Use cached device_ids

Signed-off-by: Jan Musial <[email protected]>

Author: Jan Musial

test/functional/api/cas/cache.py

@@ -1,5 +1,5 @@
 #
-# Copyright(c) 2019-2021 Intel Corporation
+# Copyright(c) 2019-2022 Intel Corporation
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
@@ -17,12 +17,12 @@ def __init__(self, device: Device):
         self.__metadata_size = None
 
     def __get_cache_id(self):
-        cmd = f"{list_cmd(by_id_path=False)} | grep {self.cache_device.get_device_id()}"
+        cmd = f"{list_cmd(by_id_path=False)} | grep {self.cache_device.device_id}"
         output = TestRun.executor.run(cmd)
         if output.exit_code == 0 and output.stdout.strip():
             return output.stdout.split()[1]
         else:
-            raise Exception(f"There is no cache started on {self.cache_device.get_device_id()}.")
+            raise Exception(f"There is no cache started on {self.cache_device.device_id}.")
 
     def get_core_devices(self):
         return get_cores(self.cache_id)

test/functional/tests/cli/test_zero_metadata_command.py

@@ -1,5 +1,5 @@
 #
-# Copyright(c) 2021 Intel Corporation
+# Copyright(c) 2021-2022 Intel Corporation
 # SPDX-License-Identifier: BSD-3-Clause
 #
 import time
@@ -110,7 +110,7 @@ def test_zero_metadata_filesystem(filesystem):
         except CmdException as e:
             cli_messages.check_stderr_msg(e.output, cli_messages.no_cas_metadata)
 
-        file_system = get_device_filesystem_type(core.get_device_id())
+        file_system = get_device_filesystem_type(core.device_id)
 
         if file_system != filesystem:
             TestRun.LOGGER.error(f"Incorrect filesystem: {file_system}; expected: {filesystem}")

test/functional/tests/misc/test_device_capabilities.py

@@ -1,5 +1,5 @@
 #
-# Copyright(c) 2020-2021 Intel Corporation
+# Copyright(c) 2020-2022 Intel Corporation
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
@@ -32,7 +32,7 @@ def test_device_capabilities():
     """
 
     core_device = TestRun.disks['core']
-    max_io_size_path = os.path.join(disk_utils.get_sysfs_path(core_device.get_device_id()),
+    max_io_size_path = os.path.join(disk_utils.get_sysfs_path(core_device.device_id),
                                     'queue/max_sectors_kb')
     default_max_io_size = fs_utils.read_file(max_io_size_path)
 
@@ -104,8 +104,8 @@ def create_scsi_debug_device(sector_size: int, physblk_exp: int, dev_size_mb=102
 def prepare_cas_device(cache_device, core_device):
     cache = casadm.start_cache(cache_device, cache_line_size=CacheLineSize.LINE_64KiB, force=True)
     try:
-        cache_dev_bs = disk_utils.get_block_size(cache_device.get_device_id())
-        core_dev_bs = disk_utils.get_block_size(core_device.get_device_id())
+        cache_dev_bs = disk_utils.get_block_size(cache_device.device_id)
+        core_dev_bs = disk_utils.get_block_size(core_device.device_id)
         core = cache.add_core(core_device)
         if cache_dev_bs > core_dev_bs:
             TestRun.LOGGER.error(
@@ -145,8 +145,8 @@ def method_lcm_not_zero(a, b):
 
 def measure_capabilities(dev):
     dev_capabilities = {}
-    dev_id = dev.parent_device.get_device_id() if isinstance(dev, Partition) \
-        else dev.get_device_id()
+    dev_id = dev.parent_device.device_id if isinstance(dev, Partition) \
+        else dev.device_id
     for c in capabilities:
         path = os.path.join(disk_utils.get_sysfs_path(dev_id), 'queue', c)
         command = f"cat {path}"
@@ -165,10 +165,10 @@ def compare_capabilities(cache_device, core_device, cache, core, msg):
                                       cli_messages.try_add_core_sector_size_mismatch)
     else:
         core_dev_sectors_num = \
-            disk_utils.get_size(core_device.get_device_id()) / disk_utils.get_block_size(
-                core_device.get_device_id())
-        core_sectors_num = disk_utils.get_size(core.get_device_id()) / disk_utils.get_block_size(
-            core.get_device_id())
+            disk_utils.get_size(core_device.device_id) / disk_utils.get_block_size(
+                core_device.device_id)
+        core_sectors_num = disk_utils.get_size(core.device_id) / disk_utils.get_block_size(
+            core.device_id)
         if core_dev_sectors_num != core_sectors_num:
             TestRun.LOGGER.error(
                 "Number of sectors in CAS device and attached core device is different.")