NAT: VPP-1531 api cleanup & update

[vpp.git] / test / test_svs.py

diff --git a/test/test_svs.py b/test/test_svs.py
index 8429f43..b4e6722 100644 (file)
--- a/test/test_svs.py
+++ b/test/test_svs.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
-from framework import VppTestCase, VppTestRunner
-from vpp_ip import VppIpPrefix
+import unittest
 
+from framework import VppTestCase, VppTestRunner
 from vpp_ip_route import VppIpTable
 
 from scapy.packet import Raw
@@ -16,6 +16,14 @@ from vpp_papi import VppEnum
 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()
 
@@ -55,7 +63,7 @@ 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) /
@@ -91,7 +99,7 @@ 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]
 
@@ -104,9 +112,7 @@ class TestSVS(VppTestCase):
             #
             for i in range(1, 4):
                 self.vapi.svs_route_add_del(
-                    table_id,
-                    VppIpPrefix("%d.0.0.0" % i, 8).encode(),
-                    i)
+                    table_id, "%d.0.0.0/8" % i, i)
 
         #
         # Enable SVS on pg0/pg1 using table 1001/1002
@@ -173,8 +179,7 @@ class TestSVS(VppTestCase):
         for table_id in table_ids:
             for i in range(1, 4):
                 self.vapi.svs_route_add_del(
-                    table_id,
-                    VppIpPrefix("%d.0.0.0" % i, 8).encode(),
+                    table_id, "%d.0.0.0/8" % i,
                     0, is_add=0)
             self.vapi.svs_table_add_del(
                 VppEnum.vl_api_address_family_t.ADDRESS_IP4,
@@ -185,7 +190,7 @@ class TestSVS(VppTestCase):
         """ 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) /
@@ -221,7 +226,7 @@ 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]
 
@@ -234,8 +239,7 @@ class TestSVS(VppTestCase):
             #
             for i in range(1, 4):
                 self.vapi.svs_route_add_del(
-                    table_id,
-                    VppIpPrefix("2001:%d::" % i, 32).encode(),
+                    table_id, "2001:%d::/32" % i,
                     i)
 
         #
@@ -304,8 +308,7 @@ class TestSVS(VppTestCase):
         for table_id in table_ids:
             for i in range(1, 4):
                 self.vapi.svs_route_add_del(
-                    table_id,
-                    VppIpPrefix("2001:%d::" % i, 32).encode(),
+                    table_id, "2001:%d::/32" % i,
                     0, is_add=0)
             self.vapi.svs_table_add_del(
                 VppEnum.vl_api_address_family_t.ADDRESS_IP6,