gbp: refactor policy nodes

[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 5310545..3e6d7ef 100644 (file)
--- a/src/plugins/gbp/gbp_bridge_domain.c
+++ b/src/plugins/gbp/gbp_bridge_domain.c
@@ -14,6 +14,7 @@
  */
 
 #include <plugins/gbp/gbp_bridge_domain.h>
+#include <plugins/gbp/gbp_route_domain.h>
 #include <plugins/gbp/gbp_endpoint.h>
 #include <plugins/gbp/gbp_learn.h>
 
@@ -34,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
  */
@@ -168,8 +174,31 @@ format_gbp_bridge_domain (u8 * s, va_list * args)
   return (s);
 }
 
+void
+gbp_bridge_domain_itf_add (u32 sw_if_index, u32 bd_index,
+                          l2_bd_port_type_t type)
+{
+  set_int_l2_mode (vlib_get_main (), vnet_get_main (), MODE_L2_BRIDGE,
+                  sw_if_index, bd_index, type, 0, 0);
+  /*
+   * adding an interface to the bridge enable learning on the
+   * interface. Disable learning on the interface by default for gbp
+   * interfaces
+   */
+  l2input_intf_bitmap_enable (sw_if_index, L2INPUT_FEAT_LEARN, 0);
+}
+
+void
+gbp_bridge_domain_itf_del (u32 sw_if_index, u32 bd_index,
+                          l2_bd_port_type_t type)
+{
+  set_int_l2_mode (vlib_get_main (), vnet_get_main (), MODE_L3, sw_if_index,
+                  bd_index, type, 0, 0);
+}
+
 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,
@@ -182,6 +211,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);
@@ -189,7 +219,7 @@ gbp_bridge_domain_add_and_lock (u32 bd_id,
       if (~0 == bd_index)
        return (VNET_API_ERROR_BD_NOT_MODIFIABLE);
 
-      bd_flags_t bd_flags = L2_LEARN;
+      bd_flags_t bd_flags = L2_NONE;
       if (flags & GBP_BD_FLAG_UU_FWD_DROP)
        bd_flags |= L2_UU_FLOOD;
       if (flags & GBP_BD_FLAG_MCAST_DROP)
@@ -205,33 +235,36 @@ 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
        */
-      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);
+      gbp_bridge_domain_itf_add (gb->gb_bvi_sw_if_index, bd_index,
+                                L2_BD_PORT_TYPE_BVI);
 
       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_bridge_domain_itf_add (gb->gb_uu_fwd_sw_if_index, bd_index,
+                                  L2_BD_PORT_TYPE_UU_FWD);
       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_bridge_domain_itf_add (gb->gb_bm_flood_sw_if_index, bd_index,
+                                    L2_BD_PORT_TYPE_NORMAL);
          gbp_learn_enable (gb->gb_bm_flood_sw_if_index, GBP_LEARN_MODE_L2);
        }
 
       /*
-       * unset learning in the bridge + any flag(s) set above
+       * unset any flag(s) set above
        */
       bd_set_flags (vlib_get_main (), bd_index, bd_flags, 0);
 
@@ -280,24 +313,20 @@ gbp_bridge_domain_unlock (index_t index)
                       (vnet_get_main (), gb->gb_bvi_sw_if_index),
                       gb->gb_bd_index, gb->gb_bvi_sw_if_index);
 
-      set_int_l2_mode (vlib_get_main (), vnet_get_main (),
-                      MODE_L3, gb->gb_bvi_sw_if_index,
-                      gb->gb_bd_index, L2_BD_PORT_TYPE_BVI, 0, 0);
+      gbp_bridge_domain_itf_del (gb->gb_bvi_sw_if_index, gb->gb_bd_index,
+                                L2_BD_PORT_TYPE_BVI);
       if (~0 != gb->gb_uu_fwd_sw_if_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_bridge_domain_itf_del (gb->gb_uu_fwd_sw_if_index, gb->gb_bd_index,
+                                  L2_BD_PORT_TYPE_UU_FWD);
       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_bridge_domain_itf_del (gb->gb_bm_flood_sw_if_index,
+                                    gb->gb_bd_index, L2_BD_PORT_TYPE_NORMAL);
          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);
     }
@@ -344,8 +373,8 @@ gbp_bridge_domain_cli (vlib_main_t * vm,
   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;
@@ -369,19 +398,24 @@ gbp_bridge_domain_cli (vlib_main_t * vm,
        ;
       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, "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, flags,
+      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);