Code Review / vpp.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
nat: nat44-ei hairpinning code cleanup
[vpp.git] / test / test_svs.py
diff --git a/test/test_svs.py b/test/test_svs.py
index cfbe75e..db4ad80 100644 (file)
--- a/test/test_svs.py
+++ b/test/test_svs.py
@@ -1,4 +1,6 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+
+import unittest
 
 from framework import VppTestCase, VppTestRunner
 from vpp_ip_route import VppIpTable
@@ -10,10 +12,20 @@ from scapy.layers.inet6 import IPv6
 
 from vpp_papi import VppEnum
 
+NUM_PKTS = 67
+
 
 class TestSVS(VppTestCase):
     """ SVS Test Case """
 
+    @classmethod
+    def setUpClass(cls):
+        super(TestSVS, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(TestSVS, cls).tearDownClass()
+
     def setUp(self):
         super(TestSVS, self).setUp()
 
@@ -43,7 +55,6 @@ class TestSVS(VppTestCase):
         for i in self.pg_interfaces:
             i.unconfig_ip4()
             i.unconfig_ip6()
-            i.ip6_disable()
             i.set_table_ip4(0)
             i.set_table_ip6(0)
             i.admin_down()
@@ -53,32 +64,32 @@ class TestSVS(VppTestCase):
         """ Source VRF Select IP4 """
 
         #
-        # packets destinet out of the 3 non-default table interfaces
+        # packets destined out of the 3 non-default table interfaces
         #
         pkts_0 = [(Ether(dst=self.pg0.local_mac, src=self.pg0.remote_mac) /
                    IP(src="1.1.1.1", dst=self.pg1.remote_ip4) /
                    UDP(sport=1234, dport=1234) /
-                   Raw('\xa5' * 100)),
+                   Raw(b'\xa5' * 100)),
                   (Ether(dst=self.pg0.local_mac, src=self.pg0.remote_mac) /
                    IP(src="2.2.2.2", dst=self.pg2.remote_ip4) /
                    UDP(sport=1234, dport=1234) /
-                   Raw('\xa5' * 100)),
+                   Raw(b'\xa5' * 100)),
                   (Ether(dst=self.pg0.local_mac, src=self.pg0.remote_mac) /
                    IP(src="3.3.3.3", dst=self.pg3.remote_ip4) /
                    UDP(sport=1234, dport=1234) /
-                   Raw('\xa5' * 100))]
+                   Raw(b'\xa5' * 100))]
         pkts_1 = [(Ether(dst=self.pg1.local_mac, src=self.pg1.remote_mac) /
                    IP(src="1.1.1.1", dst=self.pg1.remote_ip4) /
                    UDP(sport=1234, dport=1234) /
-                   Raw('\xa5' * 100)),
+                   Raw(b'\xa5' * 100)),
                   (Ether(dst=self.pg1.local_mac, src=self.pg1.remote_mac) /
                    IP(src="2.2.2.2", dst=self.pg2.remote_ip4) /
                    UDP(sport=1234, dport=1234) /
-                   Raw('\xa5' * 100)),
+                   Raw(b'\xa5' * 100)),
                   (Ether(dst=self.pg1.local_mac, src=self.pg1.remote_mac) /
                    IP(src="3.3.3.3", dst=self.pg3.remote_ip4) /
                    UDP(sport=1234, dport=1234) /
-                   Raw('\xa5' * 100))]
+                   Raw(b'\xa5' * 100))]
 
         #
         # before adding the SVS config all these packets are dropped when
@@ -89,40 +100,49 @@ class TestSVS(VppTestCase):
 
         #
         # Add table 1001 & 1002 into which we'll add the routes
-        # determing the source VRF selection
+        # determining the source VRF selection
         #
         table_ids = [101, 102]
 
         for table_id in table_ids:
             self.vapi.svs_table_add_del(
-                VppEnum.vl_api_address_family_t.ADDRESS_IP4, table_id)
+                is_add=1,
+                af=VppEnum.vl_api_address_family_t.ADDRESS_IP4,
+                table_id=table_id)
 
             #
             # map X.0.0.0/8 to each SVS table for lookup in table X
             #
             for i in range(1, 4):
                 self.vapi.svs_route_add_del(
-                    table_id, "%d.0.0.0/8" % i, i)
+                    is_add=1,
+                    prefix="%d.0.0.0/8" % i,
+                    table_id=table_id,
+                    source_table_id=i)
 
         #
         # Enable SVS on pg0/pg1 using table 1001/1002
         #
         self.vapi.svs_enable_disable(
-            VppEnum.vl_api_address_family_t.ADDRESS_IP4, table_ids[0],
-            self.pg0.sw_if_index)
+            is_enable=1,
+            af=VppEnum.vl_api_address_family_t.ADDRESS_IP4,
+            table_id=table_ids[0],
+            sw_if_index=self.pg0.sw_if_index)
         self.vapi.svs_enable_disable(
-            VppEnum.vl_api_address_family_t.ADDRESS_IP4, table_ids[1],
-            self.pg1.sw_if_index)
+            is_enable=1,
+            af=VppEnum.vl_api_address_family_t.ADDRESS_IP4,
+            table_id=table_ids[1],
+            sw_if_index=self.pg1.sw_if_index)
 
         #
         # now all the packets should be delivered out the respective interface
         #
-        self.send_and_expect(self.pg0, pkts_0[0] * 65, self.pg1)
-        self.send_and_expect(self.pg0, pkts_0[1] * 65, self.pg2)
-        self.send_and_expect(self.pg0, pkts_0[2] * 65, self.pg3)
-        self.send_and_expect(self.pg1, pkts_1[0] * 65, self.pg1)
-        self.send_and_expect(self.pg1, pkts_1[1] * 65, self.pg2)
-        self.send_and_expect(self.pg1, pkts_1[2] * 65, self.pg3)
+        self.send_and_expect(self.pg0, pkts_0[0] * NUM_PKTS, self.pg1)
+        self.send_and_expect(self.pg0, pkts_0[1] * NUM_PKTS, self.pg2)
+        self.send_and_expect(self.pg0, pkts_0[2] * NUM_PKTS, self.pg3)
+        self.send_and_expect(self.pg1, pkts_1[0] * NUM_PKTS, self.pg1)
+        self.send_and_expect(self.pg1, pkts_1[1] * NUM_PKTS, self.pg2)
+        self.send_and_expect(self.pg1, pkts_1[2] * NUM_PKTS, self.pg3)
 
         #
         # check that if the SVS lookup does not match a route the packet
@@ -131,14 +151,14 @@ class TestSVS(VppTestCase):
         p = (Ether(dst=self.pg0.local_mac, src=self.pg0.remote_mac) /
              IP(src=self.pg0.remote_ip4, dst=self.pg0.remote_ip4) /
              UDP(sport=1234, dport=1234) /
-             Raw('\xa5' * 100))
-        self.send_and_expect(self.pg0, p * 65, self.pg0)
+             Raw(b'\xa5' * 100))
+        self.send_and_expect(self.pg0, p * NUM_PKTS, self.pg0)
 
         p = (Ether(dst=self.pg1.local_mac, src=self.pg1.remote_mac) /
              IP(src=self.pg1.remote_ip4, dst=self.pg1.remote_ip4) /
              UDP(sport=1234, dport=1234) /
-             Raw('\xa5' * 100))
-        self.send_and_expect(self.pg1, p * 65, self.pg1)
+             Raw(b'\xa5' * 100))
+        self.send_and_expect(self.pg1, p * NUM_PKTS, self.pg1)
 
         #
         # dump the SVS configs
@@ -156,56 +176,59 @@ class TestSVS(VppTestCase):
         # cleanup
         #
         self.vapi.svs_enable_disable(
-            VppEnum.vl_api_address_family_t.ADDRESS_IP4,
-            table_ids[0],
-            self.pg0.sw_if_index,
-            is_enable=0)
+            is_enable=0,
+            af=VppEnum.vl_api_address_family_t.ADDRESS_IP4,
+            table_id=table_ids[0],
+            sw_if_index=self.pg0.sw_if_index)
         self.vapi.svs_enable_disable(
-            VppEnum.vl_api_address_family_t.ADDRESS_IP4,
-            table_ids[1],
-            self.pg1.sw_if_index,
-            is_enable=0)
+            is_enable=0,
+            af=VppEnum.vl_api_address_family_t.ADDRESS_IP4,
+            table_id=table_ids[1],
+            sw_if_index=self.pg1.sw_if_index)
 
         for table_id in table_ids:
             for i in range(1, 4):
                 self.vapi.svs_route_add_del(
-                    table_id, "%d.0.0.0/8" % i,
-                    0, is_add=0)
+                    is_add=0,
+                    prefix="%d.0.0.0/8" % i,
+                    table_id=table_id,
+                    source_table_id=0)
+
             self.vapi.svs_table_add_del(
-                VppEnum.vl_api_address_family_t.ADDRESS_IP4,
-                table_id,
-                is_add=0)
+                is_add=0,
+                af=VppEnum.vl_api_address_family_t.ADDRESS_IP4,
+                table_id=table_id)
 
     def test_svs6(self):
         """ Source VRF Select IP6 """
 
         #
-        # packets destinet out of the 3 non-default table interfaces
+        # packets destined out of the 3 non-default table interfaces
         #
         pkts_0 = [(Ether(dst=self.pg0.local_mac, src=self.pg0.remote_mac) /
                    IPv6(src="2001:1::1", dst=self.pg1.remote_ip6) /
                    UDP(sport=1234, dport=1234) /
-                   Raw('\xa5' * 100)),
+                   Raw(b'\xa5' * 100)),
                   (Ether(dst=self.pg0.local_mac, src=self.pg0.remote_mac) /
                    IPv6(src="2001:2::1", dst=self.pg2.remote_ip6) /
                    UDP(sport=1234, dport=1234) /
-                   Raw('\xa5' * 100)),
+                   Raw(b'\xa5' * 100)),
                   (Ether(dst=self.pg0.local_mac, src=self.pg0.remote_mac) /
                    IPv6(src="2001:3::1", dst=self.pg3.remote_ip6) /
                    UDP(sport=1234, dport=1234) /
-                   Raw('\xa5' * 100))]
+                   Raw(b'\xa5' * 100))]
         pkts_1 = [(Ether(dst=self.pg1.local_mac, src=self.pg1.remote_mac) /
                    IPv6(src="2001:1::1", dst=self.pg1.remote_ip6) /
                    UDP(sport=1234, dport=1234) /
-                   Raw('\xa5' * 100)),
+                   Raw(b'\xa5' * 100)),
                   (Ether(dst=self.pg1.local_mac, src=self.pg1.remote_mac) /
                    IPv6(src="2001:2::1", dst=self.pg2.remote_ip6) /
                    UDP(sport=1234, dport=1234) /
-                   Raw('\xa5' * 100)),
+                   Raw(b'\xa5' * 100)),
                   (Ether(dst=self.pg1.local_mac, src=self.pg1.remote_mac) /
                    IPv6(src="2001:3::1", dst=self.pg3.remote_ip6) /
                    UDP(sport=1234, dport=1234) /
-                   Raw('\xa5' * 100))]
+                   Raw(b'\xa5' * 100))]
 
         #
         # before adding the SVS config all these packets are dropped when
@@ -216,43 +239,49 @@ class TestSVS(VppTestCase):
 
         #
         # Add table 1001 & 1002 into which we'll add the routes
-        # determing the source VRF selection
+        # determining the source VRF selection
         #
         table_ids = [101, 102]
 
         for table_id in table_ids:
             self.vapi.svs_table_add_del(
-                VppEnum.vl_api_address_family_t.ADDRESS_IP6, table_id)
+                is_add=1,
+                af=VppEnum.vl_api_address_family_t.ADDRESS_IP6,
+                table_id=table_id)
 
             #
             # map X.0.0.0/8 to each SVS table for lookup in table X
             #
             for i in range(1, 4):
                 self.vapi.svs_route_add_del(
-                    table_id, "2001:%d::/32" % i,
-                    i)
+                    is_add=1,
+                    prefix="2001:%d::/32" % i,
+                    table_id=table_id,
+                    source_table_id=i)
 
         #
         # Enable SVS on pg0/pg1 using table 1001/1002
         #
         self.vapi.svs_enable_disable(
-            VppEnum.vl_api_address_family_t.ADDRESS_IP6,
-            table_ids[0],
-            self.pg0.sw_if_index)
+            is_enable=1,
+            af=VppEnum.vl_api_address_family_t.ADDRESS_IP6,
+            table_id=table_ids[0],
+            sw_if_index=self.pg0.sw_if_index)
         self.vapi.svs_enable_disable(
-            VppEnum.vl_api_address_family_t.ADDRESS_IP6,
-            table_ids[1],
-            self.pg1.sw_if_index)
+            is_enable=1,
+            af=VppEnum.vl_api_address_family_t.ADDRESS_IP6,
+            table_id=table_ids[1],
+            sw_if_index=self.pg1.sw_if_index)
 
         #
         # now all the packets should be delivered out the respective interface
         #
-        self.send_and_expect(self.pg0, pkts_0[0] * 65, self.pg1)
-        self.send_and_expect(self.pg0, pkts_0[1] * 65, self.pg2)
-        self.send_and_expect(self.pg0, pkts_0[2] * 65, self.pg3)
-        self.send_and_expect(self.pg1, pkts_1[0] * 65, self.pg1)
-        self.send_and_expect(self.pg1, pkts_1[1] * 65, self.pg2)
-        self.send_and_expect(self.pg1, pkts_1[2] * 65, self.pg3)
+        self.send_and_expect(self.pg0, pkts_0[0] * NUM_PKTS, self.pg1)
+        self.send_and_expect(self.pg0, pkts_0[1] * NUM_PKTS, self.pg2)
+        self.send_and_expect(self.pg0, pkts_0[2] * NUM_PKTS, self.pg3)
+        self.send_and_expect(self.pg1, pkts_1[0] * NUM_PKTS, self.pg1)
+        self.send_and_expect(self.pg1, pkts_1[1] * NUM_PKTS, self.pg2)
+        self.send_and_expect(self.pg1, pkts_1[2] * NUM_PKTS, self.pg3)
 
         #
         # check that if the SVS lookup does not match a route the packet
@@ -261,14 +290,14 @@ class TestSVS(VppTestCase):
         p = (Ether(dst=self.pg0.local_mac, src=self.pg0.remote_mac) /
              IPv6(src=self.pg0.remote_ip6, dst=self.pg0.remote_ip6) /
              UDP(sport=1234, dport=1234) /
-             Raw('\xa5' * 100))
-        self.send_and_expect(self.pg0, p * 65, self.pg0)
+             Raw(b'\xa5' * 100))
+        self.send_and_expect(self.pg0, p * NUM_PKTS, self.pg0)
 
         p = (Ether(dst=self.pg1.local_mac, src=self.pg1.remote_mac) /
              IPv6(src=self.pg1.remote_ip6, dst=self.pg1.remote_ip6) /
              UDP(sport=1234, dport=1234) /
-             Raw('\xa5' * 100))
-        self.send_and_expect(self.pg1, p * 65, self.pg1)
+             Raw(b'\xa5' * 100))
+        self.send_and_expect(self.pg1, p * NUM_PKTS, self.pg1)
 
         #
         # dump the SVS configs
@@ -286,25 +315,28 @@ class TestSVS(VppTestCase):
         # cleanup
         #
         self.vapi.svs_enable_disable(
-            VppEnum.vl_api_address_family_t.ADDRESS_IP6,
-            table_ids[0],
-            self.pg0.sw_if_index,
-            is_enable=0)
+            is_enable=0,
+            af=VppEnum.vl_api_address_family_t.ADDRESS_IP6,
+            table_id=table_ids[0],
+            sw_if_index=self.pg0.sw_if_index)
         self.vapi.svs_enable_disable(
-            VppEnum.vl_api_address_family_t.ADDRESS_IP6,
-            table_ids[1],
-            self.pg1.sw_if_index,
-            is_enable=0)
+            is_enable=0,
+            af=VppEnum.vl_api_address_family_t.ADDRESS_IP6,
+            table_id=table_ids[1],
+            sw_if_index=self.pg1.sw_if_index)
+
         for table_id in table_ids:
             for i in range(1, 4):
                 self.vapi.svs_route_add_del(
-                    table_id, "2001:%d::/32" % i,
-                    0, is_add=0)
-            self.vapi.svs_table_add_del(
-                VppEnum.vl_api_address_family_t.ADDRESS_IP6,
-                table_id,
-                is_add=0)
+                    is_add=0,
+                    prefix="2001:%d::/32" % i,
+                    table_id=table_id,
+                    source_table_id=0)
 
+            self.vapi.svs_table_add_del(
+                is_add=0,
+                af=VppEnum.vl_api_address_family_t.ADDRESS_IP6,
+                table_id=table_id)
 
 if __name__ == '__main__':
     unittest.main(testRunner=VppTestRunner)
Vector Packet Processing