NAT: VPP-1531 api cleanup & update

[vpp.git] / test / test_pipe.py

diff --git a/test/test_pipe.py b/test/test_pipe.py
index a89c1e9..2d3c1ec 100644 (file)
--- a/test/test_pipe.py
+++ b/test/test_pipe.py
@@ -32,14 +32,11 @@ class VppPipe(VppInterface):
         self.result = self._test.vapi.pipe_create(
             0 if self.instance == 0xffffffff else 1,
             self.instance)
-        self.set_sw_if_index(self.result.parent_sw_if_index)
+        self.set_sw_if_index(self.result.sw_if_index)
 
     def remove_vpp_config(self):
         self._test.vapi.pipe_delete(
-            self.result.parent_sw_if_index)
-
-    def __str__(self):
-        return self.object_id()
+            self.result.sw_if_index)
 
     def object_id(self):
         return "pipe-%d" % (self._sw_if_index)
@@ -47,20 +44,28 @@ class VppPipe(VppInterface):
     def query_vpp_config(self):
         pipes = self._test.vapi.pipe_dump()
         for p in pipes:
-            if p.parent_sw_if_index == self.result.parent_sw_if_index:
+            if p.sw_if_index == self.result.sw_if_index:
                 return True
         return False
 
     def set_unnumbered(self, ip_sw_if_index, is_add=True):
-        res = self._test.vapi.sw_interface_set_unnumbered(
-            self.east, ip_sw_if_index, is_add)
-        res = self._test.vapi.sw_interface_set_unnumbered(
-            self.west, ip_sw_if_index, is_add)
+        res = self._test.vapi.sw_interface_set_unnumbered(ip_sw_if_index,
+                                                          self.east, is_add)
+        res = self._test.vapi.sw_interface_set_unnumbered(ip_sw_if_index,
+                                                          self.west, is_add)
 
 
 class TestPipe(VppTestCase):
     """ Pipes """
 
+    @classmethod
+    def setUpClass(cls):
+        super(TestPipe, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(TestPipe, cls).tearDownClass()
+
     def setUp(self):
         super(TestPipe, self).setUp()
 
@@ -78,9 +83,7 @@ class TestPipe(VppTestCase):
     def test_pipe(self):
         """ Pipes """
 
-        pipes = []
-        pipes.append(VppPipe(self))
-        pipes.append(VppPipe(self, 10))
+        pipes = [VppPipe(self), VppPipe(self, 10)]
 
         for p in pipes:
             p.add_vpp_config()
@@ -102,7 +105,7 @@ class TestPipe(VppTestCase):
                                                self.pg1.sw_if_index,
                                                enable=1)
 
-        # test bi-drectional L2 flow pg0<->pg1
+        # test bi-directional L2 flow pg0<->pg1
         p = (Ether(src=self.pg0.remote_mac,
                    dst=self.pg1.remote_mac) /
              IP(src="1.1.1.1",