Import patches-unapplied version 2.1.3-0ubuntu1 to ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: 53f54030cae2de3d5fa474a61fe51f16c7a07c79

New changelog entries:
  * New upstream release (LP: #1543359):
    - Bug fixes for extension handling
    - Feature enablement for AzureStack.

1 files changed, 11 insertions, 8 deletions

diff --git a/azurelinuxagent/distro/suse/loader.py b/azurelinuxagent/distro/suse/distro.py
index b01384b..5b39369 100644
--- a/azurelinuxagent/distro/suse/loader.py
+++ b/azurelinuxagent/distro/suse/distro.py
@@ -17,13 +17,16 @@
 # Requires Python 2.4+ and Openssl 1.0+
 #
 
-from azurelinuxagent.metadata import DISTRO_NAME, DISTRO_VERSION, DISTRO_FULL_NAME
+from azurelinuxagent.distro.default.distro import DefaultDistro
+from azurelinuxagent.distro.suse.osutil import SUSE11OSUtil, SUSEOSUtil
 
-def get_osutil():
-    from azurelinuxagent.distro.suse.osutil import SUSE11OSUtil, SUSEOSUtil
-    if DISTRO_FULL_NAME=='SUSE Linux Enterprise Server' and DISTRO_VERSION < '12' \
-            or DISTRO_FULL_NAME == 'openSUSE' and DISTRO_VERSION < '13.2':
-        return SUSE11OSUtil()
-    else:
-        return SUSEOSUtil()
+class SUSE11Distro(DefaultDistro):
+    def __init__(self):
+        super(SUSE11Distro, self).__init__()
+        self.osutil = SUSE11OSUtil()
+
+class SUSEDistro(DefaultDistro):
+    def __init__(self):
+        super(SUSEDistro, self).__init__()
+        self.osutil = SUSEOSUtil()