From a5b2eec0535f9025319a752891d77ff9948ae0df Mon Sep 17 00:00:00 2001 From: Ole Troan Date: Mon, 11 Mar 2019 19:23:25 +0100 Subject: vpp_papi_provider: Remove more wrapper functions. Split this work up into pieces. Please don't add new wrappers to vpp_papi_provider.py. Change-Id: I0f8f2afc4cd2bba07ea70ddecea2d7319f7b2e10 Signed-off-by: Ole Troan --- test/test_vxlan_gbp.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'test/test_vxlan_gbp.py') diff --git a/test/test_vxlan_gbp.py b/test/test_vxlan_gbp.py index ee106a5769f..11e119822ee 100644 --- a/test/test_vxlan_gbp.py +++ b/test/test_vxlan_gbp.py @@ -96,12 +96,15 @@ class TestVxlanGbp(VppTestCase): ip_range_end): # add host route so dest_ip4n will not be resolved vip = VppIpAddress(dest_ip4) - cls.vapi.ip_add_del_route(vip.bytes, 32, next_hop_address) + cls.vapi.ip_add_del_route(dst_address=vip.bytes, + dst_address_length=32, + next_hop_address=next_hop_address) r = cls.vapi.vxlan_gbp_tunnel_add_del( VppIpAddress(cls.pg0.local_ip4).encode(), vip.encode(), vni=vni) - cls.vapi.sw_interface_set_l2_bridge(r.sw_if_index, bd_id=vni) + cls.vapi.sw_interface_set_l2_bridge(rx_sw_if_index=r.sw_if_index, + bd_id=vni) # Class method to start the VXLAN GBP test case. # Overrides setUpClass method in VppTestCase class. @@ -136,10 +139,10 @@ class TestVxlanGbp(VppTestCase): VppIpAddress(cls.pg0.local_ip4).encode(), VppIpAddress(cls.pg0.remote_ip4).encode(), vni=cls.single_tunnel_bd) - cls.vapi.sw_interface_set_l2_bridge(r.sw_if_index, - bd_id=cls.single_tunnel_bd) - cls.vapi.sw_interface_set_l2_bridge(cls.pg1.sw_if_index, + cls.vapi.sw_interface_set_l2_bridge(rx_sw_if_index=r.sw_if_index, bd_id=cls.single_tunnel_bd) + cls.vapi.sw_interface_set_l2_bridge( + rx_sw_if_index=cls.pg1.sw_if_index, bd_id=cls.single_tunnel_bd) # Setup vni 2 to test multicast flooding cls.n_ucast_tunnels = 2 @@ -147,8 +150,8 @@ class TestVxlanGbp(VppTestCase): cls.ucast_flood_bd = 3 cls.create_vxlan_gbp_flood_test_bd(cls.ucast_flood_bd, cls.n_ucast_tunnels) - cls.vapi.sw_interface_set_l2_bridge(cls.pg3.sw_if_index, - bd_id=cls.ucast_flood_bd) + cls.vapi.sw_interface_set_l2_bridge( + rx_sw_if_index=cls.pg3.sw_if_index, bd_id=cls.ucast_flood_bd) except Exception: super(TestVxlanGbp, cls).tearDownClass() raise -- cgit 1.2.3-korg