diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2019-03-27 22:58:21 +0300 |
---|---|---|
committer | Ed Tanous <ed.tanous@intel.com> | 2019-05-08 22:08:00 +0300 |
commit | 351d3063e86c5a6047c995ba72552bd82df86489 (patch) | |
tree | be1011e3a0209875900a314e1c173be66618670f /redfish-core | |
parent | 70304cb594859b3862eeecc0a16c8e6e9a126530 (diff) | |
download | bmcweb-351d3063e86c5a6047c995ba72552bd82df86489.tar.xz |
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>
Diffstat (limited to 'redfish-core')
-rw-r--r-- | redfish-core/include/registries.hpp | 12 | ||||
-rw-r--r-- | redfish-core/include/registries/base_message_registry.hpp | 12 | ||||
-rw-r--r-- | redfish-core/lib/message_registries.hpp | 29 |
3 files changed, 41 insertions, 12 deletions
diff --git a/redfish-core/include/registries.hpp b/redfish-core/include/registries.hpp index 7ee5232cd5..6b30be9363 100644 --- a/redfish-core/include/registries.hpp +++ b/redfish-core/include/registries.hpp @@ -16,6 +16,18 @@ #pragma once namespace redfish::message_registries { +struct Header +{ + const char* copyright; + const char* type; + const char* id; + const char* name; + const char* language; + const char* description; + const char* registryPrefix; + const char* registryVersion; + const char* owningEntity; +}; struct Message { diff --git a/redfish-core/include/registries/base_message_registry.hpp b/redfish-core/include/registries/base_message_registry.hpp index 1d54fdd868..472f51edce 100644 --- a/redfish-core/include/registries/base_message_registry.hpp +++ b/redfish-core/include/registries/base_message_registry.hpp @@ -22,7 +22,17 @@ namespace redfish::message_registries::base { - +const Header header = { + .copyright = "Copyright 2014-2018 DMTF. All rights reserved.", + .type = "#MessageRegistry.v1_0_0.MessageRegistry", + .id = "Base.1.4.0", + .name = "Base Message Registry", + .language = "en", + .description = "This registry defines the base messages for Redfish", + .registryPrefix = "Base", + .registryVersion = "1.4.0", + .owningEntity = "DMTF", +}; const std::array registry = { MessageEntry{ "AccessDenied", diff --git a/redfish-core/lib/message_registries.hpp b/redfish-core/lib/message_registries.hpp index f01caf901b..e44e97d2b8 100644 --- a/redfish-core/lib/message_registries.hpp +++ b/redfish-core/lib/message_registries.hpp @@ -100,8 +100,10 @@ class BaseMessageRegistryFile : public Node 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 @@ class BaseMessageRegistry : public Node 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(); |