API: Use string type instead of u8.

[vpp.git] / test / test_reassembly.py

diff --git a/test/test_reassembly.py b/test/test_reassembly.py
index d7cc627..0c11d9b 100644 (file)
--- a/test/test_reassembly.py
+++ b/test/test_reassembly.py
@@ -1,8 +1,11 @@
 #!/usr/bin/env python
+
+import six
 import unittest
 from random import shuffle
 
-from framework import VppTestCase, VppTestRunner
+from framework import VppTestCase, VppTestRunner, is_skip_aarch64_set,\
+    is_platform_aarch64
 
 from scapy.packet import Raw
 from scapy.layers.l2 import Ether, GRE
@@ -77,7 +80,7 @@ class TestIPv4Reassembly(VppTestCase):
     def create_fragments(cls):
         infos = cls._packet_infos
         cls.pkt_infos = []
-        for index, info in infos.iteritems():
+        for index, info in six.iteritems(infos):
             p = info.data
             # cls.logger.debug(ppp("Packet:", p.__class__(str(p))))
             fragments_400 = fragment_rfc791(p, 400)
@@ -175,6 +178,8 @@ class TestIPv4Reassembly(VppTestCase):
         self.verify_capture(packets)
         self.src_if.assert_nothing_captured()
 
+    @unittest.skipIf(is_skip_aarch64_set() and is_platform_aarch64(),
+                     "test doesn't work on aarch64")
     def test_random(self):
         """ random order reassembly """
 
@@ -414,7 +419,7 @@ class TestIPv6Reassembly(VppTestCase):
     def create_fragments(cls):
         infos = cls._packet_infos
         cls.pkt_infos = []
-        for index, info in infos.iteritems():
+        for index, info in six.iteritems(infos):
             p = info.data
             # cls.logger.debug(ppp("Packet:", p.__class__(str(p))))
             fragments_400 = fragment_rfc8200(p, info.index, 400)
@@ -805,7 +810,7 @@ class TestIPv4ReassemblyLocalNode(VppTestCase):
     def create_fragments(cls):
         infos = cls._packet_infos
         cls.pkt_infos = []
-        for index, info in infos.iteritems():
+        for index, info in six.iteritems(infos):
             p = info.data
             # cls.logger.debug(ppp("Packet:", p.__class__(str(p))))
             fragments_300 = fragment_rfc791(p, 300)
@@ -984,7 +989,7 @@ class TestFIFReassembly(VppTestCase):
             self.extend_packet(p, size, self.padding)
             info.data = p[IP]  # use only IP part, without ethernet header
 
-        fragments = [x for _, p in self._packet_infos.iteritems()
+        fragments = [x for _, p in six.iteritems(self._packet_infos)
                      for x in fragment_rfc791(p.data, 400)]
 
         encapped_fragments = \
@@ -1050,7 +1055,7 @@ class TestFIFReassembly(VppTestCase):
             self.extend_packet(p, size, self.padding)
             info.data = p[IPv6]  # use only IPv6 part, without ethernet header
 
-        fragments = [x for _, i in self._packet_infos.iteritems()
+        fragments = [x for _, i in six.iteritems(self._packet_infos)
                      for x in fragment_rfc8200(
                          i.data, i.index, 400)]