Merge pull request #1345 from robertbaldyga/consolidate-cas-modules

Consolidate Open CAS modules

test/functional/api/cas/cas_module.py

@@ -1,5 +1,5 @@
 #
-# Copyright(c) 2019-2021 Intel Corporation
+# Copyright(c) 2019-2022 Intel Corporation
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
@@ -11,7 +11,6 @@ from test_utils.os_utils import ModuleRemoveMethod
 
 class CasModule(Enum):
     cache = "cas_cache"
-    disk = "cas_disk"
 
 
 def reload_all_cas_modules():
@@ -22,8 +21,6 @@ def reload_all_cas_modules():
 def unload_all_cas_modules():
     os_utils.unload_kernel_module(CasModule.cache.value,
                                   os_utils.ModuleRemoveMethod.rmmod)
-    os_utils.unload_kernel_module(CasModule.disk.value,
-                                  os_utils.ModuleRemoveMethod.rmmod)
 
 
 def is_cas_management_dev_present():

test/functional/api/cas/installer.py

@@ -59,7 +59,7 @@ def install_opencas(destdir: str = ""):
     if output.exit_code != 0:
         raise CmdException("Failed to install Open CAS", output)
 
-    output = TestRun.executor.run("rmmod cas_cache cas_disk; modprobe cas_cache")
+    output = TestRun.executor.run("rmmod cas_cache; modprobe cas_cache")
     if output.exit_code != 0:
         raise CmdException("Failed to reload modules", output)
 

test/functional/tests/misc/test_weak_modules.py

@@ -19,7 +19,7 @@ from test_tools.packaging import Packages
 
 
 modules_links_dir = "/lib/modules/$(uname -r)/weak-updates/block/opencas"
-modules_names = ["cas_cache.ko", "cas_disk.ko"]
+modules_names = ["cas_cache.ko"]
 
 
 def test_weak_modules():