commit 7e952d9fd797e0fa7b57e62f66f9b2550ab9db3d
author Patrick Venture <venture@google.com> Mon Oct 05 15:58:52 2020 -0700
committer Patrick Venture <venture@google.com> Mon Oct 05 16:16:41 2020 -0700
tree 56b6d187a2f20af73ae4dc906a6c581d804a26cb
parent 3e2f758157d0b77272996c8a6ae075189733bfc1

dbus: move types to header for use in tests

Signed-off-by: Patrick Venture <venture@google.com>
Change-Id: Iff106e17fa020d7deff29b78af8a5337324317d8

dbus/dbusconfiguration.cpp

diff --git a/dbus/dbusconfiguration.cpp b/dbus/dbusconfiguration.cpp
index f69f54d..a515439 100644
--- a/dbus/dbusconfiguration.cpp
+++ b/dbus/dbusconfiguration.cpp
@@ -13,6 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 */
+#include "dbusconfiguration.hpp"
 
 #include "conf.hpp"
 #include "dbushelper.hpp"
@@ -73,9 +74,6 @@
 
 namespace dbus_configuration
 {
-using DbusVariantType =
-    std::variant<uint64_t, int64_t, double, std::string,
-                 std::vector<std::string>, std::vector<double>>;
 using SensorInterfaceType = std::pair<std::string, std::string>;
 
 inline std::string getSensorNameFromPath(const std::string& dbusPath)
@@ -459,15 +457,6 @@
 
     createMatches(bus, timer);
 
-    using DbusVariantType =
-        std::variant<uint64_t, int64_t, double, std::string,
-                     std::vector<std::string>, std::vector<double>>;
-
-    using ManagedObjectType = std::unordered_map<
-        sdbusplus::message::object_path,
-        std::unordered_map<std::string,
-                           std::unordered_map<std::string, DbusVariantType>>>;
-
     auto mapper =
         bus.new_method_call("xyz.openbmc_project.ObjectMapper",
                             "/xyz/openbmc_project/object_mapper",

dbus/dbusconfiguration.hpp

diff --git a/dbus/dbusconfiguration.hpp b/dbus/dbusconfiguration.hpp
index fc119e8..29f8597 100644
--- a/dbus/dbusconfiguration.hpp
+++ b/dbus/dbusconfiguration.hpp
@@ -13,13 +13,28 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 */
-
 #pragma once
+
 #include "conf.hpp"
 
 #include <boost/asio/steady_timer.hpp>
 #include <sdbusplus/bus.hpp>
 
+#include <cstdint>
+#include <string>
+#include <unordered_map>
+#include <variant>
+#include <vector>
+
+using DbusVariantType =
+    std::variant<uint64_t, int64_t, double, std::string,
+                 std::vector<std::string>, std::vector<double>>;
+
+using ManagedObjectType = std::unordered_map<
+    sdbusplus::message::object_path,
+    std::unordered_map<std::string,
+                       std::unordered_map<std::string, DbusVariantType>>>;
+
 namespace pid_control
 {
 namespace dbus_configuration