Merge branch 'master' into master

sonic-net · May 23, 2024 · 0acbbc8 · 0acbbc8
2 parents 4d37760 + 425a852
commit 0acbbc8
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 0 deletions.
diff --git a/orchagent/port/portcnt.h b/orchagent/port/portcnt.h
@@ -202,6 +202,11 @@ class PortConfig final
         bool is_set = false;
     } description; // Port description
 
+    struct {
+        std::string value;
+        bool is_set = false;
+    } subport; // Port subport
+
     std::string key;
     std::string op;
 

diff --git a/orchagent/port/porthlpr.cpp b/orchagent/port/porthlpr.cpp
@@ -749,6 +749,30 @@ bool PortHelper::parsePortDescription(PortConfig &port, const std::string &field
     return true;
 }
 
+bool PortHelper::parsePortSubport(PortConfig &port, const std::string &field, const std::string &value) const
+{
+    SWSS_LOG_ENTER();
+
+    if (value.empty())
+    {
+        SWSS_LOG_ERROR("Failed to parse field(%s): empty string is prohibited", field.c_str());
+        return false;
+    }
+
+    try
+    {
+        port.subport.value = value;
+        port.subport.is_set = true;
+    }
+    catch (const std::exception &e)
+    {
+        SWSS_LOG_ERROR("Failed to parse field(%s): %s", field.c_str(), e.what());
+        return false;
+    }
+
+    return true;
+}
+
 bool PortHelper::parsePortConfig(PortConfig &port) const
 {
     SWSS_LOG_ENTER();
@@ -996,6 +1020,13 @@ bool PortHelper::parsePortConfig(PortConfig &port) const
                 return false;
             }
         }
+        else if (field == PORT_SUBPORT)
+        {
+            if (!this->parsePortSubport(port, field, value))
+            {
+                return false;
+            }
+        }
         else
         {
             SWSS_LOG_WARN("Unknown field(%s): skipping ...", field.c_str());

diff --git a/orchagent/port/porthlpr.h b/orchagent/port/porthlpr.h
@@ -53,4 +53,5 @@ class PortHelper final
     bool parsePortRole(PortConfig &port, const std::string &field, const std::string &value) const;
     bool parsePortAdminStatus(PortConfig &port, const std::string &field, const std::string &value) const;
     bool parsePortDescription(PortConfig &port, const std::string &field, const std::string &value) const;
+    bool parsePortSubport(PortConfig &port, const std::string &field, const std::string &value) const;
 };
diff --git a/orchagent/port/portschema.h b/orchagent/port/portschema.h
@@ -87,3 +87,4 @@
 #define PORT_ROLE                "role"
 #define PORT_ADMIN_STATUS        "admin_status"
 #define PORT_DESCRIPTION         "description"
+#define PORT_SUBPORT             "subport"