From b8158f9ceb2c32663b7e3da4170f869c39853f53 Mon Sep 17 00:00:00 2001 From: Katarzyna Lapinska Date: Wed, 27 Jan 2021 12:46:03 +0100 Subject: [PATCH] Add remove core script command to tests API Signed-off-by: Katarzyna Lapinska --- test/functional/api/cas/casadm.py | 7 +++++++ test/functional/api/cas/cli.py | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/test/functional/api/cas/casadm.py b/test/functional/api/cas/casadm.py index 858d10e..4f43441 100644 --- a/test/functional/api/cas/casadm.py +++ b/test/functional/api/cas/casadm.py @@ -106,6 +106,13 @@ def detach_core(cache_id: int, core_id: int): return output +def remove_core_with_script_command(cache_id: int, core_id: int, no_flush: bool = False): + output = TestRun.executor.run(script_remove_core_cmd(str(cache_id), str(core_id), no_flush)) + if output.exit_code != 0: + raise CmdException("Failed to execute remove core script command.", output) + return output + + def reset_counters(cache_id: int, core_id: int = None, shortcut: bool = False): _core_id = None if core_id is None else str(core_id) output = TestRun.executor.run( diff --git a/test/functional/api/cas/cli.py b/test/functional/api/cas/cli.py index 4262955..db4710b 100644 --- a/test/functional/api/cas/cli.py +++ b/test/functional/api/cas/cli.py @@ -40,6 +40,13 @@ def script_detach_core_cmd(cache_id: str, core_id: str): f"--core-id {core_id}" +def script_remove_core_cmd(cache_id: str, core_id: str, no_flush: bool = False): + command = f"{casadm_bin} --script --remove-core --cache-id {cache_id} --core-id {core_id}" + if no_flush: + command += ' --no-flush' + return command + + def remove_core_cmd(cache_id: str, core_id: str, force: bool = False, shortcut: bool = False): command = f" -R -i {cache_id} -j {core_id}" if shortcut \ else f" --remove-core --cache-id {cache_id} --core-id {core_id}"