X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fgbp%2Fgbp.api;h=5092a5e26a83608b82143bace2e81311d54df3ef;hb=59f71132e;hp=b0b284fcc3e95583cf33f6219dce69b87cc34354;hpb=1aa35576ec00ba2acc103c444cd8598d7d3b5dbd;p=vpp.git

diff --git a/src/plugins/gbp/gbp.api b/src/plugins/gbp/gbp.api
index b0b284fcc3e..5092a5e26a8 100644
--- a/src/plugins/gbp/gbp.api
+++ b/src/plugins/gbp/gbp.api
@@ -18,6 +18,7 @@ option version = "2.0.0";
 
 import "vnet/ip/ip_types.api";
 import "vnet/ethernet/ethernet_types.api";
+import "vnet/interface_types.api";
 
 enum gbp_bridge_domain_flags
 {
@@ -31,10 +32,11 @@ enum gbp_bridge_domain_flags
 typedef gbp_bridge_domain
 {
   u32 bd_id;
+  u32 rd_id;
   vl_api_gbp_bridge_domain_flags_t flags;
-  u32 bvi_sw_if_index;
-  u32 uu_fwd_sw_if_index;
-  u32 bm_flood_sw_if_index;
+  vl_api_interface_index_t bvi_sw_if_index;
+  vl_api_interface_index_t uu_fwd_sw_if_index;
+  vl_api_interface_index_t bm_flood_sw_if_index;
 };
 
 manual_print autoreply define gbp_bridge_domain_add
@@ -60,13 +62,16 @@ define gbp_bridge_domain_details
   vl_api_gbp_bridge_domain_t bd;
 };
 
+typedef u16 gbp_scope;
+
 typedef gbp_route_domain
 {
   u32 rd_id;
   u32 ip4_table_id;
   u32 ip6_table_id;
-  u32 ip4_uu_sw_if_index;
-  u32 ip6_uu_sw_if_index;
+  vl_api_interface_index_t ip4_uu_sw_if_index;
+  vl_api_interface_index_t ip6_uu_sw_if_index;
+  vl_api_gbp_scope_t scope;
 };
 
 manual_print autoreply define gbp_route_domain_add
@@ -114,7 +119,7 @@ typedef gbp_endpoint_tun
 
 typedef gbp_endpoint
 {
-  u32 sw_if_index;
+  vl_api_interface_index_t sw_if_index;
   u16 sclass;
   vl_api_gbp_endpoint_flags_t flags;
   vl_api_mac_address_t mac;
@@ -163,13 +168,13 @@ typedef gbp_endpoint_retention
   u32 remote_ep_timeout;
 };
 
-typeonly define gbp_endpoint_group
+typedef gbp_endpoint_group
 {
   u32 vnid;
   u16 sclass;
   u32 bd_id;
   u32 rd_id;
-  u32 uplink_sw_if_index;
+  vl_api_interface_index_t uplink_sw_if_index;
   vl_api_gbp_endpoint_retention_t retention;
 };
 
@@ -198,18 +203,18 @@ define gbp_endpoint_group_details
   vl_api_gbp_endpoint_group_t epg;
 };
 
-typeonly define gbp_recirc
+typedef gbp_recirc
 {
-  u32 sw_if_index;
+  vl_api_interface_index_t sw_if_index;
   u16 sclass;
-  u8  is_ext;
+  bool is_ext;
 };
 
 manual_print autoreply define gbp_recirc_add_del
 {
   u32 client_index;
   u32 context;
-  u8  is_add;
+  bool is_add;
   vl_api_gbp_recirc_t recirc;
 };
 
@@ -231,12 +236,13 @@ enum gbp_subnet_type
   GBP_API_SUBNET_STITCHED_INTERNAL,
   GBP_API_SUBNET_STITCHED_EXTERNAL,
   GBP_API_SUBNET_L3_OUT,
+  GBP_API_SUBNET_ANON_L3_OUT,
 };
 
-typeonly define gbp_subnet
+typedef gbp_subnet
 {
   u32 rd_id;
-  u32 sw_if_index;
+  vl_api_interface_index_t sw_if_index;
   u16 sclass;
   vl_api_gbp_subnet_type_t type;
   vl_api_prefix_t prefix;
@@ -246,7 +252,7 @@ manual_print autoreply define gbp_subnet_add_del
 {
   u32 client_index;
   u32 context;
-  u8  is_add;
+  bool is_add;
   vl_api_gbp_subnet_t subnet;
 };
 
@@ -299,6 +305,7 @@ typedef gbp_rule
 
 typedef gbp_contract
 {
+  vl_api_gbp_scope_t scope;
   u16 sclass;
   u16 dclass;
   u32 acl_index;
@@ -312,7 +319,7 @@ manual_print define gbp_contract_add_del
 {
   u32 client_index;
   u32 context;
-  u8  is_add;
+  bool is_add;
   vl_api_gbp_contract_t contract;
 };
 define gbp_contract_add_del_reply
@@ -365,7 +372,7 @@ define gbp_vxlan_tunnel_add_reply
 {
   u32 context;
   i32 retval;
-  u32 sw_if_index;
+  vl_api_interface_index_t sw_if_index;
 };
 
 manual_print autoreply define gbp_vxlan_tunnel_del
@@ -387,18 +394,25 @@ define gbp_vxlan_tunnel_details
   vl_api_gbp_vxlan_tunnel_t tunnel;
 };
 
-typeonly define gbp_ext_itf
+enum gbp_ext_itf_flags
+{
+  GBP_API_EXT_ITF_F_NONE = 0,
+  GBP_API_EXT_ITF_F_ANON = 1,
+};
+
+typedef gbp_ext_itf
 {
-  u32 sw_if_index;
+  vl_api_interface_index_t sw_if_index;
   u32 bd_id;
   u32 rd_id;
+  vl_api_gbp_ext_itf_flags_t flags;
 };
 
 manual_print autoreply define gbp_ext_itf_add_del
 {
   u32 client_index;
   u32 context;
-  u8  is_add;
+  bool is_add;
   vl_api_gbp_ext_itf_t ext_itf;
 };