tests: GRE over IPSec unit tests

[vpp.git] / test / test_classifier_ip6.py

diff --git a/test/test_classifier_ip6.py b/test/test_classifier_ip6.py
index 6725f61..464034d 100644 (file)
--- a/test/test_classifier_ip6.py
+++ b/test/test_classifier_ip6.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 import socket
@@ -73,10 +73,6 @@ class TestClassifier(VppTestCase):
     def tearDown(self):
         """Run standard test teardown and acl related log."""
         if not self.vpp_dead:
-            self.logger.info(self.vapi.ppcli("show inacl type ip6"))
-            self.logger.info(self.vapi.ppcli("show outacl type ip6"))
-            self.logger.info(self.vapi.cli("show classify table verbose"))
-            self.logger.info(self.vapi.cli("show ip fib"))
             if self.acl_active_table == 'ip6_out':
                 self.output_acl_set_interface(
                     self.pg0, self.acl_tbl_idx.get(self.acl_active_table), 0)
@@ -91,6 +87,12 @@ class TestClassifier(VppTestCase):
 
         super(TestClassifier, self).tearDown()
 
+    def show_commands_at_teardown(self):
+        self.logger.info(self.vapi.ppcli("show inacl type ip6"))
+        self.logger.info(self.vapi.ppcli("show outacl type ip6"))
+        self.logger.info(self.vapi.cli("show classify table verbose"))
+        self.logger.info(self.vapi.cli("show ip fib"))
+
     def create_stream(self, src_if, dst_if, packet_sizes,
                       proto_l=UDP(sport=1234, dport=5678)):
         """Create input packet stream for defined interfaces.
@@ -188,11 +190,18 @@ class TestClassifier(VppTestCase):
         :param int dst_port: destination port number "x"
         """
         if src_ip:
-            src_ip = binascii.hexlify(socket.inet_pton(
-                socket.AF_INET6, src_ip))
+            if sys.version_info[0] == 2:
+                src_ip = binascii.hexlify(socket.inet_pton(
+                    socket.AF_INET6, src_ip))
+            else:
+                src_ip = socket.inet_pton(socket.AF_INET6, src_ip).hex()
+
         if dst_ip:
-            dst_ip = binascii.hexlify(socket.inet_pton(
-                socket.AF_INET6, dst_ip))
+            if sys.version_info[0] == 2:
+                dst_ip = binascii.hexlify(socket.inet_pton(
+                    socket.AF_INET6, dst_ip))
+            else:
+                dst_ip = socket.inet_pton(socket.AF_INET6, dst_ip).hex()
 
         return ('{!s:0>14}{!s:0>34}{!s:0>32}{!s:0>4}{!s:0>4}'.format(
             hex(nh)[2:], src_ip, dst_ip, hex(src_port)[2:],