Skip to content

Multi-Db changes for NAT feature. #1202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lguohan merged 2 commits into from
Mar 8, 2020
Merged

Multi-Db changes for NAT feature. #1202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
331d545
Multi-Db changes for NAT feature in sonic-swss repo.
AkhileshSamineni Feb 21, 2020
5a323ff
Addressed review comments.
AkhileshSamineni Feb 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cfgmgr/natmgrd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,9 @@ int main(int argc, char **argv)
CFG_ACL_RULE_TABLE_NAME
};

DBConnector cfgDb(CONFIG_DB, DBConnector::DEFAULT_UNIXSOCKET, 0);
DBConnector appDb(APPL_DB, DBConnector::DEFAULT_UNIXSOCKET, 0);
DBConnector stateDb(STATE_DB, DBConnector::DEFAULT_UNIXSOCKET, 0);
DBConnector cfgDb("CONFIG_DB", 0);
DBConnector appDb("APPL_DB", 0);
DBConnector stateDb("STATE_DB", 0);

cleanupNotifier = std::make_shared<swss::NotificationProducer>(&appDb, "NAT_DB_CLEANUP_NOTIFICATION");

Expand Down
4 changes: 2 additions & 2 deletions natsyncd/natsyncd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ int main(int argc, char **argv)
{
Logger::linkToDbNative("natsyncd");

DBConnector appDb(APPL_DB, DBConnector::DEFAULT_UNIXSOCKET, 0);
DBConnector appDb("APPL_DB", 0);
DBConnector stateDb("STATE_DB", 0);
RedisPipeline pipelineAppDB(&appDb);
DBConnector stateDb(STATE_DB, DBConnector::DEFAULT_UNIXSOCKET, 0);
NfNetlink nfnl;

nfnl.registerRecvCallbacks();
Expand Down
2 changes: 1 addition & 1 deletion orchagent/natorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ NatOrch::NatOrch(DBConnector *appDb, DBConnector *stateDb, vector<table_name_wit
Orch(appDb, tableNames),
m_neighOrch(neighOrch),
m_routeOrch(routeOrch),
m_countersDb(COUNTERS_DB, DBConnector::DEFAULT_UNIXSOCKET, 0),
m_countersDb("COUNTERS_DB", 0),
m_countersNatTable(&m_countersDb, COUNTERS_NAT_TABLE),
m_countersNaptTable(&m_countersDb, COUNTERS_NAPT_TABLE),
m_countersTwiceNatTable(&m_countersDb, COUNTERS_TWICE_NAT_TABLE),
Expand Down