X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_ip6.py;h=7c9df4657072bdc55c9899f91377c040a162538d;hb=4271c971919bb8defa3ca54f4a362676cd57bfb2;hp=77ae63bfa3966c3cf62dbf5db3716bd691bb99ee;hpb=8feeaff56fa9a4fbdfc06131f28a1060ffd9645d;p=vpp.git

diff --git a/test/test_ip6.py b/test/test_ip6.py
index 77ae63bfa39..7c9df465707 100644
--- a/test/test_ip6.py
+++ b/test/test_ip6.py
@@ -36,6 +36,8 @@ try:
 except NameError:
     text_type = str
 
+NUM_PKTS = 67
+
 
 class TestIPv6ND(VppTestCase):
     def validate_ra(self, intf, rx, dst_ip=None):
@@ -161,6 +163,10 @@ class TestIPv6(TestIPv6ND):
     def setUpClass(cls):
         super(TestIPv6, cls).setUpClass()
 
+    @classmethod
+    def tearDownClass(cls):
+        super(TestIPv6, cls).tearDownClass()
+
     def setUp(self):
         """
         Perform test setup before test case.
@@ -946,6 +952,14 @@ class TestIPv6(TestIPv6ND):
 class TestICMPv6Echo(VppTestCase):
     """ ICMPv6 Echo Test Case """
 
+    @classmethod
+    def setUpClass(cls):
+        super(TestICMPv6Echo, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(TestICMPv6Echo, cls).tearDownClass()
+
     def setUp(self):
         super(TestICMPv6Echo, self).setUp()
 
@@ -1015,6 +1029,10 @@ class TestIPv6RD(TestIPv6ND):
     def setUpClass(cls):
         super(TestIPv6RD, cls).setUpClass()
 
+    @classmethod
+    def tearDownClass(cls):
+        super(TestIPv6RD, cls).tearDownClass()
+
     def setUp(self):
         super(TestIPv6RD, self).setUp()
 
@@ -1132,6 +1150,10 @@ class TestIPv6RDControlPlane(TestIPv6ND):
     def setUpClass(cls):
         super(TestIPv6RDControlPlane, cls).setUpClass()
 
+    @classmethod
+    def tearDownClass(cls):
+        super(TestIPv6RDControlPlane, cls).tearDownClass()
+
     def setUp(self):
         super(TestIPv6RDControlPlane, self).setUp()
 
@@ -1288,6 +1310,7 @@ class TestIPv6RDControlPlane(TestIPv6ND):
         # check FIB still contains the SLAAC address
         addresses = set(self.get_interface_addresses(fib, self.pg0))
         new_addresses = addresses.difference(initial_addresses)
+
         self.assertEqual(len(new_addresses), 1)
         prefix = list(new_addresses)[0][:8] + '\0\0\0\0\0\0\0\0'
         self.assertEqual(inet_ntop(AF_INET6, prefix), '1::')
@@ -1304,6 +1327,14 @@ class TestIPv6RDControlPlane(TestIPv6ND):
 class IPv6NDProxyTest(TestIPv6ND):
     """ IPv6 ND ProxyTest Case """
 
+    @classmethod
+    def setUpClass(cls):
+        super(IPv6NDProxyTest, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(IPv6NDProxyTest, cls).tearDownClass()
+
     def setUp(self):
         super(IPv6NDProxyTest, self).setUp()
 
@@ -1493,6 +1524,14 @@ class IPv6NDProxyTest(TestIPv6ND):
 class TestIPNull(VppTestCase):
     """ IPv6 routes via NULL """
 
+    @classmethod
+    def setUpClass(cls):
+        super(TestIPNull, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(TestIPNull, cls).tearDownClass()
+
     def setUp(self):
         super(TestIPNull, self).setUp()
 
@@ -1561,6 +1600,14 @@ class TestIPNull(VppTestCase):
 class TestIPDisabled(VppTestCase):
     """ IPv6 disabled """
 
+    @classmethod
+    def setUpClass(cls):
+        super(TestIPDisabled, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(TestIPDisabled, cls).tearDownClass()
+
     def setUp(self):
         super(TestIPDisabled, self).setUp()
 
@@ -1650,6 +1697,14 @@ class TestIPDisabled(VppTestCase):
 class TestIP6LoadBalance(VppTestCase):
     """ IPv6 Load-Balancing """
 
+    @classmethod
+    def setUpClass(cls):
+        super(TestIP6LoadBalance, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(TestIP6LoadBalance, cls).tearDownClass()
+
     def setUp(self):
         super(TestIP6LoadBalance, self).setUp()
 
@@ -1708,7 +1763,7 @@ class TestIP6LoadBalance(VppTestCase):
         src_ip_pkts = []
         src_mpls_pkts = []
 
-        for ii in range(65):
+        for ii in range(NUM_PKTS):
             port_ip_hdr = (
                 IPv6(dst="3000::1", src="3000:1::1") /
                 inet6.UDP(sport=1234, dport=1234 + ii) /
@@ -1915,6 +1970,14 @@ class TestIP6LoadBalance(VppTestCase):
 class TestIP6Punt(VppTestCase):
     """ IPv6 Punt Police/Redirect """
 
+    @classmethod
+    def setUpClass(cls):
+        super(TestIP6Punt, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(TestIP6Punt, cls).tearDownClass()
+
     def setUp(self):
         super(TestIP6Punt, self).setUp()
 
@@ -2043,6 +2106,14 @@ class TestIP6Punt(VppTestCase):
 class TestIPDeag(VppTestCase):
     """ IPv6 Deaggregate Routes """
 
+    @classmethod
+    def setUpClass(cls):
+        super(TestIPDeag, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(TestIPDeag, cls).tearDownClass()
+
     def setUp(self):
         super(TestIPDeag, self).setUp()
 
@@ -2162,6 +2233,14 @@ class TestIPDeag(VppTestCase):
 class TestIP6Input(VppTestCase):
     """ IPv6 Input Exception Test Cases """
 
+    @classmethod
+    def setUpClass(cls):
+        super(TestIP6Input, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(TestIP6Input, cls).tearDownClass()
+
     def setUp(self):
         super(TestIP6Input, self).setUp()
 
@@ -2191,7 +2270,7 @@ class TestIP6Input(VppTestCase):
                      inet6.UDP(sport=1234, dport=1234) /
                      Raw('\xa5' * 100))
 
-        rx = self.send_and_expect(self.pg0, p_version * 65, self.pg0)
+        rx = self.send_and_expect(self.pg0, p_version * NUM_PKTS, self.pg0)
         rx = rx[0]
         icmp = rx[ICMPv6TimeExceeded]
 
@@ -2230,7 +2309,7 @@ class TestIP6Input(VppTestCase):
                      l4 /
                      Raw('\xa5' * 100))
 
-        self.send_and_assert_no_replies(self.pg0, p_version * 65,
+        self.send_and_assert_no_replies(self.pg0, p_version * NUM_PKTS,
                                         remark=msg or "",
                                         timeout=timeout)