Merge branch 'main' into log-update

Author: mraineri

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+## [2.5.0] - 2025-05-16
+- Corrected regex pattern for date-time properties
+
 ## [2.4.9] - 2024-09-27
 - Added 'requesttimeout' and 'requestattempts' arguments
 

LICENSE.md

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2016-2024, Contributing Member(s) of Distributed Management Task
+Copyright (c) 2016-2025, Contributing Member(s) of Distributed Management Task
 Force, Inc.. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

README.md

@@ -1,4 +1,4 @@
-Copyright 2016-2024 DMTF.  All rights reserved.
+Copyright 2016-2025 DMTF.  All rights reserved.
 
 # Redfish Service Validator
 

RedfishServiceValidator.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright 2016-2024 DMTF. All rights reserved.
+# Copyright 2016-2025 DMTF. All rights reserved.
 # License: BSD 3-Clause License. For full text see link:
 # https://github.com/DMTF/Redfish-Service-Validator/blob/main/LICENSE.md
 

RedfishServiceValidatorGui.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright 2016-2024 DMTF. All rights reserved.
+# Copyright 2016-2025 DMTF. All rights reserved.
 # License: BSD 3-Clause License. For full text see link:
 # https://github.com/DMTF/Redfish-Service-Validator/blob/main/LICENSE.md
 

redfish_service_validator/RedfishLogo.py

@@ -1,5 +1,5 @@
 # Copyright Notice:
-# Copyright 2016-2024 DMTF. All rights reserved.
+# Copyright 2016-2025 DMTF. All rights reserved.
 # License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/Redfish-Service-Validator/blob/main/LICENSE.md
 
 """

redfish_service_validator/RedfishServiceValidator.py

@@ -1,5 +1,5 @@
 # Copyright Notice:
-# Copyright 2016-2024 DMTF. All rights reserved.
+# Copyright 2016-2025 DMTF. All rights reserved.
 # License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/Redfish-Service-Validator/blob/main/LICENSE.md
 
 import sys
@@ -16,7 +16,7 @@
 from redfish_service_validator.validateResource import validateSingleURI, validateURITree
 from redfish_service_validator import tohtml, schema_pack, traverse, logger
 
-tool_version = '2.4.9'
+tool_version = '2.5.0'
 
 def validate(argslist=None, configfile=None):
     """Main command

redfish_service_validator/RedfishServiceValidatorGui.py

@@ -1,5 +1,5 @@
 # Copyright Notice:
-# Copyright 2016-2024 DMTF. All rights reserved.
+# Copyright 2016-2025 DMTF. All rights reserved.
 # License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/Redfish-Service-Validator/blob/main/LICENSE.md
 
 """

redfish_service_validator/catalog.py

@@ -785,7 +785,7 @@ def validate_basic(val, my_type, validPattern=None, min=None, max=None):
 
         elif my_type == "Edm.DateTimeOffset":
             return RedfishProperty.validate_string(
-                val, r".*(Z|(\+|-)[0-9][0-9]:[0-9][0-9])")
+                val, r"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d+)?(Z|(\+|-)\d{2}:\d{2})")
 
         elif my_type == "Edm.Duration":
             return RedfishProperty.validate_string(
@@ -1075,7 +1075,16 @@ def as_json(self):
             base = super().as_json()
             base.update({'Properties': {a: b.as_json() for a, b in self.properties.items()}})
             return base
-
+        
+    def act_iterator(self, actions_dict):
+        for key, value in actions_dict.items():
+            if key.startswith("#"):
+                yield value
+            elif key == "Oem":
+                for oem_key, oem_value in value.items():
+                    if oem_key.startswith("#"):
+                        yield oem_value
+                        
     def getLinks(self, collectionlimit={}):
         """Grab links from our Object
         """
@@ -1091,13 +1100,13 @@ def getLinks(self, collectionlimit={}):
                     if not isinstance(item.Type, RedfishType): continue
                     if n == 'Actions':
                         new_type = item.Type.catalog.getTypeInCatalog('ActionInfo.ActionInfo')
-                        for act in item.Value.values():
-                            if isinstance(act, dict):
-                                uri = act.get('@Redfish.ActionInfo')
-                                if isinstance(uri, str):
-                                    my_link = RedfishObject(new_type, 'ActionInfo', item).populate({'@odata.id': uri})
-                                    my_link.InAnnotation = True
-                                    links.append(my_link)
+                        act_iter = self.act_iterator(item.Value)
+                        for act in act_iter:
+                            uri = act.get('@Redfish.ActionInfo')
+                            if isinstance(uri, str):
+                                my_link = RedfishObject(new_type, 'ActionInfo', item).populate({'@odata.id': uri})
+                                my_link.InAnnotation = True
+                                links.append(my_link)
                     if item.Type.IsNav:
                         if isinstance(item.Value, list):
                             for num, val in enumerate(item.Value):

redfish_service_validator/config.py

@@ -1,5 +1,5 @@
 # Copyright Notice:
-# Copyright 2016-2024 DMTF. All rights reserved.
+# Copyright 2016-2025 DMTF. All rights reserved.
 # License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/Redfish-Service-Validator/blob/main/LICENSE.md
 
 import configparser