Merge pull request #2199 from fstagni/removeUseShifterProxy

[v6r12] Removed use of shifter proxy (read-only operations)
DIRACGrid · Dec 15, 2014 · f61db38 · f61db38
2 parents 722b77a + 7c28d5d
commit f61db38
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 19 deletions.
diff --git a/TransformationSystem/Agent/MCExtensionAgent.py b/TransformationSystem/Agent/MCExtensionAgent.py
@@ -32,8 +32,6 @@ def initialize( self ):
     '''Sets defaults
     '''
 
-    self.am_setOption( 'shifterProxy', 'DataManager' )
-
     gLogger.info( "Will consider the following transformation types: %s" % str( self.transformationTypes ) )
     gLogger.info( "Will create a maximum of %s tasks per iteration" % self.maxIterationTasks )
     gLogger.info( "Will not submit tasks for transformations with failure rate greater than %s%%" % ( self.maxFailRate ) )

diff --git a/TransformationSystem/Agent/TaskManagerAgentBase.py b/TransformationSystem/Agent/TaskManagerAgentBase.py
@@ -67,8 +67,6 @@ def initialize( self ):
     gMonitor.registerActivity( "SubmittedTasks", "Automatically submitted tasks", "Transformation Monitoring", "Tasks",
                                gMonitor.OP_ACUM )
 
-    self.am_setOption( 'shifterProxy', 'ProductionManager' )
-
     # Default clients
     self.transClient = TransformationClient()
 

diff --git a/TransformationSystem/Agent/TransformationAgent.py b/TransformationSystem/Agent/TransformationAgent.py
@@ -80,9 +80,6 @@ def initialize( self ):
     # clients
     self.transfClient = TransformationClient()
 
-    # shifter
-    self.am_setOption( 'shifterProxy', 'ProductionManager' )
-
     # for caching using a pickle file
     self.__readCache()
     self.workDirectory = self.am_getWorkDirectory()

diff --git a/TransformationSystem/Agent/ValidateOutputDataAgent.py b/TransformationSystem/Agent/ValidateOutputDataAgent.py
@@ -43,11 +43,6 @@ def __init__( self, *args, **kwargs ):
   def initialize( self ):
     """ Sets defaults
     """
-    # This sets the Default Proxy to used as that defined under
-    # /Operations/Shifter/DataManager
-    # the shifterProxy option in the Configuration can be used to change this default.
-    self.am_setOption( 'shifterProxy', 'DataManager' )
-
     gLogger.info( "Will treat the following transformation types: %s" % str( self.transformationTypes ) )
     gLogger.info( "Will search for directories in the following locations: %s" % str( self.directoryLocations ) )
     gLogger.info( "Will check the following storage elements: %s" % str( self.activeStorages ) )

diff --git a/WorkloadManagementSystem/Agent/InputDataAgent.py b/WorkloadManagementSystem/Agent/InputDataAgent.py
@@ -32,8 +32,6 @@ def initializeOptimizer( self ):
     #this will ignore failover SE files
     self.checkFileMetadata = self.am_getOption( 'CheckFileMetadata', True )
 
-    self.am_setOption( 'shifterProxy', 'DataManager' )
-
     self.dataManager = DataManager()
     self.resourceStatus = ResourceStatus()
     self.fc = FileCatalog()

diff --git a/WorkloadManagementSystem/Executor/InputData.py b/WorkloadManagementSystem/Executor/InputData.py
@@ -34,11 +34,6 @@ def initializeOptimizer( cls ):
     #this will ignore failover SE files
     cls.checkFileMetadata = cls.ex_getOption( 'CheckFileMetadata', True )
 
-    #Define the shifter proxy needed
-    # This sets the Default Proxy to used as that defined under
-    # the shifterProxy option in the Configuration can be used to change this default.
-    cls.ex_setProperty( 'shifterProxy', 'DataManager' )
-
     cls.__dataManDict = {}
     cls.__fcDict = {}
     cls.__SEToSiteMap = {}