summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Gradzki <mgradzki@cisco.com>2017-10-13 10:22:59 +0200
committerNeale Ranns <nranns@cisco.com>2017-10-19 07:31:16 +0000
commit0164a06d8145f416118183bd496124bfbdfcd3f2 (patch)
treeeecd0f4f391eaade2b5bf6bc9015bf50a29ce8c1
parent7bee773e71b81a1e13a656030b0f7edae99c5e92 (diff)
Remove unused 'not_last' parameter from ip_add_del_route
Vat supports setting value for the parameter, but 'not_last' is ignored by ip_add_del_route handler, so can be removed. This patch - updates ip.api, - removes vat handlers - updates vpp_papi_provider.py (also mpls_route_add_del with unused not_last) Change-Id: Ife15de123db4bc8247103a29b90bce1988e46534 Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
-rw-r--r--src/vat/api_format.c4
-rw-r--r--src/vnet/ip/ip.api3
-rw-r--r--src/vpp/api/custom_dump.c3
-rw-r--r--test/vpp_papi_provider.py9
4 files changed, 2 insertions, 17 deletions
diff --git a/src/vat/api_format.c b/src/vat/api_format.c
index d6af6984467..bc5e9596bba 100644
--- a/src/vat/api_format.c
+++ b/src/vat/api_format.c
@@ -7564,7 +7564,6 @@ api_ip_add_del_route (vat_main_t * vam)
u8 create_vrf_if_needed = 0;
u8 is_add = 1;
u32 next_hop_weight = 1;
- u8 not_last = 0;
u8 is_multipath = 0;
u8 address_set = 0;
u8 address_length_set = 0;
@@ -7648,8 +7647,6 @@ api_ip_add_del_route (vat_main_t * vam)
is_add = 0;
else if (unformat (i, "add"))
is_add = 1;
- else if (unformat (i, "not-last"))
- not_last = 1;
else if (unformat (i, "resolve-via-host"))
resolve_host = 1;
else if (unformat (i, "resolve-via-attached"))
@@ -7758,7 +7755,6 @@ api_ip_add_del_route (vat_main_t * vam)
mp->is_multipath = is_multipath;
mp->is_resolve_host = resolve_host;
mp->is_resolve_attached = resolve_attached;
- mp->not_last = not_last;
mp->next_hop_weight = next_hop_weight;
mp->dst_address_length = dst_address_length;
mp->next_hop_table_id = ntohl (next_hop_table_id);
diff --git a/src/vnet/ip/ip.api b/src/vnet/ip/ip.api
index 8501eb26030..67258ee4fe9 100644
--- a/src/vnet/ip/ip.api
+++ b/src/vnet/ip/ip.api
@@ -374,7 +374,6 @@ autoreply define sw_interface_ip6_set_link_local_address
@param is_source_lookup - The the path is a deaggregate path (i.e. a lookup
in another table) is the lookup on the packet's
source address or destination.
- @param not_last - Is last or not last msg in group of multiple add/del msgs
@param next_hop_weight -
@param dst_address_length -
@param dst_address[16] -
@@ -404,8 +403,6 @@ autoreply define ip_add_del_route
u8 is_resolve_attached;
u8 is_l2_bridged;
u8 is_source_lookup;
- /* Is last/not-last message in group of multiple add/del messages. */
- u8 not_last;
u8 next_hop_weight;
u8 next_hop_preference;
u8 dst_address_length;
diff --git a/src/vpp/api/custom_dump.c b/src/vpp/api/custom_dump.c
index 46ce0b2659c..c1aa14d5497 100644
--- a/src/vpp/api/custom_dump.c
+++ b/src/vpp/api/custom_dump.c
@@ -586,9 +586,6 @@ static void *vl_api_ip_add_del_route_t_print
if (mp->next_hop_weight != 1)
s = format (s, "weight %d ", mp->next_hop_weight);
- if (mp->not_last)
- s = format (s, "not-last ");
-
if (mp->is_multipath)
s = format (s, "multipath ");
diff --git a/test/vpp_papi_provider.py b/test/vpp_papi_provider.py
index f7047eaf58f..2e970d24704 100644
--- a/test/vpp_papi_provider.py
+++ b/test/vpp_papi_provider.py
@@ -747,8 +747,7 @@ class VppPapiProvider(object):
is_classify=0,
is_multipath=0,
is_l2_bridged=0,
- is_source_lookup=0,
- not_last=0):
+ is_source_lookup=0):
"""
:param dst_address_length:
@@ -769,7 +768,6 @@ class VppPapiProvider(object):
:param is_resolve_attached: (Default value = 0)
:param is_l2_bridged: (Default value = 0)
:param is_source_lookup: (Default value = 0)
- :param not_last: (Default value = 0)
:param next_hop_weight: (Default value = 1)
"""
@@ -792,7 +790,6 @@ class VppPapiProvider(object):
'is_resolve_attached': is_resolve_attached,
'is_l2_bridged': is_l2_bridged,
'is_source_lookup': is_source_lookup,
- 'not_last': not_last,
'next_hop_weight': next_hop_weight,
'dst_address_length': dst_address_length,
'dst_address': dst_address,
@@ -1024,8 +1021,7 @@ class VppPapiProvider(object):
is_drop=0,
is_multipath=0,
classify_table_index=0xFFFFFFFF,
- is_classify=0,
- not_last=0):
+ is_classify=0):
"""
:param dst_address_length:
@@ -1045,7 +1041,6 @@ class VppPapiProvider(object):
:param is_multicast: (Default value = 0)
:param is_resolve_host: (Default value = 0)
:param is_resolve_attached: (Default value = 0)
- :param not_last: (Default value = 0)
:param next_hop_weight: (Default value = 1)
"""