commit 351d3063e86c5a6047c995ba72552bd82df86489
author Jason M. Bills <jason.m.bills@linux.intel.com> Wed Mar 27 12:58:21 2019 -0700
committer Ed Tanous <ed.tanous@intel.com> Wed May 08 19:08:00 2019 +0000
tree be1011e3a0209875900a314e1c173be66618670f
parent 70304cb594859b3862eeecc0a16c8e6e9a126530

Parse Message Registry header info from the file

This extends the Message Registry parsing to include header
details that are part of the redfish resource.

Tested:
Verified that the MessageRegistry info all returns correctly
in the redfish response.

Change-Id: I6179c07f4067cd4520fce3e774d18530fede0a95
Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>

redfish-core/lib/message_registries.hpp

diff --git a/redfish-core/lib/message_registries.hpp b/redfish-core/lib/message_registries.hpp
index f01caf9..e44e97d 100644
--- a/redfish-core/lib/message_registries.hpp
+++ b/redfish-core/lib/message_registries.hpp
@@ -100,8 +100,10 @@
         asyncResp->res.jsonValue["Name"] = "Base Message Registry File";
         asyncResp->res.jsonValue["Description"] =
             "DMTF Base Message Registry File Location";
-        asyncResp->res.jsonValue["Id"] = "Base";
-        asyncResp->res.jsonValue["Registry"] = "Base.1.4";
+        asyncResp->res.jsonValue["Id"] =
+            message_registries::base::header.registryPrefix;
+        asyncResp->res.jsonValue["Registry"] =
+            message_registries::base::header.id;
         nlohmann::json &messageRegistryLanguageArray =
             asyncResp->res.jsonValue["Languages"];
         messageRegistryLanguageArray = nlohmann::json::array();
@@ -144,17 +146,22 @@
         std::shared_ptr<AsyncResp> asyncResp = std::make_shared<AsyncResp>(res);
 
         asyncResp->res.jsonValue["@Redfish.Copyright"] =
-            "Copyright 2014-2018 DMTF. All rights reserved.";
+            message_registries::base::header.copyright;
         asyncResp->res.jsonValue["@odata.type"] =
-            "#MessageRegistry.v1_0_0.MessageRegistry";
-        asyncResp->res.jsonValue["Id"] = "Base.1.4.0";
-        asyncResp->res.jsonValue["Name"] = "Base Message Registry";
-        asyncResp->res.jsonValue["Language"] = "en";
+            message_registries::base::header.type;
+        asyncResp->res.jsonValue["Id"] = message_registries::base::header.id;
+        asyncResp->res.jsonValue["Name"] =
+            message_registries::base::header.name;
+        asyncResp->res.jsonValue["Language"] =
+            message_registries::base::header.language;
         asyncResp->res.jsonValue["Description"] =
-            "This registry defines the base messages for Redfish";
-        asyncResp->res.jsonValue["RegistryPrefix"] = "Base";
-        asyncResp->res.jsonValue["RegistryVersion"] = "1.4.0";
-        asyncResp->res.jsonValue["OwningEntity"] = "DMTF";
+            message_registries::base::header.description;
+        asyncResp->res.jsonValue["RegistryPrefix"] =
+            message_registries::base::header.registryPrefix;
+        asyncResp->res.jsonValue["RegistryVersion"] =
+            message_registries::base::header.registryVersion;
+        asyncResp->res.jsonValue["OwningEntity"] =
+            message_registries::base::header.owningEntity;
         nlohmann::json &messageArray = asyncResp->res.jsonValue["Messages"];
         messageArray = nlohmann::json::array();