rucio 37.6.0__py3-none-any.whl → 37.7.0__py3-none-any.whl

rucio/core/did.py

@@ -28,6 +28,7 @@ import rucio.core.replica  # import add_replicas
 import rucio.core.rule
 from rucio.common import exception
 from rucio.common.config import config_get_bool, config_get_int
+from rucio.common.constants import DEFAULT_VO
 from rucio.common.utils import chunks, is_archive
 from rucio.core import did_meta_plugins
 from rucio.core.message import add_message
@@ -211,7 +212,7 @@ def add_dids(
                                'scope': did['scope'].external,
                                'name': did['name'],
                                'expired_at': str(expired_at) if expired_at is not None else None}
-                    if account.vo != 'def':
+                    if account.vo != DEFAULT_VO:
                         message['vo'] = account.vo
 
                     add_message(event_type, message, session=session)
@@ -773,7 +774,7 @@ def __add_collections_to_container(
                    'childscope': c['scope'].external,
                    'childname': c['name'],
                    'childtype': chld_type}
-        if account.vo != 'def':
+        if account.vo != DEFAULT_VO:
             message['vo'] = account.vo
         messages.append(message)
 
@@ -857,7 +858,7 @@ def delete_dids(
         message = {'account': account.external,
                    'scope': did['scope'].external,
                    'name': did['name']}
-        if did['scope'].vo != 'def':
+        if did['scope'].vo != DEFAULT_VO:
             message['vo'] = did['scope'].vo
 
         add_message('ERASE', message, session=session)
@@ -1286,7 +1287,7 @@ def detach_dids(
                        'childscope': source['scope'].external,
                        'childname': source['name'],
                        'childtype': chld_type}
-            if scope.vo != 'def':
+            if scope.vo != DEFAULT_VO:
                 message['vo'] = scope.vo
 
             add_message('ERASE_CNT', message, session=session)
@@ -1297,7 +1298,7 @@ def detach_dids(
                    'child_scope': source['scope'].external,
                    'child_name': str(source['name']),
                    'child_type': str(child_type)}
-        if scope.vo != 'def':
+        if scope.vo != DEFAULT_VO:
             message['vo'] = scope.vo
 
         add_message('DETACH', message, session=session)
@@ -2241,7 +2242,7 @@ def set_status(
                            'bytes': values['bytes'],
                            'length': values['length'],
                            'events': values['events']}
-                if scope.vo != 'def':
+                if scope.vo != DEFAULT_VO:
                     message['vo'] = scope.vo
 
                 add_message('CLOSE', message, session=session)
@@ -2259,7 +2260,7 @@ def set_status(
                 values['is_open'] = True
 
                 message = {'scope': scope.external, 'name': name}
-                if scope.vo != 'def':
+                if scope.vo != DEFAULT_VO:
                     message['vo'] = scope.vo
                 add_message('OPEN', message, session=session)
 

rucio/core/dirac.py

@@ -21,6 +21,7 @@ from sqlalchemy import and_, select
 from sqlalchemy.exc import NoResultFound
 
 from rucio.common.config import config_get
+from rucio.common.constants import DEFAULT_VO
 from rucio.common.exception import ConfigNotFound, InvalidType, RucioException, UnsupportedOperation
 from rucio.common.types import InternalAccount, InternalScope
 from rucio.common.utils import extract_scope
@@ -74,7 +75,7 @@ def add_files(
     account: str,
     ignore_availability: bool,
     parents_metadata: Optional[dict[str, Any]] = None,
-    vo: str = 'def',
+    vo: str = DEFAULT_VO,
     *,
     session: "Session"
 ) -> None:

rucio/core/distance.py

@@ -19,6 +19,7 @@ from sqlalchemy.exc import DatabaseError, IntegrityError
 from sqlalchemy.orm import aliased
 
 from rucio.common import exception
+from rucio.common.constants import DEFAULT_VO
 from rucio.db.sqla.models import RSE, Distance
 from rucio.db.sqla.session import read_session, transactional_session
 
@@ -147,7 +148,7 @@ def list_distances(filter_: Optional[dict[str, Any]] = None, *, session: "Sessio
 
 
 @read_session
-def export_distances(vo: str = 'def', *, session: "Session") -> dict[str, Any]:
+def export_distances(vo: str = DEFAULT_VO, *, session: "Session") -> dict[str, Any]:
     """
     Export distances between all the RSEs using RSE ids.
     :param vo: The VO to export.

rucio/core/exporter.py

@@ -14,6 +14,7 @@
 
 from typing import TYPE_CHECKING, Any
 
+from rucio.common.constants import DEFAULT_VO
 from rucio.core import distance as distance_module
 from rucio.core import rse as rse_module
 from rucio.db.sqla.session import transactional_session
@@ -23,7 +24,7 @@ if TYPE_CHECKING:
 
 
 @transactional_session
-def export_rses(vo: str = 'def', *, session: "Session") -> dict[str, dict[str, Any]]:
+def export_rses(vo: str = DEFAULT_VO, *, session: "Session") -> dict[str, dict[str, Any]]:
     """
     Export RSE data.
 
@@ -39,7 +40,7 @@ def export_rses(vo: str = 'def', *, session: "Session") -> dict[str, dict[str, A
 
 
 @transactional_session
-def export_data(vo: str = 'def', distance: bool = True, *, session: "Session") -> dict[str, Any]:
+def export_data(vo: str = DEFAULT_VO, distance: bool = True, *, session: "Session") -> dict[str, Any]:
     """
     Export data.
 

rucio/core/importer.py

@@ -17,7 +17,7 @@ from typing import TYPE_CHECKING, Any
 from sqlalchemy import select
 
 from rucio.common.config import config_get
-from rucio.common.constants import RseAttr
+from rucio.common.constants import DEFAULT_VO, RseAttr
 from rucio.common.exception import RSEOperationNotSupported
 from rucio.common.types import InternalAccount
 from rucio.core import account as account_module
@@ -35,7 +35,7 @@ if TYPE_CHECKING:
 
 
 @transactional_session
-def import_rses(rses: dict[str, dict[str, Any]], rse_sync_method: str = 'edit', attr_sync_method: str = 'edit', protocol_sync_method: str = 'edit', vo: str = 'def', *, session: "Session") -> None:
+def import_rses(rses: dict[str, dict[str, Any]], rse_sync_method: str = 'edit', attr_sync_method: str = 'edit', protocol_sync_method: str = 'edit', vo: str = DEFAULT_VO, *, session: "Session") -> None:
     new_rses = []
     for rse_name in rses:
         rse = rses[rse_name]
@@ -143,7 +143,7 @@ def import_rses(rses: dict[str, dict[str, Any]], rse_sync_method: str = 'edit',
 
 
 @transactional_session
-def import_distances(distances, vo: str = 'def', *, session: "Session") -> None:
+def import_distances(distances, vo: str = DEFAULT_VO, *, session: "Session") -> None:
     for src_rse_name in distances:
         src = rse_module.get_rse_id(rse=src_rse_name, vo=vo, session=session)
         for dest_rse_name in distances[src_rse_name]:
@@ -192,7 +192,7 @@ def import_identities(identities: 'Iterable[dict[str, Any]]', account_name: str,
 
 
 @transactional_session
-def import_accounts(accounts: 'Iterable[dict[str, Any]]', vo: str = 'def', *, session: "Session") -> None:
+def import_accounts(accounts: 'Iterable[dict[str, Any]]', vo: str = DEFAULT_VO, *, session: "Session") -> None:
     vo_filter = {'account': InternalAccount(account='*', vo=vo)}
     old_accounts = {account['account']: account for account in account_module.list_accounts(filter_=vo_filter, session=session)}
     missing_accounts = [account for account in accounts if account['account'] not in old_accounts]
@@ -234,7 +234,7 @@ def import_accounts(accounts: 'Iterable[dict[str, Any]]', vo: str = 'def', *, se
 
 
 @transactional_session
-def import_data(data: dict[str, Any], vo: str = 'def', *, session: "Session") -> None:
+def import_data(data: dict[str, Any], vo: str = DEFAULT_VO, *, session: "Session") -> None:
     """
     Import data to add and update records in Rucio.
 

rucio/core/permission/__init__.py

@@ -20,6 +20,7 @@ from typing import TYPE_CHECKING, Any
 
 import rucio.core.permission.generic
 from rucio.common import config, exception
+from rucio.common.constants import DEFAULT_VO
 from rucio.common.plugins import check_policy_module_version
 from rucio.common.policy import get_policy
 
@@ -80,7 +81,7 @@ if not multivo:
     except ImportError:
         raise exception.ErrorLoadingPolicyPackage(policy)
 
-    permission_modules["def"] = module
+    permission_modules[DEFAULT_VO] = module
 
 
 def load_permission_for_vo(vo: str) -> None:

rucio/core/replica.py

@@ -41,7 +41,7 @@ import rucio.core.lock
 from rucio.common import exception
 from rucio.common.cache import MemcacheRegion
 from rucio.common.config import config_get, config_get_bool
-from rucio.common.constants import RseAttr, SuspiciousAvailability
+from rucio.common.constants import DEFAULT_VO, RseAttr, SuspiciousAvailability
 from rucio.common.types import InternalAccount, InternalScope, IPDict, LFNDict, is_str_list
 from rucio.common.utils import add_url_query, chunks, clean_pfns, str_to_date
 from rucio.core.credential import get_signed_url
@@ -249,7 +249,7 @@ def list_bad_replicas_status(
     older_than: Optional[datetime] = None,
     limit: Optional[int] = None,
     list_pfns: Optional[bool] = False,
-    vo: str = 'def',
+    vo: str = DEFAULT_VO,
     *,
     session: "Session"
 ) -> list[dict[str, Any]]:
@@ -536,7 +536,7 @@ def declare_bad_file_replicas(
 @read_session
 def get_pfn_to_rse(
     pfns: "Iterable[str]",
-    vo: str = 'def',
+    vo: str = DEFAULT_VO,
     *,
     session: "Session"
 ) -> tuple[Optional[str], dict[str, Any], dict[str, list[str]]]:
@@ -711,7 +711,7 @@ def list_bad_replicas(
 def get_did_from_pfns(
     pfns: "Iterable[str]",
     rse_id: Optional[str] = None,
-    vo: str = 'def',
+    vo: str = DEFAULT_VO,
     *,
     session: "Session"
 ) -> 'Iterator[dict[str, dict[str, Any]]]':
@@ -1450,7 +1450,7 @@ def list_replicas(
     if dids:
         filter_ = {'vo': dids[0]['scope'].vo}
     else:
-        filter_ = {'vo': 'def'}
+        filter_ = {'vo': DEFAULT_VO}
 
     dids = {(did['scope'], did['name']): did for did in dids}  # type: ignore (Deduplicate input)
     if not dids:

rucio/core/request.py

@@ -31,7 +31,7 @@ from sqlalchemy.orm import aliased
 from sqlalchemy.sql.expression import asc, false, func, null, true
 
 from rucio.common.config import config_get_bool, config_get_int
-from rucio.common.constants import RseAttr, TransferLimitDirection
+from rucio.common.constants import DEFAULT_VO, RseAttr, TransferLimitDirection
 from rucio.common.exception import InvalidRSEExpression, RequestNotFound, RucioException, UnsupportedOperation
 from rucio.common.types import FilterDict, InternalAccount, InternalScope, LoggerFunction, RequestDict
 from rucio.common.utils import chunks, generate_uuid
@@ -2918,7 +2918,7 @@ def add_monitor_message(
     if not message.get('vo') and request.get('source_rse_id'):
         src_id = request['source_rse_id']
         vo = get_rse_vo(rse_id=src_id, session=session)
-        if vo != 'def':
+        if vo != DEFAULT_VO:
             message['vo'] = vo
     for time_field in ('created_at', 'submitted_at', 'started_at', 'transferred_at'):
         field_value = message[time_field]

rucio/core/rse.py

@@ -29,7 +29,7 @@ from rucio.common import exception, types, utils
 from rucio.common.cache import MemcacheRegion
 from rucio.common.checksum import CHECKSUM_KEY, GLOBALLY_SUPPORTED_CHECKSUMS
 from rucio.common.config import get_lfn2pfn_algorithm_default
-from rucio.common.constants import RSE_ALL_SUPPORTED_PROTOCOL_OPERATIONS, RSE_ATTRS_BOOL, RSE_ATTRS_STR, SUPPORTED_SIGN_URL_SERVICES_LITERAL, RseAttr
+from rucio.common.constants import DEFAULT_VO, RSE_ALL_SUPPORTED_PROTOCOL_OPERATIONS, RSE_ATTRS_BOOL, RSE_ATTRS_STR, SUPPORTED_SIGN_URL_SERVICES_LITERAL, RseAttr
 from rucio.common.utils import Availability
 from rucio.core.rse_counter import add_counter, get_counter
 from rucio.db.sqla import models
@@ -415,7 +415,7 @@ def _group_query_result_by_rse_id(
 @transactional_session
 def add_rse(
     rse: str,
-    vo: str = 'def',
+    vo: str = DEFAULT_VO,
     deterministic: bool = True,
     volatile: bool = False,
     city: Optional[str] = None,
@@ -497,7 +497,7 @@ def add_rse(
 @read_session
 def rse_exists(
     rse: str,
-    vo: str = 'def',
+    vo: str = DEFAULT_VO,
     include_deleted: bool = False,
     *,
     session: "Session"
@@ -662,7 +662,7 @@ def get_rse(
 @read_session
 def get_rse_id(
     rse: str,
-    vo: str = 'def',
+    vo: str = DEFAULT_VO,
     include_deleted: bool = True,
     *,
     session: "Session"
@@ -680,7 +680,7 @@ def get_rse_id(
     """
 
     if include_deleted:
-        if vo != 'def':
+        if vo != DEFAULT_VO:
             cache_key = 'rse-id_{}@{}'.format(rse, vo).replace(' ', '.')
         else:
             cache_key = 'rse-id_{}'.format(rse).replace(' ', '.')
@@ -1035,7 +1035,7 @@ def get_rses_with_attribute(
 def get_rses_with_attribute_value(
     key: str,
     value: Union[bool, str],
-    vo: str = 'def',
+    vo: str = DEFAULT_VO,
     *,
     session: "Session"
 ) -> list[dict[str, str]]:
@@ -1048,7 +1048,7 @@ def get_rses_with_attribute_value(
 
     :returns: List of rse dictionaries with the rse_id and rse_name
     """
-    if vo != 'def':
+    if vo != DEFAULT_VO:
         cache_key = 'av-%s-%s@%s' % (key, value, vo)
     else:
         cache_key = 'av-%s-%s' % (key, value)

rucio/core/rule.py

@@ -37,7 +37,7 @@ import rucio.core.lock  # import get_replica_locks, get_files_and_replica_locks_
 import rucio.core.replica  # import get_and_lock_file_replicas, get_and_lock_file_replicas_for_dataset
 from rucio.common.cache import MemcacheRegion
 from rucio.common.config import config_get
-from rucio.common.constants import RseAttr
+from rucio.common.constants import DEFAULT_VO, RseAttr
 from rucio.common.exception import (
     DataIdentifierNotFound,
     DuplicateRule,
@@ -2510,7 +2510,7 @@ def update_rules_for_lost_replica(
                    'name': name,
                    'dataset_name': dts['name'],
                    'dataset_scope': dts['scope'].external}
-        if scope.vo != 'def':
+        if scope.vo != DEFAULT_VO:
             message['vo'] = scope.vo
 
         add_message('LOST', message, session=session)
@@ -2675,7 +2675,7 @@ def generate_rule_notifications(
             payload = {'scope': rule.scope.external,
                        'name': rule.name,
                        'rule_id': rule.id}
-            if rule.scope.vo != 'def':
+            if rule.scope.vo != DEFAULT_VO:
                 payload['vo'] = rule.scope.vo
 
             add_message(event_type='RULE_OK', payload=payload, session=session)
@@ -2687,7 +2687,7 @@ def generate_rule_notifications(
                     payload = {'scope': rule.scope.external,
                                'name': rule.name,
                                'rule_id': rule.id}
-                    if rule.scope.vo != 'def':
+                    if rule.scope.vo != DEFAULT_VO:
                         payload['vo'] = rule.scope.vo
 
                     add_message(event_type='RULE_OK', payload=payload, session=session)
@@ -2697,7 +2697,7 @@ def generate_rule_notifications(
                                    'name': rule.name,
                                    'rule_id': rule.id,
                                    'progress': __progress_class(rule.locks_replicating_cnt, total_locks)}
-                        if rule.scope.vo != 'def':
+                        if rule.scope.vo != DEFAULT_VO:
                             payload['vo'] = rule.scope.vo
 
                         add_message(event_type='RULE_PROGRESS', payload=payload, session=session)
@@ -2721,7 +2721,7 @@ def generate_rule_notifications(
                                'rse': get_rse_name(rse_id=dataset_lock.rse_id, session=session),
                                'rse_id': dataset_lock.rse_id,
                                'rule_id': rule.id}
-                    if dataset_lock.scope.vo != 'def':
+                    if dataset_lock.scope.vo != DEFAULT_VO:
                         payload['vo'] = dataset_lock.scope.vo
 
                     add_message(event_type='DATASETLOCK_OK', payload=payload, session=session)
@@ -2745,7 +2745,7 @@ def generate_rule_notifications(
                                            'rse': get_rse_name(rse_id=dataset_lock.rse_id, session=session),
                                            'rse_id': dataset_lock.rse_id,
                                            'rule_id': rule.id}
-                                if dataset_lock.scope.vo != 'def':
+                                if dataset_lock.scope.vo != DEFAULT_VO:
                                     payload['vo'] = dataset_lock.scope.vo
 
                                 add_message(event_type='DATASETLOCK_OK', payload=payload, session=session)
@@ -2763,7 +2763,7 @@ def generate_rule_notifications(
                                'name': rule.name,
                                'rule_id': rule.id,
                                'progress': __progress_class(rule.locks_replicating_cnt, total_locks)}
-                    if rule.scope.vo != 'def':
+                    if rule.scope.vo != DEFAULT_VO:
                         payload['vo'] = rule.scope.vo
 
                     add_message(event_type='RULE_PROGRESS', payload=payload, session=session)

rucio/core/transfer.py

@@ -28,7 +28,7 @@ from sqlalchemy import select, update
 from sqlalchemy.exc import IntegrityError
 
 from rucio.common.config import config_get, config_get_list
-from rucio.common.constants import SUPPORTED_PROTOCOLS, RseAttr, TransferLimitDirection
+from rucio.common.constants import DEFAULT_VO, SUPPORTED_PROTOCOLS, RseAttr, TransferLimitDirection
 from rucio.common.exception import InvalidRSEExpression, RequestNotFound, RSEProtocolNotSupported, RucioException, UnsupportedOperation
 from rucio.common.utils import construct_non_deterministic_pfn, get_transfer_schemas
 from rucio.core import did
@@ -485,7 +485,7 @@ def set_transfers_state(
                    'external-host': external_host,
                    'queued_at': str(submitted_at),
                    'datatype': datatype}
-            if rws.scope.vo != 'def':
+            if rws.scope.vo != DEFAULT_VO:
                 msg['vo'] = rws.scope.vo
 
             ds_scope = transfer.rws.attributes.get('ds_scope')

rucio/core/vo.py

@@ -20,6 +20,7 @@ from sqlalchemy.exc import DatabaseError, IntegrityError, NoResultFound
 
 from rucio.common import exception
 from rucio.common.config import config_get, config_get_bool
+from rucio.common.constants import DEFAULT_VO
 from rucio.common.types import InternalAccount
 from rucio.db.sqla import models
 from rucio.db.sqla.constants import AccountType, IdentityType
@@ -88,7 +89,7 @@ def add_vo(vo: str, description: str, email: str, *, session: "Session") -> None
                          password='password',  # noqa: S106
                          session=session)
 
-    for ident in list_identities(account=InternalAccount('super_root', vo='def'), session=session):
+    for ident in list_identities(account=InternalAccount('super_root', vo=DEFAULT_VO), session=session):
         add_account_identity(identity=ident['identity'], type_=ident['type'], account=new_root, email='', session=session)
 
 

rucio/daemons/atropos/atropos.py

@@ -24,6 +24,7 @@ from typing import TYPE_CHECKING
 import rucio.core.lifetime_exception
 import rucio.db.sqla.util
 from rucio.common import exception
+from rucio.common.constants import DEFAULT_VO
 from rucio.common.exception import InvalidRSEExpression, RuleNotFound
 from rucio.common.logging import setup_logging
 from rucio.core.did import set_metadata
@@ -193,7 +194,7 @@ def run_once(
             tot_size += summary[rse_id][did].get('bytes', 0)
         vo = get_rse_vo(rse_id=rse_id)
         logger(logging.INFO, 'For RSE %s%s %d datasets will be deleted representing %d files and %d bytes',
-               get_rse_name(rse_id=rse_id), '' if vo == 'def' else ' on VO ' + vo, tot_datasets, tot_files, tot_size)
+               get_rse_name(rse_id=rse_id), '' if vo == DEFAULT_VO else ' on VO ' + vo, tot_datasets, tot_files, tot_size)
 
 
 def run(

rucio/daemons/automatix/automatix.py

@@ -31,7 +31,7 @@ from rucio.common import exception
 from rucio.common.config import config_get, config_get_bool, config_get_int, config_get_list
 from rucio.common.logging import setup_logging
 from rucio.common.stopwatch import Stopwatch
-from rucio.common.types import InternalScope, LoggerFunction
+from rucio.common.types import FileToUploadDict, InternalScope, LoggerFunction
 from rucio.common.utils import execute, generate_uuid
 from rucio.core.monitor import MetricManager
 from rucio.core.scope import list_scopes
@@ -214,7 +214,7 @@ def run_once(heartbeat_handler: HeartbeatHandler, inputfile: str, **_kwargs) ->
         fnames = []
         lfns = []
         physical_fnames = []
-        files = []
+        items: list[FileToUploadDict] = []
         for _ in range(nbfiles):
             fname = generate_didname(metadata=metadata, dsn=dsn, did_type="file")
             lfns.append(fname)
@@ -223,7 +223,7 @@ def run_once(heartbeat_handler: HeartbeatHandler, inputfile: str, **_kwargs) ->
             physical_fnames.append(physical_fname)
             generate_file(physical_fname, filesize, logger=logger)
             fnames.append(fname)
-            file_ = {
+            file_: FileToUploadDict = {
                 "did_scope": scope,
                 "did_name": fname,
                 "dataset_scope": scope,
@@ -235,11 +235,11 @@ def run_once(heartbeat_handler: HeartbeatHandler, inputfile: str, **_kwargs) ->
                 file_["dataset_meta"] = metadata
                 if dataset_lifetime:
                     file_["dataset_meta"]["lifetime"] = dataset_lifetime
-            files.append(file_)
+            items.append(file_)
         logger(logging.INFO, "Upload %s:%s to %s", scope, dsn, rse)
         try:
             upload_client = UploadClient(client)
-            ret = upload_client.upload(files)
+            ret = upload_client.upload(items=items)
             if ret == 0:
                 logger(logging.INFO, "%s successfully registered on %s", dsn, rse)
                 METRICS.counter(name="addnewdataset.done").inc()

rucio/daemons/badreplicas/minos.py

@@ -24,6 +24,7 @@ from sqlalchemy.exc import DatabaseError
 
 import rucio.db.sqla.util
 from rucio.common.config import config_get_int
+from rucio.common.constants import DEFAULT_VO
 from rucio.common.exception import DatabaseException, DataIdentifierNotFound, ReplicaNotFound, UnsupportedOperation
 from rucio.common.logging import setup_logging
 from rucio.common.utils import chunks
@@ -208,7 +209,7 @@ def run_once(heartbeat_handler: "HeartbeatHandler", bulk: int, **_kwargs) -> boo
             dict_rse = __clean_unknown_replicas(pfns, vo, logger)
             for rse_id, pfns_by_scheme in dict_rse.items():
                 rse = get_rse_name(rse_id=rse_id, session=None)
-                rse_vo_str = rse if vo == 'def' else '{} on VO {}'.format(rse, vo)
+                rse_vo_str = rse if vo == DEFAULT_VO else '{} on VO {}'.format(rse, vo)
                 for scheme, pfns in pfns_by_scheme.items():
                     logger(logging.DEBUG, 'Running on RSE %s with %s replicas', rse_vo_str, len(pfns))
                     tot_chunk = int(math.ceil(len(pfns) / chunk_size))
@@ -245,7 +246,7 @@ def run_once(heartbeat_handler: "HeartbeatHandler", bulk: int, **_kwargs) -> boo
         for rse_id in dict_rse:
             replicas = []
             rse = get_rse_name(rse_id=rse_id, session=None)
-            rse_vo_str = rse if vo == 'def' else '{} on VO {}'.format(rse, vo)
+            rse_vo_str = rse if vo == DEFAULT_VO else '{} on VO {}'.format(rse, vo)
             logger(logging.DEBUG, 'Running on RSE %s', rse_vo_str)
             for rse_id, pfns_by_scheme in dict_rse.items():
                 for scheme, pfns in pfns_by_scheme.items():

rucio/daemons/bb8/bb8.py

@@ -23,6 +23,7 @@ import threading
 from typing import TYPE_CHECKING, Optional
 
 from rucio.common.config import config_get_float
+from rucio.common.constants import DEFAULT_VO
 from rucio.common.exception import InvalidRSEExpression
 from rucio.common.logging import setup_logging
 from rucio.core.heartbeat import list_payload_counts, sanity_check
@@ -252,7 +253,7 @@ def run_once(
                 if available_source_rebalance_volume > 0:
                     vo_str = (
                         " on VO {}".format(destination_rse["vo"])
-                        if destination_rse["vo"] != "def"
+                        if destination_rse["vo"] != DEFAULT_VO
                         else ""
                     )
                     if index == 0 and destination_rse["id"] in dict_locks:

rucio/daemons/bb8/nuclei_background_rebalance.py

@@ -18,7 +18,7 @@ This script is to be used to background rebalance ATLAS t2 datadisks
 
 from sqlalchemy import and_, or_, select
 
-from rucio.common.constants import RseAttr
+from rucio.common.constants import DEFAULT_VO, RseAttr
 from rucio.core.rse import get_rse_attribute, get_rse_usage
 from rucio.core.rse_expression_parser import parse_expression
 from rucio.daemons.bb8.common import rebalance_rse
@@ -143,7 +143,7 @@ for source_rse in rses_over_ratio:
             if available_target_rebalance_volume >= available_source_rebalance_volume:
                 available_target_rebalance_volume = available_source_rebalance_volume
 
-            vo_str = 'on VO {}'.format(destination_rse['vo']) if destination_rse['vo'] != 'def' else 'def'
+            vo_str = 'on VO {}'.format(destination_rse['vo']) if destination_rse['vo'] != DEFAULT_VO else DEFAULT_VO
             print('Rebalance %dTB from %s(%f) to %s(%f)%s' % (available_target_rebalance_volume / 1E12, source_rse['rse'], source_rse['ratio'], destination_rse['rse'], destination_rse['ratio'], vo_str))
             expr = destination_rse['rse']
             rebalance_rse(rse_id=source_rse['id'], max_bytes=available_target_rebalance_volume, dry_run=False, comment='Nuclei Background rebalancing', force_expression=expr)

rucio/daemons/conveyor/common.py

@@ -24,7 +24,7 @@ import re
 from typing import TYPE_CHECKING, Any, Optional
 
 from rucio.common.config import config_get_bool
-from rucio.common.constants import RseAttr
+from rucio.common.constants import DEFAULT_VO, RseAttr
 from rucio.common.exception import DatabaseException, DuplicateFileTransferSubmission, InvalidRSEExpression, RequestNotFound, TransferToolTimeout, TransferToolWrongAnswer, VONotFound
 from rucio.common.stopwatch import Stopwatch
 from rucio.core import request as request_core
@@ -510,7 +510,7 @@ def get_conveyor_rses(
     :param include_rses:  RSEs to include
     :param exclude_rses:  RSEs to exclude
     :param vos:           VOs on which to look for RSEs. Only used in multi-VO mode.
-                          If None, we either use all VOs if run from "def", or the current VO otherwise.
+                          If None, we either use all VOs if run from DEFAULT_VO, or the current VO otherwise.
     :param logger:        Optional decorated logger that can be passed from the calling daemons or servers.
     :return:              List of working rses
     """
@@ -518,7 +518,7 @@ def get_conveyor_rses(
     if not multi_vo:
         if vos:
             logger(logging.WARNING, 'Ignoring argument vos, this is only applicable in a multi-VO setup.')
-        vos = ['def']
+        vos = [DEFAULT_VO]
     else:
         if vos:
             invalid = set(vos) - set([v['vo'] for v in list_vos()])

rucio/daemons/conveyor/submitter.py

@@ -22,6 +22,7 @@ from typing import TYPE_CHECKING, Optional
 import rucio.db.sqla.util
 from rucio.common import exception
 from rucio.common.config import config_get, config_get_bool, config_get_float, config_get_int, config_get_list
+from rucio.common.constants import DEFAULT_VO
 from rucio.common.logging import setup_logging
 from rucio.common.schema import get_schema_value
 from rucio.common.stopwatch import Stopwatch
@@ -370,7 +371,7 @@ def run(
     if exclude_activities:
         if not activities:
             if not multi_vo:
-                vos = ['def']
+                vos = [DEFAULT_VO]
             if vos and len(vos) == 1:
                 activities = get_schema_value('ACTIVITY', vos[0])
             elif vos and len(vos) > 1:

rucio/daemons/hermes/hermes.py

@@ -25,6 +25,7 @@ import random
 import re
 import smtplib
 import socket
+import ssl
 import sys
 import threading
 import time
@@ -343,6 +344,14 @@ def deliver_emails(
     :returns:                  List of message_id to delete
     """
 
+    smtp_host = config_get("messaging-hermes", "smtp_host")
+    smtp_port = config_get_int("messaging-hermes", "smtp_port", default=25)
+    smtp_username = config_get("messaging-hermes", "smtp_username", default='')
+    smtp_password = config_get("messaging-hermes", "smtp_password", default='')
+    smtp_certfile = config_get("messaging-hermes", "smtp_certfile", default='')
+    smtp_keyfile = config_get("messaging-hermes", "smtp_keyfile", default='')
+    smtp_usessl = config_get_bool("messaging-hermes", "smtp_usessl", default=False)
+    smtp_usetls = config_get_bool("messaging-hermes", "smtp_usetls", default=False)
     email_from = config_get("messaging-hermes", "email_from")
     send_email = config_get_bool(
         "messaging-hermes", "send_email", raise_exception=False, default=True
@@ -357,12 +366,24 @@ def deliver_emails(
 
             try:
                 if send_email:
-                    smtp = smtplib.SMTP()
-                    smtp.connect()
-                    smtp.sendmail(
-                        msg["From"], message["payload"]["to"], msg.as_string()
-                    )
-                    smtp.quit()
+                    ssl_context = None
+                    if smtp_certfile and smtp_keyfile:
+                        ssl_context = ssl.create_default_context()
+                        ssl_context.load_cert_chain(certfile=smtp_certfile, keyfile=smtp_keyfile)
+
+                    smtp_context = smtplib.SMTP(host=smtp_host, port=smtp_port)
+                    if not smtp_usetls and smtp_usessl:
+                        smtp_context = smtplib.SMTP_SSL(host=smtp_host, port=smtp_port, context=ssl_context)
+
+                    with smtp_context as smtp_server:
+                        if smtp_usetls:
+                            smtp_server.ehlo()  # not strictly necessary
+                            smtp_server.starttls(context=ssl_context)
+                        if smtp_username and smtp_password:
+                            smtp_server.login(smtp_username, smtp_password)
+                        smtp_server.sendmail(
+                            msg["From"], message["payload"]["to"], msg.as_string()
+                        )
                 to_delete.append(message["id"])
             except Exception as error:
                 logger(logging.ERROR, "Cannot send email : %s", str(error))