diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_vxlan_gbp.py | 23 | ||||
| -rw-r--r-- | test/vpp_papi_provider.py | 32 |
2 files changed, 31 insertions, 24 deletions
diff --git a/test/test_vxlan_gbp.py b/test/test_vxlan_gbp.py index 55594a59fa7..919ecbc6203 100644 --- a/test/test_vxlan_gbp.py +++ b/test/test_vxlan_gbp.py @@ -1,10 +1,11 @@ #!/usr/bin/env python import socket -from util import ip4n_range, ip4_range +from util import ip4_range import unittest from framework import VppTestCase, VppTestRunner from template_bd import BridgeDomain +from vpp_ip import VppIpAddress from scapy.layers.l2 import Ether, Raw from scapy.layers.inet import IP, UDP @@ -106,13 +107,15 @@ class TestVxlanGbp(VppTestCase): ip_range_start = 10 ip_range_end = ip_range_start + n_ucast_tunnels next_hop_address = cls.pg0.remote_ip4n - for dest_ip4n in ip4n_range(next_hop_address, ip_range_start, - ip_range_end): + for dest_ip4 in ip4_range(cls.pg0.remote_ip4, + 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) - r = cls.vapi.vxlan_gbp_add_del_tunnel( - src_addr=cls.pg0.local_ip4n, - dst_addr=dest_ip4n, + vip = VppIpAddress(dest_ip4) + cls.vapi.ip_add_del_route(vip.bytes, 32, 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) @@ -145,9 +148,9 @@ class TestVxlanGbp(VppTestCase): # Create VXLAN GBP VTEP on VPP pg0, and put vxlan_gbp_tunnel0 and # pg1 into BD. cls.single_tunnel_bd = 1 - r = cls.vapi.vxlan_gbp_add_del_tunnel( - src_addr=cls.pg0.local_ip4n, - dst_addr=cls.pg0.remote_ip4n, + r = cls.vapi.vxlan_gbp_tunnel_add_del( + 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) diff --git a/test/vpp_papi_provider.py b/test/vpp_papi_provider.py index 3028a25b70b..13d0d933ea1 100644 --- a/test/vpp_papi_provider.py +++ b/test/vpp_papi_provider.py @@ -2723,14 +2723,14 @@ class VppPapiProvider(object): 'protocol': protocol, 'vni': vni}) - def vxlan_gbp_add_del_tunnel( + def vxlan_gbp_tunnel_add_del( self, - src_addr, - dst_addr, + src, + dst, mcast_sw_if_index=0xFFFFFFFF, is_add=1, is_ipv6=0, - encap_vrf_id=0, + encap_table_id=0, decap_next_index=0xFFFFFFFF, vni=0, instance=0xFFFFFFFF): @@ -2740,23 +2740,27 @@ class VppPapiProvider(object): :param src_addr: :param is_add: (Default value = 1) :param is_ipv6: (Default value = 0) - :param encap_vrf_id: (Default value = 0) + :param encap_table_id: (Default value = 0) :param decap_next_index: (Default value = 0xFFFFFFFF) :param mcast_sw_if_index: (Default value = 0xFFFFFFFF) :param vni: (Default value = 0) :param instance: (Default value = 0xFFFFFFFF) """ - return self.api(self.papi.vxlan_gbp_add_del_tunnel, + return self.api(self.papi.vxlan_gbp_tunnel_add_del, {'is_add': is_add, - 'is_ipv6': is_ipv6, - 'src_address': src_addr, - 'dst_address': dst_addr, - 'mcast_sw_if_index': mcast_sw_if_index, - 'encap_vrf_id': encap_vrf_id, - 'decap_next_index': decap_next_index, - 'vni': vni, - 'instance': instance}) + 'tunnel': { + 'src': src, + 'dst': dst, + 'mcast_sw_if_index': mcast_sw_if_index, + 'encap_table_id': encap_table_id, + 'decap_next_index': decap_next_index, + 'vni': vni, + 'instance': instance}}) + + def vxlan_gbp_tunnel_dump(self, sw_if_index=0xffffffff): + return self.api(self.papi.vxlan_gbp_tunnel_dump, + {'sw_if_index': sw_if_index}) def pppoe_add_del_session( self, |