From 1ab0ab912bfc5f8f645cd7f1c5324d7eb5f250e3 Mon Sep 17 00:00:00 2001 From: Cristiano Urban <cristiano.urban@inaf.it> Date: Fri, 6 Dec 2024 13:09:41 +0100 Subject: [PATCH] IBM Spectrum Protect integration: replaced 'tapePool' and 'tapePoolList' with 'tapeHSMFilesystem' and 'tapeHSMFilesystemList'. Signed-off-by: Cristiano Urban <cristiano.urban@inaf.it> --- client/vos_storage | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/client/vos_storage b/client/vos_storage index 5f1e31e..9d43221 100644 --- a/client/vos_storage +++ b/client/vos_storage @@ -28,8 +28,8 @@ class VOSStorage(RedisRPCClient): storageType = None storageBasePath = None storageHostname = None - tapePool = None - tapePoolList = [] + tapeHSMFilesystem = None + tapeHSMFilesystemList = [] while storageType not in ("cold", "hot"): try: storageType = input("\nStorage type ['cold' or 'hot']: ") @@ -40,17 +40,17 @@ class VOSStorage(RedisRPCClient): except KeyboardInterrupt: sys.exit("\nCTRL+C detected. Exiting...") if storageType == "cold": - storageRequest = { "requestType": "TAPE_POOL_LST" } + storageRequest = { "requestType": "TAPE_HSM_FS_LST" } storageResponse = self.call(storageRequest) if "responseType" not in storageResponse: sys.exit("FATAL: Malformed response, storage acknowledge expected.\n") - elif storageResponse["responseType"] == "TAPE_POOL_LST_DONE": - tapePoolList = storageResponse["tapePoolList"] - while tapePool not in tapePoolList: - print("\nSelect one of the available tape pools:") - print("\n" + tabulate([ [t] for t in tapePoolList ], headers = ["tape_pool"], tablefmt = "pretty") + "\n") + elif storageResponse["responseType"] == "TAPE_HSM_FS_LST_DONE": + tapeHSMFilesystemList = storageResponse["tapeHSMFilesystemList"] + while tapeHSMFilesystem not in tapeHSMFilesystemList: + print("\nSelect one of the available tape HSM filesystems:") + print("\n" + tabulate([ [t] for t in tapeHSMFilesystemList ], headers = ["tape_hsm_fs"], tablefmt = "pretty") + "\n") try: - tapePool = input("Please, insert a tape pool: ") + tapeHSMFilesystem = input("Please, insert a tape HSM filesystem: ") except ValueError: print("Input type is not valid!") except EOFError: @@ -81,7 +81,7 @@ class VOSStorage(RedisRPCClient): "storageType": storageType, "basePath": storageBasePath, "hostname": storageHostname, - "tapePool": tapePool } + "tapeHSMFilesystem": tapeHSMFilesystem } storageResponse = self.call(storageRequest) if "responseType" not in storageResponse: @@ -202,8 +202,8 @@ DESCRIPTION Adding 'hot' or 'cold' storage points requires a base path to be specified (e.g. '/mnt/my_storage/users'). - Adding a 'cold' storage point requires selecting a tape pool - (a tape pool list is provided). + Adding a 'cold' storage point requires selecting a tape HSM + filesystem (a tape HSM filesystem list is provided). All storage points require a valid hostname or IP address. """) -- GitLab