From 933f6fd1af59ffede0f1e51ca67b6913fb9a27e8 Mon Sep 17 00:00:00 2001
From: Neale Ranns <nranns@cisco.com>
Date: Sat, 25 Feb 2017 14:23:37 +0000
Subject: Remove unused VRF paramter from IP neighbour Add/del

Change-Id: I4a348c696e4cacbf5aa0723f2b8070bbcce7666c
Signed-off-by: Neale Ranns <nranns@cisco.com>
---
 resources/libraries/python/IPv4Setup.py | 14 ++++----------
 resources/libraries/python/IPv6Util.py  |  9 ++-------
 resources/libraries/robot/vrf.robot     |  4 ++--
 3 files changed, 8 insertions(+), 19 deletions(-)

(limited to 'resources/libraries')

diff --git a/resources/libraries/python/IPv4Setup.py b/resources/libraries/python/IPv4Setup.py
index 0220139c04..7129e67231 100644
--- a/resources/libraries/python/IPv4Setup.py
+++ b/resources/libraries/python/IPv4Setup.py
@@ -202,23 +202,19 @@ class Dut(IPv4Node):
         # TODO: check return value
         VatExecutor.cmd_from_template(self.node_info, script, **args)
 
-    def set_arp(self, iface_key, ip_address, mac_address, vrf=None):
+    def set_arp(self, iface_key, ip_address, mac_address):
         """Set entry in ARP cache.
 
         :param iface_key: Interface key.
         :param ip_address: IP address.
         :param mac_address: MAC address.
-        :param vrf: VRF table ID (Optional).
         :type iface_key: str
         :type ip_address: str
         :type mac_address: str
-        :type vrf: int
         """
-        vrf = "vrf {}".format(vrf) if vrf else ''
         self.exec_vat('add_ip_neighbor.vat',
                       sw_if_index=self.get_sw_if_index(iface_key),
-                      ip_address=ip_address, mac_address=mac_address,
-                      vrf=vrf)
+                      ip_address=ip_address, mac_address=mac_address)
 
     def set_ip(self, interface, address, prefix_length):
         self.exec_vat('add_ip_address.vat',
@@ -350,18 +346,16 @@ class IPv4Setup(object):
                 get_node(node).set_arp(iface_key, ip_address, mac_address)
 
     @staticmethod
-    def add_arp_on_dut(node, iface_key, ip_address, mac_address, vrf=None):
+    def add_arp_on_dut(node, iface_key, ip_address, mac_address):
         """Set ARP cache entree on DUT node.
 
         :param node: VPP Node in the topology.
         :param iface_key: Interface key.
         :param ip_address: IP address of the interface.
         :param mac_address: MAC address of the interface.
-        :param vrf: VRF table ID (Optional).
         :type node: dict
         :type iface_key: str
         :type ip_address: str
         :type mac_address: str
-        :type vrf: int
         """
-        get_node(node).set_arp(iface_key, ip_address, mac_address, vrf)
+        get_node(node).set_arp(iface_key, ip_address, mac_address)
diff --git a/resources/libraries/python/IPv6Util.py b/resources/libraries/python/IPv6Util.py
index 2a4704dff2..1aab1816f2 100644
--- a/resources/libraries/python/IPv6Util.py
+++ b/resources/libraries/python/IPv6Util.py
@@ -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)
diff --git a/resources/libraries/robot/vrf.robot b/resources/libraries/robot/vrf.robot
index b741e4a533..ef6091ec89 100644
--- a/resources/libraries/robot/vrf.robot
+++ b/resources/libraries/robot/vrf.robot
@@ -67,9 +67,9 @@
 | | ... | ${node} | ${vrf_src_if} | ${table}
 | | ...
 | | Add IP Neighbor | ${node} | ${vrf_src_if}
-| | ... | ${src_if_ip} | ${src_if_mac} | vrf=${table}
+| | ... | ${src_if_ip} | ${src_if_mac}
 | | Add IP Neighbor | ${node} | ${route_interface}
-| | ... | ${route_gateway_ip} | ${route_gateway_mac} | vrf=${table}
+| | ... | ${route_gateway_ip} | ${route_gateway_mac}
 | | ...
 | | Vpp Route Add | ${node} | ${route_dst_ip} | ${prefix_len}
 | | ... | ${route_gateway_ip} | ${route_interface} | vrf=${table}
-- 
cgit 1.2.3-korg