From 0948cdfbef2052cdf839f24d6a17d457aa9fd4d3 Mon Sep 17 00:00:00 2001
From: Ryan Harper <ryan.harper@canonical.com>
Date: Thu, 26 Sep 2019 19:43:29 +0000
Subject: 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
---
 tests/unittests/test_net.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'tests')

diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
index e5789924..a093cf10 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'],
-- 
cgit v1.2.3