Bug fixes: in ConfigurePatching error reporting and disabling auto updates in yum via packagekit (#98)

* Fixing bugs in Configure Patching error reporting and disable auto updates for PackageKit in YUM

* Addresing PR feedback

Author: rane-rajasi

src/core/src/core_logic/ConfigurePatchingProcessor.py

@@ -73,9 +73,9 @@ def __try_set_patch_mode(self):
 
             self.current_auto_os_patch_state = self.package_manager.get_current_auto_os_patch_state()
 
-            if self.current_auto_os_patch_state == Constants.AutomaticOSPatchStates.UNKNOWN:
+            if self.execution_config.patch_mode == Constants.PatchModes.AUTOMATIC_BY_PLATFORM and self.current_auto_os_patch_state == Constants.AutomaticOSPatchStates.UNKNOWN:
                 # NOTE: only sending details in error objects for customer visibility on why patch state is unknown, overall configurepatching status will remain successful
-                self.__report_consolidated_configure_patch_status(error="Extension attempted but could not disable some of the auto OS update service. Please check if the auto OS services are configured correctly")
+                self.__report_consolidated_configure_patch_status(error="Extension attempted but could not disable one or more automatic OS update services. Please check if the auto OS services are configured correctly")
             else:
                 self.__report_consolidated_configure_patch_status()
 
@@ -128,8 +128,6 @@ def __report_consolidated_configure_patch_status(self, status=Constants.STATUS_T
             error_msg = 'Error: ' + repr(error)
             self.composite_logger.log_error(error_msg)
             self.status_handler.add_error_to_status(error_msg, Constants.PatchOperationErrorCodes.DEFAULT_ERROR)
-            if Constants.ERROR_ADDED_TO_STATUS not in repr(error):
-                error.args = (error.args, "[{0}]".format(Constants.ERROR_ADDED_TO_STATUS))
 
         # write consolidated status
         self.status_handler.set_configure_patching_substatus_json(status=status,

src/core/src/package_managers/YumPackageManager.py

@@ -583,19 +583,19 @@ def disable_auto_os_update_for_packagekit(self):
         #todo: uncomment after finding the correct value
         # self.update_os_patch_configuration_sub_setting(self.download_updates_identifier_text, "false", self.packagekit_config_pattern_match_text)
         self.update_os_patch_configuration_sub_setting(self.apply_updates_identifier_text, "false", self.packagekit_config_pattern_match_text)
-        self.disable_auto_update_on_reboot(self.dnf_automatic_disable_on_reboot_cmd)
+        self.disable_auto_update_on_reboot(self.packagekit_disable_on_reboot_cmd)
 
-        self.composite_logger.log("Successfully disabled auto OS updates using dnf-automatic")
+        self.composite_logger.log("Successfully disabled auto OS updates using packagekit")
 
     def is_service_set_to_enable_on_reboot(self, command):
         """ Checking if auto update is enable_on_reboot on the machine. An enable_on_reboot service will be activated (if currently inactive) on machine reboot """
         self.composite_logger.log_debug("Checking if auto update service is set to enable on reboot...")
         code, out = self.env_layer.run_command_output(command, False, False)
         self.composite_logger.log_debug(" - Code: " + str(code) + ", Output: \n|\t" + "\n|\t".join(out.splitlines()))
         if len(out.strip()) > 0 and code == 0 and 'enabled' in out:
-            self.composite_logger.log_debug("Auto OS update will enable on reboot")
+            self.composite_logger.log_debug("Auto OS update service will enable on reboot")
             return True
-        self.composite_logger.log_debug("Auto OS update will NOT enable on reboot")
+        self.composite_logger.log_debug("Auto OS update service will NOT enable on reboot")
         return False
 
     def backup_image_default_patch_configuration_if_not_exists(self):
@@ -721,7 +721,6 @@ def __get_current_auto_os_updates_setting_on_machine(self):
 
             # get install state
             if not self.is_auto_update_service_installed(self.install_check_cmd):
-                self.composite_logger.log_debug("Auto OS service is not installed on the machine")
                 return is_service_installed, enable_on_reboot_value, download_updates_value, apply_updates_value
 
             is_service_installed = True
@@ -806,10 +805,10 @@ def is_auto_update_service_installed(self, install_check_cmd):
         code, out = self.env_layer.run_command_output(install_check_cmd, False, False)
         self.composite_logger.log_debug(" - Code: " + str(code) + ", Output: \n|\t" + "\n|\t".join(out.splitlines()))
         if len(out.strip()) > 0 and code == 0:
-            self.composite_logger.log_debug("Auto OS update is installed on the machine")
+            self.composite_logger.log_debug("Auto OS update service is installed on the machine")
             return True
         else:
-            self.composite_logger.log_debug("Auto OS update is NOT installed on the machine")
+            self.composite_logger.log_debug("Auto OS update service is NOT installed on the machine")
             return False
 
     # endregion