X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fgbp%2Fgbp.api;h=99be9c4f777864a62cd4eb6ae03b91f1e13ca310;hb=3918bdbcb;hp=8343e228f1966f34c195cf142a3dd9255301312e;hpb=8da9fc659badc016e409f772673002f021c0cc4a;p=vpp.git

diff --git a/src/plugins/gbp/gbp.api b/src/plugins/gbp/gbp.api
index 8343e228f19..99be9c4f777 100644
--- a/src/plugins/gbp/gbp.api
+++ b/src/plugins/gbp/gbp.api
@@ -23,24 +23,28 @@ enum gbp_bridge_domain_flags
 {
   GBP_BD_API_FLAG_NONE = 0,
   GBP_BD_API_FLAG_DO_NOT_LEARN = 1,
+  GBP_BD_API_FLAG_UU_FWD_DROP = 2,
+  GBP_BD_API_FLAG_MCAST_DROP = 4,
+  GBP_BD_API_FLAG_UCAST_ARP = 8,
 };
 
 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;
 };
 
-autoreply define gbp_bridge_domain_add
+manual_print autoreply define gbp_bridge_domain_add
 {
   u32 client_index;
   u32 context;
   vl_api_gbp_bridge_domain_t bd;
 };
-autoreply define gbp_bridge_domain_del
+manual_print autoreply define gbp_bridge_domain_del
 {
   u32 client_index;
   u32 context;
@@ -57,6 +61,8 @@ define gbp_bridge_domain_details
   vl_api_gbp_bridge_domain_t bd;
 };
 
+typedef u16 gbp_scope;
+
 typedef gbp_route_domain
 {
   u32 rd_id;
@@ -64,15 +70,16 @@ typedef gbp_route_domain
   u32 ip6_table_id;
   u32 ip4_uu_sw_if_index;
   u32 ip6_uu_sw_if_index;
+  vl_api_gbp_scope_t scope;
 };
 
-autoreply define gbp_route_domain_add
+manual_print autoreply define gbp_route_domain_add
 {
   u32 client_index;
   u32 context;
   vl_api_gbp_route_domain_t rd;
 };
-autoreply define gbp_route_domain_del
+manual_print autoreply define gbp_route_domain_del
 {
   u32 client_index;
   u32 context;
@@ -100,8 +107,6 @@ enum gbp_endpoint_flags
   GBP_API_ENDPOINT_FLAG_BOUNCE = 0x1,
   GBP_API_ENDPOINT_FLAG_REMOTE = 0x2,
   GBP_API_ENDPOINT_FLAG_LEARNT = 0x4,
-  /* hey Ole WTF */
-  GBP_API_ENDPOINT_FLAG_REMOTE_LEARNT = 0x6,
   GBP_API_ENDPOINT_FLAG_EXTERNAL = 0x8,
 };
 
@@ -114,7 +119,7 @@ typedef gbp_endpoint_tun
 typedef gbp_endpoint
 {
   u32 sw_if_index;
-  u16 epg_id;
+  u16 sclass;
   vl_api_gbp_endpoint_flags_t flags;
   vl_api_mac_address_t mac;
   vl_api_gbp_endpoint_tun_t tun;
@@ -122,7 +127,7 @@ typedef gbp_endpoint
   vl_api_address_t ips[n_ips];
 };
 
-define gbp_endpoint_add
+manual_print define gbp_endpoint_add
 {
   u32 client_index;
   u32 context;
@@ -136,7 +141,7 @@ define gbp_endpoint_add_reply
   u32 handle;
 };
 
-autoreply define gbp_endpoint_del
+manual_print autoreply define gbp_endpoint_del
 {
   u32 client_index;
   u32 context;
@@ -164,7 +169,7 @@ typedef gbp_endpoint_retention
 
 typeonly define gbp_endpoint_group
 {
-  u16 epg_id;
+  u32 vnid;
   u16 sclass;
   u32 bd_id;
   u32 rd_id;
@@ -172,17 +177,17 @@ typeonly define gbp_endpoint_group
   vl_api_gbp_endpoint_retention_t retention;
 };
 
-autoreply define gbp_endpoint_group_add
+manual_print autoreply define gbp_endpoint_group_add
 {
   u32 client_index;
   u32 context;
   vl_api_gbp_endpoint_group_t epg;
 };
-autoreply define gbp_endpoint_group_del
+manual_print autoreply define gbp_endpoint_group_del
 {
   u32 client_index;
   u32 context;
-  u16 epg_id;
+  u16 sclass;
 };
 
 define gbp_endpoint_group_dump
@@ -200,11 +205,11 @@ define gbp_endpoint_group_details
 typeonly define gbp_recirc
 {
   u32 sw_if_index;
-  u16 epg_id;
+  u16 sclass;
   u8  is_ext;
 };
 
-autoreply define gbp_recirc_add_del
+manual_print autoreply define gbp_recirc_add_del
 {
   u32 client_index;
   u32 context;
@@ -230,18 +235,19 @@ 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
 {
   u32 rd_id;
   u32 sw_if_index;
-  u16 epg_id;
+  u16 sclass;
   vl_api_gbp_subnet_type_t type;
   vl_api_prefix_t prefix;
 };
 
-autoreply define gbp_subnet_add_del
+manual_print autoreply define gbp_subnet_add_del
 {
   u32 client_index;
   u32 context;
@@ -298,22 +304,29 @@ typedef gbp_rule
 
 typedef gbp_contract
 {
-  u16 src_epg;
-  u16 dst_epg;
+  vl_api_gbp_scope_t scope;
+  u16 sclass;
+  u16 dclass;
   u32 acl_index;
+  u8 n_ether_types;
+  u16 allowed_ethertypes[16];
   u8  n_rules;
   vl_api_gbp_rule_t rules[n_rules];
-  u8 n_ether_types;
-  u16 allowed_ethertypes[n_ether_types];
 };
 
-autoreply define gbp_contract_add_del
+manual_print define gbp_contract_add_del
 {
   u32 client_index;
   u32 context;
   u8  is_add;
   vl_api_gbp_contract_t contract;
 };
+define gbp_contract_add_del_reply
+{
+  u32 context;
+  i32 retval;
+  u32 stats_index;
+};
 
 define gbp_contract_dump
 {
@@ -347,7 +360,7 @@ typedef gbp_vxlan_tunnel
   vl_api_ip4_address_t src;
 };
 
-define gbp_vxlan_tunnel_add
+manual_print define gbp_vxlan_tunnel_add
 {
   u32 client_index;
   u32 context;
@@ -361,7 +374,7 @@ define gbp_vxlan_tunnel_add_reply
   u32 sw_if_index;
 };
 
-autoreply define gbp_vxlan_tunnel_del
+manual_print autoreply define gbp_vxlan_tunnel_del
 {
   u32 client_index;
   u32 context;
@@ -380,14 +393,21 @@ define gbp_vxlan_tunnel_details
   vl_api_gbp_vxlan_tunnel_t tunnel;
 };
 
+enum gbp_ext_itf_flags
+{
+  GBP_API_EXT_ITF_F_NONE = 0,
+  GBP_API_EXT_ITF_F_ANON = 1,
+};
+
 typeonly define gbp_ext_itf
 {
   u32 sw_if_index;
   u32 bd_id;
   u32 rd_id;
+  vl_api_gbp_ext_itf_flags_t flags;
 };
 
-autoreply define gbp_ext_itf_add_del
+manual_print autoreply define gbp_ext_itf_add_del
 {
   u32 client_index;
   u32 context;