rucio-clients 38.2.0__py3-none-any.whl → 38.4.0__py3-none-any.whl

rucio/client/metaconventionsclient.py

@@ -19,6 +19,7 @@ from urllib.parse import quote_plus
 from requests.status_codes import codes
 
 from rucio.client.baseclient import BaseClient, choice
+from rucio.common.constants import HTTPMethod
 from rucio.common.utils import build_url
 
 if TYPE_CHECKING:
@@ -63,7 +64,7 @@ class MetaConventionClient(BaseClient):
                       'value_regexp': value_regexp,
                       'key_type': key_type})
 
-        r = self._send_request(url, type_='POST', data=data)
+        r = self._send_request(url, method=HTTPMethod.POST, data=data)
 
         if r.status_code == codes.created:
             return True
@@ -81,7 +82,7 @@ class MetaConventionClient(BaseClient):
         """
         path = self.META_BASEURL + '/'
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url)
+        r = self._send_request(url, method=HTTPMethod.GET)
         if r.status_code == codes.ok:
             keys = loads(r.text)
             return keys
@@ -99,7 +100,7 @@ class MetaConventionClient(BaseClient):
         """
         path = '/'.join([self.META_BASEURL, quote_plus(key)]) + '/'
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url)
+        r = self._send_request(url, method=HTTPMethod.GET)
         if r.status_code == codes.ok:
             values = loads(r.text)
             return values
@@ -131,7 +132,7 @@ class MetaConventionClient(BaseClient):
         path = '/'.join([self.META_BASEURL, quote_plus(key)]) + '/'
         data = dumps({'value': value})
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='POST', data=data)
+        r = self._send_request(url, method=HTTPMethod.POST, data=data)
         if r.status_code == codes.created:
             return True
         else:

rucio/client/opendataclient.py

@@ -20,6 +20,7 @@ from requests.status_codes import codes
 
 from rucio.client.baseclient import BaseClient, choice
 from rucio.common.config import config_get
+from rucio.common.constants import HTTPMethod
 from rucio.common.utils import build_url, render_json
 
 if TYPE_CHECKING:
@@ -85,7 +86,7 @@ class OpenDataClient(BaseClient):
             raise ValueError('state and public cannot be provided at the same time.')
 
         url = build_url(self.get_opendata_host(public=public), path=path)
-        r = self._send_request(url, type_='GET', params=params)
+        r = self._send_request(url, method=HTTPMethod.GET, params=params)
         if r.status_code == codes.ok:
             return json.loads(r.content.decode('utf-8'))
         else:
@@ -115,7 +116,7 @@ class OpenDataClient(BaseClient):
         path = '/'.join([self.opendata_private_dids_base_url, quote_plus(scope), quote_plus(name)])
         url = build_url(self.get_opendata_host(public=False), path=path)
 
-        r = self._send_request(url, type_='POST')
+        r = self._send_request(url, method=HTTPMethod.POST)
 
         if r.status_code == codes.created:
             return True
@@ -146,7 +147,7 @@ class OpenDataClient(BaseClient):
         path = '/'.join([self.opendata_private_dids_base_url, quote_plus(scope), quote_plus(name)])
         url = build_url(self.get_opendata_host(public=False), path=path)
 
-        r = self._send_request(url, type_='DEL')
+        r = self._send_request(url, method=HTTPMethod.DELETE)
 
         if r.status_code == codes.no_content:
             return True
@@ -162,7 +163,7 @@ class OpenDataClient(BaseClient):
             state: Optional["OPENDATA_DID_STATE_LITERAL"] = None,
             meta: Optional[dict] = None,
             doi: Optional[str] = None,
-    ) -> bool:
+    ) -> dict[str, Any]:
         """
         Update an existing Opendata DID in the Opendata catalog.
 
@@ -198,10 +199,10 @@ class OpenDataClient(BaseClient):
         if doi is not None:
             data['doi'] = doi
 
-        r = self._send_request(url, type_='PUT', data=render_json(**data))
+        r = self._send_request(url, method=HTTPMethod.PUT, data=render_json(**data))
 
         if r.status_code == codes.ok:
-            return True
+            return json.loads(r.content.decode('utf-8'))
         else:
             exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
             raise exc_cls(exc_msg)
@@ -236,7 +237,7 @@ class OpenDataClient(BaseClient):
         path = '/'.join([base_url, quote_plus(scope), quote_plus(name)])
         url = build_url(self.get_opendata_host(public=public), path=path)
 
-        r = self._send_request(url, type_='GET', params={
+        r = self._send_request(url, method=HTTPMethod.GET, params={
             'files': 1 if include_files else 0,
             'meta': 1 if include_metadata else 0,
             'doi': 1 if include_doi else 0,

rucio/client/pingclient.py

@@ -18,6 +18,7 @@ from typing import Any
 from requests.status_codes import codes
 
 from rucio.client.baseclient import BaseClient
+from rucio.common.constants import HTTPMethod
 from rucio.common.utils import build_url
 
 
@@ -67,7 +68,7 @@ class PingClient(BaseClient):
         headers = None
         path = 'ping'
         url = build_url(self.host, path=path)
-        r = self._send_request(url, headers=headers, type_='GET')
+        r = self._send_request(url, headers=headers, method=HTTPMethod.GET)
 
         if r.status_code == codes.ok:
             server_info = loads(r.text)

rucio/client/replicaclient.py

@@ -20,6 +20,7 @@ from urllib.parse import quote_plus
 from requests.status_codes import codes
 
 from rucio.client.baseclient import BaseClient, choice
+from rucio.common.constants import HTTPMethod
 from rucio.common.utils import build_url, chunks, render_json
 
 
@@ -50,7 +51,7 @@ class ReplicaClient(BaseClient):
         headers = {}
         for chunk in chunks(replicas, self.REPLICAS_CHUNK_SIZE):
             data = {'rse': rse, 'rse_id': rse_id, 'replicas': chunk}
-            r = self._send_request(url, headers=headers, type_='POST', data=dumps(data))
+            r = self._send_request(url, headers=headers, method=HTTPMethod.POST, data=dumps(data))
             if r.status_code != codes.ok:
                 exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
                 raise exc_cls(exc_msg)
@@ -74,12 +75,12 @@ class ReplicaClient(BaseClient):
             Dictionary of the form {"rse_name": ["did: error",...]} - list of strings for DIDs failed to declare, by RSE
         """
 
-        out = {}    # {rse: ["did: error text",...]}
+        out = {}  # {rse: ["did: error text",...]}
         url = build_url(self.host, path='/'.join([self.REPLICAS_BASEURL, 'bad']))
         headers = {}
         for chunk in chunks(replicas, self.REPLICAS_CHUNK_SIZE):
             data = {'reason': reason, 'replicas': chunk, 'force': force}
-            r = self._send_request(url, headers=headers, type_='POST', data=dumps(data))
+            r = self._send_request(url, headers=headers, method=HTTPMethod.POST, data=dumps(data))
             if r.status_code not in (codes.created, codes.ok):
                 exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
                 raise exc_cls(exc_msg)
@@ -105,7 +106,7 @@ class ReplicaClient(BaseClient):
         data = {'reason': reason, 'rse': rse, 'dids': dids}
         url = build_url(self.host, path='/'.join([self.REPLICAS_BASEURL, 'bad/dids']))
         headers = {}
-        r = self._send_request(url, headers=headers, type_='POST', data=dumps(data))
+        r = self._send_request(url, headers=headers, method=HTTPMethod.POST, data=dumps(data))
         if r.status_code == codes.created:
             return loads(r.text)
         exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
@@ -126,7 +127,7 @@ class ReplicaClient(BaseClient):
         data = {'reason': reason, 'pfns': pfns}
         url = build_url(self.host, path='/'.join([self.REPLICAS_BASEURL, 'suspicious']))
         headers = {}
-        r = self._send_request(url, headers=headers, type_='POST', data=dumps(data))
+        r = self._send_request(url, headers=headers, method=HTTPMethod.POST, data=dumps(data))
         if r.status_code == codes.created:
             return loads(r.text)
         exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
@@ -146,7 +147,7 @@ class ReplicaClient(BaseClient):
         data = {'rse': rse, 'pfns': pfns}
         url = build_url(self.host, path='/'.join([self.REPLICAS_BASEURL, 'dids']))
         headers = {}
-        r = self._send_request(url, headers=headers, type_='POST', data=dumps(data))
+        r = self._send_request(url, headers=headers, method=HTTPMethod.POST, data=dumps(data))
         if r.status_code == codes.ok:
             return self._load_json_data(r)
         exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
@@ -243,7 +244,7 @@ class ReplicaClient(BaseClient):
             headers['Accept'] = 'application/metalink4+xml'
 
         # pass json dict in querystring
-        r = self._send_request(url, headers=headers, type_='POST', data=dumps(data), stream=True)
+        r = self._send_request(url, headers=headers, method=HTTPMethod.POST, data=dumps(data), stream=True)
         if r.status_code == codes.ok:
             if not metalink:
                 return self._load_json_data(r)
@@ -278,22 +279,22 @@ class ReplicaClient(BaseClient):
 
         url = build_url(choice(self.list_hosts),
                         path='/'.join([self.REPLICAS_BASEURL, 'suspicious']))
-        r = self._send_request(url, type_='GET', params=params)
+        r = self._send_request(url, method=HTTPMethod.GET, params=params)
         if r.status_code == codes.ok:
             return self._load_json_data(r)
         exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
         raise exc_cls(exc_msg)
 
     def add_replica(
-        self,
-        rse: str,
-        scope: str,
-        name: str,
-        bytes_: int,
-        adler32: str,
-        pfn: Optional[str] = None,
-        md5: Optional[str] = None,
-        meta: Optional[dict[str, Any]] = None
+            self,
+            rse: str,
+            scope: str,
+            name: str,
+            bytes_: int,
+            adler32: str,
+            pfn: Optional[str] = None,
+            md5: Optional[str] = None,
+            meta: Optional[dict[str, Any]] = None
     ) -> bool:
         """
         Add file replicas to a RSE.
@@ -350,7 +351,7 @@ class ReplicaClient(BaseClient):
         """
         url = build_url(choice(self.list_hosts), path=self.REPLICAS_BASEURL)
         data = {'rse': rse, 'files': files, 'ignore_availability': ignore_availability}
-        r = self._send_request(url, type_='POST', data=render_json(**data))
+        r = self._send_request(url, method=HTTPMethod.POST, data=render_json(**data))
         if r.status_code == codes.created:
             return True
         exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
@@ -375,7 +376,7 @@ class ReplicaClient(BaseClient):
         """
         url = build_url(choice(self.list_hosts), path=self.REPLICAS_BASEURL)
         data = {'rse': rse, 'files': files, 'ignore_availability': ignore_availability}
-        r = self._send_request(url, type_='DEL', data=render_json(**data))
+        r = self._send_request(url, method=HTTPMethod.DELETE, data=render_json(**data))
         if r.status_code == codes.ok:
             return True
         exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
@@ -408,7 +409,7 @@ class ReplicaClient(BaseClient):
         """
         url = build_url(choice(self.list_hosts), path=self.REPLICAS_BASEURL)
         data = {'rse': rse, 'files': files}
-        r = self._send_request(url, type_='PUT', data=render_json(**data))
+        r = self._send_request(url, method=HTTPMethod.PUT, data=render_json(**data))
         if r.status_code == codes.ok:
             return True
         exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
@@ -438,7 +439,7 @@ class ReplicaClient(BaseClient):
         url = build_url(self.host,
                         path='/'.join([self.REPLICAS_BASEURL, quote_plus(scope), quote_plus(name), 'datasets']),
                         params=payload)
-        r = self._send_request(url, type_='GET')
+        r = self._send_request(url, method=HTTPMethod.GET)
         if r.status_code == codes.ok:
             return self._load_json_data(r)
         exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
@@ -459,7 +460,7 @@ class ReplicaClient(BaseClient):
         """
         payload = {'dids': list(dids)}
         url = build_url(self.host, path='/'.join([self.REPLICAS_BASEURL, 'datasets_bulk']))
-        r = self._send_request(url, type_='POST', data=dumps(payload))
+        r = self._send_request(url, method=HTTPMethod.POST, data=dumps(payload))
         if r.status_code == codes.ok:
             return self._load_json_data(r)
         exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
@@ -493,7 +494,7 @@ class ReplicaClient(BaseClient):
         url = build_url(self.host,
                         path='/'.join([self.REPLICAS_BASEURL, quote_plus(scope), quote_plus(name), 'datasets_vp']),
                         params=payload)
-        r = self._send_request(url, type_='GET')
+        r = self._send_request(url, method=HTTPMethod.GET)
         if r.status_code == codes.ok:
             return self._load_json_data(r)
         exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
@@ -516,7 +517,7 @@ class ReplicaClient(BaseClient):
         A list of dict dataset replicas
         """
         url = build_url(self.host, path='/'.join([self.REPLICAS_BASEURL, 'rse', rse]))
-        r = self._send_request(url, type_='GET')
+        r = self._send_request(url, method=HTTPMethod.GET)
         if r.status_code == codes.ok:
             return self._load_json_data(r)
 
@@ -545,7 +546,7 @@ class ReplicaClient(BaseClient):
         data = {'reason': reason, 'pfns': pfns, 'state': state, 'expires_at': expires_at}
         url = build_url(self.host, path='/'.join([self.REPLICAS_BASEURL, 'bad/pfns']))
         headers = {}
-        r = self._send_request(url, headers=headers, type_='POST', data=dumps(data))
+        r = self._send_request(url, headers=headers, method=HTTPMethod.POST, data=dumps(data))
         if r.status_code == codes.created:
             return True
         exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
@@ -562,7 +563,7 @@ class ReplicaClient(BaseClient):
         """
         url = build_url(self.host, path='/'.join([self.REPLICAS_BASEURL, 'tombstone']))
         data = {'replicas': replicas}
-        r = self._send_request(url, type_='POST', data=render_json(**data))
+        r = self._send_request(url, method=HTTPMethod.POST, data=render_json(**data))
         if r.status_code == codes.created:
             return True
         exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)

rucio/client/requestclient.py

@@ -19,7 +19,7 @@ from urllib.parse import quote_plus
 from requests.status_codes import codes
 
 from rucio.client.baseclient import BaseClient, choice
-from rucio.common.constants import TransferLimitDirection
+from rucio.common.constants import HTTPMethod, TransferLimitDirection
 from rucio.common.utils import build_url
 
 if TYPE_CHECKING:
@@ -45,7 +45,7 @@ class RequestClient(BaseClient):
         path = '/'.join([self.REQUEST_BASEURL, 'list']) + '?' + '&'.join(['src_rse={}'.format(src_rse), 'dst_rse={}'.format(
             dst_rse), 'request_states={}'.format(request_states)])
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='GET')
+        r = self._send_request(url, method=HTTPMethod.GET)
 
         if r.status_code == codes.ok:
             return self._load_json_data(r)
@@ -70,7 +70,7 @@ class RequestClient(BaseClient):
         path = '/'.join([self.REQUEST_BASEURL, 'history', 'list']) + '?' + '&'.join(['src_rse={}'.format(src_rse), 'dst_rse={}'.format(
             dst_rse), 'request_states={}'.format(request_states), 'offset={}'.format(offset), 'limit={}'.format(limit)])
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='GET')
+        r = self._send_request(url, method=HTTPMethod.GET)
 
         if r.status_code == codes.ok:
             return self._load_json_data(r)
@@ -106,7 +106,7 @@ class RequestClient(BaseClient):
         if scope is not None:
             path = '/'.join([self.REQUEST_BASEURL, quote_plus(scope), quote_plus(name), rse])
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='GET')
+        r = self._send_request(url, method=HTTPMethod.GET)
 
         if r.status_code == codes.ok:
             return next(self._load_json_data(r))
@@ -144,7 +144,7 @@ class RequestClient(BaseClient):
         if scope is not None:
             path = '/'.join([self.REQUEST_BASEURL, 'history', quote_plus(scope), quote_plus(name), rse])
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='GET')
+        r = self._send_request(url, method=HTTPMethod.GET)
 
         if r.status_code == codes.ok:
             return next(self._load_json_data(r))
@@ -161,7 +161,7 @@ class RequestClient(BaseClient):
         """
         path = '/'.join([self.REQUEST_BASEURL, 'transfer_limits'])
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='GET')
+        r = self._send_request(url, method=HTTPMethod.GET)
 
         if r.status_code == codes.ok:
             return self._load_json_data(r)
@@ -201,7 +201,7 @@ class RequestClient(BaseClient):
                       'direction': direction.value, 'max_transfers': max_transfers,
                       'volume': volume, 'deadline': deadline, 'strategy': strategy,
                       'transfers': transfers, 'waitings': waitings})
-        r = self._send_request(url, type_='PUT', data=data)
+        r = self._send_request(url, method=HTTPMethod.PUT, data=data)
 
         if r.status_code == codes.created:
             return True
@@ -225,7 +225,7 @@ class RequestClient(BaseClient):
         path = '/'.join([self.REQUEST_BASEURL, 'transfer_limits'])
         url = build_url(choice(self.list_hosts), path=path)
         data = dumps({'rse_expression': rse_expression, 'activity': activity, 'direction': direction.value})
-        r = self._send_request(url, type_='DEL', data=data)
+        r = self._send_request(url, method=HTTPMethod.DELETE, data=data)
 
         if r.status_code == codes.ok:
             return True

rucio/client/richclient.py

@@ -131,6 +131,12 @@ class CLITheme:
         'SERVICE': 'yellow'
     }
 
+    OPENDATA_DID_STATE = {
+        'PUBLIC': 'bold green',
+        'DRAFT': 'bold default',
+        'SUSPENDED': 'bold red',
+    }
+
 
 def setup_rich_logger(
     module_name: Optional[str] = None,

rucio/client/rseclient.py

@@ -19,6 +19,7 @@ from urllib.parse import quote
 from requests.status_codes import codes
 
 from rucio.client.baseclient import BaseClient, choice
+from rucio.common.constants import HTTPMethod
 from rucio.common.utils import build_url
 
 if TYPE_CHECKING:
@@ -53,7 +54,7 @@ class RSEClient(BaseClient):
         path = '/'.join([self.RSE_BASEURL, rse])
         url = build_url(choice(self.list_hosts), path=path)
 
-        r = self._send_request(url, type_='GET')
+        r = self._send_request(url, method=HTTPMethod.GET)
         if r.status_code == codes.ok:
             rse_dict = loads(r.text)
             return rse_dict
@@ -110,7 +111,7 @@ class RSEClient(BaseClient):
         """
         path = 'rses/' + rse
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='POST', data=dumps(kwargs))
+        r = self._send_request(url, method=HTTPMethod.POST, data=dumps(kwargs))
         if r.status_code == codes.created:
             return True
         exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
@@ -129,7 +130,7 @@ class RSEClient(BaseClient):
         """
         path = 'rses/' + rse
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='PUT', data=dumps(parameters))
+        r = self._send_request(url, method=HTTPMethod.PUT, data=dumps(parameters))
         if r.status_code == codes.created:
             return True
         exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
@@ -150,7 +151,7 @@ class RSEClient(BaseClient):
         """
         path = 'rses/' + rse
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='DEL')
+        r = self._send_request(url, method=HTTPMethod.DELETE)
         if r.status_code == codes.ok:
             return True
         else:
@@ -175,7 +176,7 @@ class RSEClient(BaseClient):
         else:
             path = 'rses/'
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='GET')
+        r = self._send_request(url, method=HTTPMethod.GET)
         if r.status_code == codes.ok:
             return self._load_json_data(r)
         else:
@@ -213,7 +214,7 @@ class RSEClient(BaseClient):
         url = build_url(choice(self.list_hosts), path=path)
         data = dumps({'value': value})
 
-        r = self._send_request(url, type_='POST', data=data)
+        r = self._send_request(url, method=HTTPMethod.POST, data=data)
         if r.status_code == codes.created:
             return True
         else:
@@ -238,7 +239,7 @@ class RSEClient(BaseClient):
         path = '/'.join([self.RSE_BASEURL, rse, 'attr', key])
         url = build_url(choice(self.list_hosts), path=path)
 
-        r = self._send_request(url, type_='DEL')
+        r = self._send_request(url, method=HTTPMethod.DELETE)
         if r.status_code == codes.ok:
             return True
         else:
@@ -260,7 +261,7 @@ class RSEClient(BaseClient):
         """
         path = '/'.join([self.RSE_BASEURL, rse, 'attr/'])
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='GET')
+        r = self._send_request(url, method=HTTPMethod.GET)
         if r.status_code == codes.ok:
             attributes = loads(r.text)
             return attributes
@@ -306,7 +307,7 @@ class RSEClient(BaseClient):
         scheme = params['scheme']
         path = '/'.join([self.RSE_BASEURL, rse, 'protocols', scheme])
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='POST', data=dumps(params))
+        r = self._send_request(url, method=HTTPMethod.POST, data=dumps(params))
         if r.status_code == codes.created:
             return True
         else:
@@ -366,7 +367,7 @@ class RSEClient(BaseClient):
         params['protocol_domain'] = protocol_domain
         url = build_url(choice(self.list_hosts), path=path, params=params)
 
-        r = self._send_request(url, type_='GET')
+        r = self._send_request(url, method=HTTPMethod.GET)
         if r.status_code == codes.ok:
             protocols = loads(r.text)
             return protocols
@@ -426,7 +427,7 @@ class RSEClient(BaseClient):
 
         url = build_url(choice(self.list_hosts), path=path, params=params, doseq=True)
 
-        r = self._send_request(url, type_='GET')
+        r = self._send_request(url, method=HTTPMethod.GET)
         if r.status_code == codes.ok:
             pfns = loads(r.text)
             return pfns
@@ -477,7 +478,7 @@ class RSEClient(BaseClient):
 
         path = '/'.join(path)
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='DEL')
+        r = self._send_request(url, method=HTTPMethod.DELETE)
         if r.status_code == codes.ok:
             return True
         else:
@@ -530,7 +531,7 @@ class RSEClient(BaseClient):
 
         path = '/'.join(path)
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='PUT', data=dumps(data))
+        r = self._send_request(url, method=HTTPMethod.PUT, data=dumps(data))
         if r.status_code == codes.ok:
             return True
         else:
@@ -586,8 +587,10 @@ class RSEClient(BaseClient):
 
         priority_a = protocol_a['domains'][domain][operation]
         priority_b = protocol_b['domains'][domain][operation]
-        self.update_protocols(rse, protocol_a['scheme'], {'domains': {domain: {operation: priority_b}}}, protocol_a['hostname'], protocol_a['port'])
-        self.update_protocols(rse, protocol_b['scheme'], {'domains': {domain: {operation: priority_a}}}, protocol_b['hostname'], protocol_b['port'])
+        self.update_protocols(rse, protocol_a['scheme'], {'domains': {domain: {operation: priority_b}}},
+                              protocol_a['hostname'], protocol_a['port'])
+        self.update_protocols(rse, protocol_b['scheme'], {'domains': {domain: {operation: priority_a}}},
+                              protocol_b['hostname'], protocol_b['port'])
         return True
 
     def add_qos_policy(self, rse: str, qos_policy: str) -> Literal[True]:
@@ -614,7 +617,7 @@ class RSEClient(BaseClient):
         path = [self.RSE_BASEURL, rse, 'qos_policy', qos_policy]
         path = '/'.join(path)
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='POST')
+        r = self._send_request(url, method=HTTPMethod.POST)
         if r.status_code == codes.created:
             return True
         else:
@@ -649,7 +652,7 @@ class RSEClient(BaseClient):
         path = [self.RSE_BASEURL, rse, 'qos_policy', qos_policy]
         path = '/'.join(path)
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='DEL')
+        r = self._send_request(url, method=HTTPMethod.DELETE)
         if r.status_code == codes.ok:
             return True
         else:
@@ -669,7 +672,7 @@ class RSEClient(BaseClient):
         path = [self.RSE_BASEURL, rse, 'qos_policy']
         path = '/'.join(path)
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='GET')
+        r = self._send_request(url, method=HTTPMethod.GET)
         if r.status_code == codes.ok:
             return loads(r.text)
         else:
@@ -708,7 +711,7 @@ class RSEClient(BaseClient):
         path = '/'.join(path)
         url = build_url(choice(self.list_hosts), path=path)
         data = {'source': source, 'used': used, 'free': free, 'files': files}
-        r = self._send_request(url, type_='PUT', data=dumps(data))
+        r = self._send_request(url, method=HTTPMethod.PUT, data=dumps(data))
         if r.status_code == codes.ok:
             return True
         else:
@@ -737,7 +740,7 @@ class RSEClient(BaseClient):
         path = [self.RSE_BASEURL, rse, 'usage']
         path = '/'.join(path)
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='GET', params=filters)
+        r = self._send_request(url, method=HTTPMethod.GET, params=filters)
         if r.status_code == codes.ok:
             return self._load_json_data(r)
         else:
@@ -766,7 +769,7 @@ class RSEClient(BaseClient):
         path = [self.RSE_BASEURL, rse, 'usage', 'history']
         path = '/'.join(path)
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='GET', params=filters)
+        r = self._send_request(url, method=HTTPMethod.GET, params=filters)
         if r.status_code == codes.ok:
             return self._load_json_data(r)
         else:
@@ -800,7 +803,7 @@ class RSEClient(BaseClient):
         path = [self.RSE_BASEURL, rse, 'limits']
         path = '/'.join(path)
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='PUT', data=dumps({'name': name, 'value': value}))
+        r = self._send_request(url, method=HTTPMethod.PUT, data=dumps({'name': name, 'value': value}))
         if r.status_code == codes.ok:
             return True
         exc_cls, exc_msg = self._get_exception(headers=r.headers,
@@ -827,7 +830,7 @@ class RSEClient(BaseClient):
         path = [self.RSE_BASEURL, rse, 'limits']
         path = '/'.join(path)
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='GET')
+        r = self._send_request(url, method=HTTPMethod.GET)
         if r.status_code == codes.ok:
             return next(self._load_json_data(r))
         exc_cls, exc_msg = self._get_exception(headers=r.headers,
@@ -853,7 +856,7 @@ class RSEClient(BaseClient):
         path = [self.RSE_BASEURL, rse, 'limits']
         path = '/'.join(path)
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='DEL', data=dumps({'name': name}))
+        r = self._send_request(url, method=HTTPMethod.DELETE, data=dumps({'name': name}))
         if r.status_code == codes.ok:
             return True
         exc_cls, exc_msg = self._get_exception(headers=r.headers,
@@ -878,7 +881,7 @@ class RSEClient(BaseClient):
         path = [self.RSE_BASEURL, source, 'distances', destination]
         path = '/'.join(path)
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='POST', data=dumps(parameters))
+        r = self._send_request(url, method=HTTPMethod.POST, data=dumps(parameters))
         if r.status_code == codes.created:
             return True
         exc_cls, exc_msg = self._get_exception(headers=r.headers,
@@ -907,7 +910,7 @@ class RSEClient(BaseClient):
         path = [self.RSE_BASEURL, source, 'distances', destination]
         path = '/'.join(path)
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='PUT', data=dumps(parameters))
+        r = self._send_request(url, method=HTTPMethod.PUT, data=dumps(parameters))
         if r.status_code == codes.ok:
             return True
         exc_cls, exc_msg = self._get_exception(headers=r.headers,
@@ -938,7 +941,7 @@ class RSEClient(BaseClient):
         path = [self.RSE_BASEURL, source, 'distances', destination]
         path = '/'.join(path)
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='GET')
+        r = self._send_request(url, method=HTTPMethod.GET)
         if r.status_code == codes.ok:
             return next(self._load_json_data(r))
         exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
@@ -962,7 +965,7 @@ class RSEClient(BaseClient):
         path = [self.RSE_BASEURL, source, 'distances', destination]
         path = '/'.join(path)
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='DEL')
+        r = self._send_request(url, method=HTTPMethod.DELETE)
         if r.status_code == codes.ok:
             return True
         exc_cls, exc_msg = self._get_exception(headers=r.headers,