X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Flisp-cp%2Flisp.api;h=8bed71b3bf7b888257f3f9a38689dc1843beab92;hb=11b8dbf78af49d270a0e72abe7dea73eec30d85f;hp=f0feafeecc8b3b8bfd896aac3c6fd716c13054f9;hpb=ba888e46f799a1ae209c51fffdd6159d75b20cdd;p=vpp.git

diff --git a/src/vnet/lisp-cp/lisp.api b/src/vnet/lisp-cp/lisp.api
index f0feafeecc8..8bed71b3bf7 100644
--- a/src/vnet/lisp-cp/lisp.api
+++ b/src/vnet/lisp-cp/lisp.api
@@ -13,6 +13,13 @@
  * limitations under the License.
  */
 
+typeonly manual_print manual_endian define local_locator
+{
+  u32 sw_if_index;
+  u8 priority;
+  u8 weight;
+};
+
 /** \brief add or delete locator_set
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -20,22 +27,15 @@
     @param locator_set_name - locator name
     @param locator_num - number of locators
     @param locators - LISP locator records
-        Structure of one locator record is as follows:
-
-        define locator_t {
-          u32 sw_if_index;
-          u8 priority;
-          u8 weight;
-        }
 */
-define lisp_add_del_locator_set
+manual_endian manual_print define lisp_add_del_locator_set
 {
   u32 client_index;
   u32 context;
   u8 is_add;
   u8 locator_set_name[64];
   u32 locator_num;
-  u8 locators[0];
+  vl_api_local_locator_t locators[locator_num];
 };
 
 /** \brief Reply for locator_set add/del
@@ -59,7 +59,7 @@ define lisp_add_del_locator_set_reply
     @param priority - priority of the lisp locator
     @param weight - weight of the lisp locator
 */
-define lisp_add_del_locator
+autoreply define lisp_add_del_locator
 {
   u32 client_index;
   u32 context;
@@ -70,16 +70,6 @@ define lisp_add_del_locator
   u8 weight;
 };
 
-/** \brief Reply for locator add/del
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define lisp_add_del_locator_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief add or delete lisp eid-table
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -98,7 +88,7 @@ define lisp_add_del_locator_reply
       HMAC_SHA_256_128      2
     @param key - secret key
 */
-define lisp_add_del_local_eid
+autoreply define lisp_add_del_local_eid
 {
   u32 client_index;
   u32 context;
@@ -112,16 +102,6 @@ define lisp_add_del_local_eid
   u8 key[64];
 };
 
-/** \brief Reply for local_eid add/del
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define lisp_add_del_local_eid_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Add/delete map server
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -129,7 +109,7 @@ define lisp_add_del_local_eid_reply
     @param is_ipv6 - if non-zero the address is ipv6, else ipv4
     @param ip_address - map server IP address
 */
-define lisp_add_del_map_server
+autoreply define lisp_add_del_map_server
 {
   u32 client_index;
   u32 context;
@@ -138,16 +118,6 @@ define lisp_add_del_map_server
   u8 ip_address[16];
 };
 
-/** \brief Reply for lisp_add_del_map_server
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define lisp_add_del_map_server_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief add or delete map-resolver
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -155,7 +125,7 @@ define lisp_add_del_map_server_reply
     @param is_ipv6 - if non-zero the address is ipv6, else ipv4
     @param ip_address - array of address bytes
 */
-define lisp_add_del_map_resolver
+autoreply define lisp_add_del_map_resolver
 {
   u32 client_index;
   u32 context;
@@ -164,45 +134,25 @@ define lisp_add_del_map_resolver
   u8 ip_address[16];
 };
 
-/** \brief Reply for map_resolver add/del
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define lisp_add_del_map_resolver_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief enable or disable LISP feature
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
     @param is_en - enable protocol if non-zero, else disable
 */
-define lisp_enable_disable
+autoreply define lisp_enable_disable
 {
   u32 client_index;
   u32 context;
   u8 is_en;
 };
 
-/** \brief Reply for gpe enable/disable
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define lisp_enable_disable_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief configure or disable LISP PITR node
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
     @param ls_name - locator set name
     @param is_add - add locator set if non-zero, else disable pitr
 */
-define lisp_pitr_set_locator_set
+autoreply define lisp_pitr_set_locator_set
 {
   u32 client_index;
   u32 context;
@@ -210,16 +160,6 @@ define lisp_pitr_set_locator_set
   u8 ls_name[64];
 };
 
-/** \brief Reply for lisp_pitr_set_locator_set
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define lisp_pitr_set_locator_set_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief configure or disable use of PETR
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -227,7 +167,7 @@ define lisp_pitr_set_locator_set_reply
     @param address - PETR IP address
     @param is_add - add locator set if non-zero, else disable pitr
 */
-define lisp_use_petr
+autoreply define lisp_use_petr
 {
   u32 client_index;
   u32 context;
@@ -236,16 +176,6 @@ define lisp_use_petr
   u8 is_add;
 };
 
-/** \brief Reply for lisp_pitr_set_locator_set
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define lisp_use_petr_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Request for LISP PETR status
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -298,45 +228,25 @@ define show_lisp_rloc_probe_state_reply
     @param context - sender context, to match reply w/ request
     @param is_enable - enable if non-zero; disable otherwise
 */
-define lisp_rloc_probe_enable_disable
+autoreply define lisp_rloc_probe_enable_disable
 {
   u32 client_index;
   u32 context;
   u8 is_enabled;
 };
 
-/** \brief Reply for lisp_rloc_probe_enable_disable
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define lisp_rloc_probe_enable_disable_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief enable/disable LISP map-register
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
     @param is_enable - enable if non-zero; disable otherwise
 */
-define lisp_map_register_enable_disable
+autoreply define lisp_map_register_enable_disable
 {
   u32 client_index;
   u32 context;
   u8 is_enabled;
 };
 
-/** \brief Reply for lisp_map_register_enable_disable
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define lisp_map_register_enable_disable_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Get state of LISP map-register
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -366,23 +276,13 @@ define show_lisp_map_register_state_reply
       0 - destination only
       1 - source/destaination
 */
-define lisp_map_request_mode
+autoreply define lisp_map_request_mode
 {
   u32 client_index;
   u32 context;
   u8 mode;
 };
 
-/** \brief Reply for lisp_map_request_mode
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define lisp_map_request_mode_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Request for LISP map-request mode
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -405,6 +305,14 @@ define show_lisp_map_request_mode_reply
   u8 mode;
 };
 
+typeonly manual_endian manual_print define remote_locator
+{
+  u8 is_ip4;
+  u8 priority;
+  u8 weight;
+  u8 addr[16];
+};
+
 /** \brief add or delete remote static mapping
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -421,16 +329,8 @@ define show_lisp_map_request_mode_reply
     @param seid - src EID, valid only if is_src_dst is enabled
     @param rloc_num - number of remote locators
     @param rlocs - remote locator records
-        Structure of remote locator:
-
-        define rloc_t {
-          u8 is_ip4;
-          u8 priority;
-          u8 weight;
-          u8 addr[16];
-        }
 */
-define lisp_add_del_remote_mapping
+autoreply manual_print manual_endian define lisp_add_del_remote_mapping
 {
   u32 client_index;
   u32 context;
@@ -445,17 +345,7 @@ define lisp_add_del_remote_mapping
   u8 seid[16];
   u8 seid_len;
   u32 rloc_num;
-  u8 rlocs[0];
-};
-
-/** \brief Reply for lisp_add_del_remote_mapping
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define lisp_add_del_remote_mapping_reply
-{
-  u32 context;
-  i32 retval;
+  vl_api_remote_locator_t rlocs[rloc_num];
 };
 
 /** \brief add or delete LISP adjacency adjacency
@@ -470,7 +360,7 @@ define lisp_add_del_remote_mapping_reply
     @param reid - remote EID
     @param leid - local EID
 */
-define lisp_add_del_adjacency
+autoreply define lisp_add_del_adjacency
 {
   u32 client_index;
   u32 context;
@@ -483,23 +373,13 @@ define lisp_add_del_adjacency
   u8 leid_len;
 };
 
-/** \brief Reply for lisp_add_del_adjacency
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define lisp_add_del_adjacency_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief add or delete map request itr rlocs
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
     @param is_add - add address if non-zero, else delete
     @param locator_set_name - locator set name
 */
-define lisp_add_del_map_request_itr_rlocs
+autoreply define lisp_add_del_map_request_itr_rlocs
 {
   u32 client_index;
   u32 context;
@@ -512,12 +392,6 @@ define lisp_add_del_map_request_itr_rlocs
     @param retval - return code
 */
 
-define lisp_add_del_map_request_itr_rlocs_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief map/unmap vni/bd_index to vrf
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -525,7 +399,7 @@ define lisp_add_del_map_request_itr_rlocs_reply
     @param dp_table - virtual network id/bridge domain index
     @param vrf - vrf
 */
-define lisp_eid_table_add_del_map
+autoreply define lisp_eid_table_add_del_map
 {
   u32 client_index;
   u32 context;
@@ -535,16 +409,6 @@ define lisp_eid_table_add_del_map
   u8 is_l2;
 };
 
-/** \brief Reply for lisp_eid_table_add_del_map
-    @param context - returned sender context, to match reply w/ request
-    @param retval - return code
-*/
-define lisp_eid_table_add_del_map_reply
-{
-  u32 context;
-  i32 retval;
-};
-
 /** \brief Request for map lisp locator status
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
@@ -883,4 +747,4 @@ define show_lisp_pitr_reply
  * eval: (c-set-style "gnu")
  * End:
  */
- 
\ No newline at end of file
+