fib: fib api updates

[vpp.git] / test / test_vxlan_gpe.py

diff --git a/test/test_vxlan_gpe.py b/test/test_vxlan_gpe.py
index 61d86fe..f13a528 100644 (file)
--- a/test/test_vxlan_gpe.py
+++ b/test/test_vxlan_gpe.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 import socket
 #!/usr/bin/env python
 
 import socket

-from util import ip4n_range
+from util import ip4n_range, ip4_range

 import unittest
 from framework import VppTestCase, VppTestRunner, running_extended_tests
 from template_bd import BridgeDomain
 import unittest
 from framework import VppTestCase, VppTestRunner, running_extended_tests
 from template_bd import BridgeDomain


@@ -10,9 +10,11 @@ from scapy.layers.l2 import Ether, Raw
 from scapy.layers.inet import IP, UDP
 from scapy.layers.vxlan import VXLAN
 from scapy.utils import atol
 from scapy.layers.inet import IP, UDP
 from scapy.layers.vxlan import VXLAN
 from scapy.utils import atol

+from vpp_ip_route import VppIpRoute, VppRoutePath
+from vpp_ip import INVALID_INDEX

 
 
 
 

-@unittest.skipUnless(running_extended_tests(), "part of extended tests")
+@unittest.skipUnless(running_extended_tests, "part of extended tests")

 class TestVxlanGpe(BridgeDomain, VppTestCase):
     """ VXLAN-GPE Test Case """
 
 class TestVxlanGpe(BridgeDomain, VppTestCase):
     """ VXLAN-GPE Test Case """
 


@@ -31,6 +33,10 @@ class TestVxlanGpe(BridgeDomain, VppTestCase):
                 VXLAN(vni=vni, flags=self.flags) /
                 pkt)
 
                 VXLAN(vni=vni, flags=self.flags) /
                 pkt)
 

+    def ip_range(self, start, end):
+        """ range of remote ip's """
+        return ip4_range(self.pg0.remote_ip4, start, end)
+

     def encap_mcast(self, pkt, src_ip, src_mac, vni):
         """
         Encapsulate the original payload frame by adding VXLAN-GPE header
     def encap_mcast(self, pkt, src_ip, src_mac, vni):
         """
         Encapsulate the original payload frame by adding VXLAN-GPE header


@@ -76,19 +82,26 @@ class TestVxlanGpe(BridgeDomain, VppTestCase):
 
     @classmethod
     def create_vxlan_gpe_flood_test_bd(cls, vni, n_ucast_tunnels):
 
     @classmethod
     def create_vxlan_gpe_flood_test_bd(cls, vni, n_ucast_tunnels):

-        # Create 10 ucast vxlan_gpe tunnels under bd
+        # Create 10 ucast vxlan tunnels under bd

         ip_range_start = 10
         ip_range_end = ip_range_start + n_ucast_tunnels
         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
             # 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.vxlan_gpe_add_del_tunnel(
                 src_addr=cls.pg0.local_ip4n,
                 dst_addr=dest_ip4n,
                 vni=vni)
             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):
 
     @classmethod
     def add_del_shared_mcast_dst_load(cls, is_add):


@@ -107,7 +120,7 @@ class TestVxlanGpe(BridgeDomain, VppTestCase):
                 vni=vni,
                 is_add=is_add)
             if r.sw_if_index == 0xffffffff:
                 vni=vni,
                 is_add=is_add)
             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):
 
     @classmethod
     def add_shared_mcast_dst_load(cls):


@@ -181,10 +194,10 @@ class TestVxlanGpe(BridgeDomain, VppTestCase):
                 src_addr=cls.pg0.local_ip4n,
                 dst_addr=cls.pg0.remote_ip4n,
                 vni=cls.single_tunnel_bd)
                 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)
                                                 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
 
             # Setup vni 2 to test multicast flooding
             cls.n_ucast_tunnels = 10


@@ -196,10 +209,10 @@ class TestVxlanGpe(BridgeDomain, VppTestCase):
                 dst_addr=cls.mcast_ip4n,
                 mcast_sw_if_index=1,
                 vni=cls.mcast_flood_bd)
                 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)
                                                 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()
 
             # Add and delete mcast tunnels to check stability
             cls.add_shared_mcast_dst_load()


@@ -211,12 +224,16 @@ 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.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
 
         except Exception:
             super(TestVxlanGpe, cls).tearDownClass()
             raise
 

+    @classmethod
+    def tearDownClass(cls):
+        super(TestVxlanGpe, cls).tearDownClass()
+

     @unittest.skip("test disabled for vxlan-gpe")
     def test_mcast_flood(self):
         """ inherited from BridgeDomain """
     @unittest.skip("test disabled for vxlan-gpe")
     def test_mcast_flood(self):
         """ inherited from BridgeDomain """


@@ -232,13 +249,14 @@ class TestVxlanGpe(BridgeDomain, VppTestCase):
     #  @param self The object pointer.
     def tearDown(self):
         super(TestVxlanGpe, self).tearDown()
     #  @param self The object pointer.
     def tearDown(self):
         super(TestVxlanGpe, self).tearDown()

-        if not self.vpp_dead:
-            self.logger.info(self.vapi.cli("show bridge-domain 11 detail"))
-            self.logger.info(self.vapi.cli("show bridge-domain 12 detail"))
-            self.logger.info(self.vapi.cli("show bridge-domain 13 detail"))
-            self.logger.info(self.vapi.cli("show int"))
-            self.logger.info(self.vapi.cli("show vxlan-gpe"))
-            self.logger.info(self.vapi.cli("show trace"))
+
+    def show_commands_at_teardown(self):
+        self.logger.info(self.vapi.cli("show bridge-domain 11 detail"))
+        self.logger.info(self.vapi.cli("show bridge-domain 12 detail"))
+        self.logger.info(self.vapi.cli("show bridge-domain 13 detail"))
+        self.logger.info(self.vapi.cli("show int"))
+        self.logger.info(self.vapi.cli("show vxlan-gpe"))
+        self.logger.info(self.vapi.cli("show trace"))

 
 
 if __name__ == '__main__':
 
 
 if __name__ == '__main__':