IPSEC-GRE: fixes and API update to common types.

Change-Id: Icdcbac7453baa837a9c0c4a2401dff4a6aa6cba0
Signed-off-by: Neale Ranns <nranns@cisco.com>

1 files changed, 22 insertions, 15 deletions

diff --git a/src/vnet/ipsec-gre/ipsec_gre.api b/src/vnet/ipsec-gre/ipsec_gre.api
index 770746d5e32..b4950097f61 100644
--- a/src/vnet/ipsec-gre/ipsec_gre.api
+++ b/src/vnet/ipsec-gre/ipsec_gre.api
@@ -13,25 +13,37 @@
  * limitations under the License.
  */
 
-option version = "1.0.0";
+option version = "1.1.0";
+
+import "vnet/ip/ip_types.api";
 
 /** \brief Add / del ipsec gre tunnel request
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
-    @param local_sa_id - local SA id
-    @param remote_sa_id - remote SA id
+    @param local_sa_id - local/output SA id
+    @param remote_sa_id - remote/input SA id
     @param is_add - 1 if adding the tunnel, 0 if deleting
-    @param src_address - tunnel source address
-    @param dst_address - tunnel destination address
+    @param sw_if_index - software index of the ipsec gre tunnel
+                         ignored on create. set in dump/details
+    @param src - tunnel source address
+    @param dst - tunnel destination address
 */
-define ipsec_gre_add_del_tunnel {
+typedef ipsec_gre_tunnel {
     u32 client_index;
     u32 context;
     u32 local_sa_id;
     u32 remote_sa_id;
     u8 is_add;
-    u8 src_address[4];
-    u8 dst_address[4];
+    u32 sw_if_index;
+    vl_api_ip4_address_t src;
+    vl_api_ip4_address_t dst;
+};
+
+define ipsec_gre_tunnel_add_del {
+    u32 client_index;
+    u32 context;
+    u8 is_add;
+    vl_api_ipsec_gre_tunnel_t tunnel;
 };
 
 /** \brief Reply for add / del ipsec gre tunnel request
@@ -39,7 +51,7 @@ define ipsec_gre_add_del_tunnel {
     @param retval - return code
     @param sw_if_index - software index of the new ipsec gre tunnel
 */
-define ipsec_gre_add_del_tunnel_reply {
+define ipsec_gre_tunnel_add_del_reply {
     u32 context;
     i32 retval;
     u32 sw_if_index;
@@ -58,7 +70,6 @@ define ipsec_gre_tunnel_dump {
 
 /** \brief ipsec gre tunnel operational state response
     @param context - returned sender context, to match reply w/ request
-    @param sw_if_index - software index of the ipsec gre tunnel
     @param local_sa_id - local SA id
     @param remote_sa_id - remote SA id
     @param src_address - tunnel source address
@@ -66,11 +77,7 @@ define ipsec_gre_tunnel_dump {
 */
 define ipsec_gre_tunnel_details {
     u32 context;
-    u32 sw_if_index;
-    u32 local_sa_id;
-    u32 remote_sa_id;
-    u8 src_address[4];
-    u8 dst_address[4];
+    vl_api_ipsec_gre_tunnel_t tunnel;
 };
 
 /*