ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove the unused VRF ID parameter from the IP neighbour Add/Del API

Browse Source 
Change-Id: Icf0d72f6af1f98c86f78e586c354515ac69804aa
Signed-off-by: Neale Ranns <nranns@cisco.com>
This commit is contained in:
Neale Ranns
2017-02-25 04:20:00 -08:00
committed by Ole Trøan
parent 584282a1d2
commit baf2e90a91
7 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/vat/api_format.c
View File

@ -7071,7 +7071,6 @@ api_ip_neighbor_add_del (vat_main_t * vam)
vl_api_ip_neighbor_add_del_t *mp;
u32 sw_if_index;
u8 sw_if_index_set = 0;
u32 vrf_id = 0;
u8 is_add = 1;
u8 is_static = 0;
u8 mac_address[6];
@ -7100,8 +7099,6 @@ api_ip_neighbor_add_del (vat_main_t * vam)
sw_if_index_set = 1;
else if (unformat (i, "is_static"))
is_static = 1;
else if (unformat (i, "vrf %d", &vrf_id))
;
else if (unformat (i, "dst %U", unformat_ip4_address, &v4address))
v4_address_set = 1;
else if (unformat (i, "dst %U", unformat_ip6_address, &v6address))
@ -7134,7 +7131,6 @@ api_ip_neighbor_add_del (vat_main_t * vam)
mp->sw_if_index = ntohl (sw_if_index);
mp->is_add = is_add;
mp->vrf_id = ntohl (vrf_id);
mp->is_static = is_static;
if (mac_set)
clib_memcpy (mp->mac_address, mac_address, 6);

2
src/vnet/ip/ip.api
View File

@ -125,7 +125,6 @@ define ip_neighbor_details {
/** \brief IP neighbor add / del request
@param client_index - opaque cookie to identify the sender
@param context - sender context, to match reply w/ request
@param vrf_id - vrf_id, only for IP4
@param sw_if_index - interface used to reach neighbor
@param is_add - 1 to add neighbor, 0 to delete
@param is_ipv6 - 1 for IPv6 neighbor, 0 for IPv4
@ -137,7 +136,6 @@ define ip_neighbor_add_del
{
u32 client_index;
u32 context;
u32 vrf_id; /* only makes sense for ip4 */
u32 sw_if_index;
/* 1 = add, 0 = delete */
u8 is_add;

2
src/vpp/api/custom_dump.c
View File

@ -581,8 +581,6 @@ static void *vl_api_ip_neighbor_add_del_t_print
if (mp->is_static)
s = format (s, "is_static ");
s = format (s, "vrf_id %d ", ntohl (mp->vrf_id));
if (memcmp (mp->mac_address, null_mac, 6))
s = format (s, "mac %U ", format_ethernet_address, mp->mac_address);

2
test/test_ip4_vrf_multi_instance.py
View File

@ -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"))

2
test/test_ip6_vrf_multi_instance.py
View File

@ -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"))

8
test/vpp_interface.py
View File

@ -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."""

5
test/vpp_papi_provider.py
View File

@ -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,