Merge pull request #79 from thecuriousneutrino/master

IN2P3 SEs have been updated, and error handling of the get_SE method improved

Author: thecuriousneutrino

CHANGELOG.md

@@ -6,7 +6,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
-Nothing
+### Fixed
+- Basepath string for IN2P3-CC-XRD-tape and IN2P3-CC-XRD-disk is corrected (// is replaced with / for an exact string match with the host name string).
+- BackendException for cases where the get_SE method returns None because the host name string is not contained inside the file URL are added.
 
 ## [1.17.5] - 2022-02-26
 ### Changed

t2kdm/backends.py

@@ -1009,10 +1009,20 @@ def _replicate(self, source_surl, destination_surl, lurl, verbose=False, **kwarg
         else:
             out = None
 
-        source = storage.get_SE(source_surl).name
-        destination = storage.get_SE(destination_surl).name
+        source = storage.get_SE(source_surl)
+        if source is None:
+            raise BackendException(
+                "Could not find storage element with host name string contained inside %s."
+                % (source_surl)
+            )
+        destination = storage.get_SE(destination_surl)
+        if destination is None:
+            raise BackendException(
+                "Could not find storage element with host name string contained inside %s."
+                % (destination_surl)
+            )
         try:
-            self._replicate_cmd(lurl, destination, source, _out=out, **kwargs)
+            self._replicate_cmd(lurl, destination.name, source.name, _out=out, **kwargs)
         except sh.ErrorReturnCode as e:
             if "No such file" in str(e.stderr):
                 raise DoesNotExistException("No such file or directory.")
@@ -1048,10 +1058,15 @@ def _put(self, localpath, surl, lurl, verbose=False, **kwargs):
             out = sys.stdout
         else:
             out = None
-        se = storage.get_SE(surl).name
+        se = storage.get_SE(surl)
+        if se is None:
+            raise BackendException(
+                "Could not find storage element with host name string contained inside %s."
+                % (surl)
+            )
 
         try:
-            self._add_cmd(lurl, localpath, se, _out=out, **kwargs)
+            self._add_cmd(lurl, localpath, se.name, _out=out, **kwargs)
         except sh.ErrorReturnCode as e:
             if "No such file" in str(e.stderr):
                 raise DoesNotExistException("No such file or directory.")
@@ -1063,7 +1078,12 @@ def _put(self, localpath, surl, lurl, verbose=False, **kwargs):
         return True
 
     def _remove(self, surl, lurl, last=False, verbose=False, **kwargs):
-        se = storage.get_SE(surl).name
+        se = storage.get_SE(surl)
+        if se is None:
+            raise BackendException(
+                "Could not find storage element with host name string contained inside %s."
+                % (surl)
+            )
 
         if last:
             # Delete lfn
@@ -1072,8 +1092,8 @@ def _remove(self, surl, lurl, last=False, verbose=False, **kwargs):
             ret = self.dm.removeFile([lurl])
         else:
             if verbose:
-                print_("Removing replica of %s from %s." % (lurl, se))
-            ret = self.dm.removeReplica(se, [lurl])
+                print_("Removing replica of %s from %s." % (lurl, se.name))
+            ret = self.dm.removeReplica(se.name, [lurl])
 
         if not ret["OK"]:
             raise BackendException("Failed: %s" % (ret["Message"]))

t2kdm/storage.py

@@ -241,15 +241,15 @@ def __str__(self):
         type="disk",
         location="/europe/fr/in2p3",
         directpath="root://ccxrdrli04.in2p3.fr:1097/xrootd/in2p3.fr/disk/t2k.org",
-        basepath="root://ccxrdrli04.in2p3.fr:1097//xrootd/in2p3.fr/disk/t2k.org",
+        basepath="root://ccxrdrli04.in2p3.fr:1097/xrootd/in2p3.fr/disk/t2k.org",
     ),
     StorageElement(
         "IN2P3-CC-XRD-tape",
         host="ccxrdrli04.in2p3.fr:1097/xrootd/in2p3.fr/tape",
         type="tape",
         location="/europe/fr/in2p3",
         directpath="root://ccxrdrli04.in2p3.fr:1097/xrootd/in2p3.fr/tape/t2k.org",
-        basepath="root://ccxrdrli04.in2p3.fr:1097//xrootd/in2p3.fr/tape/t2k.org",
+        basepath="root://ccxrdrli04.in2p3.fr:1097/xrootd/in2p3.fr/tape/t2k.org",
     ),
     StorageElement(
         "IN2P3-CC-disk",