Skip to content

Commit

Permalink
spell check fixes (#1630)
Browse files Browse the repository at this point in the history
  • Loading branch information
liat-grozovik authored Feb 14, 2021
1 parent 32bc1b6 commit f2854f8
Show file tree
Hide file tree
Showing 41 changed files with 97 additions and 97 deletions.
2 changes: 1 addition & 1 deletion cfgmgr/buffermgr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ void BufferMgr::transformReference(string &name)
* This function copies the data from tables in CONFIG_DB to APPL_DB.
* With dynamically buffer calculation supported, the following tables
* will be moved to APPL_DB from CONFIG_DB because the CONFIG_DB contains
* confgured entries only while APPL_DB contains dynamically generated entries
* configured entries only while APPL_DB contains dynamically generated entries
* - BUFFER_POOL
* - BUFFER_PROFILE
* - BUFFER_PG
Expand Down
8 changes: 4 additions & 4 deletions cfgmgr/buffermgrdyn.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* 1. All keys in this file are in format of APPL_DB key.
* Key population:
* On receiving item update from CONFIG_DB: key has been transformed into the format of APPL_DB
* In intermal maps: table name removed from the index
* In internal maps: table name removed from the index
* 2. Maintain maps for pools, profiles and PGs in CONFIG_DB and APPL_DB
* 3. Keys of maps in this file don't contain the TABLE_NAME
* 3.
Expand Down Expand Up @@ -468,7 +468,7 @@ void BufferMgrDynamic::checkSharedBufferPoolSize()
// Eventually, the correct values will pushed to APPL_DB and then ASIC_DB
recalculateSharedBufferPool();
m_firstTimeCalculateBufferPool = false;
SWSS_LOG_NOTICE("Buffer pool update defered because port is still under initialization, start polling timer");
SWSS_LOG_NOTICE("Buffer pool update deferred because port is still under initialization, start polling timer");
}

return;
Expand Down Expand Up @@ -712,7 +712,7 @@ bool BufferMgrDynamic::isHeadroomResourceValid(const string &port, const buffer_
}

//Called when speed/cable length updated from CONFIG_DB
// Update buffer profile of a certern PG of a port or all PGs of the port according to its speed, cable_length and mtu
// Update buffer profile of a certain PG of a port or all PGs of the port according to its speed, cable_length and mtu
// Called when
// - port's speed, cable_length or mtu updated
// - one buffer pg of port's is set to dynamic calculation
Expand Down Expand Up @@ -1814,7 +1814,7 @@ task_process_status BufferMgrDynamic::handleBufferPortEgressProfileListTable(Key
* This function copies the data from tables in CONFIG_DB to APPL_DB.
* With dynamically buffer calculation supported, the following tables
* will be moved to APPL_DB from CONFIG_DB because the CONFIG_DB contains
* confgured entries only while APPL_DB contains dynamically generated entries
* configured entries only while APPL_DB contains dynamically generated entries
* - BUFFER_POOL
* - BUFFER_PROFILE
* - BUFFER_PG
Expand Down
2 changes: 1 addition & 1 deletion cfgmgr/buffermgrdyn.h
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ typedef struct {
typedef enum {
// Port is under initializing, which means its info hasn't been comprehensive for calculating headroom
PORT_INITIALIZING,
// All necessary information for calculating headrom is ready
// All necessary information for calculating headroom is ready
PORT_READY
} port_state_t;

Expand Down
2 changes: 1 addition & 1 deletion cfgmgr/intfmgr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,7 @@ bool IntfMgr::doIntfGeneralTask(const vector<string>& keys,
else if (op == DEL_COMMAND)
{
/* make sure all ip addresses associated with interface are removed, otherwise these ip address would
be set with global vrf and it may cause ip address confliction. */
be set with global vrf and it may cause ip address conflict. */
if (getIntfIpCount(alias))
{
return false;
Expand Down
2 changes: 1 addition & 1 deletion cfgmgr/natmgr.h
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ class NatMgr : public Orch
natDnatPool_map_t m_natDnatPoolInfo;
SelectableTimer *m_natRefreshTimer;

/* Declare doTask related fucntions */
/* Declare doTask related functions */
void doTask(Consumer &consumer);
void doTask(SelectableTimer &timer);
void doNatRefreshTimerTask();
Expand Down
2 changes: 1 addition & 1 deletion cfgmgr/sflowmgr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ void SflowMgr::sflowCheckAndFillValues(string alias, vector<FieldValueTuple> &va
{
if (m_sflowPortConfMap[alias].admin == "")
{
/* By default admin state is enable if not set explicitely */
/* By default admin state is enable if not set explicitly */
m_sflowPortConfMap[alias].admin = "up";
}
FieldValueTuple fv("admin_state", m_sflowPortConfMap[alias].admin);
Expand Down
6 changes: 3 additions & 3 deletions cfgmgr/vxlanmgr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -906,7 +906,7 @@ void VxlanMgr::createAppDBTunnelMapTable(const KeyOpFieldsValuesTuple & t)
std::replace(vxlanTunnelMapName.begin(), vxlanTunnelMapName.end(), config_db_key_delimiter, delimiter);

/* Case 1: Entry exist - Erase from cache & return
* Case 2: Enry does not exist - Write to AppDB
* Case 2: Entry does not exist - Write to AppDB
* Case 3: Entry exist but modified - Not taken care. Will address later
*/
if (m_in_reconcile)
Expand All @@ -921,7 +921,7 @@ void VxlanMgr::createAppDBTunnelMapTable(const KeyOpFieldsValuesTuple & t)
}
else
{
SWSS_LOG_INFO("Reconcile App Tunnel Map Table create %s doesnt not exist. Pending %zu",
SWSS_LOG_INFO("Reconcile App Tunnel Map Table create %s does not exist. Pending %zu",
vxlanTunnelMapName.c_str(), m_appVxlanTunnelMapKeysRecon.size());
}
}
Expand Down Expand Up @@ -956,7 +956,7 @@ int VxlanMgr::createVxlanNetdevice(std::string vxlanTunnelName, std::string vni_
vlan_id.c_str());

// Case 1: Entry exist - Erase from cache & return
// Case 2: Enry does not exist - Create netDevice in Kernel
// Case 2: Entry does not exist - Create netDevice in Kernel
// Case 3: Entry exist but modified - Not taken care. Will address later

if (m_in_reconcile)
Expand Down
2 changes: 1 addition & 1 deletion fdbsyncd/fdbsyncd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ int main(int argc, char **argv)
}
catch (const std::exception& e)
{
cout << "Exception \"" << e.what() << "\" had been thrown in deamon" << endl;
cout << "Exception \"" << e.what() << "\" had been thrown in daemon" << endl;
return 0;
}
}
Expand Down
2 changes: 1 addition & 1 deletion fpmsyncd/fpmsyncd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ int main(int argc, char **argv)
}
catch (const exception& e)
{
cout << "Exception \"" << e.what() << "\" had been thrown in deamon" << endl;
cout << "Exception \"" << e.what() << "\" had been thrown in daemon" << endl;
return 0;
}
}
Expand Down
4 changes: 2 additions & 2 deletions mclagsyncd/mclaglink.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,8 @@ void MclagLink::setPortMacLearnMode(char *msg)
attrs.push_back(learn_attr);
if (strncmp(learn_port.c_str(), PORTCHANNEL_PREFIX, strlen(PORTCHANNEL_PREFIX)) == 0)
p_lag_tbl->set(learn_port, attrs);
/*vxlan tunnel dont supported currently, for src_ip is the mandatory attribute*/
/*else if(strncmp(learn_port.c_str(),VXLAN_TUNNEL_PREFIX,5)==0)
/* vxlan tunnel is currently not supported, for src_ip is the mandatory attribute */
/* else if(strncmp(learn_port.c_str(),VXLAN_TUNNEL_PREFIX,5)==0)
p_tnl_tbl->set(learn_port, attrs); */
else
p_port_tbl->set(learn_port, attrs);
Expand Down
2 changes: 1 addition & 1 deletion mclagsyncd/mclagsyncd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ int main(int argc, char **argv)
}
catch (const exception& e)
{
cout << "Exception \"" << e.what() << "\" had been thrown in deamon" << endl;
cout << "Exception \"" << e.what() << "\" had been thrown in daemon" << endl;
return 0;
}
}
Expand Down
2 changes: 1 addition & 1 deletion neighsyncd/neighsync.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ void NeighSync::onMsg(int nlmsg_type, struct nl_object *obj)
/* Ignore neighbor entries with Broadcast Mac - Trigger for directed broadcast */
if (!delete_key && (MacAddress(macStr) == MacAddress("ff:ff:ff:ff:ff:ff")))
{
SWSS_LOG_INFO("Broadcast Mac recieved, ignoring for %s", ipStr);
SWSS_LOG_INFO("Broadcast Mac received, ignoring for %s", ipStr);
return;
}

Expand Down
2 changes: 1 addition & 1 deletion neighsyncd/neighsyncd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ int main(int argc, char **argv)
}
catch (const std::exception& e)
{
cout << "Exception \"" << e.what() << "\" had been thrown in deamon" << endl;
cout << "Exception \"" << e.what() << "\" had been thrown in daemon" << endl;
return 0;
}
}
Expand Down
6 changes: 3 additions & 3 deletions orchagent/aclorch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ bool AclRule::validateAddPriority(string attr_name, string attr_value)
char *endp = NULL;
errno = 0;
m_priority = (uint32_t)strtol(attr_value.c_str(), &endp, 0);
// chack conversion was successfull and the value is within the allowed range
// check conversion was successful and the value is within the allowed range
status = (errno == 0) &&
(endp == attr_value.c_str() + attr_value.size()) &&
(m_priority >= m_minPriority) &&
Expand Down Expand Up @@ -2476,7 +2476,7 @@ void AclOrch::queryAclActionAttrEnumValues(const string &action_name,
}
}
#else
/* assume all enum values are supported untill sai object api is available */
/* assume all enum values are supported until sai object api is available */
for (size_t i = 0; i < meta->enummetadata->valuescount; i++)
{
m_aclEnumActionCapabilities[acl_action].insert(meta->enummetadata->values[i]);
Expand Down Expand Up @@ -2747,7 +2747,7 @@ bool AclOrch::addAclTable(AclTable &newTable)
/* If ACL table exists, remove the table first.*/
if (!removeAclTable(table_id))
{
SWSS_LOG_ERROR("Failed to remove exsiting ACL table %s before adding the new one",
SWSS_LOG_ERROR("Failed to remove existing ACL table %s before adding the new one",
table_id.c_str());
return false;
}
Expand Down
6 changes: 3 additions & 3 deletions orchagent/aclorch.h
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ class AclTable {
map<string, shared_ptr<AclRule>> rules;
// Set to store the ACL table port alias
set<string> portSet;
// Set to store the not cofigured ACL table port alias
// Set to store the not configured ACL table port alias
set<string> pendingPortSet;

AclTable()
Expand All @@ -374,9 +374,9 @@ class AclTable {
bool validate();
bool create();

// Bind the ACL table to a port which is alread linked
// Bind the ACL table to a port which is already linked
bool bind(sai_object_id_t portOid);
// Unbind the ACL table to a port which is alread linked
// Unbind the ACL table to a port which is already linked
bool unbind(sai_object_id_t portOid);
// Bind the ACL table to all ports linked
bool bind();
Expand Down
2 changes: 1 addition & 1 deletion orchagent/bufferorch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ void BufferOrch::generateBufferPoolWatermarkCounterIdList(void)
// is received on buffer pool watermark key under table "FLEX_COUNTER_GROUP_TABLE"
// Because the SubscriberStateTable listens to the entire keyspace of "BUFFER_POOL_WATERMARK", any update
// to field value tuples under key "BUFFER_POOL_WATERMARK" will cause this tuple to be heard again
// To avoid resync the coutner ID list a second time, we introduce a data member variable to mark whether
// To avoid resync the counter ID list a second time, we introduce a data member variable to mark whether
// this operation has already been done or not yet
if (m_isBufferPoolWatermarkCounterIdListGenerated)
{
Expand Down
2 changes: 1 addition & 1 deletion orchagent/crmorch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -596,7 +596,7 @@ void CrmOrch::checkCrmThresholds()
}
else
{
SWSS_LOG_WARN("%s Exception occured (div by Zero): Used count %u free count %u",
SWSS_LOG_WARN("%s Exception occurred (div by Zero): Used count %u free count %u",
res.name.c_str(), cnt.usedCounter, cnt.availableCounter);
}
}
Expand Down
8 changes: 4 additions & 4 deletions orchagent/debugcounterorch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ void DebugCounterOrch::doTask(Consumer& consumer)
++it;
break;
case task_process_status::task_failed:
SWSS_LOG_ERROR("Failed to process debug counters '%s' task, error(s) occured during execution", op.c_str());
SWSS_LOG_ERROR("Failed to process debug counters '%s' task, error(s) occurred during execution", op.c_str());
consumer.m_toSync.erase(it++);
break;
default:
Expand Down Expand Up @@ -255,7 +255,7 @@ task_process_status DebugCounterOrch::installDebugCounter(const string& counter_
addFreeCounter(counter_name, counter_type);
reconcileFreeDropCounters(counter_name);

SWSS_LOG_NOTICE("Succesfully created drop counter %s", counter_name.c_str());
SWSS_LOG_NOTICE("Successfully created drop counter %s", counter_name.c_str());
return task_process_status::task_success;
}

Expand Down Expand Up @@ -294,7 +294,7 @@ task_process_status DebugCounterOrch::uninstallDebugCounter(const string& counte
m_counterNameToSwitchStatMap->hdel("", counter_name);
}

SWSS_LOG_NOTICE("Succesfully deleted drop counter %s", counter_name.c_str());
SWSS_LOG_NOTICE("Successfully deleted drop counter %s", counter_name.c_str());
return task_process_status::task_success;
}

Expand Down Expand Up @@ -451,7 +451,7 @@ void DebugCounterOrch::reconcileFreeDropCounters(const string& counter_name)
createDropCounter(counter_name, counter_it->second, reasons_it->second);
free_drop_counters.erase(counter_it);
free_drop_reasons.erase(reasons_it);
SWSS_LOG_NOTICE("Succesfully matched drop reasons to counter %s", counter_name.c_str());
SWSS_LOG_NOTICE("Successfully matched drop reasons to counter %s", counter_name.c_str());
}
}

Expand Down
4 changes: 2 additions & 2 deletions orchagent/fdborch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -677,7 +677,7 @@ void FdbOrch::doTask(NotificationConsumer& consumer)
if (op == "ALL")
{
/*
* so far only support flush all the FDB entris
* so far only support flush all the FDB entries
* flush per port and flush per vlan will be added later.
*/
status = sai_fdb_api->flush_fdb_entries(gSwitchId, 0, NULL);
Expand Down Expand Up @@ -741,7 +741,7 @@ void FdbOrch::doTask(NotificationConsumer& consumer)
* Description:
* Flushes FDB entries based on bridge_port_oid, or vlan_oid or both.
* This function is called in three cases.
* 1. Port is reoved from VLAN (via SUBJECT_TYPE_VLAN_MEMBER_CHANGE)
* 1. Port is removed from VLAN (via SUBJECT_TYPE_VLAN_MEMBER_CHANGE)
* 2. Bridge port OID is removed (Direct call)
* 3. Port is shut down (via SUBJECT_TYPE_
*/
Expand Down
18 changes: 9 additions & 9 deletions orchagent/fgnhgorch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ void FgNhgOrch::update(SubjectType type, void *cntx)
SWSS_LOG_WARN("Hit unexpected condition where structs are out of sync");
}
nexthop_entry->second.link_oper_state = LINK_UP;
SWSS_LOG_INFO("Updated %s assoicated with %s to state up",
SWSS_LOG_INFO("Updated %s associated with %s to state up",
update->port.m_alias.c_str(), ip.to_string().c_str());

if (!m_neighOrch->getNeighborEntry(ip, nhk, macAddress))
Expand Down Expand Up @@ -481,9 +481,9 @@ bool FgNhgOrch::invalidNextHopInNextHopGroup(const NextHopKey& nexthop)


/* setActiveBankHashBucketChanges: Sets hash buckets for active banks and called on a PER bank basis
* This function deals with a scenario where next-hop changes occured for the route,
* This function deals with a scenario where next-hop changes occurred for the route,
* and the next-hop change didn't cause an entire bank to go active/inactive.
* The function uses bank_member_changes to compute the hash buckets to modify, in order to satisy the next-hop
* The function uses bank_member_changes to compute the hash buckets to modify, in order to satisfy the next-hop
* availability for the route/neigh.
* Eg: Prefix A had nhs 1, 2, 3 with 1, 2, 3, being equally distributed over hash buckets
* 0-59(20 buckets per nh). If there was a nh removal of nh 2, this fn would equally redistribute hash buckets
Expand Down Expand Up @@ -763,12 +763,12 @@ bool FgNhgOrch::setInactiveBankToNextAvailableActiveBank(FGNextHopGroupEntry *sy


/* setInactiveBankHashBucketChanges: Sets hash buckets for inactive banks and called on a PER bank basis.
* This function deals with scenarios where next-hop changes occured for the route,
* This function deals with scenarios where next-hop changes occurred for the route,
* and the next-hop change causes an active bank to become inactive, or an inactive bank to become active or
* inactive bank to remain inactive.
* The function uses the bank member diffs provided in bank_member_changes and uses it to compute
* the hash buckets to modify, in order to satisy the next-hop availability for the route/neigh.
* Eg: Lets assume prefix A had nhs 1, 2, 3, 4, 5, 6 with nhs being equally distirbuted over hash buckets
* the hash buckets to modify, in order to satisfy the next-hop availability for the route/neigh.
* Eg: Lets assume prefix A had nhs 1, 2, 3, 4, 5, 6 with nhs being equally distributed over hash buckets
* 0-59(10 per nh). Now there was a nh deletion of 1, 2, 3 which constituted bank 0(4, 5, 6 constituted bank 1)
* This function will identify that all of bank 0's nh are down and re-assign all the hash buckets(0-29) for these nhs to
* nhs from bank 1, along with making local struct changes to track this for future route/neigh changes.
Expand All @@ -781,7 +781,7 @@ bool FgNhgOrch::setInactiveBankHashBucketChanges(FGNextHopGroupEntry *syncd_fg_r

if (bank_member_changes[bank].nhs_to_add.size() > 0)
{
/* Previously inactive bank now transistions to active */
/* Previously inactive bank now transitions to active */
syncd_fg_route_entry->syncd_fgnhg_map[bank].clear();
for (uint32_t i = fgNhgEntry->hash_bucket_indices[bank].start_index;
i <= fgNhgEntry->hash_bucket_indices[bank].end_index; i++)
Expand All @@ -805,7 +805,7 @@ bool FgNhgOrch::setInactiveBankHashBucketChanges(FGNextHopGroupEntry *syncd_fg_r
}
else if (bank_member_changes[bank].nhs_to_del.size() > 0)
{
/* Previously active bank now transistions to inactive */
/* Previously active bank now transitions to inactive */
if (!setInactiveBankToNextAvailableActiveBank(syncd_fg_route_entry, fgNhgEntry,
bank, bank_member_changes, nhopgroup_members_set, ipPrefix))
{
Expand Down Expand Up @@ -1130,7 +1130,7 @@ bool FgNhgOrch::setFgNhg(sai_object_id_t vrf_id, const IpPrefix &ipPrefix, const
fgNhgEntry->hash_bucket_indices.size(), BankMemberChanges());
if (fgNhgEntry->hash_bucket_indices.size() == 0)
{
/* Only happens the 1st time when hash_bucket_indices are not inited
/* Only happens the 1st time when hash_bucket_indices are not initialized
*/
for (auto it : fgNhgEntry->next_hops)
{
Expand Down
2 changes: 1 addition & 1 deletion orchagent/fgnhgorch.h
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ typedef std::map<IpAddress, FgNhgEntry*> FgNhgMembers;
/* Main structure to hold user configuration */
typedef std::map<FgNhg, FgNhgEntry> FgNhgs;

/* Helper struct populated at every route change to identify the next-hop changes which occured */
/* Helper struct populated at every route change to identify the next-hop changes which occurred */
typedef struct
{
std::vector<NextHopKey> nhs_to_del;
Expand Down
2 changes: 1 addition & 1 deletion orchagent/intfsorch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1047,7 +1047,7 @@ bool IntfsOrch::addRouterIntfs(sai_object_id_t vrf_id, Port &port)
attr.id = SAI_ROUTER_INTERFACE_ATTR_NAT_ZONE_ID;
attr.value.u32 = port.m_nat_zone_id;

SWSS_LOG_INFO("Assinging NAT zone id %d to interface %s\n", attr.value.u32, port.m_alias.c_str());
SWSS_LOG_INFO("Assigning NAT zone id %d to interface %s\n", attr.value.u32, port.m_alias.c_str());
attrs.push_back(attr);
}

Expand Down
Loading

0 comments on commit f2854f8

Please sign in to comment.