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

VPP-1508: Python3 compatible print

Browse Source 
Change-Id: I7d2597f2a9589f2463e213da6ca67b1b7593095e
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
This commit is contained in:
Paul Vinciguerra
2018-11-28 19:06:41 -08:00
committed by Ole Trøan
parent a6fe463c1c
commit 661f91fe0a
6 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
test/test_acl_plugin_macip.py
View File

@ -1,4 +1,5 @@
#!/usr/bin/env python
from __future__ import print_function
"""ACL plugin - MACIP tests
"""
import binascii
@ -167,29 +168,29 @@ class MethodHolder(VppTestCase):
self.logger.info(self.vapi.ppcli("sh acl-plugin acl"))
self.logger.info(self.vapi.ppcli("sh acl-plugin interface"))
self.logger.info(self.vapi.ppcli("sh acl-plugin tables"))
# print self.vapi.ppcli("show interface address")
# print self.vapi.ppcli("show hardware")
# print self.vapi.ppcli("sh acl-plugin macip interface")
# print self.vapi.ppcli("sh acl-plugin macip acl")
# print(self.vapi.ppcli("show interface address"))
# print(self.vapi.ppcli("show hardware"))
# print(self.vapi.ppcli("sh acl-plugin macip interface"))
# print(self.vapi.ppcli("sh acl-plugin macip acl"))
self.delete_acls()
def macip_acl_dump_debug(self):
acls = self.vapi.macip_acl_dump()
if self.DEBUG:
for acl in acls:
print "ACL #"+str(acl.acl_index)
print("ACL #"+str(acl.acl_index))
for r in acl.r:
rule = "ACTION"
if r.is_permit == 1:
rule = "PERMIT"
elif r.is_permit == 0:
rule = "DENY "
print " IP6" if r.is_ipv6 else " IP4", \
rule, \
binascii.hexlify(r.src_mac), \
binascii.hexlify(r.src_mac_mask),\
unpack('<16B', r.src_ip_addr), \
r.src_ip_prefix_len
print(" IP6" if r.is_ipv6 else " IP4",
rule,
binascii.hexlify(r.src_mac),
binascii.hexlify(r.src_mac_mask),
unpack('<16B', r.src_ip_addr),
r.src_ip_prefix_len)
return acls
def create_rules(self, mac_type=EXACT_MAC, ip_type=EXACT_IP,
@ -569,22 +570,22 @@ class MethodHolder(VppTestCase):
# p_l3 = IPv6 if is_ip6 else IP
# if self.DEBUG:
# for p in stream:
# print p[Ether].src, p[Ether].dst, p[p_l3].src, p[p_l3].dst
# print(p[Ether].src, p[Ether].dst, p[p_l3].src, p[p_l3].dst)
#
# acls = self.macip_acl_dump_debug()
# TODO : verify
# for acl in acls:
# for r in acl.r:
# print binascii.hexlify(r.src_mac), \
# print(binascii.hexlify(r.src_mac), \
# binascii.hexlify(r.src_mac_mask),\
# unpack('<16B', r.src_ip_addr), \
# r.src_ip_prefix_len
# r.src_ip_prefix_len)
#
# for p in capture:
# print p[Ether].src, p[Ether].dst, p[p_l3].src, p[p_l3].dst
# data = p[Raw].load.split(':',1)[1]
# print p[p_l3].src, data
# print(p[Ether].src, p[Ether].dst, p[p_l3].src, p[p_l3].dst
# data = p[Raw].load.split(':',1)[1])
# print(p[p_l3].src, data)
def run_traffic(self, mac_type, ip_type, traffic, is_ip6, packets,
do_not_expected_capture=False, tags=None,

6
test/test_flowprobe.py
View File

@ -1,5 +1,5 @@
#!/usr/bin/env python
from __future__ import print_function
import binascii
import random
import socket
@ -215,11 +215,11 @@ class MethodHolder(VppTestCase):
data_set={1: 'octets', 2: 'packets'},
ip_ver='v4'):
if self.debug_print:
print capture[0].show()
print(capture[0].show())
if cflow.haslayer(Data):
data = decoder.decode_data_set(cflow.getlayer(Set))
if self.debug_print:
print data
print(data)
if ip_ver == 'v4':
ip_layer = capture[0][IP]
else:

3
test/test_p2p_ethernet.py
View File

@ -82,7 +82,8 @@ class P2PEthernetAPI(VppTestCase):
mactobinary(macs[i-1]),
i)
except Exception:
print "Failed to create subif %d %s" % (i, macs[i-1])
self.logger.info("Failed to create subif %d %s" % (
i, macs[i-1]))
raise
intfs = self.vapi.cli("show interface").split("\n")

1
test/test_srv6.py
View File

@ -2144,7 +2144,6 @@ class TestSRv6(VppTestCase):
compare_func(txed_packet, packet)
except:
print packet.command()
self.logger.error(ppp("Unexpected or invalid packet:", packet))
raise

1
test/test_srv6_ad.py
View File

@ -793,7 +793,6 @@ class TestSRv6(VppTestCase):
compare_func(txed_packet, packet)
except:
print packet.command()
self.logger.error(ppp("Unexpected or invalid packet:", packet))
raise

1
test/test_srv6_as.py
View File

@ -874,7 +874,6 @@ class TestSRv6(VppTestCase):
compare_func(txed_packet, packet)
except:
print packet.command()
self.logger.error(ppp("Unexpected or invalid packet:", packet))
raise