From dfdbd9abbe5bb61c061bfbaf46be1afc3c665309 Mon Sep 17 00:00:00 2001
From: Katarzyna Lapinska <katarzyna.lapinska@intel.com>
Date: Mon, 24 Aug 2020 10:39:35 +0200
Subject: [PATCH] Add detach command to test's API and fix for attach command

Signed-off-by: Katarzyna Lapinska <katarzyna.lapinska@intel.com>
---
 test/functional/api/cas/casadm.py | 12 ++++++++++--
 test/functional/api/cas/cli.py    | 14 +++++++++++---
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/test/functional/api/cas/casadm.py b/test/functional/api/cas/casadm.py
index ef4eebf..a957fa0 100644
--- a/test/functional/api/cas/casadm.py
+++ b/test/functional/api/cas/casadm.py
@@ -72,8 +72,9 @@ def remove_detached(core_device: Device, shortcut: bool = False):
     return output
 
 
-def try_add(core_device: Device, cache_id: int):
-    output = TestRun.executor.run(script_try_add_cmd(str(cache_id), core_device.system_path))
+def try_add(core_device: Device, cache_id: int, core_id: int = None):
+    output = TestRun.executor.run(script_try_add_cmd(str(cache_id), core_device.system_path,
+                                                     str(core_id) if core_id is not None else None))
     if output.exit_code != 0:
         raise CmdException("Failed to execute try add script command.", output)
     return Core(core_device.system_path, cache_id)
@@ -93,6 +94,13 @@ def purge_core(cache_id: int, core_id: int):
     return output
 
 
+def detach_core(cache_id: int, core_id: int):
+    output = TestRun.executor.run(script_detach_core_cmd(str(cache_id), str(core_id)))
+    if output.exit_code != 0:
+        raise CmdException("Failed to execute detach 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 62f5477..75d7ed7 100644
--- a/test/functional/api/cas/cli.py
+++ b/test/functional/api/cas/cli.py
@@ -19,9 +19,12 @@ def add_core_cmd(cache_id: str, core_dev: str, core_id: str = None, shortcut: bo
     return casadm_bin + command
 
 
-def script_try_add_cmd(cache_id: str, core_dev: str):
-    return f"{casadm_bin} --script --add-core --try-add --cache-id {cache_id} " \
-           f"--core-device {core_dev}"
+def script_try_add_cmd(cache_id: str, core_dev: str, core_id: str = None):
+    command = f"{casadm_bin} --script --add-core --try-add --cache-id {cache_id} " \
+              f"--core-device {core_dev}"
+    if core_id:
+        command += f" --core-id {core_id}"
+    return command
 
 
 def script_purge_cache_cmd(cache_id: str):
@@ -32,6 +35,11 @@ def script_purge_core_cmd(cache_id: str, core_id: str):
     return f"{casadm_bin} --script --purge-core --cache-id {cache_id} --core-id {core_id}"
 
 
+def script_detach_core_cmd(cache_id: str, core_id: str):
+    return f"{casadm_bin} --script --remove-core --detach --cache-id {cache_id} " \
+           f"--core-id {core_id}"
+
+
 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}"