commit 85c356f76fe07db3c1253c48f5b35c5811a15c07
author John Wang <wangzqbj@inspur.com> Wed Sep 11 16:20:13 2019 +0800
committer John Wang <wangzqbj@inspur.com> Tue Sep 17 09:10:07 2019 +0800
tree 68b11410136c1a9ba583966c82df841000ccce05
parent a013560f96a9ee5c2db4e1778c7dcee199c3acf1

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

activation.hpp

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>;