Reapply "update distro name to match os-release"

This reverts commit 198ad10.

Author: Mayank Singh

azurelinuxagent/common/osutil/acl.py

@@ -47,20 +47,20 @@ def conf_sshd(self, disable_password):
             snippet_file = os.path.join(snippet_dir, "80-acl-walinuxagent.conf")
             option = "no" if disable_password else "yes"
             lines = [
-                f"PasswordAuthentication {option}",
-                f"ChallengeResponseAuthentication {option}",
-                f"ClientAliveInterval {str(conf.get_ssh_client_alive_interval())}"
+                "PasswordAuthentication {0}".format(option),
+                "ChallengeResponseAuthentication {0}".format(option),
+                "ClientAliveInterval {0}".format(conf.get_ssh_client_alive_interval())
             ]
             fileutil.write_file(snippet_file, "\n".join(lines))
             logger.info("Added SSH config snippet {0} for ACL".format(snippet_file))
         else:
             # If snippets are unavailable, fall back to base behavior (ensuring file is not a symlink).
             conf_file_path = conf.get_sshd_conf_file_path()
-            conf_file_path2 = f"{conf_file_path}.wal.tmp"
+            conf_file_path2 = "{0}.wal.tmp".format(conf_file_path)
             shutil.copy(conf_file_path, conf_file_path2)
             os.remove(conf_file_path)
             os.rename(conf_file_path2, conf_file_path)
-            super(CoreosCommonUtil, self).conf_sshd(disable_password)
+            super(AclUtil, self).conf_sshd(disable_password)
 
     def restart_if(self, ifname, retries=3, wait=5):
         """

azurelinuxagent/common/osutil/coreos.py

@@ -17,7 +17,6 @@
 #
 
 import os
-from azurelinuxagent.common.utils import shellutil
 from azurelinuxagent.common.osutil.coreoscommon import CoreosCommonUtil
 
 

azurelinuxagent/common/osutil/coreoscommon.py

@@ -32,7 +32,7 @@ def is_dhcp_enabled(self):
     def start_network(self):
         return shellutil.run("systemctl start systemd-networkd", chk_err=False)
 
-    def restart_if(self, ifname=None, retries=None, wait=None):
+    def restart_if(self, ifname, retries=3, wait=5):
         shellutil.run("systemctl restart systemd-networkd")
 
     def restart_ssh_service(self):

azurelinuxagent/common/osutil/factory.py

@@ -90,7 +90,7 @@ def _get_osutil(distro_name, distro_code_name, distro_version, distro_full_name)
     if distro_name == "kali":
         return DebianOSBaseUtil()
 
-    if distro_name in ("acl") or distro_code_name in ("acl"):
+    if distro_name in ("azurecontainerlinux",) or distro_code_name in ("azurecontainerlinux",):
         return AclUtil()
 
     if distro_name in ("flatcar", "coreos") or distro_code_name in ("flatcar", "coreos"):

azurelinuxagent/pa/deprovision/factory.py

@@ -35,7 +35,7 @@ def get_deprovision_handler(distro_name=DISTRO_NAME,
             return Ubuntu1804DeprovisionHandler()
         else:
             return UbuntuDeprovisionHandler()
-    if distro_name in ("acl", "flatcar", "coreos"):
+    if distro_name in ("azurecontainerlinux", "flatcar", "coreos"):
         return CoreOSDeprovisionHandler()
     if "Clear Linux" in distro_full_name:
         return ClearLinuxDeprovisionHandler()  # pylint: disable=E1120

setup.py

@@ -150,10 +150,10 @@ def get_data_files(name, version, fullname):  # pylint: disable=R0912
         set_udev_files(data_files)
         set_systemd_files(data_files, dest=systemd_dir_path,
                           src=["init/arch/waagent.service"])
-    elif name in ('coreos', 'flatcar', 'acl'):
+    elif name in ('coreos', 'flatcar', 'azurecontainerlinux'):
         set_bin_files(data_files, dest=agent_bin_path)
         set_logrotate_files(data_files)
-        if name == 'acl':
+        if name == 'azurecontainerlinux':
             set_conf_files(data_files, dest="/etc",
                            src=["config/acl/waagent.conf"])
             set_systemd_files(data_files, dest=systemd_dir_path,

tests/common/osutil/test_factory.py

@@ -158,7 +158,7 @@ def test_get_osutil_it_should_return_coreos(self):
                           distro_full_name="")
         self.assertTrue(isinstance(ret, CoreOSUtil))
         self.assertEqual(ret.get_service_name(), "waagent")
-        ret = _get_osutil(distro_name="acl",
+        ret = _get_osutil(distro_name="azurecontainerlinux",
                           distro_code_name="",
                           distro_version="",
                           distro_full_name="")

tests/lib/tools.py

@@ -492,7 +492,7 @@ def load_bin_data(name, directory=None):
 
     ["coreos", "", ""],
     ["flatcar", "", ""],
-    ["acl", "", ""],
+    ["azurecontainerlinux", "", ""],
 
     ["suse", "12", "SUSE Linux Enterprise Server"],
     ["suse", "13.2", "openSUSE"],