Updating automaticOSPatchState property name in status and incrementing extension version for a new release (#84)

Author: rane-rajasi

src/core/src/bootstrap/Constants.py

@@ -30,7 +30,7 @@ def __iter__(self):
     UNKNOWN = "Unknown"
 
     # Extension version (todo: move to a different file)
-    EXT_VERSION = "1.6.22"
+    EXT_VERSION = "1.6.23"
 
     # Runtime environments
     TEST = 'Test'
@@ -105,7 +105,7 @@ class AssessmentModes(EnumBackport):
         AUTOMATIC_BY_PLATFORM = "AutomaticByPlatform"
 
     # automatic OS patch states for configure patching
-    class AutomaticOsPatchStates(EnumBackport):
+    class AutomaticOSPatchStates(EnumBackport):
         UNKNOWN = "Unknown"
         DISABLED = "Disabled"
         ENABLED = "Enabled"

src/core/src/core_logic/ConfigurePatchingProcessor.py

@@ -32,7 +32,7 @@ def __init__(self, env_layer, execution_config, composite_logger, telemetry_writ
         self.auto_assess_timer_manager = auto_assess_timer_manager
         self.lifecycle_manager = lifecycle_manager
 
-        self.current_auto_os_patch_state = Constants.AutomaticOsPatchStates.UNKNOWN
+        self.current_auto_os_patch_state = Constants.AutomaticOSPatchStates.UNKNOWN
         self.current_auto_assessment_state = Constants.AutoAssessmentStates.UNKNOWN
         self.configure_patching_successful = True
 
@@ -69,7 +69,7 @@ def __try_set_patch_mode(self):
 
             # disable auto OS updates if VM is configured for platform updates only.
             # NOTE: this condition will be false for Assessment operations, since patchMode is not sent in the API request
-            if self.current_auto_os_patch_state == Constants.AutomaticOsPatchStates.ENABLED and self.execution_config.patch_mode == Constants.PatchModes.AUTOMATIC_BY_PLATFORM:
+            if self.current_auto_os_patch_state == Constants.AutomaticOSPatchStates.ENABLED and self.execution_config.patch_mode == Constants.PatchModes.AUTOMATIC_BY_PLATFORM:
                 self.package_manager.disable_auto_os_update()
 
             self.current_auto_os_patch_state = self.package_manager.get_current_auto_os_patch_state()

src/core/src/package_managers/AptitudePackageManager.py

@@ -373,11 +373,11 @@ def get_current_auto_os_patch_state(self):
         self.composite_logger.log("Fetching the current automatic OS patch state on the machine...")
         self.__get_current_auto_os_updates_setting_on_machine()
         if int(self.unattended_upgrade_value) == 0:
-            return Constants.AutomaticOsPatchStates.DISABLED
+            return Constants.AutomaticOSPatchStates.DISABLED
         elif int(self.unattended_upgrade_value) == 1:
-            return Constants.AutomaticOsPatchStates.ENABLED
+            return Constants.AutomaticOSPatchStates.ENABLED
         else:
-            return Constants.AutomaticOsPatchStates.UNKNOWN
+            return Constants.AutomaticOSPatchStates.UNKNOWN
 
     def __get_current_auto_os_updates_setting_on_machine(self):
         """ Gets all the update settings related to auto OS updates currently set on the machine """

src/core/src/service_interfaces/StatusHandler.py

@@ -383,7 +383,7 @@ def __new_patch_metadata_for_healthstore_json(self, patch_version=Constants.PATC
         }
 
     def set_configure_patching_substatus_json(self, status=Constants.STATUS_TRANSITIONING, code=0,
-                                              automatic_os_patch_state=Constants.AutomaticOsPatchStates.UNKNOWN,
+                                              automatic_os_patch_state=Constants.AutomaticOSPatchStates.UNKNOWN,
                                               auto_assessment_state=Constants.AutoAssessmentStates.UNKNOWN):
         """ Prepare the configure patching substatus json including the message containing configure patching summary """
         self.composite_logger.log_debug("Setting configure patching substatus. [Substatus={0}]".format(str(status)))
@@ -407,7 +407,7 @@ def __new_configure_patching_summary_json(self, automatic_os_patch_state, auto_a
             "activityId": str(self.execution_config.activity_id),
             "startTime": str(self.execution_config.start_time),
             "lastModifiedTime": str(self.env_layer.datetime.timestamp()),
-            "automaticOsPatchState": automatic_os_patch_state,
+            "automaticOSPatchState": automatic_os_patch_state,
             "autoAssessmentStatus": {
                 "autoAssessmentState": auto_assessment_state,
                 "errors": self.__set_errors_json(self.__configure_patching_auto_assessment_error_count, self.__configure_patching_auto_assessment_errors)
@@ -670,7 +670,7 @@ def add_error_to_status(self, message, error_code=Constants.PatchOperationErrorC
 
             # retain previously set status, code, patchMode and M for configure patching substatus
             if self.__configure_patching_substatus_json is not None:
-                automatic_os_patch_state = json.loads(self.__configure_patching_substatus_json["formattedMessage"]["message"])["automaticOsPatchState"]
+                automatic_os_patch_state = json.loads(self.__configure_patching_substatus_json["formattedMessage"]["message"])["automaticOSPatchState"]
                 auto_assessment_status = self.__json_try_get_key_value(self.__configure_patching_substatus_json["formattedMessage"]["message"],"autoAssessmentStatus","{}")
                 auto_assessment_state = self.__json_try_get_key_value(json.dumps(auto_assessment_status), "autoAssessmentState", Constants.AutoAssessmentStates.UNKNOWN)
                 self.set_configure_patching_substatus_json(status=self.__configure_patching_substatus_json["status"], code=self.__configure_patching_substatus_json["code"],

src/core/tests/Test_ConfigurePatchingProcessor.py

@@ -70,7 +70,7 @@ def test_operation_success_for_configure_patching_request_for_apt(self):
         self.assertTrue(substatus_file_data[0]["name"] == Constants.CONFIGURE_PATCHING_SUMMARY)
         self.assertTrue(substatus_file_data[0]["status"].lower() == Constants.STATUS_SUCCESS.lower())
         message = json.loads(substatus_file_data[0]["formattedMessage"]["message"])
-        self.assertEqual(message["automaticOsPatchState"], Constants.AutomaticOsPatchStates.DISABLED)
+        self.assertEqual(message["automaticOSPatchState"], Constants.AutomaticOSPatchStates.DISABLED)
 
         # check status file for configure patching assessment state
         message = json.loads(substatus_file_data[0]["formattedMessage"]["message"])
@@ -205,7 +205,7 @@ def test_configure_patching_with_assessment_mode_by_platform(self):
         self.assertTrue(substatus_file_data[0]["name"] == Constants.CONFIGURE_PATCHING_SUMMARY)
         self.assertTrue(substatus_file_data[0]["status"].lower() == Constants.STATUS_SUCCESS.lower())
         message = json.loads(substatus_file_data[0]["formattedMessage"]["message"])
-        self.assertEqual(message["automaticOsPatchState"], Constants.AutomaticOsPatchStates.ENABLED)  # no change is made on Auto OS updates for patch mode 'ImageDefault'
+        self.assertEqual(message["automaticOSPatchState"], Constants.AutomaticOSPatchStates.ENABLED)  # no change is made on Auto OS updates for patch mode 'ImageDefault'
 
         # check status file for configure patching assessment state
         message = json.loads(substatus_file_data[0]["formattedMessage"]["message"])
@@ -248,7 +248,7 @@ def test_configure_patching_with_patch_mode_and_assessment_mode_by_platform(self
         self.assertTrue(substatus_file_data[0]["name"] == Constants.CONFIGURE_PATCHING_SUMMARY)
         self.assertTrue(substatus_file_data[0]["status"].lower() == Constants.STATUS_SUCCESS.lower())
         message = json.loads(substatus_file_data[0]["formattedMessage"]["message"])
-        self.assertEqual(message["automaticOsPatchState"], Constants.AutomaticOsPatchStates.DISABLED)  # auto OS updates are disabled on patch mode 'AutomaticByPlatform'
+        self.assertEqual(message["automaticOSPatchState"], Constants.AutomaticOSPatchStates.DISABLED)  # auto OS updates are disabled on patch mode 'AutomaticByPlatform'
 
         # check status file for configure patching assessment state
         message = json.loads(substatus_file_data[0]["formattedMessage"]["message"])

src/core/tests/Test_CoreMain.py

@@ -457,7 +457,7 @@ def test_auto_assessment_success_with_configure_patching_in_prev_operation_on_sa
         self.assertTrue(substatus_file_data[0]["status"].lower() == Constants.STATUS_SUCCESS.lower())
         # check status file for configure patching auto updates state
         message = json.loads(substatus_file_data[0]["formattedMessage"]["message"])
-        self.assertEqual(message["automaticOsPatchState"], Constants.AutomaticOsPatchStates.DISABLED)  # auto OS updates are disabled in RuntimeCompositor
+        self.assertEqual(message["automaticOSPatchState"], Constants.AutomaticOSPatchStates.DISABLED)  # auto OS updates are disabled in RuntimeCompositor
         # check status file for configure patching assessment state
         message = json.loads(substatus_file_data[0]["formattedMessage"]["message"])
         self.assertEqual(message["autoAssessmentStatus"]["autoAssessmentState"], Constants.AutoAssessmentStates.ENABLED)  # auto assessment is enabled
@@ -490,7 +490,7 @@ def test_auto_assessment_success_with_configure_patching_in_prev_operation_on_sa
         self.assertTrue(substatus_file_data[1]["name"] == Constants.CONFIGURE_PATCHING_SUMMARY)
         self.assertTrue(substatus_file_data[1]["status"].lower() == Constants.STATUS_SUCCESS.lower())
         message = json.loads(substatus_file_data[1]["formattedMessage"]["message"])
-        self.assertEqual(message["automaticOsPatchState"], Constants.AutomaticOsPatchStates.DISABLED)  # auto OS updates are disabled in RuntimeCompositor
+        self.assertEqual(message["automaticOSPatchState"], Constants.AutomaticOSPatchStates.DISABLED)  # auto OS updates are disabled in RuntimeCompositor
         # check status file for configure patching assessment state
         message = json.loads(substatus_file_data[1]["formattedMessage"]["message"])
         self.assertEqual(message["autoAssessmentStatus"]["autoAssessmentState"], Constants.AutoAssessmentStates.ENABLED)  # auto assessment is enabled
@@ -521,7 +521,7 @@ def test_auto_assessment_success_with_assessment_in_prev_operation_on_same_seque
         self.assertTrue(substatus_file_data[1]["status"].lower() == Constants.STATUS_SUCCESS.lower())
         # check status file for configure patching auto updates state
         message = json.loads(substatus_file_data[1]["formattedMessage"]["message"])
-        self.assertEqual(message["automaticOsPatchState"], Constants.AutomaticOsPatchStates.DISABLED)  # auto OS updates are disabled in RuntimeCompositor
+        self.assertEqual(message["automaticOSPatchState"], Constants.AutomaticOSPatchStates.DISABLED)  # auto OS updates are disabled in RuntimeCompositor
         # check status file for configure patching assessment state
         message = json.loads(substatus_file_data[1]["formattedMessage"]["message"])
         self.assertEqual(message["autoAssessmentStatus"]["autoAssessmentState"], Constants.AutoAssessmentStates.UNKNOWN)  # Configure patching for auto assessment did not execute since assessmentMode was not in input
@@ -556,7 +556,7 @@ def test_auto_assessment_success_with_assessment_in_prev_operation_on_same_seque
         self.assertTrue(substatus_file_data[1]["status"].lower() == Constants.STATUS_SUCCESS.lower())
         # check status file for configure patching auto updates state
         message = json.loads(substatus_file_data[1]["formattedMessage"]["message"])
-        self.assertEqual(message["automaticOsPatchState"], Constants.AutomaticOsPatchStates.DISABLED)  # auto OS updates are disabled in RuntimeCompositor
+        self.assertEqual(message["automaticOSPatchState"], Constants.AutomaticOSPatchStates.DISABLED)  # auto OS updates are disabled in RuntimeCompositor
         # check status file for configure patching assessment state
         message = json.loads(substatus_file_data[1]["formattedMessage"]["message"])
         self.assertEqual(message["autoAssessmentStatus"]["autoAssessmentState"], Constants.AutoAssessmentStates.UNKNOWN)  # Configure patching for auto assessment did not execute since assessmentMode was not in input
@@ -595,7 +595,7 @@ def test_auto_assessment_success_with_installation_in_prev_operation_on_same_seq
         self.assertTrue(substatus_file_data[3]["status"].lower() == Constants.STATUS_SUCCESS.lower())
         # check status file for configure patching auto updates state
         message = json.loads(substatus_file_data[3]["formattedMessage"]["message"])
-        self.assertEqual(message["automaticOsPatchState"], Constants.AutomaticOsPatchStates.DISABLED)  # auto OS updates are disabled in RuntimeCompositor, this is tested in Test-ConfigurePatchingProcessor
+        self.assertEqual(message["automaticOSPatchState"], Constants.AutomaticOSPatchStates.DISABLED)  # auto OS updates are disabled in RuntimeCompositor, this is tested in Test-ConfigurePatchingProcessor
         # check status file for configure patching assessment state
         message = json.loads(substatus_file_data[3]["formattedMessage"]["message"])
         self.assertEqual(message["autoAssessmentStatus"]["autoAssessmentState"], Constants.AutoAssessmentStates.UNKNOWN)  # Configure patching for auto assessment did not execute since assessmentMode was not in input
@@ -637,7 +637,7 @@ def test_auto_assessment_success_with_installation_in_prev_operation_on_same_seq
         self.assertTrue(substatus_file_data[3]["status"].lower() == Constants.STATUS_SUCCESS.lower())
         # check status file for configure patching auto updates state
         message = json.loads(substatus_file_data[3]["formattedMessage"]["message"])
-        self.assertEqual(message["automaticOsPatchState"], Constants.AutomaticOsPatchStates.DISABLED)  # auto OS updates are disabled in RuntimeCompositor
+        self.assertEqual(message["automaticOSPatchState"], Constants.AutomaticOSPatchStates.DISABLED)  # auto OS updates are disabled in RuntimeCompositor
         # check status file for configure patching assessment state
         message = json.loads(substatus_file_data[3]["formattedMessage"]["message"])
         self.assertEqual(message["autoAssessmentStatus"]["autoAssessmentState"], Constants.AutoAssessmentStates.UNKNOWN)  # Configure patching for auto assessment did not execute since assessmentMode was not in input

src/core/tests/library/RuntimeCompositor.py

@@ -142,7 +142,7 @@ def check_sudo_status(self, raise_if_not_sudo=True):
         return True
 
     def get_current_auto_os_patch_state(self):
-        return Constants.AutomaticOsPatchStates.DISABLED
+        return Constants.AutomaticOSPatchStates.DISABLED
 
     def mock_urlopen(url, data=None, timeout=socket._GLOBAL_DEFAULT_TIMEOUT, cafile=None, capath=None, cadefault=False, context=None):
         resp = urlreq.addinfourl(StringIO("mock file"), "mock message", "mockurl")

src/extension/src/Constants.py

@@ -28,7 +28,7 @@ def __iter__(self):
                         yield item
 
     # Extension version (todo: move to a different file)
-    EXT_VERSION = "1.6.22"
+    EXT_VERSION = "1.6.23"
 
     # Runtime environments
     TEST = 'Test'

src/extension/src/manifest.xml

@@ -2,7 +2,7 @@
 <ExtensionImage xmlns="http://schemas.microsoft.com/windowsazure">
   <ProviderNameSpace>Microsoft.CPlat.Core</ProviderNameSpace>
   <Type>LinuxPatchExtension</Type>
-  <Version>1.6.22</Version>
+  <Version>1.6.23</Version>
   <Label>Microsoft Azure VM InGuest Patch Extension for Linux Virtual Machines</Label>
   <HostingResources>VmRole</HostingResources>
   <MediaLink></MediaLink>