Removing 'metadata_mode' leftovers

Signed-off-by: Karolina Rogowska <karolina.rogowska@intel.com>
This commit is contained in:
Karolina Rogowska 2021-09-27 15:35:44 +02:00
parent 6792c1b455
commit f057eba2cb
4 changed files with 1 additions and 24 deletions

View File

@ -14,7 +14,6 @@ class Cache:
self.cache_device = device
self.cache_id = int(self.__get_cache_id())
self.__cache_line_size = None
self.__metadata_mode = None
self.__metadata_size = None
def __get_cache_id(self):
@ -40,13 +39,6 @@ class Cache:
cp = stats.config_stats.cleaning_policy
return CleaningPolicy[cp]
def get_metadata_mode(self):
if self.__metadata_mode is None:
stats = self.get_statistics()
mm = stats.config_stats.metadata_mode
self.__metadata_mode = MetadataMode[mm]
return self.__metadata_mode
def get_metadata_size(self):
if self.__metadata_size is None:
stats = self.get_statistics()
@ -180,5 +172,4 @@ class Cache:
def get_cache_config(self):
return CacheConfig(self.get_cache_line_size(),
self.get_cache_mode(),
self.get_cleaning_policy(),
self.get_metadata_mode())
self.get_cleaning_policy())

View File

@ -370,13 +370,11 @@ class CacheConfig:
cache_line_size=CacheLineSize.DEFAULT,
cache_mode=CacheMode.DEFAULT,
cleaning_policy=CleaningPolicy.DEFAULT,
metadata_mode=MetadataMode.normal,
kernel_parameters=None
):
self.cache_line_size = cache_line_size
self.cache_mode = cache_mode
self.cleaning_policy = cleaning_policy
self.metadata_mode = metadata_mode
self.kernel_parameters = kernel_parameters
def __eq__(self, other):
@ -384,7 +382,6 @@ class CacheConfig:
self.cache_line_size == other.cache_line_size
and self.cache_mode == other.cache_mode
and self.cleaning_policy == other.cleaning_policy
and self.metadata_mode == other.metadata_mode
and equal_or_default(
self.kernel_parameters, other.kernel_parameters, KernelParameters.DEFAULT
)

View File

@ -93,11 +93,6 @@ def test_cache_stop_and_load(cache_mode):
f"Cache line size is: {check_cache_config.cache_line_size}, "
f"should be: {cache.get_cache_line_size()}\n"
)
if check_cache_config.metadata_mode != cache.get_metadata_mode():
failed_params += (
f"Metadata mode is: {check_cache_config.metadata_mode}, "
f"should be: {cache.get_metadata_mode()}\n"
)
TestRun.fail(f"Parameters do not match after reload:\n{failed_params}")
with TestRun.step(

View File

@ -16,7 +16,6 @@ from api.cas.cache_config import (
CacheModeTrait,
CacheStatus,
CleaningPolicy,
MetadataMode,
PromotionPolicy,
)
from api.cas.casadm import StatsFilter
@ -289,11 +288,6 @@ def validate_cache_config_statistics(caches, after_io: bool = False):
f"For cache number {caches[i].cache_id} cache line size is "
f"{caches_stats[i].config_stats.cache_line_size}, "
f"should be {CacheLineSize.DEFAULT.value}\n")
if caches_stats[i].config_stats.metadata_mode != MetadataMode.DEFAULT.value:
failed_stats += (
f"For cache number {caches[i].cache_id} metadata mode is "
f"{caches_stats[i].config_stats.metadata_mode}, "
f"should be {MetadataMode.DEFAULT}\n")
if (
CacheStatus[caches_stats[i].config_stats.status.replace(' ', '_').lower()]
!= CacheStatus.running