ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ip: ip vrf tests python3 support

Browse Source 
Type: fix
Signed-off-by: Ole Troan <ot@cisco.com>
Change-Id: Ie23c9d2d7325be62ef33df2f0562ab41518f7bf4
This commit is contained in:
Ole Troan
2019-10-18 14:54:30 +02:00
committed by Neale Ranns
parent 5dc5fcf14c
commit 197573320d
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/test_ip4_vrf_multi_instance.py
View File

@ -108,7 +108,7 @@ class TestIp4VrfMultiInst(VppTestCase):
# Packet flows mapping pg0 -> pg1, pg2 etc. # Packet flows mapping pg0 -> pg1, pg2 etc.
cls.flows = dict() cls.flows = dict()
for i in range(len(cls.pg_interfaces)): for i in range(len(cls.pg_interfaces)):
multiplicand = i / cls.pg_ifs_per_vrf multiplicand = i // cls.pg_ifs_per_vrf
pg_list = [ pg_list = [
cls.pg_interfaces[multiplicand * cls.pg_ifs_per_vrf + j] cls.pg_interfaces[multiplicand * cls.pg_ifs_per_vrf + j]
for j in range(cls.pg_ifs_per_vrf) for j in range(cls.pg_ifs_per_vrf)
@ -351,12 +351,6 @@ class TestIp4VrfMultiInst(VppTestCase):
vrf_count += 1 vrf_count += 1
found = True found = True
break break
for host in pg_if.remote_hosts:
if scapy.compat.raw(addr) == \
scapy.compat.raw(host.ip4):
vrf_count += 1
found = True
break
if not vrf_exist and vrf_count == 0: if not vrf_exist and vrf_count == 0:
self.logger.info("IPv4 VRF ID %d is not configured" % vrf_id) self.logger.info("IPv4 VRF ID %d is not configured" % vrf_id)
return VRFState.not_configured return VRFState.not_configured

2
test/test_ip6_vrf_multi_instance.py
View File

@ -120,7 +120,7 @@ class TestIP6VrfMultiInst(VppTestCase):
# Packet flows mapping pg0 -> pg1, pg2 etc. # Packet flows mapping pg0 -> pg1, pg2 etc.
cls.flows = dict() cls.flows = dict()
for i in range(len(cls.pg_interfaces)): for i in range(len(cls.pg_interfaces)):
multiplicand = i / cls.pg_ifs_per_vrf multiplicand = i // cls.pg_ifs_per_vrf
pg_list = [ pg_list = [
cls.pg_interfaces[multiplicand * cls.pg_ifs_per_vrf + j] cls.pg_interfaces[multiplicand * cls.pg_ifs_per_vrf + j]
for j in range(cls.pg_ifs_per_vrf) for j in range(cls.pg_ifs_per_vrf)