CTADIRAC 3.2.0__tar.gz → 3.2.2__tar.gz

{ctadirac-3.2.0/src/CTADIRAC.egg-info → ctadirac-3.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CTADIRAC
-Version: 3.2.0
+Version: 3.2.2
 Summary: CTADIRAC is an extension of the DIRAC interware for dedicated CTA usage.
 Author-email: Luisa Arrabito <arrabito@in2p3.fr>
 License: BSD 3-Clause License

ctadirac-3.2.2/docs/changes/361.bugfix.rst

@@ -0,0 +1 @@
+Fix Rucio2CS agent in case no StorageElements are configured.

{ctadirac-3.2.0 → ctadirac-3.2.2}/pyproject.toml

@@ -81,6 +81,8 @@ extend-select = [
 ignore = [
     "COM812", # incompatible with ruff format
     "ISC001", # incompatible with ruff format
+    "G004", # DIRAC logging cannot use lazy formatting
+    "N999", # DIRAC does not follow usual naming conventions
 ]
 
 [tool.ruff.lint.pydocstyle]

{ctadirac-3.2.0 → ctadirac-3.2.2}/src/CTADIRAC/ConfigurationSystem/Agent/Rucio2CSAgent.py

@@ -1,6 +1,4 @@
-"""
-Rucio2CSAgent
-"""
+"""Rucio2CSAgent."""
 
 from DIRAC import S_ERROR, S_OK, gConfig
 from DIRAC.ConfigurationSystem.Client.CSAPI import CSAPI
@@ -9,21 +7,32 @@ from rucio.client import Client
 
 
 class Rucio2CSAgent(AgentModule):
-    """
-    DIRAC Agent to synchronize Rucio RSEs to DIRAC CS
-    """
+    """DIRAC Agent to synchronize Rucio RSEs to DIRAC CS."""
 
     def initialize(self):
-        """
-        Initialise the agent
-        """
+        """Initialise the agent."""
         self.log.info("Starting Rucio2CS")
         return S_OK()
 
+    @staticmethod
+    def get_known_rses() -> list[str]:
+        """Get names of known Rucio StorageElements."""
+        # Retrieve existing SEs
+        existing_ses = gConfig.getSections("/Resources/StorageElements")
+        if not existing_ses["OK"]:
+            return []
+
+        if existing_ses["Value"] is None:
+            return []
+
+        return [
+            se
+            for se in existing_ses["Value"]
+            if gConfig.getValue(f"/Resources/StorageElements/{se}/RucioSE", False)
+        ]
+
     def execute(self):
-        """
-        Synchronize Rucio RSEs to DIRAC CS
-        """
+        """Synchronize Rucio RSEs to DIRAC CS."""
         # - Rucio Client Creation
         try:
             rucio_client = Client()
@@ -45,17 +54,7 @@ class Rucio2CSAgent(AgentModule):
             )
             return S_ERROR(result["Message"])
 
-        # - RSEs Synchronization
-        # Retrieve existing SEs
-        existing_ses = gConfig.getSections("/Resources/StorageElements")
-        existing_rses = []
-        for se in existing_ses["Value"]:
-            is_rucio_se = gConfig.getValue(
-                f"/Resources/StorageElements/{se}/RucioSE", False
-            )
-            if is_rucio_se:
-                existing_rses.append(se)
-
+        existing_rses = self.get_known_rses()
         # Retrieve all RSEs
         rses = [rse["rse"] for rse in rucio_client.list_rses()]
 
@@ -65,6 +64,8 @@ class Rucio2CSAgent(AgentModule):
                 cs_api.delSection(f"/Resources/StorageElements/{rse}")
                 self.log.debug(f"Deleted stale RSE from CS: {rse}")
 
+        sites_rses = {}
+        sites_paths = {}
         # Add or update the RSEs from Rucio
         for rse in rses:
             try:
@@ -78,8 +79,12 @@ class Rucio2CSAgent(AgentModule):
                 # Retrieve the RSE details from Rucio
                 self.sync_details(cs_api, rucio_client, rse, se_path)
 
-                # Retrieve the RSE attributes from Rucio
-                self.sync_attributes(cs_api, rucio_client, rse)
+                # Retrieve the DIRAC-SITE attribute from Rucio
+                dirac_site, site_path = self._retrieve_dirac_site(rucio_client, rse)
+                sites_paths[dirac_site] = site_path
+                if dirac_site not in sites_rses:
+                    sites_rses[dirac_site] = set()
+                sites_rses[dirac_site].add(rse)
 
                 # Retrieve the RSE protocols from Rucio
                 self.sync_protocols(cs_api, rucio_client, rse, se_path)
@@ -90,6 +95,8 @@ class Rucio2CSAgent(AgentModule):
                     sVarMsg=f"[RSE: {rse}, Error: {err!s}]",
                 )
                 continue
+        # One-time sync DIRAC-SITES
+        self.sync_sites(cs_api, sites_paths, sites_rses)
 
         # Apply changes to DIRAC CS
         result = cs_api.commit()
@@ -104,9 +111,7 @@ class Rucio2CSAgent(AgentModule):
         return S_OK()
 
     def sync_details(self, cs_api, rucio_client, rse, se_path):
-        """
-        Synchronize all Rucio RSEs details to DIRAC CS SEs
-        """
+        """Synchronize all Rucio RSEs details to DIRAC CS SEs."""
         rse_details = rucio_client.get_rse(rse)
 
         result = cs_api.setOption(f"{se_path}/RucioSE", True)
@@ -132,33 +137,19 @@ class Rucio2CSAgent(AgentModule):
             )
             self.log.debug(result["Value"])
 
-    def sync_attributes(self, cs_api, rucio_client, rse):
-        """
-        Synchronize all Rucio RSEs attributes to DIRAC CS SEs
-        """
+    @staticmethod
+    def _retrieve_dirac_site(rucio_client, rse):
+        """Retrieve DIRAC-SITE attribute from a RSE."""
         rse_attributes = rucio_client.list_rse_attributes(rse)
         dirac_site = rse_attributes.get("DIRAC-SITE")
-        if dirac_site:
-            site_prefix = dirac_site.split(".")[0]
-            site_path = f"/Resources/Sites/{site_prefix}/{dirac_site}/SE"
-
-            site_ses = gConfig.getValue(site_path)
-            existing_site_ses = (
-                [s.strip() for s in site_ses.split(",")] if site_ses else []
-            )
-            if rse not in existing_site_ses:
-                existing_site_ses.append(rse)
-            site_ses = ", ".join(existing_site_ses)
-
-            result = cs_api.setOption(site_path, site_ses)
-            self.log.debug(result["Value"])
-        else:
+        if not dirac_site:
             raise ValueError(f"RSE {rse} is missing mandatory attribute DIRAC-SITE")
+        site_prefix = dirac_site.split(".")[0]
+        site_path = f"/Resources/Sites/{site_prefix}/{dirac_site}/SE"
+        return dirac_site, site_path
 
     def sync_protocols(self, cs_api, rucio_client, rse, se_path):
-        """
-        Synchronize all Rucio RSEs protocols to DIRAC CS SEs
-        """
+        """Synchronize all Rucio RSEs protocols to DIRAC CS SEs."""
         rse_protocols = rucio_client.get_protocols(rse)
         protocol_mapping = {
             "Protocol": "scheme",
@@ -222,3 +213,25 @@ class Rucio2CSAgent(AgentModule):
                     extended_attributes.get(rucio_attribute),
                 )
                 self.log.debug(result["Value"])
+
+    def sync_sites(self, cs_api, sites_paths, sites_rses):
+        """Synchronize all Rucio RSEs sites to DIRAC CS sites."""
+        for dirac_site, rses in sites_rses.items():
+            site_path = sites_paths[dirac_site]
+            try:
+                site_ses = gConfig.getValue(site_path)
+                existing_site_ses = (
+                    [s.strip() for s in site_ses.split(",")] if site_ses else []
+                )
+                for rse in rses:
+                    if rse not in existing_site_ses:
+                        existing_site_ses.append(rse)
+                site_ses = ", ".join(sorted(existing_site_ses))
+
+                result = cs_api.setOption(site_path, site_ses)
+                self.log.debug(result["Value"])
+            except Exception as err:
+                self.log.error(
+                    sMsg="Cannot sync site RSEs into CS",
+                    sVarMsg=f"[Site: {dirac_site}, Error: {err!s}]",
+                )

{ctadirac-3.2.0 → ctadirac-3.2.2}/src/CTADIRAC/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '3.2.0'
-__version_tuple__ = version_tuple = (3, 2, 0)
+__version__ = version = '3.2.2'
+__version_tuple__ = version_tuple = (3, 2, 2)
 
-__commit_id__ = commit_id = 'g6a0070268'
+__commit_id__ = commit_id = 'gfe4f935a6'

{ctadirac-3.2.0 → ctadirac-3.2.2/src/CTADIRAC.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CTADIRAC
-Version: 3.2.0
+Version: 3.2.2
 Summary: CTADIRAC is an extension of the DIRAC interware for dedicated CTA usage.
 Author-email: Luisa Arrabito <arrabito@in2p3.fr>
 License: BSD 3-Clause License

{ctadirac-3.2.0 → ctadirac-3.2.2}/src/CTADIRAC.egg-info/SOURCES.txt

@@ -240,6 +240,7 @@ docs/contribute.rst
 docs/fake_storage.rst
 docs/index.rst
 docs/introduction.rst
+docs/changes/361.bugfix.rst
 docs/changes/template.rst
 report/inspection.tex
 report/performance_verification.tex

{ctadirac-3.2.0 → ctadirac-3.2.2}/src/CTADIRAC.egg-info/scm_file_list.json

@@ -250,6 +250,7 @@
     "aiv-toolkit/workflows/subdir/echo-tool-container.cwl",
     "ctadirac_requirements_traceability_matrix.csv",
     "docs/Makefile",
+    "docs/changes/361.bugfix.rst",
     "docs/changes/template.rst",
     "docs/conf.py",
     "docs/contribute.rst",

ctadirac-3.2.2/src/CTADIRAC.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "3.2.2",
+  "distance": 0,
+  "node": "gfe4f935a667d0e9b14b0ebe9ac54308bf2827db8",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-08-28"
+}

{ctadirac-3.2.0 → ctadirac-3.2.2}/tests/unit/configuration_system/agent/test_rucio2cs_agent.py

@@ -10,7 +10,7 @@ from DIRAC import S_ERROR, S_OK
 from CTADIRAC.ConfigurationSystem.Agent.Rucio2CSAgent import Rucio2CSAgent
 
 
-@pytest.fixture()
+@pytest.fixture
 def dirac_agent():
     """
     Rucio2CSAgent fixture
@@ -20,7 +20,7 @@ def dirac_agent():
     return agent
 
 
-@pytest.fixture()
+@pytest.fixture
 def cs_api(monkeypatch):
     """
     CS API fixture
@@ -36,16 +36,26 @@ def cs_api(monkeypatch):
     return api
 
 
-@pytest.fixture()
-def g_config(monkeypatch):
+@pytest.fixture(
+    params=[
+        pytest.param([], id="no-ses"),
+        pytest.param(
+            ["DIRAC-STORAGE", "RUCIO-STORAGE", "RUCIO-OLD-STORAGE"], id="existing-ses"
+        ),
+    ]
+)
+def g_config(monkeypatch, request):
     """
     Global configuration fixture
     """
     config = MagicMock()
     # all existing SEs in CS
-    config.getSections.return_value = S_OK(
-        ["DIRAC-STORAGE", "RUCIO-STORAGE", "RUCIO-OLD-STORAGE"]
+
+    known_ses = request.param
+    return_value = (
+        S_ERROR(message="No such section") if len(known_ses) == 0 else S_OK(known_ses)
     )
+    config.getSections.return_value = return_value
 
     # determine if a SE is Rucio or not
     def get_value(path, default=None):
@@ -58,10 +68,10 @@ def g_config(monkeypatch):
     monkeypatch.setattr(
         "CTADIRAC.ConfigurationSystem.Agent.Rucio2CSAgent.gConfig", config
     )
-    return config
+    return known_ses
 
 
-@pytest.fixture()
+@pytest.fixture
 def rucio_client(monkeypatch):
     """
     Rucio client fixture
@@ -70,7 +80,9 @@ def rucio_client(monkeypatch):
     # all existing SEs in Rucio
     client.list_rses.return_value = [
         {"rse": "RUCIO-STORAGE"},
-        {"rse": "RUCIO-NEW-STORAGE"},
+        {"rse": "RUCIO-NEW-STORAGE-A"},
+        {"rse": "RUCIO-NEW-STORAGE-B"},
+        {"rse": "RUCIO-NEW-STORAGE-C"},
     ]
     client.get_rse.return_value = {
         "rse_type": "DISK",
@@ -80,7 +92,7 @@ def rucio_client(monkeypatch):
     }
 
     def get_attributes(rse):
-        if rse == "RUCIO-NEW-STORAGE":
+        if "RUCIO-NEW-STORAGE" in rse:
             return {"DIRAC-SITE": "CTAO.DESY-ZEUTHEN.de"}
         return {}
 
@@ -137,13 +149,12 @@ def test_execute(monkeypatch, dirac_agent):
 
 
 def test_sync_rse_to_cs(dirac_agent, cs_api, g_config, rucio_client):
-    """
-    Create the RUCIO-NEW-STORAGE in DIRAC CS
-    """
+    """Create the RUCIO-NEW-STORAGE-A in DIRAC CS"""
+
     result = dirac_agent.execute()
     assert result["OK"]
 
-    se_path = "/Resources/StorageElements/RUCIO-NEW-STORAGE"
+    se_path = "/Resources/StorageElements/RUCIO-NEW-STORAGE-A"
     cs_api.createSection.assert_any_call(se_path)
     cs_api.setOption.assert_any_call(f"{se_path}/SEType", "T0D1")
 
@@ -152,10 +163,6 @@ def test_sync_rse_to_cs(dirac_agent, cs_api, g_config, rucio_client):
     cs_api.setOption.assert_any_call(f"{se_path}/WriteAccess", "Active")
     cs_api.setOption.assert_any_call(f"{se_path}/RemoveAccess", "Banned")
 
-    cs_api.setOption.assert_any_call(
-        "/Resources/Sites/CTAO/CTAO.DESY-ZEUTHEN.de/SE", "RUCIO-NEW-STORAGE"
-    )
-
     protocol_path = f"{se_path}/AccessProtocol.1"
     expected_options = {
         "Protocol": "root",
@@ -181,21 +188,19 @@ def test_sync_rse_to_cs(dirac_agent, cs_api, g_config, rucio_client):
 
 
 def test_stale_rse_deleted_from_cs(dirac_agent, cs_api, g_config, rucio_client):
-    """
-    Delete the RUCIO-OLD-STORAGE from CS since it isn't part of Rucio list_rses() list
-    """
+    """Delete the RUCIO-OLD-STORAGE from CS since it isn't part of Rucio list_rses() list"""
     result = dirac_agent.execute()
     assert result["OK"]
 
-    cs_api.delSection.assert_called_once_with(
-        "/Resources/StorageElements/RUCIO-OLD-STORAGE"
-    )
+    known_ses = g_config
+    if "RUCIO-OLD-STORAGE" in known_ses:
+        cs_api.delSection.assert_called_once_with(
+            "/Resources/StorageElements/RUCIO-OLD-STORAGE"
+        )
 
 
 def test_cs_api_download_failure(dirac_agent, g_config, rucio_client, cs_api):
-    """
-    Test CS API DownloadCSData failure case
-    """
+    """Test CS API DownloadCSData failure case"""
     cs_api.downloadCSData.return_value = S_ERROR("Download failed")
 
     result = dirac_agent.execute()
@@ -210,9 +215,7 @@ def test_cs_api_download_failure(dirac_agent, g_config, rucio_client, cs_api):
 
 
 def test_cs_api_commit_failure(dirac_agent, g_config, rucio_client, cs_api):
-    """
-    Test CS API Commit failure case
-    """
+    """Test CS API Commit failure case"""
     cs_api.commit.return_value = S_ERROR("Commit failed")
 
     result = dirac_agent.execute()
@@ -224,3 +227,22 @@ def test_cs_api_commit_failure(dirac_agent, g_config, rucio_client, cs_api):
         sMsg="Cannot commit CS changes",
         sVarMsg="[Error: Commit failed]",
     )
+
+
+def test_sync_multiple_rse_sites(dirac_agent, cs_api, g_config, rucio_client):
+    """Sync multiple RSE with same DIRAC-SITE"""
+    result = dirac_agent.execute()
+    assert result["OK"]
+
+    site_path = "/Resources/Sites/CTAO/CTAO.DESY-ZEUTHEN.de/SE"
+    sync_site_calls = [
+        call for call in cs_api.setOption.call_args_list if call.args[0] == site_path
+    ]
+    assert len(sync_site_calls) == 1
+
+    new_ses = {se.strip() for se in sync_site_calls[0].args[1].split(",")}
+    assert new_ses == {
+        "RUCIO-NEW-STORAGE-A",
+        "RUCIO-NEW-STORAGE-B",
+        "RUCIO-NEW-STORAGE-C",
+    }

ctadirac-3.2.0/src/CTADIRAC.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "3.2.0",
-  "distance": 0,
-  "node": "g6a0070268d8b4697566c0cb24b08e5a2eeced36a",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-08-27"
-}