py-pve-cloud 3.2.5__tar.gz → 3.3.0__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {py_pve_cloud-3.2.5/src/py_pve_cloud.egg-info → py_pve_cloud-3.3.0}/PKG-INFO +2 -2
- {py_pve_cloud-3.2.5 → py_pve_cloud-3.3.0}/pyproject.toml +1 -1
- py_pve_cloud-3.3.0/src/pve_cloud/_version.py +1 -0
- {py_pve_cloud-3.2.5 → py_pve_cloud-3.3.0}/src/pve_cloud/cli/pvcli.py +4 -4
- {py_pve_cloud-3.2.5 → py_pve_cloud-3.3.0}/src/pve_cloud/lib/inventory.py +10 -3
- {py_pve_cloud-3.2.5 → py_pve_cloud-3.3.0/src/py_pve_cloud.egg-info}/PKG-INFO +2 -2
- {py_pve_cloud-3.2.5 → py_pve_cloud-3.3.0}/src/py_pve_cloud.egg-info/requires.txt +1 -1
- py_pve_cloud-3.2.5/src/pve_cloud/_version.py +0 -1
- {py_pve_cloud-3.2.5 → py_pve_cloud-3.3.0}/LICENSE.md +0 -0
- {py_pve_cloud-3.2.5 → py_pve_cloud-3.3.0}/README.md +0 -0
- {py_pve_cloud-3.2.5 → py_pve_cloud-3.3.0}/setup.cfg +0 -0
- {py_pve_cloud-3.2.5 → py_pve_cloud-3.3.0}/src/pve_cloud/cli/pvclu.py +0 -0
- {py_pve_cloud-3.2.5 → py_pve_cloud-3.3.0}/src/pve_cloud/cli/pxrpc.py +0 -0
- {py_pve_cloud-3.2.5 → py_pve_cloud-3.3.0}/src/pve_cloud/lib/ssh.py +0 -0
- {py_pve_cloud-3.2.5 → py_pve_cloud-3.3.0}/src/pve_cloud/orm/alchemy.py +0 -0
- {py_pve_cloud-3.2.5 → py_pve_cloud-3.3.0}/src/pve_cloud/orm/alembic.ini +0 -0
- {py_pve_cloud-3.2.5 → py_pve_cloud-3.3.0}/src/pve_cloud/orm/migrations/env.py +0 -0
- {py_pve_cloud-3.2.5 → py_pve_cloud-3.3.0}/src/pve_cloud/orm/migrations/versions/04398db10434_external_cp_extra_sans.py +0 -0
- {py_pve_cloud-3.2.5 → py_pve_cloud-3.3.0}/src/pve_cloud/orm/migrations/versions/0ad803c51325_machine_type_refactor.py +0 -0
- {py_pve_cloud-3.2.5 → py_pve_cloud-3.3.0}/src/pve_cloud/orm/migrations/versions/24a548bfce3e_len_rules_enforcements.py +0 -0
- {py_pve_cloud-3.2.5 → py_pve_cloud-3.3.0}/src/pve_cloud/orm/migrations/versions/27724e407e2b_proxy_fqdn.py +0 -0
- {py_pve_cloud-3.2.5 → py_pve_cloud-3.3.0}/src/pve_cloud/orm/migrations/versions/3c95509a5de9_fix.py +0 -0
- {py_pve_cloud-3.2.5 → py_pve_cloud-3.3.0}/src/pve_cloud/orm/migrations/versions/7496c3f3b2e8_fix_secrets_constraint.py +0 -0
- {py_pve_cloud-3.2.5 → py_pve_cloud-3.3.0}/src/pve_cloud/orm/migrations/versions/7868bcd05006_migrate_old.py +0 -0
- {py_pve_cloud-3.2.5 → py_pve_cloud-3.3.0}/src/pve_cloud/orm/migrations/versions/7dea8c4ee39f_init.py +0 -0
- {py_pve_cloud-3.2.5 → py_pve_cloud-3.3.0}/src/pve_cloud/orm/migrations/versions/944a8fd5d5bc_ext_ctrl_plns.py +0 -0
- {py_pve_cloud-3.2.5 → py_pve_cloud-3.3.0}/src/pve_cloud/orm/migrations/versions/9de11ef8ba39_vm_vars_and_cloud_secrets.py +0 -0
- {py_pve_cloud-3.2.5 → py_pve_cloud-3.3.0}/src/pve_cloud/orm/migrations/versions/d9b711555be8_ext_control_plane.py +0 -0
- {py_pve_cloud-3.2.5 → py_pve_cloud-3.3.0}/src/pve_cloud/orm/migrations/versions/e60b9cc63413_ingress_generic.py +0 -0
- {py_pve_cloud-3.2.5 → py_pve_cloud-3.3.0}/src/pve_cloud/orm/migrations/versions/e6ae1e138c1f_change_scope_cloud.py +0 -0
- {py_pve_cloud-3.2.5 → py_pve_cloud-3.3.0}/src/pve_cloud/orm/migrations/versions/ee4924ac4f60_secrets_plural_type.py +0 -0
- {py_pve_cloud-3.2.5 → py_pve_cloud-3.3.0}/src/pve_cloud/orm/migrations/versions/fdcb5aa33b76_slop_firewall_seperation.py +0 -0
- {py_pve_cloud-3.2.5 → py_pve_cloud-3.3.0}/src/py_pve_cloud.egg-info/SOURCES.txt +0 -0
- {py_pve_cloud-3.2.5 → py_pve_cloud-3.3.0}/src/py_pve_cloud.egg-info/dependency_links.txt +0 -0
- {py_pve_cloud-3.2.5 → py_pve_cloud-3.3.0}/src/py_pve_cloud.egg-info/entry_points.txt +0 -0
- {py_pve_cloud-3.2.5 → py_pve_cloud-3.3.0}/src/py_pve_cloud.egg-info/top_level.txt +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: py-pve-cloud
|
|
3
|
-
Version: 3.
|
|
3
|
+
Version: 3.3.0
|
|
4
4
|
Author-email: Tobias Huebner <tobias.huebner@vmzberlin.com>
|
|
5
5
|
License-Expression: GPL-3.0-or-later
|
|
6
6
|
License-File: LICENSE.md
|
|
@@ -13,5 +13,5 @@ Requires-Dist: dnspython==2.8.0
|
|
|
13
13
|
Requires-Dist: rpyc==6.0.2
|
|
14
14
|
Requires-Dist: fabric==3.2.3
|
|
15
15
|
Requires-Dist: asyncssh==2.22.0
|
|
16
|
-
Requires-Dist: pve-cloud-schemas<3.
|
|
16
|
+
Requires-Dist: pve-cloud-schemas<3.3.0,>=3.2.0
|
|
17
17
|
Dynamic: license-file
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
__version__ = "3.3.0"
|
|
@@ -10,15 +10,15 @@ from pve_cloud_schemas.validate import (validate_cloud_dyn_inv,
|
|
|
10
10
|
from pve_cloud.cli.pvclu import (get_ssh_master_kubeconfig,
|
|
11
11
|
get_ssh_remote_master_kubeconfig)
|
|
12
12
|
from pve_cloud.cli.pxrpc import PxServiceEnum, launch_pxrpc
|
|
13
|
-
from pve_cloud.lib.inventory import (get_cloud_domain,
|
|
14
|
-
get_pve_inventory,
|
|
13
|
+
from pve_cloud.lib.inventory import (get_cloud_domain, get_cloud_dyn_inv_path,
|
|
14
|
+
get_online_pve_host, get_pve_inventory,
|
|
15
|
+
get_target_cluster)
|
|
15
16
|
from pve_cloud.lib.ssh import connect_host
|
|
16
17
|
|
|
17
|
-
inv_path = os.path.expanduser("~/.pve-cloud-dyn-inv.yaml")
|
|
18
|
-
|
|
19
18
|
|
|
20
19
|
# init_funcs needs
|
|
21
20
|
def init_dyn_inv(args, init_funcs):
|
|
21
|
+
inv_path = get_cloud_dyn_inv_path()
|
|
22
22
|
# try load current dynamic inventory
|
|
23
23
|
if os.path.exists(inv_path):
|
|
24
24
|
with open(inv_path, "r") as file:
|
|
@@ -66,10 +66,17 @@ def get_avahi_iterator():
|
|
|
66
66
|
)
|
|
67
67
|
|
|
68
68
|
|
|
69
|
+
def get_cloud_dyn_inv_path():
|
|
70
|
+
if os.getenv("PYTEST_CURRENT_TEST"):
|
|
71
|
+
return os.path.expanduser("~/.pve-cloud-e2e-dyn-inv.yaml")
|
|
72
|
+
|
|
73
|
+
return os.path.expanduser("~/.pve-cloud-dyn-inv.yaml")
|
|
74
|
+
|
|
75
|
+
|
|
69
76
|
def get_cloud_domain(target_pve):
|
|
70
|
-
inv_path =
|
|
77
|
+
inv_path = get_cloud_dyn_inv_path()
|
|
71
78
|
if os.path.exists(inv_path):
|
|
72
|
-
with open(
|
|
79
|
+
with open(inv_path, "r") as f:
|
|
73
80
|
pve_inventory = yaml.safe_load(f)
|
|
74
81
|
|
|
75
82
|
validate_cloud_dyn_inv(pve_inventory)
|
|
@@ -96,7 +103,7 @@ def get_pve_inventory(
|
|
|
96
103
|
):
|
|
97
104
|
# first we try to load the manually created inventory via pvcli connect
|
|
98
105
|
# as it takes precedence over avahi
|
|
99
|
-
inv_path =
|
|
106
|
+
inv_path = get_cloud_dyn_inv_path()
|
|
100
107
|
if os.path.exists(inv_path):
|
|
101
108
|
with open(inv_path, "r") as file:
|
|
102
109
|
dynamic_inventory = yaml.safe_load(file)
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: py-pve-cloud
|
|
3
|
-
Version: 3.
|
|
3
|
+
Version: 3.3.0
|
|
4
4
|
Author-email: Tobias Huebner <tobias.huebner@vmzberlin.com>
|
|
5
5
|
License-Expression: GPL-3.0-or-later
|
|
6
6
|
License-File: LICENSE.md
|
|
@@ -13,5 +13,5 @@ Requires-Dist: dnspython==2.8.0
|
|
|
13
13
|
Requires-Dist: rpyc==6.0.2
|
|
14
14
|
Requires-Dist: fabric==3.2.3
|
|
15
15
|
Requires-Dist: asyncssh==2.22.0
|
|
16
|
-
Requires-Dist: pve-cloud-schemas<3.
|
|
16
|
+
Requires-Dist: pve-cloud-schemas<3.3.0,>=3.2.0
|
|
17
17
|
Dynamic: license-file
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
__version__ = "3.2.5"
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{py_pve_cloud-3.2.5 → py_pve_cloud-3.3.0}/src/pve_cloud/orm/migrations/versions/3c95509a5de9_fix.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
{py_pve_cloud-3.2.5 → py_pve_cloud-3.3.0}/src/pve_cloud/orm/migrations/versions/7dea8c4ee39f_init.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|