Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
tests: refactor. Replace literal constant w/ named constant.
[vpp.git]
/
test
/
test_udp.py
diff --git
a/test/test_udp.py
b/test/test_udp.py
index
d0ad23f
..
c714f25
100644
(file)
--- a/
test/test_udp.py
+++ b/
test/test_udp.py
@@
-10,10
+10,20
@@
from scapy.layers.inet import IP, UDP
from scapy.layers.inet6 import IPv6
from scapy.contrib.mpls import MPLS
from scapy.layers.inet6 import IPv6
from scapy.contrib.mpls import MPLS
+NUM_PKTS = 67
+
class TestUdpEncap(VppTestCase):
""" UDP Encap Test Case """
class TestUdpEncap(VppTestCase):
""" UDP Encap Test Case """
+ @classmethod
+ def setUpClass(cls):
+ super(TestUdpEncap, cls).setUpClass()
+
+ @classmethod
+ def tearDownClass(cls):
+ super(TestUdpEncap, cls).tearDownClass()
+
def setUp(self):
super(TestUdpEncap, self).setUp()
def setUp(self):
super(TestUdpEncap, self).setUp()
@@
-85,7
+95,7
@@
class TestUdpEncap(VppTestCase):
#
# construct a UDP encap object through each of the peers
#
# construct a UDP encap object through each of the peers
- # v4 through the first two pee
a
rs, v6 through the second.
+ # v4 through the first two peers, v6 through the second.
#
udp_encap_0 = VppUdpEncap(self,
self.pg0.local_ip4,
#
udp_encap_0 = VppUdpEncap(self,
self.pg0.local_ip4,
@@
-156,12
+166,12
@@
class TestUdpEncap(VppTestCase):
IP(src="2.2.2.2", dst="1.1.0.1") /
UDP(sport=1234, dport=1234) /
Raw('\xa5' * 100))
IP(src="2.2.2.2", dst="1.1.0.1") /
UDP(sport=1234, dport=1234) /
Raw('\xa5' * 100))
- rx = self.send_and_expect(self.pg0, p_4o4*
65
, self.pg0)
+ rx = self.send_and_expect(self.pg0, p_4o4*
NUM_PKTS
, self.pg0)
for p in rx:
self.validate_outer4(p, udp_encap_0)
p = IP(p["UDP"].payload.load)
self.validate_inner4(p, p_4o4)
for p in rx:
self.validate_outer4(p, udp_encap_0)
p = IP(p["UDP"].payload.load)
self.validate_inner4(p, p_4o4)
- self.assertEqual(udp_encap_0.get_stats()['packets'],
65
)
+ self.assertEqual(udp_encap_0.get_stats()['packets'],
NUM_PKTS
)
#
# 4o6 encap
#
# 4o6 encap
@@
-171,12
+181,12
@@
class TestUdpEncap(VppTestCase):
IP(src="2.2.2.2", dst="1.1.2.1") /
UDP(sport=1234, dport=1234) /
Raw('\xa5' * 100))
IP(src="2.2.2.2", dst="1.1.2.1") /
UDP(sport=1234, dport=1234) /
Raw('\xa5' * 100))
- rx = self.send_and_expect(self.pg0, p_4o6*
65
, self.pg2)
+ rx = self.send_and_expect(self.pg0, p_4o6*
NUM_PKTS
, self.pg2)
for p in rx:
self.validate_outer6(p, udp_encap_2)
p = IP(p["UDP"].payload.load)
self.validate_inner4(p, p_4o6)
for p in rx:
self.validate_outer6(p, udp_encap_2)
p = IP(p["UDP"].payload.load)
self.validate_inner4(p, p_4o6)
- self.assertEqual(udp_encap_2.get_stats()['packets'],
65
)
+ self.assertEqual(udp_encap_2.get_stats()['packets'],
NUM_PKTS
)
#
# 6o4 encap
#
# 6o4 encap
@@
-186,12
+196,12
@@
class TestUdpEncap(VppTestCase):
IPv6(src="2001::100", dst="2001::1") /
UDP(sport=1234, dport=1234) /
Raw('\xa5' * 100))
IPv6(src="2001::100", dst="2001::1") /
UDP(sport=1234, dport=1234) /
Raw('\xa5' * 100))
- rx = self.send_and_expect(self.pg0, p_6o4*
65
, self.pg1)
+ rx = self.send_and_expect(self.pg0, p_6o4*
NUM_PKTS
, self.pg1)
for p in rx:
self.validate_outer4(p, udp_encap_1)
p = IPv6(p["UDP"].payload.load)
self.validate_inner6(p, p_6o4)
for p in rx:
self.validate_outer4(p, udp_encap_1)
p = IPv6(p["UDP"].payload.load)
self.validate_inner6(p, p_6o4)
- self.assertEqual(udp_encap_1.get_stats()['packets'],
65
)
+ self.assertEqual(udp_encap_1.get_stats()['packets'],
NUM_PKTS
)
#
# 6o6 encap
#
# 6o6 encap
@@
-201,12
+211,12
@@
class TestUdpEncap(VppTestCase):
IPv6(src="2001::100", dst="2001::3") /
UDP(sport=1234, dport=1234) /
Raw('\xa5' * 100))
IPv6(src="2001::100", dst="2001::3") /
UDP(sport=1234, dport=1234) /
Raw('\xa5' * 100))
- rx = self.send_and_expect(self.pg0, p_6o6*
65
, self.pg3)
+ rx = self.send_and_expect(self.pg0, p_6o6*
NUM_PKTS
, self.pg3)
for p in rx:
self.validate_outer6(p, udp_encap_3)
p = IPv6(p["UDP"].payload.load)
self.validate_inner6(p, p_6o6)
for p in rx:
self.validate_outer6(p, udp_encap_3)
p = IPv6(p["UDP"].payload.load)
self.validate_inner6(p, p_6o6)
- self.assertEqual(udp_encap_3.get_stats()['packets'],
65
)
+ self.assertEqual(udp_encap_3.get_stats()['packets'],
NUM_PKTS
)
#
# A route with an output label
#
# A route with an output label
@@
-225,12
+235,12
@@
class TestUdpEncap(VppTestCase):
IP(src="2.2.2.2", dst="1.1.2.22") /
UDP(sport=1234, dport=1234) /
Raw('\xa5' * 100))
IP(src="2.2.2.2", dst="1.1.2.22") /
UDP(sport=1234, dport=1234) /
Raw('\xa5' * 100))
- rx = self.send_and_expect(self.pg0, p_4omo4*
65
, self.pg1)
+ rx = self.send_and_expect(self.pg0, p_4omo4*
NUM_PKTS
, self.pg1)
for p in rx:
self.validate_outer4(p, udp_encap_1)
p = MPLS(p["UDP"].payload.load)
self.validate_inner4(p, p_4omo4, ttl=63)
for p in rx:
self.validate_outer4(p, udp_encap_1)
p = MPLS(p["UDP"].payload.load)
self.validate_inner4(p, p_4omo4, ttl=63)
- self.assertEqual(udp_encap_1.get_stats()['packets'],
130
)
+ self.assertEqual(udp_encap_1.get_stats()['packets'],
2*NUM_PKTS
)
class TestUDP(VppTestCase):
class TestUDP(VppTestCase):
@@
-240,6
+250,10
@@
class TestUDP(VppTestCase):
def setUpClass(cls):
super(TestUDP, cls).setUpClass()
def setUpClass(cls):
super(TestUDP, cls).setUpClass()
+ @classmethod
+ def tearDownClass(cls):
+ super(TestUDP, cls).tearDownClass()
+
def setUp(self):
super(TestUDP, self).setUp()
self.vapi.session_enable_disable(is_enabled=1)
def setUp(self):
super(TestUDP, self).setUp()
self.vapi.session_enable_disable(is_enabled=1)