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_pipe.py
diff --git
a/test/test_pipe.py
b/test/test_pipe.py
index
6a0b4a0
..
20e6d2a
100644
(file)
--- a/
test/test_pipe.py
+++ b/
test/test_pipe.py
@@
-10,6
+10,8
@@
from framework import VppTestCase, VppTestRunner
from vpp_interface import VppInterface
from vpp_ip_route import VppIpTable, VppIpRoute, VppRoutePath
from vpp_interface import VppInterface
from vpp_ip_route import VppIpTable, VppIpRoute, VppRoutePath
+NUM_PKTS = 67
+
class VppPipe(VppInterface):
"""
class VppPipe(VppInterface):
"""
@@
-114,8
+116,8
@@
class TestPipe(VppTestCase):
UDP(sport=1234, dport=1234) /
Raw('\xa5' * 100))
UDP(sport=1234, dport=1234) /
Raw('\xa5' * 100))
- self.send_and_expect(self.pg0, p *
65
, self.pg1)
- self.send_and_expect(self.pg1, p *
65
, self.pg0)
+ self.send_and_expect(self.pg0, p *
NUM_PKTS
, self.pg1)
+ self.send_and_expect(self.pg1, p *
NUM_PKTS
, self.pg0)
#
# Attach ACL to ensure features are run on the pipe
#
# Attach ACL to ensure features are run on the pipe
@@
-138,8
+140,8
@@
class TestPipe(VppTestCase):
self.vapi.acl_interface_set_acl_list(pipes[0].east,
0,
[acl.acl_index])
self.vapi.acl_interface_set_acl_list(pipes[0].east,
0,
[acl.acl_index])
- self.send_and_assert_no_replies(self.pg0, p *
65
)
- self.send_and_expect(self.pg1, p *
65
, self.pg0)
+ self.send_and_assert_no_replies(self.pg0, p *
NUM_PKTS
)
+ self.send_and_expect(self.pg1, p *
NUM_PKTS
, self.pg0)
# remove from output and apply on input
self.vapi.acl_interface_set_acl_list(pipes[0].east,
# remove from output and apply on input
self.vapi.acl_interface_set_acl_list(pipes[0].east,
@@
-148,13
+150,13
@@
class TestPipe(VppTestCase):
self.vapi.acl_interface_set_acl_list(pipes[0].west,
1,
[acl.acl_index])
self.vapi.acl_interface_set_acl_list(pipes[0].west,
1,
[acl.acl_index])
- self.send_and_assert_no_replies(self.pg0, p *
65
)
- self.send_and_expect(self.pg1, p *
65
, self.pg0)
+ self.send_and_assert_no_replies(self.pg0, p *
NUM_PKTS
)
+ self.send_and_expect(self.pg1, p *
NUM_PKTS
, self.pg0)
self.vapi.acl_interface_set_acl_list(pipes[0].west,
0,
[])
self.vapi.acl_interface_set_acl_list(pipes[0].west,
0,
[])
- self.send_and_expect(self.pg0, p *
65
, self.pg1)
- self.send_and_expect(self.pg1, p *
65
, self.pg0)
+ self.send_and_expect(self.pg0, p *
NUM_PKTS
, self.pg1)
+ self.send_and_expect(self.pg1, p *
NUM_PKTS
, self.pg0)
#
# L3 routes in two separate tables so a pipe can be used to L3
#
# L3 routes in two separate tables so a pipe can be used to L3
@@
-205,13
+207,13
@@
class TestPipe(VppTestCase):
self.vapi.sw_interface_set_table(pipes[1].east, 0, 1)
# IP is not enabled on the pipes at this point
self.vapi.sw_interface_set_table(pipes[1].east, 0, 1)
# IP is not enabled on the pipes at this point
- self.send_and_assert_no_replies(self.pg2, p_east *
65
)
+ self.send_and_assert_no_replies(self.pg2, p_east *
NUM_PKTS
)
# IP enable the Pipes by making them unnumbered
pipes[0].set_unnumbered(self.pg2.sw_if_index)
pipes[1].set_unnumbered(self.pg3.sw_if_index)
# IP enable the Pipes by making them unnumbered
pipes[0].set_unnumbered(self.pg2.sw_if_index)
pipes[1].set_unnumbered(self.pg3.sw_if_index)
- self.send_and_expect(self.pg2, p_east *
65
, self.pg3)
+ self.send_and_expect(self.pg2, p_east *
NUM_PKTS
, self.pg3)
# and the return path
p_west = (Ether(src=self.pg3.remote_mac,
# and the return path
p_west = (Ether(src=self.pg3.remote_mac,
@@
-220,7
+222,7
@@
class TestPipe(VppTestCase):
dst="1.1.1.2") /
UDP(sport=1234, dport=1234) /
Raw('\xa5' * 100))
dst="1.1.1.2") /
UDP(sport=1234, dport=1234) /
Raw('\xa5' * 100))
- self.send_and_expect(self.pg3, p_west *
65
, self.pg2)
+ self.send_and_expect(self.pg3, p_west *
NUM_PKTS
, self.pg2)
#
# Use ACLs to test features run on the Pipes
#
# Use ACLs to test features run on the Pipes
@@
-228,8
+230,8
@@
class TestPipe(VppTestCase):
self.vapi.acl_interface_set_acl_list(pipes[1].east,
0,
[acl.acl_index])
self.vapi.acl_interface_set_acl_list(pipes[1].east,
0,
[acl.acl_index])
- self.send_and_assert_no_replies(self.pg2, p_east *
65
)
- self.send_and_expect(self.pg3, p_west *
65
, self.pg2)
+ self.send_and_assert_no_replies(self.pg2, p_east *
NUM_PKTS
)
+ self.send_and_expect(self.pg3, p_west *
NUM_PKTS
, self.pg2)
# remove from output and apply on input
self.vapi.acl_interface_set_acl_list(pipes[1].east,
# remove from output and apply on input
self.vapi.acl_interface_set_acl_list(pipes[1].east,
@@
-238,13
+240,13
@@
class TestPipe(VppTestCase):
self.vapi.acl_interface_set_acl_list(pipes[1].west,
1,
[acl.acl_index])
self.vapi.acl_interface_set_acl_list(pipes[1].west,
1,
[acl.acl_index])
- self.send_and_assert_no_replies(self.pg2, p_east *
65
)
- self.send_and_expect(self.pg3, p_west *
65
, self.pg2)
+ self.send_and_assert_no_replies(self.pg2, p_east *
NUM_PKTS
)
+ self.send_and_expect(self.pg3, p_west *
NUM_PKTS
, self.pg2)
self.vapi.acl_interface_set_acl_list(pipes[1].west,
0,
[])
self.vapi.acl_interface_set_acl_list(pipes[1].west,
0,
[])
- self.send_and_expect(self.pg2, p_east *
65
, self.pg3)
- self.send_and_expect(self.pg3, p_west *
65
, self.pg2)
+ self.send_and_expect(self.pg2, p_east *
NUM_PKTS
, self.pg3)
+ self.send_and_expect(self.pg3, p_west *
NUM_PKTS
, self.pg2)
# cleanup (so the tables delete)
self.pg2.unconfig_ip4()
# cleanup (so the tables delete)
self.pg2.unconfig_ip4()