aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorsnaramre <snaramre@cisco.com>2019-10-16 22:15:43 +0000
committerNaveen Joy <najoy@cisco.com>2019-10-17 15:20:44 -0700
commit2bb7151daf3cf312804cd2242419017bad5af07a (patch)
tree1a19dba22af19cd15cb8061601d54b98838906c6 /src
parent8a754f1a55fb16a4d42efd5c606e5a07b4afffe9 (diff)
tests: python3 changes for span and aclplugin test
Type: fix Change-Id: Ia9f74f951f831cc5c9b5af863db1bb3f7a1a81ff Signed-off-by: snaramre <snaramre@cisco.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/acl/test/test_acl_plugin.py10
-rw-r--r--src/plugins/acl/test/test_acl_plugin_macip.py4
2 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/acl/test/test_acl_plugin.py b/src/plugins/acl/test/test_acl_plugin.py
index 91f5ef0ec8e..a85414e440a 100644
--- a/src/plugins/acl/test/test_acl_plugin.py
+++ b/src/plugins/acl/test/test_acl_plugin.py
@@ -125,7 +125,7 @@ class TestACLplugin(VppTestCase):
count = 16
start = 0
n_int = len(cls.pg_interfaces)
- macs_per_if = count / n_int
+ macs_per_if = count // n_int
i = -1
for pg_if in cls.pg_interfaces:
i += 1
@@ -133,7 +133,7 @@ class TestACLplugin(VppTestCase):
end_nr = count + start if i == (n_int - 1) \
else macs_per_if * (i + 1) + start
hosts = cls.hosts_by_pg_idx[pg_if.sw_if_index]
- for j in range(start_nr, end_nr):
+ for j in range(int(start_nr), int(end_nr)):
host = Host(
"00:00:00:ff:%02x:%02x" % (pg_if.sw_if_index, j),
"172.17.1%02x.%u" % (pg_if.sw_if_index, j),
@@ -175,8 +175,8 @@ class TestACLplugin(VppTestCase):
% self.bd_id))
def create_rule(self, ip=0, permit_deny=0, ports=PORTS_ALL, proto=-1,
- s_prefix=0, s_ip='\x00\x00\x00\x00',
- d_prefix=0, d_ip='\x00\x00\x00\x00'):
+ s_prefix=0, s_ip=b'\x00\x00\x00\x00',
+ d_prefix=0, d_ip=b'\x00\x00\x00\x00'):
if proto == -1:
return
if ports == self.PORTS_ALL:
@@ -314,7 +314,7 @@ class TestACLplugin(VppTestCase):
dst_hosts = self.hosts_by_pg_idx[dst_if.sw_if_index]
n_int = len(dst_hosts) * len(src_hosts)
for i in range(0, n_int):
- dst_host = dst_hosts[i / len(src_hosts)]
+ dst_host = dst_hosts[int(i / len(src_hosts))]
src_host = src_hosts[i % len(src_hosts)]
pkt_info = self.create_packet_info(src_if, dst_if)
if ipv6 == 1:
diff --git a/src/plugins/acl/test/test_acl_plugin_macip.py b/src/plugins/acl/test/test_acl_plugin_macip.py
index 41735251792..31bc8e5478c 100644
--- a/src/plugins/acl/test/test_acl_plugin_macip.py
+++ b/src/plugins/acl/test/test_acl_plugin_macip.py
@@ -218,7 +218,7 @@ class MethodHolder(VppTestCase):
ip6 = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
prefix_len4 = 0
prefix_len6 = 0
- rules_count[(acl / 2) - 1] = 1
+ rules_count[int((acl / 2) - 1)] = 1
else:
prefix_len4 = 24
prefix_len6 = 64
@@ -235,7 +235,7 @@ class MethodHolder(VppTestCase):
ip = ip6 if is_ip6 else ip4
ip_len = prefix_len6 if is_ip6 else prefix_len4
- for i in range(0, rules_count[(acl / 2) - 1]):
+ for i in range(0, (rules_count[int((acl / 2) - 1)])):
src_mac += 16777217
if mac_type == self.WILD_MAC:
mac = "00:00:00:00:00:00"