Tests: Refactor payload_to_info()

[vpp.git] / test / test_srv6.py

diff --git a/test/test_srv6.py b/test/test_srv6.py
index 3e5f856..2ea9da7 100644 (file)
--- a/test/test_srv6.py
+++ b/test/test_srv6.py
@@ -1224,14 +1224,14 @@ class TestSRv6(VppTestCase):
 
         # add classify table
         # mask on dst ip address prefix a7::/8
-        mask = '{:0<16}'.format('ff')
+        mask = '{!s:0<16}'.format('ff')
         r = self.vapi.classify_add_del_table(
             1,
             binascii.unhexlify(mask),
             match_n_vectors=(len(mask) - 1) // 32 + 1,
             current_data_flag=1,
             skip_n_vectors=2)  # data offset
-        self.assertIsNotNone(r, msg='No response msg for add_del_table')
+        self.assertIsNotNone(r, 'No response msg for add_del_table')
         table_index = r.new_table_index
 
         # add the source routign node as a ip6 inacl netxt node
@@ -1239,7 +1239,7 @@ class TestSRv6(VppTestCase):
                                     'sr-pl-rewrite-insert')
         inacl_next_node_index = r.node_index
 
-        match = '{:0<16}'.format('a7')
+        match = '{!s:0<16}'.format('a7')
         r = self.vapi.classify_add_del_session(
             1,
             table_index,
@@ -1247,7 +1247,7 @@ class TestSRv6(VppTestCase):
             hit_next_index=inacl_next_node_index,
             action=3,
             metadata=0)  # sr policy index
-        self.assertIsNotNone(r, msg='No response msg for add_del_session')
+        self.assertIsNotNone(r, 'No response msg for add_del_session')
 
         # log the classify table used in the steering policy
         self.logger.info(self.vapi.cli("show classify table"))
@@ -1257,7 +1257,7 @@ class TestSRv6(VppTestCase):
             sw_if_index=self.pg3.sw_if_index,
             ip6_table_index=table_index)
         self.assertIsNotNone(r,
-                             msg='No response msg for input_acl_set_interface')
+                             'No response msg for input_acl_set_interface')
 
         # log the ip6 inacl
         self.logger.info(self.vapi.cli("show inacl type ip6"))
@@ -1292,7 +1292,7 @@ class TestSRv6(VppTestCase):
             sw_if_index=self.pg3.sw_if_index,
             ip6_table_index=table_index)
         self.assertIsNotNone(r,
-                             msg='No response msg for input_acl_set_interface')
+                             'No response msg for input_acl_set_interface')
 
         # log the ip6 inacl after cleaning
         self.logger.info(self.vapi.cli("show inacl type ip6"))
@@ -1313,13 +1313,13 @@ class TestSRv6(VppTestCase):
             0,
             table_index,
             binascii.unhexlify(match))
-        self.assertIsNotNone(r, msg='No response msg for add_del_session')
+        self.assertIsNotNone(r, 'No response msg for add_del_session')
 
         r = self.vapi.classify_add_del_table(
             0,
             binascii.unhexlify(mask),
             table_index=table_index)
-        self.assertIsNotNone(r, msg='No response msg for add_del_table')
+        self.assertIsNotNone(r, 'No response msg for add_del_table')
 
         self.logger.info(self.vapi.cli("show classify table"))
 
@@ -2080,7 +2080,7 @@ class TestSRv6(VppTestCase):
         # but packet[Raw] gives the complete payload
         # (incl L2 header) for the T.Encaps L2 case
         try:
-            payload_info = self.payload_to_info(str(packet[Raw]))
+            payload_info = self.payload_to_info(packet[Raw])
 
         except:
             # remote L2 header from packet[Raw]:
@@ -2144,7 +2144,6 @@ class TestSRv6(VppTestCase):
                 compare_func(txed_packet, packet)
 
             except:
-                print packet.command()
                 self.logger.error(ppp("Unexpected or invalid packet:", packet))
                 raise