Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
nat: use correct data types for memory sizes
[vpp.git]
/
test
/
test_ip6.py
diff --git
a/test/test_ip6.py
b/test/test_ip6.py
index
f4b9ef8
..
63d3e41
100644
(file)
--- a/
test/test_ip6.py
+++ b/
test/test_ip6.py
@@
-1,5
+1,6
@@
#!/usr/bin/env python3
#!/usr/bin/env python3
+import socket
from socket import inet_pton, inet_ntop
import unittest
from socket import inet_pton, inet_ntop
import unittest
@@
-28,6
+29,7
@@
from vpp_ip_route import VppIpRoute, VppRoutePath, find_route, VppIpMRoute, \
from vpp_neighbor import find_nbr, VppNeighbor
from vpp_pg_interface import is_ipv6_misc
from vpp_sub_interface import VppSubInterface, VppDot1QSubint
from vpp_neighbor import find_nbr, VppNeighbor
from vpp_pg_interface import is_ipv6_misc
from vpp_sub_interface import VppSubInterface, VppDot1QSubint
+from vpp_policer import VppPolicer
from ipaddress import IPv6Network, IPv6Address
AF_INET6 = socket.AF_INET6
from ipaddress import IPv6Network, IPv6Address
AF_INET6 = socket.AF_INET6
@@
-959,7
+961,7
@@
class TestIPv6(TestIPv6ND):
subitf.admin_up()
subitf.config_ip6()
subitf.admin_up()
subitf.config_ip6()
- rxs = self.pg1._get_capture(timeout=
2
, filter_out_fn=None)
+ rxs = self.pg1._get_capture(timeout=
4
, filter_out_fn=None)
#
# hunt for the MLD on vlan 99
#
# hunt for the MLD on vlan 99
@@
-2118,8
+2120,8
@@
class TestIP6Punt(VppTestCase):
#
# add a policer
#
#
# add a policer
#
- policer =
self.vapi.policer_add_del(b"ip6-punt", 400, 0, 10, 0,
-
rate_type=1
)
+ policer =
VppPolicer(self, "ip6-punt", 400, 0, 10, 0, rate_type=1)
+
policer.add_vpp_config(
)
self.vapi.ip_punt_police(policer.policer_index, is_ip6=1)
self.vapi.cli("clear trace")
self.vapi.ip_punt_police(policer.policer_index, is_ip6=1)
self.vapi.cli("clear trace")
@@
-2139,8
+2141,7
@@
class TestIP6Punt(VppTestCase):
# remove the policer. back to full rx
#
self.vapi.ip_punt_police(policer.policer_index, is_add=0, is_ip6=1)
# remove the policer. back to full rx
#
self.vapi.ip_punt_police(policer.policer_index, is_add=0, is_ip6=1)
- self.vapi.policer_add_del(b"ip6-punt", 400, 0, 10, 0,
- rate_type=1, is_add=0)
+ policer.remove_vpp_config()
self.send_and_expect(self.pg0, pkts, self.pg1)
#
self.send_and_expect(self.pg0, pkts, self.pg1)
#