X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_svs.py;h=db4ad8078e0e808dfbab9551fc518d8fcb9ace20;hb=1c4415bfa;hp=9a9ac57016b096e38d9bef0b1069414296c02a6e;hpb=4271c971919bb8defa3ca54f4a362676cd57bfb2;p=vpp.git

diff --git a/test/test_svs.py b/test/test_svs.py
index 9a9ac57016b..db4ad8078e0 100644
--- a/test/test_svs.py
+++ b/test/test_svs.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 
@@ -55,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()
@@ -70,27 +69,27 @@ class TestSVS(VppTestCase):
         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
@@ -107,24 +106,33 @@ class TestSVS(VppTestCase):
 
         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
@@ -143,13 +151,13 @@ 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))
+             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))
+             Raw(b'\xa5' * 100))
         self.send_and_expect(self.pg1, p * NUM_PKTS, self.pg1)
 
         #
@@ -168,25 +176,28 @@ 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 """
@@ -197,27 +208,27 @@ class TestSVS(VppTestCase):
         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
@@ -234,27 +245,33 @@ class TestSVS(VppTestCase):
 
         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
@@ -273,13 +290,13 @@ 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))
+             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))
+             Raw(b'\xa5' * 100))
         self.send_and_expect(self.pg1, p * NUM_PKTS, self.pg1)
 
         #
@@ -298,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)