X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FIPv6Setup.py;h=94c95e552fbf543f69e7bae29a8d008eb3a2d35d;hp=2c68c338e23a818713c0cc064219ebe18aca89ca;hb=39b4a07718ecab94ea331362edb62dfcf678bd09;hpb=cbd47fbe97945e9dc6584d08cd2266e3a7536a68

diff --git a/resources/libraries/python/IPv6Setup.py b/resources/libraries/python/IPv6Setup.py
index 2c68c338e2..94c95e552f 100644
--- a/resources/libraries/python/IPv6Setup.py
+++ b/resources/libraries/python/IPv6Setup.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:
@@ -40,9 +40,9 @@ class IPv6Networks(object):
     def next_network(self):
         """Get the next element of the iterator.
 
-        :return: IPv6 network.
+        :returns: IPv6 network.
         :rtype: IPv6Network object
-        :raises: StopIteration if there is no more elements.
+        :raises StopIteration: If there is no more elements.
         """
         if len(self._networks):
             return self._networks.pop()
@@ -63,7 +63,7 @@ class IPv6Setup(object):
         :param nodes_addr: Available nodes IPv6 addresses.
         :type nodes: dict
         :type nodes_addr: dict
-        :return: Affected interfaces as list of (node, interface) tuples.
+        :returns: Affected interfaces as list of (node, interface) tuples.
         :rtype: list
         """
         interfaces = []
@@ -169,7 +169,6 @@ class IPv6Setup(object):
         :type addr: str
         :type prefix: str
         """
-        topo = Topology()
         sw_if_index = Topology.get_interface_sw_index(node, iface_key)
         with VatTerminal(node) as vat:
             vat.vat_terminal_exec_cmd_from_template('add_ip_address.vat',
@@ -212,27 +211,6 @@ class IPv6Setup(object):
                                                     sw_if_index=sw_if_index,
                                                     state='admin-down')
 
-
-    @staticmethod
-    def vpp_set_ipv6_neighbor(node, interface, ipaddr, macaddr):
-        """Set IPv6 neighbor.
-
-           :param node: VPP node.
-           :param interface: Interface name.
-           :param ip_address: IPv6 address.
-           :param mac_address: mac address.
-           :type node: dict
-           :type interface: str
-           :type ip_address: str
-           :type mac_address: str
-        """
-        sw_if_index = Topology.get_interface_sw_index(node, interface)
-        VatExecutor.cmd_from_template(node,
-                                      'add_ip_neighbor.vat',
-                                      sw_if_index=sw_if_index,
-                                      ip_address=ipaddr,
-                                      mac_address=macaddr)
-
     @staticmethod
     def vpp_ra_suppress_link_layer(node, interface):
         """Suppress ICMPv6 router advertisement message for link scope address.
@@ -287,7 +265,7 @@ class IPv6Setup(object):
         :param nodes_addr: Available nodes IPv6 addresses.
         :type link: str
         :type nodes_addr: dict
-        :return: Link IPv6 address.
+        :returns: Link IPv6 address.
         :rtype: str
         """
         net = nodes_addr.get(link)
@@ -303,7 +281,7 @@ class IPv6Setup(object):
         :param nodes_addr: Available nodes IPv6 addresses.
         :type link: str
         :type nodes_addr: dict
-        :return: Link IPv6 address prefix.
+        :returns: Link IPv6 address prefix.
         :rtype: int
         """
         net = nodes_addr.get(link)