Skip to content

Commit f2854f8

Browse files
spell check fixes (sonic-net#1630)
1 parent 32bc1b6 commit f2854f8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+97
-97
lines changed

cfgmgr/buffermgr.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ void BufferMgr::transformReference(string &name)
246246
* This function copies the data from tables in CONFIG_DB to APPL_DB.
247247
* With dynamically buffer calculation supported, the following tables
248248
* will be moved to APPL_DB from CONFIG_DB because the CONFIG_DB contains
249-
* confgured entries only while APPL_DB contains dynamically generated entries
249+
* configured entries only while APPL_DB contains dynamically generated entries
250250
* - BUFFER_POOL
251251
* - BUFFER_PROFILE
252252
* - BUFFER_PG

cfgmgr/buffermgrdyn.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* 1. All keys in this file are in format of APPL_DB key.
2020
* Key population:
2121
* On receiving item update from CONFIG_DB: key has been transformed into the format of APPL_DB
22-
* In intermal maps: table name removed from the index
22+
* In internal maps: table name removed from the index
2323
* 2. Maintain maps for pools, profiles and PGs in CONFIG_DB and APPL_DB
2424
* 3. Keys of maps in this file don't contain the TABLE_NAME
2525
* 3.
@@ -468,7 +468,7 @@ void BufferMgrDynamic::checkSharedBufferPoolSize()
468468
// Eventually, the correct values will pushed to APPL_DB and then ASIC_DB
469469
recalculateSharedBufferPool();
470470
m_firstTimeCalculateBufferPool = false;
471-
SWSS_LOG_NOTICE("Buffer pool update defered because port is still under initialization, start polling timer");
471+
SWSS_LOG_NOTICE("Buffer pool update deferred because port is still under initialization, start polling timer");
472472
}
473473

474474
return;
@@ -712,7 +712,7 @@ bool BufferMgrDynamic::isHeadroomResourceValid(const string &port, const buffer_
712712
}
713713

714714
//Called when speed/cable length updated from CONFIG_DB
715-
// Update buffer profile of a certern PG of a port or all PGs of the port according to its speed, cable_length and mtu
715+
// Update buffer profile of a certain PG of a port or all PGs of the port according to its speed, cable_length and mtu
716716
// Called when
717717
// - port's speed, cable_length or mtu updated
718718
// - one buffer pg of port's is set to dynamic calculation
@@ -1814,7 +1814,7 @@ task_process_status BufferMgrDynamic::handleBufferPortEgressProfileListTable(Key
18141814
* This function copies the data from tables in CONFIG_DB to APPL_DB.
18151815
* With dynamically buffer calculation supported, the following tables
18161816
* will be moved to APPL_DB from CONFIG_DB because the CONFIG_DB contains
1817-
* confgured entries only while APPL_DB contains dynamically generated entries
1817+
* configured entries only while APPL_DB contains dynamically generated entries
18181818
* - BUFFER_POOL
18191819
* - BUFFER_PROFILE
18201820
* - BUFFER_PG

cfgmgr/buffermgrdyn.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ typedef struct {
8181
typedef enum {
8282
// Port is under initializing, which means its info hasn't been comprehensive for calculating headroom
8383
PORT_INITIALIZING,
84-
// All necessary information for calculating headrom is ready
84+
// All necessary information for calculating headroom is ready
8585
PORT_READY
8686
} port_state_t;
8787

cfgmgr/intfmgr.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,7 @@ bool IntfMgr::doIntfGeneralTask(const vector<string>& keys,
613613
else if (op == DEL_COMMAND)
614614
{
615615
/* make sure all ip addresses associated with interface are removed, otherwise these ip address would
616-
be set with global vrf and it may cause ip address confliction. */
616+
be set with global vrf and it may cause ip address conflict. */
617617
if (getIntfIpCount(alias))
618618
{
619619
return false;

cfgmgr/natmgr.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ class NatMgr : public Orch
276276
natDnatPool_map_t m_natDnatPoolInfo;
277277
SelectableTimer *m_natRefreshTimer;
278278

279-
/* Declare doTask related fucntions */
279+
/* Declare doTask related functions */
280280
void doTask(Consumer &consumer);
281281
void doTask(SelectableTimer &timer);
282282
void doNatRefreshTimerTask();

cfgmgr/sflowmgr.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ void SflowMgr::sflowCheckAndFillValues(string alias, vector<FieldValueTuple> &va
247247
{
248248
if (m_sflowPortConfMap[alias].admin == "")
249249
{
250-
/* By default admin state is enable if not set explicitely */
250+
/* By default admin state is enable if not set explicitly */
251251
m_sflowPortConfMap[alias].admin = "up";
252252
}
253253
FieldValueTuple fv("admin_state", m_sflowPortConfMap[alias].admin);

cfgmgr/vxlanmgr.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -906,7 +906,7 @@ void VxlanMgr::createAppDBTunnelMapTable(const KeyOpFieldsValuesTuple & t)
906906
std::replace(vxlanTunnelMapName.begin(), vxlanTunnelMapName.end(), config_db_key_delimiter, delimiter);
907907

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

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

962962
if (m_in_reconcile)

fdbsyncd/fdbsyncd.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ int main(int argc, char **argv)
9696
}
9797
catch (const std::exception& e)
9898
{
99-
cout << "Exception \"" << e.what() << "\" had been thrown in deamon" << endl;
99+
cout << "Exception \"" << e.what() << "\" had been thrown in daemon" << endl;
100100
return 0;
101101
}
102102
}

fpmsyncd/fpmsyncd.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ int main(int argc, char **argv)
188188
}
189189
catch (const exception& e)
190190
{
191-
cout << "Exception \"" << e.what() << "\" had been thrown in deamon" << endl;
191+
cout << "Exception \"" << e.what() << "\" had been thrown in daemon" << endl;
192192
return 0;
193193
}
194194
}

mclagsyncd/mclaglink.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -277,8 +277,8 @@ void MclagLink::setPortMacLearnMode(char *msg)
277277
attrs.push_back(learn_attr);
278278
if (strncmp(learn_port.c_str(), PORTCHANNEL_PREFIX, strlen(PORTCHANNEL_PREFIX)) == 0)
279279
p_lag_tbl->set(learn_port, attrs);
280-
/*vxlan tunnel dont supported currently, for src_ip is the mandatory attribute*/
281-
/*else if(strncmp(learn_port.c_str(),VXLAN_TUNNEL_PREFIX,5)==0)
280+
/* vxlan tunnel is currently not supported, for src_ip is the mandatory attribute */
281+
/* else if(strncmp(learn_port.c_str(),VXLAN_TUNNEL_PREFIX,5)==0)
282282
p_tnl_tbl->set(learn_port, attrs); */
283283
else
284284
p_port_tbl->set(learn_port, attrs);

mclagsyncd/mclagsyncd.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ int main(int argc, char **argv)
8686
}
8787
catch (const exception& e)
8888
{
89-
cout << "Exception \"" << e.what() << "\" had been thrown in deamon" << endl;
89+
cout << "Exception \"" << e.what() << "\" had been thrown in daemon" << endl;
9090
return 0;
9191
}
9292
}

neighsyncd/neighsync.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ void NeighSync::onMsg(int nlmsg_type, struct nl_object *obj)
9999
/* Ignore neighbor entries with Broadcast Mac - Trigger for directed broadcast */
100100
if (!delete_key && (MacAddress(macStr) == MacAddress("ff:ff:ff:ff:ff:ff")))
101101
{
102-
SWSS_LOG_INFO("Broadcast Mac recieved, ignoring for %s", ipStr);
102+
SWSS_LOG_INFO("Broadcast Mac received, ignoring for %s", ipStr);
103103
return;
104104
}
105105

neighsyncd/neighsyncd.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ int main(int argc, char **argv)
8686
}
8787
catch (const std::exception& e)
8888
{
89-
cout << "Exception \"" << e.what() << "\" had been thrown in deamon" << endl;
89+
cout << "Exception \"" << e.what() << "\" had been thrown in daemon" << endl;
9090
return 0;
9191
}
9292
}

orchagent/aclorch.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ bool AclRule::validateAddPriority(string attr_name, string attr_value)
173173
char *endp = NULL;
174174
errno = 0;
175175
m_priority = (uint32_t)strtol(attr_value.c_str(), &endp, 0);
176-
// chack conversion was successfull and the value is within the allowed range
176+
// check conversion was successful and the value is within the allowed range
177177
status = (errno == 0) &&
178178
(endp == attr_value.c_str() + attr_value.size()) &&
179179
(m_priority >= m_minPriority) &&
@@ -2476,7 +2476,7 @@ void AclOrch::queryAclActionAttrEnumValues(const string &action_name,
24762476
}
24772477
}
24782478
#else
2479-
/* assume all enum values are supported untill sai object api is available */
2479+
/* assume all enum values are supported until sai object api is available */
24802480
for (size_t i = 0; i < meta->enummetadata->valuescount; i++)
24812481
{
24822482
m_aclEnumActionCapabilities[acl_action].insert(meta->enummetadata->values[i]);
@@ -2747,7 +2747,7 @@ bool AclOrch::addAclTable(AclTable &newTable)
27472747
/* If ACL table exists, remove the table first.*/
27482748
if (!removeAclTable(table_id))
27492749
{
2750-
SWSS_LOG_ERROR("Failed to remove exsiting ACL table %s before adding the new one",
2750+
SWSS_LOG_ERROR("Failed to remove existing ACL table %s before adding the new one",
27512751
table_id.c_str());
27522752
return false;
27532753
}

orchagent/aclorch.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ class AclTable {
352352
map<string, shared_ptr<AclRule>> rules;
353353
// Set to store the ACL table port alias
354354
set<string> portSet;
355-
// Set to store the not cofigured ACL table port alias
355+
// Set to store the not configured ACL table port alias
356356
set<string> pendingPortSet;
357357

358358
AclTable()
@@ -374,9 +374,9 @@ class AclTable {
374374
bool validate();
375375
bool create();
376376

377-
// Bind the ACL table to a port which is alread linked
377+
// Bind the ACL table to a port which is already linked
378378
bool bind(sai_object_id_t portOid);
379-
// Unbind the ACL table to a port which is alread linked
379+
// Unbind the ACL table to a port which is already linked
380380
bool unbind(sai_object_id_t portOid);
381381
// Bind the ACL table to all ports linked
382382
bool bind();

orchagent/bufferorch.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ void BufferOrch::generateBufferPoolWatermarkCounterIdList(void)
178178
// is received on buffer pool watermark key under table "FLEX_COUNTER_GROUP_TABLE"
179179
// Because the SubscriberStateTable listens to the entire keyspace of "BUFFER_POOL_WATERMARK", any update
180180
// to field value tuples under key "BUFFER_POOL_WATERMARK" will cause this tuple to be heard again
181-
// To avoid resync the coutner ID list a second time, we introduce a data member variable to mark whether
181+
// To avoid resync the counter ID list a second time, we introduce a data member variable to mark whether
182182
// this operation has already been done or not yet
183183
if (m_isBufferPoolWatermarkCounterIdListGenerated)
184184
{

orchagent/crmorch.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ void CrmOrch::checkCrmThresholds()
596596
}
597597
else
598598
{
599-
SWSS_LOG_WARN("%s Exception occured (div by Zero): Used count %u free count %u",
599+
SWSS_LOG_WARN("%s Exception occurred (div by Zero): Used count %u free count %u",
600600
res.name.c_str(), cnt.usedCounter, cnt.availableCounter);
601601
}
602602
}

orchagent/debugcounterorch.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ void DebugCounterOrch::doTask(Consumer& consumer)
163163
++it;
164164
break;
165165
case task_process_status::task_failed:
166-
SWSS_LOG_ERROR("Failed to process debug counters '%s' task, error(s) occured during execution", op.c_str());
166+
SWSS_LOG_ERROR("Failed to process debug counters '%s' task, error(s) occurred during execution", op.c_str());
167167
consumer.m_toSync.erase(it++);
168168
break;
169169
default:
@@ -255,7 +255,7 @@ task_process_status DebugCounterOrch::installDebugCounter(const string& counter_
255255
addFreeCounter(counter_name, counter_type);
256256
reconcileFreeDropCounters(counter_name);
257257

258-
SWSS_LOG_NOTICE("Succesfully created drop counter %s", counter_name.c_str());
258+
SWSS_LOG_NOTICE("Successfully created drop counter %s", counter_name.c_str());
259259
return task_process_status::task_success;
260260
}
261261

@@ -294,7 +294,7 @@ task_process_status DebugCounterOrch::uninstallDebugCounter(const string& counte
294294
m_counterNameToSwitchStatMap->hdel("", counter_name);
295295
}
296296

297-
SWSS_LOG_NOTICE("Succesfully deleted drop counter %s", counter_name.c_str());
297+
SWSS_LOG_NOTICE("Successfully deleted drop counter %s", counter_name.c_str());
298298
return task_process_status::task_success;
299299
}
300300

@@ -451,7 +451,7 @@ void DebugCounterOrch::reconcileFreeDropCounters(const string& counter_name)
451451
createDropCounter(counter_name, counter_it->second, reasons_it->second);
452452
free_drop_counters.erase(counter_it);
453453
free_drop_reasons.erase(reasons_it);
454-
SWSS_LOG_NOTICE("Succesfully matched drop reasons to counter %s", counter_name.c_str());
454+
SWSS_LOG_NOTICE("Successfully matched drop reasons to counter %s", counter_name.c_str());
455455
}
456456
}
457457

orchagent/fdborch.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -677,7 +677,7 @@ void FdbOrch::doTask(NotificationConsumer& consumer)
677677
if (op == "ALL")
678678
{
679679
/*
680-
* so far only support flush all the FDB entris
680+
* so far only support flush all the FDB entries
681681
* flush per port and flush per vlan will be added later.
682682
*/
683683
status = sai_fdb_api->flush_fdb_entries(gSwitchId, 0, NULL);
@@ -741,7 +741,7 @@ void FdbOrch::doTask(NotificationConsumer& consumer)
741741
* Description:
742742
* Flushes FDB entries based on bridge_port_oid, or vlan_oid or both.
743743
* This function is called in three cases.
744-
* 1. Port is reoved from VLAN (via SUBJECT_TYPE_VLAN_MEMBER_CHANGE)
744+
* 1. Port is removed from VLAN (via SUBJECT_TYPE_VLAN_MEMBER_CHANGE)
745745
* 2. Bridge port OID is removed (Direct call)
746746
* 3. Port is shut down (via SUBJECT_TYPE_
747747
*/

orchagent/fgnhgorch.cpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ void FgNhgOrch::update(SubjectType type, void *cntx)
6262
SWSS_LOG_WARN("Hit unexpected condition where structs are out of sync");
6363
}
6464
nexthop_entry->second.link_oper_state = LINK_UP;
65-
SWSS_LOG_INFO("Updated %s assoicated with %s to state up",
65+
SWSS_LOG_INFO("Updated %s associated with %s to state up",
6666
update->port.m_alias.c_str(), ip.to_string().c_str());
6767

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

482482

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

764764

765765
/* setInactiveBankHashBucketChanges: Sets hash buckets for inactive banks and called on a PER bank basis.
766-
* This function deals with scenarios where next-hop changes occured for the route,
766+
* This function deals with scenarios where next-hop changes occurred for the route,
767767
* and the next-hop change causes an active bank to become inactive, or an inactive bank to become active or
768768
* inactive bank to remain inactive.
769769
* The function uses the bank member diffs provided in bank_member_changes and uses it to compute
770-
* the hash buckets to modify, in order to satisy the next-hop availability for the route/neigh.
771-
* Eg: Lets assume prefix A had nhs 1, 2, 3, 4, 5, 6 with nhs being equally distirbuted over hash buckets
770+
* the hash buckets to modify, in order to satisfy the next-hop availability for the route/neigh.
771+
* Eg: Lets assume prefix A had nhs 1, 2, 3, 4, 5, 6 with nhs being equally distributed over hash buckets
772772
* 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)
773773
* 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
774774
* nhs from bank 1, along with making local struct changes to track this for future route/neigh changes.
@@ -781,7 +781,7 @@ bool FgNhgOrch::setInactiveBankHashBucketChanges(FGNextHopGroupEntry *syncd_fg_r
781781

782782
if (bank_member_changes[bank].nhs_to_add.size() > 0)
783783
{
784-
/* Previously inactive bank now transistions to active */
784+
/* Previously inactive bank now transitions to active */
785785
syncd_fg_route_entry->syncd_fgnhg_map[bank].clear();
786786
for (uint32_t i = fgNhgEntry->hash_bucket_indices[bank].start_index;
787787
i <= fgNhgEntry->hash_bucket_indices[bank].end_index; i++)
@@ -805,7 +805,7 @@ bool FgNhgOrch::setInactiveBankHashBucketChanges(FGNextHopGroupEntry *syncd_fg_r
805805
}
806806
else if (bank_member_changes[bank].nhs_to_del.size() > 0)
807807
{
808-
/* Previously active bank now transistions to inactive */
808+
/* Previously active bank now transitions to inactive */
809809
if (!setInactiveBankToNextAvailableActiveBank(syncd_fg_route_entry, fgNhgEntry,
810810
bank, bank_member_changes, nhopgroup_members_set, ipPrefix))
811811
{
@@ -1130,7 +1130,7 @@ bool FgNhgOrch::setFgNhg(sai_object_id_t vrf_id, const IpPrefix &ipPrefix, const
11301130
fgNhgEntry->hash_bucket_indices.size(), BankMemberChanges());
11311131
if (fgNhgEntry->hash_bucket_indices.size() == 0)
11321132
{
1133-
/* Only happens the 1st time when hash_bucket_indices are not inited
1133+
/* Only happens the 1st time when hash_bucket_indices are not initialized
11341134
*/
11351135
for (auto it : fgNhgEntry->next_hops)
11361136
{

orchagent/fgnhgorch.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ typedef std::map<IpAddress, FgNhgEntry*> FgNhgMembers;
8383
/* Main structure to hold user configuration */
8484
typedef std::map<FgNhg, FgNhgEntry> FgNhgs;
8585

86-
/* Helper struct populated at every route change to identify the next-hop changes which occured */
86+
/* Helper struct populated at every route change to identify the next-hop changes which occurred */
8787
typedef struct
8888
{
8989
std::vector<NextHopKey> nhs_to_del;

orchagent/intfsorch.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1047,7 +1047,7 @@ bool IntfsOrch::addRouterIntfs(sai_object_id_t vrf_id, Port &port)
10471047
attr.id = SAI_ROUTER_INTERFACE_ATTR_NAT_ZONE_ID;
10481048
attr.value.u32 = port.m_nat_zone_id;
10491049

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

0 commit comments

Comments
 (0)