X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_geneve.py;h=04271e31b6940b36c7dc37a463f1bc1cec83190c;hb=097fa66b986f06281f603767d321ab13ab6c88c3;hp=d77bfbfcff1df1c5605eda6c4212801e1fec6332;hpb=cef1e2a8b49306fc1347d97b6d74255923292edf;p=vpp.git diff --git a/test/test_geneve.py b/test/test_geneve.py index d77bfbfcff1..04271e31b69 100644 --- a/test/test_geneve.py +++ b/test/test_geneve.py @@ -10,6 +10,8 @@ from scapy.layers.l2 import Ether from scapy.layers.inet import IP, UDP from scapy.layers.geneve import GENEVE from scapy.utils import atol +from vpp_ip_route import VppIpRoute, VppRoutePath +from vpp_ip import INVALID_INDEX class TestGeneve(BridgeDomain, VppTestCase): @@ -85,16 +87,21 @@ class TestGeneve(BridgeDomain, VppTestCase): # Create 10 ucast geneve tunnels under bd 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): + next_hop_address = cls.pg0.remote_ip4 + for dest_ip4 in ip4_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) + rip = VppIpRoute(cls, dest_ip4, 32, + [VppRoutePath(next_hop_address, + INVALID_INDEX)], + register=False) + rip.add_vpp_config() + dest_ip4n = socket.inet_pton(socket.AF_INET, dest_ip4) r = cls.vapi.geneve_add_del_tunnel( - local_addr=cls.pg0.local_ip4n, - remote_addr=dest_ip4n, + local_address=cls.pg0.local_ip4n, remote_address=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): @@ -107,13 +114,11 @@ class TestGeneve(BridgeDomain, VppTestCase): vni_end = vni_start + n_shared_dst_tunnels for vni in range(vni_start, vni_end): r = cls.vapi.geneve_add_del_tunnel( - local_addr=cls.pg0.local_ip4n, - remote_addr=cls.mcast_ip4n, - mcast_sw_if_index=1, - vni=vni, - is_add=is_add) + local_address=cls.pg0.local_ip4n, + remote_address=cls.mcast_ip4n, mcast_sw_if_index=1, + is_add=is_add, vni=vni) if r.sw_if_index == 0xffffffff: - raise "bad sw_if_index" + raise ValueError("bad sw_if_index: ~0") @classmethod def add_shared_mcast_dst_load(cls): @@ -134,12 +139,10 @@ class TestGeneve(BridgeDomain, VppTestCase): for dest_ip4n in ip4n_range(cls.mcast_ip4n, ip_range_start, ip_range_end): vni = bytearray(dest_ip4n)[3] - cls.vapi.geneve_add_del_tunnel( - local_addr=cls.pg0.local_ip4n, - remote_addr=dest_ip4n, - mcast_sw_if_index=1, - vni=vni, - is_add=is_add) + cls.vapi.geneve_add_del_tunnel(local_address=cls.pg0.local_ip4n, + remote_address=dest_ip4n, + mcast_sw_if_index=1, is_add=is_add, + vni=vni) @classmethod def add_mcast_tunnels_load(cls): @@ -183,13 +186,12 @@ class TestGeneve(BridgeDomain, VppTestCase): # into BD. cls.single_tunnel_bd = 1 r = cls.vapi.geneve_add_del_tunnel( - local_addr=cls.pg0.local_ip4n, - remote_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, + local_address=cls.pg0.local_ip4n, + remote_address=cls.pg0.remote_ip4n, 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 @@ -197,14 +199,13 @@ class TestGeneve(BridgeDomain, VppTestCase): cls.create_geneve_flood_test_bd(cls.mcast_flood_bd, cls.n_ucast_tunnels) r = cls.vapi.geneve_add_del_tunnel( - local_addr=cls.pg0.local_ip4n, - remote_addr=cls.mcast_ip4n, - mcast_sw_if_index=1, + local_address=cls.pg0.local_ip4n, + remote_address=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() @@ -216,8 +217,8 @@ class TestGeneve(BridgeDomain, VppTestCase): cls.ucast_flood_bd = 3 cls.create_geneve_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(TestGeneve, cls).tearDownClass() raise @@ -227,11 +228,12 @@ class TestGeneve(BridgeDomain, VppTestCase): # @param self The object pointer. def tearDown(self): super(TestGeneve, self).tearDown() - if not self.vpp_dead: - self.logger.info(self.vapi.cli("show bridge-domain 1 detail")) - self.logger.info(self.vapi.cli("show bridge-domain 2 detail")) - self.logger.info(self.vapi.cli("show bridge-domain 3 detail")) - self.logger.info(self.vapi.cli("show geneve tunnel")) + + def show_commands_at_teardown(self): + self.logger.info(self.vapi.cli("show bridge-domain 1 detail")) + self.logger.info(self.vapi.cli("show bridge-domain 2 detail")) + self.logger.info(self.vapi.cli("show bridge-domain 3 detail")) + self.logger.info(self.vapi.cli("show geneve tunnel")) if __name__ == '__main__':