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 <ot@cisco.com>
This commit is contained in:
committed by
Paul Vinciguerra
parent
2d9b427a5b
commit
a5b2eec053
@@ -87,12 +87,15 @@ class TestVxlanGpe(BridgeDomain, VppTestCase):
|
||||
for dest_ip4n in ip4n_range(next_hop_address, ip_range_start,
|
||||
ip_range_end):
|
||||
# add host route so dest_ip4n will not be resolved
|
||||
cls.vapi.ip_add_del_route(dest_ip4n, 32, next_hop_address)
|
||||
cls.vapi.ip_add_del_route(dst_address=dest_ip4n,
|
||||
dst_address_length=32,
|
||||
next_hop_address=next_hop_address)
|
||||
r = cls.vapi.vxlan_gpe_add_del_tunnel(
|
||||
src_addr=cls.pg0.local_ip4n,
|
||||
dst_addr=dest_ip4n,
|
||||
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)
|
||||
|
||||
@classmethod
|
||||
def add_del_shared_mcast_dst_load(cls, is_add):
|
||||
@@ -185,10 +188,10 @@ class TestVxlanGpe(BridgeDomain, VppTestCase):
|
||||
src_addr=cls.pg0.local_ip4n,
|
||||
dst_addr=cls.pg0.remote_ip4n,
|
||||
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 = 10
|
||||
@@ -200,10 +203,10 @@ class TestVxlanGpe(BridgeDomain, VppTestCase):
|
||||
dst_addr=cls.mcast_ip4n,
|
||||
mcast_sw_if_index=1,
|
||||
vni=cls.mcast_flood_bd)
|
||||
cls.vapi.sw_interface_set_l2_bridge(r.sw_if_index,
|
||||
bd_id=cls.mcast_flood_bd)
|
||||
cls.vapi.sw_interface_set_l2_bridge(cls.pg2.sw_if_index,
|
||||
cls.vapi.sw_interface_set_l2_bridge(rx_sw_if_index=r.sw_if_index,
|
||||
bd_id=cls.mcast_flood_bd)
|
||||
cls.vapi.sw_interface_set_l2_bridge(
|
||||
rx_sw_if_index=cls.pg2.sw_if_index, bd_id=cls.mcast_flood_bd)
|
||||
|
||||
# Add and delete mcast tunnels to check stability
|
||||
cls.add_shared_mcast_dst_load()
|
||||
@@ -215,8 +218,8 @@ class TestVxlanGpe(BridgeDomain, VppTestCase):
|
||||
cls.ucast_flood_bd = 13
|
||||
cls.create_vxlan_gpe_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(TestVxlanGpe, cls).tearDownClass()
|
||||
raise
|
||||
|
||||
Reference in New Issue
Block a user