remove comments

Author: feng-j678

src/core/src/core_logic/PatchInstaller.py

@@ -53,8 +53,6 @@ def __init__(self, env_layer, execution_config, composite_logger, telemetry_writ
 
         self.stopwatch = Stopwatch(self.env_layer, self.telemetry_writer, self.composite_logger)
 
-        self.__org_expected_install_packages_list = None
-        self.__org_expected_install_packages_version_list = None
         self.__enable_installation_warning_status = False
 
     def start_installation(self, simulate=False):
@@ -128,9 +126,6 @@ def start_installation(self, simulate=False):
         overall_patch_installation_successful = bool(update_run_successful and not maintenance_window_exceeded)
         # NOTE: Not updating installation substatus at this point because we need to wait for the implicit/second assessment to complete first, as per CRP's instructions
 
-        # Reset expected packages and versions list:
-        self.__reset_expected_packages_and_version_list()
-
         return overall_patch_installation_successful
 
     def write_installer_perf_logs(self, patch_operation_successful, installed_patch_count, retry_count, maintenance_window, maintenance_window_exceeded, task_status, error_msg):
@@ -260,10 +255,6 @@ def install_updates(self, maintenance_window, package_manager, simulate=False):
         self.status_handler.set_package_install_status(self.skipped_esm_packages, self.skipped_esm_package_versions, Constants.FAILED)
         self.composite_logger.log("\nList of packages to be updated: \n" + str(packages))
 
-        # Store the original list of packages and versions that were intended to be installed
-        self.__org_expected_install_packages_list = list(packages)
-        self.__org_expected_install_packages_version_list = list(package_versions)
-
         sec_packages, sec_package_versions = self.package_manager.get_security_updates()
         self.telemetry_writer.write_event("Security packages out of the final package list: " + str(sec_packages), Constants.TelemetryEventLevel.Verbose)
         self.status_handler.set_package_install_status_classification(sec_packages, sec_package_versions, classification="Security")
@@ -844,23 +835,29 @@ def __log_progress_status(self, maintenance_window, installed_update_count):
         self.composite_logger.log(progress_status)
 
     # region - Failed packages retry succeeded
-    def __reset_expected_packages_and_version_list(self):
-        self.__org_expected_install_packages_list = None
-        self.__org_expected_install_packages_version_list = None
-
     def __check_if_all_packages_installed(self):
         #type (none) -> bool
-        """ Check if all supposed packages are installed """
+        """ Check if all supposed security and critical packages are installed """
         # Get the list of installed packages
         installed_packages_list = self.status_handler.get_installation_packages_list()
-        # Create a list to store uninstalled packages
-        uninstalled_packages_list = [
-            (pkg, ver) for pkg, ver in zip(self.__org_expected_install_packages_list, self.__org_expected_install_packages_version_list)
-            if not any(installed_pkg['name'] == pkg and installed_pkg['version'] == ver and installed_pkg['patchInstallationState'] == Constants.INSTALLED for
-                       installed_pkg in installed_packages_list)
-        ]
-        # Return True if all packages are installed, otherwise return False
-        return len(uninstalled_packages_list) == 0
+        print('what is installed_packages_list', installed_packages_list)
+        # Get security and critical packages
+        security_critical_packages = []
+        for package in installed_packages_list:
+            if 'classifications' in package and any(classification in ['Security', 'Critical'] for classification in package['classifications']):
+                security_critical_packages.append(package)
+
+        # Return false there's no security/critical packages
+        if len(security_critical_packages) == 0:
+            return False
+
+        # Check if any security/critical package are not installed
+        for package in security_critical_packages:
+            if package['patchInstallationState'] != Constants.INSTALLED:
+                return False
+
+        # All security/critical packages are installed
+        return True
 
     def __sent_metadata_health_store(self):
         self.composite_logger.log_debug("[PI] Reviewing final healthstore record write. [HealthStoreId={0}][MaintenanceRunId={1}]".format(str(self.execution_config.health_store_id), str(self.execution_config.maintenance_run_id)))

src/core/tests/Test_CoreMain.py

@@ -55,14 +55,10 @@ def mock_os_path_exists(self, patch_to_validate):
 
     def mock_batch_patching_with_packages(self, all_packages, all_package_versions, packages, package_versions, maintenance_window, package_manager):
         """Mock batch_patching to simulate package installation failure, return some packages """
-        # This simulates the first batch attempt failing, returning original packages unchanged
-        # When the retry path kicks in, the package list should be processed and succeed there
         return packages, package_versions, 0, False
 
     def mock_batch_patching_with_no_packages(self, all_packages, all_package_versions, packages, package_versions, maintenance_window, package_manager):
         """Mock batch_patching to simulate package installation failure, return no packages"""
-        # This simulates the first batch attempt failing, returning original packages unchanged
-        # When the retry path kicks in, the package list should be processed and succeed there
         return [], [], 0, False
 
     def test_operation_fail_for_non_autopatching_request(self):