rucio-clients 35.4.0__tar.gz → 35.5.0__tar.gz

{rucio_clients-35.4.0 → rucio_clients-35.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rucio-clients
-Version: 35.4.0
+Version: 35.5.0
 Summary: Rucio Client Lite Package
 Home-page: https://rucio.cern.ch/
 Author: Rucio

{rucio_clients-35.4.0 → rucio_clients-35.5.0}/lib/rucio/client/didclient.py

@@ -92,7 +92,7 @@ class DIDClient(BaseClient):
             self,
             scope: str,
             name: str,
-            did_type: Literal['FILE', 'DATASET', 'CONTAINER'],
+            did_type: Literal['DATASET', 'CONTAINER'],
             statuses: Optional["Mapping[str, Any]"] = None,
             meta: Optional["Mapping[str, Any]"] = None,
             rules: Optional["Sequence[Mapping[str, Any]]"] = None,
@@ -105,7 +105,7 @@ class DIDClient(BaseClient):
 
         :param scope: The scope name.
         :param name: The data identifier name.
-        :param did_type: The data identifier type (file|dataset|container).
+        :param did_type: The data identifier type (dataset|container).
         :param statuses: Dictionary with statuses, e.g. {'monotonic':True}.
         :param meta: Meta-data associated with the data identifier is represented using key/value pairs in a dictionary.
         :param rules: Replication rules associated with the data identifier. A list of dictionaries, e.g., [{'copies': 2, 'rse_expression': 'TIERS1'}, ].

{rucio_clients-35.4.0 → rucio_clients-35.5.0}/lib/rucio/vcsversion.py

@@ -4,8 +4,8 @@ This file is automatically generated; Do not edit it. :)
 '''
 VERSION_INFO = {
     'final': True,
-    'version': '35.4.0',
+    'version': '35.5.0',
     'branch_nick': 'release-35-LTS',
-    'revision_id': '3fb618d968f2efbe7431b303ef916d5cdf07d133',
-    'revno': 13156
+    'revision_id': 'f5e7f329eb6baed9096242ee497152cd14464b2c',
+    'revno': 13174
 }

{rucio_clients-35.4.0 → rucio_clients-35.5.0}/tests/test_transfer_plugins.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import logging
+from unittest.mock import MagicMock
 
 import pytest
 
@@ -31,9 +32,14 @@ MAX_POLL_WAIT_SECONDS = 60
 TEST_FTS_HOST = "https://fts:8446"
 
 
-def _make_transfer_path(did, rse_factory, root_account):
+def _make_transfer_path(
+        did,
+        rse_factory,
+        root_account,
+        dst_rse_is_tape: bool = True
+):
     _, src_rse_id = rse_factory.make_mock_rse()
-    dst_rse, dst_rse_id = rse_factory.make_mock_rse()
+    dst_rse, dst_rse_id = rse_factory.make_mock_rse(rse_type="TAPE" if dst_rse_is_tape else "DISK")
     all_rses = [src_rse_id, dst_rse_id]
     distance_core.add_distance(src_rse_id, dst_rse_id, distance=1)
 
@@ -229,8 +235,8 @@ def test_multiple_plugin_concat(file_config_mock, did_factory, rse_factory, root
     generated_collocation_hints = job_params["archive_metadata"]["collocation_hints"]
     assert expected_hints["collocation_hints"] == generated_collocation_hints
 
-    expected_schedule_hints = job_params["archive_metadata"]["scheduling_hints"]
-    assert expected_hints["scheduling_hints"] == expected_schedule_hints
+    generated_scheduling_hints = job_params["archive_metadata"]["scheduling_hints"]
+    assert expected_hints["scheduling_hints"] == generated_scheduling_hints
 
 
 @pytest.mark.parametrize("file_config_mock", [
@@ -284,3 +290,33 @@ def test_include_none_by_default(did_factory, rse_factory, root_account):
 
     job_params = fts3_tool._file_from_transfer(transfer_path[0], job_params)
     assert "archive_metadata" not in job_params
+
+
+def test_no_metadata_if_dest_is_not_tape(did_factory, rse_factory, root_account):
+    """
+    If the destination RSE is not tape,
+    no tape metadata plugin should run,
+    and no archive metadata should be included.
+    """
+
+    mock_did = did_factory.random_file_did()
+    mock_metadata_plugin = MagicMock()
+    transfer_path = _make_transfer_path(mock_did, rse_factory, root_account, dst_rse_is_tape=False)
+
+    fts3_tool = FTS3Transfertool(TEST_FTS_HOST)
+
+    fts3_tool.tape_metadata_plugins = [mock_metadata_plugin]  # type: ignore
+
+    job_params = build_job_params(
+        transfer_path=transfer_path,
+        bring_online=None,
+        default_lifetime=None,
+        archive_timeout_override=None,
+        max_time_in_queue=None,
+        logger=logging.log,
+    )
+
+    job_params = fts3_tool._file_from_transfer(transfer_path[0], job_params)
+
+    assert not mock_metadata_plugin.called
+    assert "archive_metadata" not in job_params