Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
VPP-1508 python3 tests: use six.iteritems
[vpp.git]
/
test
/
test_reassembly.py
diff --git
a/test/test_reassembly.py
b/test/test_reassembly.py
index
d7cc627
..
95fefdb
100644
(file)
--- a/
test/test_reassembly.py
+++ b/
test/test_reassembly.py
@@
-1,4
+1,6
@@
#!/usr/bin/env python
#!/usr/bin/env python
+
+import six
import unittest
from random import shuffle
import unittest
from random import shuffle
@@
-77,7
+79,7
@@
class TestIPv4Reassembly(VppTestCase):
def create_fragments(cls):
infos = cls._packet_infos
cls.pkt_infos = []
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)
p = info.data
# cls.logger.debug(ppp("Packet:", p.__class__(str(p))))
fragments_400 = fragment_rfc791(p, 400)
@@
-414,7
+416,7
@@
class TestIPv6Reassembly(VppTestCase):
def create_fragments(cls):
infos = cls._packet_infos
cls.pkt_infos = []
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)
p = info.data
# cls.logger.debug(ppp("Packet:", p.__class__(str(p))))
fragments_400 = fragment_rfc8200(p, info.index, 400)
@@
-805,7
+807,7
@@
class TestIPv4ReassemblyLocalNode(VppTestCase):
def create_fragments(cls):
infos = cls._packet_infos
cls.pkt_infos = []
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)
p = info.data
# cls.logger.debug(ppp("Packet:", p.__class__(str(p))))
fragments_300 = fragment_rfc791(p, 300)
@@
-984,7
+986,7
@@
class TestFIFReassembly(VppTestCase):
self.extend_packet(p, size, self.padding)
info.data = p[IP] # use only IP part, without ethernet header
self.extend_packet(p, size, self.padding)
info.data = p[IP] # use only IP part, without ethernet header
- fragments = [x for _, p in s
elf._packet_infos.iteritems(
)
+ fragments = [x for _, p in s
ix.iteritems(self._packet_infos
)
for x in fragment_rfc791(p.data, 400)]
encapped_fragments = \
for x in fragment_rfc791(p.data, 400)]
encapped_fragments = \
@@
-1050,7
+1052,7
@@
class TestFIFReassembly(VppTestCase):
self.extend_packet(p, size, self.padding)
info.data = p[IPv6] # use only IPv6 part, without ethernet header
self.extend_packet(p, size, self.padding)
info.data = p[IPv6] # use only IPv6 part, without ethernet header
- fragments = [x for _, i in s
elf._packet_infos.iteritems(
)
+ fragments = [x for _, i in s
ix.iteritems(self._packet_infos
)
for x in fragment_rfc8200(
i.data, i.index, 400)]
for x in fragment_rfc8200(
i.data, i.index, 400)]