1 files changed, 21 insertions, 21 deletions

diff --git a/src/vnet/vxlan/vxlan.api b/src/vnet/vxlan/vxlan.api
index 9e969de7bc5..907d7d32ce7 100644
--- a/src/vnet/vxlan/vxlan.api
+++ b/src/vnet/vxlan/vxlan.api
@@ -13,31 +13,32 @@
  * limitations under the License.
  */
 
-option version = "1.1.0";
+option version = "2.0.0";
+
+import "vnet/interface_types.api";
+import "vnet/ip/ip_types.api";
 
 /** \brief Create or delete a VXLAN tunnel
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
     @param is_add - Use 1 to create the tunnel, 0 to remove it
-    @param is_ipv6 - Use 0 for IPv4, 1 for IPv6
     @param instance - optional unique custom device instance, else ~0.
     @param src_address - Source IP address
     @param dst_address - Destination IP address, can be multicast
     @param mcast_sw_if_index - Interface for multicast destination
     @param encap_vrf_id - Encap route table FIB index
-    @param decap_next_index - Name of decap next graph node
+    @param decap_next_index - index of decap next graph node
     @param vni - The VXLAN Network Identifier, uint24
 */
 define vxlan_add_del_tunnel
 {
   u32 client_index;
   u32 context;
-  u8 is_add;
-  u8 is_ipv6;
+  bool is_add [default=true];
   u32 instance;		/* If non-~0, specifies a custom dev instance */
-  u8 src_address[16];
-  u8 dst_address[16];
-  u32 mcast_sw_if_index;
+  vl_api_address_t src_address;
+  vl_api_address_t dst_address;
+  vl_api_interface_index_t mcast_sw_if_index;
   u32 encap_vrf_id;
   u32 decap_next_index;
   u32 vni;
@@ -47,28 +48,27 @@ define vxlan_add_del_tunnel_reply
 {
   u32 context;
   i32 retval;
-  u32 sw_if_index;
+  vl_api_interface_index_t sw_if_index;
 };
 
 define vxlan_tunnel_dump
 {
   u32 client_index;
   u32 context;
-  u32 sw_if_index;
+  vl_api_interface_index_t sw_if_index;
 };
 
 define vxlan_tunnel_details
 {
   u32 context;
-  u32 sw_if_index;
+  vl_api_interface_index_t sw_if_index;
   u32 instance;
-  u8 src_address[16];
-  u8 dst_address[16];
-  u32 mcast_sw_if_index;
+  vl_api_address_t src_address;
+  vl_api_address_t dst_address;
+  vl_api_interface_index_t mcast_sw_if_index;
   u32 encap_vrf_id;
   u32 decap_next_index;
   u32 vni;
-  u8 is_ipv6;
 };
 
 /** \brief Interface set vxlan-bypass request
@@ -82,9 +82,9 @@ autoreply define sw_interface_set_vxlan_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];
 };
 
 /** \brief Offload vxlan rx request
@@ -98,7 +98,7 @@ autoreply define vxlan_offload_rx
 {
   u32 client_index;
   u32 context;
-  u32 hw_if_index;
-  u32 sw_if_index;
-  u8 enable;
+  vl_api_interface_index_t hw_if_index;
+  vl_api_interface_index_t sw_if_index;
+  bool enable [default=true];
 };