forked from sonic-net/sonic-swss
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Replace RedisClient with DBConnector (sonic-net#1439)
After this PR: sonic-net/sonic-swss-common#382
- Loading branch information
1 parent
df38337
commit 3bd45f9
Showing
9 changed files
with
1,000 additions
and
24 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
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,152 @@ | ||
| /* Copyright(c) 2016-2019 Nephos. | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify it | ||
| * under the terms and conditions of the GNU General Public License, | ||
| * version 2, as published by the Free Software Foundation. | ||
| * | ||
| * This program is distributed in the hope it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
| * more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License along with | ||
| * this program; if not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| * The full GNU General Public License is included in this distribution in | ||
| * the file called "COPYING". | ||
| * | ||
| * Maintainer: Jim Jiang from nephos | ||
| */ | ||
|
|
||
| #ifndef __MCLAGLINK__ | ||
| #define __MCLAGLINK__ | ||
|
|
||
| #include <arpa/inet.h> | ||
| #include <sys/socket.h> | ||
| #include <linux/netlink.h> | ||
| #include <linux/rtnetlink.h> | ||
|
|
||
| #include <errno.h> | ||
| #include <assert.h> | ||
| #include <unistd.h> | ||
| #include <exception> | ||
| #include <string> | ||
| #include <map> | ||
| #include <set> | ||
|
|
||
| #include "producerstatetable.h" | ||
| #include "selectable.h" | ||
| #include "redisclient.h" | ||
| #include "mclagsyncd/mclag.h" | ||
|
|
||
| namespace swss { | ||
|
|
||
| #define ETHER_ADDR_STR_LEN 18 | ||
| #define MAX_L_PORT_NAME 20 | ||
|
|
||
| struct mclag_fdb_info | ||
| { | ||
| char mac[ETHER_ADDR_STR_LEN]; | ||
| unsigned int vid; | ||
| char port_name[MAX_L_PORT_NAME]; | ||
| short type; /*dynamic or static*/ | ||
| short op_type; /*add or del*/ | ||
| }; | ||
|
|
||
| struct mclag_fdb | ||
| { | ||
| std::string mac; | ||
| unsigned int vid; | ||
| std::string port_name; | ||
| std::string type;/*dynamic or static*/ | ||
|
|
||
| mclag_fdb(std::string val_mac, unsigned int val_vid, std::string val_pname, | ||
| std::string val_type) : mac(val_mac), vid(val_vid), port_name(val_pname), type(val_type) | ||
| { | ||
| } | ||
| mclag_fdb() | ||
| { | ||
| } | ||
|
|
||
| bool operator <(const mclag_fdb &fdb) const | ||
| { | ||
| if (mac != fdb.mac) | ||
| return mac < fdb.mac; | ||
| else if (vid != fdb.vid) | ||
| return vid < fdb.vid; | ||
| else | ||
| return port_name < fdb.port_name; | ||
| //else if (port_name != fdb.port_name) return port_name < fdb.port_name; | ||
| //else return type <fdb.type; | ||
| } | ||
|
|
||
| bool operator ==(const mclag_fdb &fdb) const | ||
| { | ||
| if (mac != fdb.mac) | ||
| return 0; | ||
| if (vid != fdb.vid) | ||
| return 0; | ||
| return 1; | ||
| } | ||
|
|
||
| }; | ||
|
|
||
| class MclagLink : public Selectable { | ||
| public: | ||
| const int MSG_BATCH_SIZE; | ||
| ProducerStateTable * p_port_tbl; | ||
| ProducerStateTable * p_lag_tbl; | ||
| ProducerStateTable * p_tnl_tbl; | ||
| ProducerStateTable * p_intf_tbl; | ||
| ProducerStateTable *p_fdb_tbl; | ||
| ProducerStateTable *p_acl_table_tbl; | ||
| ProducerStateTable *p_acl_rule_tbl; | ||
| DBConnector *p_appl_db; | ||
| DBConnector *p_asic_db; /*redis client access to ASIC_DB*/ | ||
| DBConnector *p_counters_db; /*redis client access to COUNTERS_DB*/ | ||
| std::set <mclag_fdb> *p_old_fdb; | ||
|
|
||
| MclagLink(uint16_t port = MCLAG_DEFAULT_PORT); | ||
| virtual ~MclagLink(); | ||
|
|
||
| /* Wait for connection (blocking) */ | ||
| void accept(); | ||
|
|
||
| int getFd() override; | ||
| uint64_t readData() override; | ||
|
|
||
| /* readMe throws MclagConnectionClosedException when connection is lost */ | ||
| class MclagConnectionClosedException : public std::exception | ||
| { | ||
| }; | ||
|
|
||
| private: | ||
| unsigned int m_bufSize; | ||
| char *m_messageBuffer; | ||
| char *m_messageBuffer_send; | ||
| unsigned int m_pos; | ||
|
|
||
| bool m_connected; | ||
| bool m_server_up; | ||
| int m_server_socket; | ||
| int m_connection_socket; | ||
|
|
||
| void getOidToPortNameMap(std::unordered_map<std::string, std:: string> & port_map); | ||
| void getBridgePortIdToAttrPortIdMap(std::map<std::string, std:: string> *oid_map); | ||
| void getVidByBvid(std::string &bvid, std::string &vlanid); | ||
| void getFdbSet(std::set<mclag_fdb> *fdb_set); | ||
| void setPortIsolate(char *msg); | ||
| void setPortMacLearnMode(char *msg); | ||
| void setFdbFlush(); | ||
| void setFdbFlushByPort(char *msg); | ||
| void setIntfMac(char *msg); | ||
| void setFdbEntry(char *msg, int msg_len); | ||
| ssize_t getFdbChange(char *msg_buf); | ||
| void connectionLostHandlePortIsolate(); | ||
| void connectionLostHandlePortLearnMode(); | ||
| void connectionLost(); | ||
| }; | ||
|
|
||
| } | ||
| #endif | ||
|
|
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,96 @@ | ||
| /* Copyright(c) 2016-2019 Nephos. | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify it | ||
| * under the terms and conditions of the GNU General Public License, | ||
| * version 2, as published by the Free Software Foundation. | ||
| * | ||
| * This program is distributed in the hope it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
| * more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License along with | ||
| * this program; if not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| * The full GNU General Public License is included in this distribution in | ||
| * the file called "COPYING". | ||
| * | ||
| * Maintainer: Jim Jiang from nephos | ||
| */ | ||
| #include <iostream> | ||
| #include "logger.h" | ||
| #include <map> | ||
| #include "select.h" | ||
| #include "netdispatcher.h" | ||
| #include "mclagsyncd/mclaglink.h" | ||
| #include <set> | ||
|
|
||
| using namespace std; | ||
| using namespace swss; | ||
|
|
||
| int main(int argc, char **argv) | ||
| { | ||
| swss::Logger::linkToDbNative("mclagsyncd"); | ||
| DBConnector appl_db("APPL_DB", 0); | ||
| DBConnector asic_db("ASIC_DB", 0); | ||
| DBConnector counters_db("COUNTERS_DB", 0); | ||
| ProducerStateTable port_tbl(&appl_db, APP_PORT_TABLE_NAME); | ||
| ProducerStateTable lag_tbl(&appl_db, APP_LAG_TABLE_NAME); | ||
| ProducerStateTable tnl_tbl(&appl_db, APP_VXLAN_TUNNEL_TABLE_NAME); | ||
| ProducerStateTable intf_tbl(&appl_db, APP_INTF_TABLE_NAME); | ||
| ProducerStateTable fdb_tbl(&appl_db, APP_FDB_TABLE_NAME); | ||
| ProducerStateTable acl_table_tbl(&appl_db, APP_ACL_TABLE_TABLE_NAME); | ||
| ProducerStateTable acl_rule_tbl(&appl_db, APP_ACL_RULE_TABLE_NAME); | ||
| map <string, string> isolate; | ||
| RedisPipeline pipeline(&appl_db); | ||
| set <mclag_fdb> old_fdb; | ||
|
|
||
| while (1) | ||
| { | ||
| try | ||
| { | ||
| MclagLink mclag; | ||
| Select s; | ||
|
|
||
| mclag.p_port_tbl = &port_tbl; | ||
| mclag.p_lag_tbl = &lag_tbl; | ||
| mclag.p_tnl_tbl = &tnl_tbl; | ||
| mclag.p_intf_tbl = &intf_tbl; | ||
| mclag.p_fdb_tbl = &fdb_tbl; | ||
| mclag.p_acl_table_tbl = &acl_table_tbl; | ||
| mclag.p_acl_rule_tbl = &acl_rule_tbl; | ||
| mclag.p_appl_db = &appl_db; | ||
| mclag.p_asic_db = &asic_db; | ||
| mclag.p_counters_db = &counters_db; | ||
| mclag.p_old_fdb = &old_fdb; | ||
|
|
||
| cout << "Waiting for connection..." << endl; | ||
| mclag.accept(); | ||
| cout << "Connected!" << endl; | ||
|
|
||
| s.addSelectable(&mclag); | ||
|
|
||
| while (true) | ||
| { | ||
| Selectable *temps; | ||
|
|
||
| /* Reading MCLAG messages forever (and calling "readData" to read them) */ | ||
| s.select(&temps); | ||
| pipeline.flush(); | ||
| SWSS_LOG_DEBUG("Pipeline flushed"); | ||
| } | ||
| } | ||
| catch (MclagLink::MclagConnectionClosedException &e) | ||
| { | ||
| cout << "Connection lost, reconnecting..." << endl; | ||
| } | ||
| catch (const exception& e) | ||
| { | ||
| cout << "Exception \"" << e.what() << "\" had been thrown in deamon" << endl; | ||
| return 0; | ||
| } | ||
| } | ||
|
|
||
| return 1; | ||
| } | ||
|
|
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
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
Oops, something went wrong.