diff options
5 files changed, 20 insertions, 19 deletions
diff --git a/redfish-core/include/registries/base_message_registry.hpp b/redfish-core/include/registries/base_message_registry.hpp index c030530d90..cf5861e33c 100644 --- a/redfish-core/include/registries/base_message_registry.hpp +++ b/redfish-core/include/registries/base_message_registry.hpp @@ -1,3 +1,4 @@ +#pragma once /**************************************************************** * READ THIS WARNING FIRST * This is an auto-generated header which contains definitions @@ -8,7 +9,6 @@ * should be first pushed to the relevant registry in the DMTF * github organization. ***************************************************************/ -#pragma once #include <registries.hpp> // clang-format off diff --git a/redfish-core/include/registries/privilege_registry.hpp b/redfish-core/include/registries/privilege_registry.hpp index 035aee4aec..d42d530df3 100644 --- a/redfish-core/include/registries/privilege_registry.hpp +++ b/redfish-core/include/registries/privilege_registry.hpp @@ -9,10 +9,10 @@ * should be first pushed to the relevant registry in the DMTF * github organization. ***************************************************************/ -// clang-format off - #include <privileges.hpp> +// clang-format off + namespace redfish::privileges { const std::array<Privileges, 1> privilegeSetLogin = {{ diff --git a/redfish-core/include/registries/resource_event_message_registry.hpp b/redfish-core/include/registries/resource_event_message_registry.hpp index 3b02cde1c6..d161882467 100644 --- a/redfish-core/include/registries/resource_event_message_registry.hpp +++ b/redfish-core/include/registries/resource_event_message_registry.hpp @@ -1,3 +1,4 @@ +#pragma once /**************************************************************** * READ THIS WARNING FIRST * This is an auto-generated header which contains definitions @@ -8,7 +9,6 @@ * should be first pushed to the relevant registry in the DMTF * github organization. ***************************************************************/ -#pragma once #include <registries.hpp> // clang-format off diff --git a/redfish-core/include/registries/task_event_message_registry.hpp b/redfish-core/include/registries/task_event_message_registry.hpp index 5158ff40c4..94c74d16da 100644 --- a/redfish-core/include/registries/task_event_message_registry.hpp +++ b/redfish-core/include/registries/task_event_message_registry.hpp @@ -1,3 +1,4 @@ +#pragma once /**************************************************************** * READ THIS WARNING FIRST * This is an auto-generated header which contains definitions @@ -8,7 +9,6 @@ * should be first pushed to the relevant registry in the DMTF * github organization. ***************************************************************/ -#pragma once #include <registries.hpp> // clang-format off diff --git a/scripts/parse_registries.py b/scripts/parse_registries.py index de560d80bb..8c300eda2e 100755 --- a/scripts/parse_registries.py +++ b/scripts/parse_registries.py @@ -4,6 +4,9 @@ import os import requests +PRAGMA_ONCE = '''#pragma once +''' + WARNING = '''/**************************************************************** * READ THIS WARNING FIRST * This is an auto-generated header which contains definitions @@ -15,8 +18,7 @@ WARNING = '''/**************************************************************** * github organization. ***************************************************************/''' -REGISTRY_HEADER = WARNING + ''' -#pragma once +REGISTRY_HEADER = PRAGMA_ONCE + WARNING + ''' #include <registries.hpp> // clang-format off @@ -163,23 +165,22 @@ def get_variable_name_for_privilege_set(privilege_list): return "Or".join(names) +PRIVILEGE_HEADER = PRAGMA_ONCE + WARNING + ''' +#include <privileges.hpp> + +// clang-format off + +namespace redfish::privileges +{ +''' + + def make_privilege_registry(): path, json_file, type_name, url = \ make_getter('Redfish_1.3.0_PrivilegeRegistry.json', 'privilege_registry.hpp', 'privilege') with open(path, 'w') as registry: - registry.write( - "#pragma once\n" - "{WARNING}\n" - "// clang-format off\n" - "\n" - "#include <privileges.hpp>\n" - "\n" - "namespace redfish::privileges\n" - "{{\n" - .format( - WARNING=WARNING, - filename=os.path.basename(path))) + registry.write(PRIVILEGE_HEADER) privilege_dict = {} for mapping in json_file["Mappings"]: |