Merge pull request #75 from thecuriousneutrino/master

Updated RAL-LCG2-T2K-tape, IN2P3-CC-XRD-disk and IN2P3-CC-XRD-tape SEs, and replaced deprecated bringonline command.
t2k-software · Feb 21, 2024 · 1c2b364 · 1c2b364
2 parents b9f53f4 + 3462c52
commit 1c2b364
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/t2kdm/backends.py b/t2kdm/backends.py
@@ -747,9 +747,7 @@ def __init__(self, **kwargs):
 
         self._xattr_cmd = sh.Command("gfal-xattr").bake(_tty_out=False)
         self._replica_checksum_cmd = sh.Command("gfal-sum").bake(_tty_out=False)
-        self._bringonline_cmd = sh.Command("gfal-legacy-bringonline").bake(
-            _tty_out=False
-        )
+        self._bringonline_cmd = sh.Command("gfal-bringonline").bake(_tty_out=False)
         self._cp_cmd = sh.Command("gfal-copy").bake(_tty_out=False)
         self._ls_se_cmd = sh.Command("gfal-ls").bake(color="never", _tty_out=False)
         self._move_cmd = sh.Command("gfal-rename").bake(_tty_out=False)

diff --git a/t2kdm/storage.py b/t2kdm/storage.py
@@ -3,6 +3,7 @@
 import posixpath
 import t2kdm as dm
 from six import print_
+import os
 
 
 class StorageElement(object):
@@ -167,10 +168,11 @@ def __str__(self):
 SEs = [
     StorageElement(
         "RAL-LCG2-T2K-tape",
-        host="x509up_u8000133@antares.stfc.ac.uk",
+        host="antares.stfc.ac.uk",
         type="tape",
         location="/europe/uk/ral",
-        basepath="root://x509up_u8000133@antares.stfc.ac.uk:1094//eos/antares/prod",
+        basepath="root://x509up_u%s@antares.stfc.ac.uk:1094//eos/antares/prod"
+        % (os.getuid()),
     ),
     StorageElement(
         "UKI-SOUTHGRID-RALPP-disk",
@@ -235,24 +237,24 @@ def __str__(self):
     ),
     StorageElement(
         "IN2P3-CC-XRD-disk",
-        host="ccxroot.in2p3.fr:1097//xrootd/in2p3.fr/disk",
+        host="ccxrdrli04.in2p3.fr:1097/xrootd/in2p3.fr/disk",
         type="disk",
         location="/europe/fr/in2p3",
-        directpath="root://ccxrdli283.in2p3.fr:1094/xrootd/in2p3.fr/disk/t2k.org",
-        basepath="root://ccxroot.in2p3.fr:1097//xrootd/in2p3.fr/disk/t2k.org",
+        directpath="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="ccxroot.in2p3.fr:1097//xrootd/in2p3.fr/tape",
+        host="ccxrdrli04.in2p3.fr:1097/xrootd/in2p3.fr/tape",
         type="tape",
         location="/europe/fr/in2p3",
-        directpath="root://ccxrdli283.in2p3.fr:1094/xrootd/in2p3.fr/tape/t2k.org",
-        basepath="root://ccxroot.in2p3.fr:1097//xrootd/in2p3.fr/tape/t2k.org",
+        directpath="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",
         broken=True,
-        host="in2p3.fr",
+        host="polgrid4.in2p3.fr",
         type="disk",
         location="/europe/fr/in2p3",
         basepath="srm://polgrid4.in2p3.fr/dpm/in2p3.fr/home/t2k.org",