Move to new 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
Partially resolves openbmc/openbmc#3584
Tested: See the org.openbmc.Associations interface has been replaced by the xyz
one in /xyz/openbmc_project/software/version_id object
Signed-off-by: John Wang <wangzqbj@inspur.com>
Change-Id: I249b7fea26f720b57e60e0bf8ba8bc71c620af98
diff --git a/Makefile.am b/Makefile.am
index 6c3ec16..9b4e251 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,9 +29,7 @@
BUILT_SOURCES = \
xyz/openbmc_project/Software/Image/error.cpp \
- xyz/openbmc_project/Software/Image/error.hpp \
- org/openbmc/Associations/server.cpp \
- org/openbmc/Associations/server.hpp
+ xyz/openbmc_project/Software/Image/error.hpp
CLEANFILES = ${BUILT_SOURCES}
@@ -90,9 +88,6 @@
synclist
endif
-nodist_phosphor_image_updater_SOURCES = \
- org/openbmc/Associations/server.cpp
-
generic_cxxflags = \
$(SYSTEMD_CFLAGS) \
$(PHOSPHOR_DBUS_INTERFACES_CFLAGS) \
@@ -116,14 +111,6 @@
@mkdir -p `dirname $@`
$(SDBUSPLUSPLUS) -r $(srcdir) error exception-cpp xyz.openbmc_project.Software.Image > $@
-org/openbmc/Associations/server.cpp: org/openbmc/Associations.interface.yaml
- @mkdir -p `dirname $@`
- $(SDBUSPLUSPLUS) -r $(srcdir) interface server-cpp org.openbmc.Associations > $@
-
-org/openbmc/Associations/server.hpp: org/openbmc/Associations.interface.yaml
- @mkdir -p `dirname $@`
- $(SDBUSPLUSPLUS) -r $(srcdir) interface server-header org.openbmc.Associations > $@
-
phosphor_version_software_manager_CXXFLAGS = $(generic_cxxflags)
phosphor_version_software_manager_LDFLAGS = $(generic_ldflags)
phosphor_download_manager_CXXFLAGS = $(generic_cxxflags)
diff --git a/activation.hpp b/activation.hpp
index df8cba8..e87d20c 100644
--- a/activation.hpp
+++ b/activation.hpp
@@ -3,12 +3,12 @@
#include "config.h"
#include "flash.hpp"
-#include "org/openbmc/Associations/server.hpp"
#include "utils.hpp"
#include "xyz/openbmc_project/Software/ActivationProgress/server.hpp"
#include "xyz/openbmc_project/Software/RedundancyPriority/server.hpp"
#include <sdbusplus/server.hpp>
+#include <xyz/openbmc_project/Association/Definitions/server.hpp>
#include <xyz/openbmc_project/Software/Activation/server.hpp>
#include <xyz/openbmc_project/Software/ActivationBlocksTransition/server.hpp>
@@ -31,7 +31,7 @@
std::vector<std::tuple<std::string, std::string, std::string>>;
using ActivationInherit = sdbusplus::server::object::object<
sdbusplus::xyz::openbmc_project::Software::server::Activation,
- sdbusplus::org::openbmc::server::Associations>;
+ sdbusplus::xyz::openbmc_project::Association::server::Definitions>;
using ActivationBlocksTransitionInherit = sdbusplus::server::object::object<
sdbusplus::xyz::openbmc_project::Software::server::
ActivationBlocksTransition>;
diff --git a/item_updater.hpp b/item_updater.hpp
index aafd66b..4a4d1b4 100644
--- a/item_updater.hpp
+++ b/item_updater.hpp
@@ -2,11 +2,11 @@
#include "activation.hpp"
#include "item_updater_helper.hpp"
-#include "org/openbmc/Associations/server.hpp"
#include "version.hpp"
#include "xyz/openbmc_project/Collection/DeleteAll/server.hpp"
#include <sdbusplus/server.hpp>
+#include <xyz/openbmc_project/Association/Definitions/server.hpp>
#include <xyz/openbmc_project/Common/FactoryReset/server.hpp>
#include <xyz/openbmc_project/Control/FieldMode/server.hpp>
@@ -20,7 +20,7 @@
using ItemUpdaterInherit = sdbusplus::server::object::object<
sdbusplus::xyz::openbmc_project::Common::server::FactoryReset,
sdbusplus::xyz::openbmc_project::Control::server::FieldMode,
- sdbusplus::org::openbmc::server::Associations,
+ sdbusplus::xyz::openbmc_project::Association::server::Definitions,
sdbusplus::xyz::openbmc_project::Collection::server::DeleteAll>;
namespace MatchRules = sdbusplus::bus::match::rules;
diff --git a/org/openbmc/Associations.interface.yaml b/org/openbmc/Associations.interface.yaml
deleted file mode 100644
index 3259123..0000000
--- a/org/openbmc/Associations.interface.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-description: >
- Implement to delegate org.openbmc.Association interface management
- responsibilities to another application.
-properties:
- - name: associations
- type: array[struct[string,string,string]]
- description: >
- An array of forward, reverse, endpoint tuples where:
- forward - The type of the association.
- reverse - The type of the association to create for the endpoint.
- endpoint - The association endpoint.
-