From ebef4a9e5dcdf764e856a6d6b61ef22f546abb1d Mon Sep 17 00:00:00 2001
From: Ole Troan <ot@cisco.com>
Date: Fri, 6 Dec 2019 10:00:47 +0100
Subject: lacp: use explit api types

Type: fix
Signed-off-by: Ole Troan <ot@cisco.com>
Change-Id: I3f19c69a6f6282a97fd591adcd1e4490cf21e743
---
 src/plugins/lacp/lacp.api    | 14 ++++++++------
 src/plugins/lacp/lacp_api.c  |  1 +
 src/plugins/lacp/lacp_test.c |  1 +
 3 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'src/plugins')

diff --git a/src/plugins/lacp/lacp.api b/src/plugins/lacp/lacp.api
index 9eb5c7eed07..d50bd78836b 100644
--- a/src/plugins/lacp/lacp.api
+++ b/src/plugins/lacp/lacp.api
@@ -19,7 +19,9 @@
     the bonding device driver
 */
 
-option version = "1.0.0";
+option version = "2.0.0";
+import "vnet/ethernet/ethernet_types.api";
+import "vnet/interface_types.api";
 
 /** \brief Dump lacp interfaces request */
 define sw_interface_lacp_dump
@@ -52,21 +54,21 @@ define sw_interface_lacp_dump
 define sw_interface_lacp_details
 {
   u32 context;
-  u32 sw_if_index;
-  u8 interface_name[64];
+  vl_api_interface_index_t sw_if_index;
+  string interface_name[64];
   u32 rx_state;
   u32 tx_state;
   u32 mux_state;
   u32 ptx_state;
-  u8 bond_interface_name[64];
+  string bond_interface_name[64];
   u16 actor_system_priority;
-  u8 actor_system[6];
+  vl_api_mac_address_t actor_system;
   u16 actor_key;
   u16 actor_port_priority;
   u16 actor_port_number;
   u8 actor_state;
   u16 partner_system_priority;
-  u8 partner_system[6];
+  vl_api_mac_address_t partner_system;
   u16 partner_key;
   u16 partner_port_priority;
   u16 partner_port_number;
diff --git a/src/plugins/lacp/lacp_api.c b/src/plugins/lacp/lacp_api.c
index 1a97baf3aba..115dd473836 100644
--- a/src/plugins/lacp/lacp_api.c
+++ b/src/plugins/lacp/lacp_api.c
@@ -27,6 +27,7 @@
 
 
 /* define message IDs */
+#include <vnet/format_fns.h>
 #include <lacp/lacp.api_enum.h>
 #include <lacp/lacp.api_types.h>
 
diff --git a/src/plugins/lacp/lacp_test.c b/src/plugins/lacp/lacp_test.c
index 4a705ff0140..3a5e6351693 100644
--- a/src/plugins/lacp/lacp_test.c
+++ b/src/plugins/lacp/lacp_test.c
@@ -28,6 +28,7 @@
 #include <vlibapi/vat_helper_macros.h>
 
 /* declare message IDs */
+#include <vnet/format_fns.h>
 #include <lacp/lacp.api_enum.h>
 #include <lacp/lacp.api_types.h>
 #include <vpp/api/vpe.api_types.h>
-- 
cgit 1.2.3-korg