Merge pull request #5764 from chaen/cherry-pick-2-3eade1f52-integration

[sweep:integration] Replace RPCClient with Client

Author: fstagni

docs/source/DeveloperGuide/AddingNewComponents/DevelopingAgents/index.rst

@@ -26,7 +26,7 @@ functional although simplest possible agent::
    # # imports
    from DIRAC import S_OK, S_ERROR
    from DIRAC.Core.Base.AgentModule import AgentModule
-   from DIRAC.Core.DISET.RPCClient import RPCClient
+   from DIRAC.Core.Base.Client import Client
 
 
    __RCSID__ = "Id$"
@@ -54,7 +54,7 @@ functional although simplest possible agent::
        :param self: self reference
        """
        self.log.info("message is: %s" % self.message)
-       simpleMessageService = RPCClient('Framework/Hello')
+       simpleMessageService = Client(url='Framework/Hello')
        result = simpleMessageService.sayHello(self.message)
        if not result['OK']:
          self.log.error("Error while calling the service: %s" % result['Message'])

docs/source/DeveloperGuide/WebAppDIRAC/DevelopWebApp/index.rst

@@ -198,7 +198,7 @@ by the server is shown in the textarea.
   .. code-block:: python
 
     from WebAppDIRAC.Lib.WebHandler import WebHandler
-    from DIRAC.Core.DISET.RPCClient import RPCClient
+    from DIRAC.Core.Base.Client import Client
     import random
 
 
@@ -235,7 +235,7 @@ by the server is shown in the textarea.
           """
           @asyncGen
           def web_getServiceInfo(self):
-                  RPC = RPCClient("WorkloadManagement/JobMonitoring")
+                  RPC = Client(url="WorkloadManagement/JobMonitoring")
                   result = yield self.threadTask(RPC.ping)
                   self.finish({"info": str(result['Value'])})
 

src/DIRAC/AccountingSystem/Client/Types/BaseAccountingType.py

@@ -8,7 +8,7 @@
 
 from DIRAC import S_OK, S_ERROR
 from DIRAC.Core.Utilities import Time
-from DIRAC.Core.DISET.RPCClient import RPCClient
+from DIRAC.Core.Base.Client import Client
 from DIRAC.AccountingSystem.Client.DataStoreClient import gDataStoreClient
 
 
@@ -169,7 +169,7 @@ def registerToServer(self):
         """
         Register type in server
         """
-        rpcClient = RPCClient("Accounting/DataStore")
+        rpcClient = Client(url="Accounting/DataStore")
         return rpcClient.registerType(*self.getDefinition())
 
     def commit(self):

src/DIRAC/AccountingSystem/Service/DataStoreHandler.py

@@ -22,7 +22,7 @@
 from DIRAC.Core.DISET.RequestHandler import RequestHandler, getServiceOption
 from DIRAC.Core.Utilities import Time
 from DIRAC.Core.Utilities.ThreadScheduler import gThreadScheduler
-from DIRAC.Core.DISET.RPCClient import RPCClient
+from DIRAC.Core.Base.Client import Client
 
 __RCSID__ = "$Id$"
 
@@ -184,7 +184,7 @@ def export_compactDB(self):
         if self.runBucketing:
             return self.__acDB.compactBuckets()  # pylint: disable=no-member
 
-        return RPCClient("Accounting/DataStoreMaster").compactDB()
+        return Client(url="Accounting/DataStoreMaster").compactDB()
 
     types_remove = [str, datetime.datetime, datetime.datetime, list]
 

src/DIRAC/Core/Tornado/Client/private/TornadoBaseClient.py

@@ -51,8 +51,6 @@
 from DIRAC.Core.Utilities import Network
 from DIRAC.Core.Utilities.JEncode import decode, encode
 
-from DIRAC.Resources.IdProvider.IdProviderFactory import IdProviderFactory
-from DIRAC.FrameworkSystem.private.authorization.utils.Tokens import getLocalTokenDict, writeTokenDictToTokenFile
 
 # TODO CHRIS: refactor all the messy `discover` methods
 # I do not do it now because I want first to decide
@@ -249,6 +247,8 @@ def __discoverCredentialsToUse(self):
         self.kwargs[self.KW_USE_ACCESS_TOKEN] = self.__useAccessToken
 
         if self.__useAccessToken:
+            from DIRAC.Resources.IdProvider.IdProviderFactory import IdProviderFactory
+
             result = IdProviderFactory().getIdProvider("DIRACCLI")
             if not result["OK"]:
                 return result
@@ -531,6 +531,11 @@ def _request(self, retry=0, outputFile=None, **kwargs):
 
         # Use access token?
         elif self.__useAccessToken:
+            from DIRAC.FrameworkSystem.private.authorization.utils.Tokens import (
+                getLocalTokenDict,
+                writeTokenDictToTokenFile,
+            )
+
             # Read token from token environ variable or from token file
             result = getLocalTokenDict()
             if not result["OK"]:

src/DIRAC/FrameworkSystem/Client/MonitoringClient.py

@@ -18,7 +18,7 @@
 from DIRAC.Core.Utilities.LockRing import LockRing
 from DIRAC.ConfigurationSystem.Client import PathFinder
 from DIRAC.Core.Utilities import Time, Network, ThreadScheduler
-from DIRAC.Core.DISET.RPCClient import RPCClient
+from DIRAC.Core.Base.Client import Client
 
 
 class MonitoringClientActivityNotDefined(Exception):
@@ -395,7 +395,7 @@ def __sendData(self, secsTimeout=False):
         else:
             self.logger.debug("Creating RPC client")
             # Here is where the client is created from the running Framework/Monitoring service.
-            rpcClient = RPCClient("Framework/Monitoring", timeout=secsTimeout)
+            rpcClient = Client(url="Framework/Monitoring", timeout=secsTimeout)
         # Send registrations
         if not self.__sendRegistration(rpcClient):
             return False
@@ -475,7 +475,7 @@ def getComponentsStatus(self, condDict):
         :param condDict: A condition dictionary.
         :return: S_OK with status and message about the component.
         """
-        rpcClient = RPCClient("Framework/Monitoring", timeout=100)
+        rpcClient = Client(url="Framework/Monitoring", timeout=100)
         return rpcClient.getComponentsStatus(condDict)
 
     def __filterComponent(self, component, condDict):

src/DIRAC/FrameworkSystem/Client/PlottingClient.py

@@ -8,8 +8,8 @@
 
 import tempfile
 from DIRAC import S_OK, S_ERROR
-from DIRAC.Core.DISET.RPCClient import RPCClient
 from DIRAC.Core.Tornado.Client.ClientSelector import TransferClientSelector as TransferClient
+from DIRAC.Core.Base.Client import Client
 
 
 class PlottingClient(object):
@@ -21,7 +21,7 @@ def __init__(self, rpcClient=None, transferClient=None):
     def __getRPCClient(self):
         if self.rpcClient:
             return self.rpcClient
-        return RPCClient(self.serviceName)
+        return Client(url=self.serviceName)
 
     def __getTransferClient(self):
         if self.transferClient:

src/DIRAC/FrameworkSystem/Client/ProxyManagerClient.py

@@ -15,7 +15,7 @@
 from DIRAC.Core.Security.X509Request import X509Request  # pylint: disable=import-error
 from DIRAC.Core.Security.VOMS import VOMS
 from DIRAC.Core.Security import Locations
-from DIRAC.Core.DISET.RPCClient import RPCClient
+from DIRAC.Core.Base.Client import Client
 
 gUsersSync = ThreadSafe.Synchronizer()
 gProxiesSync = ThreadSafe.Synchronizer()
@@ -68,7 +68,7 @@ def __refreshUserCache(self, validSeconds=0):
 
         :return: S_OK()/S_ERROR()
         """
-        rpcClient = RPCClient("Framework/ProxyManager", timeout=120)
+        rpcClient = Client(url="Framework/ProxyManager", timeout=120)
         retVal = rpcClient.getRegisteredUsers(validSeconds)
         if not retVal["OK"]:
             return retVal
@@ -151,7 +151,7 @@ def setPersistency(self, userDN, userGroup, persistent):
         persistentFlag = True
         if not persistent:
             persistentFlag = False
-        rpcClient = RPCClient("Framework/ProxyManager", timeout=120)
+        rpcClient = Client(url="Framework/ProxyManager", timeout=120)
         retVal = rpcClient.setPersistency(userDN, userGroup, persistentFlag)
         if not retVal["OK"]:
             return retVal
@@ -196,7 +196,7 @@ def uploadProxy(self, proxy=None, restrictLifeTime=0, rfcIfPossible=False):
         if chain.getDIRACGroup(ignoreDefault=True).get("Value") or chain.isVOMS().get("Value"):
             return S_ERROR("Cannot upload proxy with DIRAC group or VOMS extensions")
 
-        rpcClient = RPCClient("Framework/ProxyManager", timeout=120)
+        rpcClient = Client(url="Framework/ProxyManager", timeout=120)
         # Get a delegation request
         result = rpcClient.requestDelegationUpload(chain.getRemainingSecs()["Value"])
         if not result["OK"]:
@@ -237,9 +237,9 @@ def downloadProxy(
         req = X509Request()
         req.generateProxyRequest(limited=limited)
         if proxyToConnect:
-            rpcClient = RPCClient("Framework/ProxyManager", proxyChain=proxyToConnect, timeout=120)
+            rpcClient = Client(url="Framework/ProxyManager", proxyChain=proxyToConnect, timeout=120)
         else:
-            rpcClient = RPCClient("Framework/ProxyManager", timeout=120)
+            rpcClient = Client(url="Framework/ProxyManager", timeout=120)
         if token:
             retVal = rpcClient.getProxyWithToken(
                 userDN, userGroup, req.dumpRequest()["Value"], int(cacheTime + requiredTimeLeft), token
@@ -322,9 +322,9 @@ def downloadVOMSProxy(
         req = X509Request()
         req.generateProxyRequest(limited=limited)
         if proxyToConnect:
-            rpcClient = RPCClient("Framework/ProxyManager", proxyChain=proxyToConnect, timeout=120)
+            rpcClient = Client(url="Framework/ProxyManager", proxyChain=proxyToConnect, timeout=120)
         else:
-            rpcClient = RPCClient("Framework/ProxyManager", timeout=120)
+            rpcClient = Client(url="Framework/ProxyManager", timeout=120)
         if token:
             retVal = rpcClient.getVOMSProxyWithToken(
                 userDN,
@@ -542,7 +542,7 @@ def deleteProxyBundle(self, idList):
 
         :return: S_OK(int)/S_ERROR()
         """
-        rpcClient = RPCClient("Framework/ProxyManager", timeout=120)
+        rpcClient = Client(url="Framework/ProxyManager", timeout=120)
         return rpcClient.deleteProxyBundle(idList)
 
     def requestToken(self, requesterDN, requesterGroup, numUses=1):
@@ -555,7 +555,7 @@ def requestToken(self, requesterDN, requesterGroup, numUses=1):
 
         :return: S_OK(tuple)/S_ERROR() -- tuple contain token, number uses
         """
-        rpcClient = RPCClient("Framework/ProxyManager", timeout=120)
+        rpcClient = Client(url="Framework/ProxyManager", timeout=120)
         return rpcClient.generateToken(requesterDN, requesterGroup, numUses)
 
     def renewProxy(self, proxyToBeRenewed=None, minLifeTime=3600, newProxyLifeTime=43200, proxyToConnect=None):
@@ -641,7 +641,7 @@ def getDBContents(self, condDict={}, sorting=[["UserDN", "DESC"]], start=0, limi
 
         :return: S_OK(dict)/S_ERROR() -- dict contain fields, record list, total records
         """
-        rpcClient = RPCClient("Framework/ProxyManager", timeout=120)
+        rpcClient = Client(url="Framework/ProxyManager", timeout=120)
         return rpcClient.getContents(condDict, sorting, start, limit)
 
     def getVOMSAttributes(self, chain):
@@ -683,7 +683,7 @@ def getUserProxiesInfo(self):
 
         :return: S_OK(dict)/S_ERROR()
         """
-        result = RPCClient("Framework/ProxyManager", timeout=120).getUserProxiesInfo()
+        result = Client(url="Framework/ProxyManager", timeout=120).getUserProxiesInfo()
         if "rpcStub" in result:
             result.pop("rpcStub")
         return result

src/DIRAC/FrameworkSystem/Client/SecurityLogClient.py

@@ -7,7 +7,7 @@
 import syslog
 
 from DIRAC import gLogger, gConfig
-from DIRAC.Core.DISET.RPCClient import RPCClient
+from DIRAC.Core.Base.Client import Client
 from DIRAC.Core.Utilities import Time
 from DIRAC.Core.Utilities.ThreadScheduler import gThreadScheduler
 
@@ -67,7 +67,7 @@ def __sendData(self):
         gLogger.debug("Sending records to security log service...")
         msgList = self.__messagesList
         self.__messagesList = []
-        rpcClient = RPCClient("Framework/SecurityLogging")
+        rpcClient = Client(url="Framework/SecurityLogging")
         for _i in range(0, len(msgList), self.__maxMessagesInBundle):
             msgsToSend = msgList[: self.__maxMessagesInBundle]
             result = rpcClient.logActionBundle(msgsToSend)

src/DIRAC/FrameworkSystem/Client/UserProfileClient.py

@@ -3,17 +3,17 @@
 from __future__ import print_function
 
 from DIRAC import S_OK, S_ERROR
-from DIRAC.Core.DISET.RPCClient import RPCClient
+from DIRAC.Core.Base.Client import Client
 from DIRAC.Core.Utilities import DEncode
 
 
 class UserProfileClient(object):
-    def __init__(self, profile, rpcClientFunctor=RPCClient):
+    def __init__(self, profile, rpcClientFunctor=Client):
         self.rpcClientFunctor = rpcClientFunctor
         self.profile = profile
 
     def __getRPCClient(self):
-        return self.rpcClientFunctor("Framework/UserProfileManager")
+        return self.rpcClientFunctor(url="Framework/UserProfileManager")
 
     def storeVar(self, varName, data, perms={}):
         try: