Merge pull request #8381 from fstagni/90_add_VO_DM

[9.0] fix: make sure the DataManager knows the VO

Author: fstagni

src/DIRAC/DataManagementSystem/Client/DataManager.py

@@ -10,11 +10,11 @@
 """
 
 # # imports
-from datetime import datetime, timedelta
+import errno
 import fnmatch
 import os
 import time
-import errno
+from datetime import datetime, timedelta
 
 # # from DIRAC
 import DIRAC
@@ -25,13 +25,13 @@
 from DIRAC.Core.Utilities.List import randomize, breakListIntoChunks
 from DIRAC.Core.Utilities.ReturnValues import returnSingleResult
 from DIRAC.Core.Security.ProxyInfo import getProxyInfo
+from DIRAC.Core.Security.ProxyInfo import getVOfromProxyGroup
 from DIRAC.ConfigurationSystem.Client.Helpers.Operations import Operations
 from DIRAC.DataManagementSystem.Client import MAX_FILENAME_LENGTH
-from DIRAC.MonitoringSystem.Client.DataOperationSender import DataOperationSender
 from DIRAC.DataManagementSystem.Utilities.DMSHelpers import DMSHelpers
+from DIRAC.MonitoringSystem.Client.DataOperationSender import DataOperationSender
 from DIRAC.Resources.Catalog.FileCatalog import FileCatalog
 from DIRAC.Resources.Storage.StorageElement import StorageElement
-from DIRAC.ResourceStatusSystem.Client.ResourceStatus import ResourceStatus
 
 
 # # RSCID
@@ -89,18 +89,17 @@ def __init__(self, catalogs=None, masterCatalogOnly=False, vo=False):
         :param vo: the VO for which the DataManager is created, get VO from the current proxy if not specified
         """
         self.log = gLogger.getSubLogger(self.__class__.__name__)
-        self.voName = vo
+        self.voName = vo if vo else getVOfromProxyGroup().get("Value", None)
 
         if catalogs is None:
             catalogs = []
         catalogsToUse = FileCatalog(vo=self.voName).getMasterCatalogNames()["Value"] if masterCatalogOnly else catalogs
 
         self.fileCatalog = FileCatalog(catalogs=catalogsToUse, vo=self.voName)
         self.accountingClient = None
-        self.resourceStatus = ResourceStatus()
         self.ignoreMissingInFC = Operations(vo=self.voName).getValue("DataManagement/IgnoreMissingInFC", False)
         self.useCatalogPFN = Operations(vo=self.voName).getValue("DataManagement/UseCatalogPFN", True)
-        self.dmsHelper = DMSHelpers(vo=vo)
+        self.dmsHelper = DMSHelpers(vo=self.voName)
         self.registrationProtocol = self.dmsHelper.getRegistrationProtocols()
         self.thirdPartyProtocols = self.dmsHelper.getThirdPartyProtocols()
         self.dataOpSender = DataOperationSender()