Remove SDBUSPP_REMOVE_DEPRECATED_NAMESPACE

wltu · spinler · commit 6ddbf69e8357 · 2023-10-27T16:06:19.000Z
Fix the code to support new sdbusplus error without
SDBUSPP_REMOVE_DEPRECATED_NAMESPACE.

Change-Id: I12713ec1757d3835e1acf07c7abf409ff97615e1
Signed-off-by: Willy Tu &lt;wltu@google.com&gt;
diff --git a/callouts/callout_test.cpp b/callouts/callout_test.cpp
@@ -16,7 +16,7 @@ int main(int argc, char** argv)
         return -1;
     }
 
-    using namespace example::xyz::openbmc_project::Example::Elog;
+    using namespace example::xyz::openbmc_project::example::elog;
     try
     {
         elog<TestCallout>(TestCallout::DEV_ADDR(0xDEADEAD),
diff --git a/elog_block.hpp b/elog_block.hpp
@@ -14,8 +14,8 @@ namespace logging
 {
 
 using BlockIface = sdbusplus::server::object_t<
-    sdbusplus::xyz::openbmc_project::Logging::server::ErrorBlocksTransition,
-    sdbusplus::xyz::openbmc_project::Association::server::Definitions>;
+    sdbusplus::server::xyz::openbmc_project::logging::ErrorBlocksTransition,
+    sdbusplus::server::xyz::openbmc_project::association::Definitions>;
 
 using AssociationList =
     std::vector<std::tuple<std::string, std::string, std::string>>;
diff --git a/elog_entry.cpp b/elog_entry.cpp
@@ -23,12 +23,12 @@ void Entry::delete_()
 bool Entry::resolved(bool value)
 {
     auto current =
-        sdbusplus::xyz::openbmc_project::Logging::server::Entry::resolved();
+        sdbusplus::server::xyz::openbmc_project::logging::Entry::resolved();
     if (value != current)
     {
         value ? associations({}) : associations(assocs);
         current =
-            sdbusplus::xyz::openbmc_project::Logging::server::Entry::resolved(
+            sdbusplus::server::xyz::openbmc_project::logging::Entry::resolved(
                 value);
 
         uint64_t ms = std::chrono::duration_cast<std::chrono::milliseconds>(
@@ -45,11 +45,11 @@ bool Entry::resolved(bool value)
 std::string Entry::eventId(std::string value)
 {
     auto current =
-        sdbusplus::xyz::openbmc_project::Logging::server::Entry::eventId();
+        sdbusplus::server::xyz::openbmc_project::logging::Entry::eventId();
     if (value != current)
     {
         current =
-            sdbusplus::xyz::openbmc_project::Logging::server::Entry::eventId(
+            sdbusplus::server::xyz::openbmc_project::logging::Entry::eventId(
                 value);
         serialize(*this);
     }
@@ -60,11 +60,11 @@ std::string Entry::eventId(std::string value)
 std::string Entry::resolution(std::string value)
 {
     auto current =
-        sdbusplus::xyz::openbmc_project::Logging::server::Entry::resolution();
+        sdbusplus::server::xyz::openbmc_project::logging::Entry::resolution();
     if (value != current)
     {
         current =
-            sdbusplus::xyz::openbmc_project::Logging::server::Entry::resolution(
+            sdbusplus::server::xyz::openbmc_project::logging::Entry::resolution(
                 value);
         serialize(*this);
     }
diff --git a/elog_entry.hpp b/elog_entry.hpp
@@ -17,11 +17,11 @@ namespace logging
 {
 
 using EntryIfaces = sdbusplus::server::object_t<
-    sdbusplus::xyz::openbmc_project::Logging::server::Entry,
-    sdbusplus::xyz::openbmc_project::Object::server::Delete,
-    sdbusplus::xyz::openbmc_project::Association::server::Definitions,
-    sdbusplus::xyz::openbmc_project::Software::server::Version,
-    sdbusplus::xyz::openbmc_project::Common::server::FilePath>;
+    sdbusplus::server::xyz::openbmc_project::logging::Entry,
+    sdbusplus::server::xyz::openbmc_project::object::Delete,
+    sdbusplus::server::xyz::openbmc_project::association::Definitions,
+    sdbusplus::server::xyz::openbmc_project::software::Version,
+    sdbusplus::server::xyz::openbmc_project::common::FilePath>;
 
 using AssociationList =
     std::vector<std::tuple<std::string, std::string, std::string>>;
@@ -79,7 +79,7 @@ class Entry : public EntryIfaces
         associations(std::move(objects), true);
         // Store a copy of associations in case we need to recreate
         assocs = associations();
-        sdbusplus::xyz::openbmc_project::Logging::server::Entry::resolved(false,
+        sdbusplus::server::xyz::openbmc_project::logging::Entry::resolved(false,
                                                                           true);
 
         version(fwVersion, true);
@@ -113,23 +113,23 @@ class Entry : public EntryIfaces
      */
     bool resolved(bool value) override;
 
-    using sdbusplus::xyz::openbmc_project::Logging::server::Entry::resolved;
+    using sdbusplus::server::xyz::openbmc_project::logging::Entry::resolved;
 
     /** @brief Update eventId string of the error.
      *  @param[in] value - The eventID
      *  @returns New property value
      */
     std::string eventId(std::string value) override;
 
-    using sdbusplus::xyz::openbmc_project::Logging::server::Entry::eventId;
+    using sdbusplus::server::xyz::openbmc_project::logging::Entry::eventId;
 
     /** @brief Update resolution string of the error.
      *  @param[in] value - The resolution
      *  @returns New property value
      */
     std::string resolution(std::string value) override;
 
-    using sdbusplus::xyz::openbmc_project::Logging::server::Entry::resolution;
+    using sdbusplus::server::xyz::openbmc_project::logging::Entry::resolution;
 
     /** @brief Delete this d-bus object.
      */
diff --git a/elog_meta.cpp b/elog_meta.cpp
@@ -14,7 +14,7 @@ namespace associations
 #if defined PROCESS_META
 
 template <>
-void build<xyz::openbmc_project::Common::Callout::Device::CALLOUT_DEVICE_PATH>(
+void build<xyz::openbmc_project::common::callout::Device::CALLOUT_DEVICE_PATH>(
     const std::string& match, const std::vector<std::string>& data,
     AssociationList& list)
 {
@@ -40,7 +40,7 @@ void build<xyz::openbmc_project::Common::Callout::Device::CALLOUT_DEVICE_PATH>(
 
 template <>
 void build<
-    xyz::openbmc_project::Common::Callout::Inventory::CALLOUT_INVENTORY_PATH>(
+    xyz::openbmc_project::common::callout::Inventory::CALLOUT_INVENTORY_PATH>(
     const std::string& match, const std::vector<std::string>& data,
     AssociationList& list)
 {
diff --git a/elog_meta.hpp b/elog_meta.hpp
@@ -79,7 +79,7 @@ void build(const std::string& match, const std::vector<std::string>& data,
 
 // Example template specialization - we don't want to do anything
 // for this metadata.
-using namespace example::xyz::openbmc_project::Example::Elog;
+using namespace example::xyz::openbmc_project::example::elog;
 template <>
 inline void
     build<TestErrorTwo::DEV_ID>(const std::string& /*match*/,
@@ -89,7 +89,7 @@ inline void
 
 template <>
 inline void
-    build<example::xyz::openbmc_project::Example::Device::Callout::
+    build<example::xyz::openbmc_project::example::device::Callout::
               CALLOUT_DEVICE_PATH_TEST>(const std::string& match,
                                         const std::vector<std::string>& data,
                                         AssociationList& list)
@@ -122,13 +122,13 @@ inline void
 #if defined PROCESS_META
 
 template <>
-void build<xyz::openbmc_project::Common::Callout::Device::CALLOUT_DEVICE_PATH>(
+void build<xyz::openbmc_project::common::callout::Device::CALLOUT_DEVICE_PATH>(
     const std::string& match, const std::vector<std::string>& data,
     AssociationList& list);
 
 template <>
 void build<
-    xyz::openbmc_project::Common::Callout::Inventory::CALLOUT_INVENTORY_PATH>(
+    xyz::openbmc_project::common::callout::Inventory::CALLOUT_INVENTORY_PATH>(
     const std::string& match, const std::vector<std::string>& data,
     AssociationList& list);
 
diff --git a/elog_serialize.cpp b/elog_serialize.cpp
@@ -45,7 +45,7 @@ void save(Archive& a, const Entry& e, const std::uint32_t /*version*/)
 template <class Archive>
 void load(Archive& a, Entry& e, const std::uint32_t version)
 {
-    using namespace sdbusplus::xyz::openbmc_project::Logging::server;
+    using namespace sdbusplus::server::xyz::openbmc_project::logging;
 
     uint32_t id{};
     Entry::Level severity{};
@@ -92,11 +92,11 @@ void load(Archive& a, Entry& e, const std::uint32_t version)
     e.timestamp(timestamp, true);
     e.message(message, true);
     e.additionalData(additionalData, true);
-    e.sdbusplus::xyz::openbmc_project::Logging::server::Entry::resolved(
+    e.sdbusplus::server::xyz::openbmc_project::logging::Entry::resolved(
         resolved, true);
     e.associations(associations, true);
     e.version(fwVersion, true);
-    e.purpose(sdbusplus::xyz::openbmc_project::Software::server::Version::
+    e.purpose(sdbusplus::server::xyz::openbmc_project::software::Version::
                   VersionPurpose::BMC,
               true);
     e.updateTimestamp(updateTimestamp, true);
diff --git a/extensions/openpower-pels/data_interface.cpp b/extensions/openpower-pels/data_interface.cpp
@@ -106,8 +106,8 @@ constexpr auto invPowerSupply =
     "xyz.openbmc_project.Inventory.Item.PowerSupply";
 } // namespace interface
 
-using namespace sdbusplus::xyz::openbmc_project::State::Boot::server;
-using namespace sdbusplus::xyz::openbmc_project::State::server;
+using namespace sdbusplus::server::xyz::openbmc_project::state::boot;
+using namespace sdbusplus::server::xyz::openbmc_project::state;
 namespace match_rules = sdbusplus::bus::match::rules;
 
 const DBusInterfaceList hotplugInterfaces{interface::invFan,
diff --git a/extensions/openpower-pels/manager.cpp b/extensions/openpower-pels/manager.cpp
@@ -46,7 +46,7 @@ namespace rg = openpower::pels::message;
 
 namespace common_error = sdbusplus::xyz::openbmc_project::Common::Error;
 
-using Create = sdbusplus::xyz::openbmc_project::Logging::server::Create;
+using Create = sdbusplus::server::xyz::openbmc_project::logging::Create;
 
 namespace additional_data
 {
@@ -632,7 +632,7 @@ std::tuple<uint32_t, uint32_t> Manager::createPELWithFFDCFiles(
     std::string message, Entry::Level severity,
     std::map<std::string, std::string> additionalData,
     std::vector<std::tuple<
-        sdbusplus::xyz::openbmc_project::Logging::server::Create::FFDCFormat,
+        sdbusplus::server::xyz::openbmc_project::logging::Create::FFDCFormat,
         uint8_t, uint8_t, sdbusplus::message::unix_fd>>
         fFDC)
 {
diff --git a/extensions/openpower-pels/manager.hpp b/extensions/openpower-pels/manager.hpp
@@ -551,7 +551,7 @@ class Manager : public PELInterface
      */
     std::map<std::string,
              std::unique_ptr<
-                 sdbusplus::org::open_power::Logging::PEL::server::Entry>>
+                 sdbusplus::server::org::open_power::logging::pel::Entry>>
         _pelEntries;
 
     /**
diff --git a/extensions/openpower-pels/pel_entry.cpp b/extensions/openpower-pels/pel_entry.cpp
@@ -11,11 +11,11 @@ namespace common_error = sdbusplus::xyz::openbmc_project::Common::Error;
 
 bool PELEntry::managementSystemAck(bool value)
 {
-    auto current = sdbusplus::org::open_power::Logging::PEL::server::Entry::
+    auto current = sdbusplus::server::org::open_power::logging::pel::Entry::
         managementSystemAck();
     if (value != current)
     {
-        current = sdbusplus::org::open_power::Logging::PEL::server::Entry::
+        current = sdbusplus::server::org::open_power::logging::pel::Entry::
             managementSystemAck(value);
 
         Repository::LogID id{Repository::LogID::Obmc(getMyId())};
diff --git a/extensions/openpower-pels/pel_entry.hpp b/extensions/openpower-pels/pel_entry.hpp
@@ -6,7 +6,7 @@ namespace openpower
 namespace pels
 {
 
-using PELEntryIface = sdbusplus::org::open_power::Logging::PEL::server::Entry;
+using PELEntryIface = sdbusplus::server::org::open_power::logging::pel::Entry;
 using PropertiesVariant = PELEntryIface::PropertiesVariant;
 
 class PELEntry : public PELEntryIface
diff --git a/extensions/openpower-pels/phal_service_actions.hpp b/extensions/openpower-pels/phal_service_actions.hpp
@@ -13,7 +13,7 @@ namespace phal
 {
 
 using EntrySeverity =
-    sdbusplus::xyz::openbmc_project::HardwareIsolation::server::Entry::Type;
+    sdbusplus::server::xyz::openbmc_project::hardware_isolation::Entry::Type;
 
 /**
  * @brief Helper function to create service actions in the PEL
diff --git a/lib/elog.cpp b/lib/elog.cpp
@@ -10,7 +10,7 @@ namespace logging
 {
 namespace details
 {
-using namespace sdbusplus::xyz::openbmc_project::Logging::server;
+using namespace sdbusplus::server::xyz::openbmc_project::logging;
 
 auto _prepareMsg(const char* funcName)
 {
diff --git a/lib/include/phosphor-logging/elog.hpp b/lib/include/phosphor-logging/elog.hpp
@@ -13,7 +13,7 @@ namespace phosphor
 namespace logging
 {
 
-using namespace sdbusplus::xyz::openbmc_project::Logging::server;
+using namespace sdbusplus::server::xyz::openbmc_project::logging;
 
 /**
  * @brief Structure used by callers to indicate they want to use the last value
diff --git a/log_manager.cpp b/log_manager.cpp
@@ -335,7 +335,7 @@ void Manager::onEntryResolve(sdbusplus::message_t& msg)
 
 void Manager::checkAndQuiesceHost()
 {
-    using Host = sdbusplus::xyz::openbmc_project::State::server::Host;
+    using Host = sdbusplus::server::xyz::openbmc_project::state::Host;
 
     // First check host state
     std::variant<Host::HostState> property;
diff --git a/log_manager.hpp b/log_manager.hpp
@@ -20,17 +20,17 @@ namespace logging
 extern const std::map<std::string, std::vector<std::string>> g_errMetaMap;
 extern const std::map<std::string, level> g_errLevelMap;
 
-using CreateIface = sdbusplus::xyz::openbmc_project::Logging::server::Create;
+using CreateIface = sdbusplus::server::xyz::openbmc_project::logging::Create;
 using DeleteAllIface =
-    sdbusplus::xyz::openbmc_project::Collection::server::DeleteAll;
+    sdbusplus::server::xyz::openbmc_project::collection::DeleteAll;
 
 namespace details
 {
 template <typename... T>
 using ServerObject = typename sdbusplus::server::object_t<T...>;
 
 using ManagerIface =
-    sdbusplus::xyz::openbmc_project::Logging::Internal::server::Manager;
+    sdbusplus::server::xyz::openbmc_project::logging::internal::Manager;
 
 } // namespace details
 
@@ -184,7 +184,7 @@ class Manager : public details::ServerObject<details::ManagerIface>
      */
     void create(
         const std::string& message,
-        sdbusplus::xyz::openbmc_project::Logging::server::Entry::Level severity,
+        sdbusplus::server::xyz::openbmc_project::logging::Entry::Level severity,
         const std::map<std::string, std::string>& additionalData);
 
     /** @brief Creates an event log, and accepts FFDC files
@@ -203,7 +203,7 @@ class Manager : public details::ServerObject<details::ManagerIface>
      */
     void createWithFFDC(
         const std::string& message,
-        sdbusplus::xyz::openbmc_project::Logging::server::Entry::Level severity,
+        sdbusplus::server::xyz::openbmc_project::logging::Entry::Level severity,
         const std::map<std::string, std::string>& additionalData,
         const FFDCEntries& ffdc);
 
@@ -381,7 +381,7 @@ class Manager : public details::ServerObject<DeleteAllIface, CreateIface>
      */
     void create(
         std::string message,
-        sdbusplus::xyz::openbmc_project::Logging::server::Entry::Level severity,
+        sdbusplus::server::xyz::openbmc_project::logging::Entry::Level severity,
         std::map<std::string, std::string> additionalData) override
     {
         manager.create(message, severity, additionalData);
@@ -399,7 +399,7 @@ class Manager : public details::ServerObject<DeleteAllIface, CreateIface>
      */
     void createWithFFDCFiles(
         std::string message,
-        sdbusplus::xyz::openbmc_project::Logging::server::Entry::Level severity,
+        sdbusplus::server::xyz::openbmc_project::logging::Entry::Level severity,
         std::map<std::string, std::string> additionalData,
         std::vector<std::tuple<CreateIface::FFDCFormat, uint8_t, uint8_t,
                                sdbusplus::message::unix_fd>>
diff --git a/logging_test.cpp b/logging_test.cpp
diff --git a/phosphor-rsyslog-config/server-conf.cpp b/phosphor-rsyslog-config/server-conf.cpp
diff --git a/tools/phosphor-logging/templates/elog-process-metadata.mako.cpp b/tools/phosphor-logging/templates/elog-process-metadata.mako.cpp

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ int main(int argc, char** argv)`
`16`	`16`	`return -1;`
`17`	`17`	`}`
`18`	`18`
`19`		`- using namespace example::xyz::openbmc_project::Example::Elog;`
	`19`	`+ using namespace example::xyz::openbmc_project::example::elog;`
`20`	`20`	`try`
`21`	`21`	`{`
`22`	`22`	`elog<TestCallout>(TestCallout::DEV_ADDR(0xDEADEAD),`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@ namespace logging`
`14`	`14`	`{`
`15`	`15`
`16`	`16`	`using BlockIface = sdbusplus::server::object_t<`
`17`		`- sdbusplus::xyz::openbmc_project::Logging::server::ErrorBlocksTransition,`
`18`		`- sdbusplus::xyz::openbmc_project::Association::server::Definitions>;`
	`17`	`+ sdbusplus::server::xyz::openbmc_project::logging::ErrorBlocksTransition,`
	`18`	`+ sdbusplus::server::xyz::openbmc_project::association::Definitions>;`
`19`	`19`
`20`	`20`	`using AssociationList =`
`21`	`21`	`std::vector<std::tuple<std::string, std::string, std::string>>;`
Original file line number	Diff line number	Diff line change
`@@ -23,12 +23,12 @@ void Entry::delete_()`
`23`	`23`	`bool Entry::resolved(bool value)`
`24`	`24`	`{`
`25`	`25`	`auto current =`
`26`		`- sdbusplus::xyz::openbmc_project::Logging::server::Entry::resolved();`
	`26`	`+ sdbusplus::server::xyz::openbmc_project::logging::Entry::resolved();`
`27`	`27`	`if (value != current)`
`28`	`28`	`{`
`29`	`29`	`value ? associations({}) : associations(assocs);`
`30`	`30`	`current =`
`31`		`- sdbusplus::xyz::openbmc_project::Logging::server::Entry::resolved(`
	`31`	`+ sdbusplus::server::xyz::openbmc_project::logging::Entry::resolved(`
`32`	`32`	`value);`
`33`	`33`
`34`	`34`	`uint64_t ms = std::chrono::duration_cast<std::chrono::milliseconds>(`
`@@ -45,11 +45,11 @@ bool Entry::resolved(bool value)`
`45`	`45`	`std::string Entry::eventId(std::string value)`
`46`	`46`	`{`
`47`	`47`	`auto current =`
`48`		`- sdbusplus::xyz::openbmc_project::Logging::server::Entry::eventId();`
	`48`	`+ sdbusplus::server::xyz::openbmc_project::logging::Entry::eventId();`
`49`	`49`	`if (value != current)`
`50`	`50`	`{`
`51`	`51`	`current =`
`52`		`- sdbusplus::xyz::openbmc_project::Logging::server::Entry::eventId(`
	`52`	`+ sdbusplus::server::xyz::openbmc_project::logging::Entry::eventId(`
`53`	`53`	`value);`
`54`	`54`	`serialize(*this);`
`55`	`55`	`}`
`@@ -60,11 +60,11 @@ std::string Entry::eventId(std::string value)`
`60`	`60`	`std::string Entry::resolution(std::string value)`
`61`	`61`	`{`
`62`	`62`	`auto current =`
`63`		`- sdbusplus::xyz::openbmc_project::Logging::server::Entry::resolution();`
	`63`	`+ sdbusplus::server::xyz::openbmc_project::logging::Entry::resolution();`
`64`	`64`	`if (value != current)`
`65`	`65`	`{`
`66`	`66`	`current =`
`67`		`- sdbusplus::xyz::openbmc_project::Logging::server::Entry::resolution(`
	`67`	`+ sdbusplus::server::xyz::openbmc_project::logging::Entry::resolution(`
`68`	`68`	`value);`
`69`	`69`	`serialize(*this);`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ namespace rg = openpower::pels::message;`
`46`	`46`
`47`	`47`	`namespace common_error = sdbusplus::xyz::openbmc_project::Common::Error;`
`48`	`48`
`49`		`-using Create = sdbusplus::xyz::openbmc_project::Logging::server::Create;`
	`49`	`+using Create = sdbusplus::server::xyz::openbmc_project::logging::Create;`
`50`	`50`
`51`	`51`	`namespace additional_data`
`52`	`52`	`{`
`@@ -632,7 +632,7 @@ std::tuple<uint32_t, uint32_t> Manager::createPELWithFFDCFiles(`
`632`	`632`	`std::string message, Entry::Level severity,`
`633`	`633`	`std::map<std::string, std::string> additionalData,`
`634`	`634`	`std::vector<std::tuple<`
`635`		`- sdbusplus::xyz::openbmc_project::Logging::server::Create::FFDCFormat,`
	`635`	`+ sdbusplus::server::xyz::openbmc_project::logging::Create::FFDCFormat,`
`636`	`636`	`uint8_t, uint8_t, sdbusplus::message::unix_fd>>`
`637`	`637`	`fFDC)`
`638`	`638`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,11 +11,11 @@ namespace common_error = sdbusplus::xyz::openbmc_project::Common::Error;`
`11`	`11`
`12`	`12`	`bool PELEntry::managementSystemAck(bool value)`
`13`	`13`	`{`
`14`		`- auto current = sdbusplus::org::open_power::Logging::PEL::server::Entry::`
	`14`	`+ auto current = sdbusplus::server::org::open_power::logging::pel::Entry::`
`15`	`15`	`managementSystemAck();`
`16`	`16`	`if (value != current)`
`17`	`17`	`{`
`18`		`- current = sdbusplus::org::open_power::Logging::PEL::server::Entry::`
	`18`	`+ current = sdbusplus::server::org::open_power::logging::pel::Entry::`
`19`	`19`	`managementSystemAck(value);`
`20`	`20`
`21`	`21`	`Repository::LogID id{Repository::LogID::Obmc(getMyId())};`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ namespace openpower`
`6`	`6`	`namespace pels`
`7`	`7`	`{`
`8`	`8`
`9`		`-using PELEntryIface = sdbusplus::org::open_power::Logging::PEL::server::Entry;`
	`9`	`+using PELEntryIface = sdbusplus::server::org::open_power::logging::pel::Entry;`
`10`	`10`	`using PropertiesVariant = PELEntryIface::PropertiesVariant;`
`11`	`11`
`12`	`12`	`class PELEntry : public PELEntryIface`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ namespace phal`
`13`	`13`	`{`
`14`	`14`
`15`	`15`	`using EntrySeverity =`
`16`		`- sdbusplus::xyz::openbmc_project::HardwareIsolation::server::Entry::Type;`
	`16`	`+ sdbusplus::server::xyz::openbmc_project::hardware_isolation::Entry::Type;`
`17`	`17`
`18`	`18`	`/**`
`19`	`19`	`* @brief Helper function to create service actions in the PEL`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ namespace logging`
`10`	`10`	`{`
`11`	`11`	`namespace details`
`12`	`12`	`{`
`13`		`-using namespace sdbusplus::xyz::openbmc_project::Logging::server;`
	`13`	`+using namespace sdbusplus::server::xyz::openbmc_project::logging;`
`14`	`14`
`15`	`15`	`auto _prepareMsg(const char* funcName)`
`16`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ namespace phosphor`
`13`	`13`	`namespace logging`
`14`	`14`	`{`
`15`	`15`
`16`		`-using namespace sdbusplus::xyz::openbmc_project::Logging::server;`
	`16`	`+using namespace sdbusplus::server::xyz::openbmc_project::logging;`
`17`	`17`
`18`	`18`	`/**`
`19`	`19`	`* @brief Structure used by callers to indicate they want to use the last value`
Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,7 @@ void Manager::onEntryResolve(sdbusplus::message_t& msg)`
`335`	`335`
`336`	`336`	`void Manager::checkAndQuiesceHost()`
`337`	`337`	`{`
`338`		`- using Host = sdbusplus::xyz::openbmc_project::State::server::Host;`
	`338`	`+ using Host = sdbusplus::server::xyz::openbmc_project::state::Host;`
`339`	`339`
`340`	`340`	`// First check host state`
`341`	`341`	`std::variant<Host::HostState> property;`