Import patches-applied version 2.1.2-0ubuntu1 to applied/ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: f6e3f158c2fb9021b37654ea20839ec7a4308d52
Unapplied parent: f4e6aca60e419eafbdf11bdd631d35cf785735ae

New changelog entries:
  * New upstream release (LP: #1523715):
    - Bug fixes for Ubuntu 15.10 on Azure
    - Enablement for Azure Stack
    - Dropped patch for systemd job as upstream now includes it.

1 files changed, 3 insertions, 18 deletions

diff --git a/azurelinuxagent/distro/default/run.py b/azurelinuxagent/distro/default/run.py
index 13880b4..dfd3b03 100644
--- a/azurelinuxagent/distro/default/run.py
+++ b/azurelinuxagent/distro/default/run.py
@@ -1,4 +1,4 @@
-# Windows Azure Linux Agent
+# Microsoft Azure Linux Agent
 #
 # Copyright 2014 Microsoft Corporation
 #
@@ -27,8 +27,8 @@ from azurelinuxagent.metadata import AGENT_LONG_NAME, AGENT_VERSION, \
                                      DISTRO_NAME, DISTRO_VERSION, \
                                      DISTRO_FULL_NAME, PY_VERSION_MAJOR, \
                                      PY_VERSION_MINOR, PY_VERSION_MICRO
-import azurelinuxagent.protocol as prot
 import azurelinuxagent.event as event
+import azurelinuxagent.protocol as prot
 from azurelinuxagent.utils.osutil import OSUTIL
 import azurelinuxagent.utils.fileutil as fileutil
 
@@ -65,22 +65,7 @@ class MainHandler(object):
 
         protocol = prot.FACTORY.get_default_protocol()
         while True:
-
             #Handle extensions
-            h_status_list = self.handlers.extension_handler.process()
-
-            #Report status
-            vm_status = prot.VMStatus()
-            vm_status.vmAgent.agentVersion = AGENT_LONG_NAME
-            vm_status.vmAgent.status = "Ready"
-            vm_status.vmAgent.message = "Guest Agent is running"
-            for h_status in h_status_list:
-                vm_status.extensionHandlers.append(h_status)
-            try:
-                logger.info("Report vm status")
-                protocol.report_status(vm_status)
-            except prot.ProtocolError as e:
-                logger.error("Failed to report vm status: {0}", e)
-
+            self.handlers.ext_handlers_handler.process()
             time.sleep(25)