X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FIPv6Util.py;h=1aab1816f258614c671f12b6690f84af8ee8ae6f;hb=7436d8bdf60bca9b80fb76781e1f709bbcd435da;hp=35ec8d5258a9260e4f470d2f4db55bbe9f5119f0;hpb=452fabf532691f88b36b79bf2469afde18183de2;p=csit.git

diff --git a/resources/libraries/python/IPv6Util.py b/resources/libraries/python/IPv6Util.py
index 35ec8d5258..1aab1816f2 100644
--- a/resources/libraries/python/IPv6Util.py
+++ b/resources/libraries/python/IPv6Util.py
@@ -46,7 +46,7 @@ class IPv6Util(object):
         cmd = "ping6 -c {c} -s {s} -W {W} {dst}".format(c=count, s=data_size,
                                                         W=timeout,
                                                         dst=dst_addr)
-        (ret_code, stdout, _) = ssh.exec_command(cmd)
+        (_, stdout, _) = ssh.exec_command(cmd)
 
         regex = re.compile(r'(\d+) packets transmitted, (\d+) received')
         match = regex.search(stdout)
@@ -81,26 +81,27 @@ class IPv6Util(object):
         return IPv6Util.ipv6_ping(src_node, dst_ip, cnt, size, timeout)
 
     @staticmethod
-    def get_node_port_ipv6_address(node, interface, nodes_addr):
+    def get_node_port_ipv6_address(node, iface_key, nodes_addr):
         """Return IPv6 address of the node port.
 
         :param node: Node in the topology.
-        :param interface: Interface name of the node.
+        :param iface_key: Interface key of the node.
         :param nodes_addr: Nodes IPv6 addresses.
         :type node: dict
-        :type interface: str
+        :type iface_key: str
         :type nodes_addr: dict
         :return: IPv6 address string.
         :rtype: str
         """
+        interface = Topology.get_interface_name(node, iface_key)
         for net in nodes_addr.values():
             for port in net['ports'].values():
                 host = port.get('node')
                 dev = port.get('if')
                 if host == node['host'] and dev == interface:
-                    ip = port.get('addr')
-                    if ip is not None:
-                        return ip
+                    ip_addr = port.get('addr')
+                    if ip_addr is not None:
+                        return ip_addr
                     else:
                         raise Exception(
                             'Node {n} port {p} IPv6 address is not set'.format(