From 58989a37d6edb62a021989f0cff1533f0a48cd9f Mon Sep 17 00:00:00 2001
From: Jakub Grajciar <jgrajcia@cisco.com>
Date: Tue, 8 Oct 2019 14:05:18 +0200
Subject: [PATCH] ip: API cleanup

Use consistent API types.

Type: fix

Signed-off-by: Jakub Grajciar <jgrajcia@cisco.com>
Change-Id: I17b95bba2327049d2b99e59cea79208814a24b22
Signed-off-by: Jakub Grajciar <jgrajcia@cisco.com>
---
 src/vnet/ip/ip.api        | 51 ++++++++++++++++++++++++-----------------------
 src/vpp/api/test_client.c |  3 +--
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/vnet/ip/ip.api b/src/vnet/ip/ip.api
index 831b38ac53c..edf995ed77d 100644
--- a/src/vnet/ip/ip.api
+++ b/src/vnet/ip/ip.api
@@ -17,11 +17,12 @@
 /** \file
 
     This file defines vpp IP control-plane API messages which are generally
-    called through a shared memory interface. 
+    called through a shared memory interface.
 */
 
-option version = "3.0.0";
+option version = "3.0.1";
 
+import "vnet/interface_types.api";
 import "vnet/fib/fib_types.api";
 import "vnet/ethernet/ethernet_types.api";
 import "vnet/mfib/mfib_types.api";
@@ -52,7 +53,7 @@ autoreply define ip_table_add_del
 {
   u32 client_index;
   u32 context;
-  bool is_add;
+  bool is_add [default=true];
   vl_api_ip_table_t table;
 };
 
@@ -158,7 +159,7 @@ define ip_route_add_del
 {
   u32 client_index;
   u32 context;
-  bool is_add;
+  bool is_add [default=true];
   bool is_multipath;
   vl_api_ip_route_t route;
 };
@@ -208,13 +209,13 @@ autoreply define set_ip_flow_hash
   u32 context;
   u32 vrf_id;
   bool is_ipv6;
-  u8 src;
-  u8 dst;
-  u8 sport;
-  u8 dport;
-  u8 proto;
-  u8 reverse;
-  u8 symmetric;
+  bool src;
+  bool dst;
+  bool sport;
+  bool dport;
+  bool proto;
+  bool reverse;
+  bool symmetric;
 };
 
 /** \brief IPv6 interface enable / disable request
@@ -288,7 +289,7 @@ define ip_mroute_add_del
 {
   u32 client_index;
   u32 context;
-  bool is_add;
+  bool is_add [default=true];
   bool is_multipath;
   vl_api_ip_mroute_t route;
 };
@@ -396,7 +397,7 @@ autoreply define ip_punt_police
   u32 client_index;
   u32 context;
   u32 policer_index;
-  bool is_add;
+  bool is_add [default=true];
   bool is_ip6;
 };
 
@@ -426,7 +427,7 @@ autoreply define ip_punt_redirect
   u32 client_index;
   u32 context;
   vl_api_punt_redirect_t punt;
-  bool is_add;
+  bool is_add [default=true];
 };
 
 define ip_punt_redirect_dump
@@ -449,7 +450,7 @@ autoreply define ip_container_proxy_add_del
   u32 context;
   vl_api_prefix_t pfx;
   vl_api_interface_index_t sw_if_index;
-  bool is_add;
+  bool is_add [default=true];
 };
 
 define ip_container_proxy_dump
@@ -481,7 +482,7 @@ autoreply define ip_source_and_port_range_check_add_del
 {
   u32 client_index;
   u32 context;
-  bool is_add;
+  bool is_add [default=true];
   vl_api_prefix_t prefix;
   u8 number_of_ranges;
   u16 low_ports[32];
@@ -500,7 +501,7 @@ autoreply define ip_source_and_port_range_check_interface_add_del
 {
   u32 client_index;
   u32 context;
-  bool is_add;
+  bool is_add [default=true];
   vl_api_interface_index_t sw_if_index;
   u32 tcp_in_vrf_id;
   u32 tcp_out_vrf_id;
@@ -519,8 +520,8 @@ autoreply define ip_source_check_interface_add_del
 {
   u32 client_index;
   u32 context;
-  bool is_add;
-  u8 loose;
+  bool is_add [default=true];
+  bool loose;
   vl_api_interface_index_t sw_if_index;
 };
 
@@ -541,8 +542,8 @@ autoreply define sw_interface_ip6_set_link_local_address
 /** \brief IOAM enable : Enable in-band OAM
     @param id - profile id
     @param seqno - To enable Seqno Processing
-    @param analyse - Enabling analysis of iOAM at decap node 
-    @param pot_enable - Proof of Work enabled or not flag
+    @param analyse - Enabling analysis of iOAM at decap node
+    @param pow_enable - Proof of Work enabled or not flag
     @param trace_enable - iOAM Trace enabled or not flag
 */
 autoreply define ioam_enable
@@ -550,10 +551,10 @@ autoreply define ioam_enable
   u32 client_index;
   u32 context;
   u16 id;
-  u8 seqno;
-  u8 analyse;
-  u8 pot_enable;
-  u8 trace_enable;
+  bool seqno;
+  bool analyse;
+  bool pot_enable;
+  bool trace_enable;
   u32 node_id;
 };
 
diff --git a/src/vpp/api/test_client.c b/src/vpp/api/test_client.c
index f207bb0935c..3c545945c3c 100644
--- a/src/vpp/api/test_client.c
+++ b/src/vpp/api/test_client.c
@@ -1206,8 +1206,7 @@ ip6_set_link_local_address (test_main_t * tm)
   tmp[0] = clib_host_to_net_u64 (0xfe80000000000000ULL);
   tmp[1] = clib_host_to_net_u64 (0x11ULL);
 
-  clib_memcpy (mp->address, &tmp[0], 8);
-  clib_memcpy (&mp->address[8], &tmp[1], 8);
+  ip6_address_encode ((ip6_address_encode *) & tmp, mp->address);
 
   mp->_vl_msg_id = ntohs (VL_API_SW_INTERFACE_IP6_SET_LINK_LOCAL_ADDRESS);
 
-- 
2.16.6