Skip to content

Fix NameError: name 'OrderedDict' is not defined during runtime #204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
feng-j678 merged 3 commits into from
Jul 6, 2023
Merged

Fix NameError: name 'OrderedDict' is not defined during runtime #204

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a308918
Fix NameError: name 'OrderedDict' is not defined during runtime
feng-j678 Jul 6, 2023
e8907cd
Merge branch 'master' into user/jf/fix_ordereddict_runtime_error
kjohn-msft Jul 6, 2023
46f24c2
Merge branch 'master' into user/jf/fix_ordereddict_runtime_error
feng-j678 Jul 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions src/core/src/service_interfaces/StatusHandler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,13 @@
# limitations under the License.
#
# Requires Python 2.7+

import collections
import json
import os
import re
import shutil
import time
from core.src.bootstrap.Constants import Constants
from collections import OrderedDict


class StatusHandler(object):
Expand Down Expand Up @@ -48,15 +47,15 @@ def __init__(self, env_layer, execution_config, composite_logger, telemetry_writ
self.__installation_total_error_count = 0 # All errors during install, includes errors not in error objects due to size limit
self.__maintenance_window_exceeded = False
self.__installation_reboot_status = Constants.RebootStatus.NOT_NEEDED
self.__installation_packages_map = OrderedDict()
self.__installation_packages_map = collections.OrderedDict()

# Internal in-memory representation of Patch Assessment data
self.__assessment_substatus_json = None
self.__assessment_summary_json = None
self.__assessment_packages = []
self.__assessment_errors = []
self.__assessment_total_error_count = 0 # All errors during assess, includes errors not in error objects due to size limit
self.__assessment_packages_map = OrderedDict()
self.__assessment_packages_map = collections.OrderedDict()

# Internal in-memory representation of Patch Metadata for HealthStore
self.__metadata_for_healthstore_substatus_json = None
Expand Down Expand Up @@ -105,7 +104,7 @@ def reset_assessment_data(self):
self.__assessment_packages = []
self.__assessment_errors = []
self.__assessment_total_error_count = 0
self.__assessment_packages_map = OrderedDict()
self.__assessment_packages_map = collections.OrderedDict()

def set_package_assessment_status(self, package_names, package_versions, classification="Other", status="Available"):
""" Externally available method to set assessment status for one or more packages of the **SAME classification and status** """
Expand Down Expand Up @@ -552,13 +551,13 @@ def load_status_file_components(self, initial_load=False):
self.__installation_summary_json = None
self.__installation_packages = []
self.__installation_errors = []
self.__installation_packages_map = OrderedDict()
self.__installation_packages_map = collections.OrderedDict()

self.__assessment_substatus_json = None
self.__assessment_summary_json = None
self.__assessment_packages = []
self.__assessment_errors = []
self.__assessment_packages_map = OrderedDict()
self.__assessment_packages_map = collections.OrderedDict()

self.__metadata_for_healthstore_substatus_json = None
self.__metadata_for_healthstore_summary_json = None
Expand Down Expand Up @@ -594,7 +593,7 @@ def load_status_file_components(self, initial_load=False):
else:
message = complete_status_file_data['status']['substatus'][i]['formattedMessage']['message']
self.__installation_summary_json = json.loads(message)
self.__installation_packages_map = OrderedDict((package["patchId"], package) for package in self.__installation_summary_json['patches'])
self.__installation_packages_map = collections.OrderedDict((package["patchId"], package) for package in self.__installation_summary_json['patches'])
self.__installation_packages = list(self.__installation_packages_map.values())
self.__maintenance_window_exceeded = bool(self.__installation_summary_json['maintenanceWindowExceeded'])
self.__installation_reboot_status = self.__installation_summary_json['rebootStatus']
Expand All @@ -605,7 +604,7 @@ def load_status_file_components(self, initial_load=False):
if name == Constants.PATCH_ASSESSMENT_SUMMARY: # if it exists, it must be to spec, or an exception will get thrown
message = complete_status_file_data['status']['substatus'][i]['formattedMessage']['message']
self.__assessment_summary_json = json.loads(message)
self.__assessment_packages_map = OrderedDict((package["patchId"], package) for package in self.__assessment_summary_json['patches'])
self.__assessment_packages_map = collections.OrderedDict((package["patchId"], package) for package in self.__assessment_summary_json['patches'])
self.__assessment_packages = list(self.__assessment_packages_map.values())
errors = self.__assessment_summary_json['errors']
if errors is not None and errors['details'] is not None:
Expand Down