pytest-pve-cloud 3.3.0__tar.gz → 3.4.0__tar.gz

{pytest_pve_cloud-3.3.0/src/pytest_pve_cloud.egg-info → pytest_pve_cloud-3.4.0}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: pytest-pve-cloud
-Version: 3.3.0
+Version: 3.4.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.4.0,>=3.3.0
+Requires-Dist: py-pve-cloud<3.5.0,>=3.4.0
 Requires-Dist: kubernetes==34.1.0
 Requires-Dist: pytest==8.4.2
 Requires-Dist: ansible-runner==2.4.2

{pytest_pve_cloud-3.3.0 → pytest_pve_cloud-3.4.0}/requirements.txt

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

pytest_pve_cloud-3.4.0/src/pve_cloud_test/_version.py

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

{pytest_pve_cloud-3.3.0 → pytest_pve_cloud-3.4.0}/src/pve_cloud_test/k8s_fixtures.py

@@ -1,11 +1,18 @@
 import logging
+import os
 import tempfile
 
+import dns.query
+import dns.rcode
+import dns.resolver
+import dns.tsigkeyring
+import dns.update
 import paramiko
 import pytest
 import yaml
 from kubernetes import client, config
 from proxmoxer import ProxmoxAPI
+from pve_cloud.lib.ssh import connect_host
 
 from pve_cloud_test.cloud_fixtures import get_test_env
 
@@ -419,3 +426,87 @@ def get_k8s_secondary_api_v1(get_secondary_kubeconfig):
     v1 = client.CoreV1Api()
 
     return v1
+
+
+def construct_k0s_ext_hosts_inv(get_test_env):
+    resolver = dns.resolver.Resolver()
+    resolver.nameservers = [get_test_env["cloud_inventory"]["bind_master_ip"]]
+
+    ddns_answer = resolver.resolve(
+        f"single-pytest-k0s-edge.{get_test_env['cloud_inventory']['pve_cloud_domain']}"
+    )
+    ddns_ips = [rdata.to_text() for rdata in ddns_answer]
+    logger.info(ddns_ips)
+    assert ddns_ips  # assert ddns response
+
+    with tempfile.NamedTemporaryFile("w", suffix=".yaml", delete=False) as temp_k0s_inv:
+        yaml.dump(
+            {
+                "plugin": "pxc.cloud.ext_hosts_inv",
+                "pve_cloud_domain": get_test_env["cloud_inventory"]["pve_cloud_domain"],
+                "target_cluster": get_test_env["pve_test_cluster_name"],
+                "external_stack_name": "pytest-k0s",
+                "typed_host_groups": {
+                    "k0s_edge": {
+                        "k0s_single": {
+                            "ansible_user": "admin",
+                            "ansible_host": ddns_ips[0],
+                            "k0s_conf_local_path": f"{os.getenv('ANSIBLE_COLLECTIONS_PATH')}/ansible_collections/pxc/cloud/tests/files/k0s.yaml",
+                            "zfs_containerd_dataset": True,
+                            "zpool_csi_parameters": {
+                                "pool_properties": {"ashift": "12"},
+                                "vdevs": [
+                                    {
+                                        "disks": [
+                                            "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi1"
+                                        ]
+                                    },
+                                ],
+                            },
+                            "e2e_limit_containerd_downloads": get_e2e_limit_feature(
+                                get_test_env, "limit_containerd_downloads"
+                            ),
+                        }
+                    }
+                },
+            },
+            temp_k0s_inv,
+        )
+        temp_k0s_inv.flush()
+        logger.info(f"ext hosts inv {temp_k0s_inv.name}")
+
+        return temp_k0s_inv.name, ddns_ips[0]
+
+
+@pytest.fixture(scope="session")
+def get_k0s_api_v1(get_test_env):
+    _, k0s_host = construct_k0s_ext_hosts_inv(get_test_env)
+
+    with connect_host(k0s_host, user="admin") as ssh:
+        _, stdout, _ = ssh.exec_command("sudo k0s kubeconfig admin")
+
+        with tempfile.NamedTemporaryFile(mode="w", delete=False) as temp_file:
+            temp_file.write(stdout.read().decode("utf-8"))
+            temp_file.flush()
+            config.load_kube_config(config_file=temp_file.name)
+
+            v1 = client.CoreV1Api()
+
+            return v1
+
+
+@pytest.fixture(scope="session")
+def get_k0s_api_v1_batch(get_test_env):
+    _, k0s_host = construct_k0s_ext_hosts_inv(get_test_env)
+
+    with connect_host(k0s_host, user="admin") as ssh:
+        _, stdout, _ = ssh.exec_command("sudo k0s kubeconfig admin")
+
+        with tempfile.NamedTemporaryFile(mode="w", delete=False) as temp_file:
+            temp_file.write(stdout.read().decode("utf-8"))
+            temp_file.flush()
+            config.load_kube_config(config_file=temp_file.name)
+
+            v1 = client.BatchV1Api()
+
+            return v1

{pytest_pve_cloud-3.3.0 → pytest_pve_cloud-3.4.0}/src/pve_cloud_test/terraform.py

@@ -30,9 +30,7 @@ def get_ipv4(iface):
     return None
 
 
-def get_tf_env_vars(
-    module_name, scenario_name, kube_v1, get_test_env, get_kubespray_inv
-):
+def get_tf_env_vars(module_name, scenario_name, get_test_env):
     # 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}"
@@ -81,9 +79,6 @@ def get_tf_env_vars(
 
     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
-
     # 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"]:
@@ -140,14 +135,10 @@ def get_tf_env_vars(
     return tf_env_vars
 
 
-def apply(
-    module_name, scenario_name, kube_v1, get_test_env, get_kubespray_inv, extra_env={}
-):
+def apply(module_name, scenario_name, kube_v1, get_test_env, 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
-    )
+    tf_env_vars = get_tf_env_vars(module_name, scenario_name, get_test_env)
 
     # create env to pass to tf procs + write sourcable debug.env file
     terraform_env = os.environ.copy()
@@ -204,14 +195,10 @@ def apply(
             logger.info("pods still initializing")
 
 
-def destroy(
-    module_name, scenario_name, kube_v1, get_test_env, get_kubespray_inv, extra_env={}
-):
+def destroy(module_name, scenario_name, get_test_env, 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
-    )
+    tf_env_vars = get_tf_env_vars(module_name, scenario_name, get_test_env)
 
     # create env to pass to tf procs + write sourcable debug.env file
     terraform_env = os.environ.copy()

{pytest_pve_cloud-3.3.0 → pytest_pve_cloud-3.4.0/src/pytest_pve_cloud.egg-info}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: pytest-pve-cloud
-Version: 3.3.0
+Version: 3.4.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.4.0,>=3.3.0
+Requires-Dist: py-pve-cloud<3.5.0,>=3.4.0
 Requires-Dist: kubernetes==34.1.0
 Requires-Dist: pytest==8.4.2
 Requires-Dist: ansible-runner==2.4.2

{pytest_pve_cloud-3.3.0 → pytest_pve_cloud-3.4.0}/src/pytest_pve_cloud.egg-info/requires.txt

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

pytest_pve_cloud-3.3.0/src/pve_cloud_test/_version.py

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