namespace VOM {
+const gbp_bridge_domain::flags_t gbp_bridge_domain::flags_t::NONE(0, "none");
+const gbp_bridge_domain::flags_t gbp_bridge_domain::flags_t::DO_NOT_LEARN(
+ 1,
+ "do-not-learn");
+const gbp_bridge_domain::flags_t gbp_bridge_domain::flags_t::UU_FWD_DROP(
+ 2,
+ "uu-fwd-drop");
+const gbp_bridge_domain::flags_t gbp_bridge_domain::flags_t::MCAST_DROP(
+ 4,
+ "mcast-drop");
+const gbp_bridge_domain::flags_t gbp_bridge_domain::flags_t::UCAST_ARP(
+ 8,
+ "ucast-arp");
+
+gbp_bridge_domain::flags_t::flags_t(int v, const std::string& s)
+ : enum_base<gbp_bridge_domain::flags_t>(v, s)
+{
+}
+
/**
* A DB of al the interfaces, key on the name
*/
* Construct a new object matching the desried state
*/
gbp_bridge_domain::gbp_bridge_domain(const bridge_domain& bd,
- const interface& bvi)
+ const gbp_route_domain& rd,
+ const interface& bvi,
+ const flags_t& flags)
: m_id(bd.id())
, m_bd(bd.singular())
+ , m_rd(rd.singular())
, m_bvi(bvi.singular())
-{
-}
-
-gbp_bridge_domain::gbp_bridge_domain(const bridge_domain& bd)
- : m_id(bd.id())
- , m_bd(bd.singular())
+ , m_uu_fwd()
+ , m_bm_flood()
+ , m_flags(flags)
{
}
gbp_bridge_domain::gbp_bridge_domain(const bridge_domain& bd,
+ const gbp_route_domain& rd,
const interface& bvi,
- const interface& uu_fwd)
+ const interface& uu_fwd,
+ const interface& bm_flood,
+ const flags_t& flags)
: m_id(bd.id())
, m_bd(bd.singular())
+ , m_rd(rd.singular())
, m_bvi(bvi.singular())
, m_uu_fwd(uu_fwd.singular())
+ , m_bm_flood(bm_flood.singular())
+ , m_flags(flags)
{
}
gbp_bridge_domain::gbp_bridge_domain(const bridge_domain& bd,
+ const gbp_route_domain& rd,
const std::shared_ptr<interface> bvi,
- const std::shared_ptr<interface> uu_fwd)
+ const std::shared_ptr<interface> uu_fwd,
+ const std::shared_ptr<interface> bm_flood,
+ const flags_t& flags)
: m_id(bd.id())
, m_bd(bd.singular())
- , m_bvi(bvi->singular())
- , m_uu_fwd(uu_fwd->singular())
+ , m_rd(rd.singular())
+ , m_bvi(bvi)
+ , m_uu_fwd(uu_fwd)
+ , m_bm_flood(bm_flood)
+ , m_flags(flags)
{
+ if (m_bvi)
+ m_bvi = m_bvi->singular();
+ if (m_uu_fwd)
+ m_uu_fwd = m_uu_fwd->singular();
+ if (m_bm_flood)
+ m_bm_flood = m_bm_flood->singular();
}
gbp_bridge_domain::gbp_bridge_domain(const bridge_domain& bd,
+ const gbp_route_domain& rd,
const interface& bvi,
- const std::shared_ptr<interface> uu_fwd)
+ const std::shared_ptr<interface> uu_fwd,
+ const std::shared_ptr<interface> bm_flood,
+ const flags_t& flags)
: m_id(bd.id())
, m_bd(bd.singular())
+ , m_rd(rd.singular())
, m_bvi(bvi.singular())
- , m_uu_fwd(uu_fwd->singular())
+ , m_uu_fwd(uu_fwd)
+ , m_bm_flood(bm_flood)
+ , m_flags(flags)
{
+ if (m_uu_fwd)
+ m_uu_fwd = m_uu_fwd->singular();
+ if (m_bm_flood)
+ m_bm_flood = m_bm_flood->singular();
}
gbp_bridge_domain::gbp_bridge_domain(const gbp_bridge_domain& bd)
: m_id(bd.id())
, m_bd(bd.m_bd)
+ , m_rd(bd.m_rd)
, m_bvi(bd.m_bvi)
, m_uu_fwd(bd.m_uu_fwd)
+ , m_bm_flood(bd.m_bm_flood)
+ , m_flags(bd.m_flags)
{
}
}
const std::shared_ptr<bridge_domain>
-gbp_bridge_domain::get_bridge_domain()
+gbp_bridge_domain::get_bridge_domain() const
{
return m_bd;
}
const std::shared_ptr<interface>
-gbp_bridge_domain::get_bvi()
+gbp_bridge_domain::get_bvi() const
{
return m_bvi;
}
else
equal = false;
+ if (m_bm_flood && b.m_bm_flood)
+ equal &= (m_bm_flood->key() == b.m_bm_flood->key());
+ else if (!m_bm_flood && !b.m_bm_flood)
+ ;
+ else
+ equal = false;
+
return ((m_bd->key() == b.m_bd->key()) && equal);
}
gbp_bridge_domain::replay()
{
if (rc_t::OK == m_id.rc()) {
- if (m_bvi && m_uu_fwd)
- HW::enqueue(new gbp_bridge_domain_cmds::create_cmd(m_id, m_bvi->handle(),
- m_uu_fwd->handle()));
- else
- HW::enqueue(new gbp_bridge_domain_cmds::create_cmd(
- m_id, handle_t::INVALID, handle_t::INVALID));
+ HW::enqueue(new gbp_bridge_domain_cmds::create_cmd(
+ m_id, m_rd->id(), (m_bvi ? m_bvi->handle() : handle_t::INVALID),
+ (m_uu_fwd ? m_uu_fwd->handle() : handle_t::INVALID),
+ (m_bm_flood ? m_bm_flood->handle() : handle_t::INVALID), m_flags));
}
}
gbp_bridge_domain::to_string() const
{
std::ostringstream s;
- s << "gbp-bridge-domain:[" << m_bd->to_string();
+ s << "gbp-bridge-domain:[" << m_bd->to_string()
+ << " flags:" << m_flags.to_string();
if (m_bvi)
s << " bvi:" << m_bvi->to_string();
* the desired state is always that the interface should be created
*/
if (rc_t::OK != m_id.rc()) {
- if (m_bvi && m_uu_fwd)
- HW::enqueue(new gbp_bridge_domain_cmds::create_cmd(m_id, m_bvi->handle(),
- m_uu_fwd->handle()));
- else
- HW::enqueue(new gbp_bridge_domain_cmds::create_cmd(
- m_id, handle_t::INVALID, handle_t::INVALID));
+ HW::enqueue(new gbp_bridge_domain_cmds::create_cmd(
+ m_id, m_rd->id(), (m_bvi ? m_bvi->handle() : handle_t::INVALID),
+ (m_uu_fwd ? m_uu_fwd->handle() : handle_t::INVALID),
+ (m_bm_flood ? m_bm_flood->handle() : handle_t::INVALID), m_flags));
}
}
gbp_bridge_domain::event_handler::handle_populate(const client_db::key_t& key)
{
/*
- * dump VPP Bridge domains
+ * dump GBP Bridge domains
*/
std::shared_ptr<gbp_bridge_domain_cmds::dump_cmd> cmd =
std::make_shared<gbp_bridge_domain_cmds::dump_cmd>();
std::shared_ptr<interface> uu_fwd =
interface::find(payload.bd.uu_fwd_sw_if_index);
+ std::shared_ptr<interface> bm_flood =
+ interface::find(payload.bd.bm_flood_sw_if_index);
std::shared_ptr<interface> bvi =
interface::find(payload.bd.bvi_sw_if_index);
-
- if (uu_fwd && bvi) {
- gbp_bridge_domain bd(payload.bd.bd_id, bvi, uu_fwd);
+ std::shared_ptr<gbp_route_domain> grd =
+ gbp_route_domain::find(payload.bd.rd_id);
+
+ flags_t flags = gbp_bridge_domain::flags_t::NONE;
+ if (payload.bd.flags & GBP_BD_API_FLAG_DO_NOT_LEARN)
+ flags |= gbp_bridge_domain::flags_t::DO_NOT_LEARN;
+ if (payload.bd.flags & GBP_BD_API_FLAG_UU_FWD_DROP)
+ flags |= gbp_bridge_domain::flags_t::UU_FWD_DROP;
+ if (payload.bd.flags & GBP_BD_API_FLAG_MCAST_DROP)
+ flags |= gbp_bridge_domain::flags_t::MCAST_DROP;
+ if (payload.bd.flags & GBP_BD_API_FLAG_UCAST_ARP)
+ flags |= gbp_bridge_domain::flags_t::UCAST_ARP;
+
+ if (uu_fwd && bm_flood && bvi && grd) {
+ gbp_bridge_domain bd(payload.bd.bd_id, *grd, bvi, uu_fwd, bm_flood,
+ flags);
OM::commit(key, bd);
VOM_LOG(log_level_t::DEBUG) << "dump: " << bd.to_string();
} else if (bvi) {
- gbp_bridge_domain bd(payload.bd.bd_id, *bvi);
+ gbp_bridge_domain bd(payload.bd.bd_id, *grd, *bvi, flags);
OM::commit(key, bd);
VOM_LOG(log_level_t::DEBUG) << "dump: " << bd.to_string();
+ } else {
+ VOM_LOG(log_level_t::ERROR)
+ << "no BVI:" << payload.bd.bvi_sw_if_index
+ << " nor uu-fwd:" << payload.bd.uu_fwd_sw_if_index;
}
}
}
dependency_t
gbp_bridge_domain::event_handler::order() const
{
- return (dependency_t::TABLE);
+ /* order after gbp-route-domains */
+ return (dependency_t::ACL);
}
void