rucio-clients 32.6.0__tar.gz → 33.0.0__tar.gz

{rucio-clients-32.6.0 → rucio-clients-33.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rucio-clients
-Version: 32.6.0
+Version: 33.0.0
 Summary: Rucio Client Lite Package
 Home-page: https://rucio.cern.ch/
 Author: Rucio
@@ -20,21 +20,21 @@ Requires-Python: >=3.9, <4
 License-File: LICENSE
 License-File: AUTHORS.rst
 Requires-Dist: requests<=2.31.0,>=2.25.1
-Requires-Dist: urllib3~=1.26.16
+Requires-Dist: urllib3~=1.26.18
 Requires-Dist: dogpile.cache~=1.2.2
 Requires-Dist: tabulate~=0.9.0
-Requires-Dist: jsonschema~=4.18.4
+Requires-Dist: jsonschema~=4.20.0
 Provides-Extra: ssh
-Requires-Dist: paramiko~=3.2.0; extra == "ssh"
+Requires-Dist: paramiko~=3.3.1; extra == "ssh"
 Provides-Extra: kerberos
 Requires-Dist: kerberos~=1.3.1; extra == "kerberos"
 Requires-Dist: pykerberos~=1.2.4; extra == "kerberos"
 Requires-Dist: requests-kerberos>=0.14.0; extra == "kerberos"
 Provides-Extra: swift
-Requires-Dist: python-swiftclient~=4.3.0; extra == "swift"
+Requires-Dist: python-swiftclient~=4.4.0; extra == "swift"
 Provides-Extra: argcomplete
-Requires-Dist: argcomplete~=3.1.1; extra == "argcomplete"
+Requires-Dist: argcomplete~=3.1.6; extra == "argcomplete"
 Provides-Extra: sftp
-Requires-Dist: paramiko~=3.2.0; extra == "sftp"
+Requires-Dist: paramiko~=3.3.1; extra == "sftp"
 Provides-Extra: dumper
 Requires-Dist: python-magic~=0.4.27; extra == "dumper"

{rucio-clients-32.6.0 → rucio-clients-33.0.0}/lib/rucio/alembicrevision.py

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ALEMBIC_REVISION = '27e3a68927fb'  # the current alembic head revision
+ALEMBIC_REVISION = 'a08fa8de1545'  # the current alembic head revision

{rucio-clients-32.6.0 → rucio-clients-33.0.0}/lib/rucio/client/didclient.py

@@ -661,19 +661,6 @@ class DIDClient(BaseClient):
             exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
             raise exc_cls(exc_msg)
 
-    def add_temporary_dids(self, dids):
-        """
-        Bulk add temporary data identifiers.
-
-        :param dids: A list of dids.
-        """
-        url = build_url(choice(self.list_hosts), path='tmp_dids')
-        r = self._send_request(url, type_='POST', data=dumps(dids))
-        if r.status_code == codes.created:
-            return True
-        exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
-        raise exc_cls(exc_msg)
-
     def list_archive_content(self, scope, name):
         """
         List archive contents.

{rucio-clients-32.6.0 → rucio-clients-33.0.0}/lib/rucio/rse/protocols/gfal.py

@@ -51,7 +51,7 @@ class Default(protocol.RSEProtocol):
 
         :returns: Fully qualified PFN.
         """
-        lfns = [lfns] if type(lfns) == dict else lfns
+        lfns = [lfns] if isinstance(lfns, dict) else lfns
 
         pfns = {}
         prefix = self.attributes['prefix']

{rucio-clients-32.6.0 → rucio-clients-33.0.0}/lib/rucio/rse/protocols/rclone.py

@@ -242,7 +242,7 @@ class Default(protocol.RSEProtocol):
         if not prefix.endswith('/'):
             prefix = ''.join([prefix, '/'])
 
-        lfns = [lfns] if type(lfns) == dict else lfns
+        lfns = [lfns] if isinstance(lfns, dict) else lfns
         for lfn in lfns:
             scope, name = lfn['scope'], lfn['name']
             if 'path' in lfn and lfn['path'] is not None:

{rucio-clients-32.6.0 → rucio-clients-33.0.0}/lib/rucio/rse/protocols/srm.py

@@ -51,7 +51,7 @@ class Default(protocol.RSEProtocol):
         if '://' in hostname:
             hostname = hostname.split("://")[1]
 
-        lfns = [lfns] if type(lfns) == dict else lfns
+        lfns = [lfns] if isinstance(lfns, dict) else lfns
         if not self.attributes['port']:
             for lfn in lfns:
                 scope, name, path = lfn['scope'], lfn['name'], lfn.get('path')

{rucio-clients-32.6.0 → rucio-clients-33.0.0}/lib/rucio/rse/protocols/ssh.py

@@ -157,7 +157,7 @@ class Default(protocol.RSEProtocol):
         if not prefix.endswith('/'):
             prefix = ''.join([prefix, '/'])
 
-        lfns = [lfns] if type(lfns) == dict else lfns
+        lfns = [lfns] if isinstance(lfns, dict) else lfns
         for lfn in lfns:
             scope, name = lfn['scope'], lfn['name']
             if 'path' in lfn and lfn['path'] is not None:

{rucio-clients-32.6.0 → rucio-clients-33.0.0}/lib/rucio/rse/protocols/xrootd.py

@@ -160,7 +160,7 @@ class Default(protocol.RSEProtocol):
         if not prefix.endswith('/'):
             prefix = ''.join([prefix, '/'])
 
-        lfns = [lfns] if type(lfns) == dict else lfns
+        lfns = [lfns] if isinstance(lfns, dict) else lfns
         for lfn in lfns:
             scope, name = lfn['scope'], lfn['name']
             if 'path' in lfn and lfn['path'] is not None:

rucio-clients-33.0.0/lib/rucio/vcsversion.py

@@ -0,0 +1,11 @@
+
+'''
+This file is automatically generated; Do not edit it. :)
+'''
+VERSION_INFO = {
+    'final': True,
+    'version': '33.0.0',
+    'branch_nick': 'master',
+    'revision_id': '0400523747c2c211473ed86e9644c7a6fca846ff',
+    'revno': 12668
+}

{rucio-clients-32.6.0 → rucio-clients-33.0.0}/lib/rucio_clients.egg-info/SOURCES.txt

@@ -176,7 +176,6 @@ tests/test_rule.py
 tests/test_schema_cms.py
 tests/test_scope.py
 tests/test_subscription.py
-tests/test_temporary_did.py
 tests/test_throttler.py
 tests/test_tpc.py
 tests/test_trace.py

{rucio-clients-32.6.0 → rucio-clients-33.0.0}/requirements.txt

@@ -1,55 +1,55 @@
 # All dependencies needed to run rucio client (and server/daemons) should be defined here
 requests>=2.25.1,<=2.31.0                                   # Python HTTP for Humans.
-urllib3~=1.26.16                                            # HTTP library with thread-safe connection pooling, file post, etc.
+urllib3~=1.26.18                                            # HTTP library with thread-safe connection pooling, file post, etc.
 dogpile.cache~=1.2.2                                        # Caching API plugins (1.1.2 is the first version to support pymemcache)
 tabulate~=0.9.0                                             # Pretty-print tabular data
-jsonschema~=4.18.4                                          # For JSON schema validation (Policy modules)
+jsonschema~=4.20.0                                          # For JSON schema validation (Policy modules)
 
 # All dependencies needed in extras for rucio client (and server/daemons) should be defined here
-paramiko~=3.2.0                                             # ssh_extras; SSH2 protocol library (also needed in the server)
+paramiko~=3.3.1                                             # ssh_extras; SSH2 protocol library (also needed in the server)
 kerberos~=1.3.1                                             # kerberos_extras for client and server
 pykerberos~=1.2.4                                           # kerberos_extras for client and server
 requests-kerberos>=0.14.0                                   # kerberos_extras for client and server
-python-swiftclient~=4.3.0                                   # swift_extras
-argcomplete~=3.1.1                                          # argcomplete_extras; Bash tab completion for argparse
+python-swiftclient~=4.4.0                                   # swift_extras
+argcomplete~=3.1.6                                          # argcomplete_extras; Bash tab completion for argparse
 python-magic~=0.4.27                                        # dumper_extras; File type identification using libmagic
 
 # All dependencies needed to run rucio server/daemons should be defined here
-SQLAlchemy==2.0.19                                          # DB backend
-alembic~=1.11.1                                             # Lightweight database migration tool for SQLAlchemy
+SQLAlchemy==2.0.23                                          # DB backend
+alembic~=1.12.1                                             # Lightweight database migration tool for SQLAlchemy
 pymemcache==4.0.0                                           # A comprehensive, fast, pure-Python memcached client (Used by Dogpile)
 python-dateutil==2.8.2                                      # Extensions to the standard datetime module
 stomp.py==8.1.0                                             # ActiveMQ Messaging Protocol
 statsd==4.0.1                                               # Needed to log into graphite with more than 1 Hz
 geoip2==4.7.0                                               # GeoIP2 API (for IPv6 support)
-google-auth==2.22.0                                         # Google authentication library for Python
-redis==4.6.0                                                # Python client for Redis key-value store
-Flask==2.3.2                                                # Python web framework
+google-auth==2.23.4                                         # Google authentication library for Python
+redis==5.0.1                                                # Python client for Redis key-value store
+Flask==3.0.0                                                # Python web framework
 oic==1.6.1                                                  # for authentication via OpenID Connect protocol
-prometheus_client==0.17.1                                   # Python client for the Prometheus monitoring system
-boto3==1.28.5                                               # S3 boto protocol (new version)
+prometheus_client==0.19.0                                   # Python client for the Prometheus monitoring system
+boto3==1.29.5                                               # S3 boto protocol (new version)
 
 # All dependencies needed in extras for rucio server/daemons should be defined here
 cx_oracle==8.3.0                                            # oracle_extras
-psycopg2-binary==2.9.6                                      # postgresql_extras
+psycopg2-binary==2.9.9                                      # postgresql_extras
 PyMySQL==1.1.0                                              # mysql_extras
 PyYAML==6.0.1                                               # globus_extras and used for reading test configuration files
-globus-sdk==3.24.0                                          # globus_extras
-python3-saml==1.15.0                                        # saml_extras
-pymongo==4.4.1                                              # pymongo (metadata plugin)
+globus-sdk==3.32.0                                          # globus_extras
+python3-saml==1.16.0                                        # saml_extras
+pymongo==4.6.0                                              # pymongo (metadata plugin)
 
 # All dependencies needed to develop/test rucio should be defined here
-pytest==7.4.0
-pytest-xdist~=3.3.1                                         # Used for parallel testing
-pyflakes==3.0.1                                             # Passive checker of Python programs
-flake8==6.0.0                                               # Wrapper around PyFlakes&pep8; python_version < '3.9'
-pycodestyle==2.10.0                                         # New package replacing pep8; python_version < '3.9'
-pylint==3.0.0a7
-astroid==3.0.0a9
-virtualenv==20.24.0                                         # Virtual Python Environment builder
+pytest==7.4.3
+pytest-xdist~=3.5.0                                         # Used for parallel testing
+pyflakes==3.1.0                                             # Passive checker of Python programs
+flake8==6.1.0                                               # Wrapper around PyFlakes&pep8; python_version < '3.9'
+pycodestyle==2.11.0                                         # New package replacing pep8; python_version < '3.9'
+pylint==3.0.2
+astroid==3.0.1
+virtualenv==20.24.7                                         # Virtual Python Environment builder
 xmltodict==0.13.0                                           # Makes working with XML feel like you are working with JSON
-pytz==2023.3                                                # World timezone definitions, modern and historical
+pytz==2023.3.post1                                          # World timezone definitions, modern and historical
 pydoc-markdown~=4.8.2                                       # Used for generating Markdown documentation for docusaurus
-sh~=2.0.4                                                   # Convenience library for running subprocesses in Python
+sh~=2.0.6                                                   # Convenience library for running subprocesses in Python
 apispec==6.3.0                                              # Generate OpenApi definition out of pydoc comments
 apispec-webframeworks                                       # Integration of apispec in Flask

{rucio-clients-32.6.0 → rucio-clients-33.0.0}/tests/test_conveyor.py

@@ -1364,7 +1364,10 @@ def test_multi_vo_certificates(file_config_mock, rse_factory, did_factory, scope
     'rucio.core.config.REGION',
     'rucio.daemons.reaper.reaper.REGION',
 ]}], indirect=True)
-def test_two_multihops_same_intermediate_rse(rse_factory, did_factory, root_account, core_config_mock, caches_mock):
+@pytest.mark.parametrize("file_config_mock", [{"overrides": [
+    ('transfers', 'stats_enabled', 'True'),
+]}], indirect=True)
+def test_two_multihops_same_intermediate_rse(rse_factory, did_factory, root_account, file_config_mock, core_config_mock, caches_mock):
     """
     Handle correctly two multihop transfers having to both jump via the same intermediate hops
     """
@@ -1379,6 +1382,7 @@ def test_two_multihops_same_intermediate_rse(rse_factory, did_factory, root_acco
     #                             +------>| RSE6 +--->| RSE7 |
     #                                     |      |    |      |
     #                                     +------+    +------+
+    start_time = datetime.utcnow()
     _, _, reaper_cache_region = caches_mock
     rse1, rse1_id = rse_factory.make_rse(scheme='mock', protocol_impl='rucio.rse.protocols.posix.Default')
     rse2, rse2_id = rse_factory.make_rse(scheme='mock', protocol_impl='rucio.rse.protocols.posix.Default')
@@ -1465,6 +1469,17 @@ def test_two_multihops_same_intermediate_rse(rse_factory, did_factory, root_acco
         with pytest.raises(ReplicaNotFound):
             replica_core.get_replica(rse_id=rse_id, **did)
 
+    # Verify that the statistics are correctly recorded for executed transfers
+    stats_manager = request_core.TransferStatsManager()
+    dict_stats = {}
+    for stat in stats_manager.load_totals(
+            older_t=start_time - stats_manager.raw_resolution
+    ):
+        dict_stats.setdefault(stat['dest_rse_id'], {})[stat['src_rse_id']] = stat
+    assert dict_stats[rse2_id][rse1_id]['files_failed'] == 1
+    assert dict_stats[rse2_id][rse1_id]['files_done'] == 1
+    assert dict_stats[rse2_id][rse1_id]['bytes_done'] == 2
+
 
 @skip_rse_tests_with_accounts
 @pytest.mark.noparallel(groups=[NoParallelGroups.SUBMITTER, NoParallelGroups.POLLER])

{rucio-clients-32.6.0 → rucio-clients-33.0.0}/tests/test_conveyor_submitter.py

@@ -283,7 +283,11 @@ def test_ignore_availability(rse_factory, did_factory, root_account, caches_mock
 
 
 @pytest.mark.noparallel(reason="multiple submitters cannot be run in parallel due to partial job assignment by hash")
-def test_scheme_missmatch(rse_factory, did_factory, root_account):
+@pytest.mark.parametrize("file_config_mock", [
+    {"overrides": [('transfers', 'source_ranking_strategies', 'SkipSchemeMissmatch,PathDistance')]},
+    {"overrides": [('transfers', 'source_ranking_strategies', 'PathDistance')]}
+], indirect=True)
+def test_scheme_missmatch(rse_factory, did_factory, root_account, file_config_mock):
     """
     Ensure that the requests are marked MISSMATCH_SCHEME when there is a path, but with wrong schemes.
     """
@@ -298,7 +302,10 @@ def test_scheme_missmatch(rse_factory, did_factory, root_account):
     submitter(once=True, rses=[{'id': rse_id} for rse_id in (src_rse_id, dst_rse_id)], partition_wait_time=None, transfertools=['mock'], transfertype='single')
 
     request = request_core.get_request_by_did(rse_id=dst_rse_id, **did)
-    assert request['state'] == RequestState.MISMATCH_SCHEME
+    if 'SkipSchemeMissmatch' in file_config_mock.get('transfers', 'source_ranking_strategies'):
+        assert request['state'] == RequestState.MISMATCH_SCHEME
+    else:
+        assert request['state'] == RequestState.NO_SOURCES
 
 
 @pytest.mark.noparallel(groups=[NoParallelGroups.SUBMITTER])

{rucio-clients-32.6.0 → rucio-clients-33.0.0}/tests/test_daemons.py

@@ -30,7 +30,7 @@ from rucio.daemons.follower import follower
 from rucio.daemons.hermes import hermes
 from rucio.daemons.judge import cleaner, evaluator, injector, repairer
 from rucio.daemons.oauthmanager import oauthmanager
-from rucio.daemons.reaper import dark_reaper, light_reaper, reaper
+from rucio.daemons.reaper import dark_reaper, reaper
 from rucio.daemons.replicarecoverer import suspicious_replica_recoverer
 from rucio.daemons.tracer import kronos
 from rucio.daemons.transmogrifier import transmogrifier
@@ -62,7 +62,6 @@ DAEMONS = [
     repairer,
     oauthmanager,
     dark_reaper,
-    light_reaper,
     reaper,
     suspicious_replica_recoverer,
     kronos,

{rucio-clients-32.6.0 → rucio-clients-33.0.0}/tests/test_oidc.py

@@ -15,11 +15,13 @@
 
 import time
 import traceback
+import uuid
 from datetime import datetime, timedelta
 from unittest.mock import MagicMock, patch
 from urllib.parse import urlparse, parse_qs
 
 import pytest
+from jwkest.jwt import JWT
 from oic import rndstr
 
 from rucio.common.config import config_get_bool
@@ -30,7 +32,8 @@ from rucio.core.account import add_account
 from rucio.core.authentication import redirect_auth_oidc, validate_auth_token
 from rucio.core.identity import add_account_identity
 from rucio.core.oidc import (get_auth_oidc, get_token_oidc, get_token_for_account_operation,
-                             EXPECTED_OIDC_AUDIENCE, EXPECTED_OIDC_SCOPE, oidc_identity_string)
+                             EXPECTED_OIDC_AUDIENCE, EXPECTED_OIDC_SCOPE, oidc_identity_string,
+                             _token_cache_get, _token_cache_set)
 from rucio.db.sqla import models
 from rucio.db.sqla.constants import AccountType
 from rucio.db.sqla.constants import IdentityType
@@ -1956,3 +1959,30 @@ class TestAuthCoreAPIoidc:
         # ---------------------------
         # Check if NO token has been received
         assert not new_token_dict
+
+
+def test_token_cache() -> None:
+    KEY = str(uuid.uuid1())
+    assert _token_cache_get(KEY) is None
+
+    valid_token = JWT().pack([{
+        'exp': int((datetime.utcnow() + timedelta(hours=1)).timestamp())
+    }])
+    _token_cache_set(KEY, valid_token)
+    assert _token_cache_get(KEY) == valid_token
+
+    invalid_token = 'invalid'
+    _token_cache_set(KEY, invalid_token)
+    assert _token_cache_get(KEY) is None
+
+    below_min_lifetime_token = JWT().pack([{
+        'exp': int((datetime.utcnow() + timedelta(minutes=1)).timestamp())
+    }])
+    _token_cache_set(KEY, below_min_lifetime_token)
+    assert _token_cache_get(KEY) is None
+
+    expired_token = JWT().pack([{
+        'exp': int((datetime.utcnow() - timedelta(minutes=1)).timestamp())
+    }])
+    _token_cache_set(KEY, expired_token)
+    assert _token_cache_get(KEY) is None

{rucio-clients-32.6.0 → rucio-clients-33.0.0}/tests/test_request.py

@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import json
 from datetime import datetime
 from typing import Union
 
@@ -20,8 +21,9 @@ import pytest
 
 from rucio.common.config import config_get_bool
 from rucio.common.utils import generate_uuid, parse_response
+from rucio.core.distance import add_distance
 from rucio.core.replica import add_replica
-from rucio.core.request import queue_requests, get_request_by_did, list_requests, list_requests_history, set_transfer_limit
+from rucio.core.request import queue_requests, get_request_by_did, list_requests, list_requests_history, set_transfer_limit, TransferStatsManager
 from rucio.core.rse import add_rse_attribute
 from rucio.db.sqla import models, constants
 from rucio.db.sqla.constants import RequestType, RequestState
@@ -286,3 +288,86 @@ def test_api_list(
 
     params = {'request_states': 'S', 'src_site': source_site, 'dst_site': 'unknown'}
     check_error_api(params, 'NotFound', 'Could not resolve site name unknown to RSE', 404)
+
+
+@pytest.mark.parametrize("file_config_mock", [{"overrides": [
+    ('transfers', 'stats_enabled', 'True'),
+]}], indirect=True)
+def test_api_metrics(vo, rest_client, auth_token, rse_factory, did_factory, root_account, file_config_mock):
+
+    src_rse, src_rse_id = rse_factory.make_mock_rse()
+    dst_rse, dst_rse_id = rse_factory.make_mock_rse()
+    add_distance(src_rse_id, dst_rse_id, distance=10)
+
+    replica_bytes = 20
+
+    did1 = did_factory.random_file_did()
+    activity1 = 'User Subscription'
+    add_replica(rse_id=src_rse_id, bytes_=replica_bytes, adler32='beefdead', account=root_account, **did1)
+
+    did2 = did_factory.random_file_did()
+    activity2 = 'Test'
+    add_replica(rse_id=src_rse_id, bytes_=replica_bytes, adler32='beefdead', account=root_account, **did2)
+
+    requests = [
+        {
+            'dest_rse_id': dst_rse_id,
+            'source_rse_id': src_rse_id,
+            'request_type': RequestType.TRANSFER,
+            'request_id': generate_uuid(),
+            'name': did1['name'],
+            'scope': did1['scope'],
+            'rule_id': generate_uuid(),
+            'retry_count': 1,
+            'attributes': {
+                'activity': activity,
+                'bytes': replica_bytes,
+                'md5': '',
+                'adler32': ''
+            }
+        }
+        for did, activity in ((did1, activity1), (did2, activity2))
+    ]
+    queue_requests(requests)
+
+    stats_manager = TransferStatsManager()
+    stats_manager.observe(
+        src_rse_id=src_rse_id,
+        dst_rse_id=dst_rse_id,
+        activity=activity1,
+        state=RequestState.DONE,
+        file_size=367,
+    )
+    stats_manager.observe(
+        src_rse_id=src_rse_id,
+        dst_rse_id=dst_rse_id,
+        activity=activity2,
+        state=RequestState.FAILED,
+        file_size=1020,
+    )
+    stats_manager.force_save()
+    stats_manager.downsample_and_cleanup()
+
+    api_endpoint = '/requests/metrics'
+    params = {'dst_rse': dst_rse, 'src_rse': src_rse}
+    headers_dict = {'X-Rucio-Type': 'user', 'X-Rucio-Account': root_account.external}
+    response = rest_client.get(api_endpoint, query_string=params, headers=headers(auth(auth_token), vohdr(vo), hdrdict(headers_dict)))
+    metric = json.loads(response.get_data(as_text=True))
+    assert metric['distance'] == 10
+    assert metric['bytes']['queued'][activity1] == replica_bytes
+    assert metric['bytes']['queued'][activity2] == replica_bytes
+    assert metric['bytes']['queued-total'] == 2 * replica_bytes
+    assert metric['files']['queued'][activity1] == 1
+    assert metric['files']['queued'][activity2] == 1
+    assert metric['files']['queued-total'] == 2
+    assert metric['files']['done'][activity1]['1h'] == 1
+    assert metric['bytes']['done'][activity1]['1h'] == 367
+    assert metric['files']['failed'][activity2]['1h'] == 1
+    assert metric['src_rse'] == src_rse
+    assert metric['dst_rse'] == dst_rse
+
+    params = {'dst_rse': dst_rse, 'src_rse': src_rse, 'format': 'panda'}
+    response = rest_client.get(api_endpoint, query_string=params, headers=headers(auth(auth_token), vohdr(vo), hdrdict(headers_dict)))
+    response = json.loads(response.get_data(as_text=True))
+    metric = response.get(f'{src_rse}:{dst_rse}')
+    assert metric is not None

{rucio-clients-32.6.0 → rucio-clients-33.0.0}/tests/test_transfer.py

@@ -148,7 +148,7 @@ def test_get_hops(rse_factory):
     assert hop4['dest_rse'].id == rse6_id
 
 
-def test_disk_vs_tape_priority(rse_factory, root_account, mock_scope):
+def test_disk_vs_tape_priority(rse_factory, root_account, mock_scope, file_config_mock):
     tape1_rse_name, tape1_rse_id = rse_factory.make_posix_rse(rse_type=RSEType.TAPE)
     tape2_rse_name, tape2_rse_id = rse_factory.make_posix_rse(rse_type=RSEType.TAPE)
     disk1_rse_name, disk1_rse_id = rse_factory.make_posix_rse(rse_type=RSEType.DISK)
@@ -215,6 +215,38 @@ def test_disk_vs_tape_priority(rse_factory, root_account, mock_scope):
     assert transfer[0].legacy_sources[0][0] == tape1_rse_name
 
 
+@pytest.mark.parametrize("file_config_mock", [
+    {"overrides": [('transfers', 'source_ranking_strategies', 'PathDistance')]},
+    {"overrides": [('transfers', 'source_ranking_strategies', 'PreferDiskOverTape,PathDistance')]}
+], indirect=True)
+def test_disk_vs_tape_with_custom_strategy(rse_factory, root_account, mock_scope, file_config_mock):
+    """
+    Disk RSEs are preferred over tape only if the PreferDiskOverTape strategy is set.
+    """
+    disk_rse_name, disk_rse_id = rse_factory.make_posix_rse(rse_type=RSEType.DISK)
+    tape_rse_name, tape_rse_id = rse_factory.make_posix_rse(rse_type=RSEType.TAPE)
+    dst_rse_name, dst_rse_id = rse_factory.make_posix_rse()
+    all_rses = [tape_rse_id, disk_rse_id, dst_rse_id]
+    add_distance(disk_rse_id, dst_rse_id, distance=20)
+    add_distance(tape_rse_id, dst_rse_id, distance=10)
+
+    file = {'scope': mock_scope, 'name': 'lfn.' + generate_uuid(), 'type': 'FILE', 'bytes': 1, 'adler32': 'beefdead'}
+    did = {'scope': file['scope'], 'name': file['name']}
+    for rse_id in [tape_rse_id, disk_rse_id]:
+        add_replicas(rse_id=rse_id, files=[file], account=root_account)
+
+    rule_core.add_rule(dids=[did], account=root_account, copies=1, rse_expression=dst_rse_name, grouping='ALL', weight=None, lifetime=None, locked=False, subscription_id=None)
+    topology = Topology().configure_multihop()
+    requests = list_and_mark_transfer_requests_and_source_replicas(rse_collection=topology, rses=all_rses)
+
+    [[_, [transfer]]] = pick_and_prepare_submission_path(topology=topology, protocol_factory=ProtocolFactory(),
+                                                         requests_with_sources=requests).items()
+    if 'PreferDiskOverTape' in file_config_mock.get('transfers', 'source_ranking_strategies'):
+        assert transfer[0].src.rse.name == disk_rse_name
+    else:
+        assert transfer[0].src.rse.name == tape_rse_name
+
+
 @pytest.mark.parametrize("caches_mock", [{"caches_to_mock": [
     'rucio.core.rse_expression_parser.REGION',  # The list of multihop RSEs is retrieved by an expression
 ]}], indirect=True)

rucio-clients-32.6.0/lib/rucio/vcsversion.py

@@ -1,11 +0,0 @@
-
-'''
-This file is automatically generated; Do not edit it. :)
-'''
-VERSION_INFO = {
-    'final': True,
-    'version': '32.6.0',
-    'branch_nick': 'release-32-LTS',
-    'revision_id': '0ac2e5fa1b28c4876c0fb2c8f691567859e3195a',
-    'revno': 12652
-}

rucio-clients-32.6.0/tests/test_temporary_did.py

@@ -1,74 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright European Organization for Nuclear Research (CERN) since 2012
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import pytest
-
-from rucio.client.didclient import DIDClient
-from rucio.common.config import config_get_bool
-from rucio.common.types import InternalAccount, InternalScope
-from rucio.common.utils import generate_uuid
-from rucio.core.rse import get_rse_id
-from rucio.core.temporary_did import (add_temporary_dids, compose, delete_temporary_dids,
-                                      list_expired_temporary_dids)
-from rucio.tests.common_server import get_vo
-
-
-@pytest.mark.noparallel(reason='uses pre-defined RSE')
-def test_core_temporary_dids():
-    """ TMP DATA IDENTIFIERS (CORE): """
-
-    if config_get_bool('common', 'multi_vo', raise_exception=False, default=False):
-        vo = {'vo': get_vo()}
-    else:
-        vo = {}
-    scope = InternalScope('mock', **vo)
-    root = InternalAccount('root', **vo)
-    temporary_dids = []
-    rse = 'MOCK'
-    rse_id = get_rse_id(rse=rse, **vo)
-    for _ in range(10):
-        temporary_dids.append({'scope': scope,
-                               'name': 'object_%s' % generate_uuid(),
-                               'rse_id': rse_id,
-                               'bytes': 1,
-                               'path': None})
-
-    add_temporary_dids(dids=temporary_dids, account=root)
-
-    compose(scope=scope, name='file_%s' % generate_uuid(), rse_id=rse_id,
-            bytes_=10, sources=temporary_dids, account=root,
-            md5=None, adler32=None, pfn=None, meta={}, rules=[],
-            parent_scope=None, parent_name=None)
-
-    dids = list_expired_temporary_dids(rse_id=rse_id, limit=10)
-
-    rowcount = delete_temporary_dids(dids=dids)
-
-    assert rowcount == 10
-
-
-@pytest.mark.noparallel(reason='uses pre-defined RSE')
-def test_client_temporary_dids():
-    """ TMP DATA IDENTIFIERS (CLIENT): """
-    client = DIDClient()
-    temporary_dids = []
-    for _ in range(10):
-        temporary_dids.append({'scope': 'mock',
-                               'name': 'object_%s' % generate_uuid(),
-                               'rse': 'MOCK',
-                               'bytes': 1,
-                               'path': None})
-
-    client.add_temporary_dids(dids=temporary_dids)