github/open-cas-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor improvements in opencas.py/casctl

Browse Source 
Signed-off-by: Jan Musial <jan.musial@intel.com>
This commit is contained in:
Jan Musial 2022-02-08 11:14:04 +01:00
parent 9da912e485
commit a187813d13
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
utils/casctl
View File

@ -44,7 +44,7 @@ def start():
for cache in config.caches.values(): for cache in config.caches.values():
try: try:
opencas.start_cache(cache, True) opencas.start_cache(cache, load=True)
except opencas.casadm.CasadmError as e: except opencas.casadm.CasadmError as e:
eprint( eprint(
"Unable to load cache {0} ({1}). Reason:\n{2}".format( "Unable to load cache {0} ({1}). Reason:\n{2}".format(
@ -116,7 +116,7 @@ def init(force):
for cache in config.caches.values(): for cache in config.caches.values():
try: try:
opencas.start_cache(cache, False, force) opencas.start_cache(cache, load=False, force=force)
except opencas.casadm.CasadmError as e: except opencas.casadm.CasadmError as e:
eprint( eprint(
"Unable to start cache {0} ({1}). Reason:\n{2}".format( "Unable to start cache {0} ({1}). Reason:\n{2}".format(

22
utils/opencas.py
View File

@ -197,7 +197,7 @@ class cas_config(object):
def __init__(self, cache_id, device, cache_mode, **params): def __init__(self, cache_id, device, cache_mode, **params):
self.cache_id = int(cache_id) self.cache_id = int(cache_id)
self.device = device self.device = device
self.cache_mode = cache_mode self.cache_mode = cache_mode.lower()
self.params = params self.params = params
self.cores = dict() self.cores = dict()
@ -215,7 +215,7 @@ class cas_config(object):
params = dict() params = dict()
if len(values) > 3: if len(values) > 3:
for param in values[3].split(','): for param in values[3].lower().split(','):
param_name, param_value = param.split('=') param_name, param_value = param.split('=')
if param_name in params: if param_name in params:
raise ValueError('Invalid cache configuration (repeated parameter') raise ValueError('Invalid cache configuration (repeated parameter')
@ -273,19 +273,19 @@ class cas_config(object):
) )
def check_cache_mode_valid(self, cache_mode): def check_cache_mode_valid(self, cache_mode):
if cache_mode.lower() not in ['wt', 'pt', 'wa', 'wb', 'wo']: if cache_mode not in ['wt', 'pt', 'wa', 'wb', 'wo']:
raise ValueError(f'Invalid cache mode {cache_mode}') raise ValueError(f'Invalid cache mode {cache_mode}')
def check_cleaning_policy_valid(self, cleaning_policy): def check_cleaning_policy_valid(self, cleaning_policy):
if cleaning_policy.lower() not in ['acp', 'alru', 'nop']: if cleaning_policy not in ['acp', 'alru', 'nop']:
raise ValueError(f'{cleaning_policy} is invalid cleaning policy name') raise ValueError(f'{cleaning_policy} is invalid cleaning policy name')
def check_lazy_startup_valid(self, lazy_startup): def check_lazy_startup_valid(self, lazy_startup):
if lazy_startup.lower() not in ["true", "false"]: if lazy_startup not in ["true", "false"]:
raise ValueError('{0} is invalid lazy_startup value'.format(lazy_startup)) raise ValueError('{0} is invalid lazy_startup value'.format(lazy_startup))
def check_promotion_policy_valid(self, promotion_policy): def check_promotion_policy_valid(self, promotion_policy):
if promotion_policy.lower() not in ['always', 'nhit']: if promotion_policy not in ['always', 'nhit']:
raise ValueError(f'{promotion_policy} is invalid promotion policy name') raise ValueError(f'{promotion_policy} is invalid promotion policy name')
def check_cache_line_size_valid(self, cache_line_size): def check_cache_line_size_valid(self, cache_line_size):
@ -319,7 +319,7 @@ class cas_config(object):
return ret return ret
def is_lazy(self): def is_lazy(self):
return self.params.get("lazy_startup", "false").lower() == "true" return self.params.get("lazy_startup", "false") == "true"
class core_config(object): class core_config(object):
def __init__(self, cache_id, core_id, path, **params): def __init__(self, cache_id, core_id, path, **params):
@ -369,7 +369,7 @@ class cas_config(object):
def validate_parameter(self, param_name, param_value): def validate_parameter(self, param_name, param_value):
if param_name == "lazy_startup": if param_name == "lazy_startup":
if param_value.lower() not in ["true", "false"]: if param_value not in ["true", "false"]:
raise ValueError( raise ValueError(
f"{param_value} is invalid value for '{param_name}' core param" f"{param_value} is invalid value for '{param_name}' core param"
) )
@ -401,7 +401,7 @@ class cas_config(object):
return ret return ret
def is_lazy(self): def is_lazy(self):
return self.params.get("lazy_startup", "false").lower() == "true" return self.params.get("lazy_startup", "false") == "true"
def __init__(self, caches=None, cores=None, version_tag=None): def __init__(self, caches=None, cores=None, version_tag=None):
self.caches = caches if caches else dict() self.caches = caches if caches else dict()
@ -820,9 +820,9 @@ def wait_for_startup(timeout=300, interval=5):
def start_device(dev): def start_device(dev):
if os.path.exists(dev.device): if os.path.exists(dev.device):
if type(dev) is cas_config.core_config: if type(dev) is cas_config.core_config:
add_core(dev, True) add_core(dev, try_add=True)
elif type(dev) is cas_config.cache_config: elif type(dev) is cas_config.cache_config:
start_cache(dev, True) start_cache(dev, load=True)
stop_time = time.time() + int(timeout) stop_time = time.time() + int(timeout)