registries: remove hardcoded size of MessageEntry arrays
The latest C++ no longer requires the size of the array to be hardcoded.
This removes the hardcoded size to simplify changes to the message
arrays.
Tested:
Confirmed that event Messages are still correctly generated.
Signed-off-by: Jason M. Bills <jason.m.bills@intel.com>
Change-Id: I29e6a4a02c247865c275cf4ff71587bc188d5957
diff --git a/redfish-core/include/registries/base_message_registry.hpp b/redfish-core/include/registries/base_message_registry.hpp
index 48875ec..d36b041 100644
--- a/redfish-core/include/registries/base_message_registry.hpp
+++ b/redfish-core/include/registries/base_message_registry.hpp
@@ -3,7 +3,7 @@
* This is an auto-generated header which contains definitions
* for Redfish DMTF defined messages.
* DO NOT modify this registry outside of running the
- * parse_regisries.py script. The definitions contained within
+ * parse_registries.py script. The definitions contained within
* this file are owned by DMTF. Any modifications to these files
* should be first pushed to the relevant registry in the DMTF
* github organization.
@@ -29,7 +29,7 @@
constexpr const char* url =
"https://redfish.dmtf.org/registries/Base.1.11.0.json";
-constexpr std::array<MessageEntry, 93> registry =
+constexpr std::array registry =
{
MessageEntry{
"AccessDenied",
diff --git a/redfish-core/include/registries/openbmc_message_registry.hpp b/redfish-core/include/registries/openbmc_message_registry.hpp
index a47475f..db624e7 100644
--- a/redfish-core/include/registries/openbmc_message_registry.hpp
+++ b/redfish-core/include/registries/openbmc_message_registry.hpp
@@ -29,7 +29,7 @@
"0.3.1",
"OpenBMC",
};
-constexpr std::array<MessageEntry, 190> registry = {
+constexpr std::array registry = {
MessageEntry{
"ADDDCCorrectable",
{
diff --git a/redfish-core/include/registries/privilege_registry.hpp b/redfish-core/include/registries/privilege_registry.hpp
index bd0a501..a10c7f6 100644
--- a/redfish-core/include/registries/privilege_registry.hpp
+++ b/redfish-core/include/registries/privilege_registry.hpp
@@ -4,7 +4,7 @@
* This is an auto-generated header which contains definitions
* for Redfish DMTF defined messages.
* DO NOT modify this registry outside of running the
- * parse_regisries.py script. The definitions contained within
+ * parse_registries.py script. The definitions contained within
* this file are owned by DMTF. Any modifications to these files
* should be first pushed to the relevant registry in the DMTF
* github organization.
diff --git a/redfish-core/include/registries/resource_event_message_registry.hpp b/redfish-core/include/registries/resource_event_message_registry.hpp
index 5a70355..3b02cde 100644
--- a/redfish-core/include/registries/resource_event_message_registry.hpp
+++ b/redfish-core/include/registries/resource_event_message_registry.hpp
@@ -3,7 +3,7 @@
* This is an auto-generated header which contains definitions
* for Redfish DMTF defined messages.
* DO NOT modify this registry outside of running the
- * parse_regisries.py script. The definitions contained within
+ * parse_registries.py script. The definitions contained within
* this file are owned by DMTF. Any modifications to these files
* should be first pushed to the relevant registry in the DMTF
* github organization.
@@ -29,7 +29,7 @@
constexpr const char* url =
"https://redfish.dmtf.org/registries/ResourceEvent.1.0.3.json";
-constexpr std::array<MessageEntry, 19> registry =
+constexpr std::array registry =
{
MessageEntry{
"LicenseAdded",
diff --git a/redfish-core/include/registries/task_event_message_registry.hpp b/redfish-core/include/registries/task_event_message_registry.hpp
index 5e38021..5158ff4 100644
--- a/redfish-core/include/registries/task_event_message_registry.hpp
+++ b/redfish-core/include/registries/task_event_message_registry.hpp
@@ -3,7 +3,7 @@
* This is an auto-generated header which contains definitions
* for Redfish DMTF defined messages.
* DO NOT modify this registry outside of running the
- * parse_regisries.py script. The definitions contained within
+ * parse_registries.py script. The definitions contained within
* this file are owned by DMTF. Any modifications to these files
* should be first pushed to the relevant registry in the DMTF
* github organization.
@@ -29,7 +29,7 @@
constexpr const char* url =
"https://redfish.dmtf.org/registries/TaskEvent.1.0.3.json";
-constexpr std::array<MessageEntry, 9> registry =
+constexpr std::array registry =
{
MessageEntry{
"TaskAborted",
diff --git a/scripts/parse_registries.py b/scripts/parse_registries.py
index 3786843..7074589 100755
--- a/scripts/parse_registries.py
+++ b/scripts/parse_registries.py
@@ -18,7 +18,7 @@
* This is an auto-generated header which contains definitions
* for Redfish DMTF defined messages.
* DO NOT modify this registry outside of running the
- * parse_regisries.py script. The definitions contained within
+ * parse_registries.py script. The definitions contained within
* this file are owned by DMTF. Any modifications to these files
* should be first pushed to the relevant registry in the DMTF
* github organization.
@@ -94,11 +94,10 @@
"constexpr const char* url =\n"
" \"{url}\";\n"
"\n"
- "constexpr std::array<MessageEntry, {message_len}> registry =\n"
+ "constexpr std::array registry =\n"
"{{\n".format(
json_dict=json_dict,
url=url,
- message_len=len(json_dict["Messages"]),
))
messages_sorted = sorted(json_dict["Messages"].items())