Merge pull request #3424 from krismarvell/prestera_revert

[202411] Revert "platform/marvell renaming to platform/marvell-prestera (#3378)"

Author: kperumalbfn

mclagsyncd/mclaglink.cpp

@@ -193,7 +193,7 @@ void MclagLink::setPortIsolate(char *msg)
         BRCM_PLATFORM_SUBSTRING,
         BFN_PLATFORM_SUBSTRING,
         CTC_PLATFORM_SUBSTRING,
-        MRVL_PRST_PLATFORM_SUBSTRING
+        MRVL_PLATFORM_SUBSTRING
     };
 
     const char *platform = getenv("platform");

mclagsyncd/mclaglink.h

@@ -54,7 +54,7 @@
 #define BRCM_PLATFORM_SUBSTRING "broadcom"
 #define BFN_PLATFORM_SUBSTRING  "barefoot"
 #define CTC_PLATFORM_SUBSTRING  "centec"
-#define MRVL_PRST_PLATFORM_SUBSTRING "marvell-prestera"
+#define MRVL_PLATFORM_SUBSTRING "marvell"
 
 using namespace std;
 

orchagent/Makefile.am

@@ -20,7 +20,7 @@ dist_swss_DATA = \
 		 pfc_detect_marvell_teralynx.lua  \
 		 pfc_detect_mellanox.lua  \
 		 pfc_detect_broadcom.lua \
-		 pfc_detect_marvell_prestera.lua \
+		 pfc_detect_marvell.lua \
 		 pfc_detect_barefoot.lua \
 		 pfc_detect_nephos.lua \
 		 pfc_detect_cisco-8000.lua \

orchagent/aclorch.cpp

@@ -3306,7 +3306,7 @@ void AclOrch::init(vector<TableConnector>& connectors, PortsOrch *portOrch, Mirr
             platform == CISCO_8000_PLATFORM_SUBSTRING ||
             platform == MLNX_PLATFORM_SUBSTRING ||
             platform == BFN_PLATFORM_SUBSTRING  ||
-            platform == MRVL_PRST_PLATFORM_SUBSTRING ||
+            platform == MRVL_PLATFORM_SUBSTRING ||
             platform == MRVL_TL_PLATFORM_SUBSTRING ||
             platform == NPS_PLATFORM_SUBSTRING ||
             platform == XS_PLATFORM_SUBSTRING ||
@@ -3327,7 +3327,7 @@ void AclOrch::init(vector<TableConnector>& connectors, PortsOrch *portOrch, Mirr
         };
     }
 
-    if ( platform == MRVL_PRST_PLATFORM_SUBSTRING ||
+    if ( platform == MRVL_PLATFORM_SUBSTRING ||
 	    platform == MRVL_TL_PLATFORM_SUBSTRING ||
             platform == VS_PLATFORM_SUBSTRING)
     {
@@ -3362,7 +3362,7 @@ void AclOrch::init(vector<TableConnector>& connectors, PortsOrch *portOrch, Mirr
     // In Broadcom DNX platform also, V4 and V6 rules are stored in different tables
     if (platform == MLNX_PLATFORM_SUBSTRING ||
         platform == CISCO_8000_PLATFORM_SUBSTRING ||
-        platform == MRVL_PRST_PLATFORM_SUBSTRING ||
+        platform == MRVL_PLATFORM_SUBSTRING ||
         platform == XS_PLATFORM_SUBSTRING ||
         (platform == BRCM_PLATFORM_SUBSTRING && sub_platform == BRCM_DNX_PLATFORM_SUBSTRING))
     {

orchagent/copporch.cpp

@@ -191,7 +191,7 @@ void CoppOrch::initDefaultTrapIds()
     /* Mellanox platform doesn't support trap priority setting */
     /* Marvell platform doesn't support trap priority. */
     char *platform = getenv("platform");
-    if (!platform || (!strstr(platform, MLNX_PLATFORM_SUBSTRING) && (!strstr(platform, MRVL_PRST_PLATFORM_SUBSTRING))))
+    if (!platform || (!strstr(platform, MLNX_PLATFORM_SUBSTRING) && (!strstr(platform, MRVL_PLATFORM_SUBSTRING))))
     {
         attr.id = SAI_HOSTIF_TRAP_ATTR_TRAP_PRIORITY;
         attr.value.u32 = 0;
@@ -1015,7 +1015,7 @@ bool CoppOrch::getAttribsFromTrapGroup (vector<FieldValueTuple> &fv_tuple,
             /* Mellanox platform doesn't support trap priority setting */
             /* Marvell platform doesn't support trap priority. */
 	    char *platform = getenv("platform");
-	    if (!platform || (!strstr(platform, MLNX_PLATFORM_SUBSTRING) && (!strstr(platform, MRVL_PRST_PLATFORM_SUBSTRING))))
+	    if (!platform || (!strstr(platform, MLNX_PLATFORM_SUBSTRING) && (!strstr(platform, MRVL_PLATFORM_SUBSTRING))))
             {
                 attr.id = SAI_HOSTIF_TRAP_ATTR_TRAP_PRIORITY,
                     attr.value.u32 = (uint32_t)stoul(fvValue(*i));

orchagent/orch.h

@@ -35,13 +35,13 @@ const char config_db_key_delimiter = '|';
 const char state_db_key_delimiter  = '|';
 
 #define MRVL_TL_PLATFORM_SUBSTRING "marvell-teralynx"
-#define MRVL_PRST_PLATFORM_SUBSTRING "marvell-prestera"
 #define MLNX_PLATFORM_SUBSTRING "mellanox"
 #define BRCM_PLATFORM_SUBSTRING "broadcom"
 #define BRCM_DNX_PLATFORM_SUBSTRING "broadcom-dnx"
 #define BFN_PLATFORM_SUBSTRING  "barefoot"
 #define VS_PLATFORM_SUBSTRING   "vs"
 #define NPS_PLATFORM_SUBSTRING  "nephos"
+#define MRVL_PLATFORM_SUBSTRING "marvell"
 #define CISCO_8000_PLATFORM_SUBSTRING "cisco-8000"
 #define XS_PLATFORM_SUBSTRING   "xsight"
 

orchagent/orchdaemon.cpp

@@ -592,7 +592,7 @@ bool OrchDaemon::init()
                     PFC_WD_POLL_MSECS));
     }
     else if ((platform == MRVL_TL_PLATFORM_SUBSTRING)
-	     || (platform == MRVL_PRST_PLATFORM_SUBSTRING)
+	     || (platform == MRVL_PLATFORM_SUBSTRING)
              || (platform == BFN_PLATFORM_SUBSTRING)
              || (platform == NPS_PLATFORM_SUBSTRING))
     {
@@ -625,7 +625,7 @@ bool OrchDaemon::init()
 
         static const vector<sai_queue_attr_t> queueAttrIds;
 
-        if ((platform == MRVL_PRST_PLATFORM_SUBSTRING) ||
+        if ((platform == MRVL_PLATFORM_SUBSTRING) ||
 	    (platform == MRVL_TL_PLATFORM_SUBSTRING) ||
 	    (platform == NPS_PLATFORM_SUBSTRING))
         {