-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Make openbmp support redis subscription/population on sonic. (#7)
Make openbmp support redis subscription/population on sonic. This PR contains below changes: Use -DENABLE_REDIS=ON to make openbmp support sonic redis population, without -DENABLE_REDIS=ON it keeps its original openbmp functionality/dependency, both of two path verification have been covered by current azure pipeline. Support BMP_STATE_DB specific table population per users' config via CONFIG_DB, config cli. Work together with bmpcfgd daemon Add bmpcfgd for monitoring config_db state change. sonic-host-services#121, and the detail workflow is as below: 3.1 bmpcfgd will be daemon which subscribe config_db table enablement, like bgp_neighbor_table/bgp_rib_in_table/bgp_rib_out_table, once config is changed, bmpcfgd will stop openbmpd, clear bmp related tables, then restart openbmpd 3.2 openbmpd will be daemon which accept connection from bgp, and populate BMP_STATE_DB for relevant bmp table like BGP_NEIGHBOR, etc. Integrate with swss-common library.
- Loading branch information
1 parent
6112422
commit 6b5f200
Showing
11 changed files
with
903 additions
and
90 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,154 @@ | ||
| /* | ||
| * Copyright (c) 2024 Microsoft, Inc. and others. All rights reserved. | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Eclipse Public License v1.0 which accompanies this distribution, | ||
| * and is available at http://www.eclipse.org/legal/epl-v10.html | ||
| * | ||
| */ | ||
|
|
||
| #include "RedisManager.h" | ||
|
|
||
|
|
||
| /*********************************************************************//** | ||
| * Constructor for class | ||
| ***********************************************************************/ | ||
| RedisManager::RedisManager() { | ||
| exit_ = false; | ||
| } | ||
|
|
||
| /*********************************************************************//** | ||
| * Constructor for class | ||
| ***********************************************************************/ | ||
| RedisManager::~RedisManager() { | ||
| } | ||
|
|
||
|
|
||
| /********************************************************************* | ||
| * Setup for this class | ||
| * | ||
| * \param [in] logPtr logger pointer | ||
| ***********************************************************************/ | ||
| void RedisManager::Setup(Logger *logPtr) { | ||
| logger = logPtr; | ||
| if (!swss::SonicDBConfig::isInit()) { | ||
| swss::SonicDBConfig::initialize(); | ||
| } | ||
|
|
||
| stateDb_ = std::make_shared<swss::DBConnector>(BMP_DB_NAME, 0, false); | ||
| separator_ = swss::SonicDBConfig::getSeparator(BMP_DB_NAME); | ||
| } | ||
|
|
||
|
|
||
|
|
||
| /** | ||
| * Get Key separator for deletion | ||
| * | ||
| * \param [in] N/A | ||
| */ | ||
| std::string RedisManager::GetKeySeparator() { | ||
| return separator_; | ||
| } | ||
|
|
||
|
|
||
| /** | ||
| * WriteBMPTable | ||
| * | ||
| * \param [in] table Reference to table name | ||
| * \param [in] key Reference to various keys list | ||
| * \param [in] fieldValues Reference to field-value pairs | ||
| */ | ||
| bool RedisManager::WriteBMPTable(const std::string& table, const std::vector<std::string>& keys, const std::vector<swss::FieldValueTuple> fieldValues) { | ||
|
|
||
| if (enabledTables_.find(table) == enabledTables_.end()) { | ||
| LOG_INFO("RedisManager %s is disabled", table.c_str()); | ||
| return false; | ||
| } | ||
| std::unique_ptr<swss::Table> stateBMPTable = std::make_unique<swss::Table>(stateDb_.get(), table); | ||
| std::ostringstream oss; | ||
| for (const auto& key : keys) { | ||
| oss << key << separator_; | ||
| } | ||
| std::string fullKey = oss.str(); | ||
| fullKey.pop_back(); | ||
|
|
||
| DEBUG("RedisManager WriteBMPTable key = %s", fullKey.c_str()); | ||
|
|
||
| stateBMPTable->set(fullKey, fieldValues); | ||
| return true; | ||
| } | ||
|
|
||
|
|
||
| /** | ||
| * RemoveEntityFromBMPTable | ||
| * | ||
| * \param [in] keys Reference to various keys | ||
| */ | ||
| bool RedisManager::RemoveEntityFromBMPTable(const std::vector<std::string>& keys) { | ||
|
|
||
| for (const auto& key : keys) { | ||
| DEBUG("RedisManager RemoveEntityFromBMPTable key = %s", key.c_str()); | ||
| } | ||
| stateDb_->del(keys); | ||
| return true; | ||
| } | ||
|
|
||
|
|
||
| /** | ||
| * ExitRedisManager | ||
| * | ||
| * \param [in] N/A | ||
| */ | ||
| void RedisManager::ExitRedisManager() { | ||
| exit_ = true; | ||
| } | ||
|
|
||
|
|
||
| /** | ||
| * InitBMPConfig, read config_db for table enablement setting. | ||
| * | ||
| * \param [in] N/A | ||
| */ | ||
| bool RedisManager::InitBMPConfig() { | ||
| std::shared_ptr<swss::DBConnector> cfgDb = | ||
| std::make_shared<swss::DBConnector>("CONFIG_DB", 0, false); | ||
| std::unique_ptr<swss::Table> cfgTable = std::make_unique<swss::Table>(cfgDb.get(), BMP_CFG_TABLE_NAME); | ||
| std::vector<swss::FieldValueTuple> fvt; | ||
| cfgTable->get(BMP_CFG_TABLE_KEY, fvt); | ||
| for (const auto& item : fvt) { | ||
| if (item.second == "true") { | ||
| enabledTables_.insert(item.first); | ||
| } | ||
| } | ||
| return true; | ||
| } | ||
|
|
||
|
|
||
| /** | ||
| * Reset ResetBMPTable, this will flush redis | ||
| * | ||
| * \param [in] table Reference to table name BGP_NEIGHBOR_TABLE/BGP_RIB_OUT_TABLE/BGP_RIB_IN_TABLE | ||
| */ | ||
| void RedisManager::ResetBMPTable(const std::string & table) { | ||
|
|
||
| LOG_INFO("RedisManager ResetBMPTable %s", table.c_str()); | ||
| std::unique_ptr<swss::Table> stateBMPTable = std::make_unique<swss::Table>(stateDb_.get(), table); | ||
| std::vector<std::string> keys; | ||
| stateBMPTable->getKeys(keys); | ||
| stateDb_->del(keys); | ||
| } | ||
|
|
||
|
|
||
|
|
||
| /** | ||
| * Reset all Tables once FRR reconnects to BMP, this will not disable table population | ||
| * | ||
| * \param [in] N/A | ||
| */ | ||
| void RedisManager::ResetAllTables() { | ||
| LOG_INFO("RedisManager ResetAllTables"); | ||
|
|
||
| for (const auto& enabledTable : enabledTables_) { | ||
| ResetBMPTable(enabledTable); | ||
| } | ||
| } |
Oops, something went wrong.