Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
L2 BD: introduce a BD interface on which to send UU packets
[vpp.git]
/
test
/
test_acl_plugin_l2l3.py
diff --git
a/test/test_acl_plugin_l2l3.py
b/test/test_acl_plugin_l2l3.py
index
97675d4
..
66d053f
100644
(file)
--- a/
test/test_acl_plugin_l2l3.py
+++ b/
test/test_acl_plugin_l2l3.py
@@
-36,6
+36,7
@@
from scapy.layers.inet6 import ICMPv6EchoReply, IPv6ExtHdrRouting
from scapy.layers.inet6 import IPv6ExtHdrFragment
from framework import VppTestCase, VppTestRunner
from scapy.layers.inet6 import IPv6ExtHdrFragment
from framework import VppTestCase, VppTestRunner
+from vpp_papi_provider import L2_PORT_TYPE
import time
import time
@@
-60,7
+61,7
@@
class TestIpIrb(VppTestCase):
# create 3 pg interfaces, 1 loopback interface
cls.create_pg_interfaces(range(3))
# create 3 pg interfaces, 1 loopback interface
cls.create_pg_interfaces(range(3))
- cls.create_loopback_interfaces(
range(1)
)
+ cls.create_loopback_interfaces(
1
)
cls.interfaces = list(cls.pg_interfaces)
cls.interfaces.extend(cls.lo_interfaces)
cls.interfaces = list(cls.pg_interfaces)
cls.interfaces.extend(cls.lo_interfaces)
@@
-70,7
+71,8
@@
class TestIpIrb(VppTestCase):
# Create BD with MAC learning enabled and put interfaces to this BD
cls.vapi.sw_interface_set_l2_bridge(
# Create BD with MAC learning enabled and put interfaces to this BD
cls.vapi.sw_interface_set_l2_bridge(
- cls.loop0.sw_if_index, bd_id=cls.bd_id, bvi=1)
+ cls.loop0.sw_if_index, bd_id=cls.bd_id,
+ port_type=L2_PORT_TYPE.BVI)
cls.vapi.sw_interface_set_l2_bridge(
cls.pg0.sw_if_index, bd_id=cls.bd_id)
cls.vapi.sw_interface_set_l2_bridge(
cls.vapi.sw_interface_set_l2_bridge(
cls.pg0.sw_if_index, bd_id=cls.bd_id)
cls.vapi.sw_interface_set_l2_bridge(
@@
-346,7
+348,7
@@
class TestIpIrb(VppTestCase):
all_rules = []
for old_acl in orig_acls:
for rule in old_acl.r:
all_rules = []
for old_acl in orig_acls:
for rule in old_acl.r:
- all_rules.append(dict(
vars(rule
)))
+ all_rules.append(dict(
rule._asdict(
)))
# Add a few ACLs made from shuffled rules
shuffle(all_rules)
# Add a few ACLs made from shuffled rules
shuffle(all_rules)