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

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

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: pytest-pve-cloud
-Version: 3.2.0
+Version: 3.2.1
 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.3.0,>=3.2.0
+Requires-Dist: py-pve-cloud<3.3.0,>=3.2.1
 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 → pytest_pve_cloud-3.2.1}/requirements.txt

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

pytest_pve_cloud-3.2.1/src/pve_cloud_test/_version.py

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

{pytest_pve_cloud-3.2.0 → pytest_pve_cloud-3.2.1}/src/pve_cloud_test/cloud_fixtures.py

@@ -3,7 +3,9 @@ import inspect
 import logging
 import os
 import re
+from contextlib import contextmanager
 
+import ansible_runner
 import jsonschema
 import paramiko
 import pytest
@@ -78,6 +80,13 @@ def cloud_fixture(*tags):
                 yield
                 return
 
+            if request.config.getoption("--fixture-tags") and request.config.getoption(
+                "--skip-fixture-tags"
+            ):
+                raise RuntimeError(
+                    "Cannot both specify skip fixture tags and include fixture tags!"
+                )
+
             # filter out fixtures that are not specifically targeted
             allowed_tags_opt = request.config.getoption("--fixture-tags")
             if allowed_tags_opt:
@@ -89,6 +98,16 @@ def cloud_fixture(*tags):
                     yield
                     return
 
+            skip_tags_opt = request.config.getoption("--skip-fixture-tags")
+            if skip_tags_opt:
+                skip_tags = skip_tags_opt.split(",")
+                if any(tag in skip_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")
 
@@ -118,6 +137,54 @@ def cloud_fixture(*tags):
     return decorator
 
 
+@contextmanager
+def run_playbook(
+    request, inventory_file, *create_playbooks, destroy_playbook=None, extra_vars=None
+):
+    cmd_line = None
+
+    if request.config.getoption("--runner-tags") and request.config.getoption(
+        "--skip-runner-tags"
+    ):
+        raise RuntimeError("Cannot specify both include and exclude runner tags!")
+
+    if request.config.getoption("--runner-tags"):
+        cmd_line = f"--tags {request.config.getoption('--runner-tags')}"
+
+    if request.config.getoption("--skip-runner-tags"):
+        cmd_line = f"--skip-tags {request.config.getoption('--skip-runner-tags')}"
+
+    try:
+        for create_playbook in create_playbooks:
+            logger.info(f"Running create playbook {create_playbook}")
+            create_run = ansible_runner.run(
+                project_dir=os.getcwd(),
+                playbook=create_playbook,
+                inventory=inventory_file,
+                verbosity=request.config.getoption("--ansible-verbosity"),
+                cmdline=cmd_line,
+                extravars=extra_vars,
+            )
+
+            assert create_run.rc == 0, f"Create playbook run failed {create_playbook}"
+
+        yield
+
+    finally:
+        if not request.config.getoption("--skip-cleanup") and destroy_playbook:
+            logger.info(f"Running destroy playbook {destroy_playbook}")
+            destroy_run = ansible_runner.run(
+                project_dir=os.getcwd(),
+                playbook=destroy_playbook,
+                inventory=inventory_file,
+                verbosity=request.config.getoption("--ansible-verbosity"),
+                cmdline=cmd_line,
+                extravars=extra_vars,
+            )
+
+            assert destroy_run.rc == 0, f"Create playbook run failed {destroy_playbook}"
+
+
 # load the test environment yaml from parameters
 @pytest.fixture(scope="session")
 def get_test_env(request):

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

@@ -23,9 +23,21 @@ def pytest_addoption(parser):
         help="Runs only fixtures with the specified tags (comma seperated list). Works for fixtures annotated with special cloud_fixture from cloud_fixtures.py",
     )
     parser.addoption(
-        "--skip-kubespray",
-        action="store_true",
-        default=False,
-        help="Skips the kubespray playbook part when syncing test kubespray clusters. This saves a lot of time in total.",
+        "--skip-fixture-tags",
+        type=str,
+        default=None,
+        help="Runs only fixtures with the specified tags (comma seperated list). Works for fixtures annotated with special cloud_fixture from cloud_fixtures.py",
+    )
+    parser.addoption(
+        "--runner-tags",
+        type=str,
+        default=None,
+        help="Runs only fixtures with the specified tags (comma seperated list). Works for fixtures annotated with special cloud_fixture from cloud_fixtures.py",
+    )
+    parser.addoption(
+        "--skip-runner-tags",
+        type=str,
+        default=None,
+        help="Runs only fixtures with the specified tags (comma seperated list). Works for fixtures annotated with special cloud_fixture from cloud_fixtures.py",
     )
     parser.addoption("--ansible-verbosity", type=int, choices=[1, 2, 3], default=0)

{pytest_pve_cloud-3.2.0 → pytest_pve_cloud-3.2.1}/src/pve_cloud_test/terraform.py

@@ -5,13 +5,19 @@ import os
 import shutil
 import subprocess
 from contextlib import contextmanager
+from pathlib import Path
 
 import netifaces
 import paramiko
 import yaml
 from jinja2 import Environment, FileSystemLoader
 from pve_cloud.lib.inventory import get_pve_inventory
+from pve_cloud.orm.alchemy import AcmeX509, ProxmoxCloudSecrets
 from pytest_httpserver import HTTPServer
+from sqlalchemy import create_engine, delete, select
+from sqlalchemy.orm import Session
+
+from pve_cloud_test.cloud_fixtures import *
 
 logger = logging.getLogger(__name__)
 
@@ -78,6 +84,59 @@ def get_tf_env_vars(
     # write testing kubespray inv and set the path (for provider init)
     tf_env_vars["TF_VAR_e2e_kubespray_inv"] = get_kubespray_inv
 
+    # if the harbor_copy_mirror_host is defined in the kubernetes section, we set is as an env variable
+    # to use in the pxc_helm_mirror terraform resource
+    if "harbor_copy_mirror_host" in get_test_env["kubernetes"]:
+        tf_env_vars["E2E_HARBOR_MIRROR_HOST"] = get_test_env["kubernetes"][
+            "harbor_copy_mirror_host"
+        ]
+
+    # look for mirror vm presence and rsync terraform provider cache
+    engine = create_engine(pg_conn_str_orm)
+
+    with Session(engine) as session:
+        stmt = select(ProxmoxCloudSecrets).where(
+            ProxmoxCloudSecrets.cloud_domain
+            == get_test_env["cloud_inventory"]["pve_cloud_domain"],
+            ProxmoxCloudSecrets.secret_name == "cloud-mirror-vm",
+        )
+        cloud_mirror_vm = session.scalars(stmt).first()
+
+    logger.info(
+        f"found cloud mirror vm {cloud_mirror_vm.secret_data['mirror_vm_addr']}"
+    )
+    if cloud_mirror_vm:
+        # create local cache idr
+        local_cache_dir = f"{os.getenv('HOME')}/.terraform.d/plugin-cache/"
+
+        if Path(local_cache_dir).exists():
+            # rsync local to upstream
+            upsync_cmd = [
+                "rsync",
+                "-avz",
+                local_cache_dir,
+                f"admin@{cloud_mirror_vm.secret_data['mirror_vm_addr']}:/home/admin/.cache/terraform-plugins/",
+            ]
+            logger.info(upsync_cmd)
+            subprocess.run(upsync_cmd, check=True, text=True)
+
+        Path(local_cache_dir).mkdir(parents=True, exist_ok=True)
+
+        # rsync download
+        subprocess.run(
+            [
+                "rsync",
+                "-avz",
+                f"admin@{cloud_mirror_vm.secret_data['mirror_vm_addr']}:/home/admin/.cache/terraform-plugins/",
+                local_cache_dir,
+            ],
+            check=True,
+            text=True,
+        )
+
+        # set the cache dir for terraform subprocess launches
+        tf_env_vars["TF_PLUGIN_CACHE_DIR"] = local_cache_dir
+
     return tf_env_vars
 
 

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

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: pytest-pve-cloud
-Version: 3.2.0
+Version: 3.2.1
 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.3.0,>=3.2.0
+Requires-Dist: py-pve-cloud<3.3.0,>=3.2.1
 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 → pytest_pve_cloud-3.2.1}/src/pytest_pve_cloud.egg-info/requires.txt

@@ -1,4 +1,4 @@
-py-pve-cloud<3.3.0,>=3.2.0
+py-pve-cloud<3.3.0,>=3.2.1
 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

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