gbp: VRF scoped contracts

[vpp.git] / src / plugins / gbp / gbp_bridge_domain.c

diff --git a/src/plugins/gbp/gbp_bridge_domain.c b/src/plugins/gbp/gbp_bridge_domain.c
index 24bfb25..6c14fbc 100644 (file)
--- a/src/plugins/gbp/gbp_bridge_domain.c
+++ b/src/plugins/gbp/gbp_bridge_domain.c
@@ -14,8 +14,8 @@
  */
 
 #include <plugins/gbp/gbp_bridge_domain.h>
+#include <plugins/gbp/gbp_route_domain.h>
 #include <plugins/gbp/gbp_endpoint.h>
-#include <plugins/gbp/gbp_sclass.h>
 #include <plugins/gbp/gbp_learn.h>
 
 #include <vnet/dpo/dvr_dpo.h>
@@ -35,6 +35,11 @@ gbp_bridge_domain_t *gbp_bridge_domain_pool;
  */
 gbp_bridge_domain_db_t gbp_bridge_domain_db;
 
+/**
+ * Map of BD index to contract scope
+ */
+gbp_scope_t *gbp_scope_by_bd_index;
+
 /**
  * logger
  */
@@ -122,7 +127,13 @@ format_gbp_bridge_domain_flags (u8 * s, va_list * args)
   if (gf)
     {
       if (gf & GBP_BD_FLAG_DO_NOT_LEARN)
-       s = format (s, "do-not-learn");
+       s = format (s, "do-not-learn ");
+      if (gf & GBP_BD_FLAG_UU_FWD_DROP)
+       s = format (s, "uu-fwd-drop ");
+      if (gf & GBP_BD_FLAG_MCAST_DROP)
+       s = format (s, "mcast-drop ");
+      if (gf & GBP_BD_FLAG_UCAST_ARP)
+       s = format (s, "ucast-arp ");
     }
   else
     {
@@ -165,6 +176,7 @@ format_gbp_bridge_domain (u8 * s, va_list * args)
 
 int
 gbp_bridge_domain_add_and_lock (u32 bd_id,
+                               u32 rd_id,
                                gbp_bridge_domain_flags_t flags,
                                u32 bvi_sw_if_index,
                                u32 uu_fwd_sw_if_index,
@@ -177,6 +189,7 @@ gbp_bridge_domain_add_and_lock (u32 bd_id,
 
   if (INDEX_INVALID == gbi)
     {
+      gbp_route_domain_t *gr;
       u32 bd_index;
 
       bd_index = bd_find_index (&bd_main, bd_id);
@@ -184,10 +197,11 @@ gbp_bridge_domain_add_and_lock (u32 bd_id,
       if (~0 == bd_index)
        return (VNET_API_ERROR_BD_NOT_MODIFIABLE);
 
-      /*
-       * unset learning in the bridge
-       */
-      bd_set_flags (vlib_get_main (), bd_index, L2_LEARN, 0);
+      bd_flags_t bd_flags = L2_LEARN;
+      if (flags & GBP_BD_FLAG_UU_FWD_DROP)
+       bd_flags |= L2_UU_FLOOD;
+      if (flags & GBP_BD_FLAG_MCAST_DROP)
+       bd_flags |= L2_FLOOD;
 
       pool_get (gbp_bridge_domain_pool, gb);
       memset (gb, 0, sizeof (*gb));
@@ -199,6 +213,14 @@ gbp_bridge_domain_add_and_lock (u32 bd_id,
       gb->gb_bm_flood_sw_if_index = bm_flood_sw_if_index;
       gb->gb_locks = 1;
       gb->gb_flags = flags;
+      gb->gb_rdi = gbp_route_domain_find_and_lock (rd_id);
+
+      /*
+       * set the scope from the BD's RD's scope
+       */
+      gr = gbp_route_domain_get (gb->gb_rdi);
+      vec_validate (gbp_scope_by_bd_index, gb->gb_bd_index);
+      gbp_scope_by_bd_index[gb->gb_bd_index] = gr->grd_scope;
 
       /*
        * Set the BVI and uu-flood interfaces into the BD
@@ -206,22 +228,35 @@ gbp_bridge_domain_add_and_lock (u32 bd_id,
       set_int_l2_mode (vlib_get_main (), vnet_get_main (),
                       MODE_L2_BRIDGE, gb->gb_bvi_sw_if_index,
                       bd_index, L2_BD_PORT_TYPE_BVI, 0, 0);
-      if (~0 != gb->gb_uu_fwd_sw_if_index)
+
+      if ((!(flags & GBP_BD_FLAG_UU_FWD_DROP)
+          || (flags & GBP_BD_FLAG_UCAST_ARP))
+         && ~0 != gb->gb_uu_fwd_sw_if_index)
        {
          set_int_l2_mode (vlib_get_main (), vnet_get_main (),
                           MODE_L2_BRIDGE, gb->gb_uu_fwd_sw_if_index,
                           bd_index, L2_BD_PORT_TYPE_UU_FWD, 0, 0);
-         gbp_sclass_enable_l2 (gb->gb_uu_fwd_sw_if_index);
        }
-      if (~0 != gb->gb_bm_flood_sw_if_index)
+      if (!(flags & GBP_BD_FLAG_MCAST_DROP)
+         && ~0 != gb->gb_bm_flood_sw_if_index)
        {
          set_int_l2_mode (vlib_get_main (), vnet_get_main (),
                           MODE_L2_BRIDGE, gb->gb_bm_flood_sw_if_index,
                           bd_index, L2_BD_PORT_TYPE_NORMAL, 0, 0);
-         gbp_sclass_enable_l2 (gb->gb_bm_flood_sw_if_index);
          gbp_learn_enable (gb->gb_bm_flood_sw_if_index, GBP_LEARN_MODE_L2);
        }
 
+      /*
+       * unset learning in the bridge + any flag(s) set above
+       */
+      bd_set_flags (vlib_get_main (), bd_index, bd_flags, 0);
+
+      if (flags & GBP_BD_FLAG_UCAST_ARP)
+       {
+         bd_flags = L2_ARP_UFWD;
+         bd_set_flags (vlib_get_main (), bd_index, bd_flags, 1);
+       }
+
       /*
        * Add the BVI's MAC to the L2FIB
        */
@@ -269,18 +304,17 @@ gbp_bridge_domain_unlock (index_t index)
          set_int_l2_mode (vlib_get_main (), vnet_get_main (),
                           MODE_L3, gb->gb_uu_fwd_sw_if_index,
                           gb->gb_bd_index, L2_BD_PORT_TYPE_UU_FWD, 0, 0);
-         gbp_sclass_disable_l2 (gb->gb_uu_fwd_sw_if_index);
        }
       if (~0 != gb->gb_bm_flood_sw_if_index)
        {
          set_int_l2_mode (vlib_get_main (), vnet_get_main (),
                           MODE_L3, gb->gb_bm_flood_sw_if_index,
                           gb->gb_bd_index, L2_BD_PORT_TYPE_NORMAL, 0, 0);
-         gbp_sclass_disable_l2 (gb->gb_bm_flood_sw_if_index);
          gbp_learn_enable (gb->gb_bm_flood_sw_if_index, GBP_LEARN_MODE_L2);
        }
 
       gbp_bridge_domain_db_remove (gb);
+      gbp_route_domain_unlock (gb->gb_rdi);
 
       pool_put (gbp_bridge_domain_pool, gb);
     }
@@ -324,12 +358,15 @@ gbp_bridge_domain_cli (vlib_main_t * vm,
                       unformat_input_t * input, vlib_cli_command_t * cmd)
 {
   vnet_main_t *vnm = vnet_get_main ();
+  gbp_bridge_domain_flags_t flags;
   u32 bm_flood_sw_if_index = ~0;
   u32 uu_fwd_sw_if_index = ~0;
+  u32 bd_id = ~0, rd_id = ~0;
   u32 bvi_sw_if_index = ~0;
-  u32 bd_id = ~0;
   u8 add = 1;
 
+  flags = GBP_BD_FLAG_NONE;
+
   while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
     {
       if (unformat (input, "bvi %U", unformat_vnet_sw_interface,
@@ -345,21 +382,28 @@ gbp_bridge_domain_cli (vlib_main_t * vm,
        add = 1;
       else if (unformat (input, "del"))
        add = 0;
+      else if (unformat (input, "flags %d", &flags))
+       ;
       else if (unformat (input, "bd %d", &bd_id))
        ;
+      else if (unformat (input, "rd %d", &rd_id))
+       ;
       else
        break;
     }
 
   if (~0 == bd_id)
-    return clib_error_return (0, "EPG-ID must be specified");
+    return clib_error_return (0, "BD-ID must be specified");
+  if (~0 == rd_id)
+    return clib_error_return (0, "RD-ID must be specified");
 
   if (add)
     {
       if (~0 == bvi_sw_if_index)
        return clib_error_return (0, "interface must be specified");
 
-      gbp_bridge_domain_add_and_lock (bd_id, GBP_BD_FLAG_NONE,
+      gbp_bridge_domain_add_and_lock (bd_id, rd_id,
+                                     flags,
                                      bvi_sw_if_index,
                                      uu_fwd_sw_if_index,
                                      bm_flood_sw_if_index);
@@ -374,13 +418,13 @@ gbp_bridge_domain_cli (vlib_main_t * vm,
  * Configure a GBP bridge-domain
  *
  * @cliexpar
- * @cliexstart{set gbp bridge-domain [del] bd <ID> bvi <interface> uu-flood <interface>}
+ * @cliexstart{gbp bridge-domain [del] bd <ID> bvi <interface> [uu-fwd <interface>] [bm-flood <interface>] [flags <flags>]}
  * @cliexend
  ?*/
 /* *INDENT-OFF* */
 VLIB_CLI_COMMAND (gbp_bridge_domain_cli_node, static) = {
   .path = "gbp bridge-domain",
-  .short_help = "gbp bridge-domain [del] epg bd <ID> bvi <interface> uu-flood <interface>",
+  .short_help = "gbp bridge-domain [del] bd <ID> bvi <interface> [uu-fwd <interface>] [bm-flood <interface>] [flags <flags>]",
   .function = gbp_bridge_domain_cli,
 };