Skip to content

Commit 0b331f0

Browse files
authored
platform/innovium renaming to platform/marvell-teralynx (#3252)
What I did asic type checks for innovium platforms renamed innovium to marvell-teralynx Why I did it asictype is being renamed in sonic-buildimage repo and hence respective platform checks needs changes in swss
1 parent c865803 commit 0b331f0

File tree

6 files changed

+11
-9
lines changed

6 files changed

+11
-9
lines changed

orchagent/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ swssdir = $(datadir)/swss
1717
dist_swss_DATA = \
1818
eliminate_events.lua \
1919
rif_rates.lua \
20-
pfc_detect_innovium.lua \
20+
pfc_detect_marvell_teralynx.lua \
2121
pfc_detect_mellanox.lua \
2222
pfc_detect_broadcom.lua \
2323
pfc_detect_marvell.lua \

orchagent/aclorch.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -3128,7 +3128,7 @@ void AclOrch::init(vector<TableConnector>& connectors, PortsOrch *portOrch, Mirr
31283128
platform == MLNX_PLATFORM_SUBSTRING ||
31293129
platform == BFN_PLATFORM_SUBSTRING ||
31303130
platform == MRVL_PLATFORM_SUBSTRING ||
3131-
platform == INVM_PLATFORM_SUBSTRING ||
3131+
platform == MRVL_TL_PLATFORM_SUBSTRING ||
31323132
platform == NPS_PLATFORM_SUBSTRING ||
31333133
platform == XS_PLATFORM_SUBSTRING ||
31343134
platform == VS_PLATFORM_SUBSTRING)
@@ -3149,7 +3149,7 @@ void AclOrch::init(vector<TableConnector>& connectors, PortsOrch *portOrch, Mirr
31493149
}
31503150

31513151
if ( platform == MRVL_PLATFORM_SUBSTRING ||
3152-
platform == INVM_PLATFORM_SUBSTRING ||
3152+
platform == MRVL_TL_PLATFORM_SUBSTRING ||
31533153
platform == VS_PLATFORM_SUBSTRING)
31543154
{
31553155
m_L3V4V6Capability =

orchagent/copporch.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1014,8 +1014,8 @@ bool CoppOrch::getAttribsFromTrapGroup (vector<FieldValueTuple> &fv_tuple,
10141014
{
10151015
/* Mellanox platform doesn't support trap priority setting */
10161016
/* Marvell platform doesn't support trap priority. */
1017-
char *platform = getenv("platform");
1018-
if (!platform || (!strstr(platform, MLNX_PLATFORM_SUBSTRING) && (!strstr(platform, MRVL_PLATFORM_SUBSTRING))))
1017+
char *platform = getenv("platform");
1018+
if (!platform || (!strstr(platform, MLNX_PLATFORM_SUBSTRING) && (!strstr(platform, MRVL_PLATFORM_SUBSTRING))))
10191019
{
10201020
attr.id = SAI_HOSTIF_TRAP_ATTR_TRAP_PRIORITY,
10211021
attr.value.u32 = (uint32_t)stoul(fvValue(*i));

orchagent/orch.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ const char range_specifier = '-';
3434
const char config_db_key_delimiter = '|';
3535
const char state_db_key_delimiter = '|';
3636

37-
#define INVM_PLATFORM_SUBSTRING "innovium"
37+
#define MRVL_TL_PLATFORM_SUBSTRING "marvell-teralynx"
3838
#define MLNX_PLATFORM_SUBSTRING "mellanox"
3939
#define BRCM_PLATFORM_SUBSTRING "broadcom"
4040
#define BRCM_DNX_PLATFORM_SUBSTRING "broadcom-dnx"

orchagent/orchdaemon.cpp

+5-3
Original file line numberDiff line numberDiff line change
@@ -590,9 +590,9 @@ bool OrchDaemon::init()
590590
queueAttrIds,
591591
PFC_WD_POLL_MSECS));
592592
}
593-
else if ((platform == INVM_PLATFORM_SUBSTRING)
593+
else if ((platform == MRVL_TL_PLATFORM_SUBSTRING)
594+
|| (platform == MRVL_PLATFORM_SUBSTRING)
594595
|| (platform == BFN_PLATFORM_SUBSTRING)
595-
|| (platform == MRVL_PLATFORM_SUBSTRING)
596596
|| (platform == NPS_PLATFORM_SUBSTRING))
597597
{
598598

@@ -624,7 +624,9 @@ bool OrchDaemon::init()
624624

625625
static const vector<sai_queue_attr_t> queueAttrIds;
626626

627-
if ((platform == INVM_PLATFORM_SUBSTRING) || (platform == NPS_PLATFORM_SUBSTRING) || (platform == MRVL_PLATFORM_SUBSTRING))
627+
if ((platform == MRVL_PLATFORM_SUBSTRING) ||
628+
(platform == MRVL_TL_PLATFORM_SUBSTRING) ||
629+
(platform == NPS_PLATFORM_SUBSTRING))
628630
{
629631
m_orchList.push_back(new PfcWdSwOrch<PfcWdZeroBufferHandler, PfcWdLossyHandler>(
630632
m_configDb,

0 commit comments

Comments
 (0)