From 490541636e89c01e4a76de31e9f3d4224fa2906f Mon Sep 17 00:00:00 2001
From: saksarav <sakthivadivu.saravanaraj@nokia.com>
Date: Fri, 26 Jun 2026 15:49:10 -0400
Subject: [PATCH] [voq] Fixed the ParsePortConfig and processQueue Warning
 messages

Signed-off-by: saksarav <sakthivadivu.saravanaraj@nokia.com>
---
 orchagent/bufferorch.cpp          |  9 +++++++--
 orchagent/port/porthlpr.cpp       | 15 +++++++++++++++
 orchagent/port/portschema.h       |  5 +++++
 tests/mock_tests/portsorch_ut.cpp |  4 +++-
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/orchagent/bufferorch.cpp b/orchagent/bufferorch.cpp
index 3bcf9e88..4d7266b8 100644
--- a/orchagent/bufferorch.cpp
+++ b/orchagent/bufferorch.cpp
@@ -1222,9 +1222,14 @@ task_process_status BufferOrch::processQueuePost(const QueueTask& task)
             }
             else
             {
-                if (gPortsOrch->isPortAdminUp(port_name))
+                /* In the Voq Switch, the admin status is set to True when the system port is added to the m_portList map
+                   and always True for remote System Port, so no need to check for remote system port*/
+                if (!((gMySwitchType == "voq") && (tokens.size() == 4)))
                 {
-                    SWSS_LOG_WARN("Queue profile '%s' applied after port %s is up", key.c_str(), port_name.c_str());
+                    if (gPortsOrch->isPortAdminUp(port_name))
+                    {
+                        SWSS_LOG_WARN("Queue profile '%s' applied after port %s is up", key.c_str(), port_name.c_str());
+                    }
                 }
             }
         }
diff --git a/orchagent/port/porthlpr.cpp b/orchagent/port/porthlpr.cpp
index dfa25b98..01432ea1 100644
--- a/orchagent/port/porthlpr.cpp
+++ b/orchagent/port/porthlpr.cpp
@@ -1328,6 +1328,21 @@ bool PortHelper::parsePortConfig(PortConfig &port) const
                 return false;
             }
         }
+        else if (field == PORT_MACSEC)
+        {
+            /* Placeholder to prevent warning. Parsed by macsecorch.*/
+            SWSS_LOG_INFO("Parsing %s", field.c_str());
+        }
+        else if (field == PORT_ASIC_PORT_NAME)
+        {
+            /* Placeholder to prevent warning. Not used by orchagent.*/
+            SWSS_LOG_INFO("Parsing %s", field.c_str());
+        }
+        else if ((field == PORT_CORE_ID) || (field == PORT_CORE_PORT_ID) || (field == PORT_NUM_VOQ))
+        {
+            /* Placeholder to prevent warning. These fields are taken from SYSTEM_PORT*/
+            SWSS_LOG_INFO("Parsing %s", field.c_str());
+        }
         else
         {
             SWSS_LOG_WARN("Unknown field(%s): skipping ...", field.c_str());
diff --git a/orchagent/port/portschema.h b/orchagent/port/portschema.h
index d2f4cab3..3faa5831 100644
--- a/orchagent/port/portschema.h
+++ b/orchagent/port/portschema.h
@@ -106,3 +106,8 @@
 #define PORT_MODE                  "mode"
 #define PORT_UNRELIABLE_LOS        "unreliable_los"
 #define PORT_MEDIA_TYPE            "media_type"
+#define PORT_MACSEC                "macsec"
+#define PORT_ASIC_PORT_NAME        "asic_port_name"
+#define PORT_CORE_ID               "core_id"
+#define PORT_CORE_PORT_ID          "core_port_id"
+#define PORT_NUM_VOQ               "num_voq"
diff --git a/tests/mock_tests/portsorch_ut.cpp b/tests/mock_tests/portsorch_ut.cpp
index 9506bfb0..0f23d78c 100644
--- a/tests/mock_tests/portsorch_ut.cpp
+++ b/tests/mock_tests/portsorch_ut.cpp
@@ -1230,7 +1230,9 @@ namespace portsorch_test
                 { "tpid",                "0x9100"            },
                 { "pfc_asym",            "on"                },
                 { "link_training",       "on"                },
-                { "admin_status",        "up"                }
+                { "admin_status",        "up"                },
+                { "macsec",              "basic-profile"     },
+                { "num_voq",             "8"                 }
             }
         }};