Address comments: Handling all default values for fields at the IntfMgr

level Signed-off-by: Wenda Ni <wenni@microsoft.com>
sonic-net · Nov 6, 2019 · 7f59f07 · 7f59f07
1 parent 0011b12
commit 7f59f07
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/cfgmgr/intfmgr.cpp b/cfgmgr/intfmgr.cpp
@@ -287,7 +287,7 @@ bool IntfMgr::doIntfGeneralTask(const vector<string>& keys,
 
     string vrf_name = "";
     uint32_t mtu = 0;
-    string adminStatus = "up";
+    string adminStatus = "";
     for (auto idx : data)
     {
         const auto &field = fvField(idx);
@@ -356,7 +356,18 @@ bool IntfMgr::doIntfGeneralTask(const vector<string>& keys,
                         return false;
                     }
                 }
+                else
+                {
+                    FieldValueTuple fvTuple("mtu", std::to_string(mtu));
+                    data.push_back(fvTuple);
+                }
 
+                if (adminStatus.empty())
+                {
+                    adminStatus = "up";
+                    FieldValueTuple fvTuple("admin_status", adminStatus);
+                    data.push_back(fvTuple);
+                }
                 try
                 {
                     setHostSubIntfAdminStatus(subIntfAlias, adminStatus);

diff --git a/orchagent/intfsorch.cpp b/orchagent/intfsorch.cpp
@@ -377,8 +377,8 @@ void IntfsOrch::doTask(Consumer &consumer)
 
         const vector<FieldValueTuple>& data = kfvFieldsValues(t);
         string vrf_name = "", vnet_name = "";
-        uint32_t mtu = 0;
-        bool adminUp = true;
+        uint32_t mtu;
+        bool adminUp;
         for (auto idx : data)
         {
             const auto &field = fvField(idx);
@@ -407,9 +407,6 @@ void IntfsOrch::doTask(Consumer &consumer)
                     SWSS_LOG_ERROR("Out of range argument %s to %s()", value.c_str(), e.what());
                     continue;
                 }
-
-                // Inherit mtu from parent port or port channel
-                mtu = 0;
             }
             else if (field == "admin_status")
             {