AzureLinux Strict SDP support: Resolving merge conflicts

Author: rane-rajasi

src/core/src/bootstrap/Constants.py

@@ -31,7 +31,7 @@ def __iter__(self):
     UNKNOWN = "Unknown"
 
     # Extension version (todo: move to a different file)
-    EXT_VERSION = "1.6.60"
+    EXT_VERSION = "1.6.62"
 
     # Runtime environments
     TEST = 'Test'

src/core/src/bootstrap/EnvLayer.py

@@ -135,8 +135,9 @@ def get_env_var(self, var_name, raise_if_not_success=False):
             print("Error occurred while getting environment variable [Variable={0}][Exception={1}]".format(str(var_name), repr(error)))
             if raise_if_not_success:
                 raise
+            return None
 
-    def run_command_output(self, cmd, no_output, chk_err=True):
+    def run_command_output(self, cmd, no_output=False, chk_err=True):
         # type: (str, bool, bool) -> (int, any)
         """ Wrapper for subprocess.check_output. Execute 'cmd'. Returns return code and STDOUT, trapping expected exceptions. Reports exceptions to Error if chk_err parameter is True """
 
@@ -185,7 +186,7 @@ def __str__(self):
             output = subprocess.check_output(no_output, cmd, stderr=subprocess.STDOUT, shell=True)
         except subprocess.CalledProcessError as e:
             if chk_err:
-                print("Error: CalledProcessError. [Code={0}][Command={1}][Result={2}]".format(str(e.returncode), e.cmd, self.__convert_process_output_to_ascii(e.output[:-1])), file=sys.stdout)
+                print("Error: CalledProcessError. [Code={0}][Command={1}][Result={2}]".format(str(e.return_code), e.cmd, self.__convert_process_output_to_ascii(e.output[:-1])), file=sys.stdout)
             if no_output:
                 return e.return_code, None
             else:

src/core/src/core_logic/RebootManager.py

@@ -142,8 +142,8 @@ def __start_reboot(self, message="Azure VM Guest Patching initiated a reboot as
 
             # Keep logging to indicate machine hasn't rebooted yet. If successful, this will be the last log we see from this process.
             if elapsed_time_in_minutes < max_allowable_time_to_reboot_in_minutes:
-                self.__reboot_wait_pulse(int(elapsed_time_in_minutes), int(max_allowable_time_to_reboot_in_minutes),
-                                         maintenance_window_allowable_limit_remaining_in_minutes = int(maintenance_window_available_time_in_minutes - elapsed_time_in_minutes))
+                self.__reboot_wait_pulse(elapsed_time_in_minutes = int(elapsed_time_in_minutes), max_allowable_time_to_reboot_in_minutes = int(max_allowable_time_to_reboot_in_minutes),
+                                         maintenance_window_allowable_limit_remaining = int(maintenance_window_available_time_in_minutes - elapsed_time_in_minutes))
                 continue
 
             # If we get here, the machine has not rebooted in the time we expected. We need to fail the operation.

src/core/tests/Test_Bootstrapper.py

@@ -28,8 +28,6 @@
 
 
 class TestBootstrapper(unittest.TestCase):
-    # def __init__(self, methodName: str = "runTest"):
-    #     super().__init__(methodName)
 
     def setUp(self):
         self.sudo_check_status_attempts = 0

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.60"
+    EXT_VERSION = "1.6.62"
 
     # Runtime environments
     TEST = 'Test'

src/extension/src/EnvLayer.py

@@ -97,7 +97,7 @@ def __str__(self):
                 no_output, cmd, stderr=subprocess.STDOUT, shell=True)
         except subprocess.CalledProcessError as e:
             if chk_err:
-                print("Error: CalledProcessError.  Error Code is: " + str(e.returncode), file=sys.stdout)
+                print("Error: CalledProcessError.  Error Code is: " + str(e.return_code), file=sys.stdout)
                 print("Error: CalledProcessError.  Command string was: " + e.cmd, file=sys.stdout)
                 print("Error: CalledProcessError.  Command result was: " + self.__convert_process_output_to_ascii(e.output[:-1]), file=sys.stdout)
             if no_output:

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.60</Version>
+  <Version>1.6.62</Version>
   <Label>Microsoft Azure VM InGuest Patch Extension for Linux Virtual Machines</Label>
   <HostingResources>VmRole</HostingResources>
   <MediaLink></MediaLink>