commit b0b395b670b6e496dda0ce117e1b5a1e195ab0e9
author Marri Devender Rao <devenrao@in.ibm.com> Tue Oct 24 10:14:14 2017 -0500
committer Tom Joseph <tomjoseph@in.ibm.com> Fri Nov 03 17:54:28 2017 +0530
tree e6cb4c407159c927ccee5f5455fd126da9e82fea
parent 8991dd62b7678ce012c545de01d36959b6e5b940

Fixed the duplicated event string in error message

The message for the host event was org.open_power.Host.Event.Error.Event,
it is corrected to org.open_power.Host.Error.Event.

Resolves openbmc/openbmc#1960

Change-Id: I86304b1f2e4bec740e2e9ec58f98ea9df0d752ea
Signed-off-by: Marri Devender Rao <devenrao@in.ibm.com>

elog-errors.hpp

diff --git a/elog-errors.hpp b/elog-errors.hpp
index 73e2dc1..02649f4 100644
--- a/elog-errors.hpp
+++ b/elog-errors.hpp
@@ -37,13 +37,10 @@
 {
 namespace Host
 {
-namespace Event
-{
 namespace Error
 {
     struct Event;
 } // namespace Error
-} // namespace Event
 } // namespace Host
 } // namespace open_power
 } // namespace org
@@ -1199,8 +1196,6 @@
 {
 namespace Host
 {
-namespace Event
-{
 namespace _Event
 {
 
@@ -1224,7 +1219,6 @@
 
 };
 
-} // namespace Event
 } // namespace Host
 } // namespace open_power
 } // namespace org
@@ -1234,9 +1228,9 @@
 {
 
 template <>
-struct map_exception_type<sdbusplus::org::open_power::Host::Event::Error::Event>
+struct map_exception_type<sdbusplus::org::open_power::Host::Error::Event>
 {
-    using type = org::open_power::Host::Event::Event;
+    using type = org::open_power::Host::Event;
 };
 
 }

error-HostEvent.hpp

diff --git a/error-HostEvent.hpp b/error-HostEvent.hpp
index f8abf21..186e28e 100644
--- a/error-HostEvent.hpp
+++ b/error-HostEvent.hpp
@@ -10,18 +10,16 @@
 {
 namespace Host
 {
-namespace Event
-{
 namespace Error
 {
 
 struct Event final : public sdbusplus::exception_t
 {
-    static constexpr auto errName = "org.open_power.Host.Event.Error.Event";
+    static constexpr auto errName = "org.open_power.Host.Error.Event";
     static constexpr auto errDesc =
             "A host system event was received";
     static constexpr auto errWhat =
-            "org.open_power.Host.Event.Error.Event: A host system event was received";
+            "org.open_power.Host.Error.Event: A host system event was received";
 
     const char* name() const noexcept override;
     const char* description() const noexcept override;
@@ -29,7 +27,6 @@
 };
 
 } // namespace Error
-} // namespace Event
 } // namespace Host
 } // namespace open_power
 } // namespace org

storageaddsel.cpp

diff --git a/storageaddsel.cpp b/storageaddsel.cpp
index 3232406..01147ac 100644
--- a/storageaddsel.cpp
+++ b/storageaddsel.cpp
@@ -202,8 +202,8 @@
     }
     selData[debuglen*3] = '\0';
 
-    using error =  sdbusplus::org::open_power::Host::Event::Error::Event;
-    using metadata = org::open_power::Host::Event::Event;
+    using error =  sdbusplus::org::open_power::Host::Error::Event;
+    using metadata = org::open_power::Host::Event;
 
     report<error>(metadata::ESEL(selData.get()),
                   metadata::CALLOUT_INVENTORY_PATH(inventoryPath.c_str()));