[Livepatching][MVP] Completing all items earlier marked as todo

Author: rane-rajasi

src/core/src/package_managers/AptitudePackageManager.py

@@ -858,15 +858,17 @@ def are_livepatch_prereq_met(self):
         These pre-reqs are: Machine should be attached to a pro subscription and livepatch service should be enabled on the VM. """
         self.composite_logger.log_debug("[APM] Checking if all the pre-reqs to receive livepatches are met. NOTE: Livepatches is only available on Ubuntu LTS paid pro VMs and has to be in enabled state")
         if not self.ubuntu_pro_client.is_livepatching_applicable_for_machine():
-            self.composite_logger.log_warning("[APM] Livepatching is not applicable for this machine, hence no livepatches will be installed")
+            error_message = "[APM] Livepatching is not applicable for this machine, hence no livepatches will be installed"
+            self.composite_logger.log_error(error_message)
+            self.status_handler.add_error_to_status(error_message, Constants.PatchOperationErrorCodes.LIVEPATCH_ERROR)
             return False
-            # todo: add to error?
 
         if not self.ubuntu_pro_client.is_livepatch_service_enabled_on_machine():
-            self.composite_logger.log_warning("[APM] Livepatch service is not enabled on this machine, hence no livepatches will be installed."
-                " Please enable livepatch service if you want AzGPS to apply livepatches on this machine")
+            error_message = ("[APM] Livepatch service is not enabled on this machine, hence no livepatches will be installed."
+                             " Please enable livepatch service if you want AzGPS to apply livepatches on this machine")
+            self.composite_logger.log_error(error_message)
+            self.status_handler.add_error_to_status(error_message, Constants.PatchOperationErrorCodes.LIVEPATCH_ERROR)
             return False
-            # todo: add to error?
 
         self.composite_logger.log_debug("[APM] All Livepatch pre-reqs are met. VM is eligible to receive livepatches")
         return True
@@ -937,11 +939,13 @@ def try_get_livepatch_status(self):
                 livepatch_status = json.loads(output)
                 self.composite_logger.log_debug("[APM] Successfully fetched livepatch status. [Status={0}]".format(str(livepatch_status)))
             else:
-                self.composite_logger.log_warning("[APM] Failed to fetch livepatch status. [Cmd={0}][Code={1}][Output={2}]".format(str(cmd), str(code), str(output)))
-                # todo: add to error object?
+                error_msg = "[APM] Failed to fetch livepatch status. [Cmd={0}][Code={1}][Output={2}]".format(str(cmd), str(code), str(output))
+                self.composite_logger.log_error(error_msg)
+                self.status_handler.add_error_to_status(error_msg, Constants.PatchOperationErrorCodes.LIVEPATCH_ERROR)
         except Exception as error:
-            livepatch_status_fetch_exception = repr(error) # todo: applies everywhere, see if this should be logged as error in status blob. If not, refactor code
-            self.composite_logger.log_warning("[APM] Exception while fetching livepatch status. [Cmd={0}][Exception={1}]".format(str(cmd), livepatch_status_fetch_exception))
+            error_msg = "[APM] Exception while fetching livepatch status. [Cmd={0}][Exception={1}]".format(str(cmd), repr(error))
+            self.composite_logger.log_error(error_msg)
+            self.status_handler.add_error_to_status(error_msg, Constants.PatchOperationErrorCodes.LIVEPATCH_ERROR)
         return livepatch_status
 
     def update_livepatch_status_in_patch_installation_summary(self, livepatch_status):

src/core/tests/Test_AptitudePackageManager.py

@@ -1085,15 +1085,24 @@ def test_are_livepatch_prereq_met_success(self):
     def test_are_livepatch_prereq_met_failure(self):
         package_manager = self.__setup_package_manager()
         self.assertIsNotNone(package_manager)
+        self.runtime.status_handler.set_current_operation(Constants.INSTALLATION)
 
         # VM is not attached
         package_manager.ubuntu_pro_client.is_ubuntu_pro_client_attached = False
         self.assertFalse(package_manager.are_livepatch_prereq_met())
+        substatus_file_data = self.__get_substatus_from_status_file()[0]
+        errors = json.loads(substatus_file_data["formattedMessage"]["message"])["errors"]
+        self.assertNotEqual(errors, None)
+        self.assertTrue("Livepatching is not applicable for this machine" in str(errors))
 
         #VM is attached but livepatch service not enabled
         package_manager = self.__setup_package_manager(legacy_type='SadPath')
         package_manager.ubuntu_pro_client.is_ubuntu_pro_client_attached = True
         self.assertFalse(package_manager.are_livepatch_prereq_met())
+        substatus_file_data = self.__get_substatus_from_status_file()[0]
+        updated_errors = json.loads(substatus_file_data["formattedMessage"]["message"])["errors"]
+        self.assertNotEqual(updated_errors, None)
+        self.assertTrue("Livepatch service is not enabled on this machine" in str(updated_errors))
 
     def test_try_set_livepatch_cutoff_date_in_config_success(self):
         package_manager = self.__setup_package_manager()
@@ -1141,13 +1150,23 @@ def test_try_get_livepatch_status_success(self):
 
     def test_try_get_livepatch_status_failure(self):
         package_manager = self.__setup_package_manager(legacy_type='SadPath')
+        self.runtime.status_handler.set_current_operation(Constants.INSTALLATION)
         self.assertEqual(package_manager.try_get_livepatch_status(), {})
+        substatus_file_data = self.__get_substatus_from_status_file()[0]
+        errors = json.loads(substatus_file_data["formattedMessage"]["message"])["errors"]
+        self.assertNotEqual(errors, None)
+        self.assertTrue("Failed to fetch livepatch status." in str(errors))
 
     def test_try_get_livepatch_status_exception_path(self):
         package_manager = self.__setup_package_manager()
+        self.runtime.status_handler.set_current_operation(Constants.INSTALLATION)
         backup_run_command_output = package_manager.env_layer.run_command_output
         package_manager.env_layer.run_command_output = self.mock_run_command_output_raise_exception
         self.assertEqual(package_manager.try_get_livepatch_status(), {})
+        substatus_file_data = self.__get_substatus_from_status_file()[0]
+        errors = json.loads(substatus_file_data["formattedMessage"]["message"])["errors"]
+        self.assertNotEqual(errors, None)
+        self.assertTrue("Exception while fetching livepatch status" in str(errors))
         package_manager.env_layer.run_command_output = backup_run_command_output
 
     def test_update_livepatch_status_in_patch_installation_summary_success(self):
@@ -1240,7 +1259,10 @@ def test_start_livepatch_when_pre_req_not_met(self):
 
         package_manager.start_livepatch()
         substatus_file_data = self.__get_substatus_from_status_file()
-        self.assertEqual(len(substatus_file_data), 0)
+        self.assertEqual(len(substatus_file_data), 1)
+        errors = json.loads(substatus_file_data[0]["formattedMessage"]["message"])["errors"]
+        self.assertNotEqual(errors, None)
+        self.assertTrue("Livepatch service is not enabled on this machine" in str(errors))
 
     def test_start_livepatch_when_livepatch_config_date_not_set(self):
         # cmd to set config date in livepatch service failed. So livepatch client is not launched and status not updated with livepatch data