Changes the 'SSDs' grain name to 'ssds'

- By the documentation (https://docs.saltstack.com/en/latest/topics/grains),
  all grains needs to be resolved in lowered case, so the 'SSDs' grain was
  changed to 'ssds'.

changelog/57612.changed

@@ -0,0 +1,2 @@
+Changes the 'SSDs' grain name to 'ssds' as all grains needs to be 
+resolved in lowered case.

changelog/57612.fixed

@@ -1,2 +1,2 @@
 Fixes issue with virtual block devices, like loopbacks and LVMs, wrongly
-populating the "disks" or "SSDs" grains.
+populating the "disks" or "ssds" grains.

salt/grains/disks.py

@@ -94,7 +94,7 @@ _geom_attribs = [
 
 def _freebsd_geom():
     geom = salt.utils.path.which("geom")
-    ret = {"disks": {}, "SSDs": []}
+    ret = {"disks": {}, "ssds": []}
 
     devices = __salt__["cmd.run"]("{0} disk list".format(geom))
     devices = devices.split("\n\n")
@@ -119,7 +119,7 @@ def _freebsd_geom():
         ret["disks"][name] = tmp
         if tmp.get(_geomconsts.ROTATIONRATE) == 0:
             log.trace("Device %s reports itself as an SSD", device)
-            ret["SSDs"].append(name)
+            ret["ssds"].append(name)
 
     for device in devices:
         parse_geom_attribs(device)
@@ -131,7 +131,7 @@ def _linux_disks():
     """
     Return list of disk devices and work out if they are SSD or HDD.
     """
-    ret = {"disks": [], "SSDs": []}
+    ret = {"disks": [], "ssds": []}
 
     for entry in glob.glob("/sys/block/*"):
         virtual = salt.utils.path.readlink(entry).startswith("../devices/virtual/")
@@ -141,7 +141,7 @@ def _linux_disks():
                     device = entry.split("/")[3]
                     flag = entry_fp.read(1)
                     if flag == "0":
-                        ret["SSDs"].append(device)
+                        ret["ssds"].append(device)
                         log.trace("Device %s reports itself as an SSD", device)
                     elif flag == "1":
                         ret["disks"].append(device)
@@ -164,7 +164,7 @@ def _windows_disks():
     path = "MSFT_PhysicalDisk"
     get = "DeviceID,MediaType"
 
-    ret = {"disks": [], "SSDs": []}
+    ret = {"disks": [], "ssds": []}
 
     cmdret = __salt__["cmd.run_all"](
         "{0} /namespace:{1} path {2} get {3} /format:table".format(
@@ -186,7 +186,7 @@ def _windows_disks():
                 ret["disks"].append(device)
             elif mediatype == "4":
                 log.trace("Device %s reports itself as an SSD", device)
-                ret["SSDs"].append(device)
+                ret["ssds"].append(device)
                 ret["disks"].append(device)
             elif mediatype == "5":
                 log.trace("Device %s reports itself as an SCM", device)

tests/unit/grains/test_disks.py

@@ -48,7 +48,7 @@ class DisksGrainsTestCase(TestCase, LoaderModuleMockMixin):
         ):
             result = disks._windows_disks()
             expected = {
-                "SSDs": ["\\\\.\\PhysicalDrive0"],
+                "ssds": ["\\\\.\\PhysicalDrive0"],
                 "disks": [
                     "\\\\.\\PhysicalDrive0",
                     "\\\\.\\PhysicalDrive1",
@@ -81,7 +81,7 @@ class DisksGrainsTestCase(TestCase, LoaderModuleMockMixin):
             disks.__salt__, {"cmd.run_all": mock_run_all}
         ):
             result = disks._windows_disks()
-            expected = {"SSDs": [], "disks": []}
+            expected = {"ssds": [], "disks": []}
             self.assertDictEqual(result, expected)
 
     def test__linux_disks(self):
@@ -126,4 +126,4 @@ class DisksGrainsTestCase(TestCase, LoaderModuleMockMixin):
         with patch_glob, patch_readlink, patch_fopen:
             ret = disks._linux_disks()
 
-        assert ret == {"disks": ["sda", "sdb", "vda"], "SSDs": []}, ret
+        assert ret == {"disks": ["sda", "sdb", "vda"], "ssds": []}, ret