FIX: Remove old restart sequence - Honeycomb

[csit.git] / resources / libraries / python / IPv6Util.py

diff --git a/resources/libraries/python/IPv6Util.py b/resources/libraries/python/IPv6Util.py
index 54196eb..f89d171 100644 (file)
--- a/resources/libraries/python/IPv6Util.py
+++ b/resources/libraries/python/IPv6Util.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
+# Copyright (c) 2018 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -37,7 +37,7 @@ class IPv6Util(object):
         :type count: int
         :type data_size: int
         :type timeout: int
-        :return: Number of lost packets.
+        :returns: Number of lost packets.
         :rtype: int
         """
         ssh = SSH()
@@ -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)
@@ -74,7 +74,7 @@ class IPv6Util(object):
         :type cnt: int
         :type size: int
         :type timeout: int
-        :return: Number of lost packets.
+        :returns: Number of lost packets.
         :rtype: int
         """
         dst_ip = IPv6Util.get_node_port_ipv6_address(dst_node, port, nodes_ip)
@@ -90,7 +90,7 @@ class IPv6Util(object):
         :type node: dict
         :type iface_key: str
         :type nodes_addr: dict
-        :return: IPv6 address string.
+        :returns: IPv6 address string.
         :rtype: str
         """
         interface = Topology.get_interface_name(node, iface_key)
@@ -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,22 +111,18 @@ class IPv6Util(object):
             n=node['host'], p=interface))
 
     @staticmethod
-    def add_ip_neighbor(node, interface, ip_address, mac_address, vrf=None):
+    def add_ip_neighbor(node, interface, ip_address, mac_address):
         """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:
@@ -136,5 +132,4 @@ 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,
-                                                    vrf=vrf)
+                                                    mac_address=mac_address)