Use the local port for pipework container configuration to be the same name as the guest interface port generated through parsing the olt config map

Change-Id: If652d00697d43fc10928dfe8f429e30f5e2b82ad
diff --git a/src/test/setup/cord-test.py b/src/test/setup/cord-test.py
index 4fa409e..3cba9f9 100755
--- a/src/test/setup/cord-test.py
+++ b/src/test/setup/cord-test.py
@@ -149,7 +149,7 @@
             uplink = self.port_map[host_intf]['uplink']
             for port in ports:
                 guest_if = port
-                local_if = '{0}_{1}'.format(guest_if, port_num+1)
+                local_if = port #'{0}_{1}'.format(guest_if, port_num+1)
                 guest_ip = '{0}.{1}/24'.format(tester_intf_subnet, port_num+1)
                 ##Use pipeworks to configure container interfaces on host/bridge interfaces
                 pipework_cmd = 'pipework {0} -i {1} -l {2} {3} {4}'.format(host_intf, guest_if,
@@ -195,7 +195,7 @@
         for intf_host, ports in port_list:
             intf_type = cls.get_intf_type(intf_host)
             for port in ports:
-                local_if = '{0}_{1}'.format(port, port_num+1)
+                local_if = port #'{0}_{1}'.format(port, port_num+1)
                 if intf_type == 0:
                     if start_vlan != 0:
                         cmds = ('ip link del {}.{}'.format(intf_host, start_vlan),)