[tests/vxlan]: Convert vnet_vxlan test to Python 3 (sonic-net#12540)

In an effort to move/convert PTF test scripts from Python 2 to 3, this PR converts vnet_vxlan.py.

Convert vnet_vxlan.py to Python 3 and move it to py3 directory
Update ptf_runner to pass is_python3 flag.

What is the motivation for this PR?
Move remaining Python 2 PTF script to Python 3.

How did you do it?
Use 2to3.

How did you verify/test it?
VXLAN (vnet_vxlan and vnet_route_leak) tests are skipped due to issue sonic-net#8374; However, migrating script to Python 3 does not impact the test case.

Any platform specific information?
Mellanox, Barefoot

Signed-off-by: sagummaraj@microsoft.com

Author: opcoder0

ansible/roles/test/files/ptftests/vnet_vxlan.py ansible/roles/test/files/ptftests/py3/vnet_vxlan.py

@@ -97,7 +97,7 @@ def getSrvInfo(self, vnet, ifname=''):
 
     def checkPeer(self, test):
         for peers in self.peering:
-            for key, peer in peers.items():
+            for key, peer in list(peers.items()):
                 if test['name'] == key:
                     ptest = dict(test)
                     ptest['name'] = peer
@@ -109,7 +109,7 @@ def checkPeer(self, test):
 
     def checklocal(self, graph, test):
         for routes in graph['vnet_local_routes']:
-            for name, rt_list in routes.items():
+            for name, rt_list in list(routes.items()):
                 if test['name'] == name.split('_')[0]:
                     if self.total_routes <= self.max_routes_wo_scaling:
                         for entry in rt_list:
@@ -124,7 +124,7 @@ def getPeerTest(self, test):
         peer_vnets = []
         peer_tests = []
         for peers in self.peering:
-            for key, peer in peers.items():
+            for key, peer in list(peers.items()):
                 if test['name'] == key:
                     peer_vnets.append(peer)
 
@@ -178,14 +178,14 @@ def addLocalTest(self, test, entry):
     def calculateTotalRoutes(self, graph):
         self.total_routes = 0
         for routes in graph['vnet_routes']:
-            for name, rt_list in routes.items():
+            for name, rt_list in list(routes.items()):
                 self.total_routes += len(rt_list)
                 for peers in graph['vnet_peers']:
-                    for key, peer in peers.items():
+                    for key, peer in list(peers.items()):
                         if name.split('_')[0] == key:
                             self.total_routes += len(rt_list)
                 for l_routes in graph['vnet_local_routes']:
-                    for l_name, l_rt_list in l_routes.items():
+                    for l_name, l_rt_list in list(l_routes.items()):
                         if name == l_name:
                             self.total_routes += len(l_rt_list)
 
@@ -222,7 +222,7 @@ def setUp(self):
 
         self.pc_info = []
         self.net_ports = []
-        for name, val in graph['minigraph_portchannels'].items():
+        for name, val in list(graph['minigraph_portchannels'].items()):
             members = [graph['minigraph_port_indices'][member]
                        for member in val['members']]
             self.net_ports.extend(members)
@@ -239,7 +239,7 @@ def setUp(self):
             self.pc_info.append((ip, members))
 
         self.acc_ports = []
-        for name, data in graph['minigraph_vlans'].items():
+        for name, data in list(graph['minigraph_vlans'].items()):
             ports = [graph['minigraph_port_indices'][member]
                      for member in data['members'][1:]]
             self.acc_ports.extend(ports)
@@ -278,7 +278,7 @@ def setUp(self):
 
         self.tests = []
         for routes in graph['vnet_routes']:
-            for name, rt_list in routes.items():
+            for name, rt_list in list(routes.items()):
                 if self.total_routes <= self.max_routes_wo_scaling:
                     for entry in rt_list:
                         self.addTest(graph, name, entry)
@@ -345,9 +345,9 @@ def runTest(self):
         if not self.vxlan_enabled:
             return
 
-        print
+        print()
         for test in self.tests:
-            print(test['name'])
+            print((test['name']))
             self.FromServer(test)
             print("  FromServer passed")
             self.FromVM(test)
@@ -527,7 +527,7 @@ def FromServer(self, test):
             self.packets.append((test['port'], str(pkt).encode("base64")))
 
         finally:
-            print
+            print()
 
     def Serv2Serv(self, test):
         try:
@@ -589,4 +589,4 @@ def Serv2Serv(self, test):
                 self.packets.append((test['port'], str(pkt).encode("base64")))
 
         finally:
-            print
+            print()

tests/vxlan/test_vnet_vxlan.py

@@ -246,15 +246,17 @@ def test_vnet_vxlan(setup, vxlan_status, duthosts, rand_one_dut_hostname, ptfhos
                        platform_dir="ptftests",
                        params=ptf_params,
                        qlen=1000,
-                       log_file=log_file)
+                       log_file=log_file,
+                       is_python3=True)
     else:
         ptf_runner(ptfhost,
                    "ptftests",
                    "vnet_vxlan.VNET",
                    platform_dir="ptftests",
                    params=ptf_params,
                    qlen=1000,
-                   log_file=log_file)
+                   log_file=log_file,
+                   is_python3=True)
 
 
 def get_expected_flow_counter_packets_number(vnet_json_data):