rucio-clients 36.4.0__tar.gz → 37.0.0rc1__tar.gz

{rucio_clients-36.4.0 → rucio_clients-37.0.0rc1}/AUTHORS.rst

@@ -68,6 +68,7 @@ Individual contributors to the source code
 - Elena Gazzarrini <gazzarrini.elena@gmail.com>, 2022-2023
 - Maximilian Linhoff, <maximilian.linhoff@tu-dortmund.de>, 2024
 - Eric Banzuzi, <eric.banzuzi@gmail.com>, 2024
+- Paul Millar, <paul.millar@desy.de>, 2025
 
 Organisations employing contributors
 ------------------------------------
@@ -96,3 +97,4 @@ Organisations employing contributors
 - University of Chicago (USA)
 - Purdue University (USA)
 - TU Dortmund University (Germany)
+- Deutsches Elektronen-Synchrotron DESY (Germany)

rucio_clients-37.0.0rc1/ChangeLog

@@ -0,0 +1 @@
+Release notes may be found at: https://rucio.cern.ch/documentation/release-notes/

{rucio_clients-36.4.0 → rucio_clients-37.0.0rc1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: rucio-clients
-Version: 36.4.0
+Version: 37.0.0rc1
 Summary: Rucio Client Lite Package
 Home-page: https://rucio.cern.ch/
 Author: Rucio
@@ -19,33 +19,35 @@ Classifier: Programming Language :: Python :: 3.10
 Requires-Python: >=3.9, <4
 License-File: LICENSE
 License-File: AUTHORS.rst
-Requires-Dist: requests>=2.32.2
-Requires-Dist: urllib3>=1.26.18
-Requires-Dist: dogpile-cache>=1.2.2
-Requires-Dist: tabulate>=0.9.0
-Requires-Dist: jsonschema>=4.20.0
-Requires-Dist: packaging>=24.1
-Requires-Dist: rich>=13.7.1
-Requires-Dist: typing-extensions>=4.12.2
+Requires-Dist: requests
+Requires-Dist: urllib3
+Requires-Dist: dogpile-cache
+Requires-Dist: packaging
+Requires-Dist: tabulate
+Requires-Dist: jsonschema
+Requires-Dist: dataclasses
+Requires-Dist: rich
+Requires-Dist: typing_extensions
 Provides-Extra: ssh
-Requires-Dist: paramiko>=3.4.0; extra == "ssh"
+Requires-Dist: paramiko; 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"
+Requires-Dist: kerberos; extra == "kerberos"
+Requires-Dist: pykerberos; extra == "kerberos"
+Requires-Dist: requests-kerberos; extra == "kerberos"
 Provides-Extra: swift
-Requires-Dist: python-swiftclient>=4.4.0; extra == "swift"
+Requires-Dist: python-swiftclient; extra == "swift"
 Provides-Extra: argcomplete
-Requires-Dist: argcomplete>=3.1.6; extra == "argcomplete"
+Requires-Dist: argcomplete; extra == "argcomplete"
 Provides-Extra: sftp
-Requires-Dist: paramiko>=3.4.0; extra == "sftp"
+Requires-Dist: paramiko; extra == "sftp"
 Provides-Extra: dumper
-Requires-Dist: python-magic>=0.4.27; extra == "dumper"
+Requires-Dist: python-magic; extra == "dumper"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
 Dynamic: home-page
 Dynamic: license
+Dynamic: license-file
 Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: requires-python

{rucio_clients-36.4.0 → rucio_clients-37.0.0rc1}/bin/rucio

@@ -17,8 +17,8 @@ import argparse
 import sys
 from typing import TYPE_CHECKING, Optional
 
-from rucio.client.commands.bin_legacy.rucio import main as main_legacy
-from rucio.client.commands.command import main
+from rucio.cli.bin_legacy.rucio import main as main_legacy
+from rucio.cli.command import main
 from rucio.common.utils import setup_logger
 
 if TYPE_CHECKING:
@@ -60,7 +60,7 @@ def map_legacy_command() -> Optional[list[str]]:
             "detach": ["did", "content", "remove"],
             "ls": ["did", "list"],
             "list-dids": ["did", "list"],
-            "list-parent-dids": ["did", "show", "--parent"],
+            "list-parent-dids": ["did", "list", "--parent"],
             "list-scopes": ["scope", "list"],
             "close": ["did", "update", "--close"],
             "reopen": ["did", "update", "--open"],
@@ -83,7 +83,7 @@ def map_legacy_command() -> Optional[list[str]]:
             "list-rules": ["rule", "list"],
             "list-rules-history": ["rule", "history"],
             "update-rule": ["rule", "update"],
-            "move-rule": ["rule", "update", "--move"],
+            "move-rule": ["rule", "move"],
             "list-rses": ["rse", "list"],
             "list-suspicious-replicas": ["replica", "state", "suspicious"],
             "list-rse-attributes": ["rse", "attribute", "list"],
@@ -115,7 +115,7 @@ if __name__ == "__main__":
         main_legacy()
 
     elif (any(arg in commands for arg in sys.argv)) or args.help or args.version:
-        main()
+        main()  # pylint: disable=E1120
 
     else:
         make_warning(logger)
@@ -130,4 +130,4 @@ if __name__ == "__main__":
             else:
                 sys.argv = ["rucio", "-h"]
 
-            main()
+            main()  # pylint: disable=E1120

{rucio_clients-36.4.0 → rucio_clients-37.0.0rc1}/bin/rucio-admin

@@ -12,9 +12,10 @@
 # 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 sys
 
-from rucio.client.commands.bin_legacy.rucio_admin import main as main_legacy
+from rucio.cli.bin_legacy.rucio_admin import main as main_legacy
 from rucio.common.utils import setup_logger
 
 
@@ -32,7 +33,7 @@ def make_warning():
     except IndexError:
         second_command = "-h"
 
-    if first_command not in ("-h", "--version", "--help"):
+    if (first_command not in ("-h", "--version", "--help")) and (first_command is not None):
         command_map = {
             "data": {"import": "upload", "export": "download"},
             "account": {
@@ -44,8 +45,8 @@ def make_warning():
                 "set-limits": "account limit add",
                 "get-limits": "account limit list",
                 "delete-limits": "account limit remove",
-                "ban": "account update --ban True",
-                "unban": "account update --ban False",
+                "ban": "account update --ban",
+                "unban": "account update --unban",
                 "list-attributes": "account attribute list",
                 "add-attribute": "account attribute add",
                 "delete-attribute": "account attribute remove",
@@ -60,7 +61,8 @@ def make_warning():
                 "set-attribute": "rse attribute add",
                 "delete-attribute": "rse attribute remove",
                 "delete-distance": "rse distance remove",
-                "get-distance": "rse distance list",
+                "get-distance": "rse distance show",
+                "set-distance": "rse distance update",
                 "get-attribute": "rse attribute list",
                 "add-protocol": "rse protocol add",
                 "delete-protocol": "rse protocol remove",
@@ -75,15 +77,7 @@ def make_warning():
             "scope": {"-h": "scope -h", "add": "scope add", "list": "scope list"},
             "config": {"-h": "config -h", "get": "config list", "set": "config add", "delete": "config remove"},
             "subscription": {"-h": "subscription -h", "add": "subscription add", "list": "subscription", "update": "subscription update", "reevaluate": "subscription touch"},
-            "replicas": {
-                "-h": "replica -h",
-                "quarantine": "replica state quarantine",
-                "declare-bad": "replica state bad",
-                "declare-temporary-unavailable":
-                "replica state unavailable",
-                "set-tombstone": "replica remove",
-                "list-pfns": "replica list file --pfns"
-            },
+            "replicas": {"-h": "replica -h", "quarantine": "replica state update quarantine", "declare-bad": "replica state update bad", "declare-temporary-unavailable": "replica state update unavailable", "set-tombstone": "replica remove"},
         }
         try:
             new_command = command_map[first_command]

{rucio_clients-36.4.0 → rucio_clients-37.0.0rc1}/etc/rucio.cfg.template

@@ -77,7 +77,7 @@ default = sqlite:////tmp/rucio.db
 #default = oracle://_____________:___________@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=127.0.0.1)(PORT=______))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=_____________)))
 #schema=atlas_rucio  # only for cern oracle
 #default = mysql+pymysql://rucio:rucio@localhost/rucio
-#default = postgresql://rucio:rucio@localhost/rucio
+#default = postgresql+psycopg://rucio:rucio@localhost/rucio
 pool_recycle=3600
 echo=0
 pool_reset_on_return=rollback
@@ -211,23 +211,6 @@ fts_servers = https://fts3-pilot.cern.ch:8446, https://fts3-devel.cern.ch:8446,
 cache = /opt/rucio/auditor-cache
 results = /opt/rucio/auditor-results
 
-[c3po]
-placement_algorithm = t2_free_space
-elastic_url = http://aianalytics01.cern.ch:9200
-redis_host = localhost
-redis_port = 6379
-
-[c3po-popularity]
-elastic_url = http://rucio-logger-prod-01.cern.ch:9200
-
-[c3po-site-mapper]
-panda_url = http://atlas-agis-api.cern.ch/request/pandaqueue/query/list/?json
-ddm_url = http://atlas-agis-api.cern.ch/request/ddmendpoint/query/list/?json
-
-[c3po-workload]
-panda_url = http://bigpanda.cern.ch/jobs/?category=analysis&jobstatus=running
-window = 604800
-
 [policy]
 package = atlas_rucio_policy_package
 permission = atlas

{rucio_clients-36.4.0 → rucio_clients-37.0.0rc1}/lib/rucio/alembicrevision.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ALEMBIC_REVISION = 'b0070f3695c8'  # the current alembic head revision
+ALEMBIC_REVISION = '30d5206e9cad'  # the current alembic head revision

rucio_clients-37.0.0rc1/lib/rucio/cli/__init__.py

@@ -0,0 +1,14 @@
+# 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.
+from rucio.cli import command  # noqa: F401

rucio_clients-37.0.0rc1/lib/rucio/cli/account.py

@@ -0,0 +1,216 @@
+# 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 click
+
+from rucio.cli.bin_legacy.rucio import list_account_usage
+from rucio.cli.bin_legacy.rucio_admin import (
+    add_account,
+    add_account_attribute,
+    ban_account,
+    delete_account,
+    delete_account_attribute,
+    delete_limits,
+    identity_delete,
+    info_account,
+    list_account_attributes,
+    list_accounts,
+    list_identities,
+    set_limits,
+    unban_account,
+    update_account,
+)
+from rucio.cli.bin_legacy.rucio_admin import identity_add as legacy_identity_add
+from rucio.cli.utils import Arguments
+
+
+@click.group()
+def account():
+    """Methods to add or change accounts for users, groups, and services. Used to assign privileges"""
+
+
+@account.command("add")
+@click.argument("account-name")
+@click.argument("account-type", type=click.Choice(["USER", "GROUP", "SERVICE"]))
+@click.option("--email", type=str, help="Email address associated with the account")
+@click.pass_context
+def add_(ctx, account_type, account_name, email):
+    """Add an account of type [ACCOUNT-TYPE] with the name [ACCOUNT-NAME]
+
+    \b
+    Example:
+        $ rucio account add
+    """
+    args = Arguments({"account_type": account_type, "account": account_name, "email": email})
+    add_account(args, ctx.obj.client, ctx.obj.logger, ctx.obj.console, ctx.obj.spinner)
+
+
+@account.command("list")
+@click.option("--type", "type_", type=click.Choice(["USER", "GROUP", "SERVICE"]))
+@click.option("--id", help="Filter by identity (e.g. DN)")
+@click.option("--filter", help="Filter arguments in form `key=value,another_key=next_value`")  # TODO Explicit numeration of these possible keys
+@click.pass_context
+def list_(ctx, type_, id, filter):
+    """List all accounts that match given filters"""
+    args = Arguments({"account_type": type_, "identity": id, "filters": filter})
+    list_accounts(args, ctx.obj.client, ctx.obj.logger, ctx.obj.console, ctx.obj.spinner)
+
+
+@account.command("show")
+@click.argument("account-name")
+@click.pass_context
+def show(ctx, account_name):
+    """
+    Show info about a single account
+    """
+    info_account(Arguments({"account": account_name}), ctx.obj.client, ctx.obj.logger, ctx.obj.console, ctx.obj.spinner)
+
+
+@account.command("remove")
+@click.argument("account-name")
+@click.pass_context
+def remove(ctx, account_name):
+    """
+    Remove an account
+    (WARNING: Permanently disables the account. If you want to temporarily disable, use `account update [account-name] --ban`)
+    """
+    delete_account(Arguments({"account": account_name}), ctx.obj.client, ctx.obj.logger, ctx.obj.console, ctx.obj.spinner)
+
+
+@account.command("update")
+@click.argument("account-name")
+@click.option("--email", help="Email address associated with the account")
+@click.option("--ban/--unban", default=None, help="Temporarily disable/enable an account")
+@click.pass_context
+def update(ctx, ban, account_name, email):
+    """Update account settings"""
+    args = Arguments({"account": account_name, "key": "email", "value": email})
+    if ban is not None:
+        if ban:
+            ban_account(args, ctx.obj.client, ctx.obj.logger, ctx.obj.console, ctx.obj.spinner)
+        else:
+            unban_account(args, ctx.obj.client, ctx.obj.logger, ctx.obj.console, ctx.obj.spinner)
+    else:
+        update_account(args, ctx.obj.client, ctx.obj.logger, ctx.obj.console, ctx.obj.spinner)
+
+
+@account.group()
+def attribute():
+    """View or modify account attributes"""
+
+
+@attribute.command("list")
+@click.argument("account-name")
+@click.pass_context
+def attribute_list(ctx, account_name):
+    "List the attributes for a given account"
+    list_account_attributes(Arguments({"account": account_name}), ctx.obj.client, ctx.obj.logger, ctx.obj.console, ctx.obj.spinner)
+
+
+@attribute.command("add")
+@click.argument("account-name")
+@click.option('--key', help='Attribute key', required=True)
+@click.option('--value', help='Attribute value', required=True)
+@click.pass_context
+def attribute_add(ctx, account_name, key, value):
+    """Add a new attribute [key] to an account"""
+    add_account_attribute(Arguments({"account": account_name, "key": key, "value": value}), ctx.obj.client, ctx.obj.logger, ctx.obj.console, ctx.obj.spinner)
+
+
+@attribute.command("remove")
+@click.argument("account-name")
+@click.option("--key", help="Attribute key", required=True)
+@click.pass_context
+def attribute_remove(ctx, account_name, key):
+    """Remove an attribute from an account without reassigning it"""
+    delete_account_attribute(Arguments({"account": account_name, "key": key}), ctx.obj.client, ctx.obj.logger, ctx.obj.console, ctx.obj.spinner)
+
+
+@account.group("limit")
+def limit():
+    """View or modify account limits - limit how much data an account can store on an RSE"""
+
+
+@limit.command("list", help="Shows the space used, the quota limit and the quota left for an account for every RSE where the user have quota.")
+@click.argument("account-name")
+@click.option("--rse", "--rse-name", help="Show usage for only for this RSE.")
+@click.pass_context
+def limit_list(ctx, account_name, rse):
+    """List the limits and current usage for an account"""
+    args = Arguments({"usage_account": account_name, "rse": rse})
+    list_account_usage(args, ctx.obj.client, ctx.obj.logger, ctx.obj.console, ctx.obj.spinner)
+
+
+@limit.command("add")
+@click.argument(
+    "account-name",
+)
+@click.option("--rse", "--rse-name", help="Full RSE name", required=True)  # TODO Separate RSE (local) and RSE Expression (global)
+@click.option("--bytes", "bytes_", help='Value of the limit; can be specified in bytes ("10000"), with a storage unit ("10GB"), or "infinity"', required=True)
+@click.option("--locality", type=click.Choice(["local", "global"]), help="Global or local limit scope", default="local")
+@click.pass_context
+def limit_add(ctx, account_name, rse, bytes_, locality):
+    """Add a new limit for an account on an RSE. An account can have both local and global limits on the same RSE."""
+    args = Arguments({"account": account_name, "rse": rse, "bytes": bytes_, "locality": locality})
+    set_limits(args, ctx.obj.client, ctx.obj.logger, ctx.obj.console, ctx.obj.spinner)
+
+
+@limit.command("remove")
+@click.argument(
+    "account-name",
+)
+@click.option("--rse", "--rse-name", help="Full RSE name", required=True)
+@click.option("--locality", type=click.Choice(["local", "global"]), help="Global or local limit scope", default="local")
+@click.pass_context
+def limit_remove(ctx, account_name, rse, locality):
+    """Remove existing limits for an account on an RSE"""
+    args = Arguments({"account": account_name, "rse": rse, "locality": locality})
+    delete_limits(args, ctx.obj.client, ctx.obj.logger, ctx.obj.console, ctx.obj.spinner)
+
+
+@account.group("identity")
+def identity():
+    """Manage identities for an account - used to login"""
+
+
+@identity.command("list")
+@click.argument("account-name", required=True)
+@click.pass_context
+def identity_list(ctx, account_name):
+    """See all the IDs for [account-name]"""
+    args = Arguments({"account": account_name})
+    list_identities(args, ctx.obj.client, ctx.obj.logger, ctx.obj.console, ctx.obj.spinner)
+
+
+@identity.command("add")
+@click.argument("account-name", required=True)
+@click.option("--type", "type_", type=click.Choice(["X509", "GSS", "USERPASS", "SSH", "SAML", "OIDC"]), help="Authentication type", required=True)
+@click.option("--id", help="Identity", required=True)
+@click.option("--email", help="Email address associated with the identity", required=True)
+@click.option("--password", help="Password if authtype is USERPASS")
+@click.pass_context
+def identity_add(ctx, account_name, type_, id, email, password):
+    """Add a new identity for [account-name]"""
+    args = Arguments({"account": account_name, "authtype": type_, "identity": id, "email": email, "password": password})
+    legacy_identity_add(args, ctx.obj.client, ctx.obj.logger, ctx.obj.console, ctx.obj.spinner)
+
+
+@identity.command("remove")
+@click.argument("account-name", required=True)
+@click.option("--type", "type_", type=click.Choice(["X509", "GSS", "USERPASS", "SSH", "SAML", "OIDC"]), help="Authentication type", required=True)
+@click.option("--id", help="Identity", required=True)
+@click.pass_context
+def identity_remove(ctx, account_name, type_, id):
+    """Revoke a given ID's access from an account"""
+    args = Arguments({"account": account_name, "authtype": type_, "id": id})
+    identity_delete(args, ctx.obj.client, ctx.obj.logger, ctx.obj.console, ctx.obj.spinner)

{rucio_clients-36.4.0/lib/rucio/client/commands → rucio_clients-37.0.0rc1/lib/rucio/cli}/bin_legacy/rucio.py

@@ -39,7 +39,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.client.commands.utils import exception_handler, get_client, setup_gfal2_logger, signal_handler
+from rucio.cli.utils import exception_handler, get_client, 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
@@ -1671,7 +1671,9 @@ def list_rses(args, client, logger, console, spinner):
         spinner.start()
 
     rses = client.list_rses(args.rses)
-    if cli_config == 'rich':
+    if args.csv:
+        print(*(rse['rse'] for rse in rses), sep='\n')
+    elif cli_config == 'rich':
         table = generate_table([[rse['rse']] for rse in sorted(rses, key=lambda elem: elem['rse'])], headers=['RSE'], col_alignments=['left'])
         spinner.stop()
         print_output(table, console=console, no_pager=args.no_pager)
@@ -1985,20 +1987,22 @@ def add_lifetime_exception(args, client, logger, console, spinner):
         logger.error('inputfile is mandatory')
         return FAILURE
     with open(args.inputfile) as infile:
-        dids = list(set(line.strip() for line in infile))
+        # Deduplicate the content of the input file and ignore empty lines.
+        dids = set(did for line in infile if (did := line.strip()))
 
     dids_list = []
     containers = []
     datasets = []
-    error_types = ['Total DIDs',
-                   'DID not submitted because it is a file',
-                   'DID that are containers and were resolved',
-                   'DID not submitted because it is not part of the lifetime campaign',
-                   'DID successfully submitted including the one from containers resolved']
     for did in dids:
         scope, name = get_scope(did, client)
         dids_list.append({'scope': scope, 'name': name})
-    summary = {0: len(dids_list), 1: 0, 2: 0, 3: 0, 4: 0}
+    error_summary = {
+        "total_dids": {"description": "Total DIDs", "count": len(dids_list)},
+        "files_ignored": {"description": "DID not submitted because it is a file", "count": 0},
+        "containers_resolved": {"description": "DID that are containers and were resolved", "count": 0},
+        "not_in_lifetime_model": {"description": "DID not submitted because it is not part of the lifetime campaign", "count": 0},
+        "successfully_submitted": {"description": "DID successfully submitted including the one from containers resolved", "count": 0},
+    }
     chunk_limit = 500  # Server should be able to accept 1000
     dids_list_copy = deepcopy(dids_list)
     for chunk in chunks(dids_list_copy, chunk_limit):
@@ -2007,18 +2011,18 @@ def add_lifetime_exception(args, client, logger, console, spinner):
             dids_list.remove({'scope': scope, 'name': name})
             if meta['did_type'] == 'FILE':
                 logger.warning('%s:%s is a file. Will be ignored' % (scope, name))
-                summary[1] += 1
+                error_summary["files_ignored"]["count"] += 1
             elif meta['did_type'] == 'CONTAINER':
                 logger.warning('%s:%s is a container. It needs to be resolved' % (scope, name))
                 containers.append({'scope': scope, 'name': name})
-                summary[2] += 1
+                error_summary["containers_resolved"]["count"] += 1
             elif not meta['eol_at']:
                 logger.warning('%s:%s is not affected by the lifetime model' % (scope, name))
-                summary[3] += 1
+                error_summary["not_in_lifetime_model"]["count"] += 1
             else:
                 logger.info('%s:%s will be declared' % (scope, name))
                 datasets.append({'scope': scope, 'name': name})
-                summary[4] += 1
+                error_summary["successfully_submitted"]["count"] += 1
 
     for did in dids_list:
         scope = did['scope']
@@ -2036,11 +2040,11 @@ def add_lifetime_exception(args, client, logger, console, spinner):
                     logger.debug('%s:%s' % (scope, name))
                     if not meta['eol_at']:
                         logger.warning('%s:%s is not affected by the lifetime model' % (scope, name))
-                        summary[3] += 1
+                        error_summary["not_in_lifetime_model"]["count"] += 1
                     else:
                         logger.info('%s:%s will be declared' % (scope, name))
                         datasets.append({'scope': scope, 'name': name})
-
+                        error_summary["successfully_submitted"]["count"] += 1
     if not datasets:
         logger.error('Nothing to submit')
         return SUCCESS
@@ -2062,8 +2066,8 @@ def add_lifetime_exception(args, client, logger, console, spinner):
         return FAILURE
 
     logger.info('Exception successfully submitted. Summary below:')
-    for cnt, error in enumerate(error_types):
-        print('{0:100} {1:6d}'.format(error, summary[cnt]))
+    for key, data in error_summary.items():
+        print('{0:100} {1:6d}'.format(data["description"], data["count"]))
     return SUCCESS
 
 
@@ -2713,6 +2717,7 @@ You can filter by account::
     list_rses_parser.set_defaults(function=list_rses)
     list_rses_parser.add_argument('--rses', dest='rses', action='store', help='The RSE filter expression. A comprehensive help about RSE expressions \
 can be found in ' + Color.BOLD + 'https://rucio.cern.ch/documentation/started/concepts/rse_expressions' + Color.END)
+    list_rses_parser.add_argument("--csv", action='store_true', help='Output a list of RSEs as a csv')
 
     # The list-suspicious-replicas command
     list_suspicious_replicas_parser = subparsers.add_parser('list-suspicious-replicas', help='Show the list of all replicas marked "suspicious".')

{rucio_clients-36.4.0/lib/rucio/client/commands → rucio_clients-37.0.0rc1/lib/rucio/cli}/bin_legacy/rucio_admin.py

@@ -33,7 +33,7 @@ from rich.tree import Tree
 from tabulate import tabulate
 
 from rucio import version
-from rucio.client.commands.utils import exception_handler, get_client, setup_gfal2_logger, signal_handler
+from rucio.cli.utils import exception_handler, get_client, 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.constants import RseAttr
 from rucio.common.exception import (
@@ -151,7 +151,9 @@ def list_accounts(args, client, logger, console, spinner):
         for key, value in [(_.split('=')[0], _.split('=')[1]) for _ in args.filters.split(',')]:
             filters[key] = value
     accounts = client.list_accounts(identity=args.identity, account_type=args.account_type, filters=filters)
-    if cli_config == 'rich':
+    if args.csv:
+        print(*(account['account'] for account in accounts), sep=',')
+    elif cli_config == 'rich':
         table = generate_table([[account['account']] for account in accounts], headers=['ACCOUNT'], col_alignments=['left'])
         spinner.stop()
         print_output(table, console=console, no_pager=args.no_pager)
@@ -327,7 +329,9 @@ def list_rses(args, client, logger, console, spinner):
         spinner.start()
 
     rses = client.list_rses()
-    if cli_config == 'rich':
+    if args.csv:
+        print(*(rse['rse'] for rse in rses), sep='\n')
+    elif cli_config == 'rich':
         table_data = [[rse['rse']] for rse in sorted(rses, key=lambda elem: elem['rse'])]
         table = generate_table(table_data, headers=['RSE'], col_alignments=['left'])
         spinner.stop()
@@ -1455,6 +1459,7 @@ def get_parser():
     list_account_parser.add_argument('--type', dest='account_type', action='store', help='Account Type (USER, GROUP, SERVICE)')
     list_account_parser.add_argument('--id', dest='identity', action='store', help='Identity (e.g. DN)')
     list_account_parser.add_argument('--filters', dest='filters', action='store', help='Filter arguments in form `key=value,another_key=next_value`')
+    list_account_parser.add_argument("--csv", action='store_true', help='List result as a csv')
     list_account_parser.set_defaults(which='list_accounts')
 
     # The list_account_attributes command
@@ -1753,6 +1758,7 @@ def get_parser():
                                                       '\n'
                                                       '    $ rucio list-rses --rses \"tier=2&type=DATADISK\"\n'
                                                       '\n')
+    list_rse_parser.add_argument("--csv", action='store_true', help='Output a list of RSEs as a csv')
     list_rse_parser.set_defaults(which='list_rses')
 
     # The add_rse command