X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_vxlan6.py;h=53658433ef7cf1e2195b8091452e8bfcdcc70054;hb=7c0eb56f40b3ccf8acd8f04e208aa50231aebeba;hp=0457f9b627d3957e532f190cce7913a80254c46a;hpb=cef1e2a8b49306fc1347d97b6d74255923292edf;p=vpp.git diff --git a/test/test_vxlan6.py b/test/test_vxlan6.py index 0457f9b627d..53658433ef7 100644 --- a/test/test_vxlan6.py +++ b/test/test_vxlan6.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import socket import unittest @@ -9,10 +9,13 @@ from scapy.layers.l2 import Ether from scapy.layers.inet6 import IPv6, UDP from scapy.layers.vxlan import VXLAN from scapy.utils import atol +from vpp_ip_route import VppIpRoute, VppRoutePath +from vpp_vxlan_tunnel import VppVxlanTunnel +from vpp_ip import INVALID_INDEX -class TestVxlan(BridgeDomain, VppTestCase): - """ VXLAN Test Case """ +class TestVxlan6(BridgeDomain, VppTestCase): + """ VXLAN over IPv6 Test Case """ def __init__(self, *args): BridgeDomain.__init__(self) @@ -85,16 +88,15 @@ class TestVxlan(BridgeDomain, VppTestCase): # Create 10 ucast vxlan tunnels under bd start = 10 end = start + n_ucast_tunnels - next_hop = cls.pg0.remote_ip6n 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) + rip = VppIpRoute(cls, dest_ip6, 128, + [VppRoutePath(cls.pg0.remote_ip6, INVALID_INDEX)], + register=False) + rip.add_vpp_config() + r = VppVxlanTunnel(cls, src=cls.pg0.local_ip6, + dst=dest_ip6, vni=vni) + r.add_vpp_config() cls.vapi.sw_interface_set_l2_bridge(r.sw_if_index, bd_id=vni) @classmethod @@ -112,7 +114,7 @@ class TestVxlan(BridgeDomain, VppTestCase): # @param cls The class pointer. @classmethod def setUpClass(cls): - super(TestVxlan, cls).setUpClass() + super(TestVxlan6, cls).setUpClass() try: cls.dport = 4789 @@ -133,54 +135,58 @@ class TestVxlan(BridgeDomain, VppTestCase): cls.mcast_ip6n = socket.inet_pton(socket.AF_INET6, cls.mcast_ip6) cls.mcast_mac = "33:33:00:00:00:%02x" % (1) - # 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, - 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, - 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) except Exception: - super(TestVxlan, cls).tearDownClass() + super(TestVxlan6, cls).tearDownClass() raise + @classmethod + def tearDownClass(cls): + super(TestVxlan6, cls).tearDownClass() + + def setUp(self): + super(TestVxlan6, self).setUp() + # Create VXLAN VTEP on VPP pg0, and put vxlan_tunnel0 and pg1 + # into BD. + self.single_tunnel_bd = 1 + r = VppVxlanTunnel(self, src=self.pg0.local_ip6, + dst=self.pg0.remote_ip6, vni=self.single_tunnel_bd) + r.add_vpp_config() + self.vapi.sw_interface_set_l2_bridge(rx_sw_if_index=r.sw_if_index, + bd_id=self.single_tunnel_bd) + self.vapi.sw_interface_set_l2_bridge( + rx_sw_if_index=self.pg1.sw_if_index, bd_id=self.single_tunnel_bd) + + # Setup vni 2 to test multicast flooding + self.n_ucast_tunnels = 10 + self.mcast_flood_bd = 2 + self.create_vxlan_flood_test_bd(self.mcast_flood_bd, + self.n_ucast_tunnels) + r = VppVxlanTunnel(self, src=self.pg0.local_ip6, dst=self.mcast_ip6, + mcast_sw_if_index=1, vni=self.mcast_flood_bd) + r.add_vpp_config() + self.vapi.sw_interface_set_l2_bridge(rx_sw_if_index=r.sw_if_index, + bd_id=self.mcast_flood_bd) + self.vapi.sw_interface_set_l2_bridge( + rx_sw_if_index=self.pg2.sw_if_index, bd_id=self.mcast_flood_bd) + + # Setup vni 3 to test unicast flooding + self.ucast_flood_bd = 3 + self.create_vxlan_flood_test_bd(self.ucast_flood_bd, + self.n_ucast_tunnels) + self.vapi.sw_interface_set_l2_bridge( + rx_sw_if_index=self.pg3.sw_if_index, bd_id=self.ucast_flood_bd) + # Method to define VPP actions before tear down of the test case. # Overrides tearDown method in VppTestCase class. # @param self The object pointer. def tearDown(self): - super(TestVxlan, 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 vxlan tunnel")) + super(TestVxlan6, self).tearDown() + + 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 vxlan tunnel")) if __name__ == '__main__':