Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
GBP: contracts API fixed length of allowed ethertypes
[vpp.git]
/
test
/
test_gbp.py
diff --git
a/test/test_gbp.py
b/test/test_gbp.py
index
4304303
..
cf9ad25
100644
(file)
--- a/
test/test_gbp.py
+++ b/
test/test_gbp.py
@@
-461,6
+461,8
@@
class VppGbpContract(VppObject):
self.dst_epg = dst_epg
self.rules = rules
self.allowed_ethertypes = allowed_ethertypes
self.dst_epg = dst_epg
self.rules = rules
self.allowed_ethertypes = allowed_ethertypes
+ while (len(self.allowed_ethertypes) < 16):
+ self.allowed_ethertypes.append(0)
def add_vpp_config(self):
rules = []
def add_vpp_config(self):
rules = []
@@
-481,7
+483,8
@@
class VppGbpContract(VppObject):
self.src_epg.sclass,
self.dst_epg.sclass,
self.acl_index,
self.src_epg.sclass,
self.dst_epg.sclass,
self.acl_index,
- [], [])
+ [],
+ self.allowed_ethertypes)
def __str__(self):
return self.object_id()
def __str__(self):
return self.object_id()
@@
-545,8
+548,8
@@
class VppGbpAcl(VppObject):
self.acl_index = 4294967295
def create_rule(self, is_ipv6=0, permit_deny=0, proto=-1,
self.acl_index = 4294967295
def create_rule(self, is_ipv6=0, permit_deny=0, proto=-1,
- s_prefix=0, s_ip='\x00\x00\x00\x00', sport_from=0,
- sport_to=65535, d_prefix=0, d_ip='\x00\x00\x00\x00',
+ s_prefix=0, s_ip=
b
'\x00\x00\x00\x00', sport_from=0,
+ sport_to=65535, d_prefix=0, d_ip=
b
'\x00\x00\x00\x00',
dport_from=0, dport_to=65535):
if proto == -1 or proto == 0:
sport_to = 0
dport_from=0, dport_to=65535):
if proto == -1 or proto == 0:
sport_to = 0
@@
-569,7
+572,7
@@
class VppGbpAcl(VppObject):
reply = self._test.vapi.acl_add_replace(self.acl_index,
r=rules,
reply = self._test.vapi.acl_add_replace(self.acl_index,
r=rules,
- tag='GBPTest')
+ tag=
b
'GBPTest')
self.acl_index = reply.acl_index
return self.acl_index
self.acl_index = reply.acl_index
return self.acl_index
@@
-1977,9
+1980,9
@@
class TestGBP(VppTestCase):
#
vlan_11 = VppDot1QSubint(self, self.pg0, 11)
vlan_11.admin_up()
#
vlan_11 = VppDot1QSubint(self, self.pg0, 11)
vlan_11.admin_up()
- self.vapi.l2_interface_vlan_tag_rewrite(
vlan_11.sw_if_index,
-
L2_VTR_OP.L2_POP_1,
-
11)
+ self.vapi.l2_interface_vlan_tag_rewrite(
+
sw_if_index=vlan_11.sw_if_index, vtr_op=
L2_VTR_OP.L2_POP_1,
+
push_dot1q=
11)
bd_uu_fwd = VppVxlanGbpTunnel(self, self.pg3.local_ip4,
self.pg3.remote_ip4, 116)
bd_uu_fwd = VppVxlanGbpTunnel(self, self.pg3.local_ip4,
self.pg3.remote_ip4, 116)
@@
-3207,7
+3210,7
@@
class TestGBP(VppTestCase):
vx_tun_l3.add_vpp_config()
#
vx_tun_l3.add_vpp_config()
#
- # packets destined to unkown addresses in the BVI's subnet
+ # packets destined to unk
n
own addresses in the BVI's subnet
# are ARP'd for
#
p4 = (Ether(src=self.pg0.remote_mac, dst=str(self.router_mac)) /
# are ARP'd for
#
p4 = (Ether(src=self.pg0.remote_mac, dst=str(self.router_mac)) /