From 8204fa8a56f803bd230f9de535566d54981a4496 Mon Sep 17 00:00:00 2001 From: Katarzyna Lapinska Date: Fri, 24 Jan 2020 09:07:33 +0100 Subject: [PATCH] Update Init config usage and remove WI cache mode --- test/functional/api/cas/cache_config.py | 4 ---- test/functional/tests/startup/test_startup.py | 7 ++++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/test/functional/api/cas/cache_config.py b/test/functional/api/cas/cache_config.py index 1da49f9..88765a9 100644 --- a/test/functional/api/cas/cache_config.py +++ b/test/functional/api/cas/cache_config.py @@ -26,7 +26,6 @@ class CacheMode(Enum): WA = "Write-Around" PT = "Pass-Through" WO = "Write-Only" - WI = "Write-Invalidate" DEFAULT = WT def __str__(self): @@ -44,15 +43,12 @@ class CacheMode(Enum): return CacheModeTrait.InsertWrite | CacheModeTrait.LazyFlush elif cache_mode == CacheMode.WA: return CacheModeTrait.InsertRead - elif cache_mode == CacheMode.WI: - return CacheModeTrait.InsertRead | CacheModeTrait.WriteInvalidate class CacheModeTrait(IntFlag): InsertWrite = 1 InsertRead = 2 LazyFlush = 4 - WriteInvalidate = 8 class SeqCutOffPolicy(Enum): diff --git a/test/functional/tests/startup/test_startup.py b/test/functional/tests/startup/test_startup.py index 47d3809..964c02c 100644 --- a/test/functional/tests/startup/test_startup.py +++ b/test/functional/tests/startup/test_startup.py @@ -5,9 +5,10 @@ import pytest -from api.cas import casadm, init_config +from api.cas import casadm from api.cas.casadm_parser import get_caches, get_cores from api.cas.cache_config import CacheMode +from api.cas.init_config import InitConfig from core.test_run import TestRun from storage_devices.disk import DiskType, DiskTypeSet, DiskTypeLowerThan from test_utils.filesystem.file import File @@ -67,7 +68,7 @@ def test_cas_startup(cache_mode, filesystem): fstab.add_mountpoint(device=core, mount_point=mountpoint, fs_type=filesystem) - init_config.create_init_config_from_running_configuration() + InitConfig.create_init_config_from_running_configuration() with TestRun.step("Reboot"): TestRun.executor.reboot() @@ -98,5 +99,5 @@ def test_cas_startup(cache_mode, filesystem): with TestRun.step("Test cleanup"): fstab.remove_mountpoint(device=core) core.unmount() - init_config.create_default_init_config() + InitConfig.create_default_init_config() casadm.stop_all_caches()