Merge pull request #33903 from meaksh/salt-os-family-does-not-detect-…

…SLES-for-SAP

Fetching grains['os'] from /etc/os-release on SUSE systems if it is possible

salt/grains/core.py

@@ -1038,6 +1038,7 @@ def id_():
     'SUSE': 'SUSE',
     'openSUSE Leap': 'SUSE',
     'openSUSE Tumbleweed': 'SUSE',
+    'SLES_SAP': 'SUSE',
     'Solaris': 'Solaris',
     'SmartOS': 'Solaris',
     'OpenIndiana Development': 'Solaris',
@@ -1283,6 +1284,9 @@ def os_data():
                         grains['lsb_distrib_release'] = os_release['VERSION_ID']
                     if 'PRETTY_NAME' in os_release:
                         grains['lsb_distrib_codename'] = os_release['PRETTY_NAME']
+                    if 'CPE_NAME' in os_release:
+                        if ":suse:" in os_release['CPE_NAME'] or ":opensuse:" in os_release['CPE_NAME']:
+                            grains['os'] = "SUSE"
                 elif os.path.isfile('/etc/SuSE-release'):
                     grains['lsb_distrib_id'] = 'SUSE'
                     version = ''
@@ -1390,7 +1394,8 @@ def os_data():
         shortname = distroname.replace(' ', '').lower()[:10]
         # this maps the long names from the /etc/DISTRO-release files to the
         # traditional short names that Salt has used.
-        grains['os'] = _OS_NAME_MAP.get(shortname, distroname)
+        if 'os' not in grains:
+            grains['os'] = _OS_NAME_MAP.get(shortname, distroname)
         grains.update(_linux_cpudata())
         grains.update(_linux_gpu_data())
     elif grains['kernel'] == 'SunOS':

tests/unit/grains/core_test.py

@@ -119,6 +119,72 @@ def _import_mock(name, *args):
 
         self.assertEqual(os_grains.get('os_family'), 'Debian')
 
+    @skipIf(not salt.utils.is_linux(), 'System is not Linux')
+    def test_suse_os_from_cpe_data(self):
+        '''
+        Test if 'os' grain is parsed from CPE_NAME of /etc/os-release
+        '''
+        _path_exists_map = {
+            '/proc/1/cmdline': False
+        }
+        _path_isfile_map = {
+            '/etc/os-release': True,
+        }
+        _os_release_map = {
+            'NAME': 'SLES',
+            'VERSION': '12-SP1',
+            'VERSION_ID': '12.1',
+            'PRETTY_NAME': 'SUSE Linux Enterprise Server 12 SP1',
+            'ID': 'sles',
+            'ANSI_COLOR': '0;32',
+            'CPE_NAME': 'cpe:/o:suse:sles:12:sp1'
+        }
+
+        path_exists_mock = MagicMock(side_effect=lambda x: _path_exists_map[x])
+        path_isfile_mock = MagicMock(
+            side_effect=lambda x: _path_isfile_map.get(x, False)
+        )
+        empty_mock = MagicMock(return_value={})
+        osarch_mock = MagicMock(return_value="amd64")
+        os_release_mock = MagicMock(return_value=_os_release_map)
+
+        orig_import = __import__
+
+        def _import_mock(name, *args):
+            if name == 'lsb_release':
+                raise ImportError('No module named lsb_release')
+            return orig_import(name, *args)
+
+        # Skip the first if statement
+        with patch.object(salt.utils, 'is_proxy',
+                          MagicMock(return_value=False)):
+            # Skip the selinux/systemd stuff (not pertinent)
+            with patch.object(core, '_linux_bin_exists',
+                              MagicMock(return_value=False)):
+                # Skip the init grain compilation (not pertinent)
+                with patch.object(os.path, 'exists', path_exists_mock):
+                    # Ensure that lsb_release fails to import
+                    with patch('__builtin__.__import__',
+                               side_effect=_import_mock):
+                        # Skip all the /etc/*-release stuff (not pertinent)
+                        with patch.object(os.path, 'isfile', path_isfile_mock):
+                            with patch.object(core, '_parse_os_release', os_release_mock):
+                                # Mock platform.linux_distribution to give us the
+                                # OS name that we want.
+                                distro_mock = MagicMock(
+                                    return_value=('SUSE Linux Enterprise Server ', '12', 'x86_64')
+                                )
+                                with patch.object(platform, 'linux_distribution', distro_mock):
+                                    with patch.object(core, '_linux_gpu_data', empty_mock):
+                                        with patch.object(core, '_linux_cpudata', empty_mock):
+                                            with patch.object(core, '_virtual', empty_mock):
+                                                # Mock the osarch
+                                                with patch.dict(core.__salt__, {'cmd.run': osarch_mock}):
+                                                    os_grains = core.os_data()
+
+        self.assertEqual(os_grains.get('os_family'), 'SUSE')
+        self.assertEqual(os_grains.get('os'), 'SUSE')
+
 
 if __name__ == '__main__':
     from integration import run_tests