vxlan: vxlan-gpe/vxlan-gpe.cpi API cleanup

[vpp.git] / src / vnet / vxlan-gpe / vxlan_gpe.api

diff --git a/src/vnet/vxlan-gpe/vxlan_gpe.api b/src/vnet/vxlan-gpe/vxlan_gpe.api
index 89d3707..35d8c64 100644 (file)
--- a/src/vnet/vxlan-gpe/vxlan_gpe.api
+++ b/src/vnet/vxlan-gpe/vxlan_gpe.api
@@ -13,49 +13,51 @@
  * limitations under the License.
  */
 
-option version = "1.0.0";
+option version = "2.0.0";
+
+import "vnet/interface_types.api";
+import "vnet/ip/ip_types.api";
 
 define vxlan_gpe_add_del_tunnel
 {
   u32 client_index;
   u32 context;
-  u8 is_ipv6;
-  u8 local[16];
-  u8 remote[16];
-  u32 mcast_sw_if_index;
+  vl_api_address_t local;
+  vl_api_address_t remote;
+  vl_api_interface_index_t mcast_sw_if_index;
   u32 encap_vrf_id;
   u32 decap_vrf_id;
-  u8 protocol;
+  vl_api_ip_proto_t protocol;
   u32 vni;
-  u8 is_add;
+  bool is_add [default=true];
 };
 
 define vxlan_gpe_add_del_tunnel_reply
 {
   u32 context;
   i32 retval;
-  u32 sw_if_index;
+  vl_api_interface_index_t sw_if_index;
 };
 
 define vxlan_gpe_tunnel_dump
 {
   u32 client_index;
   u32 context;
-  u32 sw_if_index;
+  vl_api_interface_index_t sw_if_index;
 };
 
 define vxlan_gpe_tunnel_details
 {
   u32 context;
-  u32 sw_if_index;
-  u8 local[16];
-  u8 remote[16];
+  vl_api_interface_index_t sw_if_index;
+  vl_api_address_t local;
+  vl_api_address_t remote;
   u32 vni;
-  u8 protocol;
-  u32 mcast_sw_if_index;
+  vl_api_ip_proto_t protocol;
+  vl_api_interface_index_t mcast_sw_if_index;
   u32 encap_vrf_id;
   u32 decap_vrf_id;
-  u8 is_ipv6;
+  bool is_ipv6;
 };
 
 /** \brief Interface set vxlan-gpe-bypass request
@@ -69,9 +71,9 @@ autoreply define sw_interface_set_vxlan_gpe_bypass
 {
   u32 client_index;
   u32 context;
-  u32 sw_if_index;
-  u8 is_ipv6;
-  u8 enable;
+  vl_api_interface_index_t sw_if_index;
+  bool is_ipv6;
+  bool enable [default=true];
 };
 
 /*