rucio 36.0.0__tar.gz → 36.0.0.post2__tar.gz

{rucio-36.0.0 → rucio-36.0.0.post2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rucio
-Version: 36.0.0
+Version: 36.0.0.post2
 Summary: Rucio Package
 Home-page: https://rucio.cern.ch/
 Author: Rucio
@@ -42,6 +42,7 @@ Requires-Dist: sqlalchemy==2.0.31
 Requires-Dist: statsd==4.0.1
 Requires-Dist: stomp-py==8.1.2
 Requires-Dist: tabulate==0.9.0
+Requires-Dist: typing-extensions==4.12.2
 Requires-Dist: urllib3==1.26.19
 Provides-Extra: oracle
 Requires-Dist: cx-oracle==8.3.0; extra == "oracle"

{rucio-36.0.0 → rucio-36.0.0.post2}/bin/rucio

@@ -88,7 +88,7 @@ def map_legacy_command() -> Optional[list[str]]:
 
 
 if __name__ == "__main__":
-    commands = ("-h", "--version", "account", "config", "did", "replica", "rse", "rule", "scope", "subscription", "ping", "whoami", "test-server", "lifetime-exception", "upload", "download")
+    commands = ("-h", "--help", "--version", "account", "config", "did", "replica", "rse", "rule", "scope", "subscription", "ping", "whoami", "test-server", "lifetime-exception", "upload", "download")
     first_command = [arg for arg in sys.argv if arg[0] != "-" or arg in ("-h", "--help", "--version")][1]
     is_legacy = '--legacy' in sys.argv
 

{rucio-36.0.0 → rucio-36.0.0.post2}/lib/rucio/client/commands/bin_legacy/rucio.py

@@ -2069,7 +2069,7 @@ def add_lifetime_exception(args, client, logger, console, spinner):
 
 def test_server(args, client, logger, console, spinner):
     """"
-    %(prog)s test-server [options] <field1=value1 field2=value2 ...>
+    %(prog)s test-rucio-server [options] <field1=value1 field2=value2 ...>
     Test the client against a server.
     """
     suite = unittest.TestLoader().loadTestsFromTestCase(TestRucioServer)
@@ -2138,7 +2138,7 @@ def get_parser():
 
     # Options for the x509  auth_strategy
     oparser.add_argument('--certificate', dest='certificate', default=None, help='Client certificate file for x509 Authentication.')
-    oparser.add_argument('--client_key', dest='client_key', default=None, help='Client key for x509 Authentication.')
+    oparser.add_argument('--client-key', dest='client_key', default=None, help='Client key for x509 Authentication.')
     oparser.add_argument('--ca-certificate', dest='ca_certificate', default=None, help='CA certificate to verify peer against (SSL).')
 
     # Ping command
@@ -2735,7 +2735,7 @@ can be found in ' + Color.BOLD + 'https://rucio.cern.ch/documentation/started/co
     list_datasets_rse_parser.add_argument('--long', dest='long', action='store_true', default=False, help='The long option')
 
     # The test-server command
-    test_server_parser = subparsers.add_parser('test-server', help='Test Server', description='Run a bunch of tests against the Rucio Servers.')
+    test_server_parser = subparsers.add_parser('test-rucio-server', help='Test Server', description='Run a bunch of tests against the Rucio Servers.')
     test_server_parser.set_defaults(function=test_server)
 
     # The get-metadata subparser

{rucio-36.0.0 → rucio-36.0.0.post2}/lib/rucio/client/commands/bin_legacy/rucio_admin.py

@@ -1405,6 +1405,7 @@ def get_parser():
 
     # Options for the x509  auth_strategy
     oparser.add_argument('--certificate', dest='certificate', default=None, help='Client certificate file')
+    oparser.add_argument('--client-key', dest='client_key', default=None, help='Client key for x509 Authentication.')
     oparser.add_argument('--ca-certificate', dest='ca_certificate', default=None, help='CA certificate to verify peer against (SSL)')
 
     # The import export subparser

{rucio-36.0.0 → rucio-36.0.0.post2}/lib/rucio/client/commands/command.py

@@ -57,10 +57,9 @@ class Commands:
     @staticmethod
     def _all_commands() -> dict[str, type[commands.CommandBase]]:
         # Look for all the CommandBase'd child classes in this folder and add their parsers and child parsers
-        command_map = {child.__name__.lower(): child for child in commands.CommandBase.__subclasses__() if child.__name__ != "LifetimeException"}
+        custom_commands = ['LifetimeException', "TestServer"]  # These ones have custom names
+        command_map = {child.__name__.lower(): child for child in commands.CommandBase.__subclasses__() if child.__name__ not in custom_commands}
         command_map["lifetime-exception"] = commands.LifetimeException
-        command_map["ping"] = Ping
-        command_map["whoami"] = Whoami
         command_map["test-server"] = TestServer
         return command_map
 
@@ -140,6 +139,7 @@ class Commands:
 
         # Options for the x509  auth_strategy
         auth_args.add_argument("--certificate", help="Client certificate file.")
+        auth_args.add_argument('--client-key', dest='client_key', default=None, help='Client key for x509 Authentication.')
         auth_args.add_argument("--ca-certificate", help="CA certificate to verify peer against (SSL).")
 
     def _run_command(self) -> Optional[int]:

{rucio-36.0.0 → rucio-36.0.0.post2}/lib/rucio/client/commands/utils.py

@@ -22,8 +22,6 @@ from configparser import NoOptionError, NoSectionError
 from functools import wraps
 from typing import TYPE_CHECKING
 
-from typing_extensions import NotRequired, TypedDict
-
 from rucio.client.client import Client
 from rucio.common.config import config_get
 from rucio.common.exception import (
@@ -46,11 +44,12 @@ from rucio.common.utils import setup_logger
 if TYPE_CHECKING:
     from collections.abc import Callable
 
+    from typing_extensions import NotRequired, TypedDict
 
-class OperationDict(TypedDict):
-    call: "Callable"
-    docs: NotRequired[str]
-    namespace: NotRequired["Callable"]
+    class OperationDict(TypedDict):
+        call: Callable
+        docs: NotRequired[str]
+        namespace: NotRequired[Callable]
 
 
 def exception_handler(function):

{rucio-36.0.0 → rucio-36.0.0.post2}/lib/rucio/common/test_rucio_server.py

@@ -36,7 +36,7 @@ def get_scope_and_rses():
 
     :return: A tuple (scope, rses) for the rucio client where scope is mock/test and rses is a list or (None, [None]) if no suitable rse exists.
     """
-    cmd = "rucio rse list --rse 'test_container_xrd=True'"
+    cmd = "rucio rse list --rses 'test_container_xrd=True'"
     print(cmd)
     exitcode, out, err = execute(cmd)
     print(out, err)
@@ -107,7 +107,7 @@ class TestRucioServer(unittest.TestCase):
         tmp_dsn = 'tests.rucio_client_test_server_' + uuid()
 
         # Adding files to a new dataset
-        cmd = 'rucio -v did upload --rse {0} --scope {1} --files {2} {3} {4} {1}:{5}'.format(self.rse, self.scope, tmp_file1, tmp_file2, tmp_file3, tmp_dsn)
+        cmd = 'rucio upload --rse {0} --scope {1} --files {2} {3} {4} {1}:{5}'.format(self.rse, self.scope, tmp_file1, tmp_file2, tmp_file3, tmp_dsn)
         print(self.marker + cmd)
         exitcode, out, err = execute(cmd)
         print(out)
@@ -126,7 +126,7 @@ class TestRucioServer(unittest.TestCase):
         self.assertEqual(exitcode, 0)
 
         # List the replicas
-        cmd = 'rucio replica list --did {0}:{1}'.format(self.scope, tmp_dsn)
+        cmd = 'rucio replica list file --did {0}:{1}'.format(self.scope, tmp_dsn)
         print(self.marker + cmd)
         exitcode, out, err = execute(cmd)
         print(out)
@@ -134,7 +134,7 @@ class TestRucioServer(unittest.TestCase):
         self.assertEqual(exitcode, 0)
 
         # Downloading dataset
-        cmd = 'rucio did download --dir /tmp/ --did {0}:{1}'.format(self.scope, tmp_dsn)
+        cmd = 'rucio download --dir /tmp/ --did {0}:{1}'.format(self.scope, tmp_dsn)
         print(self.marker + cmd)
         exitcode, out, err = execute(cmd)
         print(out)

rucio-36.0.0.post2/lib/rucio/vcsversion.py

@@ -0,0 +1,11 @@
+
+'''
+This file is automatically generated; Do not edit it. :)
+'''
+VERSION_INFO = {
+    'final': True,
+    'version': '36.0.0.post2',
+    'branch_nick': 'release-36',
+    'revision_id': 'b07377d21b4df2a3ffd4908a32c504b453de3fa8',
+    'revno': 13375
+}

{rucio-36.0.0 → rucio-36.0.0.post2}/setuputil.py

@@ -31,6 +31,7 @@ clients_requirements_table = {
         'jsonschema',
         'dataclasses',
         'rich',
+        'typing_extensions'
     ],
     'ssh': ['paramiko'],
     'kerberos': [

{rucio-36.0.0 → rucio-36.0.0.post2}/tests/test_impl_upload_download.py

@@ -22,22 +22,6 @@ from rucio.common.utils import generate_uuid as uuid
 from rucio.tests.common import skip_rse_tests_with_accounts
 
 
-@pytest.fixture(scope='class')
-def scope_and_rse(mock_scope, test_scope):
-    """
-    Check if xrd containers rses for xrootd are available in the testing environment.
-    :return: A tuple (scope, rses) for the rucio client where scope is mock/test and rses is a list.
-    """
-    cmd = "rucio rse list --rses 'test_container_xrd=True'"
-    print(cmd)
-    exitcode, out, err = execute(cmd)
-    print(out, err)
-    rses = out.split()
-    if len(rses) == 0:
-        return mock_scope, 'MOCK-POSIX'
-    return test_scope, rses[0]
-
-
 @pytest.fixture(scope='class')
 def scope(scope_and_rse):
     scope, rse = scope_and_rse

rucio-36.0.0.post2/tests/test_rucio_server.py

@@ -0,0 +1,124 @@
+# Copyright European Organization for Nuclear Research (CERN) since 2012
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from os import remove
+from os.path import basename
+
+import pytest
+
+from rucio.common.utils import execute
+from rucio.common.utils import generate_uuid as uuid
+
+MARKER = '$ > '
+
+
+def delete_rules(did):
+    # get the rules for the file
+    print('Deleting rules')
+    cmd = "rucio rule list {0} | grep {0} | cut -f1 -d\\ ".format(did)
+    print(cmd)
+    exitcode, out, err = execute(cmd)
+    print(out, err)
+    rules = out.split()
+    # delete the rules for the file
+    for rule in rules:
+        cmd = "rucio rule remove {0}".format(rule)
+        print(cmd)
+        exitcode, out, err = execute(cmd)
+
+
+@pytest.mark.noparallel(reason='uses pre-defined RSE')
+class TestRucioServer:
+
+    def test_ping(self):
+        """CLIENT (USER): rucio ping"""
+        cmd = 'rucio ping'
+        print(MARKER + cmd)
+        exitcode, out, err = execute(cmd)
+        print(out, err)
+        assert exitcode == 0
+
+    def test_whoami(self):
+        """CLIENT (USER): rucio whoami"""
+        cmd = 'rucio whoami'
+        print(MARKER + cmd)
+        exitcode, out, err = execute(cmd)
+        print(out, err)
+        assert exitcode == 0
+
+    def test_upload_download(self, file_factory, scope_and_rse):
+        """CLIENT(USER): rucio upload files to dataset/download dataset"""
+
+        scope, rse = scope_and_rse
+
+        if rse is None:
+            return
+
+        tmp_file1 = file_factory.file_generator()
+        tmp_file2 = file_factory.file_generator()
+        tmp_file3 = file_factory.file_generator()
+        tmp_dsn = 'tests.rucio_client_test_server_' + uuid()
+
+        # Adding files to a new dataset
+        cmd = 'rucio upload --rse {0} --scope {1} --files {2} {3} {4} {1}:{5}'.format(rse, scope, tmp_file1, tmp_file2, tmp_file3, tmp_dsn)
+        print(MARKER + cmd)
+        exitcode, out, err = execute(cmd)
+        print(out)
+        print(err)
+        remove(tmp_file1)
+        remove(tmp_file2)
+        remove(tmp_file3)
+        assert exitcode == 0
+
+        # List the files
+        cmd = 'rucio did content list --did {0}:{1}'.format(scope, tmp_dsn)
+        print(MARKER + cmd)
+        exitcode, out, err = execute(cmd)
+        print(out)
+        print(err)
+        assert exitcode == 0
+
+        # List the replicas
+        cmd = 'rucio replica list file --did {0}:{1}'.format(scope, tmp_dsn)
+        print(MARKER + cmd)
+        exitcode, out, err = execute(cmd)
+        print(out)
+        print(err)
+        assert exitcode == 0
+
+        # Downloading dataset
+        cmd = 'rucio download --dir /tmp/ --did {0}:{1}'.format(scope, tmp_dsn)
+        print(MARKER + cmd)
+        exitcode, out, err = execute(cmd)
+        print(out)
+        print(err)
+        # The files should be there
+        cmd = 'ls /tmp/{0}/*'.format(tmp_dsn)
+        print(MARKER + cmd)
+        exitcode, out, err = execute(cmd)
+        print(err, out)
+        assert exitcode == 0
+        assert tmp_file1.name in out
+        assert tmp_file2.name in out
+        assert tmp_file3.name in out
+
+        # cleaning
+        remove('/tmp/{0}/'.format(tmp_dsn) + basename(tmp_file1))
+        remove('/tmp/{0}/'.format(tmp_dsn) + basename(tmp_file2))
+        remove('/tmp/{0}/'.format(tmp_dsn) + basename(tmp_file3))
+        added_dids = ['{0}:{1}'.format(scope, did) for did in (basename(tmp_file1), basename(tmp_file2), basename(tmp_file3), tmp_dsn)]
+
+        # Delete rules
+        for did in added_dids:
+            delete_rules(did)

rucio-36.0.0/lib/rucio/vcsversion.py

@@ -1,11 +0,0 @@
-
-'''
-This file is automatically generated; Do not edit it. :)
-'''
-VERSION_INFO = {
-    'final': True,
-    'version': '36.0.0',
-    'branch_nick': 'master',
-    'revision_id': '90f198e846c1744695da583dd23fcdbc2a778a98',
-    'revno': 13350
-}

rucio-36.0.0/tests/test_rucio_server.py

@@ -1,23 +0,0 @@
-# Copyright European Organization for Nuclear Research (CERN) since 2012
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import pytest
-
-import rucio.common.test_rucio_server as server_test
-
-
-@pytest.mark.noparallel(reason='uses pre-defined RSE')
-class TestRucioServer(server_test.TestRucioServer):
-    # moved to rucio.common.test_rucio_server.TestRucioServer
-    pass