diff options
author | 2019-03-15 09:04:52 -0700 | |
---|---|---|
committer | 2019-03-18 15:27:20 +0000 | |
commit | 5cbf7c7a88de1db7bc244b7da03ece6a4a977e45 (patch) | |
tree | 07061c1c76d82b2f895274517ad44e68857a5ee7 /extras/vom/vom | |
parent | c0692a4496c64c15164ef2d49b0555cbe7f1a2f6 (diff) |
VOM: GBP: L3-out subnets need only the sclass not an EPG
Change-Id: Ic600233ea69216aeee707a103bf840fbeec5c205
Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'extras/vom/vom')
-rw-r--r-- | extras/vom/vom/gbp_subnet.cpp | 22 | ||||
-rw-r--r-- | extras/vom/vom/gbp_subnet.hpp | 7 |
2 files changed, 18 insertions, 11 deletions
diff --git a/extras/vom/vom/gbp_subnet.cpp b/extras/vom/vom/gbp_subnet.cpp index 304da3ef496..35422e2a6d4 100644 --- a/extras/vom/vom/gbp_subnet.cpp +++ b/extras/vom/vom/gbp_subnet.cpp @@ -47,6 +47,7 @@ gbp_subnet::gbp_subnet(const gbp_route_domain& rd, , m_type(type) , m_recirc(nullptr) , m_epg(nullptr) + , m_sclass(~0) { } @@ -60,18 +61,20 @@ gbp_subnet::gbp_subnet(const gbp_route_domain& rd, , m_type(type_t::STITCHED_EXTERNAL) , m_recirc(recirc.singular()) , m_epg(epg.singular()) + , m_sclass(~0) { } gbp_subnet::gbp_subnet(const gbp_route_domain& rd, const route::prefix_t& prefix, - const gbp_endpoint_group& epg) + sclass_t sclass) : m_hw(false) , m_rd(rd.singular()) , m_prefix(prefix) , m_type(type_t::L3_OUT) , m_recirc(nullptr) - , m_epg(epg.singular()) + , m_epg() + , m_sclass(sclass) { } @@ -82,6 +85,7 @@ gbp_subnet::gbp_subnet(const gbp_subnet& o) , m_type(o.m_type) , m_recirc(o.m_recirc) , m_epg(o.m_epg) + , m_sclass(o.m_sclass) { } @@ -101,7 +105,8 @@ bool gbp_subnet::operator==(const gbp_subnet& gs) const { return ((key() == gs.key()) && (m_type == gs.m_type) && - (m_recirc == gs.m_recirc) && (m_epg == gs.m_epg)); + (m_recirc == gs.m_recirc) && (m_epg == gs.m_epg) && + (m_sclass == gs.m_sclass)); } void @@ -120,7 +125,7 @@ gbp_subnet::replay() HW::enqueue(new gbp_subnet_cmds::create_cmd( m_hw, m_rd->id(), m_prefix, m_type, (m_recirc ? m_recirc->handle() : handle_t::INVALID), - (m_epg ? m_epg->sclass() : ~0))); + (m_epg ? m_epg->sclass() : m_sclass))); } } @@ -147,7 +152,7 @@ gbp_subnet::update(const gbp_subnet& r) HW::enqueue(new gbp_subnet_cmds::create_cmd( m_hw, m_rd->id(), m_prefix, m_type, (m_recirc ? m_recirc->handle() : handle_t::INVALID), - (m_epg ? m_epg->sclass() : ~0))); + (m_epg ? m_epg->sclass() : m_sclass))); } else { if (m_type != r.m_type) { m_epg = r.m_epg; @@ -157,7 +162,7 @@ gbp_subnet::update(const gbp_subnet& r) HW::enqueue(new gbp_subnet_cmds::create_cmd( m_hw, m_rd->id(), m_prefix, m_type, (m_recirc ? m_recirc->handle() : handle_t::INVALID), - (m_epg ? m_epg->sclass() : ~0))); + (m_epg ? m_epg->sclass() : m_sclass))); } } } @@ -229,10 +234,7 @@ gbp_subnet::event_handler::handle_populate(const client_db::key_t& key) break; } case GBP_API_SUBNET_L3_OUT: { - std::shared_ptr<gbp_endpoint_group> epg = - gbp_endpoint_group::find(payload.subnet.sclass); - - gbp_subnet gs(*rd, pfx, *epg); + gbp_subnet gs(*rd, pfx, payload.subnet.sclass); OM::commit(key, gs); VOM_LOG(log_level_t::DEBUG) << "read: " << gs.to_string(); break; diff --git a/extras/vom/vom/gbp_subnet.hpp b/extras/vom/vom/gbp_subnet.hpp index f18aa01431e..bff32ffaf2f 100644 --- a/extras/vom/vom/gbp_subnet.hpp +++ b/extras/vom/vom/gbp_subnet.hpp @@ -82,7 +82,7 @@ public: */ gbp_subnet(const gbp_route_domain& rd, const route::prefix_t& prefix, - const gbp_endpoint_group& epg); + sclass_t sclass); /** * Copy Construct @@ -221,6 +221,11 @@ private: std::shared_ptr<gbp_endpoint_group> m_epg; /** + * Sclass for l3-out subnets + */ + sclass_t m_sclass; + + /** * A map of all bridge_domains */ static singular_db<key_t, gbp_subnet> m_db; |