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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: redfish_interop_validator
-Version: 2.3.0
+Version: 2.3.1
 Summary: Redfish Interop Validator
 Home-page: https://github.com/DMTF/Redfish-Interop-Validator
 Author: DMTF, https://www.dmtf.org/standards/feedback

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

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

@@ -67,11 +67,11 @@ def validateComparisonAnyOfAllOf(profile_entry, property_path="Unspecified"):
             top_msg = msgInterop(msg_name, my_compare, expected_values, my_values, False)
             all_msgs.append(top_msg)
 
-            # NOPASS by default, if the check fails but the value is still in the array
-            # OK if passing, FAIL if check fails and value is not in array
+            # OK if value does not contribute
+            # PASS if value contributes
             for msg in my_msgs:
                 msg.ignore = False
-                msg.success = testResultEnum.NOPASS
+                msg.success = testResultEnum.OK
                 msg.expected = '{} {} ({})'.format(msg.expected, expected_values, "Across All Resources")
 
             if my_compare == 'AnyOf':
@@ -79,25 +79,23 @@ def validateComparisonAnyOfAllOf(profile_entry, property_path="Unspecified"):
                     my_logger.info('  PASS')
                     top_msg.success = testResultEnum.PASS
                     for msg in my_msgs:
-                        msg.success = testResultEnum.OK
                         if msg.actual in expected_values:
                             msg.success = testResultEnum.PASS
                 else:
                     my_logger.info('  FAIL')
-                    for msg in my_msgs:
-                        msg.success = testResultEnum.FAIL
 
             if my_compare == 'AllOf':
                 if all([x in my_values for x in expected_values]):
                     my_logger.info('  PASS')
                     top_msg.success = testResultEnum.PASS
                     for msg in my_msgs:
-                        msg.success = testResultEnum.OK
+                        if msg.actual in expected_values:
+                            msg.success = testResultEnum.PASS
                 else:
                     my_logger.info('  FAIL')
                     for msg in my_msgs:
-                        if msg.actual not in expected_values:
-                            msg.success = testResultEnum.FAIL
+                        if msg.actual in expected_values:
+                            msg.success = testResultEnum.PASS
 
         if property_profile.get('PropertyRequirements'):
             new_msgs = validateComparisonAnyOfAllOf(property_profile.get('PropertyRequirements'), '.'.join([property_path, key]))

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: redfish_interop_validator
-Version: 2.3.0
+Version: 2.3.1
 Summary: Redfish Interop Validator
 Home-page: https://github.com/DMTF/Redfish-Interop-Validator
 Author: DMTF, https://www.dmtf.org/standards/feedback

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

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