add pr 314 changes

Author: feng-j678

src/core/src/CoreMain.py

@@ -93,15 +93,15 @@ def __init__(self, argv):
                 # setting current operation here, to include patch_installer init within installation actions, ensuring any exceptions during patch_installer init are added in installation summary errors object
                 status_handler.set_current_operation(Constants.INSTALLATION)
                 patch_installer = container.get('patch_installer')
-                patch_installation_successful = patch_installer.start_installation()
+                patch_installation_successful, maintenance_window_exceeded = patch_installer.start_installation()
                 patch_assessment_successful = False
                 patch_assessment_successful = patch_assessor.start_assessment()
 
                 # PatchInstallationSummary to be marked as completed successfully only after the implicit (i.e. 2nd) assessment is completed, as per CRP's restrictions
                 if patch_assessment_successful and patch_installation_successful:
                     patch_installer.mark_installation_completed()
                     overall_patch_installation_operation_successful = True
-                elif patch_installer.set_patch_installation_status_to_warning_from_failed():
+                elif patch_installer.should_patch_installation_status_be_set_to_warning(patch_installation_successful, maintenance_window_exceeded):
                     patch_installer.mark_installation_completed_with_warning()
                     overall_patch_installation_operation_successful = True
                 self.update_patch_substatus_if_pending(patch_operation_requested, overall_patch_installation_operation_successful, patch_assessment_successful, configure_patching_successful, status_handler, composite_logger)

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.__enable_installation_status_to_warning_flag = False
-
     def start_installation(self, simulate=False):
         """ Kick off a patch installation run """
         self.status_handler.set_current_operation(Constants.INSTALLATION)
@@ -126,7 +124,7 @@ 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
 
-        return overall_patch_installation_successful
+        return overall_patch_installation_successful, maintenance_window_exceeded
 
     def write_installer_perf_logs(self, patch_operation_successful, installed_patch_count, retry_count, maintenance_window, maintenance_window_exceeded, task_status, error_msg):
         perc_maintenance_window_used = -1
@@ -827,19 +825,13 @@ def __send_metadata_to_health_store(self):
     # region - Failed packages retry succeeded
     def log_final_installation_metric(self, patch_installation_successful, maintenance_window_exceeded, maintenance_window, installed_update_count):
         """ log final installation operation status. """
-        warning_status = self.__check_installation_status_can_set_to_warning(patch_installation_successful, maintenance_window_exceeded)
+        warning_status = self.should_patch_installation_status_be_set_to_warning(patch_installation_successful, maintenance_window_exceeded)
         if warning_status:
             self.log_final_warning_metric(maintenance_window, installed_update_count)
         else:
             self.log_final_metrics(maintenance_window, patch_installation_successful, maintenance_window_exceeded, installed_update_count)
 
-    def __check_installation_status_can_set_to_warning(self, patch_installation_successful, maintenance_window_exceeded):
+    def should_patch_installation_status_be_set_to_warning(self, patch_installation_successful, maintenance_window_exceeded):
         """ Verify patch installation status can be set to warning from failed. """
-        # type (bool, bool) -> bool
-        self.__enable_installation_status_to_warning_flag = not patch_installation_successful and not maintenance_window_exceeded and self.status_handler.are_all_requested_packages_installed()
-        return self.__enable_installation_status_to_warning_flag
-
-    def set_patch_installation_status_to_warning_from_failed(self):
-        """Access enable_installation_warning_status value"""
-        return self.__enable_installation_status_to_warning_flag
+        return not patch_installation_successful and not maintenance_window_exceeded and self.status_handler.are_all_requested_packages_installed()
     # endregion

src/core/tests/Test_CoreMain.py

@@ -64,7 +64,7 @@ def mock_batch_patching_with_no_packages(self, all_packages, all_package_version
         """Mock batch_patching to simulate package installation failure, return no packages"""
         return [], [], 0, False
 
-    def mock_check_all_requested_packages_install_state(self):
+    def mock_are_all_requested_packages_installed(self):
         return True
 
     def test_operation_fail_for_non_autopatching_request(self):
@@ -1332,11 +1332,11 @@ def test_warning_status_when_packages_initially_fail_but_succeed_on_retry_no_bat
 
         # Store original methods
         original_batch_patching = runtime.patch_installer.batch_patching
-        original_check_all_requested_packages_install_state= runtime.status_handler.are_all_requested_packages_installed
+        original_check_all_requested_packages_install_state = runtime.status_handler.are_all_requested_packages_installed
 
         # Mock batch_patching with packages to return [], [], false
         runtime.patch_installer.batch_patching = self.mock_batch_patching_with_no_packages
-        runtime.status_handler.are_all_requested_packages_installed = self.mock_check_all_requested_packages_install_state
+        runtime.status_handler.are_all_requested_packages_installed = self.mock_are_all_requested_packages_installed
 
         # Run CoreMain to execute the installation
         try:
@@ -1346,7 +1346,7 @@ def test_warning_status_when_packages_initially_fail_but_succeed_on_retry_no_bat
         finally:
             # reset mock
             runtime.patch_installer.batch_patching = original_batch_patching
-            runtime.status_handler.get_installation_packages_list = original_check_all_requested_packages_install_state
+            runtime.status_handler.are_all_requested_packages_installed = original_check_all_requested_packages_install_state
             runtime.stop()
 
     def __check_telemetry_events(self, runtime):
@@ -1363,9 +1363,6 @@ def __assertion_pkg_succeed_on_retry(self, runtime):
         # Check telemetry events
         self.__check_telemetry_events(runtime)
 
-        # If true, set installation status to warning
-        self.assertTrue(runtime.patch_installer.set_patch_installation_status_to_warning_from_failed())
-
         # Check status file
         with runtime.env_layer.file_system.open(runtime.execution_config.status_file_path, 'r') as file_handle:
             substatus_file_data = json.load(file_handle)[0]["status"]["substatus"]