From 2d76247d02925c25651e2df71a6fb492a92e9beb Mon Sep 17 00:00:00 2001
From: Cristiano Urban <cristiano.urban.slack@gmail.com>
Date: Mon, 1 Mar 2021 14:30:32 +0100
Subject: [PATCH] Fixed typo + cleanup.

Signed-off-by: Cristiano Urban <cristiano.urban.slack@gmail.com>
---
 transfer_service/db_connector.py        |  2 --
 transfer_service/storage_amqp_server.py | 46 ++++++++++++-------------
 2 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/transfer_service/db_connector.py b/transfer_service/db_connector.py
index e65d533..024445a 100644
--- a/transfer_service/db_connector.py
+++ b/transfer_service/db_connector.py
@@ -449,5 +449,3 @@ class DbConnector(object):
                     (storageId,))
                 self.conn.commit()
                 return True
-            
-                
diff --git a/transfer_service/storage_amqp_server.py b/transfer_service/storage_amqp_server.py
index 3cb5eff..5aaf313 100644
--- a/transfer_service/storage_amqp_server.py
+++ b/transfer_service/storage_amqp_server.py
@@ -9,12 +9,12 @@ class StorageAMQPServer(AMQPServer):
 
     def __init__(self, host, port, queue):
         self.type = "storage"
-        config = Config("vos_ts.conf")       
+        config = Config("vos_ts.conf")
         self.params = config.loadSection("file_catalog")
-        self.dbConn = DbConnector(self.params["user"], 
-                                  self.params["password"], 
-                                  self.params["host"], 
-                                  self.params.getint("port"), 
+        self.dbConn = DbConnector(self.params["user"],
+                                  self.params["password"],
+                                  self.params["host"],
+                                  self.params.getint("port"),
                                   self.params["db"])
         self.storageType = None
         self.storageBasePath = None
@@ -22,28 +22,28 @@ class StorageAMQPServer(AMQPServer):
         self.storageId = None
         self.storageAck = False
         super(StorageAMQPServer, self).__init__(host, port, queue)
-    
+
     def execute_callback(self, requestBody):
         # 'requestType', 'mountPoint', 'hostname' and 'storageType' attributes are mandatory
         if "requestType" not in requestBody:
             response = { "responseType": "ERROR",
                          "errorCode": 1, 
                          "errorMsg": "Malformed request, missing parameters." }
-            
+
         elif requestBody["requestType"] == "STORAGE_ADD":
             self.storageType = requestBody["storageType"]
             self.storageBasePath = requestBody["basePath"]
             self.storageHostname = requestBody["hostname"]
-            
+
             if not os.path.exists(self.storageBasePath):
                 response = { "responseType": "ERROR",
                              "errorCode": 2,
                              "errorMsg": "Base path doesn't exist."}
                 return response
-            
+
             self.dbConn.connect()
-            result = self.dbConn.insertStorage(self.storageType, 
-                                               self.storageBasePath, 
+            result = self.dbConn.insertStorage(self.storageType,
+                                               self.storageBasePath,
                                                self.storageHostname)
             self.dbConn.disconnect()
 
@@ -53,17 +53,17 @@ class StorageAMQPServer(AMQPServer):
                 response = { "responseType": "ERROR",
                              "errorCode": 3,
                              "errorMsg": "Storage point already exists." }
-            
+
         elif requestBody["requestType"] == "STORAGE_DEL_REQ":
             self.dbConn.connect()
             result = self.dbConn.getStorageList()
             self.dbConn.disconnect()
-            
+
             response = { "responseType": "STORAGE_DEL_ACK",
                          "storageList": result }
-            
+
             self.storageAck = True
-            
+
         elif requestBody["requestType"] == "STORAGE_DEL_CON":
             self.storageId = requestBody["storageId"]
             if self.storageAck:
@@ -71,33 +71,33 @@ class StorageAMQPServer(AMQPServer):
                 self.dbConn.connect()
                 result = self.dbConn.deleteStorage(self.storageId)
                 self.dbConn.disconnect()
-            
+
                 if result:
                     response = { "responseType": "STORAGE_DEL_DONE" }
                 else:
                     response = { "responseType": "ERROR",
                                  "errorCode": 4,
-                                 "errorMsg": "This storage location contains some VOSpace nodes. Please, move them to anoter location." }
+                                 "errorMsg": "This storage location contains some VOSpace nodes. Please, move those nodes to another location." }
             else:
                 response = { "responseType": "ERROR",
                              "errorCode": 5,
                              "errorMsg": "Store request not acknowledged." }
-        
-        elif requestBody["requestType"] == "STORAGE_LST":            
+
+        elif requestBody["requestType"] == "STORAGE_LST":
             self.dbConn.connect()
             result = self.dbConn.getStorageList()
             self.dbConn.disconnect()
-            
+
             response = { "responseType": "STORAGE_LST_DONE",
                          "storageList": result }
-        
+
         else:
             response = { "responseType": "ERROR",
                          "errorCode": 6,
                          "errorMsg": "Unkown request type." }
-        
+
         return response
-    
+
     def run(self):
         print(f"Starting AMQP server of type {self.type}...")
         super(StorageAMQPServer, self).run()
-- 
GitLab