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

{redfish_interop_validator-2.2.8/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.8
+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.8 → 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.8'
+tool_version = '2.3.0'
 
 # Set up the custom debug levels
 VERBOSE1 = logging.INFO - 1

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

@@ -106,14 +106,50 @@ def validateComparisonAnyOfAllOf(profile_entry, property_path="Unspecified"):
     return all_msgs
 
 
+def validateRequirementResource(profile_entry, rf_payload_item=None, parent_object_tuple=None):
+    """
+    Validates Requirement profile_entry for Resources
+
+    Has different resolutions than when validating at a per Property level
+    """
+    resource_exists = (rf_payload_item != REDFISH_ABSENT)
+    my_logger.debug('Testing Resource ReadRequirement \n\texpected:' + str(profile_entry) + ', exists: ' + str(resource_exists))
+
+    original_profile_entry = profile_entry
+
+    if profile_entry == "IfPopulated":
+        profile_entry = "Recommended"
+
+    paramPass = profile_entry != "Mandatory" or \
+        profile_entry == "Mandatory" and resource_exists
+
+    if profile_entry == "IfImplemented":
+        if not resource_exists:
+            paramPass = testResultEnum.NA
+        else:
+            my_logger.debug('\tItem cannot be tested for Implementation')
+
+    if profile_entry == "Recommended" and not resource_exists:
+        my_logger.info('\tItem is recommended but does not exist')
+        if config['WarnRecommended']:
+            my_logger.warning('\tItem is recommended but does not exist, escalating to WARN')
+            paramPass = testResultEnum.WARN
+        else:
+            paramPass = testResultEnum.NA
+
+    my_logger.debug('\tpass ' + str(paramPass))
+    return msgInterop('ReadRequirement', original_profile_entry, 'Must Exist' if profile_entry == "Mandatory" else 'Any', 'Exists' if resource_exists else 'DNE', paramPass),\
+        paramPass
+
+
 def validateRequirement(profile_entry, rf_payload_item=None, conditional=False, parent_object_tuple=None):
     """
     Validates Requirement profile_entry
 
     By default, only the first parameter is necessary and will always Pass if none given
     """
-    propDoesNotExist = (rf_payload_item == REDFISH_ABSENT)
-    my_logger.debug('Testing ReadRequirement \n\texpected:' + str(profile_entry) + ', exists: ' + str(not propDoesNotExist))
+    prop_exists = (rf_payload_item != REDFISH_ABSENT)
+    my_logger.debug('Testing ReadRequirement \n\texpected:' + str(profile_entry) + ', exists: ' + str(prop_exists))
     # If we're not mandatory, pass automatically, else fail
     # However, we have other entries "IfImplemented" and "Conditional"
     # note: Mandatory is default!! if present in the profile.  Make sure this is made sure.
@@ -133,16 +169,16 @@ def validateRequirement(profile_entry, rf_payload_item=None, conditional=False,
     if profile_entry == "Conditional" and conditional:
         profile_entry = "Mandatory"
 
-    paramPass = not profile_entry == "Mandatory" or \
-        profile_entry == "Mandatory" and not propDoesNotExist
+    paramPass = profile_entry != "Mandatory" or \
+        profile_entry == "Mandatory" and prop_exists
 
     if profile_entry == "IfImplemented":
-        if propDoesNotExist:
+        if not prop_exists:
             paramPass = testResultEnum.NA
         else:
             my_logger.debug('\tItem cannot be tested for Implementation')
 
-    if profile_entry == "Recommended" and propDoesNotExist:
+    if profile_entry == "Recommended" and not prop_exists:
         my_logger.info('\tItem is recommended but does not exist')
         if config['WarnRecommended']:
             my_logger.warning('\tItem is recommended but does not exist, escalating to WARN')
@@ -151,7 +187,7 @@ def validateRequirement(profile_entry, rf_payload_item=None, conditional=False,
             paramPass = testResultEnum.NA
 
     my_logger.debug('\tpass ' + str(paramPass))
-    return msgInterop('ReadRequirement', original_profile_entry, 'Must Exist' if profile_entry == "Mandatory" else 'Any', 'Exists' if not propDoesNotExist else 'DNE', paramPass),\
+    return msgInterop('ReadRequirement', original_profile_entry, 'Must Exist' if profile_entry == "Mandatory" else 'Any', 'Exists' if prop_exists else 'DNE', paramPass),\
         paramPass
 
 
@@ -327,19 +363,6 @@ def checkComparison(val, compareType, target):
         paramPass
 
 
-def validateMembers(members, profile_entry, annotation):
-    """
-    Validate an profile_entry of Members and its count annotation
-    """
-    my_logger.debug('Testing members \n\t' + str((members, profile_entry, annotation)))
-    if not validateRequirement('Mandatory', members):
-        return False
-    if "MinCount" in profile_entry:
-        mincount, mincountpass = validateMinCount(members, profile_entry["MinCount"], annotation)
-        mincount.name = 'MembersMinCount'
-    return mincount, mincountpass
-
-
 def validateMinVersion(version, profile_entry):
     """
     Checks for the minimum version of a resource's type
@@ -741,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.8 → 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.8 → redfish_interop_validator-2.3.0}/redfish_interop_validator/validateResource.py

@@ -263,7 +263,7 @@ def validateURITree(URI, profile, uriName, expectedType=None, expectedSchema=Non
     validateSuccess, counts, results, links, resource_obj = \
         validateSingleURI(URI, profile, uriName, expectedType, expectedSchema, expectedJson)
     
-    links, limited_links = links
+    links, limited_links = links if links else ({}, {})
     for skipped_link in limited_links:
         allLinks.add(limited_links[skipped_link])
 
@@ -396,7 +396,7 @@ def validateURITree(URI, profile, uriName, expectedType=None, expectedSchema=Non
 
                     my_logger.info('Validating UseCase {} of {} ReadRequirement'.format(entry_title, resource_type))
 
-                    my_msg, _ = interop.validateRequirement(expected_requirement, 'Exists' if does_resource_exist else REDFISH_ABSENT)
+                    my_msg, _ = interop.validateRequirementResource(expected_requirement, 'Exists' if does_resource_exist else REDFISH_ABSENT)
                     my_msg.name = 'UseCase.{}.{}'.format(entry_title, my_msg.name)
                     if uris_applied:
                         my_msg.expected = "{} at {}".format(my_msg.expected, ", ".join(uris_applied))
@@ -425,7 +425,7 @@ def validateURITree(URI, profile, uriName, expectedType=None, expectedSchema=Non
                     expected_requirement = condition.get("ReadRequirement")
                     if expected_requirement:
                         my_logger.info('Validating {} Conditional ReadRequirement'.format(resource_type))
-                        my_msg, _ = interop.validateRequirement(expected_requirement, 'Exists' if does_resource_exist else REDFISH_ABSENT)
+                        my_msg, _ = interop.validateRequirementResource(expected_requirement, 'Exists' if does_resource_exist else REDFISH_ABSENT)
                         my_msg.name = '{}.Conditional.{}'.format(resource_type, my_msg.name)
                         if uris_applied:
                             my_msg.expected = "{} at {}".format(my_msg.expected, ", ".join(uris_applied))
@@ -444,7 +444,7 @@ def validateURITree(URI, profile, uriName, expectedType=None, expectedSchema=Non
                 does_resource_exist = resource_exists
 
             my_logger.info('Validating {} ReadRequirement'.format(resource_type))
-            my_msg, _ = interop.validateRequirement(expected_requirement, 'Exists' if does_resource_exist else REDFISH_ABSENT)
+            my_msg, _ = interop.validateRequirementResource(expected_requirement, 'Exists' if does_resource_exist else REDFISH_ABSENT)
             my_msg.name = '{}.{}'.format(resource_type, my_msg.name)
             if uris_applied:
                 my_msg.expected = "{} at {}".format(my_msg.expected, ", ".join(uris_applied))

{redfish_interop_validator-2.2.8 → 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.8
+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.8 → 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.8",
+    version="2.3.0",
     description="Redfish Interop Validator",
     long_description=long_description,
     long_description_content_type="text/markdown",