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

{redfish_interop_validator-2.2.7 → redfish_interop_validator-2.2.8}/LICENSE.md

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2017-2024, Contributing Member(s) of Distributed Management Task
+Copyright (c) 2017-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,

{redfish_interop_validator-2.2.7/redfish_interop_validator.egg-info → redfish_interop_validator-2.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: redfish_interop_validator
-Version: 2.2.7
+Version: 2.2.8
 Summary: Redfish Interop Validator
 Home-page: https://github.com/DMTF/Redfish-Interop-Validator
 Author: DMTF, https://www.dmtf.org/standards/feedback
@@ -17,8 +17,17 @@ Requires-Dist: requests
 Requires-Dist: beautifulsoup4>=4.6.0
 Requires-Dist: lxml
 Requires-Dist: jsonschema
-
-Copyright 2017-2024 DMTF. All rights reserved.
+Dynamic: author
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: summary
+
+Copyright 2017-2025 DMTF. All rights reserved.
 
 # Redfish Interop Validator
 

{redfish_interop_validator-2.2.7 → redfish_interop_validator-2.2.8}/README.md

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

{redfish_interop_validator-2.2.7 → redfish_interop_validator-2.2.8}/redfish_interop_validator/RedfishInteropValidator.py

@@ -1,6 +1,6 @@
 
 # Copyright Notice:
-# Copyright 2017-2024 DMTF. All rights reserved.
+# Copyright 2017-2025 DMTF. All rights reserved.
 # License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/Redfish-Interop-Validator/blob/master/LICENSE.md
 
 import os
@@ -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.7'
+tool_version = '2.2.8'
 
 # Set up the custom debug levels
 VERBOSE1 = logging.INFO - 1
@@ -90,7 +90,7 @@ def main(argslist=None, configfile=None):
     if configfile is None:
         configfile = args.config
 
-    startTick = datetime.now()
+    start_tick = datetime.now()
 
     # Set logging file
     standard_out.setLevel(logging.INFO - args.verbose if args.verbose < 3 else logging.DEBUG)
@@ -101,7 +101,7 @@ def main(argslist=None, configfile=None):
         os.makedirs(logpath)
 
     fmt = logging.Formatter('%(levelname)s - %(message)s')
-    file_handler = logging.FileHandler(datetime.strftime(startTick, os.path.join(logpath, "InteropLog_%m_%d_%Y_%H%M%S.txt")))
+    file_handler = logging.FileHandler(datetime.strftime(start_tick, os.path.join(logpath, "InteropLog_%m_%d_%Y_%H%M%S.txt")))
     file_handler.setLevel(min(logging.INFO if not args.debugging else logging.DEBUG, standard_out.level))
     file_handler.setFormatter(fmt)
     my_logger.addHandler(file_handler)
@@ -121,7 +121,7 @@ def main(argslist=None, configfile=None):
     else:
         from redfish_interop_validator.config import convert_args_to_config
         my_logger.info('Writing config file to log directory')
-        configfilename = datetime.strftime(startTick, os.path.join(logpath, "ConfigFile_%m_%d_%Y_%H%M%S.ini"))
+        configfilename = datetime.strftime(start_tick, os.path.join(logpath, "ConfigFile_%m_%d_%Y_%H%M%S.ini"))
         my_config = convert_args_to_config(args)
         with open(configfilename, 'w') as f:
             my_config.write(f)
@@ -144,7 +144,7 @@ def main(argslist=None, configfile=None):
     my_logger.info('Target URI: ' + args.ip)
     my_logger.info('\n'.join(
         ['{}: {}'.format(x, vars(args)[x] if x not in ['password'] else '******') for x in sorted(list(vars(args).keys() - set(['description']))) if vars(args)[x] not in ['', None]]))
-    my_logger.info('Start time: ' + startTick.strftime('%x - %X'))
+    my_logger.info('Start time: ' + start_tick.strftime('%x - %X'))
     my_logger.info("")
 
     # Start our service
@@ -162,7 +162,7 @@ def main(argslist=None, configfile=None):
         my_uuid = currentService.service_root.get('UUID', 'No UUID')
         setattr(args, 'description', 'My Target System {}, version {}, {}'.format(my_name, my_version, my_uuid))
 
-    my_logger.info('Description of service: {}'.format(args.description))
+    my_logger.info('Description of service: {}\n'.format(args.description))
 
     # Interop Profile handling
     my_profiles = []
@@ -183,17 +183,12 @@ def main(argslist=None, configfile=None):
 
     if args.required_profiles_dir is not None:
         my_paths += glob.glob("{}/**/".format(args.required_profiles_dir), recursive=True)
-
-    # Create a list of profiles, required imports, and show their hashes
-    all_profiles = []
-    for name, profile in my_profiles:
-        all_profiles.extend(getProfiles(profile, [os.getcwd()] + my_paths, online=args.online_profiles))
-
-    my_logger.info('\nProfile Hashes: ')
-    for profile in all_profiles:
-        profileName = profile.get('ProfileName')
-        profileVersion = profile.get('ProfileVersion')
-        my_logger.info('profile: {} {}, dict md5 hash: {}'.format(profileName, profileVersion, hashProfile(profile)))
+    
+    my_logger.info('Profile Hashes (run-time): ')
+    for file_name, profile in my_profiles:
+        profile_name = profile.get('ProfileName')
+        profile_version = profile.get('ProfileVersion')
+        my_logger.info('profile: {} {} {}, dict md5 hash: {}'.format(file_name, profile_name, profile_version, hashProfile(profile)))
 
     # Start main
     status_code = 1
@@ -220,28 +215,55 @@ def main(argslist=None, configfile=None):
 
     try:
         results = None
-        for profile in all_profiles:
-            if 'single' in pmode:
-                success, _, resultsNew, _, _ = validateSingleURI(ppath, profile, 'Target', expectedJson=jsonData)
-            elif 'tree' in pmode:
-                success, _, resultsNew, _, _ = validateURITree(ppath, profile, 'Target', expectedJson=jsonData)
-            else:
-                success, _, resultsNew, _, _ = validateURITree('/redfish/v1/', profile, 'ServiceRoot', expectedJson=jsonData)
-            profileName = profile.get('ProfileName')
-            if results is None:
-                results = resultsNew
-            else:
-                for item in resultsNew:
-                    for x in resultsNew[item]['messages']:
-                        x.name = profileName + ' -- ' + x.name
-                    if item in results:
-                        innerCounts = results[item]['counts']
-                        innerCounts.update(resultsNew[item]['counts'])
-                        results[item]['messages'].extend(resultsNew[item]['messages'])
-                    else:
-                        results[item] = resultsNew[item]
-                    # resultsNew = {profileName+key: resultsNew[key] for key in resultsNew if key in results}
-                    # results.update(resultsNew)
+        processed_profiles = set()
+        for file_name, profile in my_profiles:
+            profile_name = profile.get('ProfileName')
+            profile_version = profile.get('ProfileVersion')
+
+            # Create a list of profiles, required imports, and show their hashes
+            included_profiles, required_by_resource = getProfiles(profile, [os.getcwd()] + my_paths, online=args.online_profiles)
+
+            all_profiles = [profile] + included_profiles
+
+            my_logger.info('Profile Hashes (included by {}): '.format(file_name))
+            for inner_profile in included_profiles:
+                inner_profile_name = profile.get('ProfileName')
+                inner_profile_version = profile.get('ProfileVersion')
+                my_logger.info('\t{} {}, dict md5 hash: {}'.format(inner_profile_name, inner_profile_version, hashProfile(inner_profile)))
+
+            my_logger.info('Profile Hashes (required by Resource): '.format(file_name))
+            for inner_profile in required_by_resource:
+                inner_profile_name = profile.get('ProfileName')
+                inner_profile_version = profile.get('ProfileVersion')
+                my_logger.info('\t{} {}, dict md5 hash: {}'.format(inner_profile_name, inner_profile_version, hashProfile(inner_profile)))
+
+            for profile_to_process in all_profiles:
+                processing_profile_name = profile_to_process.get('ProfileName')
+                if processing_profile_name not in processed_profiles:
+                    processed_profiles.add(profile_name)
+                else:
+                    my_logger.warn("Profile {} already processed".format({}))
+
+                if 'single' in pmode:
+                    success, _, new_results, _, _ = validateSingleURI(ppath, profile_to_process, 'Target', expectedJson=jsonData)
+                elif 'tree' in pmode:
+                    success, _, new_results, _, _ = validateURITree(ppath, profile_to_process, 'Target', expectedJson=jsonData)
+                else:
+                    success, _, new_results, _, _ = validateURITree('/redfish/v1/', profile_to_process, 'ServiceRoot', expectedJson=jsonData)
+                if results is None:
+                    results = new_results
+                else:
+                    for item_name, item in new_results.items():
+                        for x in item['messages']:
+                            x.name = profile_name + ' -- ' + x.name
+                        if item_name in results:
+                            inner_counts = results[item_name]['counts']
+                            inner_counts.update(item['counts'])
+                            results[item_name]['messages'].extend(item['messages'])
+                        else:
+                            results[item_name] = item
+                        # resultsNew = {profileName+key: resultsNew[key] for key in resultsNew if key in results}
+                        # results.update(resultsNew)
     except traverseInterop.AuthenticationError as e:
         # log authentication error and terminate program
         my_logger.error('{}'.format(e))
@@ -253,51 +275,51 @@ def main(argslist=None, configfile=None):
     except Exception as e:
         my_logger.error('Failed to log out of service; session may still be active ({})'.format(e))
 
-    finalCounts = Counter()
-    nowTick = datetime.now()
-    my_logger.info('Elapsed time: {}'.format(str(nowTick - startTick).rsplit('.', 1)[0]))
+    final_counts = Counter()
+    now_tick = datetime.now()
+    my_logger.info('Elapsed time: {}'.format(str(now_tick - start_tick).rsplit('.', 1)[0]))
 
     for item in results:
-        innerCounts = results[item]['counts']
+        inner_counts = results[item]['counts']
 
         # detect if there are error messages for this resource, but no failure counts; if so, add one to the innerCounts
         counters_all_pass = True
-        for countType in sorted(innerCounts.keys()):
-            if innerCounts.get(countType) == 0:
+        for count_type in sorted(inner_counts.keys()):
+            if inner_counts.get(count_type) == 0:
                 continue
-            if any(x in countType for x in ['problem', 'fail', 'bad', 'exception']):
+            if any(x in count_type for x in ['problem', 'fail', 'bad', 'exception']):
                 counters_all_pass = False
-            if 'fail' in countType or 'exception' in countType:
-                my_logger.error('{} {} errors in {}'.format(innerCounts[countType], countType, results[item]['uri']))
-            innerCounts[countType] += 0
+            if 'fail' in count_type or 'exception' in count_type:
+                my_logger.error('{} {} errors in {}'.format(inner_counts[count_type], count_type, results[item]['uri']))
+            inner_counts[count_type] += 0
         error_messages_present = False
         if results[item]['errors'] is not None and len(results[item]['errors']) > 0:
             error_messages_present = True
         if results[item]['warns'] is not None and len(results[item]['warns']) > 0:
-            innerCounts['warningPresent'] = 1
+            inner_counts['warningPresent'] = 1
         if counters_all_pass and error_messages_present:
-            innerCounts['failErrorPresent'] = 1
+            inner_counts['failErrorPresent'] = 1
 
-        finalCounts.update(results[item]['counts'])
+        final_counts.update(results[item]['counts'])
 
     import redfish_interop_validator.tohtml as tohtml
 
     fails = 0
-    for key in [key for key in finalCounts.keys()]:
-        if finalCounts[key] == 0:
-            del finalCounts[key]
+    for key in [key for key in final_counts.keys()]:
+        if final_counts[key] == 0:
+            del final_counts[key]
             continue
         if any(x in key for x in ['problem', 'fail', 'bad', 'exception']):
-            fails += finalCounts[key]
+            fails += final_counts[key]
 
-    html_str = tohtml.renderHtml(results, finalCounts, tool_version, startTick, nowTick, currentService.config)
+    html_str = tohtml.renderHtml(results, final_counts, tool_version, start_tick, now_tick, currentService.config)
 
-    lastResultsPage = datetime.strftime(startTick, os.path.join(logpath, "InteropHtmlLog_%m_%d_%Y_%H%M%S.html"))
+    lastResultsPage = datetime.strftime(start_tick, os.path.join(logpath, "InteropHtmlLog_%m_%d_%Y_%H%M%S.html"))
 
     tohtml.writeHtml(html_str, lastResultsPage)
 
     success = success and not (fails > 0)
-    my_logger.info("\n".join('{}: {}   '.format(x, y) for x, y in sorted(finalCounts.items())))
+    my_logger.info("\n".join('{}: {}   '.format(x, y) for x, y in sorted(final_counts.items())))
 
     # dump cache info to debug log
     my_logger.debug('callResourceURI() -> {}'.format(currentService.callResourceURI.cache_info()))

{redfish_interop_validator-2.2.7 → redfish_interop_validator-2.2.8}/redfish_interop_validator/RedfishLogo.py

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

{redfish_interop_validator-2.2.7 → redfish_interop_validator-2.2.8}/redfish_interop_validator/config.py

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

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

@@ -1,6 +1,6 @@
 
 # Copyright Notice:
-# Copyright 2017-2024 DMTF. All rights reserved.
+# Copyright 2017-2025 DMTF. All rights reserved.
 # License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/Redfish-Interop-Validator/blob/master/LICENSE.md
 
 import re

redfish_interop_validator-2.2.8/redfish_interop_validator/profile.py

@@ -0,0 +1,202 @@
+
+# Copyright Notice:
+# Copyright 2017-2025 DMTF. All rights reserved.
+# License: BSD 3-Clause License. For full text see link:
+# https://github.com/DMTF/Redfish-Service-Validator/LICENSE.md
+
+import os
+import re
+import glob
+import json
+import logging
+
+from urllib.request import urlopen
+from collections.abc import Mapping
+
+from redfish_interop_validator.redfish import splitVersionString, versionpattern
+
+my_logger = logging.getLogger()
+my_logger.setLevel(logging.DEBUG)
+
+
+def hashProfile(profile):
+    from hashlib import md5
+    my_md5 = md5(json.dumps(profile, sort_keys=True).encode())
+    return my_md5.hexdigest()
+
+
+def checkProfileAgainstSchema(profile, schema):
+    """
+    Checks if a profile is conformant
+    """
+    # what is required in a profile? use the json schema
+    import jsonschema
+    try:
+        jsonschema.validate(profile, schema)
+    except jsonschema.ValidationError as e:
+        my_logger.exception(e)
+        my_logger.info('ValidationError')
+        return False
+    except jsonschema.SchemaError as e:
+        my_logger.exception(e)
+        my_logger.info('SchemaError')
+        return False
+    # consider @odata.type, with regex
+    return True
+
+
+defaultrepository = 'http://redfish.dmtf.org/profiles'
+
+
+def getProfilesMatchingName(name, directories):
+    pattern = r'\.{}\.'.format(versionpattern)
+    filepattern = re.compile(pattern.join(name.split('.')) + "|{}".format(name.replace('.', '\.')))
+    for dirname in directories:
+        for file in glob.glob(os.path.join(dirname, '*.json')):
+            if filepattern.match(os.path.basename(file)):
+                yield file
+
+def dict_merge(dct, merge_dct):
+    """
+    https://gist.github.com/angstwad/bf22d1822c38a92ec0a9 modified
+    Recursive dict merge. Inspired by :meth:``dict.update()``, instead of
+    updating only top-level keys, dict_merge recurses down into dicts nested
+    to an arbitrary depth, updating keys. The ``merge_dct`` is merged into
+    ``dct``.
+    :param dct: dict onto which the merge is executed
+    :param merge_dct: dct merged into dct
+    :return: None
+    """
+    for k in merge_dct:
+        if (k in dct and isinstance(dct[k], dict)
+                and isinstance(merge_dct[k], Mapping)):
+            dict_merge(dct[k], merge_dct[k])
+        else:
+            dct[k] = merge_dct[k]
+
+
+def updateWithProfile(profile, data):
+    dict_merge(data, profile)
+    return data
+
+
+def getProfileFromRepo(profilename, repo=None):
+    try:
+        if repo is None:
+            repo = 'http://redfish.dmtf.org/profiles'
+
+        urlpath = urlopen(repo)
+        string = urlpath.read().decode('utf-8')
+
+        pattern = r'\.{}\.'.format(versionpattern)
+        filepattern = re.compile(pattern.join(profilename.split('.')))
+
+        filelist = filepattern.findall(string)
+
+        profilename = None
+        for filename in filelist:
+            filename = filename[:-1]
+            if profilename is None:
+                profilename = filename
+                continue
+            profilename = max(profilename, filename)
+        if profilename is None:
+            return None
+
+        remotefile = urlopen(repo + '/' + profilename)
+        return remotefile.read()
+    except Exception as e:
+        print(e)
+        return None
+
+# Presumes the cache does not need to handle multiple of the same profile with different versions
+profile_cache = {}
+
+def parseProfileInclude(target_name, target_profile_info, directories, online):
+    # Grab data of profile from online or locally
+
+    min_version = splitVersionString(target_profile_info.get('MinVersion', '1.0.0'))
+    target_version = 'v{}_{}_{}'.format(*min_version)
+    target_file = '{}.{}'.format(target_name, 'json')
+
+    if target_file in profile_cache:
+        return profile_cache[target_file]
+
+    # get max filename
+    repo = target_profile_info.get('Repository')
+    if online:
+        data = getProfileFromRepo(target_file, repo)
+    else:
+        data = None
+
+    if data is None:
+        target_list = list(getProfilesMatchingName(target_file, directories))
+        if len(target_list) > 0:
+            max_version = (1,0,0)
+            for target_name in target_list:
+                with open(target_name) as f:
+                    my_profile = json.load(f)
+                    my_version = splitVersionString(my_profile.get('ProfileVersion', '1.0.0'))
+                    max_version = max(max_version, my_version)
+                    if my_version == max_version or data is None:
+                        data = my_profile
+            if min_version > max_version:
+                my_logger.warning('File version smaller than target MinVersion')
+        else:
+            my_logger.error('Could not acquire this profile {} {}'.format(target_name, repo))
+            data = None
+
+    profile_cache[target_file] = data
+    return data
+
+
+def getProfiles(profile, directories, chain=None, online=False):
+    profile_includes, required_by_resource = [], []
+    
+    # Prevent cyclical imports when possible
+    profile_name = profile.get('ProfileName')
+    if chain is None:
+        chain = []
+    if profile_name in chain:
+        my_logger.error('Suspected duplicate/cyclical import error: {} {}'.format(chain, profile_name))
+        return [], []
+    chain.append(profile_name)
+
+    # Gather all included profiles, these are each run independently in validateResource.
+    # TODO: Process them simultaneously in validateResource, to avoid polling the target machine multiple times
+    required_profiles = profile.get('RequiredProfiles', {})
+    for target_name, target_profile_info in required_profiles.items():
+        profile_data = parseProfileInclude(target_name, target_profile_info, directories, online)
+
+        if profile_data:
+            profile_includes.append(profile_data)
+
+            inner_includes, inner_reqs = getProfiles(profile_data, directories, chain)
+            profile_includes.extend(inner_includes)
+            required_by_resource.extend(inner_reqs)
+        
+    # Process all RequiredResourceProfile by modifying profiles
+    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
+        if 'UseCases' not in resource:
+            modifying_objects = [resource]
+        else:
+            modifying_objects = resource['UseCases']
+        # Use same format as RequiredProfiles
+        for inner_object in modifying_objects:
+            required_profiles = inner_object.get('RequiredResourceProfile', {})
+            for target_name, target_profile_info in required_profiles.items():
+                profile_data = parseProfileInclude(target_name, target_profile_info, directories, online)
+
+                if profile_data:
+                    target_resources = profile_data.get('Resources')
+                    # Merge if our data exists
+                    if resource_name in target_resources:
+                        dict_merge(inner_object, target_resources[resource_name])
+                        required_by_resource.append(profile_data)
+                    else:
+                        my_logger.error('Import {} does not have Resource {}'.format(target_name, resource_name))
+
+    return profile_includes, required_by_resource

{redfish_interop_validator-2.2.7 → redfish_interop_validator-2.2.8}/redfish_interop_validator/redfish.py

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

{redfish_interop_validator-2.2.7 → redfish_interop_validator-2.2.8}/redfish_interop_validator/session.py

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

{redfish_interop_validator-2.2.7 → redfish_interop_validator-2.2.8}/redfish_interop_validator/tohtml.py

@@ -1,6 +1,6 @@
 
 # Copyright Notice:
-# Copyright 2017-2024 DMTF. All rights reserved.
+# Copyright 2017-2025 DMTF. All rights reserved.
 # License: BSD 3-Clause License. For full text see link: https://github.com/DMTF/Redfish-Interop-Validator/blob/master/LICENSE.md
 
 

{redfish_interop_validator-2.2.7 → redfish_interop_validator-2.2.8}/redfish_interop_validator/traverseInterop.py

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

{redfish_interop_validator-2.2.7 → redfish_interop_validator-2.2.8}/redfish_interop_validator/validateResource.py

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

{redfish_interop_validator-2.2.7 → redfish_interop_validator-2.2.8/redfish_interop_validator.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: redfish_interop_validator
-Version: 2.2.7
+Version: 2.2.8
 Summary: Redfish Interop Validator
 Home-page: https://github.com/DMTF/Redfish-Interop-Validator
 Author: DMTF, https://www.dmtf.org/standards/feedback
@@ -17,8 +17,17 @@ Requires-Dist: requests
 Requires-Dist: beautifulsoup4>=4.6.0
 Requires-Dist: lxml
 Requires-Dist: jsonschema
-
-Copyright 2017-2024 DMTF. All rights reserved.
+Dynamic: author
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: summary
+
+Copyright 2017-2025 DMTF. All rights reserved.
 
 # Redfish Interop Validator
 

{redfish_interop_validator-2.2.7 → redfish_interop_validator-2.2.8}/setup.py

@@ -1,5 +1,5 @@
 # Copyright Notice:
-# Copyright 2017-2024 DMTF. All rights reserved.
+# Copyright 2017-2025 DMTF. All rights reserved.
 # License: BSD 3-Clause License. For full text see link:
 # https://github.com/DMTF/Redfish-Interop-Validator/blob/main/LICENSE.md
 
@@ -11,7 +11,7 @@ with open("README.md", "r", "utf-8") as f:
 
 setup(
     name="redfish_interop_validator",
-    version="2.2.7",
+    version="2.2.8",
     description="Redfish Interop Validator",
     long_description=long_description,
     long_description_content_type="text/markdown",

redfish_interop_validator-2.2.7/redfish_interop_validator/profile.py

@@ -1,154 +0,0 @@
-
-# Copyright Notice:
-# Copyright 2017-2024 DMTF. All rights reserved.
-# License: BSD 3-Clause License. For full text see link:
-# https://github.com/DMTF/Redfish-Service-Validator/LICENSE.md
-
-import os
-import re
-import glob
-import json
-import logging
-
-from redfish_interop_validator.redfish import splitVersionString, versionpattern
-
-my_logger = logging.getLogger()
-my_logger.setLevel(logging.DEBUG)
-
-from urllib.request import urlopen
-
-def hashProfile(profile):
-    from hashlib import md5
-    my_md5 = md5(json.dumps(profile, sort_keys=True).encode())
-    return my_md5.hexdigest()
-
-def checkProfileAgainstSchema(profile, schema):
-    """
-    Checks if a profile is conformant
-    """
-    # what is required in a profile? use the json schema
-    import jsonschema
-    try:
-        jsonschema.validate(profile, schema)
-    except jsonschema.ValidationError as e:
-        my_logger.exception(e)
-        my_logger.info('ValidationError')
-        return False
-    except jsonschema.SchemaError as e:
-        my_logger.exception(e)
-        my_logger.info('SchemaError')
-        return False
-    # consider @odata.type, with regex
-    return True
-
-
-defaultrepository = 'http://redfish.dmtf.org/profiles'
-
-def getProfilesMatchingName(name, directories):
-    pattern = r'\.{}\.'.format(versionpattern)
-    filepattern = re.compile(pattern.join(name.split('.')) + "|{}".format(name.replace('.', '\.')))
-    for dirname in directories:
-        for file in glob.glob(os.path.join(dirname, '*.json')):
-            if filepattern.match(os.path.basename(file)):
-                yield file
-
-def dict_merge(dct, merge_dct):
-        """
-        https://gist.github.com/angstwad/bf22d1822c38a92ec0a9 modified
-        Recursive dict merge. Inspired by :meth:``dict.update()``, instead of
-        updating only top-level keys, dict_merge recurses down into dicts nested
-        to an arbitrary depth, updating keys. The ``merge_dct`` is merged into
-        ``dct``.
-        :param dct: dict onto which the merge is executed
-        :param merge_dct: dct merged into dct
-        :return: None
-        """
-        from collections import Mapping
-        for k in merge_dct:
-            if (k in dct and isinstance(dct[k], dict)
-                    and isinstance(merge_dct[k], Mapping)):
-                dict_merge(dct[k], merge_dct[k])
-            else:
-                dct[k] = merge_dct[k]
-
-def updateWithProfile(profile, data):
-    dict_merge(data, profile)
-    return data
-
-def getProfileFromRepo(profilename, repo=None):
-    try:
-        if repo is None:
-            repo = 'http://redfish.dmtf.org/profiles'
-
-        urlpath = urlopen(repo)
-        string = urlpath.read().decode('utf-8')
-
-        pattern = r'\.{}\.'.format(versionpattern)
-        filepattern = re.compile(pattern.join(profilename.split('.')))
-
-        filelist = filepattern.findall(string)
-
-        profilename = None
-        for filename in filelist:
-            filename = filename[:-1]
-            if profilename is None:
-                profilename = filename
-                continue
-            profilename = max(profilename, filename)
-        if profilename is None:
-            return None
-
-        remotefile = urlopen(repo + '/' + profilename)
-        return remotefile.read()
-    except Exception as e:
-        print(e)
-        return None
-
-
-def getProfiles(profile, directories, chain=None, online=False):
-    alldata = [profile]
-    if 'RequiredProfiles' not in profile:
-        my_logger.debug('No such item RequiredProfiles')
-    else:
-        profileName = profile.get('ProfileName')
-        if chain is None:
-            chain = []
-        if profileName in chain:
-            my_logger.error('Suspected duplicate/cyclical import error: {} {}'.format(chain, profileName))
-            return []
-        chain.append(profileName)
-
-        requiredProfiles = profile['RequiredProfiles']
-        for item in requiredProfiles:
-            targetName = item
-            rp = requiredProfiles[targetName]
-            min_version = splitVersionString(rp.get('MinVersion', '1.0.0'))
-            targetVersion = 'v{}_{}_{}'.format(*min_version)
-            targetFile = '{}.{}'.format(targetName, 'json')
-
-            # get max filename
-            repo = rp.get('Repository')
-            if online:
-                data = getProfileFromRepo(targetFile, repo)
-            else:
-                data = None
-
-            if data is None:
-                targetList = list(getProfilesMatchingName(targetFile, directories))
-                if len(targetList) > 0:
-                    max_version = (1,0,0)
-                    for item in targetList:
-                        with open(item) as f:
-                            my_profile = json.load(f)
-                            my_version = splitVersionString(my_profile.get('ProfileVersion', '1.0.0'))
-                            max_version = max(max_version, my_version)
-                            if my_version == max_version or data == None:
-                                data = my_profile
-                    if min_version > max_version:
-                        my_logger.warning('File version smaller than target MinVersion')
-                else:
-                    my_logger.error('Could not acquire this profile {} {}'.format(targetName, repo))
-                    continue
-
-            alldata.extend(getProfiles(data, directories, chain))
-    return alldata