Task #11220: use sara's round robin dns to get turl. minor improvements in...

Task #11220: use sara's round robin dns to get turl. minor improvements in string replacement using regex

LTA/LTAIngest/LTAIngestServer/LTAIngestTransferServer/lib/ltacp.py

@@ -13,6 +13,7 @@ from subprocess import Popen, PIPE
 import socket
 import os, sys, getpass
 import time
+import re
 import random
 import math
 import atexit
@@ -38,26 +39,24 @@ class LtacpDestinationExistsException(LtacpException):
 def getLocalIPAddress():
     return hostnameToIp(socket.gethostname())
 
-# 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):
-    #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)]  + \
-                 ['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)
-    turl = turl.replace("srm://lofar-srm.fz-juelich.de:8443", "gsiftp://dcachepool%d.fz-juelich.de:2811" % (random.randint(9, 16),), 1)
-    turl = turl.replace("srm://lofar-srm.fz-juelich.de", "gsiftp://dcachepool%d.fz-juelich.de:2811" % (random.randint(9, 16),), 1)
-    turl = turl.replace("srm://srm.target.rug.nl:8444","gsiftp://gridftp02.target.rug.nl/target/gpfs2/lofar/home/srm",1)
-    turl = turl.replace("srm://srm.target.rug.nl","gsiftp://gridftp02.target.rug.nl/target/gpfs2/lofar/home/srm",1)
-    turl = turl.replace("srm://lta-head.lofar.psnc.pl:8443", "gsiftp://door0%d.lofar.psnc.pl:2811" % (random.randint(1, 2),), 1)
-    return turl
+    ''' converts given srm url of an LTA site into a transport url as needed by gridftp.
+    '''
+    if 'grid.sara.nl' in surl:
+        #sara provides dynamic hostnames via a round-robin dns. Get a random/dynamic host as provided by them.
+        sara_dyn_hostname = socket.getfqdn(socket.gethostbyname('gridftp.grid.sara.nl'))
+        return re.sub('srm://srm\.grid\.sara\.nl:?\d*', 'gsiftp://%s:2811' % (sara_dyn_hostname,), surl)
+
+    if 'lofar-srm.fz-juelich.de' in surl:
+        host_nr = random.randint(9, 16)
+        return re.sub('srm://lofar-srm\.fz-juelich\.de:?\d*', 'gsiftp://dcachepool%d.fz-juelich.de:2811' % (host_nr,), surl)
+
+    if 'lta-head.lofar.psnc.pl' in surl:
+        host_nr = random.randint(1, 2)
+        return re.sub('srm://lta-head\.lofar\.psnc\.pl:?\d*', 'gsiftp://door0%d.lofar.psnc.pl:2811' % (host_nr,), surl)
+
+    raise LtacpException('Cannot convert surl to turl. Unknown destination in surl: \'%s\'.' % surl)
+
 
 def createNetCatCmd(listener, user=None, host=None):
     '''helper method to determine the proper call syntax for netcat on host'''