tests: Add NVMe controller type checks

This one was missing in the tests. Also, reorder the checks so that it matches order of the struct elements.
storaged-project · Mar 12, 2024 · 3bd52ac · 3bd52ac
1 parent 252e33d
commit 3bd52ac
Showing 1 changed file with 22 additions and 22 deletions.
diff --git a/tests/nvme_test.py b/tests/nvme_test.py
@@ -109,7 +109,13 @@ def test_ctrl_info(self):
 
         info = BlockDev.nvme_get_controller_info(self.nvme_dev)
         self.assertEqual(info.ctrl_id, 1)
-
+        self.assertEqual(info.pci_vendor_id, 0)
+        self.assertEqual(info.pci_subsys_vendor_id, 0)
+        self.assertIsNone(info.fguid)
+        self.assertIn("Linux", info.model_number)
+        self.assertGreater(len(info.serial_number), 0)
+        self.assertGreater(len(info.firmware_ver), 0)
+        self.assertGreater(len(info.nvme_ver), 0)
         self.assertTrue (info.features & BlockDev.NVMEControllerFeature.MULTIPORT)
         self.assertTrue (info.features & BlockDev.NVMEControllerFeature.MULTICTRL)
         self.assertFalse(info.features & BlockDev.NVMEControllerFeature.SRIOV)
@@ -128,19 +134,13 @@ def test_ctrl_info(self):
         self.assertFalse(info.features & BlockDev.NVMEControllerFeature.ENCLOSURE)
         self.assertFalse(info.features & BlockDev.NVMEControllerFeature.MGMT_PCIE)
         self.assertFalse(info.features & BlockDev.NVMEControllerFeature.MGMT_SMBUS)
-        self.assertIsNone(info.fguid)
-        self.assertEqual(info.pci_vendor_id, 0)
-        self.assertEqual(info.pci_subsys_vendor_id, 0)
-        self.assertIn("Linux", info.model_number)
-        self.assertGreater(len(info.serial_number), 0)
-        self.assertGreater(len(info.firmware_ver), 0)
-        self.assertGreater(len(info.nvme_ver), 0)
-        self.assertEqual(info.hmb_min_size, 0)
-        self.assertEqual(info.hmb_pref_size, 0)
-        self.assertEqual(info.num_namespaces, 1024)
+        self.assertEqual(info.controller_type, BlockDev.NVMEControllerType.IO)
         self.assertEqual(info.selftest_ext_time, 0)
+        self.assertEqual(info.hmb_pref_size, 0)
+        self.assertEqual(info.hmb_min_size, 0)
         self.assertEqual(info.size_total, 0)
         self.assertEqual(info.size_unalloc, 0)
+        self.assertEqual(info.num_namespaces, 1024)
         self.assertEqual(info.subsysnqn, "libblockdev_subnqn")
 
     @tag_test(TestTags.CORE)
@@ -631,7 +631,13 @@ def test_persistent_dc(self):
         # issue an IDENTIFY_CTRL command
         info = BlockDev.nvme_get_controller_info(ctrls[0])
         self.assertEqual(info.ctrl_id, 1)
-
+        self.assertEqual(info.pci_vendor_id, 0)
+        self.assertEqual(info.pci_subsys_vendor_id, 0)
+        self.assertIsNone(info.fguid)
+        self.assertIn("Linux", info.model_number)
+        self.assertGreater(len(info.serial_number), 0)
+        self.assertGreater(len(info.firmware_ver), 0)
+        self.assertGreater(len(info.nvme_ver), 0)
         self.assertFalse(info.features & BlockDev.NVMEControllerFeature.MULTIPORT)
         self.assertFalse(info.features & BlockDev.NVMEControllerFeature.MULTICTRL)
         self.assertFalse(info.features & BlockDev.NVMEControllerFeature.SRIOV)
@@ -650,19 +656,13 @@ def test_persistent_dc(self):
         self.assertFalse(info.features & BlockDev.NVMEControllerFeature.ENCLOSURE)
         self.assertFalse(info.features & BlockDev.NVMEControllerFeature.MGMT_PCIE)
         self.assertFalse(info.features & BlockDev.NVMEControllerFeature.MGMT_SMBUS)
-        self.assertIsNone(info.fguid)
-        self.assertEqual(info.pci_vendor_id, 0)
-        self.assertEqual(info.pci_subsys_vendor_id, 0)
-        self.assertIn("Linux", info.model_number)
-        self.assertGreater(len(info.serial_number), 0)
-        self.assertGreater(len(info.firmware_ver), 0)
-        self.assertGreater(len(info.nvme_ver), 0)
-        self.assertEqual(info.hmb_min_size, 0)
-        self.assertEqual(info.hmb_pref_size, 0)
-        self.assertEqual(info.num_namespaces, 0)
+        self.assertEqual(info.controller_type, BlockDev.NVMEControllerType.DISCOVERY)
         self.assertEqual(info.selftest_ext_time, 0)
+        self.assertEqual(info.hmb_pref_size, 0)
+        self.assertEqual(info.hmb_min_size, 0)
         self.assertEqual(info.size_total, 0)
         self.assertEqual(info.size_unalloc, 0)
+        self.assertEqual(info.num_namespaces, 0)
         self.assertEqual(info.subsysnqn, self.DISCOVERY_NQN)
 
         # disconnect