Drop support for old association interface
A new association interface is defined in phosphor-dbus-interfaces
It would be nice to move the local version of the interface
to the new one.
The behavior of how association work is described here:
https://github.com/openbmc/docs/blob/master/object-mapper.md#associations
I did some searching and confirmed that all the old interfaces
(except the openbmc/pyphosphor, but we have removed support for python)
should have been removed, so drop the support for the old interface here.
Partially resolves openbmc/openbmc#3584
In addition, when I commited this change, ci reported code format error:
@libmapper/mapper.h
-int mapper_wait_async(sd_bus*, sd_event*, char* [], void (*)(int, void*), void*,
+int mapper_wait_async(sd_bus*, sd_event*, char*[], void (*)(int, void*), void*,
Fixed that.
Signed-off-by: John Wang <wangzqbj@inspur.com>
Change-Id: I0c2d0458a3f55f4671b91f6492e7218ecc3df4aa
diff --git a/src/processing.cpp b/src/processing.cpp
index 2dfebfd..f3f59a9 100644
--- a/src/processing.cpp
+++ b/src/processing.cpp
@@ -65,9 +65,8 @@
auto ifaces = pathIt->second.find(wellKnown);
if (ifaces != pathIt->second.end())
{
- auto assoc = std::find_if(
- ifaces->second.begin(), ifaces->second.end(),
- [](const auto& iface) { return isAssocDefIface(iface); });
+ auto assoc = std::find(ifaces->second.begin(), ifaces->second.end(),
+ assocDefsInterface);
if (assoc != ifaces->second.end())
{
removeAssociation(pathIt->first, wellKnown, server, assocMaps);
@@ -110,13 +109,13 @@
{
ifaceList[wellKnown].emplace(interfacePair.first);
- if (isAssocDefIface(interfacePair.first))
+ if (interfacePair.first == assocDefsInterface)
{
const sdbusplus::message::variant<std::vector<Association>>*
variantAssociations = nullptr;
for (const auto& interface : interfacePair.second)
{
- if (interface.first == getAssocDefPropName(interfacePair.first))
+ if (interface.first == assocDefsProperty)
{
variantAssociations = &(interface.second);
}