From 4b5010bc584a87ef3f321f09d0974a089e84ec2d Mon Sep 17 00:00:00 2001 From: Cristiano Urban Date: Fri, 12 Mar 2021 10:49:48 +0100 Subject: [PATCH] Minor changes to tape client class. Signed-off-by: Cristiano Urban --- transfer_service/import_amqp_server.py | 2 +- transfer_service/retrieve_executor.py | 2 +- transfer_service/store_executor.py | 2 +- transfer_service/tape_client.py | 12 ++++-------- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/transfer_service/import_amqp_server.py b/transfer_service/import_amqp_server.py index 935e801..f0ebe73 100644 --- a/transfer_service/import_amqp_server.py +++ b/transfer_service/import_amqp_server.py @@ -26,7 +26,7 @@ class ImportAMQPServer(AMQPServer): self.tapeClient = TapeClient(self.params["host"], self.params.getint("port"), self.params["user"], - self.params["password"]) + self.params["pkey_file_path"]) self.systemUtils = SystemUtils() self.path = None self.username = None diff --git a/transfer_service/retrieve_executor.py b/transfer_service/retrieve_executor.py index e9f4f26..eae069c 100644 --- a/transfer_service/retrieve_executor.py +++ b/transfer_service/retrieve_executor.py @@ -16,7 +16,7 @@ class RetrieveExecutor(TaskExecutor): self.tapeClient = TapeClient(self.params["host"], self.params.getint("port"), self.params["user"], - self.params["password"]) + self.params["pkey_file_path"]) self.params = config.loadSection("transfer_node") self.storageRetrievePath = self.params["retrieve_path"] self.params = config.loadSection("file_catalog") diff --git a/transfer_service/store_executor.py b/transfer_service/store_executor.py index 11d1324..72b3285 100644 --- a/transfer_service/store_executor.py +++ b/transfer_service/store_executor.py @@ -18,7 +18,7 @@ class StoreExecutor(TaskExecutor): self.tapeClient = TapeClient(self.params["host"], self.params.getint("port"), self.params["user"], - self.params["password"]) + self.params["pkey_file_path"]) self.params = config.loadSection("transfer_node") self.storageStorePath = self.params["store_path"] self.params = config.loadSection("file_catalog") diff --git a/transfer_service/tape_client.py b/transfer_service/tape_client.py index 14c7776..ceb2876 100644 --- a/transfer_service/tape_client.py +++ b/transfer_service/tape_client.py @@ -5,20 +5,16 @@ import scp import sys import uuid -from config import Config from tape_task import TapeTask class TapeClient(object): # Constructor - def __init__(self): - config = Config("vos_ts.conf") - self.params = config.loadSection("spectrum_archive") - self.host = self.params["host"] - self.port = self.params.getint("port") - self.user = self.params["user"] - self.keyFile = self.params["pkey_file_path"] + def __init__(self, host, port, user, keyFile): + self.host = host + self.port = port + self.user = user self.key = paramiko.RSAKey.from_private_key_file(keyFile) self.client = paramiko.SSHClient() self.client.set_missing_host_key_policy(paramiko.AutoAddPolicy()) -- GitLab