From: pmikus <pmikus@cisco.com>
Date: Fri, 22 Jul 2016 06:28:46 +0000 (+0100)
Subject: PATCH: Fix add ip neigbour in IPV6 libraries
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=9c8743594ac51c51ac14b6b80c9806a79ada0753;hp=5d2ce55a8641a030ec6984089c51aa9313f46af1

PATCH: Fix add ip neigbour in IPV6 libraries

- fix vrf key error for IPv6 performance library

Change-Id: I3b80d350b3a524bcdea76012c717edbecff9c154
Signed-off-by: pmikus <pmikus@cisco.com>
---

diff --git a/resources/libraries/python/IPv6Setup.py b/resources/libraries/python/IPv6Setup.py
index 2c68c338e2..25e8c47ec5 100644
--- a/resources/libraries/python/IPv6Setup.py
+++ b/resources/libraries/python/IPv6Setup.py
@@ -212,27 +212,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.
diff --git a/resources/libraries/robot/performance.robot b/resources/libraries/robot/performance.robot
index 9a5f629b90..8bc0dbec24 100644
--- a/resources/libraries/robot/performance.robot
+++ b/resources/libraries/robot/performance.robot
@@ -317,14 +317,10 @@
 | | VPP Set If IPv6 Addr | ${dut2} | ${dut2_if1} | 2001:3::2 | ${prefix}
 | | VPP Set If IPv6 Addr | ${dut2} | ${dut2_if2} | 2001:2::1 | ${prefix}
 | | Vpp nodes ra suppress link layer | ${nodes}
-| | Vpp set IPv6 neighbor | ${dut1} | ${dut1_if1} | 2001:1::2
-| | ...                    | ${tg1_if1_mac}
-| | Vpp set IPv6 neighbor | ${dut2} | ${dut2_if2} | 2001:2::2
-| | ...                    | ${tg1_if2_mac}
-| | Vpp set IPv6 neighbor | ${dut1} | ${dut1_if2} | 2001:3::2
-| | ...                    | ${dut2_if1_mac}
-| | Vpp set IPv6 neighbor | ${dut2} | ${dut2_if1} | 2001:3::1
-| | ...                    | ${dut1_if2_mac}
+| | Add Ip Neighbor | ${dut1} | ${dut1_if1} | 2001:1::2 | ${tg1_if1_mac}
+| | Add Ip Neighbor | ${dut2} | ${dut2_if2} | 2001:2::2 | ${tg1_if2_mac}
+| | Add Ip Neighbor | ${dut1} | ${dut1_if2} | 2001:3::2 | ${dut2_if1_mac}
+| | Add Ip Neighbor | ${dut2} | ${dut2_if1} | 2001:3::1 | ${dut1_if2_mac}
 | | Vpp Route Add | ${dut1} | 2001:2::0 | ${prefix} | 2001:3::2 | ${dut1_if2}
 | | Vpp Route Add | ${dut2} | 2001:1::0 | ${prefix} | 2001:3::1 | ${dut2_if1}