commit 0ef0e289e4fc695e00a3331506befdea749ed079
author Johnathan Mantey <johnathanx.mantey@intel.com> Tue Nov 15 12:15:02 2022 -0800
committer Ed Tanous <ed@tanous.net> Mon Dec 05 17:01:02 2022 +0000
tree 3cff3582b7961720322e16c5ca942a7196241348
parent fcd2682a23e3a66d1fee65d866d2b002e8424af6

Prevent unconditionally writing over the LinkStatus

The NIC LinkStatus was being assigned a LinkUp or NoLink value
depending on whether the NIC is enabled.

Subsequent code unconditionally overwrites the LinkStatus.

The LinkStatus needs to take into account the NIC enabled state as
well as the link up/down state.

Tested:
Confirmed NIC enabled/link active resulted in LinkUp.
Confrimed NIC enabled/no-carrier resulted in LinkDown.
Connfimred NIC disable resulted in NoLink.

Change-Id: Iece3686cac9714e427b0e100f486a4ced334f7af
Signed-off-by: Johnathan Mantey <johnathanx.mantey@intel.com>

redfish-core/lib/ethernet.hpp

diff --git a/redfish-core/lib/ethernet.hpp b/redfish-core/lib/ethernet.hpp
index e05cb6b..b74af34 100644
--- a/redfish-core/lib/ethernet.hpp
+++ b/redfish-core/lib/ethernet.hpp
@@ -1619,7 +1619,7 @@
 
     if (ethData.nicEnabled)
     {
-        jsonResponse["LinkStatus"] = "LinkUp";
+        jsonResponse["LinkStatus"] = ethData.linkUp ? "LinkUp" : "LinkDown";
         jsonResponse["Status"]["State"] = "Enabled";
     }
     else
@@ -1628,7 +1628,6 @@
         jsonResponse["Status"]["State"] = "Disabled";
     }
 
-    jsonResponse["LinkStatus"] = ethData.linkUp ? "LinkUp" : "LinkDown";
     jsonResponse["SpeedMbps"] = ethData.speed;
     jsonResponse["MTUSize"] = ethData.mtuSize;
     jsonResponse["MACAddress"] = ethData.macAddress;