Fixes to work with new PyUnicore version

Some fixes to use new version of PyUnicore

PyUnicoreManager.py

@@ -126,18 +126,23 @@ class PyUnicoreManager(object):
         #    self.transport.preferences = "group:" + str(self.env.conn_info["serverProjectName"])
 
         self.registry = unicore_client.Registry(self.transport, self.env.conn_info["serverToRegister"])
-        self.site = self.registry.site(self.env.conn_info["serverToConnect"])
-        self.client = unicore_client.Client(self.transport, self.site.site_url)
+        name = self.env.conn_info["serverToConnect"]
+        self.site = self.registry.site(name)
+        site_url = self.registry.site_urls[name]
+        self.client = unicore_client.Client(self.transport, site_url)
 
+        
+        dsep = self.env.urls["destination_server_endpoint"]
         try:
             for storage in self.site.get_storages():
-                if storage.storage_url.endswith(self.env.urls["destination_server_endpoint"]):
+                if storage.resource_url.endswith(dsep):
                     self.storage = storage
                     break
         except Exception as e:
             logss.error("Source not available " + self.env.conn_info["serverProjectName"])
             return
 
+
         if not self.storage:
             logss.error("Source not available " + self.env.urls["destination_server_endpoint"])
             has_errors = True
@@ -145,6 +150,7 @@ class PyUnicoreManager(object):
         if self.clean_job_storages:
             self.clean_storages(endswith="-uspace")
 
+
         # Get the object Storage
         # Endpoint of Storage is mapped from env variables of your account into the UNICORE
         if self.env.conn_info["serverProjectName"]:
@@ -168,7 +174,7 @@ class PyUnicoreManager(object):
     def getStorage(self):
         if (self.verbose):
             for storage in self.client.get_storages():
-                logss.info(storage.storage_url)
+                logss.info(storage.resource_url)
 
         return self.client.get_storages()
 
@@ -192,12 +198,12 @@ class PyUnicoreManager(object):
             logss.info("Cleaning storage endpoints. Working on it...")
             for storage in self.client.get_storages():
                 msg = ""
-                if storage.storage_url.endswith(str(endswith)):
-                    self.transport.delete(url=storage.storage_url)
+                if storage.resource_url.endswith(str(endswith)):
+                    self.transport.delete(url=storage.resource_url)
                     count += 1
-                    msg = str(storage.storage_url).split("/")[-1] + " has been removed"
+                    msg = str(storage.resource_url).split("/")[-1] + " has been removed"
                 else:
-                    msg = "Keep: " + str(storage.storage_url)
+                    msg = "Keep: " + str(storage.resource_url)
 
                 if self.verbose:
                     logss.info(msg)
@@ -224,6 +230,7 @@ class PyUnicoreManager(object):
 
     def __run_job(self, job):
         result_job = {}
+        print("Running job: " + str(job))
         try:
             cmd_job = self.client.new_job(job_description=job)
             # logss.info(cmd_job.properties['status'])
@@ -260,7 +267,7 @@ class PyUnicoreManager(object):
                 return
 
             # Uploading files
-            logss.info("Uploading to " + str(self.storage.storage_url))
+            logss.info("Uploading to " + str(self.storage.resource_url))
             list_files = list()
             # destination="collab/filename"
             for file_info in filesToUpload:
@@ -282,7 +289,7 @@ class PyUnicoreManager(object):
                 logss.info("Nothing to download")
                 return
 
-            logss.info("Downloading from " + self.storage.storage_url)
+            logss.info("Downloading from " + self.storage.resource_url)
             list_files = list()
             for file_info in filesToDownload:
                 filename = str(file_info[1]).split('/')[-1]  # getting the last element