X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FIPv6Util.py;h=2a4704dff2ea27465ffba0605f96adecc7df8ff9;hp=437a7c0cbb085496c22294889ce5dd713d4957fd;hb=1813672eb9f6988046bc65167235ae37b088298c;hpb=cbd47fbe97945e9dc6584d08cd2266e3a7536a68

diff --git a/resources/libraries/python/IPv6Util.py b/resources/libraries/python/IPv6Util.py
index 437a7c0cbb..2a4704dff2 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)
@@ -99,9 +99,9 @@ class IPv6Util(object):
                 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(
@@ -111,18 +111,22 @@ class IPv6Util(object):
             n=node['host'], p=interface))
 
     @staticmethod
-    def add_ip_neighbor(node, interface, ip_address, mac_address):
+    def add_ip_neighbor(node, interface, ip_address, mac_address, vrf=None):
         """Add IP neighbor.
 
         :param node: VPP node to add ip neighbor.
         :param interface: Interface name or sw_if_index.
         :param ip_address: IP address.
         :param mac_address: MAC address.
+        :param vrf: VRF table ID (Optional).
         :type node: dict
         :type interface: str or int
         :type ip_address: str
         :type mac_address: str
+        :type vrf: int
         """
+        vrf = "vrf {}".format(vrf) if vrf else ''
+
         if isinstance(interface, basestring):
             sw_if_index = Topology.get_interface_sw_index(node, interface)
         else:
@@ -132,4 +136,5 @@ class IPv6Util(object):
             vat.vat_terminal_exec_cmd_from_template("add_ip_neighbor.vat",
                                                     sw_if_index=sw_if_index,
                                                     ip_address=ip_address,
-                                                    mac_address=mac_address)
+                                                    mac_address=mac_address,
+                                                    vrf=vrf)