DIRAC 9.0.2__py3-none-any.whl → 9.0.4__py3-none-any.whl

DIRAC/ConfigurationSystem/Client/Helpers/Registry.py

@@ -3,18 +3,14 @@
 import errno
 import inspect
 import sys
-
-from threading import Lock
 from collections.abc import Iterable
+from threading import Lock
+from typing import Optional
 
 from cachetools import TTLCache, cached
 from cachetools.keys import hashkey
 
-
-from typing import Optional
-from collections.abc import Iterable
-
-from DIRAC import S_OK, S_ERROR
+from DIRAC import S_ERROR, S_OK
 from DIRAC.ConfigurationSystem.Client.Config import gConfig
 from DIRAC.ConfigurationSystem.Client.Helpers.CSGlobals import getVO
 
@@ -488,28 +484,6 @@ def getVOMSAttributeForGroup(group):
     return gConfig.getValue(f"{gBaseRegistrySection}/Groups/{group}/VOMSRole", getDefaultVOMSAttribute())
 
 
-def getDefaultVOMSVO():
-    """Get default VOMS VO
-
-    :return: str
-    """
-    return gConfig.getValue(f"{gBaseRegistrySection}/DefaultVOMSVO", "") or getVO()
-
-
-def getVOMSVOForGroup(group):
-    """Search VOMS VO for group
-
-    :param str group: group name
-
-    :return: str
-    """
-    vomsVO = gConfig.getValue(f"{gBaseRegistrySection}/Groups/{group}/VOMSVO", getDefaultVOMSVO())
-    if not vomsVO:
-        vo = getVOForGroup(group)
-        vomsVO = getVOOption(vo, "VOMSName", "")
-    return vomsVO
-
-
 def getGroupsWithVOMSAttribute(vomsAttr):
     """Search groups with VOMS attribute
 

DIRAC/FrameworkSystem/DB/ProxyDB.py

@@ -601,13 +601,13 @@ class ProxyDB(DB):
         :return: S_OK(dict)/S_ERROR() -- dict contain attribute and VOMS VO
         """
         if requiredVOMSAttribute:
-            return S_OK({"attribute": requiredVOMSAttribute, "VOMSVO": Registry.getVOMSVOForGroup(userGroup)})
+            return S_OK({"attribute": requiredVOMSAttribute, "VO": Registry.getVOForGroup(userGroup)})
 
         csVOMSMapping = Registry.getVOMSAttributeForGroup(userGroup)
         if not csVOMSMapping:
             return S_ERROR(f"No mapping defined for group {userGroup} in the CS")
 
-        return S_OK({"attribute": csVOMSMapping, "VOMSVO": Registry.getVOMSVOForGroup(userGroup)})
+        return S_OK({"attribute": csVOMSMapping, "VO": Registry.getVOForGroup(userGroup)})
 
     def getVOMSProxy(self, userDN, userGroup, requiredLifeTime=None, requestedVOMSAttr=None):
         """Get proxy string from the Proxy Repository for use with userDN
@@ -624,7 +624,7 @@ class ProxyDB(DB):
         if not retVal["OK"]:
             return retVal
         vomsAttr = retVal["Value"]["attribute"]
-        vomsVO = retVal["Value"]["VOMSVO"]
+        vomsVO = retVal["Value"]["VO"]
 
         # Look in the cache
         retVal = self.__getPemAndTimeLeft(userDN, userGroup, vomsAttr)

DIRAC/FrameworkSystem/scripts/dirac_login.py

@@ -38,8 +38,8 @@ Script.disableCS()
 from DIRAC.ConfigurationSystem.Client.Helpers.Registry import (
     findDefaultGroupForDN,
     getGroupOption,
+    getVOForGroup,
     getVOMSAttributeForGroup,
-    getVOMSVOForGroup,
 )
 from DIRAC.FrameworkSystem.Client.ProxyManagerClient import gProxyManager
 from DIRAC.FrameworkSystem.private.authorization.utils.Tokens import (
@@ -285,7 +285,7 @@ class Params:
                 if not (vomsAttr := getVOMSAttributeForGroup(self.group)):
                     print(HTML(f"<yellow>No VOMS attribute foud for {self.group}</yellow>"))
                 else:
-                    vo = getVOMSVOForGroup(self.group)
+                    vo = getVOForGroup(self.group)
                     if not (result := VOMS().setVOMSAttributes(self.outputFile, attribute=vomsAttr, vo=vo))["OK"]:
                         return S_ERROR(f"Failed adding VOMS attribute: {result['Message']}")
                     chain = result["Value"]

DIRAC/FrameworkSystem/scripts/dirac_proxy_init.py

@@ -96,7 +96,7 @@ class ProxyInit:
             )
 
         resultVomsAttributes = VOMS.VOMS().setVOMSAttributes(
-            self.__proxyGenerated, attribute=vomsAttr, vo=Registry.getVOMSVOForGroup(self.__piParams.diracGroup)
+            self.__proxyGenerated, attribute=vomsAttr, vo=Registry.getVOForGroup(self.__piParams.diracGroup)
         )
         if not resultVomsAttributes["OK"]:
             return S_ERROR(

DIRAC/TransformationSystem/Utilities/ReplicationCLIParameters.py

@@ -1,10 +1,10 @@
 """
 Command Line Parameters for creating the Replication transformations Script
 """
-from DIRAC import S_OK, S_ERROR, gLogger
+from DIRAC import S_ERROR, S_OK, gLogger
+from DIRAC.ConfigurationSystem.Client.Helpers.Registry import getVOForGroup
 from DIRAC.Core.Security.Properties import SecurityProperty
 from DIRAC.Core.Security.ProxyInfo import getProxyInfo
-from DIRAC.ConfigurationSystem.Client.Helpers.Registry import getVOMSVOForGroup
 
 
 class Params:
@@ -144,7 +144,7 @@ class Params:
             return False
         proxyValues = proxyInfo.get("Value", {})
         group = proxyValues.get("group", "")
-        vomsvo = getVOMSVOForGroup(group)
+        vomsvo = getVOForGroup(group)
         if not vomsvo:
             self.errorMessages.append("ERROR: ProxyGroup not associated to VOMS VO, get a different proxy")
             return False

DIRAC/TransformationSystem/test/Test_replicationTransformation.py

@@ -1,14 +1,13 @@
 """Test the dirac-transformation-replication script and helper"""
 import unittest
+from unittest.mock import MagicMock as Mock
+from unittest.mock import patch
 
-from unittest.mock import MagicMock as Mock, patch
-
-from DIRAC import S_OK, S_ERROR
-
-from DIRAC.TransformationSystem.Utilities.ReplicationTransformation import createDataTransformation
+from DIRAC import S_ERROR, S_OK
 from DIRAC.TransformationSystem.Utilities.ReplicationCLIParameters import Params
+from DIRAC.TransformationSystem.Utilities.ReplicationTransformation import createDataTransformation
 
-GET_VOMS = "DIRAC.TransformationSystem.Utilities.ReplicationCLIParameters.getVOMSVOForGroup"
+GET_VOMS = "DIRAC.TransformationSystem.Utilities.ReplicationCLIParameters.getVOForGroup"
 GET_PROXY = "DIRAC.TransformationSystem.Utilities.ReplicationCLIParameters.getProxyInfo"
 
 

{dirac-9.0.2.dist-info → dirac-9.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DIRAC
-Version: 9.0.2
+Version: 9.0.4
 Summary: DIRAC is an interware, meaning a software framework for distributed computing.
 Home-page: https://github.com/DIRACGrid/DIRAC/
 License: GPL-3.0-only
@@ -19,9 +19,10 @@ Requires-Dist: cachetools
 Requires-Dist: certifi
 Requires-Dist: cwltool
 Requires-Dist: diraccfg
-Requires-Dist: DIRACCommon==v9.0.2
-Requires-Dist: diracx-client>=v0.0.1a18
-Requires-Dist: diracx-core>=v0.0.1a18
+Requires-Dist: DIRACCommon==v9.0.4
+Requires-Dist: diracx-client>=v0.0.1
+Requires-Dist: diracx-core>=v0.0.1
+Requires-Dist: diracx-cli>=v0.0.1
 Requires-Dist: db12
 Requires-Dist: fts3
 Requires-Dist: gfal2-python

{dirac-9.0.2.dist-info → dirac-9.0.4.dist-info}/RECORD

@@ -66,7 +66,7 @@ DIRAC/ConfigurationSystem/Client/__init__.py,sha256=Jkxofl9cI04MqJcu_ZP8Wdk3WXOm
 DIRAC/ConfigurationSystem/Client/Helpers/CSGlobals.py,sha256=taQyqusXtK3zAtoQY9tpCyHAr9jU7U7cjRDvW8YmUwk,911
 DIRAC/ConfigurationSystem/Client/Helpers/Operations.py,sha256=jrpeauEwV6_xXQwVEbs6DDboB8oUmzkZkB_Xg8ZgdBQ,5991
 DIRAC/ConfigurationSystem/Client/Helpers/Path.py,sha256=ghRMD2qNaKejwg4RZ3m4LzfCG5bg1afvTnwJQydl94w,930
-DIRAC/ConfigurationSystem/Client/Helpers/Registry.py,sha256=svibVaHyRKRKPEs-k4pXgcTzr74qe72m4jo2Ue9Xqts,20775
+DIRAC/ConfigurationSystem/Client/Helpers/Registry.py,sha256=qHxZ1MXg29tOTS5KxId3jVJHRpHc35cttlIWsrSwiuk,20229
 DIRAC/ConfigurationSystem/Client/Helpers/Resources.py,sha256=g6ZRdAydAnyKHjL9Gh6VS-jP5zb64q7uMOohtn8rin8,15604
 DIRAC/ConfigurationSystem/Client/Helpers/ResourcesDefaults.py,sha256=m6s-ZvjtYcLGsuu6mkCpIzxA8rEUYnwOOw1HvjecuJQ,3314
 DIRAC/ConfigurationSystem/Client/Helpers/__init__.py,sha256=syOASwgkZHn6b6ybYYu15wO8mrZXj7T-gIHk3EDlpjc,206
@@ -509,7 +509,7 @@ DIRAC/FrameworkSystem/DB/AuthDB.py,sha256=QLotpINMq45FNoFO2AV3OH5Ij5i__HHk-p-m-b
 DIRAC/FrameworkSystem/DB/AuthDB.sql,sha256=tcAnRmBBEDxljAXILp8tlLzuEb7vOoN190KQK7NSbQQ,95
 DIRAC/FrameworkSystem/DB/InstalledComponentsDB.py,sha256=rVarVs61K1kPHZIf1U_kfia-5pxR5uSXsuDutr8EcFY,43156
 DIRAC/FrameworkSystem/DB/InstalledComponentsDB.sql,sha256=-LFjjn1gRQo7zDOclKmFwmbZi_lXXnx_B17cZPLBUak,113
-DIRAC/FrameworkSystem/DB/ProxyDB.py,sha256=XH7uSohf1bO-M64BHF7MoG16zyht8sY_lsGgLE3clkU,39726
+DIRAC/FrameworkSystem/DB/ProxyDB.py,sha256=5gnttlg9pJpyq9nYZDqEe_TihO6Ug3BImaHGcz0kjnQ,39706
 DIRAC/FrameworkSystem/DB/ProxyDB.sql,sha256=QwWe_mRX_NbZQVBo3TzA60L3FemI-oLY8G7_4uRFPzU,96
 DIRAC/FrameworkSystem/DB/TokenDB.py,sha256=FjHsPuTYt2KaXs0fST_tOAZyXY1R6417BB-lblxduZ4,8652
 DIRAC/FrameworkSystem/DB/TokenDB.sql,sha256=D-D78eFUkCRb4YLNZqdCfmyaEIJFupgMhIwgSs91yE4,96
@@ -580,12 +580,12 @@ DIRAC/FrameworkSystem/scripts/dirac_admin_update_pilot.py,sha256=sxrioz8QtnZfWoP
 DIRAC/FrameworkSystem/scripts/dirac_admin_users_with_proxy.py,sha256=qPvgY1cp8_QOOEuOyOQA6MIjvweheGTVCaS_OK7Yfa0,2549
 DIRAC/FrameworkSystem/scripts/dirac_diracx_whoami.py,sha256=Sj7ovgENBe5naW0U9VPgumEO6f1-kLElfhZnAvCX6fg,653
 DIRAC/FrameworkSystem/scripts/dirac_install_component.py,sha256=cjKWUspscXdKHA-GjwBv9jntEyp-gleFoYg456Y0XWQ,5159
-DIRAC/FrameworkSystem/scripts/dirac_login.py,sha256=ZwPikf4LFa72weKA627-V04hPSvZprb_s1glueJa1EQ,16119
+DIRAC/FrameworkSystem/scripts/dirac_login.py,sha256=AAk4ulVmbdcCw8XGLKnlupDNa8m80ouSuGiyohn1W4A,16111
 DIRAC/FrameworkSystem/scripts/dirac_logout.py,sha256=9JqINw-Fqoxk1aH8LnRP_gF9DNADhv3zFar51DBBJ3w,3668
 DIRAC/FrameworkSystem/scripts/dirac_proxy_destroy.py,sha256=Db6Su17yuie2KX0vcXiqwa0BTmmU2x0_TB3vROiem-g,5009
 DIRAC/FrameworkSystem/scripts/dirac_proxy_get_uploaded_info.py,sha256=nCSGTZwOeg8kHF_Kp5OPs8Z6W1F3H7lw7aZcjVztr5E,3537
 DIRAC/FrameworkSystem/scripts/dirac_proxy_info.py,sha256=X7zQawo7ZCD4bpoUE1WR2vWExsH7V7OwcWINKSNmssM,6182
-DIRAC/FrameworkSystem/scripts/dirac_proxy_init.py,sha256=mIP5TAB42lxfq4TFNGhhxgHFz2fA1vSDfmc74TU42T0,10170
+DIRAC/FrameworkSystem/scripts/dirac_proxy_init.py,sha256=effVCmzUUDoWOSak-e1dyb2haYPeWsMU_7ali51xgHE,10166
 DIRAC/FrameworkSystem/scripts/dirac_restart_component.py,sha256=U1FPMHYhJP0xQzfN88SshzXamB-lqanAhOzWQ7JSOuk,1275
 DIRAC/FrameworkSystem/scripts/dirac_start_component.py,sha256=nlCSTjG_w57t4W2vlV_22_stBa2HZfIXTOicSzfYXg0,1289
 DIRAC/FrameworkSystem/scripts/dirac_status_component.py,sha256=KbNYSyHLZueVNLBbFHNnl7MF5gWR2JTie13GH6tlIfQ,1658
@@ -1089,7 +1089,7 @@ DIRAC/TransformationSystem/Service/TornadoTransformationManagerHandler.py,sha256
 DIRAC/TransformationSystem/Service/TransformationManagerHandler.py,sha256=02CxUBq9WmCHt2kAeSDkyw1Ul5QfuOBuf-VJwPnYEpE,20438
 DIRAC/TransformationSystem/Service/__init__.py,sha256=u3bZshx_dmLaeAOV5QX5dohrupszf9SR5rHkVwk5XJw,51
 DIRAC/TransformationSystem/Utilities/JobInfo.py,sha256=sUJNj-_5iA59eRFSSWQCCLo8HQIoh7m1xmxXrpzb3MU,10706
-DIRAC/TransformationSystem/Utilities/ReplicationCLIParameters.py,sha256=oGEnS96Tq6NnPyu79C0xIZCBEZTDCe_SNAAibkIdiJE,6387
+DIRAC/TransformationSystem/Utilities/ReplicationCLIParameters.py,sha256=RK9FTLzHicDnT60J-W6jLtxZaMh4OIxq5MltNjETv7Y,6379
 DIRAC/TransformationSystem/Utilities/ReplicationTransformation.py,sha256=RJIobUwK_g_gG5GjApeJ6zi2bff03fW7-fHVxqK3-ms,5064
 DIRAC/TransformationSystem/Utilities/ScriptUtilities.py,sha256=5HMW2uVoFVQyJGwxec-_hldEzucRHSzMOwSvdUUuHrM,2523
 DIRAC/TransformationSystem/Utilities/TransformationInfo.py,sha256=Y1k5JjkODJUZeLQuWaBqJUGK1bPm9flWQD6cn9F-Mf4,8629
@@ -1107,7 +1107,7 @@ DIRAC/TransformationSystem/scripts/dirac_transformation_verify_outputdata.py,sha
 DIRAC/TransformationSystem/test/Test_DRA.py,sha256=K7kqBljTtpFoq8Kr55EqI33KE_U98ONs34ggF-5y8wU,26861
 DIRAC/TransformationSystem/test/Test_JobInfo.py,sha256=OW12FLuD4Njz2gTTxeu-BHu_PHthVDQdoPY6_PWxHoM,25705
 DIRAC/TransformationSystem/test/Test_TransformationInfo.py,sha256=gSNiXhMzbvO9VmlEtcRQmbtgx3fTNS50zGgNq6CRsKE,15547
-DIRAC/TransformationSystem/test/Test_replicationTransformation.py,sha256=dunRhego8R-exx-0wx-rTDvZ_KqzxXp5eMBsVUTzftg,10836
+DIRAC/TransformationSystem/test/Test_replicationTransformation.py,sha256=5SSUuYY0KtsbraWFrbM8uz3lGNnzSCfLZppqyNUwsLA,10855
 DIRAC/TransformationSystem/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 DIRAC/Workflow/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 DIRAC/Workflow/Modules/FailoverRequest.py,sha256=QFv_YXtItXMzfGGKAIk_UJMSK1Maze3xEB4bQFLGq1U,3941
@@ -1295,9 +1295,9 @@ DIRAC/tests/Workflow/Integration/exe-script.py,sha256=B_slYdTocEzqfQLRhwuPiLyYUn
 DIRAC/tests/Workflow/Integration/helloWorld.py,sha256=tBgEHH3ZF7ZiTS57gtmm3DW-Qxgm_57HWHpM-Y8XSws,205
 DIRAC/tests/Workflow/Regression/helloWorld.py,sha256=69eCgFuVSYo-mK3Dj2dw1c6g86sF5FksKCf8V2aGVoM,509
 DIRAC/tests/Workflow/Regression/helloWorld.xml,sha256=xwydIcFTAHIX-YPfQfyxuQ7hzvIO3IhR3UAF7ORgkGg,5310
-dirac-9.0.2.dist-info/licenses/LICENSE,sha256=uyr4oV6jmjUeepXZPPjkJRwa5q5MrI7jqJz5sVXNblQ,32452
-dirac-9.0.2.dist-info/METADATA,sha256=NsAJ9M22XU_J_isgLyqx_7xbnY537MZjVkISWDPJE3c,9988
-dirac-9.0.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dirac-9.0.2.dist-info/entry_points.txt,sha256=hupzIL8aVmjK3nn7RLKdhcaiPmLOiD3Kulh3CSDHKmw,16492
-dirac-9.0.2.dist-info/top_level.txt,sha256=RISrnN9kb_mPqmVu8_o4jF-DSX8-h6AcgfkO9cgfkHA,6
-dirac-9.0.2.dist-info/RECORD,,
+dirac-9.0.4.dist-info/licenses/LICENSE,sha256=uyr4oV6jmjUeepXZPPjkJRwa5q5MrI7jqJz5sVXNblQ,32452
+dirac-9.0.4.dist-info/METADATA,sha256=ofzrBlYA8y8DfE4XMr1GauK7TQ0jpEO5FYZzswXwCSE,10016
+dirac-9.0.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dirac-9.0.4.dist-info/entry_points.txt,sha256=hupzIL8aVmjK3nn7RLKdhcaiPmLOiD3Kulh3CSDHKmw,16492
+dirac-9.0.4.dist-info/top_level.txt,sha256=RISrnN9kb_mPqmVu8_o4jF-DSX8-h6AcgfkO9cgfkHA,6
+dirac-9.0.4.dist-info/RECORD,,