Skip to content

Commit

Permalink
addressed review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
@gitsabari
gitsabari committed May 2, 2021
1 parent cdd57a7 commit 8d6eb61
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 46 deletions.
52 changes: 26 additions & 26 deletions mclagsyncd/mclaglink.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ void MclagLink::getVidByBvid(std::string &bvid, std::string &vlanid)
return;
}

void MclagLink::mclagsyncd_fetch_system_mac_from_configdb()
void MclagLink::mclagsyncdFetchSystemMacFromConfigdb()
{
vector<FieldValueTuple> fvs;
p_device_metadata_tbl->get("localhost",fvs);
Expand All @@ -133,7 +133,7 @@ void MclagLink::mclagsyncd_fetch_system_mac_from_configdb()
}


void MclagLink::mclagsyncd_fetch_mclag_config_from_configdb()
void MclagLink::mclagsyncdFetchMclagConfigFromConfigdb()
{
TableDump mclag_cfg_dump;
SWSS_LOG_NOTICE("mclag cfg dump....");
Expand All @@ -160,7 +160,7 @@ void MclagLink::mclagsyncd_fetch_mclag_config_from_configdb()
}
}

void MclagLink::mclagsyncd_fetch_mclag_interface_config_from_configdb()
void MclagLink::mclagsyncdFetchMclagInterfaceConfigFromConfigdb()
{
TableDump mclag_intf_cfg_dump;
SWSS_LOG_NOTICE("mclag cfg dump....");
Expand All @@ -182,7 +182,7 @@ void MclagLink::mclagsyncd_fetch_mclag_interface_config_from_configdb()
kfvFieldsValues(cfgentry).push_back(value);
}
entries.push_back(cfgentry);
mclagsyncd_send_mclag_iface_cfg(entries);
mclagsyncdSendMclagIfaceCfg(entries);
}
}

Expand Down Expand Up @@ -531,7 +531,7 @@ void MclagLink::setFdbEntry(char *msg, int msg_len)
return;
}

void MclagLink::mclagsyncd_send_fdb_entries(std::deque<KeyOpFieldsValuesTuple> &entries)
void MclagLink::mclagsyncdSendFdbEntries(std::deque<KeyOpFieldsValuesTuple> &entries)
{
size_t infor_len = sizeof(mclag_msg_hdr_t);
struct mclag_fdb_info info;
Expand Down Expand Up @@ -997,7 +997,7 @@ void MclagLink::delDomainCfgDependentSelectables()
}


void MclagLink::mclagsyncd_send_mclag_iface_cfg(std::deque<KeyOpFieldsValuesTuple> &entries)
void MclagLink::mclagsyncdSendMclagIfaceCfg(std::deque<KeyOpFieldsValuesTuple> &entries)
{
struct mclag_iface_cfg_info cfg_info;
mclag_msg_hdr_t *cfg_msg_hdr = NULL;
Expand Down Expand Up @@ -1096,7 +1096,7 @@ void MclagLink::mclagsyncd_send_mclag_iface_cfg(std::deque<KeyOpFieldsValuesTupl
return;
}

void MclagLink::mclagsyncd_send_mclag_unique_ip_cfg(std::deque<KeyOpFieldsValuesTuple> &entries)
void MclagLink::mclagsyncdSendMclagUniqueIpCfg(std::deque<KeyOpFieldsValuesTuple> &entries)
{
struct mclag_unique_ip_cfg_info cfg_info;
mclag_msg_hdr_t *cfg_msg_hdr = NULL;
Expand Down Expand Up @@ -1297,7 +1297,7 @@ void MclagLink::processVlanMemberTableUpdates(std::deque<KeyOpFieldsValuesTuple>


/* Enable/Disable traffic distribution mode for LAG member port */
void MclagLink::mclagsyncd_set_traffic_disable(
void MclagLink::mclagsyncdSetTrafficDisable(
char *msg,
uint8_t msg_type)
{
Expand Down Expand Up @@ -1328,7 +1328,7 @@ void MclagLink::mclagsyncd_set_traffic_disable(
}

/* Set the oper_status field in the STATE_MCLAG_TABLE */
void MclagLink::mclagsyncd_set_iccp_state(
void MclagLink::mclagsyncdSetIccpState(
char *msg,
size_t msg_len)
{
Expand Down Expand Up @@ -1376,7 +1376,7 @@ void MclagLink::mclagsyncd_set_iccp_state(
}

/* Set the role field in the STATE_MCLAG_TABLE */
void MclagLink::mclagsyncd_set_iccp_role(
void MclagLink::mclagsyncdSetIccpRole(
char *msg,
size_t msg_len)
{
Expand Down Expand Up @@ -1432,7 +1432,7 @@ void MclagLink::mclagsyncd_set_iccp_role(
}

/* Set the system_mac field in the STATE_MCLAG_TABLE */
void MclagLink::mclagsyncd_set_system_id(
void MclagLink::mclagsyncdSetSystemId(
char *msg,
size_t msg_len)
{
Expand Down Expand Up @@ -1483,7 +1483,7 @@ void MclagLink::processStateFdb(SubscriberStateTable *stateFdbTbl)
SWSS_LOG_INFO("MCLAGSYNCD: Process State Fdb events ");
std::deque<KeyOpFieldsValuesTuple> entries;
stateFdbTbl->pops(entries);
mclagsyncd_send_fdb_entries(entries);
mclagsyncdSendFdbEntries(entries);
}

void MclagLink::processStateVlanMember(SubscriberStateTable *stateVlanMemberTbl)
Expand All @@ -1495,7 +1495,7 @@ void MclagLink::processStateVlanMember(SubscriberStateTable *stateVlanMemberTbl)
}

/* Delete Mlag entry in the STATE_MCLAG_TABLE */
void MclagLink::mclagsyncd_del_iccp_info(
void MclagLink::mclagsyncdDelIccpInfo(
char *msg)
{
int mlag_id;
Expand Down Expand Up @@ -1549,7 +1549,7 @@ void MclagLink::deleteLocalIfPortIsolate(std::string mclag_if)
* STATE_MCLAG_REMOTE_INTF_TABLE.
* Key = "Mclag<id>|interface"
*/
void MclagLink::mclagsyncd_set_remote_if_state(
void MclagLink::mclagsyncdSetRemoteIfState(
char *msg,
size_t msg_len)
{
Expand Down Expand Up @@ -1606,7 +1606,7 @@ void MclagLink::mclagsyncd_set_remote_if_state(
/* Delete remote interface state entry in the STATE_MCLAG_REMOTE_INTF_TABLE
* Key = "Mclag<id>|interface"
*/
void MclagLink::mclagsyncd_del_remote_if_info(
void MclagLink::mclagsyncdDelRemoteIfInfo(
char *msg,
size_t msg_len)
{
Expand Down Expand Up @@ -1654,7 +1654,7 @@ void MclagLink::mclagsyncd_del_remote_if_info(
/* Set peer-link isolation for the specified Mlag interface
* Notes: Mlag-ID is not used currently for the local interface table
*/
void MclagLink::mclagsyncd_set_peer_link_isolation(
void MclagLink::mclagsyncdSetPeerLinkIsolation(
char *msg,
size_t msg_len)
{
Expand Down Expand Up @@ -1705,7 +1705,7 @@ void MclagLink::mclagsyncd_set_peer_link_isolation(
}

/* Set the remote system mac field in the STATE_MCLAG_TABLE */
void MclagLink::mclagsyncd_set_peer_system_id(
void MclagLink::mclagsyncdSetPeerSystemId(
char *msg,
size_t msg_len)
{
Expand Down Expand Up @@ -1942,31 +1942,31 @@ uint64_t MclagLink::readData()
break;
case MCLAG_MSG_TYPE_SET_TRAFFIC_DIST_ENABLE:
case MCLAG_MSG_TYPE_SET_TRAFFIC_DIST_DISABLE:
mclagsyncd_set_traffic_disable(msg, hdr->msg_type);
mclagsyncdSetTrafficDisable(msg, hdr->msg_type);
break;
case MCLAG_MSG_TYPE_SET_ICCP_STATE:
mclagsyncd_set_iccp_state(msg, mclag_msg_data_len(hdr));
mclagsyncdSetIccpState(msg, mclag_msg_data_len(hdr));
break;
case MCLAG_MSG_TYPE_SET_ICCP_ROLE:
mclagsyncd_set_iccp_role(msg, mclag_msg_data_len(hdr));
mclagsyncdSetIccpRole(msg, mclag_msg_data_len(hdr));
break;
case MCLAG_MSG_TYPE_SET_ICCP_SYSTEM_ID:
mclagsyncd_set_system_id(msg, mclag_msg_data_len(hdr));
mclagsyncdSetSystemId(msg, mclag_msg_data_len(hdr));
break;
case MCLAG_MSG_TYPE_DEL_ICCP_INFO:
mclagsyncd_del_iccp_info(msg);
mclagsyncdDelIccpInfo(msg);
break;
case MCLAG_MSG_TYPE_SET_REMOTE_IF_STATE:
mclagsyncd_set_remote_if_state(msg, mclag_msg_data_len(hdr));
mclagsyncdSetRemoteIfState(msg, mclag_msg_data_len(hdr));
break;
case MCLAG_MSG_TYPE_DEL_REMOTE_IF_INFO:
mclagsyncd_del_remote_if_info(msg, mclag_msg_data_len(hdr));
mclagsyncdDelRemoteIfInfo(msg, mclag_msg_data_len(hdr));
break;
case MCLAG_MSG_TYPE_SET_PEER_LINK_ISOLATION:
mclagsyncd_set_peer_link_isolation(msg, mclag_msg_data_len(hdr));
mclagsyncdSetPeerLinkIsolation(msg, mclag_msg_data_len(hdr));
break;
case MCLAG_MSG_TYPE_SET_ICCP_PEER_SYSTEM_ID:
mclagsyncd_set_peer_system_id(msg, mclag_msg_data_len(hdr));
mclagsyncdSetPeerSystemId(msg, mclag_msg_data_len(hdr));
break;
default:
break;
Expand Down
30 changes: 15 additions & 15 deletions mclagsyncd/mclaglink.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,18 +243,18 @@ namespace swss {
int getConnSocket();
uint64_t readData() override;

void mclagsyncd_send_fdb_entries(std::deque<KeyOpFieldsValuesTuple> &entries);
void mclagsyncdSendFdbEntries(std::deque<KeyOpFieldsValuesTuple> &entries);


void mclagsyncd_set_traffic_disable(char *msg_buf, uint8_t msg_type);
void mclagsyncd_set_iccp_state(char *msg, size_t msg_size);
void mclagsyncd_set_iccp_role(char *msg, size_t msg_size);
void mclagsyncd_set_system_id(char *msg, size_t msg_size);
void mclagsyncd_del_iccp_info(char *msg);
void mclagsyncd_set_remote_if_state(char *msg, size_t msg_size);
void mclagsyncd_del_remote_if_info(char *msg, size_t msg_size);
void mclagsyncd_set_peer_link_isolation(char *msg, size_t msg_size);
void mclagsyncd_set_peer_system_id(char *msg, size_t msg_size);
void mclagsyncdSetTrafficDisable(char *msg_buf, uint8_t msg_type);
void mclagsyncdSetIccpState(char *msg, size_t msg_size);
void mclagsyncdSetIccpRole(char *msg, size_t msg_size);
void mclagsyncdSetSystemId(char *msg, size_t msg_size);
void mclagsyncdDelIccpInfo(char *msg);
void mclagsyncdSetRemoteIfState(char *msg, size_t msg_size);
void mclagsyncdDelRemoteIfInfo(char *msg, size_t msg_size);
void mclagsyncdSetPeerLinkIsolation(char *msg, size_t msg_size);
void mclagsyncdSetPeerSystemId(char *msg, size_t msg_size);


void addDomainCfgDependentSelectables();
Expand Down Expand Up @@ -294,9 +294,9 @@ namespace swss {
/* Wait for connection (blocking) */
void accept();

void mclagsyncd_fetch_system_mac_from_configdb();
void mclagsyncd_fetch_mclag_config_from_configdb();
void mclagsyncd_fetch_mclag_interface_config_from_configdb();
void mclagsyncdFetchSystemMacFromConfigdb();
void mclagsyncdFetchMclagConfigFromConfigdb();
void mclagsyncdFetchMclagInterfaceConfigFromConfigdb();

SubscriberStateTable *getStateFdbTable()
{
Expand Down Expand Up @@ -325,8 +325,8 @@ namespace swss {
void processStateFdb(SubscriberStateTable *stateFdbTbl);
void processStateVlanMember(SubscriberStateTable *stateVlanMemberTbl);

void mclagsyncd_send_mclag_iface_cfg(std::deque<KeyOpFieldsValuesTuple> &entries);
void mclagsyncd_send_mclag_unique_ip_cfg(std::deque<KeyOpFieldsValuesTuple> &entries);
void mclagsyncdSendMclagIfaceCfg(std::deque<KeyOpFieldsValuesTuple> &entries);
void mclagsyncdSendMclagUniqueIpCfg(std::deque<KeyOpFieldsValuesTuple> &entries);

};

Expand Down
10 changes: 5 additions & 5 deletions mclagsyncd/mclagsyncd.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@ int main(int argc, char **argv)
Select s;
MclagLink mclag(&s);

mclag.mclagsyncd_fetch_system_mac_from_configdb();
mclag.mclagsyncdFetchSystemMacFromConfigdb();

cout << "Waiting for connection..." << endl;
mclag.accept();
cout << "Connected!" << endl;

mclag.mclagsyncd_fetch_mclag_config_from_configdb();
mclag.mclagsyncd_fetch_mclag_interface_config_from_configdb();
mclag.mclagsyncdFetchMclagConfigFromConfigdb();
mclag.mclagsyncdFetchMclagInterfaceConfigFromConfigdb();

s.addSelectable(&mclag);

Expand Down Expand Up @@ -88,14 +88,14 @@ int main(int argc, char **argv)
SWSS_LOG_DEBUG("MCLAGSYNCD processing mclag_intf_cfg_tbl notifications");
std::deque<KeyOpFieldsValuesTuple> entries;
mclag.getMclagIntfCfgTable()->pops(entries);
mclag.mclagsyncd_send_mclag_iface_cfg(entries);
mclag.mclagsyncdSendMclagIfaceCfg(entries);
}
else if (temps == (Selectable *)mclag.getMclagUniqueCfgTable()) //Reading MCLAG Unique IP Config Table
{
SWSS_LOG_DEBUG("MCLAGSYNCD processing mclag_unique_ip_cfg_tbl notifications");
std::deque<KeyOpFieldsValuesTuple> entries;
mclag.getMclagUniqueCfgTable()->pops(entries);
mclag.mclagsyncd_send_mclag_unique_ip_cfg(entries);
mclag.mclagsyncdSendMclagUniqueIpCfg(entries);
}
else if (temps == (Selectable *)mclag.getStateVlanMemberTable())
{
Expand Down

0 comments on commit 8d6eb61

Please sign in to comment.