redfish-interop-validator 2.2.9__tar.gz → 2.3.0__tar.gz

{redfish_interop_validator-2.2.9/redfish_interop_validator.egg-info → redfish_interop_validator-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: redfish_interop_validator
-Version: 2.2.9
+Version: 2.3.0
 Summary: Redfish Interop Validator
 Home-page: https://github.com/DMTF/Redfish-Interop-Validator
 Author: DMTF, https://www.dmtf.org/standards/feedback
@@ -24,6 +24,7 @@ Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: keywords
 Dynamic: license
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: summary
 

{redfish_interop_validator-2.2.9 → redfish_interop_validator-2.3.0}/redfish_interop_validator/RedfishInteropValidator.py

@@ -17,7 +17,7 @@ import redfish_interop_validator.traverseInterop as traverseInterop
 from redfish_interop_validator.profile import getProfiles, checkProfileAgainstSchema, hashProfile
 from redfish_interop_validator.validateResource import validateSingleURI, validateURITree
 
-tool_version = '2.2.9'
+tool_version = '2.3.0'
 
 # Set up the custom debug levels
 VERBOSE1 = logging.INFO - 1

{redfish_interop_validator-2.2.9 → redfish_interop_validator-2.3.0}/redfish_interop_validator/interop.py

@@ -764,18 +764,18 @@ def validateActionRequirement(profile_entry, rf_payload_tuple, actionname):
     return msgs, counts
 
 
-URI_ID_REGEX = '\{[A-Za-z0-9]*Id\}'
+URI_ID_REGEX = '\{[A-Za-z0-9]+\}'
 
-VALID_ID_REGEX = '([A-Za-z0-9.!#$&-;=?\[\]_~])+'
+VALID_ID_REGEX = '[A-Za-z0-9.!#$&-;=?\[\]_~]+'
 
 
 def compareRedfishURI(expected_uris, uri):
     success = False
     # If we have our URIs
     if expected_uris is not None:
-        my_uri_regex = "^{}$".format("|".join(expected_uris))
-        my_uri_regex = re.sub(URI_ID_REGEX, VALID_ID_REGEX, my_uri_regex)
-        success = re.fullmatch(my_uri_regex, uri) is not None
+        regex_pattern = "^{}$".format("|".join(expected_uris))
+        regex_pattern = re.sub(URI_ID_REGEX, VALID_ID_REGEX, regex_pattern)
+        success = re.fullmatch(regex_pattern, uri) is not None
     else:
         success = True
     return success

{redfish_interop_validator-2.2.9 → redfish_interop_validator-2.3.0}/redfish_interop_validator/profile.py

@@ -176,7 +176,7 @@ def getProfiles(profile, directories, chain=None, online=False):
             required_by_resource.extend(inner_reqs)
         
     # Process all RequiredResourceProfile by modifying profiles
-    profile_resources = profile.get('Resources')
+    profile_resources = profile.get('Resources', {})
     
     for resource_name, resource in profile_resources.items():
         # Modify just the resource or its UseCases.  Should not have concurrent UseCases and RequiredResourceProfile in Resource

{redfish_interop_validator-2.2.9 → redfish_interop_validator-2.3.0/redfish_interop_validator.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: redfish_interop_validator
-Version: 2.2.9
+Version: 2.3.0
 Summary: Redfish Interop Validator
 Home-page: https://github.com/DMTF/Redfish-Interop-Validator
 Author: DMTF, https://www.dmtf.org/standards/feedback
@@ -24,6 +24,7 @@ Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: keywords
 Dynamic: license
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: summary
 

{redfish_interop_validator-2.2.9 → redfish_interop_validator-2.3.0}/setup.py

@@ -11,7 +11,7 @@ with open("README.md", "r", "utf-8") as f:
 
 setup(
     name="redfish_interop_validator",
-    version="2.2.9",
+    version="2.3.0",
     description="Redfish Interop Validator",
     long_description=long_description,
     long_description_content_type="text/markdown",