Network.IP: use PDI constants
Use PDI constants instead of local definitions.
Tested: Inspection only.
Change-Id: If4c3c657be0d97658eb400a59ec2833c6df1c131
Signed-off-by: Alexander Hansen <alexander.hansen@9elements.com>
diff --git a/chassishandler.cpp b/chassishandler.cpp
index a6a8062..2243293 100644
--- a/chassishandler.cpp
+++ b/chassishandler.cpp
@@ -23,6 +23,7 @@
#include <xyz/openbmc_project/Control/Boot/Source/server.hpp>
#include <xyz/openbmc_project/Control/Boot/Type/server.hpp>
#include <xyz/openbmc_project/Control/Power/RestorePolicy/server.hpp>
+#include <xyz/openbmc_project/Network/IP/common.hpp>
#include <xyz/openbmc_project/State/Chassis/server.hpp>
#include <xyz/openbmc_project/State/Host/server.hpp>
#include <xyz/openbmc_project/State/PowerOnHours/server.hpp>
@@ -86,7 +87,6 @@
constexpr auto SETTINGS_ROOT = "/";
constexpr auto SETTINGS_MATCH = "host0";
-constexpr auto IP_INTERFACE = "xyz.openbmc_project.Network.IP";
constexpr auto MAC_INTERFACE = "xyz.openbmc_project.Network.MACAddress";
static constexpr auto chassisStateRoot = "/xyz/openbmc_project/state";
@@ -127,6 +127,7 @@
using Intrusion = sdbusplus::client::xyz::openbmc_project::chassis::Intrusion<>;
using HostState = sdbusplus::common::xyz::openbmc_project::state::Host;
using ChassisState = sdbusplus::common::xyz::openbmc_project::state::Chassis;
+using NetworkIP = sdbusplus::common::xyz::openbmc_project::network::IP;
namespace chassis
{
@@ -191,26 +192,30 @@
sdbusplus::bus_t bus(ipmid_get_sd_bus_connection());
- auto ipObjectInfo = ipmi::getDbusObject(bus, IP_INTERFACE,
+ auto ipObjectInfo = ipmi::getDbusObject(bus, NetworkIP::interface,
SETTINGS_ROOT, SETTINGS_MATCH);
auto macObjectInfo = ipmi::getDbusObject(bus, MAC_INTERFACE,
SETTINGS_ROOT, SETTINGS_MATCH);
properties = ipmi::getAllDbusProperties(
- bus, ipObjectInfo.second, ipObjectInfo.first, IP_INTERFACE);
+ bus, ipObjectInfo.second, ipObjectInfo.first, NetworkIP::interface);
auto variant = ipmi::getDbusProperty(
bus, macObjectInfo.second, macObjectInfo.first, MAC_INTERFACE,
"MACAddress");
- auto ipAddress = std::get<std::string>(properties["Address"]);
+ auto ipAddress = std::get<std::string>(
+ properties[NetworkIP::property_names::address]);
- auto gateway = std::get<std::string>(properties["Gateway"]);
+ auto gateway = std::get<std::string>(
+ properties[NetworkIP::property_names::gateway]);
- auto prefix = std::get<uint8_t>(properties["PrefixLength"]);
+ auto prefix = std::get<uint8_t>(
+ properties[NetworkIP::property_names::prefix_length]);
uint8_t isStatic =
- (std::get<std::string>(properties["Origin"]) ==
+ (std::get<std::string>(
+ properties[NetworkIP::property_names::origin]) ==
"xyz.openbmc_project.Network.IP.AddressOrigin.Static")
? 1
: 0;
@@ -257,10 +262,12 @@
payload.pack(isStatic);
- uint8_t addressFamily = (std::get<std::string>(properties["Type"]) ==
- "xyz.openbmc_project.Network.IP.Protocol.IPv4")
- ? AF_INET
- : AF_INET6;
+ uint8_t addressFamily =
+ (std::get<std::string>(
+ properties[NetworkIP::property_names::type]) ==
+ "xyz.openbmc_project.Network.IP.Protocol.IPv4")
+ ? AF_INET
+ : AF_INET6;
addrSize = (addressFamily == AF_INET)
? ipmi::network::IPV4_ADDRESS_SIZE_BYTE
@@ -526,21 +533,26 @@
sdbusplus::bus_t bus(ipmid_get_sd_bus_connection());
- auto ipObjectInfo = ipmi::getDbusObject(bus, IP_INTERFACE,
+ auto ipObjectInfo = ipmi::getDbusObject(bus, NetworkIP::interface,
SETTINGS_ROOT, SETTINGS_MATCH);
auto macObjectInfo = ipmi::getDbusObject(bus, MAC_INTERFACE,
SETTINGS_ROOT, SETTINGS_MATCH);
// set the dbus property
- ipmi::setDbusProperty(bus, ipObjectInfo.second, ipObjectInfo.first,
- IP_INTERFACE, "Address", std::string(ipAddress));
- ipmi::setDbusProperty(bus, ipObjectInfo.second, ipObjectInfo.first,
- IP_INTERFACE, "PrefixLength", prefix);
- ipmi::setDbusProperty(bus, ipObjectInfo.second, ipObjectInfo.first,
- IP_INTERFACE, "Origin", addressOrigin);
- ipmi::setDbusProperty(bus, ipObjectInfo.second, ipObjectInfo.first,
- IP_INTERFACE, "Gateway", std::string(gateway));
ipmi::setDbusProperty(
- bus, ipObjectInfo.second, ipObjectInfo.first, IP_INTERFACE, "Type",
+ bus, ipObjectInfo.second, ipObjectInfo.first, NetworkIP::interface,
+ NetworkIP::property_names::address, std::string(ipAddress));
+ ipmi::setDbusProperty(bus, ipObjectInfo.second, ipObjectInfo.first,
+ NetworkIP::interface,
+ NetworkIP::property_names::prefix_length, prefix);
+ ipmi::setDbusProperty(bus, ipObjectInfo.second, ipObjectInfo.first,
+ NetworkIP::interface,
+ NetworkIP::property_names::origin, addressOrigin);
+ ipmi::setDbusProperty(
+ bus, ipObjectInfo.second, ipObjectInfo.first, NetworkIP::interface,
+ NetworkIP::property_names::gateway, std::string(gateway));
+ ipmi::setDbusProperty(
+ bus, ipObjectInfo.second, ipObjectInfo.first, NetworkIP::interface,
+ NetworkIP::property_names::type,
std::string("xyz.openbmc_project.Network.IP.Protocol.IPv4"));
ipmi::setDbusProperty(bus, macObjectInfo.second, macObjectInfo.first,
MAC_INTERFACE, "MACAddress", std::string(mac));
diff --git a/transportconstants.hpp b/transportconstants.hpp
index 69456bc..c1361d3 100644
--- a/transportconstants.hpp
+++ b/transportconstants.hpp
@@ -2,9 +2,12 @@
#include <ipmid/api-types.hpp>
#include <stdplus/zstring_view.hpp>
+#include <xyz/openbmc_project/Network/IP/common.hpp>
#include <cstdint>
+using NetworkIP = sdbusplus::common::xyz::openbmc_project::network::IP;
+
namespace ipmi
{
namespace transport
@@ -15,7 +18,6 @@
// D-Bus Network Daemon definitions
constexpr auto PATH_ROOT = "/xyz/openbmc_project/network"_zsv;
constexpr auto INTF_ETHERNET = "xyz.openbmc_project.Network.EthernetInterface";
-constexpr auto INTF_IP = "xyz.openbmc_project.Network.IP";
constexpr auto INTF_IP_CREATE = "xyz.openbmc_project.Network.IP.Create";
constexpr auto INTF_MAC = "xyz.openbmc_project.Network.MACAddress";
constexpr auto INTF_NEIGHBOR = "xyz.openbmc_project.Network.Neighbor";
diff --git a/transporthandler.cpp b/transporthandler.cpp
index 7bcc696..0f7f7ac 100644
--- a/transporthandler.cpp
+++ b/transporthandler.cpp
@@ -583,7 +583,7 @@
bool dhcp4 = getEthProp<bool>(bus, params, "DHCP4");
bool dhcp6 = getEthProp<bool>(bus, params, "DHCP6");
bool ra = getEthProp<bool>(bus, params, "IPv6AcceptRA");
- ObjectLookupCache ips(bus, params, INTF_IP);
+ ObjectLookupCache ips(bus, params, NetworkIP::interface);
auto ifaddr4 = findIfAddr<AF_INET>(bus, params, 0, originsV4, ips);
std::vector<IfAddr<AF_INET6>> ifaddrs6;
for (uint8_t i = 0; i < MAX_IPV6_STATIC_ADDRESSES; ++i)
diff --git a/transporthandler.hpp b/transporthandler.hpp
index de1bb66..ec67a5e 100644
--- a/transporthandler.hpp
+++ b/transporthandler.hpp
@@ -311,7 +311,7 @@
sdbusplus::server::xyz::openbmc_project::network::IP::AddressOrigin>&
origins)
{
- ObjectLookupCache ips(bus, params, INTF_IP);
+ ObjectLookupCache ips(bus, params, NetworkIP::interface);
return findIfAddr<family>(bus, params, idx, origins, ips);
}