update distro name for ACL as azurecontainerlinux in waagent

Signed-off-by: Mayank Singh <mayankfz@gmail.com>

Author: mayankfz

azurelinuxagent/common/osutil/factory.py

@@ -149,8 +149,8 @@ def _get_osutil(distro_name, distro_code_name, distro_version, distro_full_name)
 
     # distro_name is same for azurelinux/mariner and Azure Container Linux (ACL).
     # ACL is a flavor of Azure Linux, differentiation is based on distro_full_name.
-    # For Azure Container Linux, distro_name is "azurelinux" and distro_full_name is "Microsoft Azure Container Linux".
-    if distro_name == "azurelinux" and distro_full_name == "Microsoft Azure Container Linux":
+    # For Azure Container Linux, distro_name will be made "azurecontainerlinux".
+    if distro_name == "azurecontainerlinux":
         return AclOSUtil()
 
     if distro_name in ["mariner", "azurelinux"]:

azurelinuxagent/common/version.py

@@ -137,6 +137,14 @@ def get_distro():
     if os.path.exists("/etc/mariner-release"):
         osinfo[0] = "mariner"
 
+    if os.path.exists("/etc/os-release"):
+        try:
+            with open("/etc/os-release", "r") as f:
+                if re.search(r'^VARIANT_ID=azurecontainerlinux$', f.read(), re.MULTILINE):
+                    osinfo[0] = "azurecontainerlinux"
+        except Exception:
+            pass
+
     # The platform.py lib has issue with detecting BIG-IP linux distribution.
     # Merge the following patch provided by F5.
     if os.path.exists("/shared/vadc"):

setup.py

@@ -164,7 +164,7 @@ def get_data_files(name, version, fullname):  # pylint: disable=R0912
                        src=["config/clearlinux/waagent.conf"])
         set_systemd_files(data_files, dest=systemd_dir_path,
                           src=["init/clearlinux/waagent.service"])
-    elif name == 'azurelinux' and fullname == "Microsoft Azure Container Linux":
+    elif name == 'azurecontainerlinux':
         set_bin_files(data_files, dest=agent_bin_path)
         set_logrotate_files(data_files)
         set_conf_files(data_files, dest="/etc",

tests/common/osutil/test_factory.py

@@ -160,7 +160,7 @@ def test_get_osutil_it_should_return_coreos(self):
         self.assertEqual(ret.get_service_name(), "waagent")
 
     def test_get_osutil_it_should_return_acl(self):
-        ret = _get_osutil(distro_name="azurelinux",
+        ret = _get_osutil(distro_name="azurecontainerlinux",
                           distro_code_name="",
                           distro_version="3.0",
                           distro_full_name="Microsoft Azure Container Linux")