Skip to content

Commit 953474a

Browse files
wendanistcheng
wendani
authored and
stcheng
committed
[swss]: Do not use namespace in header files (sonic-net#1081)
Signed-off-by: Wenda Ni <[email protected]>
1 parent bd36751 commit 953474a

23 files changed

+221
-216
lines changed

‎cfgmgr/buffermgr.h

+11-11
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,22 @@ namespace swss {
1414
#define LOSSLESS_PGS "3-4"
1515

1616
typedef struct{
17-
string size;
18-
string xon;
19-
string xon_offset;
20-
string xoff;
21-
string threshold;
17+
std::string size;
18+
std::string xon;
19+
std::string xon_offset;
20+
std::string xoff;
21+
std::string threshold;
2222
} pg_profile_t;
2323

24-
typedef map<string, pg_profile_t> speed_map_t;
25-
typedef map<string, speed_map_t> pg_profile_lookup_t;
24+
typedef std::map<std::string, pg_profile_t> speed_map_t;
25+
typedef std::map<std::string, speed_map_t> pg_profile_lookup_t;
2626

27-
typedef map<string, string> port_cable_length_t;
27+
typedef std::map<std::string, std::string> port_cable_length_t;
2828

2929
class BufferMgr : public Orch
3030
{
3131
public:
32-
BufferMgr(DBConnector *cfgDb, DBConnector *stateDb, string pg_lookup_file, const vector<string> &tableNames);
32+
BufferMgr(DBConnector *cfgDb, DBConnector *stateDb, std::string pg_lookup_file, const std::vector<std::string> &tableNames);
3333
using Orch::doTask;
3434

3535
private:
@@ -44,8 +44,8 @@ class BufferMgr : public Orch
4444
port_cable_length_t m_cableLenLookup;
4545
std::string getPgPoolMode();
4646
void readPgProfileLookupFile(std::string);
47-
task_process_status doCableTask(string port, string cable_length);
48-
task_process_status doSpeedUpdateTask(string port, string speed);
47+
task_process_status doCableTask(std::string port, std::string cable_length);
48+
task_process_status doSpeedUpdateTask(std::string port, std::string speed);
4949

5050
void doTask(Consumer &consumer);
5151
};

‎cfgmgr/intfmgr.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,20 @@ namespace swss {
1313
class IntfMgr : public Orch
1414
{
1515
public:
16-
IntfMgr(DBConnector *cfgDb, DBConnector *appDb, DBConnector *stateDb, const vector<string> &tableNames);
16+
IntfMgr(DBConnector *cfgDb, DBConnector *appDb, DBConnector *stateDb, const std::vector<std::string> &tableNames);
1717
using Orch::doTask;
1818

1919
private:
2020
ProducerStateTable m_appIntfTableProducer;
2121
Table m_cfgIntfTable, m_cfgVlanIntfTable;
2222
Table m_statePortTable, m_stateLagTable, m_stateVlanTable, m_stateVrfTable, m_stateIntfTable;
2323

24-
void setIntfIp(const string &alias, const string &opCmd, const IpPrefix &ipPrefix);
25-
void setIntfVrf(const string &alias, const string vrfName);
26-
bool doIntfGeneralTask(const vector<string>& keys, const vector<FieldValueTuple>& data, const string& op);
27-
bool doIntfAddrTask(const vector<string>& keys, const vector<FieldValueTuple>& data, const string& op);
24+
void setIntfIp(const std::string &alias, const std::string &opCmd, const IpPrefix &ipPrefix);
25+
void setIntfVrf(const std::string &alias, const std::string vrfName);
26+
bool doIntfGeneralTask(const std::vector<std::string>& keys, const std::vector<FieldValueTuple>& data, const std::string& op);
27+
bool doIntfAddrTask(const std::vector<std::string>& keys, const std::vector<FieldValueTuple>& data, const std::string& op);
2828
void doTask(Consumer &consumer);
29-
bool isIntfStateOk(const string &alias);
29+
bool isIntfStateOk(const std::string &alias);
3030
};
3131

3232
}

‎cfgmgr/nbrmgr.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ namespace swss {
1717
class NbrMgr : public Orch
1818
{
1919
public:
20-
NbrMgr(DBConnector *cfgDb, DBConnector *appDb, DBConnector *stateDb, const vector<string> &tableNames);
20+
NbrMgr(DBConnector *cfgDb, DBConnector *appDb, DBConnector *stateDb, const std::vector<std::string> &tableNames);
2121
using Orch::doTask;
2222

2323
bool isNeighRestoreDone();
2424

2525
private:
26-
bool isIntfStateOk(const string &alias);
27-
bool setNeighbor(const string& alias, const IpAddress& ip, const MacAddress& mac);
26+
bool isIntfStateOk(const std::string &alias);
27+
bool setNeighbor(const std::string& alias, const IpAddress& ip, const MacAddress& mac);
2828

2929
void doTask(Consumer &consumer);
3030

‎cfgmgr/portmgr.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace swss {
1717
class PortMgr : public Orch
1818
{
1919
public:
20-
PortMgr(DBConnector *cfgDb, DBConnector *appDb, DBConnector *stateDb, const vector<string> &tableNames);
20+
PortMgr(DBConnector *cfgDb, DBConnector *appDb, DBConnector *stateDb, const std::vector<std::string> &tableNames);
2121

2222
using Orch::doTask;
2323
private:
@@ -26,12 +26,12 @@ class PortMgr : public Orch
2626
Table m_statePortTable;
2727
ProducerStateTable m_appPortTable;
2828

29-
set<string> m_portList;
29+
std::set<std::string> m_portList;
3030

3131
void doTask(Consumer &consumer);
32-
bool setPortMtu(const string &alias, const string &mtu);
33-
bool setPortAdminStatus(const string &alias, const bool up);
34-
bool isPortStateOk(const string &alias);
32+
bool setPortMtu(const std::string &alias, const std::string &mtu);
33+
bool setPortAdminStatus(const std::string &alias, const bool up);
34+
bool isPortStateOk(const std::string &alias);
3535
};
3636

3737
}

‎cfgmgr/teammgr.h

+13-13
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class TeamMgr : public Orch
1414
{
1515
public:
1616
TeamMgr(DBConnector *cfgDb, DBConnector *appDb, DBConnector *staDb,
17-
const vector<TableConnector> &tables);
17+
const std::vector<TableConnector> &tables);
1818

1919
using Orch::doTask;
2020
private:
@@ -28,7 +28,7 @@ class TeamMgr : public Orch
2828
ProducerStateTable m_appPortTable;
2929
ProducerStateTable m_appLagTable;
3030

31-
set<string> m_lagList;
31+
std::set<std::string> m_lagList;
3232

3333
MacAddress m_mac;
3434

@@ -37,19 +37,19 @@ class TeamMgr : public Orch
3737
void doLagMemberTask(Consumer &consumer);
3838
void doPortUpdateTask(Consumer &consumer);
3939

40-
task_process_status addLag(const string &alias, int min_links, bool fall_back);
41-
bool removeLag(const string &alias);
42-
task_process_status addLagMember(const string &lag, const string &member);
43-
bool removeLagMember(const string &lag, const string &member);
40+
task_process_status addLag(const std::string &alias, int min_links, bool fall_back);
41+
bool removeLag(const std::string &alias);
42+
task_process_status addLagMember(const std::string &lag, const std::string &member);
43+
bool removeLagMember(const std::string &lag, const std::string &member);
4444

45-
bool setLagAdminStatus(const string &alias, const string &admin_status);
46-
bool setLagMtu(const string &alias, const string &mtu);
45+
bool setLagAdminStatus(const std::string &alias, const std::string &admin_status);
46+
bool setLagMtu(const std::string &alias, const std::string &mtu);
4747

48-
bool isPortEnslaved(const string &);
49-
bool findPortMaster(string &, const string &);
50-
bool checkPortIffUp(const string &);
51-
bool isPortStateOk(const string&);
52-
bool isLagStateOk(const string&);
48+
bool isPortEnslaved(const std::string &);
49+
bool findPortMaster(std::string &, const std::string &);
50+
bool checkPortIffUp(const std::string &);
51+
bool isPortStateOk(const std::string&);
52+
bool isLagStateOk(const std::string&);
5353
};
5454

5555
}

‎cfgmgr/vlanmgr.h

+8-8
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace swss {
1414
class VlanMgr : public Orch
1515
{
1616
public:
17-
VlanMgr(DBConnector *cfgDb, DBConnector *appDb, DBConnector *stateDb, const vector<string> &tableNames);
17+
VlanMgr(DBConnector *cfgDb, DBConnector *appDb, DBConnector *stateDb, const std::vector<std::string> &tableNames);
1818
using Orch::doTask;
1919

2020
private:
@@ -27,18 +27,18 @@ class VlanMgr : public Orch
2727
void doTask(Consumer &consumer);
2828
void doVlanTask(Consumer &consumer);
2929
void doVlanMemberTask(Consumer &consumer);
30-
void processUntaggedVlanMembers(string vlan, const string &members);
30+
void processUntaggedVlanMembers(std::string vlan, const std::string &members);
3131

3232
bool addHostVlan(int vlan_id);
3333
bool removeHostVlan(int vlan_id);
34-
bool setHostVlanAdminState(int vlan_id, const string &admin_status);
34+
bool setHostVlanAdminState(int vlan_id, const std::string &admin_status);
3535
bool setHostVlanMtu(int vlan_id, uint32_t mtu);
36-
bool addHostVlanMember(int vlan_id, const string &port_alias, const string& tagging_mode);
37-
bool removeHostVlanMember(int vlan_id, const string &port_alias);
38-
bool isMemberStateOk(const string &alias);
39-
bool isVlanStateOk(const string &alias);
36+
bool addHostVlanMember(int vlan_id, const std::string &port_alias, const std::string& tagging_mode);
37+
bool removeHostVlanMember(int vlan_id, const std::string &port_alias);
38+
bool isMemberStateOk(const std::string &alias);
39+
bool isVlanStateOk(const std::string &alias);
4040
bool isVlanMacOk();
41-
bool isVlanMemberStateOk(const string &vlanMemberKey);
41+
bool isVlanMemberStateOk(const std::string &vlanMemberKey);
4242
};
4343

4444
}

‎cfgmgr/vrfmgr.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@ namespace swss {
1515
class VrfMgr : public Orch
1616
{
1717
public:
18-
VrfMgr(DBConnector *cfgDb, DBConnector *appDb, DBConnector *stateDb, const vector<string> &tableNames);
18+
VrfMgr(DBConnector *cfgDb, DBConnector *appDb, DBConnector *stateDb, const std::vector<std::string> &tableNames);
1919
using Orch::doTask;
2020

2121
private:
22-
bool delLink(const string& vrfName);
23-
bool setLink(const string& vrfName);
22+
bool delLink(const std::string& vrfName);
23+
bool setLink(const std::string& vrfName);
2424
void recycleTable(uint32_t table);
2525
uint32_t getFreeTable(void);
2626
void handleVnetConfigSet(KeyOpFieldsValuesTuple &t);
2727
void doTask(Consumer &consumer);
2828

29-
map<string, uint32_t> m_vrfTableMap;
29+
std::map<std::string, uint32_t> m_vrfTableMap;
3030
set<uint32_t> m_freeTables;
3131

3232
Table m_stateVrfTable;

‎cfgmgr/vxlanmgr.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace swss {
1414
class VxlanMgr : public Orch
1515
{
1616
public:
17-
VxlanMgr(DBConnector *cfgDb, DBConnector *appDb, DBConnector *stateDb, const vector<std::string> &tableNames);
17+
VxlanMgr(DBConnector *cfgDb, DBConnector *appDb, DBConnector *stateDb, const std::vector<std::string> &tableNames);
1818
using Orch::doTask;
1919

2020
typedef struct VxlanInfo

‎orchagent/copporch.h

+24-24
Original file line numberDiff line numberDiff line change
@@ -6,33 +6,33 @@
66
#include "orch.h"
77

88
// trap fields
9-
const string copp_trap_id_list = "trap_ids";
10-
const string copp_trap_action_field = "trap_action";
11-
const string copp_trap_priority_field = "trap_priority";
9+
const std::string copp_trap_id_list = "trap_ids";
10+
const std::string copp_trap_action_field = "trap_action";
11+
const std::string copp_trap_priority_field = "trap_priority";
1212

13-
const string copp_queue_field = "queue";
13+
const std::string copp_queue_field = "queue";
1414

1515
// policer fields
16-
const string copp_policer_meter_type_field = "meter_type";
17-
const string copp_policer_mode_field = "mode";
18-
const string copp_policer_color_field = "color";
19-
const string copp_policer_cbs_field = "cbs";
20-
const string copp_policer_cir_field = "cir";
21-
const string copp_policer_pbs_field = "pbs";
22-
const string copp_policer_pir_field = "pir";
23-
const string copp_policer_action_green_field = "green_action";
24-
const string copp_policer_action_red_field = "red_action";
25-
const string copp_policer_action_yellow_field = "yellow_action";
16+
const std::string copp_policer_meter_type_field = "meter_type";
17+
const std::string copp_policer_mode_field = "mode";
18+
const std::string copp_policer_color_field = "color";
19+
const std::string copp_policer_cbs_field = "cbs";
20+
const std::string copp_policer_cir_field = "cir";
21+
const std::string copp_policer_pbs_field = "pbs";
22+
const std::string copp_policer_pir_field = "pir";
23+
const std::string copp_policer_action_green_field = "green_action";
24+
const std::string copp_policer_action_red_field = "red_action";
25+
const std::string copp_policer_action_yellow_field = "yellow_action";
2626

2727
/* TrapGroupPolicerTable: trap group ID, policer ID */
28-
typedef map<sai_object_id_t, sai_object_id_t> TrapGroupPolicerTable;
28+
typedef std::map<sai_object_id_t, sai_object_id_t> TrapGroupPolicerTable;
2929
/* TrapIdTrapGroupTable: trap ID, trap group ID */
30-
typedef map<sai_hostif_trap_type_t, sai_object_id_t> TrapIdTrapGroupTable;
30+
typedef std::map<sai_hostif_trap_type_t, sai_object_id_t> TrapIdTrapGroupTable;
3131

3232
class CoppOrch : public Orch
3333
{
3434
public:
35-
CoppOrch(DBConnector *db, string tableName);
35+
CoppOrch(swss::DBConnector *db, std::string tableName);
3636
protected:
3737
object_map m_trap_group_map;
3838

@@ -44,15 +44,15 @@ class CoppOrch : public Orch
4444
void initDefaultTrapIds();
4545

4646
task_process_status processCoppRule(Consumer& consumer);
47-
bool isValidList(vector<string> &trap_id_list, vector<string> &all_items) const;
48-
void getTrapIdList(vector<string> &trap_id_name_list, vector<sai_hostif_trap_type_t> &trap_id_list) const;
49-
bool applyTrapIds(sai_object_id_t trap_group, vector<string> &trap_id_name_list, vector<sai_attribute_t> &trap_id_attribs);
50-
bool applyAttributesToTrapIds(sai_object_id_t trap_group_id, const vector<sai_hostif_trap_type_t> &trap_id_list, vector<sai_attribute_t> &trap_id_attribs);
47+
bool isValidList(std::vector<std::string> &trap_id_list, std::vector<std::string> &all_items) const;
48+
void getTrapIdList(std::vector<std::string> &trap_id_name_list, std::vector<sai_hostif_trap_type_t> &trap_id_list) const;
49+
bool applyTrapIds(sai_object_id_t trap_group, std::vector<std::string> &trap_id_name_list, std::vector<sai_attribute_t> &trap_id_attribs);
50+
bool applyAttributesToTrapIds(sai_object_id_t trap_group_id, const std::vector<sai_hostif_trap_type_t> &trap_id_list, std::vector<sai_attribute_t> &trap_id_attribs);
5151

52-
bool createPolicer(string trap_group, vector<sai_attribute_t> &policer_attribs);
53-
bool removePolicer(string trap_group_name);
52+
bool createPolicer(std::string trap_group, std::vector<sai_attribute_t> &policer_attribs);
53+
bool removePolicer(std::string trap_group_name);
5454

55-
sai_object_id_t getPolicer(string trap_group_name);
55+
sai_object_id_t getPolicer(std::string trap_group_name);
5656

5757
virtual void doTask(Consumer& consumer);
5858
};

‎orchagent/countercheckorch.h

+12-12
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,31 @@ extern "C" {
1212
#include "sai.h"
1313
}
1414

15-
typedef vector<uint64_t> QueueMcCounters;
16-
typedef array<uint64_t, PFC_WD_TC_MAX> PfcFrameCounters;
15+
typedef std::vector<uint64_t> QueueMcCounters;
16+
typedef std::array<uint64_t, PFC_WD_TC_MAX> PfcFrameCounters;
1717

1818
class CounterCheckOrch: public Orch
1919
{
2020
public:
21-
static CounterCheckOrch& getInstance(DBConnector *db = nullptr);
22-
virtual void doTask(SelectableTimer &timer);
21+
static CounterCheckOrch& getInstance(swss::DBConnector *db = nullptr);
22+
virtual void doTask(swss::SelectableTimer &timer);
2323
virtual void doTask(Consumer &consumer) {}
24-
void addPort(const Port& port);
25-
void removePort(const Port& port);
24+
void addPort(const swss::Port& port);
25+
void removePort(const swss::Port& port);
2626

2727
private:
28-
CounterCheckOrch(DBConnector *db, vector<string> &tableNames);
28+
CounterCheckOrch(swss::DBConnector *db, std::vector<std::string> &tableNames);
2929
virtual ~CounterCheckOrch(void);
30-
QueueMcCounters getQueueMcCounters(const Port& port);
30+
QueueMcCounters getQueueMcCounters(const swss::Port& port);
3131
PfcFrameCounters getPfcFrameCounters(sai_object_id_t portId);
3232
void mcCounterCheck();
3333
void pfcFrameCounterCheck();
3434

35-
map<sai_object_id_t, QueueMcCounters> m_mcCountersMap;
36-
map<sai_object_id_t, PfcFrameCounters> m_pfcFrameCountersMap;
35+
std::map<sai_object_id_t, QueueMcCounters> m_mcCountersMap;
36+
std::map<sai_object_id_t, PfcFrameCounters> m_pfcFrameCountersMap;
3737

38-
shared_ptr<DBConnector> m_countersDb = nullptr;
39-
shared_ptr<Table> m_countersTable = nullptr;
38+
std::shared_ptr<swss::DBConnector> m_countersDb = nullptr;
39+
std::shared_ptr<swss::Table> m_countersTable = nullptr;
4040
};
4141

4242
#endif

‎orchagent/crmorch.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ extern sai_switch_api_t *sai_switch_api;
2020
extern sai_acl_api_t *sai_acl_api;
2121

2222
using namespace std;
23+
using namespace swss;
2324

2425

2526
const map<CrmResourceType, string> crmResTypeNameMap =

0 commit comments

Comments
 (0)