NAT: Twice NAT44 (VPP-969)

[vpp.git] / test / test_p2p_ethernet.py

diff --git a/test/test_p2p_ethernet.py b/test/test_p2p_ethernet.py
index 37a1d18..5295d1c 100644 (file)
--- a/test/test_p2p_ethernet.py
+++ b/test/test_p2p_ethernet.py
@@ -9,9 +9,9 @@ from scapy.layers.l2 import Ether
 from scapy.layers.inet import IP, UDP
 from scapy.layers.inet6 import IPv6
 
-from framework import VppTestCase, VppTestRunner, running_extended_tests
+from framework import VppTestCase, VppTestRunner
 from vpp_sub_interface import VppP2PSubint
-from vpp_ip_route import VppIpRoute, VppRoutePath
+from vpp_ip_route import VppIpRoute, VppRoutePath, DpoProto
 from util import mactobinary
 
 
@@ -93,39 +93,6 @@ class P2PEthernetAPI(VppTestCase):
 
         self.logger.info("FFP_TEST_FINISH_0001")
 
-    @unittest.skipUnless(running_extended_tests(), "part of extended tests")
-    def test_p2p_subif_creation_10k(self):
-        """create 100k of p2p subifs"""
-        self.logger.info("FFP_TEST_START_0001")
-
-        macs = []
-        clients = 100000
-        mac = int("dead00000000", 16)
-
-        s_time = datetime.datetime.now()
-        for i in range(1, clients+1):
-            if i % 1000 == 0:
-                e_time = datetime.datetime.now()
-                print "Created 1000 subifs in %s secs" % (e_time - s_time)
-                s_time = e_time
-            try:
-                macs.append(':'.join(re.findall('..', '{:02x}'.format(mac+i))))
-                self.vapi.create_p2pethernet_subif(self.pg3.sw_if_index,
-                                                   mactobinary(macs[i-1]),
-                                                   i)
-            except Exception:
-                print "Failed to create subif %d %s" % (i, macs[i-1])
-                raise
-
-        intfs = self.vapi.cli("show interface").split("\n")
-        count = 0
-        for intf in intfs:
-            if intf.startswith('pg3.'):
-                count += 1
-        self.assertEqual(count, clients)
-
-        self.logger.info("FFP_TEST_FINISH_0001")
-
 
 class P2PEthernetIPV6(VppTestCase):
     """P2P Ethernet IPv6 tests"""
@@ -219,7 +186,7 @@ class P2PEthernetIPV6(VppTestCase):
         route_8000 = VppIpRoute(self, "8000::", 64,
                                 [VppRoutePath(self.pg0.remote_ip6,
                                               self.pg0.sw_if_index,
-                                              is_ip6=1)],
+                                              proto=DpoProto.DPO_PROTO_IP6)],
                                 is_ip6=1)
         route_8000.add_vpp_config()
 
@@ -239,7 +206,7 @@ class P2PEthernetIPV6(VppTestCase):
         route_9001 = VppIpRoute(self, "9001::", 64,
                                 [VppRoutePath(self.pg1.remote_ip6,
                                               self.pg1.sw_if_index,
-                                              is_ip6=1)],
+                                              proto=DpoProto.DPO_PROTO_IP6)],
                                 is_ip6=1)
         route_9001.add_vpp_config()
 
@@ -264,7 +231,7 @@ class P2PEthernetIPV6(VppTestCase):
         route_3 = VppIpRoute(self, "9000::", 64,
                              [VppRoutePath(self.pg1._remote_hosts[0].ip6,
                                            self.pg1.sw_if_index,
-                                           is_ip6=1)],
+                                           proto=DpoProto.DPO_PROTO_IP6)],
                              is_ip6=1)
         route_3.add_vpp_config()
 
@@ -289,7 +256,7 @@ class P2PEthernetIPV6(VppTestCase):
         route_9001 = VppIpRoute(self, "9000::", 64,
                                 [VppRoutePath(self.pg1._remote_hosts[0].ip6,
                                               self.pg1.sw_if_index,
-                                              is_ip6=1)],
+                                              proto=DpoProto.DPO_PROTO_IP6)],
                                 is_ip6=1)
         route_9001.add_vpp_config()
 
@@ -310,19 +277,19 @@ class P2PEthernetIPV6(VppTestCase):
         route_8000 = VppIpRoute(self, "8000::", 64,
                                 [VppRoutePath(self.pg0.remote_ip6,
                                               self.pg0.sw_if_index,
-                                              is_ip6=1)],
+                                              proto=DpoProto.DPO_PROTO_IP6)],
                                 is_ip6=1)
         route_8000.add_vpp_config()
         route_8001 = VppIpRoute(self, "8001::", 64,
                                 [VppRoutePath(self.p2p_sub_ifs[0].remote_ip6,
                                               self.p2p_sub_ifs[0].sw_if_index,
-                                              is_ip6=1)],
+                                              proto=DpoProto.DPO_PROTO_IP6)],
                                 is_ip6=1)
         route_8001.add_vpp_config()
         route_8002 = VppIpRoute(self, "8002::", 64,
                                 [VppRoutePath(self.p2p_sub_ifs[1].remote_ip6,
                                               self.p2p_sub_ifs[1].sw_if_index,
-                                              is_ip6=1)],
+                                              proto=DpoProto.DPO_PROTO_IP6)],
                                 is_ip6=1)
         route_8002.add_vpp_config()