commit d0cf94288f597191bff5960b36145f9d94735cd8
author John Wang <wangzqbj@inspur.com> Tue Sep 17 16:01:34 2019 +0800
committer John Wang <wangzqbj@inspur.com> Tue Sep 17 17:09:47 2019 +0800
tree fbe0de4fdffb0dce40d29166750396838020c1b9
parent 5eddf44006cf9ad5b9a5c103adc1682fc835f932

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

src/test/interfaces_added.cpp

diff --git a/src/test/interfaces_added.cpp b/src/test/interfaces_added.cpp
index bee978f..5aa4212 100644
--- a/src/test/interfaces_added.cpp
+++ b/src/test/interfaces_added.cpp
@@ -37,8 +37,8 @@
     auto interfaceMap = createDefaultInterfaceMap();
     AssociationMaps assocMaps;
 
-    auto intfAdded = createInterfacesAdded(
-        assocDefsInterface, getAssocDefPropName(assocDefsInterface));
+    auto intfAdded =
+        createInterfacesAdded(assocDefsInterface, assocDefsProperty);
 
     processInterfaceAdded(interfaceMap, DEFAULT_SOURCE_PATH, intfAdded,
                           DEFAULT_DBUS_SVC, assocMaps, *server);
@@ -59,31 +59,3 @@
     // No pending associations
     EXPECT_EQ(assocMaps.pending.size(), 0);
 }
-
-TEST_F(TestInterfacesAdded, OrgOpenBmcInterfacesAddedGoodPath)
-{
-    auto interfaceMap = createDefaultInterfaceMap();
-    AssociationMaps assocMaps;
-
-    auto intfAdded = createInterfacesAdded(
-        orgOpenBMCAssocDefsInterface,
-        getAssocDefPropName(orgOpenBMCAssocDefsInterface));
-
-    processInterfaceAdded(interfaceMap, DEFAULT_SOURCE_PATH, intfAdded,
-                          DEFAULT_DBUS_SVC, assocMaps, *server);
-
-    // Interface map will get the following:
-    // /logging/entry/1 /logging/entry /logging/ /  system/chassis
-    EXPECT_EQ(interfaceMap.size(), 5);
-
-    // New association ower created so ensure it now contains a single entry
-    // dump_AssociationOwnersType(assocOwners);
-    EXPECT_EQ(assocMaps.owners.size(), 1);
-
-    // Ensure the 2 association interfaces were created
-    // dump_AssociationInterfaces(assocInterfaces);
-    EXPECT_EQ(assocMaps.ifaces.size(), 2);
-
-    // No pending associations
-    EXPECT_EQ(assocMaps.pending.size(), 0);
-}