Temporary fix in maintenanceRunId format (#42)

Author: rane-rajasi

src/core/src/core_logic/PatchInstaller.py

@@ -97,7 +97,9 @@ def start_installation(self, simulate=False):
             # update patch metadata in status for auto patching request, to be reported to healthstore
             if self.execution_config.maintenance_run_id is not None:
                 try:
-                    patch_version = str(self.execution_config.maintenance_run_id)
+                    #todo: temp fix to test auto patching, this will be reset to using the maintenanceRunId string as is, once the corresponding changes in RSM are made
+                    # patch_version = str(self.execution_config.maintenance_run_id)
+                    patch_version = datetime.datetime.strptime(self.execution_config.maintenance_run_id.split(" ")[0], "%m/%d/%Y").strftime('%Y.%m.%d')
                     self.status_handler.set_patch_metadata_for_healthstore_substatus_json(patch_version=patch_version if patch_version is not None and patch_version is not "" else Constants.PATCH_VERSION_UNKNOWN,
                                                                                           report_to_healthstore=True,
                                                                                           wait_after_update=False)

src/core/tests/TestCoreMain.py

@@ -88,7 +88,7 @@ def test_operation_success_for_non_autopatching_request(self):
     def test_operation_success_for_autopatching_request(self):
         # test with valid datetime string for maintenance run id
         argument_composer = ArgumentComposer()
-        maintenance_run_id = datetime.datetime.utcnow().strftime("%Y-%m-%dT%H:%M:%S.%fZ")
+        maintenance_run_id = "9/28/2020 02:00:00 PM +00:00"
         argument_composer.maintenance_run_id = str(maintenance_run_id)
         runtime = RuntimeCompositor(argument_composer.get_composed_arguments(), True, Constants.ZYPPER)
         runtime.set_legacy_test_type('SuccessInstallPath')
@@ -103,13 +103,14 @@ def test_operation_success_for_autopatching_request(self):
         self.assertTrue(substatus_file_data[2]["name"] == Constants.PATCH_METADATA_FOR_HEALTHSTORE)
         self.assertTrue(substatus_file_data[2]["status"] == Constants.STATUS_SUCCESS.lower())
         substatus_file_data_patch_metadata_summary = json.loads(substatus_file_data[2]["formattedMessage"]["message"])
-        self.assertEqual(substatus_file_data_patch_metadata_summary["patchVersion"], maintenance_run_id)
+        self.assertEqual(substatus_file_data_patch_metadata_summary["patchVersion"], "2020.09.28")
         self.assertTrue(substatus_file_data_patch_metadata_summary["shouldReportToHealthStore"])
         runtime.stop()
 
-        # test with a random string for maintenance run id
+    def test_invalid_maintenance_run_id(self):
+        # test with empty string for maintenence run id
         argument_composer = ArgumentComposer()
-        maintenance_run_id = "test"
+        maintenance_run_id = ""
         argument_composer.maintenance_run_id = maintenance_run_id
         runtime = RuntimeCompositor(argument_composer.get_composed_arguments(), True, Constants.ZYPPER)
         runtime.set_legacy_test_type('SuccessInstallPath')
@@ -120,18 +121,18 @@ def test_operation_success_for_autopatching_request(self):
         self.assertTrue(substatus_file_data[0]["name"] == Constants.PATCH_ASSESSMENT_SUMMARY)
         self.assertTrue(substatus_file_data[0]["status"] == Constants.STATUS_SUCCESS.lower())
         self.assertTrue(substatus_file_data[1]["name"] == Constants.PATCH_INSTALLATION_SUMMARY)
-        self.assertTrue(substatus_file_data[1]["status"] == Constants.STATUS_SUCCESS.lower())
+        self.assertTrue(substatus_file_data[1]["status"] == Constants.STATUS_TRANSITIONING.lower())
         self.assertTrue(substatus_file_data[2]["name"] == Constants.PATCH_METADATA_FOR_HEALTHSTORE)
         self.assertTrue(substatus_file_data[2]["status"] == Constants.STATUS_SUCCESS.lower())
         substatus_file_data_patch_metadata_summary = json.loads(substatus_file_data[2]["formattedMessage"]["message"])
-        self.assertEqual(substatus_file_data_patch_metadata_summary["patchVersion"], maintenance_run_id)
-        self.assertTrue(substatus_file_data_patch_metadata_summary["shouldReportToHealthStore"])
+        self.assertEqual(substatus_file_data_patch_metadata_summary["patchVersion"], Constants.PATCH_VERSION_UNKNOWN)
+        self.assertFalse(substatus_file_data_patch_metadata_summary["shouldReportToHealthStore"])
         runtime.stop()
 
-    def test_invalid_maintenance_run_id(self):
-        # test with empty string for maintenence run id
+        # todo: This will become a valid success operation run once the temp fix for maintenanceRunId is removed
+        # test with a random string for maintenance run id
         argument_composer = ArgumentComposer()
-        maintenance_run_id = ""
+        maintenance_run_id = "test"
         argument_composer.maintenance_run_id = maintenance_run_id
         runtime = RuntimeCompositor(argument_composer.get_composed_arguments(), True, Constants.ZYPPER)
         runtime.set_legacy_test_type('SuccessInstallPath')
@@ -142,12 +143,12 @@ def test_invalid_maintenance_run_id(self):
         self.assertTrue(substatus_file_data[0]["name"] == Constants.PATCH_ASSESSMENT_SUMMARY)
         self.assertTrue(substatus_file_data[0]["status"] == Constants.STATUS_SUCCESS.lower())
         self.assertTrue(substatus_file_data[1]["name"] == Constants.PATCH_INSTALLATION_SUMMARY)
-        self.assertTrue(substatus_file_data[1]["status"] == Constants.STATUS_SUCCESS.lower())
+        self.assertTrue(substatus_file_data[1]["status"] == Constants.STATUS_TRANSITIONING.lower())
         self.assertTrue(substatus_file_data[2]["name"] == Constants.PATCH_METADATA_FOR_HEALTHSTORE)
         self.assertTrue(substatus_file_data[2]["status"] == Constants.STATUS_SUCCESS.lower())
         substatus_file_data_patch_metadata_summary = json.loads(substatus_file_data[2]["formattedMessage"]["message"])
         self.assertEqual(substatus_file_data_patch_metadata_summary["patchVersion"], Constants.PATCH_VERSION_UNKNOWN)
-        self.assertTrue(substatus_file_data_patch_metadata_summary["shouldReportToHealthStore"])
+        self.assertFalse(substatus_file_data_patch_metadata_summary["shouldReportToHealthStore"])
         runtime.stop()