diff options
| author |   Ole Troan <ot@cisco.com> | 2019-03-11 19:23:25 +0100 |
|---|---|---|
| committer |   Paul Vinciguerra <pvinci@vinciconsulting.com> | 2019-03-11 21:57:19 +0000 |
| commit | a5b2eec0535f9025319a752891d77ff9948ae0df (patch) | |
| tree | 08c801cb85ab9639e00e5f565e613b817b3924e4 /test/test_vxlan6.py | |
| parent | 2d9b427a5b20dcec3d2212a3a8a47c29b4acdd46 (diff) | |
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>
Diffstat (limited to 'test/test_vxlan6.py')
| -rw-r--r-- | test/test_vxlan6.py | 49 |
1 files changed, 24 insertions, 25 deletions
diff --git a/test/test_vxlan6.py b/test/test_vxlan6.py index 5ae8e7e1268..6f8fee71ec0 100644 --- a/test/test_vxlan6.py +++ b/test/test_vxlan6.py @@ -89,13 +89,14 @@ class TestVxlan6(BridgeDomain, VppTestCase): for dest_ip6 in cls.ip_range(start, end): dest_ip6n = socket.inet_pton(socket.AF_INET6, dest_ip6) # add host route so dest ip will not be resolved - cls.vapi.ip_add_del_route(dest_ip6n, 128, next_hop, is_ipv6=1) - r = cls.vapi.vxlan_add_del_tunnel( - is_ipv6=1, - src_addr=cls.pg0.local_ip6n, - dst_addr=dest_ip6n, - vni=vni) - cls.vapi.sw_interface_set_l2_bridge(r.sw_if_index, bd_id=vni) + cls.vapi.ip_add_del_route(dst_address=dest_ip6n, + dst_address_length=128, + next_hop_address=next_hop, is_ipv6=1) + r = cls.vapi.vxlan_add_del_tunnel(src_address=cls.pg0.local_ip6n, + dst_address=dest_ip6n, is_ipv6=1, + vni=vni) + cls.vapi.sw_interface_set_l2_bridge(rx_sw_if_index=r.sw_if_index, + bd_id=vni) @classmethod def add_mcast_tunnels_load(cls): @@ -136,37 +137,35 @@ class TestVxlan6(BridgeDomain, VppTestCase): # Create VXLAN VTEP on VPP pg0, and put vxlan_tunnel0 and pg1 # into BD. cls.single_tunnel_bd = 1 - r = cls.vapi.vxlan_add_del_tunnel( - is_ipv6=1, - src_addr=cls.pg0.local_ip6n, - dst_addr=cls.pg0.remote_ip6n, - 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, + r = cls.vapi.vxlan_add_del_tunnel(src_address=cls.pg0.local_ip6n, + dst_address=cls.pg0.remote_ip6n, + is_ipv6=1, + vni=cls.single_tunnel_bd) + 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 cls.mcast_flood_bd = 2 cls.create_vxlan_flood_test_bd(cls.mcast_flood_bd, cls.n_ucast_tunnels) - r = cls.vapi.vxlan_add_del_tunnel( - mcast_sw_if_index=1, - src_addr=cls.pg0.local_ip6n, - dst_addr=cls.mcast_ip6n, - vni=cls.mcast_flood_bd, is_ipv6=1) - 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, + r = cls.vapi.vxlan_add_del_tunnel(src_address=cls.pg0.local_ip6n, + dst_address=cls.mcast_ip6n, + mcast_sw_if_index=1, is_ipv6=1, + vni=cls.mcast_flood_bd) + 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) # Setup vni 3 to test unicast flooding cls.ucast_flood_bd = 3 cls.create_vxlan_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(TestVxlan6, cls).tearDownClass() raise |