X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_l2xc_multi_instance.py;h=2a6e41c8791e7e8fc2e2a809fa6800e74fdba79d;hb=61717cc38;hp=bb26f95906c9597a27788d15f82e83e5d56a7509;hpb=da505f608e0919c45089dc80f9e3e16330a6551a;p=vpp.git

diff --git a/test/test_l2xc_multi_instance.py b/test/test_l2xc_multi_instance.py
index bb26f95906c..2a6e41c8791 100644
--- a/test/test_l2xc_multi_instance.py
+++ b/test/test_l2xc_multi_instance.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """L2XC Multi-instance Test Case HLD:
 
 **NOTES:**
@@ -112,6 +112,10 @@ class TestL2xcMultiInst(VppTestCase):
             super(TestL2xcMultiInst, cls).tearDownClass()
             raise
 
+    @classmethod
+    def tearDownClass(cls):
+        super(TestL2xcMultiInst, cls).tearDownClass()
+
     def setUp(self):
         """
         Clear trace and packet infos before running each test.
@@ -124,8 +128,9 @@ class TestL2xcMultiInst(VppTestCase):
         Show various debug prints after each test.
         """
         super(TestL2xcMultiInst, self).tearDown()
-        if not self.vpp_dead:
-            self.logger.info(self.vapi.ppcli("show l2patch"))
+
+    def show_commands_at_teardown(self):
+        self.logger.info(self.vapi.ppcli("show l2patch"))
 
     @classmethod
     def create_hosts(cls, count):
@@ -136,7 +141,7 @@ class TestL2xcMultiInst(VppTestCase):
         :param int count: Number of hosts to create MAC/IPv4 addresses for.
         """
         n_int = len(cls.pg_interfaces)
-        macs_per_if = count / n_int
+        macs_per_if = count // n_int
         i = -1
         for pg_if in cls.pg_interfaces:
             i += 1
@@ -235,7 +240,7 @@ class TestL2xcMultiInst(VppTestCase):
             last_info[i.sw_if_index] = None
         dst_sw_if_index = pg_if.sw_if_index
         for packet in capture:
-            payload_info = self.payload_to_info(str(packet[Raw]))
+            payload_info = self.payload_to_info(packet[Raw])
             try:
                 ip = packet[IP]
                 udp = packet[UDP]