X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fgbp%2Fgbp.api;h=ae45159d705a5e4aee81cf97ac6af7f2e4331451;hb=fa0ac2c56;hp=bf7c167a42f05cccf1cd1fbe78b16a616f09e8db;hpb=b6a47953973f7c94239c394b649100e91bdb2152;p=vpp.git

diff --git a/src/plugins/gbp/gbp.api b/src/plugins/gbp/gbp.api
index bf7c167a42f..ae45159d705 100644
--- a/src/plugins/gbp/gbp.api
+++ b/src/plugins/gbp/gbp.api
@@ -31,6 +31,7 @@ typedef gbp_bridge_domain
   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
@@ -99,8 +100,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,
 };
 
@@ -113,7 +112,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;
@@ -156,12 +155,19 @@ define gbp_endpoint_details
   vl_api_gbp_endpoint_t endpoint;
 };
 
+typedef gbp_endpoint_retention
+{
+  u32 remote_ep_timeout;
+};
+
 typeonly define gbp_endpoint_group
 {
-  u16 epg_id;
+  u32 vnid;
+  u16 sclass;
   u32 bd_id;
   u32 rd_id;
   u32 uplink_sw_if_index;
+  vl_api_gbp_endpoint_retention_t retention;
 };
 
 autoreply define gbp_endpoint_group_add
@@ -174,7 +180,7 @@ autoreply define gbp_endpoint_group_del
 {
   u32 client_index;
   u32 context;
-  u16 epg_id;
+  u16 sclass;
 };
 
 define gbp_endpoint_group_dump
@@ -192,7 +198,7 @@ define gbp_endpoint_group_details
 typeonly define gbp_recirc
 {
   u32 sw_if_index;
-  u16 epg_id;
+  u16 sclass;
   u8  is_ext;
 };
 
@@ -228,7 +234,7 @@ 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;
 };
@@ -290,9 +296,11 @@ typedef gbp_rule
 
 typedef gbp_contract
 {
-  u16 src_epg;
-  u16 dst_epg;
+  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];
 };
@@ -317,18 +325,6 @@ define gbp_contract_details
   vl_api_gbp_contract_t contract;
 };
 
-/**
- * @brief Set the time throeshold after which an endpoint is
-          considered inative and is aged/reaped by the scanner
- * @param threshold In seconds
- */
-autoreply define gbp_endpoint_learn_set_inactive_threshold
-{
-  u32 client_index;
-  u32 context;
-  u32 threshold;
-};
-
 /**
  * @brief Configure a 'base' tunnel from which learned tunnels
  *        are permitted to derive
@@ -346,6 +342,7 @@ typedef gbp_vxlan_tunnel
   u32 vni;
   vl_api_gbp_vxlan_tunnel_mode_t mode;
   u32 bd_rd_id;
+  vl_api_ip4_address_t src;
 };
 
 define gbp_vxlan_tunnel_add