rucio 38.3.0__py3-none-any.whl → 38.5.0__py3-none-any.whl

rucio/web/rest/flaskapi/v1/redirect.py

@@ -18,6 +18,7 @@ from typing import TYPE_CHECKING
 from flask import Blueprint, Flask, redirect, request
 from werkzeug.datastructures import Headers
 
+from rucio.common.constants import HTTPMethod
 from rucio.common.exception import DataIdentifierNotFound, ReplicaNotFound, SortingAlgorithmNotSupported
 from rucio.core.replica_sorter import site_selector, sort_replicas
 from rucio.gateway.replica import list_replicas
@@ -350,11 +351,11 @@ def blueprint(with_doc=False):
     bp = Blueprint('redirect', __name__, url_prefix='/redirect')
 
     metalink_redirector_view = MetaLinkRedirector.as_view('metalink_redirector')
-    bp.add_url_rule('/<path:scope_name>/metalink', view_func=metalink_redirector_view, methods=['get', ])
+    bp.add_url_rule('/<path:scope_name>/metalink', view_func=metalink_redirector_view, methods=[HTTPMethod.GET.value])
     header_redirector_view = HeaderRedirector.as_view('header_redirector')
-    bp.add_url_rule('/<path:scope_name>', view_func=header_redirector_view, methods=['get', ])
+    bp.add_url_rule('/<path:scope_name>', view_func=header_redirector_view, methods=[HTTPMethod.GET.value])
     if not with_doc:
-        bp.add_url_rule('/<path:scope_name>/', view_func=header_redirector_view, methods=['get', ])
+        bp.add_url_rule('/<path:scope_name>/', view_func=header_redirector_view, methods=[HTTPMethod.GET.value])
 
     return bp
 

rucio/web/rest/flaskapi/v1/replicas.py

@@ -22,7 +22,7 @@ from xml.sax.saxutils import escape
 from flask import Flask, Response, request
 
 from rucio.common.config import config_get, config_get_int
-from rucio.common.constants import SUPPORTED_PROTOCOLS
+from rucio.common.constants import SUPPORTED_PROTOCOLS, HTTPMethod
 from rucio.common.exception import (
     AccessDenied,
     DataIdentifierAlreadyExists,
@@ -1832,57 +1832,57 @@ def blueprint(with_doc=False):
     bp = AuthenticatedBlueprint('replicas', __name__, url_prefix='/replicas')
 
     list_replicas_view = ListReplicas.as_view('list_replicas')
-    bp.add_url_rule('/list', view_func=list_replicas_view, methods=['post', ])
+    bp.add_url_rule('/list', view_func=list_replicas_view, methods=[HTTPMethod.POST.value])
     replicas_view = Replicas.as_view('replicas')
     if not with_doc:
         # rule without trailing slash needs to be added before rule with trailing slash
-        bp.add_url_rule('', view_func=replicas_view, methods=['post', 'put', 'delete'])
-    bp.add_url_rule('/', view_func=replicas_view, methods=['post', 'put', 'delete'])
+        bp.add_url_rule('', view_func=replicas_view, methods=[HTTPMethod.POST.value, HTTPMethod.PUT.value, HTTPMethod.DELETE.value])
+    bp.add_url_rule('/', view_func=replicas_view, methods=[HTTPMethod.POST.value, HTTPMethod.PUT.value, HTTPMethod.DELETE.value])
     suspicious_replicas_view = SuspiciousReplicas.as_view('suspicious_replicas')
-    bp.add_url_rule('/suspicious', view_func=suspicious_replicas_view, methods=['get', 'post'])
+    bp.add_url_rule('/suspicious', view_func=suspicious_replicas_view, methods=[HTTPMethod.GET.value, HTTPMethod.POST.value])
     bad_replicas_states_view = BadReplicasStates.as_view('bad_replicas_states')
-    bp.add_url_rule('/bad/states', view_func=bad_replicas_states_view, methods=['get', ])
+    bp.add_url_rule('/bad/states', view_func=bad_replicas_states_view, methods=[HTTPMethod.GET.value])
     bad_replicas_summary_view = BadReplicasSummary.as_view('bad_replicas_summary')
-    bp.add_url_rule('/bad/summary', view_func=bad_replicas_summary_view, methods=['get', ])
+    bp.add_url_rule('/bad/summary', view_func=bad_replicas_summary_view, methods=[HTTPMethod.GET.value])
     bad_replicas_pfn_view = BadPFNs.as_view('add_bad_pfns')
-    bp.add_url_rule('/bad/pfns', view_func=bad_replicas_pfn_view, methods=['post', ])
+    bp.add_url_rule('/bad/pfns', view_func=bad_replicas_pfn_view, methods=[HTTPMethod.POST.value])
     bad_replicas_dids_view = BadDIDs.as_view('add_bad_dids')
-    bp.add_url_rule('/bad/dids', view_func=bad_replicas_dids_view, methods=['post', ])
+    bp.add_url_rule('/bad/dids', view_func=bad_replicas_dids_view, methods=[HTTPMethod.POST.value])
     replicas_rse_view = ReplicasRSE.as_view('replicas_rse')
-    bp.add_url_rule('/rse/<rse>', view_func=replicas_rse_view, methods=['get', ])
+    bp.add_url_rule('/rse/<rse>', view_func=replicas_rse_view, methods=[HTTPMethod.GET.value])
 
     bad_replicas_view = BadReplicas.as_view('bad_replicas')
-    bp.add_url_rule('/bad', view_func=bad_replicas_view, methods=['post', ])
+    bp.add_url_rule('/bad', view_func=bad_replicas_view, methods=[HTTPMethod.POST.value])
 
     quarantine_replicas_view = QuarantineReplicas.as_view('quarantine_replicas')
-    bp.add_url_rule('/quarantine', view_func=quarantine_replicas_view, methods=['post', ])
+    bp.add_url_rule('/quarantine', view_func=quarantine_replicas_view, methods=[HTTPMethod.POST.value])
 
     replicas_dids_view = ReplicasDIDs.as_view('replicas_dids')
-    bp.add_url_rule('/dids', view_func=replicas_dids_view, methods=['post', ])
+    bp.add_url_rule('/dids', view_func=replicas_dids_view, methods=[HTTPMethod.POST.value])
     dataset_replicas_view = DatasetReplicas.as_view('dataset_replicas')
-    bp.add_url_rule('/<path:scope_name>/datasets', view_func=dataset_replicas_view, methods=['get', ])
+    bp.add_url_rule('/<path:scope_name>/datasets', view_func=dataset_replicas_view, methods=[HTTPMethod.GET.value])
     dataset_replicas_bulk_view = DatasetReplicasBulk.as_view('dataset_replicas_bulk')
-    bp.add_url_rule('/datasets_bulk', view_func=dataset_replicas_bulk_view, methods=['post', ])
+    bp.add_url_rule('/datasets_bulk', view_func=dataset_replicas_bulk_view, methods=[HTTPMethod.POST.value])
     dataset_replicas_vp_view = DatasetReplicasVP.as_view('dataset_replicas_vp')
-    bp.add_url_rule('/<path:scope_name>', view_func=replicas_view, methods=['get', ])
+    bp.add_url_rule('/<path:scope_name>', view_func=replicas_view, methods=[HTTPMethod.GET.value])
     set_tombstone_view = Tombstone.as_view('set_tombstone')
-    bp.add_url_rule('/tombstone', view_func=set_tombstone_view, methods=['post', ])
+    bp.add_url_rule('/tombstone', view_func=set_tombstone_view, methods=[HTTPMethod.POST.value])
 
     if not with_doc:
-        bp.add_url_rule('/list/', view_func=list_replicas_view, methods=['post', ])
-        bp.add_url_rule('/suspicious/', view_func=suspicious_replicas_view, methods=['get', 'post'])
-        bp.add_url_rule('/bad/states/', view_func=bad_replicas_states_view, methods=['get', ])
-        bp.add_url_rule('/bad/summary/', view_func=bad_replicas_summary_view, methods=['get', ])
-        bp.add_url_rule('/bad/pfns/', view_func=bad_replicas_pfn_view, methods=['post', ])
-        bp.add_url_rule('/bad/dids/', view_func=bad_replicas_dids_view, methods=['post', ])
-        bp.add_url_rule('/rse/<rse>/', view_func=replicas_rse_view, methods=['get', ])
-        bp.add_url_rule('/bad/', view_func=bad_replicas_view, methods=['post', ])
-        bp.add_url_rule('/dids/', view_func=replicas_dids_view, methods=['post', ])
-        bp.add_url_rule('/datasets_bulk/', view_func=dataset_replicas_bulk_view, methods=['post', ])
-        bp.add_url_rule('/<path:scope_name>/datasets_vp', view_func=dataset_replicas_vp_view, methods=['get', ])
-        bp.add_url_rule('/<path:scope_name>/', view_func=replicas_view, methods=['get', ])
-        bp.add_url_rule('/tombstone/', view_func=set_tombstone_view, methods=['post', ])
-        bp.add_url_rule('/quarantine/', view_func=quarantine_replicas_view, methods=['post', ])
+        bp.add_url_rule('/list/', view_func=list_replicas_view, methods=[HTTPMethod.POST.value])
+        bp.add_url_rule('/suspicious/', view_func=suspicious_replicas_view, methods=[HTTPMethod.GET.value, HTTPMethod.POST.value])
+        bp.add_url_rule('/bad/states/', view_func=bad_replicas_states_view, methods=[HTTPMethod.GET.value])
+        bp.add_url_rule('/bad/summary/', view_func=bad_replicas_summary_view, methods=[HTTPMethod.GET.value])
+        bp.add_url_rule('/bad/pfns/', view_func=bad_replicas_pfn_view, methods=[HTTPMethod.POST.value])
+        bp.add_url_rule('/bad/dids/', view_func=bad_replicas_dids_view, methods=[HTTPMethod.POST.value])
+        bp.add_url_rule('/rse/<rse>/', view_func=replicas_rse_view, methods=[HTTPMethod.GET.value])
+        bp.add_url_rule('/bad/', view_func=bad_replicas_view, methods=[HTTPMethod.POST.value])
+        bp.add_url_rule('/dids/', view_func=replicas_dids_view, methods=[HTTPMethod.POST.value])
+        bp.add_url_rule('/datasets_bulk/', view_func=dataset_replicas_bulk_view, methods=[HTTPMethod.POST.value])
+        bp.add_url_rule('/<path:scope_name>/datasets_vp', view_func=dataset_replicas_vp_view, methods=[HTTPMethod.GET.value])
+        bp.add_url_rule('/<path:scope_name>/', view_func=replicas_view, methods=[HTTPMethod.GET.value])
+        bp.add_url_rule('/tombstone/', view_func=set_tombstone_view, methods=[HTTPMethod.POST.value])
+        bp.add_url_rule('/quarantine/', view_func=quarantine_replicas_view, methods=[HTTPMethod.POST.value])
 
     bp.after_request(response_headers)
     return bp

rucio/web/rest/flaskapi/v1/requests.py

@@ -18,7 +18,7 @@ from typing import TYPE_CHECKING, Union, cast
 import flask
 from flask import Flask, Response
 
-from rucio.common.constants import TransferLimitDirection
+from rucio.common.constants import HTTPMethod, TransferLimitDirection
 from rucio.common.exception import AccessDenied, RequestNotFound
 from rucio.common.utils import APIEncoder, render_json
 from rucio.core.rse import get_rses_with_attribute_value
@@ -1170,17 +1170,17 @@ def blueprint() -> AuthenticatedBlueprint:
     bp = AuthenticatedBlueprint('requests', __name__, url_prefix='/requests')
 
     request_get_view = RequestGet.as_view('request_get')
-    bp.add_url_rule('/<path:scope_name>/<rse>', view_func=request_get_view, methods=['get', ])
+    bp.add_url_rule('/<path:scope_name>/<rse>', view_func=request_get_view, methods=[HTTPMethod.GET.value])
     request_history_get_view = RequestHistoryGet.as_view('request_history_get')
-    bp.add_url_rule('/history/<path:scope_name>/<rse>', view_func=request_history_get_view, methods=['get', ])
+    bp.add_url_rule('/history/<path:scope_name>/<rse>', view_func=request_history_get_view, methods=[HTTPMethod.GET.value])
     request_list_view = RequestList.as_view('request_list')
-    bp.add_url_rule('/list', view_func=request_list_view, methods=['get', ])
+    bp.add_url_rule('/list', view_func=request_list_view, methods=[HTTPMethod.GET.value])
     request_history_list_view = RequestHistoryList.as_view('request_history_list')
-    bp.add_url_rule('/history/list', view_func=request_history_list_view, methods=['get', ])
+    bp.add_url_rule('/history/list', view_func=request_history_list_view, methods=[HTTPMethod.GET.value])
     request_metrics_view = RequestMetricsGet.as_view('request_metrics_get')
-    bp.add_url_rule('/metrics', view_func=request_metrics_view, methods=['get', ])
+    bp.add_url_rule('/metrics', view_func=request_metrics_view, methods=[HTTPMethod.GET.value])
     transfer_limits_view = TransferLimits.as_view('transfer_limits_get')
-    bp.add_url_rule('/transfer_limits', view_func=transfer_limits_view, methods=['get', 'put', 'delete'])
+    bp.add_url_rule('/transfer_limits', view_func=transfer_limits_view, methods=[HTTPMethod.GET.value, HTTPMethod.PUT.value, HTTPMethod.DELETE.value])
 
     bp.after_request(response_headers)
     return bp

rucio/web/rest/flaskapi/v1/rses.py

@@ -17,6 +17,7 @@ from typing import TYPE_CHECKING
 
 from flask import Flask, Response, jsonify, request
 
+from rucio.common.constants import HTTPMethod
 from rucio.common.exception import (
     AccessDenied,
     CounterNotFound,
@@ -2211,33 +2212,39 @@ def blueprint() -> AuthenticatedBlueprint:
     bp = AuthenticatedBlueprint('rses', __name__, url_prefix='/rses')
 
     attributes_view = Attributes.as_view('attributes')
-    bp.add_url_rule('/<rse>/attr/<key>', view_func=attributes_view, methods=['post', 'delete'])
-    bp.add_url_rule('/<rse>/attr/', view_func=attributes_view, methods=['get', ])
+    bp.add_url_rule('/<rse>/attr/<key>', view_func=attributes_view, methods=[HTTPMethod.POST.value, HTTPMethod.DELETE.value])
+    bp.add_url_rule('/<rse>/attr/', view_func=attributes_view, methods=[HTTPMethod.GET.value])
     distance_view = Distance.as_view('distance')
-    bp.add_url_rule('/<source>/distances/<destination>', view_func=distance_view, methods=['get', 'post', 'put', 'delete'])
+    bp.add_url_rule('/<source>/distances/<destination>', view_func=distance_view,
+                    methods=[HTTPMethod.GET.value, HTTPMethod.POST.value, HTTPMethod.PUT.value, HTTPMethod.DELETE.value])
     protocol_view = Protocol.as_view('protocol')
-    bp.add_url_rule('/<rse>/protocols/<scheme>/<hostname>/<port>', view_func=protocol_view, methods=['delete', 'put'])
-    bp.add_url_rule('/<rse>/protocols/<scheme>/<hostname>', view_func=protocol_view, methods=['delete', 'put'])
-    bp.add_url_rule('/<rse>/protocols/<scheme>', view_func=protocol_view, methods=['get', 'post', 'delete', 'put'])
+    bp.add_url_rule('/<rse>/protocols/<scheme>/<hostname>/<port>', view_func=protocol_view,
+                    methods=[HTTPMethod.DELETE.value, HTTPMethod.PUT.value])
+    bp.add_url_rule('/<rse>/protocols/<scheme>/<hostname>', view_func=protocol_view,
+                    methods=[HTTPMethod.DELETE.value, HTTPMethod.PUT.value])
+    bp.add_url_rule('/<rse>/protocols/<scheme>', view_func=protocol_view,
+                    methods=[HTTPMethod.GET.value, HTTPMethod.POST.value, HTTPMethod.DELETE.value, HTTPMethod.PUT.value])
     protocol_list_view = ProtocolList.as_view('protocol_list')
-    bp.add_url_rule('/<rse>/protocols', view_func=protocol_list_view, methods=['get', ])
+    bp.add_url_rule('/<rse>/protocols', view_func=protocol_list_view, methods=[HTTPMethod.GET.value])
     lfns2pfns_view = LFNS2PFNS.as_view('lfns2pfns')
-    bp.add_url_rule('/<rse>/lfns2pfns', view_func=lfns2pfns_view, methods=['get', ])
+    bp.add_url_rule('/<rse>/lfns2pfns', view_func=lfns2pfns_view, methods=[HTTPMethod.GET.value])
     rse_account_usage_limit_view = RSEAccountUsageLimit.as_view('rse_account_usage_limit')
-    bp.add_url_rule('/<rse>/accounts/usage', view_func=rse_account_usage_limit_view, methods=['get', ])
+    bp.add_url_rule('/<rse>/accounts/usage', view_func=rse_account_usage_limit_view, methods=[HTTPMethod.GET.value])
     usage_view = Usage.as_view('usage')
-    bp.add_url_rule('/<rse>/usage', view_func=usage_view, methods=['get', 'put'])
+    bp.add_url_rule('/<rse>/usage', view_func=usage_view, methods=[HTTPMethod.GET.value, HTTPMethod.PUT.value])
     usage_history_view = UsageHistory.as_view('usage_history')
-    bp.add_url_rule('/<rse>/usage/history', view_func=usage_history_view, methods=['get', ])
+    bp.add_url_rule('/<rse>/usage/history', view_func=usage_history_view, methods=[HTTPMethod.GET.value])
     limits_view = Limits.as_view('limits')
-    bp.add_url_rule('/<rse>/limits', view_func=limits_view, methods=['get', 'put', 'delete'])
+    bp.add_url_rule('/<rse>/limits', view_func=limits_view, methods=[HTTPMethod.GET.value, HTTPMethod.PUT.value, HTTPMethod.DELETE.value])
     qos_policy_view = QoSPolicy.as_view('qos_policy')
-    bp.add_url_rule('/<rse>/qos_policy', view_func=qos_policy_view, methods=['get', ])
-    bp.add_url_rule('/<rse>/qos_policy/<policy>', view_func=qos_policy_view, methods=['post', 'delete'])
+    bp.add_url_rule('/<rse>/qos_policy', view_func=qos_policy_view, methods=[HTTPMethod.GET.value])
+    bp.add_url_rule('/<rse>/qos_policy/<policy>', view_func=qos_policy_view,
+                    methods=[HTTPMethod.POST.value, HTTPMethod.DELETE.value])
     rse_view = RSE.as_view('rse')
-    bp.add_url_rule('/<rse>', view_func=rse_view, methods=['get', 'delete', 'put', 'post'])
+    bp.add_url_rule('/<rse>', view_func=rse_view,
+                    methods=[HTTPMethod.GET.value, HTTPMethod.DELETE.value, HTTPMethod.PUT.value, HTTPMethod.POST.value])
     rses_view = RSEs.as_view('rses')
-    bp.add_url_rule('/', view_func=rses_view, methods=['get', ])
+    bp.add_url_rule('/', view_func=rses_view, methods=[HTTPMethod.GET.value])
 
     bp.after_request(response_headers)
     return bp

rucio/web/rest/flaskapi/v1/rules.py

@@ -17,6 +17,7 @@ from typing import Any
 
 from flask import Flask, Response, request
 
+from rucio.common.constants import HTTPMethod
 from rucio.common.exception import (
     AccessDenied,
     AccountNotFound,
@@ -827,21 +828,21 @@ def blueprint() -> AuthenticatedBlueprint:
     bp = AuthenticatedBlueprint('rules', __name__, url_prefix='/rules')
 
     rule_view = Rule.as_view('rule')
-    bp.add_url_rule('/<rule_id>', view_func=rule_view, methods=['get', 'put', 'delete'])
+    bp.add_url_rule('/<rule_id>', view_func=rule_view, methods=[HTTPMethod.GET.value, HTTPMethod.PUT.value, HTTPMethod.DELETE.value])
     all_rule_view = AllRule.as_view('all_rule')
-    bp.add_url_rule('/', view_func=all_rule_view, methods=['get', 'post'])
+    bp.add_url_rule('/', view_func=all_rule_view, methods=[HTTPMethod.GET.value, HTTPMethod.POST.value])
     replica_locks_view = ReplicaLocks.as_view('replica_locks')
-    bp.add_url_rule('/<rule_id>/locks', view_func=replica_locks_view, methods=['get', ])
+    bp.add_url_rule('/<rule_id>/locks', view_func=replica_locks_view, methods=[HTTPMethod.GET.value])
     reduce_rule_view = ReduceRule.as_view('reduce_rule')
-    bp.add_url_rule('/<rule_id>/reduce', view_func=reduce_rule_view, methods=['post', ])
+    bp.add_url_rule('/<rule_id>/reduce', view_func=reduce_rule_view, methods=[HTTPMethod.POST.value])
     move_rule_view = MoveRule.as_view('move_rule')
-    bp.add_url_rule('/<rule_id>/move', view_func=move_rule_view, methods=['post', ])
+    bp.add_url_rule('/<rule_id>/move', view_func=move_rule_view, methods=[HTTPMethod.POST.value])
     rule_history_view = RuleHistory.as_view('rule_history')
-    bp.add_url_rule('/<rule_id>/history', view_func=rule_history_view, methods=['get', ])
+    bp.add_url_rule('/<rule_id>/history', view_func=rule_history_view, methods=[HTTPMethod.GET.value])
     rule_history_full_view = RuleHistoryFull.as_view('rule_history_full')
-    bp.add_url_rule('/<path:scope_name>/history', view_func=rule_history_full_view, methods=['get', ])
+    bp.add_url_rule('/<path:scope_name>/history', view_func=rule_history_full_view, methods=[HTTPMethod.GET.value])
     rule_analysis_view = RuleAnalysis.as_view('rule_analysis')
-    bp.add_url_rule('/<rule_id>/analysis', view_func=rule_analysis_view, methods=['get', ])
+    bp.add_url_rule('/<rule_id>/analysis', view_func=rule_analysis_view, methods=[HTTPMethod.GET.value])
 
     bp.after_request(response_headers)
     return bp

rucio/web/rest/flaskapi/v1/scopes.py

@@ -12,10 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from flask import Flask, jsonify, request
 
-from rucio.common.exception import AccountNotFound, Duplicate, ScopeNotFound
-from rucio.gateway.scope import add_scope, get_scopes, list_scopes
+from flask import Flask, Response, jsonify, request
+
+from rucio.common.constants import HTTPMethod
+from rucio.common.exception import AccountNotFound, Duplicate, ScopeNotFound, VONotFound
+from rucio.gateway.scope import add_scope, get_scopes, list_scopes, update_scope
 from rucio.web.rest.flaskapi.authenticated_bp import AuthenticatedBlueprint
 from rucio.web.rest.flaskapi.v1.common import ErrorHandlingMethodView, check_accept_header_wrapper_flask, generate_http_error_flask, response_headers
 
@@ -23,7 +25,7 @@ from rucio.web.rest.flaskapi.v1.common import ErrorHandlingMethodView, check_acc
 class Scope(ErrorHandlingMethodView):
 
     @check_accept_header_wrapper_flask(['application/json'])
-    def get(self):
+    def get(self) -> Response:
         """
         ---
         summary: List Scopes
@@ -39,16 +41,27 @@ class Scope(ErrorHandlingMethodView):
                   description: "All scopes."
                   type: array
                   items:
-                    description: "A scope."
-                    type: string
+                    type: object
+                    properties:
+                      scope:
+                        description: "A scope."
+                        type: string
+                      account:
+                        description: "The owner account."
+                        type: string
+
           401:
             description: "Invalid Auth Token"
           406:
             description: "Not acceptable"
         """
-        return jsonify(list_scopes(vo=request.environ['vo']))
+        scopes = list_scopes(vo=request.environ['vo'])
+        res = []
+        for dictionary in scopes:
+            res.append(dictionary)
+        return jsonify(res)
 
-    def post(self, account, scope):
+    def post(self, account: str, scope: str) -> Response:
         """
         ---
         summary: Add Scope
@@ -90,13 +103,53 @@ class Scope(ErrorHandlingMethodView):
         except AccountNotFound as error:
             return generate_http_error_flask(404, error)
 
-        return 'Created', 201
+        return Response('Created', 201)
+
+    def put(self, account: str, scope: str) -> Response:
+        """
+        ---
+        summary: Change ownership of a scope.
+        description: "Changes ownership of a scope.."
+        tags:
+          - Scopes
+        parameters:
+        - name: account
+          in: path
+          description: "The new owner account"
+          schema:
+            type: string
+          style: simple
+        - name: scope
+          in: path
+          description: "The name of the scope."
+          schema:
+            type: string
+          style: simple
+        responses:
+          201:
+            description: "OK"
+            content:
+              application/json:
+                schema:
+                  type: string
+                  enum: ['']
+          401:
+            description: "Invalid Auth Token"
+          403:
+            description: "Scope or already exists"
+        """
+        try:
+            update_scope(scope=scope, account=account, issuer=request.environ['issuer'], vo=request.environ['vo'])
+        except (ScopeNotFound, AccountNotFound, VONotFound) as error:
+            return generate_http_error_flask(404, error)
+
+        return Response("", 200)
 
 
 class AccountScopeList(ErrorHandlingMethodView):
 
     @check_accept_header_wrapper_flask(['application/json'])
-    def get(self, account):
+    def get(self, account: str) -> Response:
         """
         ---
         summary: List Account Scopes
@@ -143,10 +196,10 @@ def blueprint() -> AuthenticatedBlueprint:
     bp = AuthenticatedBlueprint('scopes', __name__, url_prefix='/scopes')
 
     scope_view = Scope.as_view('scope')
-    bp.add_url_rule('/', view_func=scope_view, methods=['get', ])
-    bp.add_url_rule('/<account>/<scope>', view_func=scope_view, methods=['post', ])
+    bp.add_url_rule('/', view_func=scope_view, methods=[HTTPMethod.GET.value])
+    bp.add_url_rule('/<account>/<scope>', view_func=scope_view, methods=[HTTPMethod.POST.value, HTTPMethod.PUT.value])
     account_scope_list_view = AccountScopeList.as_view('account_scope_list')
-    bp.add_url_rule('/<account>/scopes', view_func=account_scope_list_view, methods=['get', ])
+    bp.add_url_rule('/<account>/scopes', view_func=account_scope_list_view, methods=[HTTPMethod.GET.value])
 
     bp.after_request(response_headers)
     return bp

rucio/web/rest/flaskapi/v1/subscriptions.py

@@ -16,6 +16,7 @@ from json import dumps
 
 from flask import Flask, Response, request
 
+from rucio.common.constants import HTTPMethod
 from rucio.common.exception import AccessDenied, InvalidObject, RuleNotFound, SubscriptionDuplicate, SubscriptionNotFound
 from rucio.common.utils import APIEncoder, render_json
 from rucio.gateway.rule import list_replication_rules
@@ -623,18 +624,18 @@ def blueprint() -> AuthenticatedBlueprint:
     bp = AuthenticatedBlueprint('subscriptions', __name__, url_prefix='/subscriptions')
 
     subscription_id_view = SubscriptionId.as_view('subscription_id')
-    bp.add_url_rule('/id/<subscription_id>', view_func=subscription_id_view, methods=['get', ])
+    bp.add_url_rule('/id/<subscription_id>', view_func=subscription_id_view, methods=[HTTPMethod.GET.value])
     states_view = States.as_view('states')
-    bp.add_url_rule('/<account>/<name>/rules/states', view_func=states_view, methods=['get', ])
-    bp.add_url_rule('/<account>/rules/states', view_func=states_view, methods=['get', ])
+    bp.add_url_rule('/<account>/<name>/rules/states', view_func=states_view, methods=[HTTPMethod.GET.value])
+    bp.add_url_rule('/<account>/rules/states', view_func=states_view, methods=[HTTPMethod.GET.value])
     rules_view = Rules.as_view('rules')
-    bp.add_url_rule('/<account>/<name>/rules', view_func=rules_view, methods=['get', ])
+    bp.add_url_rule('/<account>/<name>/rules', view_func=rules_view, methods=[HTTPMethod.GET.value])
     subscription_view = Subscription.as_view('subscription')
-    bp.add_url_rule('/<account>/<name>', view_func=subscription_view, methods=['get', 'post', 'put'])
-    bp.add_url_rule('/<account>', view_func=subscription_view, methods=['get', ])
-    bp.add_url_rule('/', view_func=subscription_view, methods=['get', ])
+    bp.add_url_rule('/<account>/<name>', view_func=subscription_view, methods=[HTTPMethod.GET.value, HTTPMethod.POST.value, HTTPMethod.PUT.value])
+    bp.add_url_rule('/<account>', view_func=subscription_view, methods=[HTTPMethod.GET.value])
+    bp.add_url_rule('/', view_func=subscription_view, methods=[HTTPMethod.GET.value])
     subscription_name_view = SubscriptionName.as_view('subscription_name')
-    bp.add_url_rule('/name/<name>', view_func=subscription_name_view, methods=['get', ])
+    bp.add_url_rule('/name/<name>', view_func=subscription_name_view, methods=[HTTPMethod.GET.value])
 
     bp.after_request(response_headers)
     return bp

rucio/web/rest/flaskapi/v1/traces.py

@@ -18,6 +18,7 @@ from typing import TYPE_CHECKING
 from flask import Blueprint, Flask, Response, request
 from werkzeug.datastructures import Headers
 
+from rucio.common.constants import HTTPMethod
 from rucio.gateway.trace import trace
 from rucio.web.rest.flaskapi.v1.common import ErrorHandlingMethodView, generate_http_error_flask, response_headers
 
@@ -122,7 +123,7 @@ def blueprint() -> Blueprint:
     bp = Blueprint('traces', __name__, url_prefix='/traces')
 
     trace_view = Trace.as_view('trace')
-    bp.add_url_rule('/', view_func=trace_view, methods=['post', ])
+    bp.add_url_rule('/', view_func=trace_view, methods=[HTTPMethod.POST.value])
 
     bp.after_request(response_headers)
     return bp

rucio/web/rest/flaskapi/v1/vos.py

@@ -14,6 +14,7 @@
 
 from flask import Flask, request
 
+from rucio.common.constants import HTTPMethod
 from rucio.common.exception import AccessDenied, AccountNotFound, Duplicate, UnsupportedOperation, VONotFound
 from rucio.common.utils import render_json
 from rucio.gateway.vo import add_vo, list_vos, recover_vo_root_identity, update_vo
@@ -259,11 +260,11 @@ def blueprint() -> AuthenticatedBlueprint:
     bp = AuthenticatedBlueprint('vos', __name__, url_prefix='/vos')
 
     recover_view = RecoverVO.as_view('recover')
-    bp.add_url_rule('/<vo>/recover', view_func=recover_view, methods=['post', ])
+    bp.add_url_rule('/<vo>/recover', view_func=recover_view, methods=[HTTPMethod.POST.value])
     vo_view = VO.as_view('vo')
-    bp.add_url_rule('/<vo>', view_func=vo_view, methods=['put', 'post'])
+    bp.add_url_rule('/<vo>', view_func=vo_view, methods=[HTTPMethod.PUT.value, HTTPMethod.POST.value])
     vos_view = VOs.as_view('vos')
-    bp.add_url_rule('/', view_func=vos_view, methods=['get', ])
+    bp.add_url_rule('/', view_func=vos_view, methods=[HTTPMethod.GET.value])
 
     bp.after_request(response_headers)
     return bp

{rucio-38.3.0.data → rucio-38.5.0.data}/data/rucio/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-38.3.0.data → rucio-38.5.0.data}/data/rucio/etc/rucio_multi_vo.cfg.template

@@ -102,8 +102,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
@@ -179,7 +179,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-38.3.0.dist-info → rucio-38.5.0.dist-info}/METADATA

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