vantage6 4.1.3__py3-none-any.whl → 4.2.0rc2__py3-none-any.whl

tests_cli/test_node_cli.py

@@ -214,7 +214,7 @@ class NodeCLITest(unittest.TestCase):
             log_dir=Path("logs"),
             config_dir=Path("configs"),
             databases=[{
-                "label": "some-label",
+                "label": "some_label",
                 "uri": "data.csv",
                 "type": "csv"
             }]

tests_cli/test_server_cli.py

@@ -126,23 +126,14 @@ class ServerCLITest(unittest.TestCase):
         self.assertIsNone(result.exception)
         self.assertEqual(result.exit_code, 0)
 
-    @patch("vantage6.cli.server.stop.ServerContext")
     @patch("vantage6.cli.server.stop.docker.from_env")
-    @patch("vantage6.cli.server.stop.check_docker_running", return_value=True)
-    def test_stop(self, docker_check, containers, context):
+    def test_stop(self, containers):
         """Stop server without errors."""
 
         container1 = MagicMock()
         container1.name = f"{APPNAME}-iknl-system-server"
         containers.containers.list.return_value = [container1]
 
-        ctx = MagicMock(
-            config={
-                'rabbitmq_uri': None
-            }
-        )
-        context.return_value = ctx
-
         runner = CliRunner()
         result = runner.invoke(cli_server_stop, ["--name", "iknl"])
 
@@ -151,9 +142,7 @@ class ServerCLITest(unittest.TestCase):
 
     @patch("vantage6.cli.server.attach.time.sleep")
     @patch("docker.DockerClient.containers")
-    @patch("vantage6.cli.server.attach.check_docker_running",
-           return_value=True)
-    def test_attach(self, docker_check, containers, sleep):
+    def test_attach(self, containers, sleep):
         """Attach log to the console without errors."""
         container1 = MagicMock()
         container1.name = f"{APPNAME}-iknl-system-server"

vantage6/cli/__build__

@@ -1 +1 @@
-0
+2

vantage6/cli/_version.py

@@ -7,7 +7,7 @@ with open(os.path.join(here, '__build__')) as fp:
     __build__ = json.load(fp)
 
 # Module version
-version_info = (4, 1, 3, 'final', __build__, 0)
+version_info = (4, 2, 0, 'candidate', __build__, 0)
 
 # Module version stage suffix map
 _specifier_ = {'alpha': 'a', 'beta': 'b', 'candidate': 'rc', 'final': ''}

vantage6/cli/cli.py

@@ -5,6 +5,7 @@ from vantage6.cli.server.files import cli_server_files
 from vantage6.cli.server.import_ import cli_server_import
 from vantage6.cli.server.list import cli_server_configuration_list
 from vantage6.cli.server.new import cli_server_new
+from vantage6.cli.server.remove import cli_server_remove
 from vantage6.cli.server.shell import cli_server_shell
 from vantage6.cli.server.start import cli_server_start
 from vantage6.cli.server.stop import cli_server_stop
@@ -26,6 +27,8 @@ from vantage6.cli.dev.start import start_demo_network
 from vantage6.cli.dev.stop import stop_demo_network
 from vantage6.cli.algorithm.create import cli_algorithm_create
 from vantage6.cli.algorithm.update import cli_algorithm_update
+from vantage6.cli.test.feature_tester import cli_test_features
+from vantage6.cli.test.integration_test import cli_test_integration
 
 
 # Define the server group
@@ -42,6 +45,7 @@ cli_server.add_command(cli_server_files, name='files')
 cli_server.add_command(cli_server_import, name='import')
 cli_server.add_command(cli_server_configuration_list, name='list')
 cli_server.add_command(cli_server_new, name='new')
+cli_server.add_command(cli_server_remove, name='remove')
 cli_server.add_command(cli_server_shell, name='shell')
 cli_server.add_command(cli_server_start, name='start')
 cli_server.add_command(cli_server_stop, name='stop')
@@ -100,6 +104,19 @@ cli_algorithm.add_command(cli_algorithm_create, name="create")
 cli_algorithm.add_command(cli_algorithm_update, name="update")
 
 
+# Define the test group
+@click.group(name="test")
+def cli_test() -> None:
+    """
+    Execute tests on your vantage6 infrastructure.
+    """
+
+
+# Define the commands for the test group
+cli_test.add_command(cli_test_features, name="feature-test")
+cli_test.add_command(cli_test_integration, name="integration-test")
+
+
 # Define the overall group
 @click.group(name='cli')
 def cli_complete() -> None:
@@ -116,3 +133,4 @@ cli_complete.add_command(cli_node)
 cli_complete.add_command(cli_server)
 cli_complete.add_command(cli_dev)
 cli_complete.add_command(cli_algorithm)
+cli_complete.add_command(cli_test)

vantage6/cli/dev/create.py

@@ -69,7 +69,8 @@ def create_node_config_file(server_url: str, port: int, config: dict,
     port : int
         Port of the dummy server.
     config : dict
-        Configuration dictionary containing org_id, api_key and node name.
+        Configuration dictionary containing org_id, api_key, node name and
+        additional user_defined_config.
     server_name : str
         Configuration name of the dummy server.
     """
@@ -103,7 +104,8 @@ def create_node_config_file(server_url: str, port: int, config: dict,
         },
         "port": port,
         "server_url": server_url,
-        "task_dir": str(path_to_data_dir)
+        "task_dir": str(path_to_data_dir),
+        "user_provided_config": config['user_defined_config']
     })
 
     try:
@@ -117,9 +119,31 @@ def create_node_config_file(server_url: str, port: int, config: dict,
          f"{Style.RESET_ALL}")
 
 
-def generate_node_configs(num_nodes: int, server_url: str, port: int,
-                          server_name: str) \
-        -> list[dict]:
+def _read_extra_config_file(extra_config_file: Path | None) -> str:
+    """Reads extra configuration file.
+
+    Parameters
+    ----------
+    extra_config_file : Path | None
+        Path to file with additional configuration.
+
+    Returns
+    -------
+    str
+        Extra configuration file content
+    """
+    if extra_config_file:
+        # read the YAML file as string, so it can be appended to the
+        # configuration easily
+        with open(extra_config_file, 'r', encoding='utf-8') as f:
+            return f.read()
+    return ''
+
+
+def generate_node_configs(
+    num_nodes: int, server_url: str, port: int, server_name: str,
+    extra_node_config: Path | None
+) -> list[dict]:
     """Generates ``num_nodes`` node configuration files.
 
     Parameters
@@ -132,6 +156,8 @@ def generate_node_configs(num_nodes: int, server_url: str, port: int,
         Port of the dummy server.
     server_name : str
         Configuration name of the dummy server.
+    extra_node_config : Path | None
+        Path to file with additional node configuration.
 
     Returns
     -------
@@ -139,11 +165,13 @@ def generate_node_configs(num_nodes: int, server_url: str, port: int,
         List of dictionaries containing node configurations.
     """
     configs = []
+    extra_config = _read_extra_config_file(extra_node_config)
     for i in range(num_nodes):
         config = {
             'org_id': i + 1,
             'api_key': generate_apikey(),
-            'node_name': f"{server_name}_node_{i + 1}"
+            'node_name': f"{server_name}_node_{i + 1}",
+            "user_defined_config": extra_config
         }
         create_node_config_file(server_url, port, config, server_name)
         configs.append(config)
@@ -211,7 +239,9 @@ def create_vserver_import_config(node_configs: list[dict], server_name: str) \
     return full_path
 
 
-def create_vserver_config(server_name: str, port: int) -> Path:
+def create_vserver_config(
+    server_name: str, port: int, extra_config_file: Path
+) -> Path:
     """Creates server configuration file (YAML).
 
     Parameters
@@ -220,6 +250,8 @@ def create_vserver_config(server_name: str, port: int) -> Path:
         Server name.
     port : int
         Server port.
+    extra_config_file : Path
+        Path to file with additional server configuration.
 
     Returns
     -------
@@ -229,10 +261,14 @@ def create_vserver_config(server_name: str, port: int) -> Path:
     environment = Environment(
         loader=FileSystemLoader(PACKAGE_FOLDER / APPNAME / "cli" / "template"),
         trim_blocks=True, lstrip_blocks=True, autoescape=True)
+
+    extra_config = _read_extra_config_file(extra_config_file)
+
     template = environment.get_template("server_config.j2")
     server_config = template.render(
         port=port,
-        jwt_secret_key=generate_apikey()
+        jwt_secret_key=generate_apikey(),
+        user_provided_config=extra_config
     )
     folders = ServerContext.instance_folders(
         instance_type='server', instance_name=server_name,
@@ -257,8 +293,10 @@ def create_vserver_config(server_name: str, port: int) -> Path:
     return full_path
 
 
-def demo_network(num_nodes: int, server_url: str, server_port: int,
-                 server_name: str) -> tuple[list[dict], Path, Path]:
+def demo_network(
+    num_nodes: int, server_url: str, server_port: int, server_name: str,
+    extra_server_config: Path, extra_node_config: Path
+) -> tuple[list[dict], Path, Path]:
     """Generates the demo network.
 
     Parameters
@@ -271,6 +309,10 @@ def demo_network(num_nodes: int, server_url: str, server_port: int,
         Port of the dummy server.
     server_name : str
         Server name.
+    extra_server_config : Path
+        Path to file with additional server configuration.
+    extra_node_config : Path
+        Path to file with additional node configuration.
 
     Returns
     -------
@@ -278,10 +320,11 @@ def demo_network(num_nodes: int, server_url: str, server_port: int,
         Tuple containing node, server import and server configurations.
     """
     node_configs = generate_node_configs(num_nodes, server_url, server_port,
-                                         server_name)
+                                         server_name, extra_node_config)
     server_import_config = create_vserver_import_config(node_configs,
                                                         server_name)
-    server_config = create_vserver_config(server_name, server_port)
+    server_config = create_vserver_config(server_name, server_port,
+                                          extra_server_config)
     return (node_configs, server_import_config, server_config)
 
 
@@ -298,10 +341,18 @@ def demo_network(num_nodes: int, server_url: str, server_port: int,
 @click.option('-i', '--image', type=str, default=None,
               help='Server docker image to use when setting up resources for '
               'the development server')
+@click.option('--extra-server-config', type=click.Path(exists=True),
+              default=None, help='YAML File with additional server '
+              'configuration. This will be appended to the server '
+              'configuration file')
+@click.option('--extra-node-config', type=click.Path('rb'), default=None,
+              help='YAML File with additional node configuration. This will be'
+              ' appended to each of the node configuration files')
 @click.pass_context
 def create_demo_network(
     click_ctx: click.Context, name: str, num_nodes: int, server_url: str,
-    server_port: int, image: str = None
+    server_port: int, image: str = None, extra_server_config: Path = None,
+    extra_node_config: Path = None
 ) -> dict:
     """Creates a demo network.
 
@@ -312,7 +363,10 @@ def create_demo_network(
     """
     server_name = prompt_config_name(name)
     if not ServerContext.config_exists(server_name):
-        demo = demo_network(num_nodes, server_url, server_port, server_name)
+        demo = demo_network(
+            num_nodes, server_url, server_port, server_name,
+            extra_server_config, extra_node_config
+        )
         info(f"Created {Fore.GREEN}{len(demo[0])}{Style.RESET_ALL} node "
              f"configuration(s), attaching them to {Fore.GREEN}{server_name}"
              f"{Style.RESET_ALL}.")

vantage6/cli/dev/remove.py

@@ -8,15 +8,16 @@ import click
 from vantage6.common import info
 from vantage6.cli.context import ServerContext, NodeContext
 from vantage6.cli.server.common import click_insert_context
-from vantage6.cli.server.stop import vserver_remove
+from vantage6.cli.server.remove import cli_server_remove
 from vantage6.cli.utils import remove_file
 
 
 @click.command()
 @click_insert_context
-@click.option('-f', "--force", type=bool, flag_value=True,
-              help='Don\'t ask for confirmation')
-def remove_demo_network(ctx: ServerContext, force: bool) -> None:
+@click.pass_context
+def remove_demo_network(
+    click_ctx: click.Context, ctx: ServerContext
+) -> None:
     """ Remove all related demo network files and folders.
 
     Select a server configuration to remove that server and the nodes attached
@@ -26,7 +27,7 @@ def remove_demo_network(ctx: ServerContext, force: bool) -> None:
     # remove the server
     for handler in itertools.chain(ctx.log.handlers, ctx.log.root.handlers):
         handler.close()
-    vserver_remove(ctx, ctx.name, True, force)
+    click_ctx.invoke(cli_server_remove, ctx=ctx, force=True)
 
     # removing the server import config
     info("Deleting demo import config file")
@@ -41,8 +42,6 @@ def remove_demo_network(ctx: ServerContext, force: bool) -> None:
     server_folder = server_configs['data']
     if server_folder.is_dir():
         rmtree(server_folder)
-    # TODO BvB 2023-07-31 can it happen that the server folder is not a
-    # directory? What then?
 
     # remove the nodes
     configs, _ = NodeContext.available_configurations(system_folders=False)

vantage6/cli/globals.py

@@ -36,3 +36,6 @@ DEFAULT_UI_PORT = 5001
 
 # Location of repository to create new algorithm templates from
 ALGORITHM_TEMPLATE_REPO = "gh:vantage6/v6-algorithm-template.git"
+
+# image to use for diagnostics in `v6 test` commands
+DIAGNOSTICS_IMAGE = "harbor2.vantage6.ai/algorithms/diagnostic"

vantage6/cli/node/start.py

@@ -10,10 +10,7 @@ import docker
 
 from colorama import Fore, Style
 
-from vantage6.common import (
-    warning, error, info, debug,
-    get_database_config
-)
+from vantage6.common import warning, error, info, debug, get_database_config
 from vantage6.common.globals import (
     APPNAME,
     DEFAULT_DOCKER_REGISTRY,
@@ -21,15 +18,13 @@ from vantage6.common.globals import (
     DEFAULT_NODE_IMAGE_WO_TAG,
 )
 from vantage6.common.docker.addons import (
-  pull_if_newer,
-  remove_container_if_exists,
-  check_docker_running
+    pull_if_newer,
+    remove_container_if_exists,
+    check_docker_running,
 )
 
 from vantage6.cli.context import NodeContext
-from vantage6.cli.globals import (
-    DEFAULT_NODE_SYSTEM_FOLDERS as N_FOL
-)
+from vantage6.cli.globals import DEFAULT_NODE_SYSTEM_FOLDERS as N_FOL
 from vantage6.cli.configuration_wizard import (
     configuration_wizard,
     select_configuration_questionaire,
@@ -41,28 +36,54 @@ from vantage6.cli.node.common import print_log_worker, create_client
 
 @click.command()
 @click.option("-n", "--name", default=None, help="Configuration name")
-@click.option("-c", "--config", default=None,
-              help='Absolute path to configuration-file; overrides NAME')
-@click.option('--system', 'system_folders', flag_value=True,
-              help="Search for the configuration in the system folders")
-@click.option('--user', 'system_folders', flag_value=False, default=N_FOL,
-              help="Search for the configuration in the user folders. This is "
-                   "the default")
-@click.option('-i', '--image', default=None, help="Node Docker image to use")
-@click.option('--keep/--auto-remove', default=False,
-              help="Keep node container after finishing. Useful for debugging")
-@click.option('--force-db-mount', is_flag=True,
-              help="Always mount node databases; skip the check if they are "
-                   "existing files.")
-@click.option('--attach/--detach', default=False,
-              help="Show node logs on the current console after starting the "
-                   "node")
-@click.option('--mount-src', default='',
-              help="Override vantage6 source code in container with the source"
-                   " code in this path")
-def cli_node_start(name: str, config: str, system_folders: bool, image: str,
-                   keep: bool, mount_src: str, attach: bool,
-                   force_db_mount: bool) -> None:
+@click.option(
+    "-c", "--config", default=None, help="Path to configuration-file; overrides NAME"
+)
+@click.option(
+    "--system",
+    "system_folders",
+    flag_value=True,
+    help="Search for the configuration in the system folders",
+)
+@click.option(
+    "--user",
+    "system_folders",
+    flag_value=False,
+    default=N_FOL,
+    help="Search for the configuration in the user folders. This is " "the default",
+)
+@click.option("-i", "--image", default=None, help="Node Docker image to use")
+@click.option(
+    "--keep/--auto-remove",
+    default=False,
+    help="Keep node container after finishing. Useful for debugging",
+)
+@click.option(
+    "--force-db-mount",
+    is_flag=True,
+    help="Always mount node databases; skip the check if they are " "existing files.",
+)
+@click.option(
+    "--attach/--detach",
+    default=False,
+    help="Show node logs on the current console after starting the " "node",
+)
+@click.option(
+    "--mount-src",
+    default="",
+    help="Override vantage6 source code in container with the source"
+    " code in this path",
+)
+def cli_node_start(
+    name: str,
+    config: str,
+    system_folders: bool,
+    image: str,
+    keep: bool,
+    mount_src: str,
+    attach: bool,
+    force_db_mount: bool,
+) -> None:
     """
     Start the node.
     """
@@ -82,8 +103,7 @@ def cli_node_start(name: str, config: str, system_folders: bool, image: str,
 
         # check that config exists, if not a questionaire will be invoked
         if not NodeContext.config_exists(name, system_folders):
-            warning(f"Configuration {Fore.RED}{name}{Style.RESET_ALL} does not"
-                    " exist.")
+            warning(f"Configuration {Fore.RED}{name}{Style.RESET_ALL} does not exist.")
 
             if q.confirm("Create this configuration now?").ask():
                 configuration_wizard("node", name, system_folders)
@@ -117,7 +137,7 @@ def cli_node_start(name: str, config: str, system_folders: bool, image: str,
     # Then we check if the image has been specified in the config file, and
     # finally we use the default settings from the package.
     if not image:
-        custom_images: dict = ctx.config.get('images')
+        custom_images: dict = ctx.config.get("images")
         if custom_images:
             image = custom_images.get("node")
         else:
@@ -127,16 +147,19 @@ def cli_node_start(name: str, config: str, system_folders: bool, image: str,
             major_minor = None
             try:
                 # try to get server version, skip if can't get a connection
-                version = client.util.get_server_version(
-                    attempts_on_timeout=3
-                )['version']
-                major_minor = '.'.join(version.split('.')[:2])
-                image = (f"{DEFAULT_DOCKER_REGISTRY}/"
-                         f"{DEFAULT_NODE_IMAGE_WO_TAG}"
-                         f":{major_minor}")
+                version = client.util.get_server_version(attempts_on_timeout=3)[
+                    "version"
+                ]
+                major_minor = ".".join(version.split(".")[:2])
+                image = (
+                    f"{DEFAULT_DOCKER_REGISTRY}/"
+                    f"{DEFAULT_NODE_IMAGE_WO_TAG}"
+                    f":{major_minor}"
+                )
             except Exception:
-                warning("Could not determine server version. Using default "
-                        "node image")
+                warning(
+                    "Could not determine server version. Using default " "node image"
+                )
 
             if major_minor and not __version__.startswith(major_minor):
                 warning(
@@ -158,7 +181,7 @@ def cli_node_start(name: str, config: str, system_folders: bool, image: str,
         pull_if_newer(docker.from_env(), image)
 
     except Exception as e:
-        warning(' ... Getting latest node image failed:')
+        warning(" ... Getting latest node image failed:")
         warning(f"     {e}")
     else:
         info(" ... success!")
@@ -186,7 +209,7 @@ def cli_node_start(name: str, config: str, system_folders: bool, image: str,
     if mount_src:
         # If mount_src is a relative path, docker will consider it a volume.
         mount_src = os.path.abspath(mount_src)
-        mounts.append(('/vantage6', mount_src))
+        mounts.append(("/vantage6", mount_src))
 
     # FIXME: Code duplication: Node.__init__() (vantage6/node/__init__.py)
     #   uses a lot of the same logic. Suggest moving this to
@@ -194,10 +217,10 @@ def cli_node_start(name: str, config: str, system_folders: bool, image: str,
     filename = ctx.config.get("encryption", {}).get("private_key")
     # filename may be set to an empty string
     if not filename:
-        filename = 'private_key.pem'
+        filename = "private_key.pem"
 
     # Location may be overridden by the environment
-    filename = os.environ.get('PRIVATE_KEY', filename)
+    filename = os.environ.get("PRIVATE_KEY", filename)
 
     # If ctx.get_data_file() receives an absolute path, it is returned as-is
     fullpath = Path(ctx.get_data_file(filename))
@@ -205,8 +228,7 @@ def cli_node_start(name: str, config: str, system_folders: bool, image: str,
         if Path(fullpath).exists():
             mounts.append(("/mnt/private_key.pem", str(fullpath)))
         else:
-            warning(f"private key file provided {fullpath}, "
-                    "but does not exists")
+            warning(f"private key file provided {fullpath}, " "but does not exists")
 
     # Mount private keys for ssh tunnels
     ssh_tunnels = ctx.config.get("ssh-tunnels", [])
@@ -214,13 +236,17 @@ def cli_node_start(name: str, config: str, system_folders: bool, image: str,
         hostname = ssh_tunnel.get("hostname")
         key_path = ssh_tunnel.get("ssh", {}).get("identity", {}).get("key")
         if not key_path:
-            error(f"SSH tunnel identity {Fore.RED}{hostname}{Style.RESET_ALL} "
-                  "key not provided. Continuing to start without this tunnel.")
+            error(
+                f"SSH tunnel identity {Fore.RED}{hostname}{Style.RESET_ALL} "
+                "key not provided. Continuing to start without this tunnel."
+            )
         key_path = Path(key_path)
         if not key_path.exists():
-            error(f"SSH tunnel identity {Fore.RED}{hostname}{Style.RESET_ALL} "
-                  "key does not exist. Continuing to start without this "
-                  "tunnel.")
+            error(
+                f"SSH tunnel identity {Fore.RED}{hostname}{Style.RESET_ALL} "
+                "key does not exist. Continuing to start without this "
+                "tunnel."
+            )
 
         info(f"  Mounting private key for {hostname} at {key_path}")
 
@@ -233,20 +259,29 @@ def cli_node_start(name: str, config: str, system_folders: bool, image: str,
     env = {
         "DATA_VOLUME_NAME": data_volume.name,
         "VPN_VOLUME_NAME": vpn_volume.name,
-        "PRIVATE_KEY": "/mnt/private_key.pem"
+        "PRIVATE_KEY": "/mnt/private_key.pem",
     }
 
     # only mount the DB if it is a file
     info("Setting up databases")
-    db_labels = [db['label'] for db in ctx.databases]
+    db_labels = [db["label"] for db in ctx.databases]
     for label in db_labels:
 
+        # check that label contains only valid characters
+        if not label.isidentifier():
+            error(f"Database label {Fore.RED}{label}{Style.RESET_ALL} contains"
+                  " invalid characters. Only letters, numbers, and underscores"
+                  " are allowed, and it cannot start with a number.")
+            exit(1)
+
         db_config = get_database_config(ctx.databases, label)
-        uri = db_config['uri']
-        db_type = db_config['type']
+        uri = db_config["uri"]
+        db_type = db_config["type"]
 
-        info(f"  Processing {Fore.GREEN}{db_type}{Style.RESET_ALL} database "
-             f"{Fore.GREEN}{label}:{uri}{Style.RESET_ALL}")
+        info(
+            f"  Processing {Fore.GREEN}{db_type}{Style.RESET_ALL} database "
+            f"{Fore.GREEN}{label}:{uri}{Style.RESET_ALL}"
+        )
         label_capitals = label.upper()
 
         try:
@@ -259,22 +294,24 @@ def cli_node_start(name: str, config: str, system_folders: bool, image: str,
             file_based = False
 
         if not file_based and not force_db_mount:
-            debug('  - non file-based database added')
-            env[f'{label_capitals}_DATABASE_URI'] = uri
+            debug("  - non file-based database added")
+            env[f"{label_capitals}_DATABASE_URI"] = uri
         else:
-            debug('  - file-based database added')
+            debug("  - file-based database added")
             suffix = Path(uri).suffix
-            env[f'{label_capitals}_DATABASE_URI'] = f'{label}{suffix}'
-            mounts.append((f'/mnt/{label}{suffix}', str(uri)))
+            env[f"{label_capitals}_DATABASE_URI"] = f"{label}{suffix}"
+            mounts.append((f"/mnt/{label}{suffix}", str(uri)))
 
     system_folders_option = "--system" if system_folders else "--user"
-    cmd = f'vnode-local start -c /mnt/config/{name}.yaml -n {name} '\
-          f' --dockerized {system_folders_option}'
+    cmd = (
+        f"vnode-local start -c /mnt/config/{name}.yaml -n {name} "
+        f" --dockerized {system_folders_option}"
+    )
 
     info("Running Docker container")
     volumes = []
     for mount in mounts:
-        volumes.append(f'{mount[1]}:{mount[0]}')
+        volumes.append(f"{mount[1]}:{mount[0]}")
 
     remove_container_if_exists(
         docker_client=docker_client, name=ctx.docker_container_name
@@ -288,15 +325,15 @@ def cli_node_start(name: str, config: str, system_folders: bool, image: str,
         labels={
             f"{APPNAME}-type": "node",
             "system": str(system_folders),
-            "name": ctx.config_file_name
+            "name": ctx.config_file_name,
         },
         environment=env,
         name=ctx.docker_container_name,
         auto_remove=not keep,
-        tty=True
+        tty=True,
     )
 
-    info(f"Success! container id = {container}")
+    info("Node container was successfully started!")
 
     if attach:
         logs = container.attach(stream=True, logs=True)
@@ -306,6 +343,11 @@ def cli_node_start(name: str, config: str, system_folders: bool, image: str,
                 time.sleep(1)
             except KeyboardInterrupt:
                 info("Closing log file. Keyboard Interrupt.")
-                info("Note that your node is still running! Shut it down with "
-                     f"'{Fore.RED}v6 node stop{Style.RESET_ALL}'")
+                info(
+                    "Note that your node is still running! Shut it down with "
+                    f"'{Fore.RED}v6 node stop{Style.RESET_ALL}'"
+                )
                 exit(0)
+    else:
+        info(f"To see the logs, run: {Fore.GREEN}v6 node attach --name "
+             f"{ctx.name}{Style.RESET_ALL}")

vantage6/cli/server/remove.py

@@ -0,0 +1,41 @@
+import itertools
+import click
+import questionary as q
+
+from vantage6.common import info
+from vantage6.common.docker.addons import check_docker_running
+from vantage6.cli.server.common import click_insert_context
+from vantage6.cli.context import ServerContext
+from vantage6.cli.utils import remove_file
+
+
+@click.command()
+@click_insert_context
+@click.option('-f', '--force', 'force', flag_value=True)
+def cli_server_remove(ctx: ServerContext, force: bool) -> None:
+    """
+    Function to remove a server.
+
+    Parameters
+    ----------
+    ctx : ServerContext
+        Server context object
+    force : bool
+        Whether to ask for confirmation before removing or not
+    """
+    check_docker_running()
+
+    if not force:
+        if not q.confirm(
+            "This server will be deleted permanently including its "
+            "configuration. Are you sure?", default=False
+        ).ask():
+            info("Server will not be deleted")
+            exit(0)
+
+    # now remove the folders...
+    remove_file(ctx.config_file, 'configuration')
+
+    for handler in itertools.chain(ctx.log.handlers, ctx.log.root.handlers):
+        handler.close()
+    remove_file(ctx.log_file, 'log')

vantage6/cli/server/stop.py

@@ -1,5 +1,3 @@
-import itertools
-
 import click
 import questionary as q
 import docker
@@ -16,8 +14,6 @@ from vantage6.common.globals import APPNAME
 from vantage6.cli.rabbitmq import split_rabbitmq_uri
 
 from vantage6.cli.globals import DEFAULT_SERVER_SYSTEM_FOLDERS
-from vantage6.cli.context import ServerContext
-from vantage6.cli.utils import remove_file
 from vantage6.cli.server.common import get_server_context, stop_ui
 
 
@@ -109,50 +105,3 @@ def _stop_server_containers(client: DockerClient, container_name: str,
             remove_container(rabbit_container, kill=True)
             info(f"Stopped the {Fore.GREEN}{rabbit_container_name}"
                  f"{Style.RESET_ALL} container.")
-
-
-# TODO this should be refactored into its own module and get a click command
-# attached
-@click.pass_context
-def vserver_remove(
-    click_ctx: click.Context, ctx: ServerContext, name: str,
-    system_folders: bool, force: bool
-) -> None:
-    """
-    Function to remove a server.
-
-    Parameters
-    ----------
-    ctx : ServerContext
-        Server context object
-    name : str
-        Name of the server to remove
-    system_folders : bool
-        Whether to use system folders or not
-    force : bool
-        Whether to ask for confirmation before removing or not
-    """
-    check_docker_running()
-
-    # first stop server
-    click_ctx.invoke(
-        cli_server_stop, name=name, system_folders=system_folders,
-        all_servers=False
-    )
-
-    if not force:
-        if not q.confirm(
-            "This server will be deleted permanently including its "
-            "configuration. Are you sure?", default=False
-        ).ask():
-            info("Server will not be deleted")
-            exit(0)
-
-    # now remove the folders...
-    info(f"Removing configuration file {ctx.config_file}")
-    remove_file(ctx.config_file, 'configuration')
-
-    info(f"Removing log file {ctx.log_file}")
-    for handler in itertools.chain(ctx.log.handlers, ctx.log.root.handlers):
-        handler.close()
-    remove_file(ctx.log_file, 'log')

vantage6/cli/template/node_config.j2

@@ -20,3 +20,4 @@ logging:
 port: {{ port }}
 server_url: {{ server_url }}
 task_dir: {{ task_dir}}
+{{ user_provided_config }}

vantage6/cli/template/server_config.j2

@@ -12,4 +12,5 @@ logging:
   use_console: true
 port: {{ port }}
 uri: sqlite:///default.sqlite
-jwt_secret_key: {{ jwt_secret_key }}
+jwt_secret_key: {{ jwt_secret_key }}
+{{ user_provided_config }}

vantage6/cli/test/common/diagnostic_runner.py

@@ -0,0 +1,200 @@
+import json
+
+from typing import Any
+from rich.console import Console
+from rich.table import Table
+
+from vantage6.client import UserClient
+from vantage6.common import info, debug
+from vantage6.cli.globals import DIAGNOSTICS_IMAGE
+
+
+class DiagnosticRunner:
+    """
+    Class to run the diagnostic algorithm on a vantage6 network.
+
+    This class will create a task in the requested collaboration that will test
+    the functionality of vantage6, and will report back the results.
+
+    Parameters
+    ----------
+    client : UserClient
+        The client to use for communication with the server.
+    collaboration_id : int
+        The ID of the collaboration to run the diagnostics in.
+    organizations : list[int] | None
+        The ID(s) of the organization(s) to run the diagnostics for. If None
+        (default), run the diagnostics for all organizations in the
+        collaboration.
+    online_only : bool
+        Whether to run the diagnostics only on nodes that are online. By
+        default False
+    """
+    def __init__(
+        self, client: UserClient, collaboration_id: int,
+        organizations: list[int] | None = None, online_only: bool = False
+    ) -> None:
+        self.client = client
+        self.collaboration_id = collaboration_id
+
+        if not organizations:
+            # run on all organizations in the collaboration
+            # TODO use pagination properly, instead of just getting the first
+            # 1000 organizations (which very likely is enough though)
+            orgs = self.client.organization.list(
+                collaboration=self.collaboration_id, per_page=1000
+            )
+            self.organization_ids = [org['id'] for org in orgs['data']]
+        else:
+            self.organization_ids = organizations
+
+        if online_only:
+            nodes = self.client.node.list(
+                collaboration=self.collaboration_id,
+                is_online=True
+            )
+            debug(nodes)
+            online_orgs = [
+                node['organization']['id'] for node in nodes['data']
+            ]
+            self.organization_ids = \
+                list(set(self.organization_ids).intersection(online_orgs))
+
+        info(f"Running diagnostics to {len(self.organization_ids)} "
+             "organization(s)")
+        info(f"  organizations: {self.organization_ids}")
+        info(f"  collaboration: {self.collaboration_id}")
+
+    def __call__(self, base: bool = True, vpn: bool = True) -> Any:
+        """
+        Run the diagnostics.
+
+        Parameters
+        ----------
+        base: bool
+            Whether to run the base features of the diagnostic algorithm. By
+            default True.
+        vpn: bool
+            Whether to run the VPN features of the diagnostic algorithm. By
+            default True.
+        """
+        base_results = self.base_features() if base else []
+        vpn_results = self.vpn_features() if vpn else []
+        return base_results + vpn_results
+
+    def base_features(self) -> list[dict]:
+        """
+        Create a task to run the base features of the diagnostic algorithm.
+
+        Returns
+        -------
+        list[dict]
+            The results of the diagnostic algorithm.
+        """
+        task = self.client.task.create(
+            collaboration=self.collaboration_id,
+            name="test",
+            description="Basic Diagnostic test",
+            image=DIAGNOSTICS_IMAGE,
+            input_={
+                "method": "base_features",
+            },
+            organizations=self.organization_ids,
+            databases=[
+                {'label': 'default'}
+            ]
+        )
+        debug(task)
+
+        return self._wait_and_display(task.get("id"))
+
+    def vpn_features(self) -> list[dict]:
+        """
+        Create a task to run the VPN features of the diagnostic algorithm.
+
+        Returns
+        -------
+        list[dict]
+            The results of the diagnostic algorithm.
+        """
+        self.client.node.list(collaboration=self.collaboration_id)
+
+        task = self.client.task.create(
+            collaboration=self.collaboration_id,
+            name="test",
+            description="VPN Diagnostic test",
+            image=DIAGNOSTICS_IMAGE,
+            input_={
+                "method": "vpn_features",
+                "kwargs": {"other_nodes": self.organization_ids}
+            },
+            organizations=self.organization_ids,
+        )
+
+        return self._wait_and_display(task.get("id"))
+
+    def _wait_and_display(self, task_id: int) -> list[dict]:
+        """
+        Wait for the task to finish and then display the results.
+
+        Parameters
+        ----------
+        task_id : int
+            The ID of the task to wait for.
+
+        Returns
+        -------
+        list[dict]
+            The results of the diagnostic algorithm.
+        """
+        # TODO should we have the option to combine these in one request? Seems
+        # like it would be more efficient
+        # TODO ensure that we get all pages of results
+        results = self.client.wait_for_results(task_id=task_id)['data']
+        runs = self.client.run.from_task(task_id=task_id)['data']
+        print("\n")
+        for res in results:
+            matched_run = [
+                run for run in runs if run['id'] == res['run']['id']
+            ][0]
+            self.display_diagnostic_results(
+                res, matched_run['organization']['id']
+            )
+            print()
+        return results
+
+    def display_diagnostic_results(self, result: dict, org_id: int) -> None:
+        """
+        Print the results of the diagnostic algorithm.
+
+        Parameters
+        ----------
+        result : list[dict]
+            The result of the diagnostic algorithm.
+        org_id : int
+            The ID of the organization that the diagnostic algorithm was run on
+        """
+        res = json.loads(result["result"])
+        t_ = Table(title=f"Basic Diagnostics Summary (organization {org_id})")
+        t_.add_column('name')
+        t_.add_column('success')
+        e_ = Table(title=f"Basic Diagnostics Errors (organization {org_id})")
+        e_.add_column('name')
+        e_.add_column('exception')
+        e_.add_column('traceback')
+        e_.add_column('payload')
+        errors = False
+        for diag in res:
+            if diag['success']:
+                success = ":heavy_check_mark: [green]success[/green]"
+            else:
+                success = ":x: [red]failed[/red]"
+                e_.add_row(diag["name"], diag["exception"], diag["traceback"],
+                           diag["payload"])
+                errors = True
+            t_.add_row(diag["name"], success)
+
+        console = Console()
+        console.print(t_)
+        if errors:
+            console.print(e_)

vantage6/cli/test/feature_tester.py

@@ -0,0 +1,54 @@
+import sys
+import click
+
+from vantage6.client import UserClient
+from vantage6.cli.utils import error
+from vantage6.cli.test.common.diagnostic_runner import DiagnosticRunner
+
+
+@click.command()
+@click.option("--host", type=str, default="http://localhost",
+              help="URL of the server")
+@click.option("--port", type=int, default=5000, help="Port of the server")
+@click.option("--api-path", type=str, default="/api",
+              help="API path of the server")
+@click.option("--username", type=str, default="root",
+              help="Username of vantage6 user account to create the task with")
+@click.option("--password", type=str, default="root",
+              help="Password of vantage6 user account to create the task with")
+@click.option("--collaboration", type=int, default=1,
+              help="ID of the collaboration to create the task in")
+@click.option("-o", "--organizations", type=int, default=[], multiple=True,
+              help="ID(s) of the organization(s) to create the task for")
+@click.option("--all-nodes", is_flag=True,
+              help="Run the diagnostic test on all nodes in the collaboration")
+@click.option("--online-only", is_flag=True,
+              help="Run the diagnostic test on only nodes that are online")
+@click.option("--no-vpn", is_flag=True,
+              help="Don't execute VPN tests")
+def cli_test_features(
+    host: str, port: int, api_path: str, username: str, password: str,
+    collaboration: int, organizations: list[int] | None, all_nodes: bool,
+    online_only: bool, no_vpn: bool
+) -> list[dict]:
+    """
+    Run diagnostic checks on an existing vantage6 network.
+
+    This command will create a task in the requested collaboration that will
+    test the functionality of vantage6, and will report back the results.
+    """
+    if all_nodes and organizations:
+        error("Cannot use --all-nodes and --organization at the same time.")
+        sys.exit(1)
+
+    if all_nodes or not organizations:
+        organizations = None
+
+    client = UserClient(host=host, port=port, path=api_path,
+                        log_level='critical')
+    client.authenticate(username=username, password=password)
+    client.setup_encryption(None)
+    diagnose = DiagnosticRunner(client, collaboration, organizations,
+                                online_only)
+    res = diagnose(base=True, vpn=not no_vpn)
+    return res

vantage6/cli/test/integration_test.py

@@ -0,0 +1,82 @@
+from pathlib import Path
+import click
+
+from vantage6.cli.utils import info
+from vantage6.cli.dev.create import create_demo_network
+from vantage6.cli.dev.start import start_demo_network
+from vantage6.cli.dev.stop import stop_demo_network
+from vantage6.cli.dev.remove import remove_demo_network
+from vantage6.cli.utils import prompt_config_name, check_config_name_allowed
+from vantage6.cli.test.feature_tester import cli_test_features
+
+
+@click.command()
+@click.option('-n', '--name', default=None, type=str,
+              help="Name for your development setup")
+@click.option('--server-url', type=str, default='http://host.docker.internal',
+              help='Server URL to point to. If you are using Docker Desktop, '
+              'the default http://host.docker.internal should not be changed.')
+@click.option('-i', '--image', type=str, default=None,
+              help='Server Docker image to use')
+@click.option('--keep', type=bool, default=False,
+              help='Keep the dev network after finishing the test')
+@click.option('--extra-server-config', type=click.Path(exists=True),
+              default=None, help='YAML File with additional server '
+              'configuration. This will be appended to the server '
+              'configuration file')
+@click.option('--extra-node-config', type=click.Path('rb'), default=None,
+              help='YAML File with additional node configuration. This will be'
+              ' appended to each of the node configuration files')
+@click.pass_context
+def cli_test_integration(
+    click_ctx: click.Context, name: str, server_url: str, image: str,
+    keep: bool = False, extra_server_config: Path = None,
+    extra_node_config: Path = None
+) -> list[dict]:
+    """
+    Create dev network and run diagnostic checks on it.
+
+    This is a full integration test of the vantage6 network. It will create
+    a test server with some nodes using the `vdev` commands, and then run the
+    v6-diagnostics algorithm to test all functionality.
+    """
+    # get name for the development setup - if not given - and check if it is
+    # allowed
+    name = prompt_config_name(name)
+    check_config_name_allowed(name)
+
+    # create server & node configurations and create test resources (
+    # collaborations, organizations, etc)
+    click_ctx.invoke(
+        create_demo_network, name=name, num_nodes=3, server_url=server_url,
+        server_port=5000, image=image, extra_server_config=extra_server_config,
+        extra_node_config=extra_node_config
+    )
+
+    # start the server and nodes
+    click_ctx.invoke(
+        start_demo_network, name=name, system_folders=True, server_image=image,
+        node_image=image
+    )
+
+    # run the diagnostic tests
+    # TODO the username and password should be coordinated with the vdev
+    # command - at present it spits out this username/password combination by
+    # default but both should be defined in the same place
+    # TODO VPN testing is always excluded - allow to include it with a flag
+    # when vdev commands can handle extra config parameters
+    diagnose_results = click_ctx.invoke(
+        cli_test_features, host="http://localhost", port=5000, api_path='/api',
+        username='org_1-admin', password='password', collaboration=1,
+        organizations=None, all_nodes=True, online_only=False, no_vpn=True
+    )
+
+    # clean up the test resources
+    click_ctx.invoke(stop_demo_network, name=name, system_folders=True)
+    if not keep:
+        click_ctx.invoke(remove_demo_network, name=name, system_folders=True)
+    else:
+        info("Keeping the demo network {name}. You can start it with `v6 dev "
+             "start-demo-network`")
+
+    return diagnose_results

{vantage6-4.1.3.dist-info → vantage6-4.2.0rc2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vantage6
-Version: 4.1.3
+Version: 4.2.0rc2
 Summary: vantage6 command line interface
 Home-page: https://github.com/vantage6/vantage6
 Requires-Python: >=3.10
@@ -10,12 +10,13 @@ Requires-Dist: colorama ==0.4.6
 Requires-Dist: copier ==8.3.0
 Requires-Dist: docker ==6.1.2
 Requires-Dist: ipython ==8.10.0
-Requires-Dist: jinja2 ==3.1.2
+Requires-Dist: jinja2 ==3.1.3
 Requires-Dist: questionary ==1.10.0
+Requires-Dist: rich ==13.5.2
 Requires-Dist: schema ==0.7.5
 Requires-Dist: SQLAlchemy ==1.4.46
-Requires-Dist: vantage6-common ==4.1.3
-Requires-Dist: vantage6-client ==4.1.3
+Requires-Dist: vantage6-common ==4.2.0rc2
+Requires-Dist: vantage6-client ==4.2.0rc2
 Provides-Extra: dev
 Requires-Dist: coverage ==6.4.4 ; extra == 'dev'
 

{vantage6-4.1.3.dist-info → vantage6-4.2.0rc2.dist-info}/RECORD

@@ -1,21 +1,21 @@
 tests_cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests_cli/test_example.py,sha256=TV8JA52UR-Yh1WeVwx8g8ngA9ZTiRCwsJkUKxsXUXMg,147
-tests_cli/test_node_cli.py,sha256=LtnGjHbCJq95eH3vVIeSbVvbX1_DMgP0mVLRqcdP4ss,15454
-tests_cli/test_server_cli.py,sha256=AYI6NQpI76OxIOHvWx87B1E-q3hgc6Dh4efD82LYuOA,6202
+tests_cli/test_node_cli.py,sha256=8tfCNvdZT7uMgOJ0QbBlY73kox7RUIDHhxQWVtJiSiA,15454
+tests_cli/test_server_cli.py,sha256=hWnGEV6JnXN_SqpUiQxCzITBlbYKRykb8B4MkFX7aEU,5798
 tests_cli/test_wizard.py,sha256=dRrOScN79z8nKGNWmn6tPAVfnDOmCsGckiDJMKufhms,3580
-vantage6/cli/__build__,sha256=X-zrZv_IbzjZUnhsbWlsecLbwjndTpG0ZynXOif7V-k,1
+vantage6/cli/__build__,sha256=1HNeOiZeFu7gP1lxi5tdAwGcB9i2xR-Q2jpmbuwTqzU,1
 vantage6/cli/__init__.py,sha256=dEbhLHe9VfU3otY3CQkMVrj39uPGWjqzAvHW2B2Flgs,62
-vantage6/cli/_version.py,sha256=cdx52n-T9P3JZIQOBAMBO36zH56L9GBPhTniacMXo2M,684
-vantage6/cli/cli.py,sha256=QFyW61HP3FkcpGD8OkAfqN-oUYWdtDs_uIou2Sy7xZE,4280
+vantage6/cli/_version.py,sha256=vNBdXaoKkSVejAo0RNxmIyEGekryfMYJeh21XE5SACo,688
+vantage6/cli/cli.py,sha256=Tz7dj6X8GVPrzHd9GehURdbPFIDzGvyYW2MXRUJwFs4,4875
 vantage6/cli/configuration_manager.py,sha256=4EHlOW16nfIiplzA0sw9udc4-VLKcmdKgWzzFa5Nw7A,3841
 vantage6/cli/configuration_wizard.py,sha256=c8L4xm9_HYjAkyTmRmLDMwzTDqdKdgnBZy915TAIfRI,11569
 vantage6/cli/context.py,sha256=dJZWmOZGqQ3MazrPu8HbnXbNC2tzHcLjns9KoIHGpFk,13045
-vantage6/cli/globals.py,sha256=fWPiKGub9Chj7MM8xfm87arMisqkdoZdZqgvWxbSmLA,909
+vantage6/cli/globals.py,sha256=yDYhbzWgwrd549lTkVH7g59orQuN30zwP60VHiUiMD4,1027
 vantage6/cli/utils.py,sha256=Lx1xYKXDBeHjJpXGkVAhidy79P-zV3TOQYfa2nMbvSs,2353
 vantage6/cli/algorithm/create.py,sha256=cUjehkwRa6eWRSnWLPk9iLk4_qf8x_MI2WxmaAUMVT0,1496
 vantage6/cli/algorithm/update.py,sha256=0GCkFIRGV-HWHWagTSqkE9_SPuVrTMQQhtytpitMiQc,821
-vantage6/cli/dev/create.py,sha256=orkcbMcdQg5OQsmi3EuBGzMsuWsG73dx0SqbWW_TeDc,11256
-vantage6/cli/dev/remove.py,sha256=qNqZwAaTIqdjkHIcr1pjTMSqlTDmcaPz87NkSMhT-ws,2362
+vantage6/cli/dev/create.py,sha256=Xij_DOunyjzoDulpIrL00kasHiXbjp_YJWR3OjScCZc,13249
+vantage6/cli/dev/remove.py,sha256=m5Yjt7U3pTmlZm1f8G8JsxMm9k-CWTgoy-sCZ7GTnZA,2211
 vantage6/cli/dev/start.py,sha256=IJbXzezMx4MK7rO9nx3AvidEZfdUL5mX0gA7AlwETLU,1629
 vantage6/cli/dev/stop.py,sha256=XDvjyxxU4gVnC9sKHxYMLYPmDwRq_4lnpXE9imO614Q,993
 vantage6/cli/node/attach.py,sha256=n7mJaDJq7tngMVigXe0_JBAdueV_5YEz8FmVOvAF-PU,2152
@@ -26,7 +26,7 @@ vantage6/cli/node/list.py,sha256=b8ht09bvzVFiQx909r8zeTruCWC2uLyrNVeiipCjgAI,170
 vantage6/cli/node/new.py,sha256=01sp9005TidvHA_awuaahBHV1-LImspStLTYhruek_A,1858
 vantage6/cli/node/remove.py,sha256=kLMK2Xsfgwrb3FuqRc9cKCadc8p0P3dLTLt9wN1_sBg,3564
 vantage6/cli/node/set_api_key.py,sha256=cJXWe1G5m2LTlyhBX85KFlCcL7voO-YNHUvhnsrwHhE,1796
-vantage6/cli/node/start.py,sha256=Q6VvsnLVlwDhKmQbJ3xrMlxLTqSde3wdrZHA3BMclAA,11886
+vantage6/cli/node/start.py,sha256=ojv2csH0PcqfoT9rZNJpmuGerqBN74Ypt5bta6caLic,12404
 vantage6/cli/node/stop.py,sha256=08SWafKBpCY_pnMopRkcIcHNaBoxqRHmlDSfQDzWjuQ,2704
 vantage6/cli/node/version.py,sha256=HD0iCf2VGZK8HVYfNcMpDAQdxYQ--5ff10XYCsX7Hf4,1843
 vantage6/cli/node/common/__init__.py,sha256=nUDpIehzfX9Zd3tL2Wa9nP5940SH27gcXGRiCHcxjrA,3166
@@ -39,16 +39,20 @@ vantage6/cli/server/files.py,sha256=owBO6lj_ucHY00MxJUOOdacz4NbdOqp-vrfkVrGjPUE,
 vantage6/cli/server/import_.py,sha256=Up3IAK3c9jyFpr7y9_zl4HNViFj6jT9OLh_S6v6t5Hs,4611
 vantage6/cli/server/list.py,sha256=p5SRRGsz6G83Hc53eYoySWi32egm7jie_lo1gkS0NCk,1734
 vantage6/cli/server/new.py,sha256=ZHnjWlEKXOMdu6WYHDcrD62Qc2au-YuYIv2SW2KXS7M,1913
+vantage6/cli/server/remove.py,sha256=1Ogw2npPA9QsExVforzLe3dI3eTwxuBd9oasviX4Z_g,1182
 vantage6/cli/server/shell.py,sha256=SRw-CrD_ro9DRfqCI6IlifJk_UDr6EIke5ypN4-85yo,1384
 vantage6/cli/server/start.py,sha256=-qD1rB5dRXWLL13OVWFb4DwdshGF708bL19WOlO9uUo,10952
-vantage6/cli/server/stop.py,sha256=Lij7NSiVcgPWyQFB4-p-P2zbkdWOZAk08LKHZhYqxU0,5446
+vantage6/cli/server/stop.py,sha256=aEOqa2hYPLTGPkMBzFrFI4FLP0zMskjYD1vqzDyKEog,4005
 vantage6/cli/server/version.py,sha256=upvy6VdO3XGfovEW-2Ybc0c0niM2ieCOrz1SlsBrqkw,1743
 vantage6/cli/server/common/__init__.py,sha256=kUcDOfGuNvf8j7g5er9D_7z8IHRk53QBQ2E0NcZ_1iE,4818
-vantage6/cli/template/node_config.j2,sha256=-IyUquZl4jRxb5DRBWvEbZFwz2lFtHG_1reZoSkeees,495
-vantage6/cli/template/server_config.j2,sha256=d6O_K-VzJC3GHbCGVbXRWB4jTEzJHPz1VC7t3U8e0Tc,367
+vantage6/cli/template/node_config.j2,sha256=ebTifJuRlfUhjtI8jm9A2SWXGpUcg8L-XUBInSwAppA,522
+vantage6/cli/template/server_config.j2,sha256=rKXMky8rA7Lnf5USlPx0Es9AskwmL4bILWfACPvygv4,394
 vantage6/cli/template/server_import_config.j2,sha256=PRB0ym_FYjx9vhkmY9C0xzlv_85Y5kBfWdUYs089bNQ,1844
-vantage6-4.1.3.dist-info/METADATA,sha256=zTHnjtPLjJKpSSil59S4uEQ3ixY8eqZz-8D8hm4cpZg,9729
-vantage6-4.1.3.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-vantage6-4.1.3.dist-info/entry_points.txt,sha256=YFBvwjxoeAGxYyPC-YevEgOBBYRGaXkS6jiOGGCLNy0,157
-vantage6-4.1.3.dist-info/top_level.txt,sha256=CYDIBS8jEfFq5YCs_Fuit54K9-3wdosZppTrsymIoUk,19
-vantage6-4.1.3.dist-info/RECORD,,
+vantage6/cli/test/feature_tester.py,sha256=8MJGotRonEje6GVTkqOr5u1LbZi3W4A4gQnf5OYt-2I,2368
+vantage6/cli/test/integration_test.py,sha256=GpYG0uHoD1lVKwtSFk_QhdR1e_AYzKWIVPDI5CSwJ8o,3669
+vantage6/cli/test/common/diagnostic_runner.py,sha256=j6MWV0_dKZScYBwd--3_dv_JSeWyeUmp8T7E-7ZSjs8,6755
+vantage6-4.2.0rc2.dist-info/METADATA,sha256=L8_VGCM7QnL-1uiADLAJ_kFq47UEvGI5cK2dL7RFSSA,9767
+vantage6-4.2.0rc2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+vantage6-4.2.0rc2.dist-info/entry_points.txt,sha256=YFBvwjxoeAGxYyPC-YevEgOBBYRGaXkS6jiOGGCLNy0,157
+vantage6-4.2.0rc2.dist-info/top_level.txt,sha256=CYDIBS8jEfFq5YCs_Fuit54K9-3wdosZppTrsymIoUk,19
+vantage6-4.2.0rc2.dist-info/RECORD,,