Removed davs protocol from allowed direct access schemas

PanDAWMS · Dec 10, 2018 · 3b3db7a · 3b3db7a
1 parent f2cd454
commit 3b3db7a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/CHANGES b/CHANGES
@@ -252,7 +252,6 @@ File Changes
 M movers/mover.py (10)
 M movers/rucio_sitemover.py (19)
 
-
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 73.7:
@@ -316,6 +315,13 @@ M movers/objectstore_sitemover.py (15)
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
+73.8:
+
+Davs in direct access
+- Removed davs protocol from allowed direct access schemas (Job, mover)
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
 TODO:
 
 todo: remove the explicit usages of schedconfig.lfchost and replace with an experiment specific method (getFileCatalog())

diff --git a/Job.py b/Job.py
@@ -1294,7 +1294,7 @@ def is_directaccess(self, ensure_replica=True):
 
         if ensure_replica:
 
-            allowed_replica_schemas = ['root://', 'davs://', 'dcache://', 'dcap://', 'file://', 'https://']
+            allowed_replica_schemas = ['root://', 'dcache://', 'dcap://', 'file://', 'https://']
 
             if self.turl:
                 if True not in set([self.turl.startswith(e) for e in allowed_replica_schemas]):

diff --git a/PILOTVERSION b/PILOTVERSION
@@ -1 +1 @@
-PICARD 73.7
+PICARD 73.8
diff --git a/movers/mover.py b/movers/mover.py
@@ -50,7 +50,7 @@ class JobMover(object):
     _stageout_sleeptime_max = 5*60    # seconds, max allowed sleep time in case of stageout failure
 
     direct_remoteinput_allowed_schemas = ['root']  ## list of allowed schemas to be used for direct acccess mode from REMOTE replicas
-    direct_input_allowed_schemas = ['root', 'davs', 'dcache', 'dcap', 'file', 'https']  ## list of allowed schemas to be used for direct acccess mode from local replicas
+    direct_input_allowed_schemas = ['root', 'dcache', 'dcap', 'file', 'https']  ## list of allowed schemas to be used for direct acccess mode from local replicas
 
     remoteinput_allowed_schemas = ['root', 'gsiftp', 'dcap', 'davs', 'srm'] ## extend me later if need