X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=extras%2Fvom%2Fvom%2Fgbp_bridge_domain.cpp;h=e370a6abb0cedab1e212b58f29443ddae34fcf6b;hb=879d11c25;hp=6cad1954e5d605055aa5c7fe9b6eb77f7eaa917a;hpb=93cc3ee3b3a9c9224a1446625882205f3282a949;p=vpp.git diff --git a/extras/vom/vom/gbp_bridge_domain.cpp b/extras/vom/vom/gbp_bridge_domain.cpp index 6cad1954e5d..e370a6abb0c 100644 --- a/extras/vom/vom/gbp_bridge_domain.cpp +++ b/extras/vom/vom/gbp_bridge_domain.cpp @@ -21,6 +21,16 @@ 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( + 0, + "do-not-learn"); + +gbp_bridge_domain::flags_t::flags_t(int v, const std::string& s) + : enum_base(v, s) +{ +} + /** * A DB of al the interfaces, key on the name */ @@ -31,25 +41,67 @@ gbp_bridge_domain::event_handler gbp_bridge_domain::m_evh; /** * Construct a new object matching the desried state */ -gbp_bridge_domain::gbp_bridge_domain(const bridge_domain& bd) +gbp_bridge_domain::gbp_bridge_domain(const bridge_domain& bd, + const interface& bvi, + const flags_t& flags) : m_id(bd.id()) , m_bd(bd.singular()) + , m_bvi(bvi.singular()) + , m_uu_fwd() + , m_bm_flood() + , m_flags(flags) { } gbp_bridge_domain::gbp_bridge_domain(const bridge_domain& bd, 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_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 std::shared_ptr bvi, + const std::shared_ptr uu_fwd, + const std::shared_ptr bm_flood, + const flags_t& flags) + : m_id(bd.id()) + , m_bd(bd.singular()) + , m_bvi(bvi) + , m_uu_fwd(uu_fwd) + , m_bm_flood(bm_flood) + , m_flags(flags) +{ +} + +gbp_bridge_domain::gbp_bridge_domain(const bridge_domain& bd, + const interface& bvi, + const std::shared_ptr uu_fwd, + const std::shared_ptr bm_flood, + const flags_t& flags) + : m_id(bd.id()) + , m_bd(bd.singular()) + , m_bvi(bvi.singular()) + , m_uu_fwd(uu_fwd) + , m_bm_flood(bm_flood) + , m_flags(flags) { } gbp_bridge_domain::gbp_bridge_domain(const gbp_bridge_domain& bd) : m_id(bd.id()) , m_bd(bd.m_bd) + , m_bvi(bd.m_bvi) + , m_uu_fwd(bd.m_uu_fwd) + , m_bm_flood(bd.m_bm_flood) + , m_flags(bd.m_flags) { } @@ -65,6 +117,18 @@ gbp_bridge_domain::id() const return (m_bd->id()); } +const std::shared_ptr +gbp_bridge_domain::get_bridge_domain() const +{ + return m_bd; +} + +const std::shared_ptr +gbp_bridge_domain::get_bvi() const +{ + return m_bvi; +} + bool gbp_bridge_domain::operator==(const gbp_bridge_domain& b) const { @@ -84,6 +148,13 @@ gbp_bridge_domain::operator==(const gbp_bridge_domain& b) const 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); } @@ -100,12 +171,10 @@ void 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_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)); } } @@ -121,7 +190,14 @@ std::string 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(); + + if (m_bvi) + s << " bvi:" << m_bvi->to_string(); + if (m_uu_fwd) + s << " uu-fwd:" << m_uu_fwd->to_string(); + + s << "]"; return (s.str()); } @@ -139,12 +215,10 @@ gbp_bridge_domain::update(const gbp_bridge_domain& desired) * 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_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)); } } @@ -170,7 +244,7 @@ void gbp_bridge_domain::event_handler::handle_populate(const client_db::key_t& key) { /* - * dump VPP Bridge domains + * dump GBP Bridge domains */ std::shared_ptr cmd = std::make_shared(); @@ -183,17 +257,23 @@ gbp_bridge_domain::event_handler::handle_populate(const client_db::key_t& key) std::shared_ptr uu_fwd = interface::find(payload.bd.uu_fwd_sw_if_index); + std::shared_ptr bm_flood = + interface::find(payload.bd.bm_flood_sw_if_index); std::shared_ptr bvi = interface::find(payload.bd.bvi_sw_if_index); - if (uu_fwd && bvi) { - gbp_bridge_domain bd(payload.bd.bd_id, *bvi, *uu_fwd); + if (uu_fwd && bm_flood && bvi) { + gbp_bridge_domain bd(payload.bd.bd_id, bvi, uu_fwd, bm_flood); OM::commit(key, bd); VOM_LOG(log_level_t::DEBUG) << "dump: " << bd.to_string(); - } else { - gbp_bridge_domain bd(payload.bd.bd_id); + } else if (bvi) { + gbp_bridge_domain bd(payload.bd.bd_id, *bvi); 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; } } } @@ -213,7 +293,7 @@ gbp_bridge_domain::event_handler::handle_replay() dependency_t gbp_bridge_domain::event_handler::order() const { - return (dependency_t::TABLE); + return (dependency_t::VIRTUAL_TABLE); } void