pytest-pve-cloud 3.1.4__tar.gz → 3.2.0__tar.gz

{pytest_pve_cloud-3.1.4/src/pytest_pve_cloud.egg-info → pytest_pve_cloud-3.2.0}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: pytest-pve-cloud
-Version: 3.1.4
+Version: 3.2.0
 Author-email: Tobias Huebner <tobias.huebner@vmzberlin.com>
 License-Expression: GPL-3.0-or-later
 License-File: LICENSE.md
-Requires-Dist: py-pve-cloud<3.2.0,>=3.1.4
+Requires-Dist: py-pve-cloud<3.3.0,>=3.2.0
 Requires-Dist: kubernetes==34.1.0
 Requires-Dist: pytest==8.4.2
 Requires-Dist: ansible-runner==2.4.2

{pytest_pve_cloud-3.1.4 → pytest_pve_cloud-3.2.0}/pyproject.toml

@@ -19,3 +19,4 @@ version = {attr = "pve_cloud_test._version.__version__"}
 
 [project.scripts]
 tddog = "pve_cloud_test.tdd_watchdog:main"
+mock-server = "pve_cloud_test.terraform:launch_gw_mock_manually"

{pytest_pve_cloud-3.1.4 → pytest_pve_cloud-3.2.0}/requirements.txt

@@ -1,4 +1,4 @@
-py-pve-cloud>=3.1.4,<3.2.0
+py-pve-cloud>=3.2.0,<3.3.0
 kubernetes==34.1.0
 pytest==8.4.2
 ansible-runner==2.4.2

pytest_pve_cloud-3.2.0/src/pve_cloud_test/_version.py

@@ -0,0 +1 @@
+__version__ = "3.2.0"

pytest_pve_cloud-3.2.0/src/pve_cloud_test/cloud_fixtures.py

@@ -0,0 +1,230 @@
+import functools
+import inspect
+import logging
+import os
+import re
+
+import jsonschema
+import paramiko
+import pytest
+import redis
+import yaml
+from proxmoxer import ProxmoxAPI
+from pve_cloud.lib.inventory import (get_cloud_domain, get_pve_inventory,
+                                     get_target_cluster)
+from pve_cloud.lib.ssh import connect_host
+
+from pve_cloud_test.tdd_watchdog import get_ipv4
+
+logger = logging.getLogger(__name__)
+
+
+def get_tdd_version(artifact_key):
+    if os.getenv("TDDOG_LOCAL_IFACE"):
+        # get version for image from redis
+        r = redis.Redis(host="localhost", port=6379, db=0)
+        local_build_version = r.get(f"version.{artifact_key}").decode()
+
+        if local_build_version:
+            logger.info(f"found local version {local_build_version}")
+
+            return local_build_version, get_ipv4(os.getenv("TDDOG_LOCAL_IFACE"))
+        else:
+            logger.warning(
+                f"did not find local build pve cloud version for {artifact_key} even though TDDOG_LOCAL_IFACE env var is defined"
+            )
+
+    return None, None
+
+
+def get_tdd_ip():
+    if os.getenv("TDDOG_LOCAL_IFACE"):
+        return get_ipv4(os.getenv("TDDOG_LOCAL_IFACE"))
+
+    return None
+
+
+# this prepends a custom wrapper func to all our e2e fixtures and allows easy toggeling
+# cloud fixtures can be annotated with this and and a value tuple of tags as value
+# they also automatically get the standard pytest fixture decorator
+# depending on the pytest --fixture-tags paramater, which takes a csv of fixture tags
+# the fixtures are automatically skipped if not in the csv
+def cloud_fixture(*tags):
+    def decorator(func):
+        func._tags = tags
+
+        logger.info(f"called decorator for {func.__name__}")
+
+        @pytest.fixture(scope="session")
+        @functools.wraps(func)
+        def wrapper(*args, **kwargs):
+            logger.info(f"called wrapper for {func.__name__}")
+
+            # get pytest request object to extract globally set --fixture-tags
+            request = kwargs.get("request")
+            if request is None:
+                raise RuntimeError(
+                    f"Cannot find request object defined in {func.__name__} fixture args! Pytest requests object needs to be in params for cloud_fixture to work!"
+                )
+
+            # if this is defined we skip fixtures alltogether
+            skip_fixtures = request.config.getoption("--skip-fixtures")
+            if skip_fixtures:
+                logger.info(
+                    f"Skipping fixture {func.__name__} due --skip-fixtures flag"
+                )
+
+                # mimic fixture returns and pass blanks
+                yield
+                return
+
+            # filter out fixtures that are not specifically targeted
+            allowed_tags_opt = request.config.getoption("--fixture-tags")
+            if allowed_tags_opt:
+                allowed_tags = allowed_tags_opt.split(",")
+                if not any(tag in allowed_tags for tag in func._tags):
+                    logger.info(f"Skipping fixture {func.__name__} due to tags")
+
+                    # mimic fixture returns and pass blanks
+                    yield
+                    return
+
+            # when fixtures are executed we give the option to skip the cleanup part
+            skip_cleanup = request.config.getoption("--skip-cleanup")
+
+            result = func(*args, **kwargs)
+
+            if inspect.isgenerator(result):
+                logger.info("is generator")
+
+                if skip_cleanup:
+                    logger.info(
+                        "yielding and skipping cleanup due to --skip-cleanup flag"
+                    )
+
+                    yield next(
+                        result, None
+                    )  # might not yield conditionally (like setup_ceph_dhcp_lxcs fixture)
+
+                else:
+                    yield from result
+
+            else:
+                logger.info("is result")
+                yield result  # still yield because of wrappers
+
+        return wrapper
+
+    return decorator
+
+
+# load the test environment yaml from parameters
+@pytest.fixture(scope="session")
+def get_test_env(request):
+    test_pve_yaml_file = os.getenv("PVE_CLOUD_TEST_CONF")
+    assert test_pve_yaml_file
+
+    assert test_pve_yaml_file is not None
+    with open(test_pve_yaml_file, "r") as file:
+        test_pve_conf = yaml.safe_load(file)
+
+    logger.info(f"terraform inv file {test_pve_yaml_file}")
+
+    # load schema and validate
+    with open(
+        os.path.dirname(os.path.realpath(__file__)) + "/test_env_schema.yaml"
+    ) as file:
+        test_env_schema = yaml.safe_load(file)
+
+    jsonschema.validate(instance=test_pve_conf, schema=test_env_schema)
+
+    # render vlan tag
+    if "pve_test_net0_vlan_tag" in test_pve_conf:
+        test_pve_conf["net0_vlan_tag_rendered"] = (
+            f",tag={test_pve_conf['pve_test_net0_vlan_tag']}"
+        )
+
+    # validate that target copy pve system is directly accessible (no jump host validation supported)
+    copy_cloud_domain = get_cloud_domain(test_pve_conf["kubernetes"]["copy_target_pve"])
+    copy_pve_inventory = get_pve_inventory(copy_cloud_domain)
+
+    copy_target_cluster = get_target_cluster(
+        copy_pve_inventory,
+        test_pve_conf["kubernetes"]["copy_target_pve"],
+        target_cloud_domain=copy_cloud_domain,
+    )
+
+    assert "jump_hosts" not in copy_pve_inventory[copy_target_cluster]
+
+    return test_pve_conf
+
+
+def get_first_host(get_test_env):
+    return get_test_env["pve_test_cluster_hosts"][
+        next(iter(get_test_env["pve_test_cluster_hosts"]))
+    ]["ansible_host"]
+
+
+@pytest.fixture(scope="session")
+def fetch_default_gw_ns(get_test_env):
+
+    with connect_host(
+        get_first_host(get_test_env), get_test_env.get("pve_test_cluster_jump_host")
+    ) as client:
+
+        _, stdout, _ = client.exec_command(
+            "ip route show default 2>/dev/null | awk '{print $3}'"
+        )
+        gateway = stdout.read().decode("utf-8").strip()
+        logger.info(gateway)
+
+        _, stdout, _ = client.exec_command(
+            "grep -E '^nameserver [0-9]+' /etc/resolv.conf 2>/dev/null | awk '{print $2}'"
+        )
+        nameservers = stdout.read().decode("utf-8").strip().splitlines()
+        logger.info(nameservers)
+
+    return gateway, " ".join(nameservers)
+
+
+@pytest.fixture(scope="session")
+def get_cloud_secrets(get_test_env):
+    logger.info("setting pve cloud auth env variables for tf")
+
+    with connect_host(
+        get_first_host(get_test_env), get_test_env.get("pve_test_cluster_jump_host")
+    ) as ssh:
+        _, stdout, _ = ssh.exec_command("sudo cat /etc/pve/cloud/secrets/patroni.pass")
+        patroni_pass = stdout.read().decode("utf-8")
+
+        pg_conn_str = f"postgres://postgres:{patroni_pass}@{get_test_env['pve_test_cluster_floating_internal']}:5000/tf_states?sslmode=disable"
+        pg_conn_str_orm = f"postgresql+psycopg2://postgres:{patroni_pass}@{get_test_env['pve_test_cluster_floating_internal']}:5000/pve_cloud?sslmode=disable"
+
+        # fetch bind update key for ingress dns validation
+        _, stdout, _ = ssh.exec_command("sudo cat /etc/pve/cloud/secrets/internal.key")
+        bind_key_file = stdout.read().decode("utf-8")
+
+        bind_internal_key = re.search(r'secret\s+"([^"]+)";', bind_key_file).group(1)
+
+    return {
+        "bind_internal_key": bind_internal_key,
+        "pg_conn_str": pg_conn_str,
+        "pg_conn_str_orm": pg_conn_str_orm,
+    }
+
+
+# connect proxmoxer to pve cluster
+@pytest.fixture(scope="session")
+def get_proxmoxer(get_test_env):
+    first_test_host = get_test_env["pve_test_cluster_hosts"][
+        next(iter(get_test_env["pve_test_cluster_hosts"]))
+    ]
+
+    proxmox = ProxmoxAPI(
+        first_test_host["ansible_host"], user="root", backend="ssh_paramiko"
+    )
+    nodes = proxmox.nodes.get()
+
+    assert nodes
+
+    return proxmox

pytest_pve_cloud-3.1.4/src/pve_cloud_test/cloud_fixtures.py → pytest_pve_cloud-3.2.0/src/pve_cloud_test/k8s_fixtures.py

@@ -1,144 +1,17 @@
-import functools
-import inspect
 import logging
-import os
 import tempfile
 
-import jsonschema
+import paramiko
 import pytest
-import redis
 import yaml
+from kubernetes import client, config
 from proxmoxer import ProxmoxAPI
-from pve_cloud.lib.inventory import (get_cloud_domain, get_online_pve_host,
-                                     get_pve_inventory, get_target_cluster)
 
-from pve_cloud_test.tdd_watchdog import get_ipv4
+from pve_cloud_test.cloud_fixtures import get_test_env
 
 logger = logging.getLogger(__name__)
 
 
-def get_tdd_version(artifact_key):
-    if os.getenv("TDDOG_LOCAL_IFACE"):
-        # get version for image from redis
-        r = redis.Redis(host="localhost", port=6379, db=0)
-        local_build_version = r.get(f"version.{artifact_key}").decode()
-
-        if local_build_version:
-            logger.info(f"found local version {local_build_version}")
-
-            return local_build_version, get_ipv4(os.getenv("TDDOG_LOCAL_IFACE"))
-        else:
-            logger.warning(
-                f"did not find local build pve cloud version for {artifact_key} even though TDDOG_LOCAL_IFACE env var is defined"
-            )
-
-    return None, None
-
-
-def get_tdd_ip():
-    if os.getenv("TDDOG_LOCAL_IFACE"):
-        return get_ipv4(os.getenv("TDDOG_LOCAL_IFACE"))
-
-    return None
-
-
-# this prepends a custom wrapper func to all our e2e fixtures and allows easy toggeling
-# cloud fixtures can be annotated with this and and a value tuple of tags as value
-# they also automatically get the standard pytest fixture decorator
-# depending on the pytest --fixture-tags paramater, which takes a csv of fixture tags
-# the fixtures are automatically skipped if not in the csv
-def cloud_fixture(*tags):
-    def decorator(func):
-        func._tags = tags
-
-        logger.info(f"called decorator for {func.__name__}")
-
-        @pytest.fixture(scope="session")
-        @functools.wraps(func)
-        def wrapper(*args, **kwargs):
-            logger.info(f"called wrapper for {func.__name__}")
-
-            request = kwargs.get("request")
-            if request is None:
-                for arg in args:
-                    if hasattr(arg, "config"):
-                        request = arg
-                        break
-
-            if request is None:
-                logger.warning("Cannot find request object; running fixture anyway")
-                return func(*args, **kwargs)
-
-            allowed_tags_opt = request.config.getoption("--fixture-tags")
-            if allowed_tags_opt:
-                allowed_tags = allowed_tags_opt.split(",")
-                if not any(tag in allowed_tags for tag in func._tags):
-                    logger.info(f"Skipping fixture {func.__name__} due to tags")
-                    if inspect.isgeneratorfunction(func):
-                        yield
-                        return
-                    else:
-                        return
-
-            result = func(*args, **kwargs)
-
-            if inspect.isgenerator(result):
-                logger.info("is generator")
-                yield from result
-            else:
-                logger.info("is result")
-                return result
-
-        return wrapper
-
-    return decorator
-
-
-# load the test environment yaml from parameters
-@pytest.fixture(scope="session")
-def get_test_env(request):
-    test_pve_yaml_file = os.getenv("PVE_CLOUD_TEST_CONF")
-    assert test_pve_yaml_file
-
-    os.environ["TF_VAR_test_pve_conf"] = test_pve_yaml_file
-
-    assert test_pve_yaml_file is not None
-    with open(test_pve_yaml_file, "r") as file:
-        test_pve_conf = yaml.safe_load(file)
-
-    logger.info(f"terraform inv file {test_pve_yaml_file}")
-
-    # load schema and validate
-    with open(
-        os.path.dirname(os.path.realpath(__file__)) + "/test_env_schema.yaml"
-    ) as file:
-        test_env_schema = yaml.safe_load(file)
-
-    jsonschema.validate(instance=test_pve_conf, schema=test_env_schema)
-
-    # render vlan tag
-    if "pve_test_net0_vlan_tag" in test_pve_conf:
-        test_pve_conf["net0_vlan_tag_rendered"] = (
-            f",tag={test_pve_conf['pve_test_net0_vlan_tag']}"
-        )
-
-    # validate that target copy pve system is directly accessible (no jump host validation supported)
-    copy_cloud_domain = get_cloud_domain(
-        test_pve_conf["kubernetes"]["k8s_tls_copy_target_pve"]
-    )
-    copy_pve_inventory = get_pve_inventory(copy_cloud_domain)
-
-    copy_target_cluster = get_target_cluster(
-        copy_pve_inventory,
-        test_pve_conf["kubernetes"]["k8s_tls_copy_target_pve"],
-        target_cloud_domain=copy_cloud_domain,
-    )
-
-    assert "jump_hosts" not in copy_pve_inventory[copy_target_cluster]
-
-    return test_pve_conf
-
-
 @pytest.fixture(scope="session")
 def get_secondary_kubespray_inv(get_test_env):
     logger.info("create secondary kubespray")
@@ -165,8 +38,6 @@ def get_secondary_kubespray_inv(get_test_env):
                     + get_test_env["cloud_inventory"]["pve_cloud_domain"],
                     "postgres_stack": "ha-postgres."
                     + get_test_env["cloud_inventory"]["pve_cloud_domain"],
-                    "cache_stack": "cloud-cache."
-                    + get_test_env["cloud_inventory"]["pve_cloud_domain"],
                 },
                 "tcp_proxies": [],
                 "external_domains": [],
@@ -212,8 +83,6 @@ def get_secondary_kubespray_inv(get_test_env):
 
         temp_kubespray_inv.flush()
 
-        os.environ["TF_VAR_e2e_secondary_kubespray_inv"] = temp_kubespray_inv.name
-
         return temp_kubespray_inv.name
 
 
@@ -241,8 +110,6 @@ def get_kubespray_inv(get_test_env):
                     + get_test_env["cloud_inventory"]["pve_cloud_domain"],
                     "postgres_stack": "ha-postgres."
                     + get_test_env["cloud_inventory"]["pve_cloud_domain"],
-                    "cache_stack": "cloud-cache."
-                    + get_test_env["cloud_inventory"]["pve_cloud_domain"],
                 },
                 "tcp_proxies": [
                     {
@@ -323,7 +190,7 @@ def get_kubespray_inv(get_test_env):
                         },
                         "parameters": {
                             "cores": 4,
-                            "memory": 12288,
+                            "memory": 8192,
                         },
                     },
                 ],
@@ -334,23 +201,118 @@ def get_kubespray_inv(get_test_env):
         )
         temp_kubespray_inv.flush()
 
-        os.environ["TF_VAR_e2e_kubespray_inv"] = temp_kubespray_inv.name
-
         return temp_kubespray_inv.name
 
 
-# connect proxmoxer to pve cluster
+def get_kubeconfig(get_test_env, pve_host, stack_name):
+    # assumes loaded ssh key like all playbooks
+    proxmox = ProxmoxAPI(pve_host, user="root", backend="ssh_paramiko")
+
+    # find k8s master
+    master_qemu = None
+    host_node = None
+    for node in proxmox.nodes.get():
+        for qemu in proxmox.nodes(node["node"]).qemu.get():
+            if (
+                "tags" in qemu
+                and stack_name
+                + "."
+                + get_test_env["cloud_inventory"]["pve_cloud_domain"]
+                in qemu["tags"]
+                and "master" in qemu["tags"]
+            ):
+                master_qemu = qemu
+                host_node = node["node"]
+                break
+
+    assert master_qemu
+    assert host_node
+    logger.info(master_qemu)
+
+    ifaces = (
+        proxmox.nodes(host_node)
+        .qemu(master_qemu["vmid"])
+        .agent("network-get-interfaces")
+        .get()
+    )
+
+    master_ipv4 = None
+
+    for iface in ifaces["result"]:
+        if iface["name"] == "lo":
+            continue  # skip the first loopback device
+
+        # after that comes the primary interface
+        for ip_address in iface["ip-addresses"]:
+            if ip_address["ip-address-type"] == "ipv4":
+                master_ipv4 = ip_address["ip-address"]
+                break
+
+        assert master_ipv4
+
+        break
+
+    # now we can use that address to connect via ssh
+    ssh = paramiko.SSHClient()
+    ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
+    ssh.connect(master_ipv4, username="admin")
+
+    # since we need root we cant use sftp and root via ssh is disabled
+    _, stdout, _ = ssh.exec_command("sudo cat /etc/kubernetes/admin.conf")
+
+    kubeconfig = (
+        stdout.read()
+        .decode("utf-8")
+        .replace("https://127.0.0.1:6443", f"https://{master_ipv4}:6443")
+    )
+    assert kubeconfig
+
+    return kubeconfig
+
+
 @pytest.fixture(scope="session")
-def get_proxmoxer(get_test_env):
-    first_test_host = get_test_env["pve_test_cluster_hosts"][
+def get_primary_kubeconfig(get_test_env):
+    test_host = get_test_env["pve_test_cluster_hosts"][
         next(iter(get_test_env["pve_test_cluster_hosts"]))
     ]
+    return get_kubeconfig(get_test_env, test_host["ansible_host"], "pytest-k8s")
 
-    proxmox = ProxmoxAPI(
-        first_test_host["ansible_host"], user="root", backend="ssh_paramiko"
+
+@pytest.fixture(scope="session")
+def get_secondary_kubeconfig(get_test_env):
+    test_host = get_test_env["pve_test_cluster_hosts"][
+        next(iter(get_test_env["pve_test_cluster_hosts"]))
+    ]
+    return get_kubeconfig(
+        get_test_env, test_host["ansible_host"], "pytest-secondary-k8s"
     )
-    nodes = proxmox.nodes.get()
 
-    assert nodes
 
-    return proxmox
+@pytest.fixture(scope="session")
+def get_k8s_api_v1(get_primary_kubeconfig):
+    kubeconfig = get_primary_kubeconfig
+
+    # auth kubernetes api
+    with tempfile.NamedTemporaryFile(mode="w", delete=False) as temp_file:
+        temp_file.write(kubeconfig)
+        temp_file.flush()
+        config.load_kube_config(config_file=temp_file.name)
+
+    v1 = client.CoreV1Api()
+
+    return v1
+
+
+@pytest.fixture(scope="session")
+def get_k8s_secondary_api_v1(get_secondary_kubeconfig):
+    kubeconfig = get_secondary_kubeconfig
+
+    # auth kubernetes api
+    with tempfile.NamedTemporaryFile(mode="w", delete=False) as temp_file:
+        temp_file.write(kubeconfig)
+        temp_file.flush()
+        config.load_kube_config(config_file=temp_file.name)
+
+    v1 = client.CoreV1Api()
+
+    return v1

{pytest_pve_cloud-3.1.4 → pytest_pve_cloud-3.2.0}/src/pve_cloud_test/options.py

@@ -7,13 +7,13 @@ def pytest_addoption(parser):
         "--skip-cleanup",
         action="store_true",
         default=False,
-        help="Skips the fixture cleanup part, faster for consequtive runs / tdd.",
+        help="Skips the fixture cleanup part and also test cleanups that implement this flag. Setting this keeps the infra state and allows for hands on development.",
     )
     parser.addoption(
-        "--skip-fixture-init",
+        "--skip-fixtures",
         action="store_true",
         default=False,
-        help="Skips the initialization part of fixtures. Target run only test on consequtive runs.",
+        help="Skips fixtures alltogether. Target run only test on consequtive runs. This will also skip the cleanup of the fixture.",
     )
     # only avaible in pxc_cloud collection (decorator is defined there)
     parser.addoption(
@@ -29,15 +29,3 @@ def pytest_addoption(parser):
         help="Skips the kubespray playbook part when syncing test kubespray clusters. This saves a lot of time in total.",
     )
     parser.addoption("--ansible-verbosity", type=int, choices=[1, 2, 3], default=0)
-    parser.addoption(
-        "--skip-apply",
-        action="store_true",
-        default=False,
-        help="Skips the terraform apply part, helps with faster writing tests.",
-    )
-    parser.addoption(
-        "--tf-upgrade",
-        action="store_true",
-        default=False,
-        help="Runs init --upgrade instead of just init for terraform scenarios.",
-    )

{pytest_pve_cloud-3.1.4 → pytest_pve_cloud-3.2.0}/src/pve_cloud_test/tdd_watchdog.py

@@ -237,6 +237,9 @@ class PyCodeChangedHandler(FileSystemEventHandler):
             with open(
                 self.workdir / self.config["build"]["dyn_version_py_path"], "w"
             ) as f:
+                print(
+                    f"writing {self.config['build']['dyn_version_py_path']} {version}"
+                )
                 f.write(f'__version__ = "{version}"\n')
 
             error = False
@@ -347,10 +350,15 @@ def init_local(dog_settings, subdir_name):
         latest_semver_tag.replace(patch=datetime.now().strftime("%m%d%H%S%f"))
     )
 
-    with open(
-        Path(subdir_name) / dog_settings["local"]["dyn_version_py_path"], "w"
-    ) as f:
-        f.write(f'__version__ = "{version}"\n')
+    # only write out tdd version file if nothing has yet been generated. otherwise this will collide with
+    # the build handlers
+    dyn_version_path = Path(subdir_name) / dog_settings["local"]["dyn_version_py_path"]
+
+    if not dyn_version_path.exists():
+        with open(
+            Path(subdir_name) / dog_settings["local"]["dyn_version_py_path"], "w"
+        ) as f:
+            f.write(f'__version__ = "{version}"\n')
 
     # just install locally with all deps unmod
     # install the package
@@ -375,7 +383,7 @@ def init_local(dog_settings, subdir_name):
 # all subfolders, build a dependency graph based on the [redis] version_key
 # and dependant projects in [build] sub_rebuild_keys / [init] dep_build_keys.
 # it will launch those furthest up the chain first
-def dog_recursive(done_handler):
+def dog_recursive(done_handler, oneshot):
 
     # find all tddog toml files
     toml_file_graph = {}
@@ -419,20 +427,22 @@ def dog_recursive(done_handler):
             return
 
         # we recursed down to an artifact without any dependencies / processed the dependencies first
+        if oneshot:
+            run_oneshot(dog_settings, subdir_name)
+        else:
+            print(f"launching {subdir_name}")
+            dog_observers, dog_handlers = launch_dog(
+                dog_settings, done_handler, subdir_name
+            )
+            observers.extend(
+                dog_observers
+            )  # launch the build observer (that also builds initially)
 
-        print(f"launching {subdir_name}")
-        dog_observers, dog_handlers = launch_dog(
-            dog_settings, done_handler, subdir_name
-        )
-        observers.extend(
-            dog_observers
-        )  # launch the build observer (that also builds initially)
-
-        handlers.extend(dog_handlers)  # add handler for initial build
+            handlers.extend(dog_handlers)  # add handler for initial build
 
-        # install the project locally if required
-        if "local" in dog_settings:
-            init_local(dog_settings, subdir_name)
+            # install the project locally if required
+            if "local" in dog_settings:
+                init_local(dog_settings, subdir_name)
 
         # add project to launch guard
         launched_subdirs.add(subdir_name)
@@ -441,6 +451,11 @@ def dog_recursive(done_handler):
     for subdir_name, dog_settings in toml_file_graph.values():
         launch_observers_recursive(subdir_name, dog_settings)
 
+    # oneshot can quit right away
+    if oneshot:
+        print("oneshot done!")
+        return
+
     # trigger initial builds
     for handler in handlers:
         handler.run()
@@ -490,21 +505,8 @@ def launch(args):
 
     done_handler = DoneHandler()
 
-    if args.oneshot:
-        if not os.path.exists("tddog.toml"):
-            print("tddog.toml doesnt exist / not in current dir for this project.")
-            return
-
-        with open("tddog.toml", "rb") as f:
-            dog_settings = tomllib.load(f)
-
-        print("running oneshot build")
-        run_oneshot(dog_settings, ".")
-        print("oneshot build finished")
-        return
-
     if args.recursive:
-        dog_recursive(done_handler)
+        dog_recursive(done_handler, args.oneshot)
     else:
         # standalone launching is simpler, no need for any recursion
         if not os.path.exists("tddog.toml"):
@@ -515,6 +517,14 @@ def launch(args):
             dog_settings = tomllib.load(f)
 
         pprint.pprint(dog_settings)
+        if args.oneshot:
+            print("running oneshot build")
+            run_oneshot(dog_settings, ".")
+            print("oneshot build finished")
+            # init local is called in run_oneshot
+            return
+
+        # tdd active flow monitoring changes
         observers, handlers = launch_dog(dog_settings, done_handler, ".")
 
         for handler in handlers:

pytest_pve_cloud-3.2.0/src/pve_cloud_test/terraform.py

@@ -0,0 +1,220 @@
+import base64
+import getpass
+import logging
+import os
+import shutil
+import subprocess
+from contextlib import contextmanager
+
+import netifaces
+import paramiko
+import yaml
+from jinja2 import Environment, FileSystemLoader
+from pve_cloud.lib.inventory import get_pve_inventory
+from pytest_httpserver import HTTPServer
+
+logger = logging.getLogger(__name__)
+
+
+def get_ipv4(iface):
+    if iface in netifaces.interfaces():
+        info = netifaces.ifaddresses(iface)
+        ipv4 = info.get(netifaces.AF_INET, [{}])[0].get("addr")
+        return ipv4
+    return None
+
+
+def get_tf_env_vars(
+    module_name, scenario_name, kube_v1, get_test_env, get_kubespray_inv
+):
+    # set env vars for terraform backend / variables passed via env
+    tf_env_vars = {}
+    tf_env_vars["PG_SCHEMA_NAME"] = f"pytest-{module_name}-{scenario_name}"
+
+    tf_env_vars["TF_VAR_test_pve_conf"] = os.getenv(
+        "PVE_CLOUD_TEST_CONF"
+    )  # path to test env
+
+    # current machine IPV4 made accessible for tf var
+    tf_env_vars["TF_VAR_dev_machine_ipv4"] = get_ipv4(os.getenv("TDDOG_LOCAL_IFACE"))
+
+    # connect to pve host and collect secrets / conf
+    first_test_host = get_test_env["pve_test_cluster_hosts"][
+        next(iter(get_test_env["pve_test_cluster_hosts"]))
+    ]
+
+    ssh = paramiko.SSHClient()
+    ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
+    ssh.connect(first_test_host["ansible_host"], username="root")
+
+    _, stdout, _ = ssh.exec_command("sudo cat /etc/pve/cloud/secrets/patroni.pass")
+    patroni_pass = stdout.read().decode("utf-8")
+
+    pg_conn_str = f"postgres://postgres:{patroni_pass}@{get_test_env['pve_test_cluster_floating_internal']}:5000/tf_states?sslmode=disable"
+    pg_conn_str_orm = f"postgresql+psycopg2://postgres:{patroni_pass}@{get_test_env['pve_test_cluster_floating_internal']}:5000/pve_cloud?sslmode=disable"
+
+    # variables that terraform applies in test will use
+    tf_env_vars["PG_CONN_STR"] = pg_conn_str
+    tf_env_vars["TF_VAR_pve_cloud_pg_cstr"] = pg_conn_str_orm
+    tf_env_vars["TF_VAR_pve_ansible_host"] = first_test_host["ansible_host"]
+
+    pve_inventory = get_pve_inventory(
+        get_test_env["cloud_inventory"]["pve_cloud_domain"]
+    )
+    pve_64 = yaml.safe_dump(pve_inventory)
+    tf_env_vars["TF_VAR_pve_inventory_b64"] = base64.b64encode(
+        pve_64.encode("utf-8")
+    ).decode("utf-8")
+
+    # render terraformrc jinja2 and set env
+    j2_env = Environment(loader=FileSystemLoader(f"{os.getcwd()}/tests"))
+    rc_tmp = j2_env.get_template(".terraformrc-e2e.j2")
+
+    with open(f"{os.getcwd()}/tests/.terraformrc-e2e", "w") as f:
+        f.write(rc_tmp.render({"user_name": getpass.getuser()}))
+
+    tf_env_vars["TF_CLI_CONFIG_FILE"] = f"{os.getcwd()}/tests/.terraformrc-e2e"
+
+    # write testing kubespray inv and set the path (for provider init)
+    tf_env_vars["TF_VAR_e2e_kubespray_inv"] = get_kubespray_inv
+
+    return tf_env_vars
+
+
+def apply(
+    module_name, scenario_name, kube_v1, get_test_env, get_kubespray_inv, extra_env={}
+):
+    logger.info(f"applying terraform {scenario_name}")
+
+    tf_env_vars = get_tf_env_vars(
+        module_name, scenario_name, kube_v1, get_test_env, get_kubespray_inv
+    )
+
+    # create env to pass to tf procs + write sourcable debug.env file
+    terraform_env = os.environ.copy()
+
+    with open(
+        f"{os.getcwd()}/tests/scenarios/{scenario_name}/.debug.env", "w"
+    ) as dbg_env:
+        for ek, ev in (tf_env_vars | extra_env).items():
+            terraform_env[ek] = ev
+            dbg_env.write(f"export {ek}='{ev}'\n")
+
+        # writeout pytest current flag to get same behaviour for tf provider
+        dbg_env.write(
+            f"export PYTEST_CURRENT_TEST='{os.getenv('PYTEST_CURRENT_TEST')}'"
+        )
+
+    subprocess.run(
+        ["terraform", "init", "--upgrade"],
+        cwd=f"{os.getcwd()}/tests/scenarios/{scenario_name}",
+        env=terraform_env,
+        check=True,
+        text=True,
+    )
+
+    subprocess.run(
+        ["terraform", "apply", "-auto-approve"],
+        cwd=f"{os.getcwd()}/tests/scenarios/{scenario_name}",
+        env=terraform_env,
+        check=True,
+        text=True,
+    )
+
+    # wait and assert all pods are running
+    while True:
+        all_pods_running = True
+
+        for pod in kube_v1.list_pod_for_all_namespaces().items:
+            phase = pod.status.phase
+            assert (
+                phase != "Failed"
+            ), f"pod {pod.metadata.name} failed!"  # failed pods end tests immediatly
+
+            if phase not in ["Running", "Succeeded"]:
+                all_pods_running = False
+                logger.info(f"pod {pod.metadata.name} in phase {phase}")
+
+        if all_pods_running:
+            break
+        else:
+            logger.info("pods still initializing")
+
+
+def destroy(
+    module_name, scenario_name, kube_v1, get_test_env, get_kubespray_inv, extra_env={}
+):
+    logger.info(f"destroying terraform {scenario_name}")
+
+    tf_env_vars = get_tf_env_vars(
+        module_name, scenario_name, kube_v1, get_test_env, get_kubespray_inv
+    )
+
+    # create env to pass to tf procs + write sourcable debug.env file
+    terraform_env = os.environ.copy()
+
+    for ek, ev in (tf_env_vars | extra_env).items():
+        terraform_env[ek] = ev
+
+    subprocess.run(
+        ["terraform", "destroy", "-auto-approve"],
+        cwd=f"{os.getcwd()}/tests/scenarios/{scenario_name}",
+        env=terraform_env,
+        check=True,
+        text=True,
+    )
+
+    shutil.rmtree(f"{os.getcwd()}/tests/scenarios/{scenario_name}/.terraform")
+
+
+@contextmanager
+def get_mc_gw_http_mock():
+    server = HTTPServer(host="0.0.0.0", port=8888)
+    server.start()
+
+    server.expect_request("/get-client-alertmanagers", method="GET").respond_with_json(
+        [
+            {
+                "secret_name": "e2e-dummy",
+                "secret_data": {
+                    "host": "alrtmgr.e2e.dummy.domain",
+                    "k8s_stack_name": "e2e-dummy-stack",
+                    "password": "dummy-pw",
+                },
+                "cloud_domain": "e2e.dummy.domain",
+            }
+        ]
+    )
+
+    server.expect_request("/get-gotify-master", method="GET").respond_with_json(
+        {
+            "gotify_present": True,
+            "gotify_access": {"host": "gotify.dummy.domain", "password": "dummy-pw"},
+        }
+    )
+
+    server.expect_request("/get-victoria-clients", method="GET").respond_with_json(
+        [
+            {
+                "secret_name": "e2e-dummy",
+                "secret_data": {
+                    "host": "vlogs.e2e.dummy.domain",
+                    "k8s_stack_name": "e2e-dummy-stack",
+                },
+                "cloud_domain": "e2e.dummy.domain",
+            }
+        ]
+    )
+
+    server.expect_request("/get-vlselect-auth", method="GET").respond_with_json(
+        {"auth_present": True, "vlselect_auth": {"password": "dummy-pw"}}
+    )
+    try:
+        yield server
+    finally:
+        server.stop()
+
+
+def launch_gw_mock_manually():
+    with get_mc_gw_http_mock():
+        input("running server, press key to terminate")

{pytest_pve_cloud-3.1.4 → pytest_pve_cloud-3.2.0}/src/pve_cloud_test/test_env_schema.yaml

@@ -8,6 +8,7 @@ required:
   - pve_test_cluster_hosts
   - pve_test_cluster_floating_external
   - pve_test_cluster_floating_internal
+  - pve_test_cloud_mirror_ip
   - pve_vm_storage_id
   - ceph_csi_storage_pool
   - ssh_pub_key
@@ -55,6 +56,10 @@ properties:
     type: string
     description: Central haproxy floating ip for internal traffic and services.
 
+  pve_test_cloud_mirror_ip:
+    type: string
+    description: Static ip for cloud central mirror vm.
+
   pve_vm_storage_id:
     type: string
     description: Storage id string created in the proxmox ui. Can be ceph pool as storage or local-lvm, local-zfs, etc.
@@ -140,19 +145,22 @@ properties:
     type: object
     description: config options for test kubespray clusters that the suite creates.
     required:
-      - k8s_tls_copy_target_pve
-      - k8s_tls_copy_stack_name
       - deployments_domain
+      - copy_target_pve
+      - tls_copy_stack_name
     properties:
-      k8s_tls_copy_target_pve:
+      deployments_domain:
+        type: string
+        description: domain used for test deployments of the suites kubernetes clusters. This needs to be delegated correctly in your central dns.
+      copy_target_pve:
         type: string
         description: Target proxmox cluster (external) from which to copy tls certificates. Dev machine needs ssh to it and dns needs to be configured.
-      k8s_tls_copy_stack_name:
+      tls_copy_stack_name:
         type: string
         description: Stack name inside the target pve from which the test suite will copy a valid acme cert. This clusters cert should be extend to contain the deployments_domain.
-      deployments_domain:
+      harbor_copy_mirror_host:
         type: string
-        description: domain used for test deployments of the suites kubernetes clusters. This needs to be delegated correctly in your central dns.
+        description: The mirror host to use instead of the harbor that is deployed in the e2e testing suite.
 
   terraform_parameters:
     type: object

{pytest_pve_cloud-3.1.4 → pytest_pve_cloud-3.2.0/src/pytest_pve_cloud.egg-info}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: pytest-pve-cloud
-Version: 3.1.4
+Version: 3.2.0
 Author-email: Tobias Huebner <tobias.huebner@vmzberlin.com>
 License-Expression: GPL-3.0-or-later
 License-File: LICENSE.md
-Requires-Dist: py-pve-cloud<3.2.0,>=3.1.4
+Requires-Dist: py-pve-cloud<3.3.0,>=3.2.0
 Requires-Dist: kubernetes==34.1.0
 Requires-Dist: pytest==8.4.2
 Requires-Dist: ansible-runner==2.4.2

pytest_pve_cloud-3.2.0/src/pytest_pve_cloud.egg-info/entry_points.txt

@@ -0,0 +1,3 @@
+[console_scripts]
+mock-server = pve_cloud_test.terraform:launch_gw_mock_manually
+tddog = pve_cloud_test.tdd_watchdog:main

{pytest_pve_cloud-3.1.4 → pytest_pve_cloud-3.2.0}/src/pytest_pve_cloud.egg-info/requires.txt

@@ -1,4 +1,4 @@
-py-pve-cloud<3.2.0,>=3.1.4
+py-pve-cloud<3.3.0,>=3.2.0
 kubernetes==34.1.0
 pytest==8.4.2
 ansible-runner==2.4.2

pytest_pve_cloud-3.1.4/src/pve_cloud_test/_version.py

@@ -1 +0,0 @@
-__version__ = "3.1.4"

pytest_pve_cloud-3.1.4/src/pve_cloud_test/k8s_fixtures.py

@@ -1,168 +0,0 @@
-import base64
-import logging
-import os
-import re
-import tempfile
-
-import paramiko
-import pytest
-from kubernetes import client, config
-from proxmoxer import ProxmoxAPI
-from pve_cloud.lib.inventory import *
-
-from pve_cloud_test.cloud_fixtures import *
-
-logger = logging.getLogger(__name__)
-
-
-def get_kubeconfig(get_test_env, pve_host, stack_name):
-    # assumes loaded ssh key like all playbooks
-    proxmox = ProxmoxAPI(pve_host, user="root", backend="ssh_paramiko")
-
-    # find k8s master
-    master_qemu = None
-    host_node = None
-    for node in proxmox.nodes.get():
-        for qemu in proxmox.nodes(node["node"]).qemu.get():
-            if (
-                "tags" in qemu
-                and stack_name
-                + "."
-                + get_test_env["cloud_inventory"]["pve_cloud_domain"]
-                in qemu["tags"]
-                and "master" in qemu["tags"]
-            ):
-                master_qemu = qemu
-                host_node = node["node"]
-                break
-
-    assert master_qemu
-    assert host_node
-    logger.info(master_qemu)
-
-    ifaces = (
-        proxmox.nodes(host_node)
-        .qemu(master_qemu["vmid"])
-        .agent("network-get-interfaces")
-        .get()
-    )
-
-    master_ipv4 = None
-
-    for iface in ifaces["result"]:
-        if iface["name"] == "lo":
-            continue  # skip the first loopback device
-
-        # after that comes the primary interface
-        for ip_address in iface["ip-addresses"]:
-            if ip_address["ip-address-type"] == "ipv4":
-                master_ipv4 = ip_address["ip-address"]
-                break
-
-        assert master_ipv4
-
-        break
-
-    # now we can use that address to connect via ssh
-    ssh = paramiko.SSHClient()
-    ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
-    ssh.connect(master_ipv4, username="admin")
-
-    # since we need root we cant use sftp and root via ssh is disabled
-    _, stdout, _ = ssh.exec_command("sudo cat /etc/kubernetes/admin.conf")
-
-    kubeconfig = (
-        stdout.read()
-        .decode("utf-8")
-        .replace("https://127.0.0.1:6443", f"https://{master_ipv4}:6443")
-    )
-    assert kubeconfig
-
-    return kubeconfig
-
-
-@pytest.fixture(scope="session")
-def get_primary_kubeconfig(get_test_env):
-    test_host = get_test_env["pve_test_cluster_hosts"][
-        next(iter(get_test_env["pve_test_cluster_hosts"]))
-    ]
-    return get_kubeconfig(get_test_env, test_host["ansible_host"], "pytest-k8s")
-
-
-@pytest.fixture(scope="session")
-def get_secondary_kubeconfig(get_test_env):
-    test_host = get_test_env["pve_test_cluster_hosts"][
-        next(iter(get_test_env["pve_test_cluster_hosts"]))
-    ]
-    return get_kubeconfig(
-        get_test_env, test_host["ansible_host"], "pytest-secondary-k8s"
-    )
-
-
-@pytest.fixture(scope="session")
-def set_pve_cloud_auth(request, get_test_env, get_kubespray_inv):
-    logger.info("setting pve cloud auth env variables for tf")
-    first_test_host = get_test_env["pve_test_cluster_hosts"][
-        next(iter(get_test_env["pve_test_cluster_hosts"]))
-    ]
-
-    ssh = paramiko.SSHClient()
-    ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
-    ssh.connect(first_test_host["ansible_host"], username="root")
-
-    _, stdout, _ = ssh.exec_command("sudo cat /etc/pve/cloud/secrets/patroni.pass")
-    patroni_pass = stdout.read().decode("utf-8")
-
-    pg_conn_str = f"postgres://postgres:{patroni_pass}@{get_test_env['pve_test_cluster_floating_internal']}:5000/tf_states?sslmode=disable"
-    pg_conn_str_orm = f"postgresql+psycopg2://postgres:{patroni_pass}@{get_test_env['pve_test_cluster_floating_internal']}:5000/pve_cloud?sslmode=disable"
-
-    # variables that terraform applies in test will use
-    os.environ["PG_CONN_STR"] = pg_conn_str
-    os.environ["TF_VAR_pve_cloud_pg_cstr"] = pg_conn_str_orm
-    os.environ["TF_VAR_pve_ansible_host"] = first_test_host["ansible_host"]
-
-    pve_inventory = get_pve_inventory(
-        get_test_env["cloud_inventory"]["pve_cloud_domain"]
-    )
-    pve_64 = yaml.safe_dump(pve_inventory)
-    os.environ["TF_VAR_pve_inventory_b64"] = base64.b64encode(
-        pve_64.encode("utf-8")
-    ).decode("utf-8")
-
-    # fetch bind update key for ingress dns validation
-    _, stdout, _ = ssh.exec_command("sudo cat /etc/pve/cloud/secrets/internal.key")
-    bind_key_file = stdout.read().decode("utf-8")
-
-    bind_internal_key = re.search(r'secret\s+"([^"]+)";', bind_key_file).group(1)
-
-    return {"bind_internal_key": bind_internal_key}
-
-
-@pytest.fixture(scope="session")
-def get_k8s_api_v1(get_primary_kubeconfig):
-    kubeconfig = get_primary_kubeconfig
-
-    # auth kubernetes api
-    with tempfile.NamedTemporaryFile(mode="w", delete=False) as temp_file:
-        temp_file.write(kubeconfig)
-        temp_file.flush()
-        config.load_kube_config(config_file=temp_file.name)
-
-    v1 = client.CoreV1Api()
-
-    return v1
-
-
-@pytest.fixture(scope="session")
-def get_k8s_secondary_api_v1(get_secondary_kubeconfig):
-    kubeconfig = get_secondary_kubeconfig
-
-    # auth kubernetes api
-    with tempfile.NamedTemporaryFile(mode="w", delete=False) as temp_file:
-        temp_file.write(kubeconfig)
-        temp_file.flush()
-        config.load_kube_config(config_file=temp_file.name)
-
-    v1 = client.CoreV1Api()
-
-    return v1

pytest_pve_cloud-3.1.4/src/pve_cloud_test/terraform.py

@@ -1,87 +0,0 @@
-import getpass
-import logging
-import os
-import shutil
-import subprocess
-
-import netifaces
-from jinja2 import Environment, FileSystemLoader
-
-logger = logging.getLogger(__name__)
-
-
-def get_ipv4(iface):
-    if iface in netifaces.interfaces():
-        info = netifaces.ifaddresses(iface)
-        ipv4 = info.get(netifaces.AF_INET, [{}])[0].get("addr")
-        return ipv4
-    return None
-
-
-def apply(module_name, scenario_name, v1, upgrade=False, inject_rc=False):
-    logger.info(f"applying terraform {scenario_name}")
-    os.environ["PG_SCHEMA_NAME"] = f"pytest-{module_name}-{scenario_name}"
-
-    # now we can set env / vars and apply our test scenario
-    init_cmd = ["terraform", "init"]
-    if upgrade:
-        init_cmd.append("--upgrade")
-
-    # render terraformrc jinja2
-    j2_env = Environment(loader=FileSystemLoader(f"{os.getcwd()}/tests"))
-    rc_tmp = j2_env.get_template(".terraformrc-e2e.j2")
-
-    with open(f"{os.getcwd()}/tests/.terraformrc-e2e", "w") as f:
-        f.write(rc_tmp.render({"user_name": getpass.getuser()}))
-
-    init_env = os.environ.copy()
-    if inject_rc:
-        init_env["TF_CLI_CONFIG_FILE"] = f"{os.getcwd()}/tests/.terraformrc-e2e"
-
-    # current machine IPV4 made accessible for tf var
-    os.environ["TF_VAR_dev_machine_ipv4"] = get_ipv4(os.getenv("TDDOG_LOCAL_IFACE"))
-
-    subprocess.run(
-        init_cmd,
-        cwd=f"{os.getcwd()}/tests/scenarios/{scenario_name}",
-        env=init_env,
-        check=True,
-        text=True,
-    )
-    subprocess.run(
-        ["terraform", "apply", "-auto-approve"],
-        cwd=f"{os.getcwd()}/tests/scenarios/{scenario_name}",
-        check=True,
-        text=True,
-    )
-
-    # wait and assert all pods are running
-    while True:
-        all_pods_running = True
-
-        for pod in v1.list_pod_for_all_namespaces().items:
-            phase = pod.status.phase
-            assert (
-                phase != "Failed"
-            ), f"pod {pod.metadata.name} failed!"  # failed pods end tests immediatly
-
-            if phase not in ["Running", "Succeeded"]:
-                all_pods_running = False
-                logger.info(f"pod {pod.metadata.name} in phase {phase}")
-
-        if all_pods_running:
-            break
-        else:
-            logger.info("pods still initializing")
-
-
-def destroy(scenario_name):
-    logger.info(f"destroying terraform {scenario_name}")
-    subprocess.run(
-        ["terraform", "destroy", "-auto-approve"],
-        cwd=f"{os.getcwd()}/tests/scenarios/{scenario_name}",
-        check=True,
-        text=True,
-    )
-
-    shutil.rmtree(f"{os.getcwd()}/tests/scenarios/{scenario_name}/.terraform")

pytest_pve_cloud-3.1.4/src/pytest_pve_cloud.egg-info/entry_points.txt

@@ -1,2 +0,0 @@
-[console_scripts]
-tddog = pve_cloud_test.tdd_watchdog:main