From: snaramre <snaramre@cisco.com>
Date: Wed, 16 Oct 2019 22:15:43 +0000 (+0000)
Subject: tests: python3 changes for span and aclplugin test
X-Git-Tag: v20.05-rc0~591
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=2bb7151daf3cf312804cd2242419017bad5af07a;p=vpp.git

tests: python3 changes for span and aclplugin test

Type: fix
Change-Id: Ia9f74f951f831cc5c9b5af863db1bb3f7a1a81ff
Signed-off-by: snaramre <snaramre@cisco.com>
---

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"
diff --git a/test/test_span.py b/test/test_span.py
index c67bc7b8587..3b31f6242e2 100644
--- a/test/test_span.py
+++ b/test/test_span.py
@@ -144,7 +144,7 @@ class TestSpan(VppTestCase):
 
         for i in range(0, self.pkts_per_burst):
             payload = "span test"
-            size = packet_sizes[(i / 2) % len(packet_sizes)]
+            size = packet_sizes[int((i / 2) % len(packet_sizes))]
             p = (Ether(src=src_if.local_mac, dst=dst_mac) /
                  IP(src=src_if.remote_ip4, dst=dst_if.remote_ip4) /
                  UDP(sport=10000 + src_if.sw_if_index * 1000 + i, dport=1234) /