Merge branch 'sonic-net:master' into vrrp_orch

vvbrcm · web-flow · commit 9c02f435017c · 2024-11-19T11:02:39.000-08:00
diff --git a/orchagent/Makefile.am b/orchagent/Makefile.am
@@ -17,7 +17,7 @@ swssdir = $(datadir)/swss
 dist_swss_DATA = \
 		 eliminate_events.lua \
 		 rif_rates.lua \
-		 pfc_detect_innovium.lua  \
+		 pfc_detect_marvell_teralynx.lua  \
 		 pfc_detect_mellanox.lua  \
 		 pfc_detect_broadcom.lua \
 		 pfc_detect_marvell.lua \
diff --git a/orchagent/aclorch.cpp b/orchagent/aclorch.cpp
@@ -3128,7 +3128,7 @@ void AclOrch::init(vector<TableConnector>& connectors, PortsOrch *portOrch, Mirr
             platform == MLNX_PLATFORM_SUBSTRING ||
             platform == BFN_PLATFORM_SUBSTRING  ||
             platform == MRVL_PLATFORM_SUBSTRING ||
-            platform == INVM_PLATFORM_SUBSTRING ||
+            platform == MRVL_TL_PLATFORM_SUBSTRING ||
             platform == NPS_PLATFORM_SUBSTRING ||
             platform == XS_PLATFORM_SUBSTRING ||
             platform == VS_PLATFORM_SUBSTRING)
@@ -3149,7 +3149,7 @@ void AclOrch::init(vector<TableConnector>& connectors, PortsOrch *portOrch, Mirr
     }
 
     if ( platform == MRVL_PLATFORM_SUBSTRING ||
-            platform == INVM_PLATFORM_SUBSTRING ||
+	    platform == MRVL_TL_PLATFORM_SUBSTRING ||
             platform == VS_PLATFORM_SUBSTRING)
     {
 	m_L3V4V6Capability =
diff --git a/orchagent/copporch.cpp b/orchagent/copporch.cpp
@@ -1014,8 +1014,8 @@ 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_PLATFORM_SUBSTRING))))
+	    char *platform = getenv("platform");
+	    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));
diff --git a/orchagent/mirrororch.cpp b/orchagent/mirrororch.cpp
@@ -34,7 +34,8 @@
 
 #define MIRROR_SESSION_DEFAULT_VLAN_PRI 0
 #define MIRROR_SESSION_DEFAULT_VLAN_CFI 0
-#define MIRROR_SESSION_DEFAULT_IP_HDR_VER 4
+#define MIRROR_SESSION_IP_HDR_VER_4     4
+#define MIRROR_SESSION_IP_HDR_VER_6     6
 #define MIRROR_SESSION_DSCP_SHIFT       2
 #define MIRROR_SESSION_DSCP_MIN         0
 #define MIRROR_SESSION_DSCP_MAX         63
@@ -380,6 +381,9 @@ task_process_status MirrorOrch::createEntry(const string& key, const vector<Fiel
 {
     SWSS_LOG_ENTER();
 
+    bool src_ip_initialized = false;
+    bool dst_ip_initialized = false;
+
     auto session = m_syncdMirrors.find(key);
     if (session != m_syncdMirrors.end())
     {
@@ -396,20 +400,12 @@ task_process_status MirrorOrch::createEntry(const string& key, const vector<Fiel
             if (fvField(i) == MIRROR_SESSION_SRC_IP)
             {
                 entry.srcIp = fvValue(i);
-                if (!entry.srcIp.isV4())
-                {
-                    SWSS_LOG_ERROR("Unsupported version of sessions %s source IP address", key.c_str());
-                    return task_process_status::task_invalid_entry;
-                }
+                src_ip_initialized = true;
             }
             else if (fvField(i) == MIRROR_SESSION_DST_IP)
             {
                 entry.dstIp = fvValue(i);
-                if (!entry.dstIp.isV4())
-                {
-                    SWSS_LOG_ERROR("Unsupported version of sessions %s destination IP address", key.c_str());
-                    return task_process_status::task_invalid_entry;
-                }
+                dst_ip_initialized = true;
             }
             else if (fvField(i) == MIRROR_SESSION_GRE_TYPE)
             {
@@ -493,6 +489,12 @@ task_process_status MirrorOrch::createEntry(const string& key, const vector<Fiel
             return task_process_status::task_failed;
         }
     }
+    // Entry validation as a whole
+    if (src_ip_initialized && dst_ip_initialized && entry.srcIp.getIp().family != entry.dstIp.getIp().family)
+    {
+        SWSS_LOG_ERROR("Address family of source and destination IPs is different");
+        return task_process_status::task_invalid_entry;
+    }
 
     if (!isHwResourcesAvailable())
     {
@@ -992,7 +994,7 @@ bool MirrorOrch::activateSession(const string& name, MirrorEntry& session)
         attrs.push_back(attr);
 
         attr.id = SAI_MIRROR_SESSION_ATTR_IPHDR_VERSION;
-        attr.value.u8 = MIRROR_SESSION_DEFAULT_IP_HDR_VER;
+        attr.value.u8 = session.dstIp.isV4() ? MIRROR_SESSION_IP_HDR_VER_4 : MIRROR_SESSION_IP_HDR_VER_6;
         attrs.push_back(attr);
 
         // TOS value format is the following:
@@ -1341,7 +1343,7 @@ void MirrorOrch::updateNextHop(const NextHopUpdate& update)
         else
         {
             string alias = "";
-            session.nexthopInfo.nexthop = NextHopKey("0.0.0.0", alias);
+            session.nexthopInfo.nexthop = session.dstIp.isV4() ? NextHopKey("0.0.0.0", alias) : NextHopKey("::", alias);
         }
 
         // Update State DB Nexthop
diff --git a/orchagent/orch.h b/orchagent/orch.h
@@ -34,7 +34,7 @@ const char range_specifier     = '-';
 const char config_db_key_delimiter = '|';
 const char state_db_key_delimiter  = '|';
 
-#define INVM_PLATFORM_SUBSTRING "innovium"
+#define MRVL_TL_PLATFORM_SUBSTRING "marvell-teralynx"
 #define MLNX_PLATFORM_SUBSTRING "mellanox"
 #define BRCM_PLATFORM_SUBSTRING "broadcom"
 #define BRCM_DNX_PLATFORM_SUBSTRING "broadcom-dnx"
diff --git a/orchagent/orchdaemon.cpp b/orchagent/orchdaemon.cpp
@@ -590,9 +590,9 @@ bool OrchDaemon::init()
                     queueAttrIds,
                     PFC_WD_POLL_MSECS));
     }
-    else if ((platform == INVM_PLATFORM_SUBSTRING)
+    else if ((platform == MRVL_TL_PLATFORM_SUBSTRING)
+	     || (platform == MRVL_PLATFORM_SUBSTRING)
              || (platform == BFN_PLATFORM_SUBSTRING)
-             || (platform == MRVL_PLATFORM_SUBSTRING)
              || (platform == NPS_PLATFORM_SUBSTRING))
     {
 
@@ -624,7 +624,9 @@ bool OrchDaemon::init()
 
         static const vector<sai_queue_attr_t> queueAttrIds;
 
-        if ((platform == INVM_PLATFORM_SUBSTRING) || (platform == NPS_PLATFORM_SUBSTRING) || (platform == MRVL_PLATFORM_SUBSTRING))
+        if ((platform == MRVL_PLATFORM_SUBSTRING) ||
+	    (platform == MRVL_TL_PLATFORM_SUBSTRING) ||
+	    (platform == NPS_PLATFORM_SUBSTRING))
         {
             m_orchList.push_back(new PfcWdSwOrch<PfcWdZeroBufferHandler, PfcWdLossyHandler>(
                         m_configDb,
diff --git a/orchagent/pfc_detect_marvell_teralynx.lua b/orchagent/pfc_detect_marvell_teralynx.lua
diff --git a/tests/test_mirror.py b/tests/test_mirror.py

Original file line number	Diff line number	Diff line change
`@@ -1014,8 +1014,8 @@ bool CoppOrch::getAttribsFromTrapGroup (vector<FieldValueTuple> &fv_tuple,`
`1014`	`1014`	`{`
`1015`	`1015`	`/* Mellanox platform doesn't support trap priority setting */`
`1016`	`1016`	`/* 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))))`
`1019`	`1019`	`{`
`1020`	`1020`	`attr.id = SAI_HOSTIF_TRAP_ATTR_TRAP_PRIORITY,`
`1021`	`1021`	`attr.value.u32 = (uint32_t)stoul(fvValue(*i));`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,8 @@`
`34`	`34`
`35`	`35`	`#define MIRROR_SESSION_DEFAULT_VLAN_PRI 0`
`36`	`36`	`#define MIRROR_SESSION_DEFAULT_VLAN_CFI 0`
`37`		`-#define MIRROR_SESSION_DEFAULT_IP_HDR_VER 4`
	`37`	`+#define MIRROR_SESSION_IP_HDR_VER_4 4`
	`38`	`+#define MIRROR_SESSION_IP_HDR_VER_6 6`
`38`	`39`	`#define MIRROR_SESSION_DSCP_SHIFT 2`
`39`	`40`	`#define MIRROR_SESSION_DSCP_MIN 0`
`40`	`41`	`#define MIRROR_SESSION_DSCP_MAX 63`
`@@ -380,6 +381,9 @@ task_process_status MirrorOrch::createEntry(const string& key, const vector<Fiel`
`380`	`381`	`{`
`381`	`382`	`SWSS_LOG_ENTER();`
`382`	`383`
	`384`	`+ bool src_ip_initialized = false;`
	`385`	`+ bool dst_ip_initialized = false;`
	`386`	`+`
`383`	`387`	`auto session = m_syncdMirrors.find(key);`
`384`	`388`	`if (session != m_syncdMirrors.end())`
`385`	`389`	`{`
`@@ -396,20 +400,12 @@ task_process_status MirrorOrch::createEntry(const string& key, const vector<Fiel`
`396`	`400`	`if (fvField(i) == MIRROR_SESSION_SRC_IP)`
`397`	`401`	`{`
`398`	`402`	`entry.srcIp = fvValue(i);`
`399`		`- if (!entry.srcIp.isV4())`
`400`		`- {`
`401`		`- SWSS_LOG_ERROR("Unsupported version of sessions %s source IP address", key.c_str());`
`402`		`- return task_process_status::task_invalid_entry;`
`403`		`- }`
	`403`	`+ src_ip_initialized = true;`
`404`	`404`	`}`
`405`	`405`	`else if (fvField(i) == MIRROR_SESSION_DST_IP)`
`406`	`406`	`{`
`407`	`407`	`entry.dstIp = fvValue(i);`
`408`		`- if (!entry.dstIp.isV4())`
`409`		`- {`
`410`		`- SWSS_LOG_ERROR("Unsupported version of sessions %s destination IP address", key.c_str());`
`411`		`- return task_process_status::task_invalid_entry;`
`412`		`- }`
	`408`	`+ dst_ip_initialized = true;`
`413`	`409`	`}`
`414`	`410`	`else if (fvField(i) == MIRROR_SESSION_GRE_TYPE)`
`415`	`411`	`{`
`@@ -493,6 +489,12 @@ task_process_status MirrorOrch::createEntry(const string& key, const vector<Fiel`
`493`	`489`	`return task_process_status::task_failed;`
`494`	`490`	`}`
`495`	`491`	`}`
	`492`	`+ // Entry validation as a whole`
	`493`	`+ if (src_ip_initialized && dst_ip_initialized && entry.srcIp.getIp().family != entry.dstIp.getIp().family)`
	`494`	`+ {`
	`495`	`+ SWSS_LOG_ERROR("Address family of source and destination IPs is different");`
	`496`	`+ return task_process_status::task_invalid_entry;`
	`497`	`+ }`
`496`	`498`
`497`	`499`	`if (!isHwResourcesAvailable())`
`498`	`500`	`{`
`@@ -992,7 +994,7 @@ bool MirrorOrch::activateSession(const string& name, MirrorEntry& session)`
`992`	`994`	`attrs.push_back(attr);`
`993`	`995`
`994`	`996`	`attr.id = SAI_MIRROR_SESSION_ATTR_IPHDR_VERSION;`
`995`		`- attr.value.u8 = MIRROR_SESSION_DEFAULT_IP_HDR_VER;`
	`997`	`+ attr.value.u8 = session.dstIp.isV4() ? MIRROR_SESSION_IP_HDR_VER_4 : MIRROR_SESSION_IP_HDR_VER_6;`
`996`	`998`	`attrs.push_back(attr);`
`997`	`999`
`998`	`1000`	`// TOS value format is the following:`
`@@ -1341,7 +1343,7 @@ void MirrorOrch::updateNextHop(const NextHopUpdate& update)`
`1341`	`1343`	`else`
`1342`	`1344`	`{`
`1343`	`1345`	`string alias = "";`
`1344`		`- session.nexthopInfo.nexthop = NextHopKey("0.0.0.0", alias);`
	`1346`	`+ session.nexthopInfo.nexthop = session.dstIp.isV4() ? NextHopKey("0.0.0.0", alias) : NextHopKey("::", alias);`
`1345`	`1347`	`}`
`1346`	`1348`
`1347`	`1349`	`// Update State DB Nexthop`
Original file line number	Diff line number	Diff line change
`@@ -590,9 +590,9 @@ bool OrchDaemon::init()`
`590`	`590`	`queueAttrIds,`
`591`	`591`	`PFC_WD_POLL_MSECS));`
`592`	`592`	`}`
`593`		`- else if ((platform == INVM_PLATFORM_SUBSTRING)`
	`593`	`+ else if ((platform == MRVL_TL_PLATFORM_SUBSTRING)`
	`594`	`+ \|\| (platform == MRVL_PLATFORM_SUBSTRING)`
`594`	`595`	`\|\| (platform == BFN_PLATFORM_SUBSTRING)`
`595`		`- \|\| (platform == MRVL_PLATFORM_SUBSTRING)`
`596`	`596`	`\|\| (platform == NPS_PLATFORM_SUBSTRING))`
`597`	`597`	`{`
`598`	`598`
`@@ -624,7 +624,9 @@ bool OrchDaemon::init()`
`624`	`624`
`625`	`625`	`static const vector<sai_queue_attr_t> queueAttrIds;`
`626`	`626`
`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))`
`628`	`630`	`{`
`629`	`631`	`m_orchList.push_back(new PfcWdSwOrch<PfcWdZeroBufferHandler, PfcWdLossyHandler>(`
`630`	`632`	`m_configDb,`