diff options
author | Jennifer Lee <jennifer1.lee@intel.com> | 2019-04-25 01:13:55 +0300 |
---|---|---|
committer | Ed Tanous <ed.tanous@intel.com> | 2019-05-30 00:22:35 +0300 |
commit | da131a9a053f304528cae6573f97bb6f3db951b2 (patch) | |
tree | 705b4b6fda12d7ce68fc8e036b356b230893dc84 /redfish-core/lib/ethernet.hpp | |
parent | fe5b216f3bd0dde507aeedd4f5ad7b001dc6de04 (diff) | |
download | bmcweb-da131a9a053f304528cae6573f97bb6f3db951b2.tar.xz |
[Redfish] Enable PATCH for DHCPv4 properties in EthernetInterface schema
DHCPv4 were read-only properties, this code change make following
properties to be PATCHable:
- DHCPEnabled
- UseDNSServers
- UseDomainName
- UseNTPServers
Tested:
1. Check DHCPv4 properties value
GET /redfish/v1/Managers/bmc/EthernetInterfaces/<ethID> HTTP/1.1
Response:
{
......
"DHCPv4": {
"DHCPEnabled": true,
"UseDNSServers": true,
"UseDomainName": true,
"UseNTPServers": true
},
......
}
2. PATCH DHCPv4
PATCH /redfish/v1/Managers/bmc/EthernetInterfaces/eth1 HTTP/1.1
{
"DHCPv4": {
"DHCPEnabled":false,
"UseDNSServers": false,
"UseDomainName": false,
"UseNTPServers": false
}
}
3. Check whether DHCPv4 properties are set
GET /redfish/v1/Managers/bmc/EthernetInterfaces/<ethID> HTTP/1.1
Response:
{
......
"DHCPv4": {
"DHCPEnabled": false,
"UseDNSServers": false,
"UseDomainName": false,
"UseNTPServers": false
},
......
}
Signed-off-by: Jennifer Lee <jennifer1.lee@intel.com>
Change-Id: I125029ae4cdef329edabd18f6aa6a16db6e27d3d
Diffstat (limited to 'redfish-core/lib/ethernet.hpp')
-rw-r--r-- | redfish-core/lib/ethernet.hpp | 87 |
1 files changed, 86 insertions, 1 deletions
diff --git a/redfish-core/lib/ethernet.hpp b/redfish-core/lib/ethernet.hpp index 1f6b766c0b..26d7ddcd0b 100644 --- a/redfish-core/lib/ethernet.hpp +++ b/redfish-core/lib/ethernet.hpp @@ -953,7 +953,85 @@ class EthernetInterface : public Node "xyz.openbmc_project.Network.MACAddress", "MACAddress", std::variant<std::string>(macAddress)); } + void setDHCPEnabled(const std::string &ifaceId, + const std::string &propertyName, const bool &value, + const std::shared_ptr<AsyncResp> asyncResp) + { + crow::connections::systemBus->async_method_call( + [asyncResp](const boost::system::error_code ec) { + if (ec) + { + BMCWEB_LOG_ERROR << "D-Bus responses error: " << ec; + messages::internalError(asyncResp->res); + return; + } + }, + "xyz.openbmc_project.Network", + "/xyz/openbmc_project/network/" + ifaceId, + "org.freedesktop.DBus.Properties", "Set", + "xyz.openbmc_project.Network.EthernetInterface", propertyName, + std::variant<bool>{value}); + } + void setDHCPv4Config(const std::string &propertyName, const bool &value, + const std::shared_ptr<AsyncResp> asyncResp) + { + BMCWEB_LOG_DEBUG << propertyName << " = " << value; + crow::connections::systemBus->async_method_call( + [asyncResp](const boost::system::error_code ec) { + if (ec) + { + BMCWEB_LOG_ERROR << "D-Bus responses error: " << ec; + messages::internalError(asyncResp->res); + return; + } + }, + "xyz.openbmc_project.Network", + "/xyz/openbmc_project/network/config/dhcp", + "org.freedesktop.DBus.Properties", "Set", + "xyz.openbmc_project.Network.DHCPConfiguration", propertyName, + std::variant<bool>{value}); + } + + void handleDHCPv4Patch(const std::string &ifaceId, nlohmann::json &input, + const std::shared_ptr<AsyncResp> asyncResp) + { + std::optional<bool> dhcpEnabled; + std::optional<bool> useDNSServers; + std::optional<bool> useDomainName; + std::optional<bool> useNTPServers; + + if (!json_util::readJson(input, asyncResp->res, "DHCPEnabled", + dhcpEnabled, "UseDNSServers", useDNSServers, + "UseDomainName", useDomainName, + "UseNTPServers", useNTPServers)) + { + return; + } + + if (dhcpEnabled) + { + BMCWEB_LOG_DEBUG << "set DHCPEnabled..."; + setDHCPEnabled(ifaceId, "DHCPEnabled", *dhcpEnabled, asyncResp); + } + + if (useDNSServers) + { + BMCWEB_LOG_DEBUG << "set DNSEnabled..."; + setDHCPv4Config("DNSEnabled", *useDNSServers, asyncResp); + } + + if (useDomainName) + { + BMCWEB_LOG_DEBUG << "set HostNameEnabled..."; + setDHCPv4Config("HostNameEnabled", *useDomainName, asyncResp); + } + if (useNTPServers) + { + BMCWEB_LOG_DEBUG << "set NTPEnabled..."; + setDHCPv4Config("NTPEnabled", *useNTPServers, asyncResp); + } + } void handleIPv4Patch( const std::string &ifaceId, nlohmann::json &input, const boost::container::flat_set<IPv4AddressData> &ipv4Data, @@ -1333,16 +1411,23 @@ class EthernetInterface : public Node std::optional<nlohmann::json> ipv6Addresses; std::optional<std::vector<std::string>> staticNameServers; std::optional<std::vector<std::string>> nameServers; + std::optional<nlohmann::json> dhcpv4; if (!json_util::readJson( req, res, "HostName", hostname, "IPv4Addresses", ipv4Addresses, "IPv6Addresses", ipv6Addresses, "MACAddress", macAddress, "StaticNameServers", staticNameServers, "IPv6DefaultGateway", - ipv6DefaultGateway, "NameServers", nameServers)) + ipv6DefaultGateway, "NameServers", nameServers, "DHCPv4", + dhcpv4)) { return; } + if (dhcpv4) + { + handleDHCPv4Patch(iface_id, *dhcpv4, asyncResp); + } + // Get single eth interface data, and call the below callback for JSON // preparation getEthernetIfaceData( |