rucio-clients 38.4.0__tar.gz → 38.5.0__tar.gz

{rucio_clients-38.4.0 → rucio_clients-38.5.0}/PKG-INFO

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

{rucio_clients-38.4.0 → rucio_clients-38.5.0}/etc/rucio.cfg.template

@@ -121,8 +121,8 @@ usercert = /opt/rucio/tools/x509up
 
 [messaging-fts3]
 port = 61123
-ssl_key_file = /home/mario/.ssh/hostkey.pem
-ssl_cert_file = /home/mario/.ssh/hostcert.pem
+ssl_key_file = /etc/grid-security/hostkey.pem
+ssl_cert_file = /etc/grid-security/hostcert.pem
 destination = /topic/transfer.fts_monitoring_queue_state
 brokers = dashb-test-mb.cern.ch
 voname = atlas
@@ -199,7 +199,6 @@ account = cache_mb
 cacert = /opt/rucio/etc/web/ca.crt
 #cacert = /etc/pki/tls/certs/CERN-bundle.pem
 usercert = /opt/rucio/etc/web/usercert.pem
-#usercert = /home/mario/.ssh/usercert_with_key.pem
 
 [nagios]
 proxy = /opt/rucio/etc/ddmadmin.proxy.nagios

{rucio_clients-38.4.0 → rucio_clients-38.5.0}/lib/rucio/cli/bin_legacy/rucio.py

@@ -36,7 +36,7 @@ from tabulate import tabulate
 
 # rucio module has the same name as this executable module, so this rule fails. pylint: disable=no-name-in-module
 from rucio import version
-from rucio.cli.utils import exception_handler, get_client, setup_gfal2_logger, signal_handler
+from rucio.cli.utils import exception_handler, get_client, scope_exists, setup_gfal2_logger, signal_handler
 from rucio.client.richclient import MAX_TRACEBACK_WIDTH, MIN_CONSOLE_WIDTH, CLITheme, generate_table, get_cli_config, get_pager, print_output, setup_rich_logger
 from rucio.common.client import detect_client_location
 from rucio.common.config import config_get, config_get_float
@@ -48,7 +48,6 @@ from rucio.common.exception import (
     InvalidType,
     RSENotFound,
     RucioException,
-    ScopeNotFound,
     UnsupportedOperation,
 )
 from rucio.common.extra import import_extras
@@ -459,8 +458,7 @@ def list_dids(args, client, logger, console, spinner):
         scope = args.did[0]
         name = '*'
 
-    if scope not in client.list_scopes():
-        raise ScopeNotFound
+    scope_exists(client, scope)
 
     if args.recursive and '*' in name:
         raise InputValidationError('Option recursive cannot be used with wildcards.')
@@ -522,12 +520,19 @@ def list_scopes(args, client, logger, console, spinner):
         scopes = client.list_scopes()
     if (cli_config == 'rich') and (not args.csv):
         scopes = [[scope] for scope in sorted(scopes)]
-        table = generate_table(scopes, headers=['SCOPE'], col_alignments=['left'])
+        table = generate_table(scopes, headers=['SCOPE', 'ACCOUNT'], col_alignments=['left'])
         spinner.stop()
         print_output(table, console=console, no_pager=args.no_pager)
     else:
-        for scope in scopes:
-            print(scope)
+        if isinstance(scopes[0], str):  # TODO: Backwards compatibility - remove in v40 issue #8125
+            for scope in scopes:
+                print(scope)
+        elif args.csv:
+            for scope in scopes:
+                print(scope['scope'])
+        else:
+            scopes = [[s['scope'], s['account']] for s in scopes]
+            print(tabulate(scopes, tablefmt=tablefmt, headers=['SCOPE', 'ACCOUNT'], disable_numparse=True))
     return SUCCESS
 
 

{rucio_clients-38.4.0 → rucio_clients-38.5.0}/lib/rucio/cli/bin_legacy/rucio_admin.py

@@ -780,8 +780,15 @@ def list_scopes(args, client, logger, console, spinner):
         spinner.stop()
         print_output(table, console=console, no_pager=args.no_pager)
     else:
-        for scope in scopes:
-            print(scope)
+        if isinstance(scopes[0], str):  # TODO: Backwards compatibility - remove in v40 issue #8125
+            for scope in scopes:
+                print(scope)
+        elif args.csv:
+            for scope in scopes:
+                print(scope['scope'])
+        else:
+            scopes = [[s['scope'], s['account']] for s in scopes]
+            print(tabulate(scopes, tablefmt=tablefmt, headers=['SCOPE', 'ACCOUNT'], disable_numparse=True))
     return SUCCESS
 
 

{rucio_clients-38.4.0 → rucio_clients-38.5.0}/lib/rucio/cli/replica.py

@@ -129,11 +129,15 @@ def update_bad(ctx, replicas, reason, as_file, collection, lfn, scope, rse):
     """Mark a replica bad"""
     args = {"reason": reason, "allow_collection": collection, "scope": scope, "rse": rse}
     if as_file:
-        args["inputfile"] = replicas
+        if len(replicas) != 1:
+            raise ValueError("Exactly one positional argument expected in case as-file")
+        args["inputfile"] = replicas[0]
     elif lfn:
         if (scope is None) or (rse is None):
             raise ValueError("Scope and RSE are required when using LFNs")
-        args["lfns"] = replicas
+        if len(replicas) != 1:
+            raise ValueError("Exactly one positional argument expected in case of LFN list")
+        args["lfns"] = replicas[0]
     else:
         args["listbadfiles"] = replicas
     declare_bad_file_replicas(Arguments(args), ctx.obj.client, ctx.obj.logger, ctx.obj.console, ctx.obj.spinner)

{rucio_clients-38.4.0 → rucio_clients-38.5.0}/lib/rucio/cli/rule.py

@@ -118,7 +118,6 @@ def move(ctx, rule_id, rses, activity, source_rses):
 @click.option("--account", help="The account owning the rule")
 @click.option("--stuck", is_flag=True, default=False, help="Set state to STUCK.")
 @click.option('--suspend', is_flag=True, default=None, help='Set state to SUSPENDED.')
-@click.option("--activity", help="Activity of the rule.")
 @click.option("--cancel-requests", is_flag=True, default=False, help="Cancel requests when setting rules to stuck.")
 @click.option("--priority", help="Priority of the requests of the rule.")
 @click.option("--child-rule-id", help='Child rule id of the rule. Use "None" to remove an existing parent/child relationship.')

{rucio_clients-38.4.0 → rucio_clients-38.5.0}/lib/rucio/cli/scope.py

@@ -39,3 +39,12 @@ def add_(ctx, account, scope_name):
 def list_(ctx: click.Context, account: str, csv: bool):
     """List existing scopes"""
     list_scopes(Arguments({"no_pager": ctx.obj.no_pager, "account": account, "csv": csv}), ctx.obj.client, ctx.obj.logger, ctx.obj.console, ctx.obj.spinner)
+
+
+@scope.command("update")
+@click.argument('scope-name')
+@click.option('-a', '--account', help="New account to associate with the scope", required=True)
+@click.pass_context
+def update(ctx: click.Context, scope_name: str, account: str):
+    """Update the ownership of a [SCOPE-NAME]"""
+    ctx.obj.client.update_scope_ownership(account=account, scope=scope_name)

{rucio_clients-38.4.0 → rucio_clients-38.5.0}/lib/rucio/cli/utils.py

@@ -41,6 +41,7 @@ from rucio.common.exception import (
     RSENotFound,
     RucioException,
     RuleNotFound,
+    ScopeNotFound,
     UnsupportedOperation,
 )
 from rucio.common.utils import setup_logger
@@ -260,3 +261,13 @@ class JSONType(click.ParamType):
             return json.loads(value)
         except json.JSONDecodeError as e:
             self.fail(f"Invalid JSON: {e}", param, ctx)
+
+
+def scope_exists(client: 'Client', scope: str) -> None:
+    possible_scopes = client.list_scopes()
+    if isinstance(possible_scopes[0], str):  # type: ignore  #TODO Backwards Compat - Remove in v40, #8125
+        scopes = possible_scopes
+    else:
+        scopes = [s['scope'] for s in possible_scopes]  # type: ignore
+    if scope not in scopes:  # type: ignore - handled by the if isinstance
+        raise ScopeNotFound

{rucio_clients-38.4.0 → rucio_clients-38.5.0}/lib/rucio/client/downloadclient.py

@@ -1856,7 +1856,9 @@ class DownloadClient:
             did_name = did[1]
         elif len(did) == 1:
             if self.extract_scope_convention == 'belleii':
-                scopes = [scope for scope in self.client.list_scopes()]
+                scopes = self.client.list_scopes()
+                if not isinstance(scopes, list):
+                    scopes = [scope['scope'] for scope in scopes]
                 did_scope, did_name = extract_scope(did[0], scopes)
             else:
                 did = did_str.split('.')

{rucio_clients-38.4.0 → rucio_clients-38.5.0}/lib/rucio/client/scopeclient.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 from json import loads
+from typing import TYPE_CHECKING, Any, Literal, Union
 from urllib.parse import quote_plus
 
 from requests.status_codes import codes
@@ -21,6 +22,9 @@ from rucio.client.baseclient import BaseClient, choice
 from rucio.common.constants import HTTPMethod
 from rucio.common.utils import build_url
 
+if TYPE_CHECKING:
+    from collections.abc import Iterator
+
 
 class ScopeClient(BaseClient):
 
@@ -64,7 +68,7 @@ class ScopeClient(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 list_scopes(self) -> list[str]:
+    def list_scopes(self) -> "Union[list[str], Iterator[dict[Literal['scope', 'account'], Any]]]":
         """
         Sends the request to list all scopes.
 
@@ -83,6 +87,41 @@ class ScopeClient(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 update_scope_ownership(self, account: str, scope: str) -> bool:
+        """
+        Change the ownership of a scope
+
+        Parameters
+        ----------
+        account :
+            New account to assign as scope owner
+        scope :
+            Scope to change ownership of
+
+        Returns
+        -------
+        bool
+            True if the operation was successful
+
+        Raises
+        ------
+        AccountNotFound
+            If account doesn't exist.
+        ScopeNotFound
+            If scope doesn't exist.
+        CannotAuthenticate, AccessDenied
+            Insufficient permission/incorrect credentials to change ownership.
+        """
+
+        path = '/'.join(['scopes', account, scope])
+        url = build_url(choice(self.list_hosts), path=path)
+        r = self._send_request(url, method=HTTPMethod.PUT)
+        if r.status_code == codes.ok:
+            return True
+        else:
+            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_scopes_for_account(self, account: str) -> list[str]:
         """
         Sends the request to list all scopes for a rucio account.

{rucio_clients-38.4.0 → rucio_clients-38.5.0}/lib/rucio/common/didtype.py

@@ -15,10 +15,12 @@
 """
 DID type to represent a DID and to simplify operations on it
 """
-
+import logging
+from configparser import NoSectionError
 from typing import Any, Union
 
-from rucio.common.exception import DIDError
+from rucio.common.exception import ConfigNotFound, DIDError, InvalidAlgorithmName
+from rucio.common.utils import extract_scope
 
 
 class DID:
@@ -126,15 +128,20 @@ class DID:
         Construct the DID from a string.
         :param did: string containing the DID information
         """
-        did_parts = did.split(DID.SCOPE_SEPARATOR, 1)
-        if len(did_parts) == 1:
-            self.name = did
-            self._update_implicit_scope()
-            if not self.has_scope():
-                raise DIDError('Object construction from non-splitable string is ambigious')
-        else:
-            self.scope = did_parts[0]
-            self.name = did_parts[1]
+        try:
+            self.scope, self.name = extract_scope(did)
+        except (ImportError, InvalidAlgorithmName, ConfigNotFound, NoSectionError) as e:  # Only use when the policy can not be found
+            logging.debug("Failure using extract_scope policy for '%s': %s - Using fallback." % (did, type(e).__name__))
+            did_parts = did.split(DID.SCOPE_SEPARATOR, 1)
+            if len(did_parts) == 1:
+                self.name = did
+                self._update_implicit_scope()
+                if not self.has_scope():
+                    error = f"Could not parse scope from did string {did} - fallback policy expects only one '{DID.SCOPE_SEPARATOR}'"
+                    raise DIDError(error)
+            else:
+                self.scope = did_parts[0]
+                self.name = did_parts[1]
 
     def _did_from_dict(self, did: dict[str, str]) -> None:
         """

{rucio_clients-38.4.0 → rucio_clients-38.5.0}/lib/rucio/vcsversion.py

@@ -4,8 +4,8 @@ This file is automatically generated; Do not edit it. :)
 '''
 VERSION_INFO = {
     'final': True,
-    'version': '38.4.0',
+    'version': '38.5.0',
     'branch_nick': 'release-38-LTS',
-    'revision_id': '945ab71be90243fe96148bb3bd13c1c3ae410765',
-    'revno': 14030
+    'revision_id': '430fd3dd8f4dc5103e1e932c9515421e1c515c3e',
+    'revno': 14073
 }

{rucio_clients-38.4.0 → rucio_clients-38.5.0}/tests/test_bin_rucio.py

@@ -12,9 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import logging
 import os
 import random
 import re
+import shlex
 import tempfile
 from datetime import datetime, timedelta, timezone
 
@@ -1292,3 +1294,80 @@ def test_download_file_check_by_size(rse_factory, mock_scope, did_factory):
         exitcode, out, err = execute(cmd)
         assert exitcode == 0
         assert "File with same name exists locally, but filesize mismatches" in err
+
+
+@pytest.mark.parametrize(
+    ("cli", "lfn"),
+    [
+        ("new", True),
+        ("old", True),
+        ("new", False),
+        ("old", False),
+    ]
+)
+def test_cli_declare_bad_replicas(cli, lfn, rse_factory, mock_scope, did_factory, tmp_path, rucio_client):
+    """CLIENT(USER): Rucio declare bad replica"""
+    log = logging.getLogger("bad-replicas")
+
+    rse, _ = rse_factory.make_posix_rse()
+    scope = mock_scope.external
+
+    did = did_factory.upload_test_file(rse_name=rse, scope=scope)
+    # replace scope object with scope name str
+    did["scope"] = did["scope"].external
+
+    cmd = []
+    if cli == "new":
+        cmd = ["rucio", "replica", "state", "update", "bad"]
+    else:
+        cmd = ["rucio-admin", "replicas", "declare-bad"]
+
+    cmd.extend(["--reason", "test"])
+
+    bad_replicas = []
+
+    if lfn:
+        lfn_path = tmp_path / "lfns.txt"
+        lfn_path.write_text(did["name"] + "\n")
+
+        if cli == "new":
+            cmd.append("--lfn")
+            bad_replicas.append(str(lfn_path))
+        else:
+            cmd.extend(["--lfns", str(lfn_path)])
+
+        cmd.extend(["--rse", rse, "--scope", scope])
+    else:
+        bad_replicas.append(f"{did['scope']}:{did['name']}")
+
+    cmd.extend(bad_replicas)
+    cmd = shlex.join(cmd)
+
+    code, stdout, stderr = execute(cmd)
+    log.info("Command stdout:\n%s", stdout)
+    log.warning("Command stderr:\n%s", stderr)
+    assert code == 0, f"Running {cmd} failed. out:\n{stdout}\nerr\n{stderr}"
+
+    replicas = next(rucio_client.list_replicas([did], rse_expression=rse, all_states=True))
+    assert replicas["states"][rse] == "BAD"
+
+
+def test_cli_declare_bad_replicas_invalid_usage():
+    """CLIENT(USER): Rucio declare bad replica invalid argument handling"""
+    base_cmd = ["rucio", "replica", "state", "update", "bad"]
+
+    def run(expected_error, args=None, expected_code=1):
+        args = args or []
+        cmd = shlex.join(base_cmd + args)
+        code, stdout, stderr = execute(cmd)
+
+        assert code == expected_code, f"Running {cmd} did not fail as expected. out:\n{stdout}\nerr\n{stderr}"
+        assert expected_error in stderr, f"Expected error message not found in stderr:\n{stderr}"
+
+    run("Missing option '--reason'", expected_code=2)
+
+    args = ["--reason", "test", "--lfn", "foo"]
+    run("Scope and RSE are required", args=args, expected_code=1)
+
+    args = ["--reason", "test", "--scope", "test", "--rse", "test", "--lfn", "foo", "bar"]
+    run("Exactly one", args=args, expected_code=1)

{rucio_clients-38.4.0 → rucio_clients-38.5.0}/tests/test_cli_client_structure.py

@@ -857,20 +857,29 @@ def test_rule(rucio_client, mock_scope):
     assert len(out.split("\n")) == 3  # Creates two rules with independent IDs and one extra line at the end
 
 
-def test_scope():
-    new_scope = scope_name_generator()
-    cmd = f"rucio scope add {new_scope} --account root"
+def test_scope(rucio_client, scope_factory, random_account_factory, vo):
+    scope = scope_name_generator()
+    account = random_account_factory().external
+    cmd = f"rucio scope add {scope} --account {account}"
     exitcode, _, err = execute(cmd)
     assert exitcode == 0
     assert "ERROR" not in err
 
-    cmd = "rucio scope list --account root"
+    cmd = f"rucio scope list --account {account}"
     exitcode, out, err = execute(cmd)
     assert exitcode == 0
     assert "ERROR" not in err
     # assert new_scope in out
     # See issue https://github.com/rucio/rucio/issues/7316
 
+    new_scope, _ = scope_factory(vos=[vo], account_name=account)
+    new_account = random_account_factory().external
+    cmd = f"rucio scope update {new_scope} --account {new_account}"
+    exitcode, out, err = execute(cmd)
+    assert exitcode == 0
+    assert "ERROR" not in err
+    assert new_scope in rucio_client.list_scopes_for_account(new_account)
+
 
 def test_subscription(rucio_client, mock_scope):
     subscription_name = generate_uuid()

{rucio_clients-38.4.0 → rucio_clients-38.5.0}/tests/test_conveyor.py

@@ -452,7 +452,6 @@ def test_multisource(vo, did_factory, root_account, replica_client, caches_mock,
     )
 
 
-@pytest.mark.skip(reason="Pending https://cern.service-now.com/service-portal?id=ticket&table=incident&n=INC4506150")
 @skip_rse_tests_with_accounts
 @pytest.mark.dirty(reason="leaves files in XRD containers")
 @pytest.mark.noparallel(groups=[NoParallelGroups.XRD, NoParallelGroups.SUBMITTER, NoParallelGroups.RECEIVER])
@@ -526,7 +525,6 @@ def test_multisource_receiver(vo, did_factory, replica_client, root_account, met
         RECEIVER_GRACEFUL_STOP.clear()
 
 
-@pytest.mark.skip(reason="Pending https://cern.service-now.com/service-portal?id=ticket&table=incident&n=INC4506150")
 @skip_rse_tests_with_accounts
 @pytest.mark.noparallel(groups=[NoParallelGroups.XRD, NoParallelGroups.SUBMITTER, NoParallelGroups.RECEIVER])
 @pytest.mark.parametrize("caches_mock", [{"caches_to_mock": [
@@ -581,7 +579,6 @@ def test_multihop_receiver_on_failure(vo, did_factory, replica_client, root_acco
         RECEIVER_GRACEFUL_STOP.clear()
 
 
-@pytest.mark.skip(reason="Pending https://cern.service-now.com/service-portal?id=ticket&table=incident&n=INC4506150")
 @skip_rse_tests_with_accounts
 @pytest.mark.noparallel(groups=[NoParallelGroups.XRD, NoParallelGroups.SUBMITTER, NoParallelGroups.RECEIVER])
 @pytest.mark.parametrize("caches_mock", [{"caches_to_mock": [
@@ -626,7 +623,6 @@ def test_multihop_receiver_on_success(vo, did_factory, root_account, caches_mock
         RECEIVER_GRACEFUL_STOP.clear()
 
 
-@pytest.mark.skip(reason="Pending https://cern.service-now.com/service-portal?id=ticket&table=incident&n=INC4506150")
 @skip_rse_tests_with_accounts
 @pytest.mark.dirty(reason="leaves files in XRD containers")
 @pytest.mark.noparallel(groups=[NoParallelGroups.XRD, NoParallelGroups.SUBMITTER, NoParallelGroups.RECEIVER, NoParallelGroups.POLLER])
@@ -696,7 +692,6 @@ def test_receiver_archiving(vo, did_factory, root_account, caches_mock, scitags_
             RECEIVER_GRACEFUL_STOP.clear()
 
 
-@pytest.mark.skip(reason="Pending https://cern.service-now.com/service-portal?id=ticket&table=incident&n=INC4506150")
 @skip_rse_tests_with_accounts
 @pytest.mark.noparallel(groups=[NoParallelGroups.PREPARER, NoParallelGroups.THROTTLER, NoParallelGroups.SUBMITTER, NoParallelGroups.POLLER])
 @pytest.mark.parametrize("file_config_mock", [{
@@ -713,6 +708,10 @@ def test_preparer_throttler_submitter(rse_factory, did_factory, root_account, fi
 
     for rse_id in all_rses:
         rse_core.add_rse_attribute(rse_id, RseAttr.FTS, TEST_FTS_HOST)
+        # Disable checksum verification
+        # to avoid user-defining source and destination checksum for each transfer
+        # (required when using the mock protocol on FTS >= 3.14.1)
+        rse_core.add_rse_attribute(rse_id, RseAttr.VERIFY_CHECKSUM, False)
     distance_core.add_distance(src_rse_id, dst_rse_id1, distance=10)
     distance_core.add_distance(src_rse_id, dst_rse_id2, distance=10)
     # Set limits only for one of the RSEs
@@ -1029,7 +1028,6 @@ def test_failed_transfers_to_mas_existing_replica(rse_factory, did_factory, root
     assert rule_core.get_rule(rule2_id)['state'] == RuleState.STUCK
 
 
-@pytest.mark.skip(reason="Pending https://cern.service-now.com/service-portal?id=ticket&table=incident&n=INC4506150")
 @skip_rse_tests_with_accounts
 @pytest.mark.noparallel(groups=[NoParallelGroups.SUBMITTER, NoParallelGroups.POLLER, NoParallelGroups.FINISHER])
 def test_lost_transfers(rse_factory, did_factory, root_account):
@@ -1045,11 +1043,21 @@ def test_lost_transfers(rse_factory, did_factory, root_account):
         rse_core.add_rse_attribute(rse_id, RseAttr.FTS, TEST_FTS_HOST)
 
     did = did_factory.upload_test_file(src_rse)
+    replica = replica_core.get_replica(rse_id=src_rse_id, **did)
 
     rule_core.add_rule(dids=[did], account=root_account, copies=1, rse_expression=dst_rse, grouping='ALL', weight=None, lifetime=None, locked=False, subscription_id=None)
 
-    # Fake that the transfer is submitted and lost
-    submitter(once=True, rses=[{'id': rse_id} for rse_id in all_rses], group_bulk=2, partition_wait_time=0, transfertype='single', filter_transfertool=None)
+    class _FTSWrapper(FTSWrapper):
+        @staticmethod
+        def on_submit(file):
+            # Set the correct checksum on both source and destination
+            file['sources'] = [set_query_parameters(s_url, {'checksum': replica['adler32']}) for s_url in file['sources']]
+            file['destinations'] = [set_query_parameters(d_url, {'checksum': replica['adler32']}) for d_url in file['destinations']]
+
+    with patch('rucio.core.transfer.TRANSFERTOOL_CLASSES_BY_NAME', new={'fts3': _FTSWrapper}):
+        # Fake that the transfer is submitted and lost
+        submitter(once=True, rses=[{'id': rse_id} for rse_id in all_rses], group_bulk=2, partition_wait_time=0, transfertype='single', filter_transfertool=None)
+
     request = request_core.get_request_by_did(rse_id=dst_rse_id, **did)
     __update_request(request['id'], external_id='some-fake-random-id')
 
@@ -1064,7 +1072,8 @@ def test_lost_transfers(rse_factory, did_factory, root_account):
     # The source ranking must not be updated for submission failures and lost transfers
     request = request_core.get_request_by_did(rse_id=dst_rse_id, **did)
     assert __get_source(request_id=request['id'], src_rse_id=src_rse_id, **did).ranking == 0
-    submitter(once=True, rses=[{'id': rse_id} for rse_id in all_rses], group_bulk=2, partition_wait_time=0, transfertype='single', filter_transfertool=None)
+    with patch('rucio.core.transfer.TRANSFERTOOL_CLASSES_BY_NAME', new={'fts3': _FTSWrapper}):
+        submitter(once=True, rses=[{'id': rse_id} for rse_id in all_rses], group_bulk=2, partition_wait_time=0, transfertype='single', filter_transfertool=None)
     replica = __wait_for_replica_transfer(dst_rse_id=dst_rse_id, **did)
     assert replica['state'] == ReplicaState.AVAILABLE
 
@@ -1430,7 +1439,6 @@ def test_multi_vo_certificates(file_config_mock, rse_factory, did_factory, scope
         assert sorted(certs_used_by_poller) == ['DEFAULT_DUMMY_CERT', 'NEW_VO_DUMMY_CERT']
 
 
-@pytest.mark.skip(reason="Pending https://cern.service-now.com/service-portal?id=ticket&table=incident&n=INC4506150")
 @skip_rse_tests_with_accounts
 @pytest.mark.noparallel(groups=[NoParallelGroups.SUBMITTER, NoParallelGroups.POLLER, NoParallelGroups.FINISHER])
 @pytest.mark.parametrize("core_config_mock", [
@@ -1474,6 +1482,7 @@ def test_two_multihops_same_intermediate_rse(rse_factory, did_factory, root_acco
     all_rses = [rse1_id, rse2_id, rse3_id, rse4_id, rse5_id, rse6_id, rse7_id]
     for rse_id in all_rses:
         rse_core.add_rse_attribute(rse_id, RseAttr.FTS, TEST_FTS_HOST)
+        rse_core.add_rse_attribute(rse_id, RseAttr.VERIFY_CHECKSUM, False)
         rse_core.set_rse_limits(rse_id=rse_id, name='MinFreeSpace', value=1)
         rse_core.set_rse_usage(rse_id=rse_id, source='storage', used=1, free=0)
     distance_core.add_distance(rse1_id, rse2_id, distance=10)
@@ -1562,7 +1571,6 @@ def test_two_multihops_same_intermediate_rse(rse_factory, did_factory, root_acco
     assert dict_stats[rse2_id][rse1_id]['bytes_done'] == 2
 
 
-@pytest.mark.skip(reason="Pending https://cern.service-now.com/service-portal?id=ticket&table=incident&n=INC4506150")
 @skip_rse_tests_with_accounts
 @pytest.mark.noparallel(groups=[NoParallelGroups.SUBMITTER, NoParallelGroups.POLLER])
 def test_checksum_validation(rse_factory, did_factory, root_account):
@@ -1607,15 +1615,14 @@ def test_checksum_validation(rse_factory, did_factory, root_account):
     # No common supported checksum between the source and destination rse. It will verify the destination rse checksum and fail
     request = __wait_for_state_transition(dst_rse_id=dst_rse2_id, **did)
     assert request['state'] == RequestState.FAILED
-    assert 'User and destination checksums do not match' in request['err_msg']
+    assert 'User-defined and destination MD5 checksum do not match' in request['err_msg']
 
-    # Common checksum exists between the two. It must use "both" validation strategy and fail
+    # Common checksum exists between the two. It It will fail early when checking the user-defined and destination checksums.
     request = __wait_for_state_transition(dst_rse_id=dst_rse3_id, **did)
-    assert 'Source and destination checksums do not match' in request['err_msg']
+    assert 'User-defined and destination ADLER32 checksum do not match' in request['err_msg']
     assert request['state'] == RequestState.FAILED
 
 
-@pytest.mark.skip(reason="Pending https://cern.service-now.com/service-portal?id=ticket&table=incident&n=INC4506150")
 @skip_rse_tests_with_accounts
 @pytest.mark.needs_iam
 @pytest.mark.noparallel(groups=[NoParallelGroups.XRD, NoParallelGroups.SUBMITTER, NoParallelGroups.RECEIVER])

{rucio_clients-38.4.0 → rucio_clients-38.5.0}/tests/test_did_meta_plugins.py

@@ -431,6 +431,27 @@ class TestDidMetaExternalPostgresJSON:
         postgres_json_meta.set_metadata(scope=mock_scope, name=did_name, key=meta_key, value=meta_value)
         assert postgres_json_meta.get_metadata(scope=mock_scope, name=did_name)[meta_key] == meta_value
 
+    @pytest.mark.dirty
+    def test_delete_metadata(self, mock_scope, root_account, postgres_json_meta):
+        """ DID Meta (POSTGRES_JSON): delete DID meta """
+
+        did_name = did_name_generator('dataset')
+        meta_key1 = 'my_key_%s' % generate_uuid()
+        meta_value1 = 'my_value_%s' % generate_uuid()
+        meta_key2 = 'my_key_%s' % generate_uuid()
+        meta_value2 = 'my_value_%s' % generate_uuid()
+        add_did(scope=mock_scope, name=did_name, did_type='DATASET', account=root_account)
+        postgres_json_meta.set_metadata(scope=mock_scope, name=did_name, key=meta_key1, value=meta_value1)
+        postgres_json_meta.set_metadata(scope=mock_scope, name=did_name, key=meta_key2, value=meta_value2)
+        
+        assert postgres_json_meta.get_metadata(scope=mock_scope, name=did_name)[meta_key1] == meta_value1
+        assert postgres_json_meta.get_metadata(scope=mock_scope, name=did_name)[meta_key2] == meta_value2
+       
+        postgres_json_meta.delete_metadata(scope=mock_scope, name=did_name, key=meta_key2)
+        metadata = postgres_json_meta.get_metadata(scope=mock_scope, name=did_name)
+        assert metadata[meta_key1] == meta_value1
+        assert meta_key2 not in metadata
+
     @pytest.mark.dirty
     def test_list_did_meta(self, mock_scope, root_account, postgres_json_meta):
         """ DID Meta (POSTGRES_JSON): List DID meta """

{rucio_clients-38.4.0 → rucio_clients-38.5.0}/tests/test_gateway_external_representation.py

@@ -407,7 +407,7 @@ class TestGatewayExternalRepresentation:
     def test_gateway_scope(self, vo, vo2, account_name, scope_name, scope):
         """ SCOPE (Gateway): Test external representation of scopes """
 
-        out = list_scopes()
+        out = [s['scope'] for s in list_scopes()]
         assert scope_name in out
         if vo2:
             assert scope.internal not in out

{rucio_clients-38.4.0 → rucio_clients-38.5.0}/tests/test_multi_vo.py

@@ -757,8 +757,8 @@ class TestMultiVoClients:
         scope_client.add_scope('root', shr)
         add_scope(new, 'root', 'root', vo=second_vo)
         add_scope(shr, 'root', 'root', vo=second_vo)
-        scope_list_tst = list(scope_client.list_scopes())
-        scope_list_new = list(list_scopes(filter_={}, vo=second_vo))
+        scope_list_tst = [s['scope'] for s in scope_client.list_scopes()]
+        scope_list_new = [s['scope'] for s in list_scopes(filter_={}, vo=second_vo)]
         assert tst in scope_list_tst
         assert new not in scope_list_tst
         assert shr in scope_list_tst