Merge ~raharper/cloud-init:fix/sysconfig-distro-variant into cloud-init:master

[Ryan Harper]

sysconfig: use distro variant to check if available

The sysconfig renderer used the distro name directly which mean
some variants of distros were not considered supported. Fix this
by using util.system_info()['variant'] instead. Fix the list of
KNOWN_DISTROS value for redhat -> rhel.

LP: #1843584

[Dan Watkins (oddbloke)]

review: Needs Information

a1910c9... by Ryan Harper on 2019-09-26

Drop unrelated changes to util

[Ryan Harper (raharper)]

Yes, thanks. I've dropped that unrelated hunk.

[Dan Watkins (oddbloke)]

Thanks! Questions inline.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:a1910c946e4e06f3f66c4b59d6d7707b87402391
https://jenkins.ubuntu.com/server/job/cloud-init-ci/1180/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/1180//rebuild

review: Approve (continuous-integration)

68ad306... by Ryan Harper on 2019-09-26

Use only variant names in KNOWN_DISTROS

[Ryan Harper (raharper)]

Thanks, I updated KNOWN_DISTROS to just use variant names.

[Dan Watkins (oddbloke)]

Thanks!

review: Approve

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:68ad30679acb0be436b36c148faa2894d0efe9e7
https://jenkins.ubuntu.com/server/job/cloud-init-ci/1181/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/1181//rebuild

review: Approve (continuous-integration)

diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
index be5dede..416c1c9 100644
--- a/cloudinit/net/sysconfig.py
+++ b/cloudinit/net/sysconfig.py
@@ -18,8 +18,7 @@ from .network_state import (
 
 LOG = logging.getLogger(__name__)
 NM_CFG_FILE = "/etc/NetworkManager/NetworkManager.conf"
-KNOWN_DISTROS = [
-    'opensuse', 'sles', 'suse', 'redhat', 'fedora', 'centos']
+KNOWN_DISTROS = ['centos', 'fedora', 'rhel', 'suse']
 
 
 def _make_header(sep='#'):
@@ -731,7 +730,7 @@ class Renderer(renderer.Renderer):
 def available(target=None):
     sysconfig = available_sysconfig(target=target)
     nm = available_nm(target=target)
-    return (util.get_linux_distro()[0] in KNOWN_DISTROS
+    return (util.system_info()['variant'] in KNOWN_DISTROS
             and any([nm, sysconfig]))
 
 
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
index e578992..a093cf1 100644
--- a/tests/unittests/test_net.py
+++ b/tests/unittests/test_net.py
@@ -4158,6 +4158,24 @@ class TestNetRenderers(CiTestCase):
         m_distro.return_value = ('opensuse', None, None)
         self.assertEqual('sysconfig', renderers.select(priority=None)[0])
 
+    @mock.patch("cloudinit.net.sysconfig.available_sysconfig")
+    @mock.patch("cloudinit.util.get_linux_distro")
+    def test_sysconfig_available_uses_variant_mapping(self, m_distro, m_avail):
+        m_avail.return_value = True
+        distro_values = [
+           ('opensuse', '', ''),
+           ('opensuse-leap', '', ''),
+           ('opensuse-tumbleweed', '', ''),
+           ('sles', '', ''),
+           ('centos', '', ''),
+           ('fedora', '', ''),
+           ('redhat', '', ''),
+        ]
+        for (distro_name, distro_version, flavor) in distro_values:
+            m_distro.return_value = (distro_name, distro_version, flavor)
+            result = sysconfig.available()
+            self.assertTrue(result)
+
 
 class TestGetInterfaces(CiTestCase):
     _data = {'bonds': ['bond1'],