aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/test_ip4_vrf_multi_instance.py2
-rw-r--r--test/test_ip6_vrf_multi_instance.py2
-rw-r--r--test/vpp_interface.py8
-rw-r--r--test/vpp_papi_provider.py5
4 files changed, 7 insertions, 10 deletions
diff --git a/test/test_ip4_vrf_multi_instance.py b/test/test_ip4_vrf_multi_instance.py
index b84086ae..ddf8f593 100644
--- a/test/test_ip4_vrf_multi_instance.py
+++ b/test/test_ip4_vrf_multi_instance.py
@@ -190,7 +190,7 @@ class TestIp4VrfMultiInst(VppTestCase):
if pg_if in self.pg_not_in_vrf:
self.pg_not_in_vrf.remove(pg_if)
pg_if.config_ip4()
- pg_if.configure_ipv4_neighbors(vrf_id)
+ pg_if.configure_ipv4_neighbors()
self.logger.debug(self.vapi.ppcli("show ip fib"))
self.logger.debug(self.vapi.ppcli("show ip arp"))
diff --git a/test/test_ip6_vrf_multi_instance.py b/test/test_ip6_vrf_multi_instance.py
index b3b080eb..7bd4d89c 100644
--- a/test/test_ip6_vrf_multi_instance.py
+++ b/test/test_ip6_vrf_multi_instance.py
@@ -206,7 +206,7 @@ class TestIP6VrfMultiInst(VppTestCase):
self.pg_not_in_vrf.remove(pg_if)
pg_if.config_ip6()
pg_if.disable_ipv6_ra()
- pg_if.configure_ipv6_neighbors(vrf_id)
+ pg_if.configure_ipv6_neighbors()
self.logger.debug(self.vapi.ppcli("show ip6 fib"))
self.logger.debug(self.vapi.ppcli("show ip6 neighbors"))
diff --git a/test/vpp_interface.py b/test/vpp_interface.py
index 125d8f04..4588943d 100644
--- a/test/vpp_interface.py
+++ b/test/vpp_interface.py
@@ -196,7 +196,7 @@ class VppInterface(object):
self.has_ip4_config = False
self.has_ip4_config = False
- def configure_ipv4_neighbors(self, vrf_id=0):
+ def configure_ipv4_neighbors(self):
"""For every remote host assign neighbor's MAC to IPv4 addresses.
:param vrf_id: The FIB table / VRF ID. (Default value = 0)
@@ -205,7 +205,7 @@ class VppInterface(object):
macn = host.mac.replace(":", "").decode('hex')
ipn = host.ip4n
self.test.vapi.ip_neighbor_add_del(
- self.sw_if_index, macn, ipn, vrf_id)
+ self.sw_if_index, macn, ipn)
def config_ip6(self):
"""Configure IPv6 address on the VPP interface."""
@@ -227,7 +227,7 @@ class VppInterface(object):
self.has_ip6_config = False
self.has_ip6_config = False
- def configure_ipv6_neighbors(self, vrf_id=0):
+ def configure_ipv6_neighbors(self):
"""For every remote host assign neighbor's MAC to IPv6 addresses.
:param vrf_id: The FIB table / VRF ID. (Default value = 0)
@@ -236,7 +236,7 @@ class VppInterface(object):
macn = host.mac.replace(":", "").decode('hex')
ipn = host.ip6n
self.test.vapi.ip_neighbor_add_del(
- self.sw_if_index, macn, ipn, vrf_id, is_ipv6=1)
+ self.sw_if_index, macn, ipn, is_ipv6=1)
def unconfig(self):
"""Unconfigure IPv6 and IPv4 address on the VPP interface."""
diff --git a/test/vpp_papi_provider.py b/test/vpp_papi_provider.py
index bebbe76d..ea574b36 100644
--- a/test/vpp_papi_provider.py
+++ b/test/vpp_papi_provider.py
@@ -629,7 +629,6 @@ class VppPapiProvider(object):
sw_if_index,
mac_address,
dst_address,
- vrf_id=0,
is_add=1,
is_ipv6=0,
is_static=0,
@@ -639,7 +638,6 @@ class VppPapiProvider(object):
:param sw_if_index:
:param mac_address:
:param dst_address:
- :param vrf_id: (Default value = 0)
:param is_add: (Default value = 1)
:param is_ipv6: (Default value = 0)
:param is_static: (Default value = 0)
@@ -647,8 +645,7 @@ class VppPapiProvider(object):
return self.api(
self.papi.ip_neighbor_add_del,
- {'vrf_id': vrf_id,
- 'sw_if_index': sw_if_index,
+ {'sw_if_index': sw_if_index,
'is_add': is_add,
'is_ipv6': is_ipv6,
'is_static': is_static,