commit d05d47254e0dcb7cfe8284ecb8a839c903262122
author John Wang <wangzqbj@inspur.com> Wed Sep 11 15:18:15 2019 +0800
committer John Wang <wangzqbj@inspur.com> Tue Sep 17 08:47:17 2019 +0800
tree 6c271d05d5f9226346f65cdb40580bb55139d394
parent d23b5b74cfadea0618e5984e8d3565d2696d26b8

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 and only when the
version number is less than PNOR_MSL, "PNOR Minimum Ship Level NOT met"
is reported.

Signed-off-by: John Wang <wangzqbj@inspur.com>
Change-Id: If4afeb69a9bd8bc494b77826f2ec2854a71f56f5

item_updater.hpp

diff --git a/item_updater.hpp b/item_updater.hpp
index 01466bb..3a00afe 100644
--- a/item_updater.hpp
+++ b/item_updater.hpp
@@ -1,11 +1,11 @@
 #pragma once
 
 #include "activation.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/Object/Enable/server.hpp>
 
@@ -18,7 +18,7 @@
 
 using ItemUpdaterInherit = sdbusplus::server::object::object<
     sdbusplus::xyz::openbmc_project::Common::server::FactoryReset,
-    sdbusplus::org::openbmc::server::Associations,
+    sdbusplus::xyz::openbmc_project::Association::server::Definitions,
     sdbusplus::xyz::openbmc_project::Collection::server::DeleteAll>;
 using GardResetInherit = sdbusplus::server::object::object<
     sdbusplus::xyz::openbmc_project::Common::server::FactoryReset>;