From f8a25a24364360145d8928fa141c2106499e63dc Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Wed, 20 Jan 2016 10:19:33 +0000
Subject: [PATCH] Task #8725: use all sara doors
---
LTA/LTAIngest/ltacp.py | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/LTA/LTAIngest/ltacp.py b/LTA/LTAIngest/ltacp.py
index aee4e7a2d87..6f6b0554257 100755
--- a/LTA/LTAIngest/ltacp.py
+++ b/LTA/LTAIngest/ltacp.py
@@ -55,12 +55,16 @@ def getLocalIPAddress():
# converts given srm url of an LTA site into a transport url as needed by gridftp. (Sring replacement based on arcane knowledge.)
def convert_surl_to_turl(surl):
- sara_nodes = ['fly%d' % i for i in range(1, 10)] # + \
- #['wasp%d' % i for i in range(1, 10)] + \
- #['by27-%d' % i for i in range(1, 10)] + \
- #['bw27-%d' % i for i in range(1, 10)] + \
- #['by32-%d' % i for i in range(1, 10)] + \
- #['bw32-%d' % i for i in range(1, 10)]
+ #list of sara doors is based on recent actual transfers using srmcp, which translates the surl to a 'random' turl
+ sara_nodes = ['fly%d' % i for i in range(1, 11)] + \
+ ['wasp%d' % i for i in range(1, 10)] + \
+ ['by27-%d' % i for i in range(1, 10)] + \
+ ['bw27-%d' % i for i in range(1, 10)] + \
+ ['by32-%d' % i for i in range(1, 10)] + \
+ ['bw32-%d' % i for i in range(4, 10)] + \
+ ['s35-0%d' % i for i in range(1, 5)] + \
+ ['v40-%d' % i for i in range(8, 11)] + \
+ ['rabbit%d' % i for i in range(1, 4)]
sara_turl = 'gsiftp://%s.grid.sara.nl:2811' % sara_nodes[random.randint(0, len(sara_nodes)-1)]
turl = surl.replace("srm://srm.grid.sara.nl:8443",sara_turl, 1)
turl = turl.replace("srm://srm.grid.sara.nl",sara_turl,1)
--
GitLab