From 00f21fb2fed0b6cf10eda45913b98a20e7b4cd3f Mon Sep 17 00:00:00 2001 From: Ole Troan Date: Tue, 15 Sep 2020 11:37:16 +0200 Subject: [PATCH] api: clean up use of deprecated flag The syntax of the deprecated flag has evolved. Clean up usage to be "option deprecated;". Type: fix Signed-off-by: Ole Troan Change-Id: If2b639f275eb8db58b36c457f9245fe35a4d8cb1 (cherry picked from commit f916414b383afd37ec78509ee613df8878160406) --- src/plugins/map/map.api | 2 +- src/plugins/nat/det44/det44.api | 22 +++++++++++----------- src/plugins/nsim/nsim.api | 2 +- src/vnet/cop/cop.api | 4 ++-- src/vnet/devices/virtio/virtio.api | 4 ++-- src/vnet/geneve/geneve.api | 2 +- src/vnet/ipsec/ipsec.api | 4 ++-- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/plugins/map/map.api b/src/plugins/map/map.api index adf4d0a5bbd..fa32978591c 100644 --- a/src/plugins/map/map.api +++ b/src/plugins/map/map.api @@ -112,7 +112,7 @@ define map_domains_get_reply define map_domain_dump { - option deprecated="v21.01"; + option deprecated; u32 client_index; u32 context; }; diff --git a/src/plugins/nat/det44/det44.api b/src/plugins/nat/det44/det44.api index 818d46a1d5a..f9c38007288 100644 --- a/src/plugins/nat/det44/det44.api +++ b/src/plugins/nat/det44/det44.api @@ -311,7 +311,7 @@ autoreply define nat_det_add_del_map { u8 in_plen; vl_api_ip4_address_t out_addr; u8 out_plen; - option status="deprecated"; + option deprecated; }; /** \brief Get outside address and port range from inside address @@ -323,7 +323,7 @@ define nat_det_forward { u32 client_index; u32 context; vl_api_ip4_address_t in_addr; - option status="deprecated"; + option deprecated; }; /** \brief Get outside address and port range from inside address @@ -339,7 +339,7 @@ define nat_det_forward_reply { u16 out_port_lo; u16 out_port_hi; vl_api_ip4_address_t out_addr; - option status="deprecated"; + option deprecated; }; /** \brief Get inside address from outside address and port @@ -353,7 +353,7 @@ define nat_det_reverse { u32 context; u16 out_port; vl_api_ip4_address_t out_addr; - option status="deprecated"; + option deprecated; }; /** \brief Get inside address from outside address and port reply @@ -365,7 +365,7 @@ define nat_det_reverse_reply { u32 context; i32 retval; vl_api_ip4_address_t in_addr; - option status="deprecated"; + option deprecated; }; /** \brief Dump NAT deterministic mappings @@ -375,7 +375,7 @@ define nat_det_reverse_reply { define nat_det_map_dump { u32 client_index; u32 context; - option status="deprecated"; + option deprecated; }; /** \brief NAT users response @@ -397,7 +397,7 @@ define nat_det_map_details { u32 sharing_ratio; u16 ports_per_host; u32 ses_num; - option status="deprecated"; + option deprecated; }; /** \brief Close deterministic NAT session by outside address and port @@ -415,7 +415,7 @@ autoreply define nat_det_close_session_out { u16 out_port; vl_api_ip4_address_t ext_addr; u16 ext_port; - option status="deprecated"; + option deprecated; }; /** \brief Close deterministic NAT session by inside address and port @@ -433,7 +433,7 @@ autoreply define nat_det_close_session_in { u16 in_port; vl_api_ip4_address_t ext_addr; u16 ext_port; - option status="deprecated"; + option deprecated; }; /** \brief Dump determinstic NAT sessions @@ -445,7 +445,7 @@ define nat_det_session_dump { u32 client_index; u32 context; vl_api_ip4_address_t user_addr; - option status="deprecated"; + option deprecated; }; /** \brief Deterministic NAT sessions reply @@ -465,5 +465,5 @@ define nat_det_session_details { u16 out_port; u8 state; u32 expire; - option status="deprecated"; + option deprecated; }; diff --git a/src/plugins/nsim/nsim.api b/src/plugins/nsim/nsim.api index 65493252022..f0ae02a70bd 100644 --- a/src/plugins/nsim/nsim.api +++ b/src/plugins/nsim/nsim.api @@ -61,7 +61,7 @@ autoreply define nsim_output_feature_enable_disable */ autoreply define nsim_configure { - option deprecated="v21.01"; + option deprecated; /* Client identifier, set from api_main.my_client_index */ u32 client_index; diff --git a/src/vnet/cop/cop.api b/src/vnet/cop/cop.api index 39677a26673..75fd15bbb9f 100644 --- a/src/vnet/cop/cop.api +++ b/src/vnet/cop/cop.api @@ -26,7 +26,7 @@ import "vnet/interface_types.api"; autoreply define cop_interface_enable_disable { - option deprecated="v21.01"; + option deprecated; u32 client_index; u32 context; vl_api_interface_index_t sw_if_index; @@ -47,7 +47,7 @@ autoreply define cop_interface_enable_disable autoreply define cop_whitelist_enable_disable { - option deprecated="v21.01"; + option deprecated; u32 client_index; u32 context; vl_api_interface_index_t sw_if_index; diff --git a/src/vnet/devices/virtio/virtio.api b/src/vnet/devices/virtio/virtio.api index 143d25b73ab..3c8aed2e159 100644 --- a/src/vnet/devices/virtio/virtio.api +++ b/src/vnet/devices/virtio/virtio.api @@ -32,7 +32,7 @@ import "vlib/pci/pci_types.api"; */ define virtio_pci_create { - option deprecated="21.01"; + option deprecated; u32 client_index; u32 context; vl_api_pci_address_t pci_addr; @@ -50,7 +50,7 @@ define virtio_pci_create */ define virtio_pci_create_reply { - option deprecated="21.01"; + option deprecated; u32 context; i32 retval; vl_api_interface_index_t sw_if_index; diff --git a/src/vnet/geneve/geneve.api b/src/vnet/geneve/geneve.api index 4502d890797..ef2cd5ed8ae 100644 --- a/src/vnet/geneve/geneve.api +++ b/src/vnet/geneve/geneve.api @@ -21,7 +21,7 @@ import "vnet/ip/ip_types.api"; define geneve_add_del_tunnel { - option deprecated="20.06"; + option deprecated; u32 client_index; u32 context; bool is_add; diff --git a/src/vnet/ipsec/ipsec.api b/src/vnet/ipsec/ipsec.api index 52a16ede1aa..89dcdb761de 100644 --- a/src/vnet/ipsec/ipsec.api +++ b/src/vnet/ipsec/ipsec.api @@ -343,7 +343,7 @@ define ipsec_spd_interface_details { @param salt - for use with counter mode ciphers */ define ipsec_tunnel_if_add_del { - option deprecated="20.09"; + option deprecated; u32 client_index; u32 context; bool is_add; @@ -491,7 +491,7 @@ define ipsec_sa_details { @param is_outbound - 1 if outbound (local) SA, 0 if inbound (remote) */ autoreply define ipsec_tunnel_if_set_sa { - option deprecated="20.09"; + option deprecated; u32 client_index; u32 context; vl_api_interface_index_t sw_if_index; -- 2.16.6