use new sdbus++ camelcase
Change I17a8d7479556596a3cf252b3f4eae9c8df547189 will change
how sdbus++ generates names which start with an acronym.
Prepare for this by keying off the SDBUSPP_NEW_CAMELCASE
define to use the new format.
Changes:
dHCPEnabled -> dhcpEnabled
dNSEnabled -> dnsEnabled
iP -> ip
iPAddress -> ipAddress
iPv6AcceptRA -> ipv6AcceptRA
mACAddress -> macAddress
nICEnabled -> nicEnabled
nTPEnabled -> ntpEnabled
nTPServers -> ntpServers
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I35da2c4f8fc33262d6d096e499220419ebe4d00d
diff --git a/dhcp_configuration.hpp b/dhcp_configuration.hpp
index cc2083e..441c7b2 100644
--- a/dhcp_configuration.hpp
+++ b/dhcp_configuration.hpp
@@ -7,6 +7,11 @@
#include <string>
#include <xyz/openbmc_project/Network/DHCPConfiguration/server.hpp>
+#ifndef SDBUSPP_NEW_CAMELCASE
+#define dnsEnabled dNSEnabled
+#define ntpEnabled nTPEnabled
+#endif
+
namespace phosphor
{
namespace network
@@ -47,8 +52,8 @@
Iface(bus, objPath.c_str(), true),
bus(bus), manager(parent)
{
- ConfigIntf::dNSEnabled(getDHCPPropFromConf("UseDNS"));
- ConfigIntf::nTPEnabled(getDHCPPropFromConf("UseNTP"));
+ ConfigIntf::dnsEnabled(getDHCPPropFromConf("UseDNS"));
+ ConfigIntf::ntpEnabled(getDHCPPropFromConf("UseNTP"));
ConfigIntf::hostNameEnabled(getDHCPPropFromConf("UseHostname"));
ConfigIntf::sendHostNameEnabled(getDHCPPropFromConf("SendHostname"));
emit_object_added();
@@ -60,14 +65,14 @@
* @param[in] value - true if DNS server needed from DHCP server
* else false.
*/
- bool dNSEnabled(bool value) override;
+ bool dnsEnabled(bool value) override;
/** @brief If true then NTP servers received from the DHCP server
will be used by systemd-timesyncd.
* @param[in] value - true if NTP server needed from DHCP server
* else false.
*/
- bool nTPEnabled(bool value) override;
+ bool ntpEnabled(bool value) override;
/** @brief If true then Hostname received from the DHCP server will
* be set as the hostname of the system
@@ -94,9 +99,9 @@
sendHostNameEnabled).
*
*/
- using ConfigIntf::dNSEnabled;
+ using ConfigIntf::dnsEnabled;
using ConfigIntf::hostNameEnabled;
- using ConfigIntf::nTPEnabled;
+ using ConfigIntf::ntpEnabled;
using ConfigIntf::sendHostNameEnabled;
private: