commit 95f8646e9c27d6c3e3e549b0f1b0073f05caeb8b
author Manojkiran Eda <manojkiran.eda@gmail.com> Wed Aug 07 15:07:54 2019 +0530
committer Ed Tanous <ed.tanous@intel.com> Tue Aug 20 18:57:54 2019 +0000
tree ebda7a36581d7a5673317a0fd17bf0161bbca4a9
parent a8169ef902b4b8a3d89867155e3d43d8404a6cfd

Avoid populating StaticNameServers property

Redfish ethernet schema has two properties for nameservers
1.NameServers - Represents nameservers currently in use on Interface
2.StaticNameServers -Represents only statically defined set of DNS

As we have only one DBUS property `Nameservers` which is used for both
the static and dynamic nameservers, So the idea behind this commit is
to not populate the StaticnameServers property when DHCP mode is
enabled.

Tested By:

GET https://${BMC_IP}/redfish/v1/Managers/bmc/EthernetInterfaces/eth0

Signed-off-by: Manojkiran Eda <manojkiran.eda@gmail.com>
Change-Id: I64f66bde55ec41dc78befbb659a0cbc425bbc24b

redfish-core/lib/ethernet.hpp

diff --git a/redfish-core/lib/ethernet.hpp b/redfish-core/lib/ethernet.hpp
index 7932210..17b953b 100644
--- a/redfish-core/lib/ethernet.hpp
+++ b/redfish-core/lib/ethernet.hpp
@@ -1539,7 +1539,15 @@
                               iface_id + "/VLANs"}};
 
         json_response["NameServers"] = ethData.nameservers;
-        json_response["StaticNameServers"] = ethData.nameservers;
+
+        if (!ethData.DHCPEnabled)
+        {
+            json_response["StaticNameServers"] = ethData.nameservers;
+        }
+        else
+        {
+            json_response["StaticNameServers"] = {};
+        }
 
         nlohmann::json &ipv4_array = json_response["IPv4Addresses"];
         ipv4_array = nlohmann::json::array();