kcli 99.0.202512170917__py3-none-any.whl → 99.0.202512181208__py3-none-any.whl

{kcli-99.0.202512170917.dist-info → kcli-99.0.202512181208.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kcli
-Version: 99.0.202512170917
+Version: 99.0.202512181208
 Summary: Provisioner/Manager for Libvirt/Vsphere/Aws/Gcp/Hcloud/Kubevirt/Ovirt/Openstack/IBM Cloud and containers
 Home-page: http://github.com/karmab/kcli
 Author: Karim Boumedhel

{kcli-99.0.202512170917.dist-info → kcli-99.0.202512181208.dist-info}/RECORD

@@ -1,4 +1,4 @@
-kcli-99.0.202512170917.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+kcli-99.0.202512181208.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
 kvirt/__init__.py,sha256=eoZ6GfifbqhMLNzjlqRDVil-yyBkOmVN9ujSgJWNBlY,15
 kvirt/baseconfig.py,sha256=QG_AHI1_HAgHwIdZSm1BXkpn9pW35kTMUkFOb7UE_wY,83513
 kvirt/bottle.py,sha256=K24aCQYSylDpkxmLYGygSpAJ4MlMqMk85AMpbCWA43c,175729
@@ -390,7 +390,7 @@ kvirt/providers/fake/__init__.py,sha256=TYJe0iwO0Y7QrksKx4E63-Lxgc6WYNcjAHAq_Lwh
 kvirt/providers/gcp/__init__.py,sha256=_8qln7pO0_3MSmZ1P4X-THlTbbwFuR_a4wVCCeL0WSI,102731
 kvirt/providers/gcp/gcp-hack.service,sha256=gG35O6KTLlGqIMwrSBqb_id-h3SWm_us_yLkLfQelOw,175
 kvirt/providers/gcp/gcp-hack.sh,sha256=kH051zNphRtJe-eVi8CX28_mxP6ID1f3pSTDzvE9XzE,220
-kvirt/providers/hcloud/__init__.py,sha256=JJqL0aGHdDMQAqC45W3n1Gv53OGffNgZEql2YgalzsQ,22919
+kvirt/providers/hcloud/__init__.py,sha256=5MxO2zb63byBItwWalEUu2PYdewRyaKz_E4nJCLgUxg,23714
 kvirt/providers/ibm/__init__.py,sha256=OTGDRCwvvOZCTNGD_QXx52-9_tsBzA7Y079RAo9XL9M,66129
 kvirt/providers/kubevirt/__init__.py,sha256=NSnx2RwtRQSrrhpqLK8Fb_ye9YgJdMbkO-_wBFd7DZg,94602
 kvirt/providers/kvm/__init__.py,sha256=j6ZtyemdHJWvvgKeL3ZtG1IW5k_0hlknqxeepaz3rNg,195464
@@ -403,7 +403,7 @@ kvirt/providers/vsphere/helpers.py,sha256=eJnwVGdWArTurH5ckzScvLThNJaMWeakdxBbDT
 kvirt/providers/vsphere/tagging.py,sha256=7RqFIUETSzHAjS0F_8-j145-_8lca7aDUsCxs4DhQVQ,4893
 kvirt/providers/web/__init__.py,sha256=_9fv0_x5VomFrMZqTsMLHkIRkvujmFgTxggtRctvMD0,22053
 kvirt/version/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-kvirt/version/git,sha256=EpE3A7JywrxF2DIRwNFc2c5jNZ_QvS_2LtTwoOwabLM,19
+kvirt/version/git,sha256=tbEiyHYz_uJA2vq6-d0ceABuPqgz2r6VuX5P-F-g9eY,19
 kvirt/web/__init__.py,sha256=QW-FVaQGYogXwgV2g4f0J9s0QqUI6qIyX1ruRaiI8Yk,46658
 kvirt/web/main.py,sha256=DIb6tW3ce7wCc83kD9HBCG4ALJuLItp9uaP6tzdsm_Y,261
 kvirt/web/static/css/bootstrap-notify.css,sha256=ibUTW-jDj-F8d1T1KZ4DOujRmVTFfvMKL9y14QgEaPQ,408
@@ -645,8 +645,8 @@ kvirt/web/templates/vmprofiles.html,sha256=T65Cv7povhBtD2dyuWkWJE6byaA9EYtLSk5gt
 kvirt/web/templates/vmprofilestable.html,sha256=-8viNOqSvN_yzimENxq7Q0187zbflOn8p8zpgx0Vyek,1420
 kvirt/web/templates/vms.html,sha256=k2ptKeiLFdpzgfbk6xi__sduu0UALYXXrnrmDEmAfaQ,470
 kvirt/web/templates/vmstable.html,sha256=ikuYkIm_ocvGIBXFyJt1-tBjwQWCyqkgC08leoXgR54,4894
-kcli-99.0.202512170917.dist-info/METADATA,sha256=ZQ_5Z3pcGlXPQ18eGPt53Oojmu-JfN4WDvmQVy3ANQE,4645
-kcli-99.0.202512170917.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-kcli-99.0.202512170917.dist-info/entry_points.txt,sha256=e5EB5e2acrwl3_sYA0GrjE42UMcMfiijMJqXb6TZRmQ,245
-kcli-99.0.202512170917.dist-info/top_level.txt,sha256=FwVTxtMIWdr8QBk5mTfd0f_GheFlRR_vn4zl6p5N57s,6
-kcli-99.0.202512170917.dist-info/RECORD,,
+kcli-99.0.202512181208.dist-info/METADATA,sha256=J0A8xE1CdM1gmrFh0ckifzDwHahUqdChBD3vc51yUA8,4645
+kcli-99.0.202512181208.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+kcli-99.0.202512181208.dist-info/entry_points.txt,sha256=e5EB5e2acrwl3_sYA0GrjE42UMcMfiijMJqXb6TZRmQ,245
+kcli-99.0.202512181208.dist-info/top_level.txt,sha256=FwVTxtMIWdr8QBk5mTfd0f_GheFlRR_vn4zl6p5N57s,6
+kcli-99.0.202512181208.dist-info/RECORD,,

kvirt/providers/hcloud/__init__.py

@@ -9,7 +9,7 @@ from hcloud.load_balancers import LoadBalancerAlgorithm, LoadBalancerService, Lo
 from hcloud.load_balancers import LoadBalancerTarget
 import json
 from kvirt import common
-from kvirt.common import error, pprint, warning, get_ssh_pub_key
+from kvirt.common import error, pprint, warning, get_ssh_pub_key, pprint
 from kvirt.defaults import METADATA_FIELDS
 import os
 
@@ -31,10 +31,6 @@ class Khcloud():
                sharedfolders=[], cmdline=None, placement=[], autostart=False, cpuhotplug=False, memoryhotplug=False,
                numamode=None, numa=[], pcidevices=[], tpm=False, rng=False, metadata={}, securitygroups=[],
                vmuser=None, guestagent=True):
-        location = self.location
-        if overrides.get("location", False):
-            location = self.conn.locations.get_by_name(overrides.get("location"))
-
         if self.exists(name):
             return {'result': 'failure', 'reason': f"VM {name} already exists"}
 
@@ -42,22 +38,6 @@ class Khcloud():
         if len(disks) > 0:
             disks = disks[1:]
 
-        volumeresponses = []
-        for index, disk in enumerate(disks):
-            if isinstance(disk, int):
-                disksize = disk
-            elif isinstance(disk, str) and disk.isdigit():
-                disksize = int(disk)
-            elif isinstance(disk, dict):
-                disksize = disk.get('size', '10')
-
-            diskname = f"{name}-disk{index}"
-            volumeresponse = self.conn.volumes.get_by_name(diskname)
-            if volumeresponse is None:
-                volumeresponse = self.conn.volumes.create(disksize, diskname, location=location,
-                                                          labels={"kcli-managed": "volume"})
-            volumeresponses.append(volumeresponse)
-
         if not keys:
             publickeyfile = get_ssh_pub_key()
             if publickeyfile is not None:
@@ -118,40 +98,67 @@ class Khcloud():
 
                 placement_group = response.placement_group
 
+        # If "location_options" is specified use it, otherwise "location", otherwise use self.location
+        location_options = overrides.get("location_options", [overrides.get("location", self.location.name)])
         flavor_options = overrides.get("flavor_options", [flavor] if flavor is not None else [])
 
-        for idx, flavor_option in enumerate(flavor_options):
-            servertype = self.conn.server_types.get_by_name(flavor_option)
-            if "snapshot_id" in overrides:
-                hetzner_image = self.conn.images.get_by_id(overrides.get("snapshot_id"))
-            else:
-                hetzner_image = self.conn.images.get_by_name_and_architecture(image, servertype.architecture)
-
-            try:
-                created_vm = self.conn.servers.create(
-                    name=name,
-                    server_type=servertype,
-                    image=hetzner_image,
-                    start_after_create=False,
-                    user_data=userdata,
-                    volumes=[],
-                    ssh_keys=hetzner_ssh_keys,
-                    location=location,
-                    public_net=ServerCreatePublicNetwork(enable_ipv4=False, enable_ipv6=False),
-                    labels=labels,
-                    placement_group=placement_group
-                )
-
-                created_vm.action.wait_until_finished(300)
-                break
-            except APIException as e:
-                if e.code == "resource_unavailable":
-                    msg = f"Could not get server of type '{flavor_option}' in location '{location.name}'"
-                    if len(flavor_options) > (idx + 1):
-                        warning(f"{msg}' trying the next configured flavor option.")
+        volumeresponses = []
+        for location_option in location_options:
+            location = self.conn.locations.get_by_name(location_option)
+            created_vm = None
+            for idx, flavor_option in enumerate(flavor_options):
+                if self.debug:
+                    pprint(f"Trying to create VM {name} in location {location.name} with flavor {flavor_option}")
+                servertype = self.conn.server_types.get_by_name(flavor_option)
+                if "snapshot_id" in overrides:
+                    hetzner_image = self.conn.images.get_by_id(overrides.get("snapshot_id"))
+                else:
+                    hetzner_image = self.conn.images.get_by_name_and_architecture(image, servertype.architecture)
+
+                try:
+                    created_vm = self.conn.servers.create(
+                        name=name,
+                        server_type=servertype,
+                        image=hetzner_image,
+                        start_after_create=False,
+                        user_data=userdata,
+                        volumes=[],
+                        ssh_keys=hetzner_ssh_keys,
+                        location=location,
+                        public_net=ServerCreatePublicNetwork(enable_ipv4=False, enable_ipv6=False),
+                        labels=labels,
+                        placement_group=placement_group
+                    )
+
+                    for index, disk in enumerate(disks):
+                        if isinstance(disk, int):
+                            disksize = disk
+                        elif isinstance(disk, str) and disk.isdigit():
+                            disksize = int(disk)
+                        elif isinstance(disk, dict):
+                            disksize = disk.get('size', '10')
+
+                        diskname = f"{name}-disk{index}"
+                        volumeresponse = self.conn.volumes.get_by_name(diskname)
+                        if volumeresponse is None:
+                            volumeresponse = self.conn.volumes.create(disksize, diskname, location=location,
+                                                                    labels={"kcli-managed": "volume"})
+                        volumeresponses.append(volumeresponse)
+
+                    created_vm.action.wait_until_finished(300)
+                    break
+                except APIException as e:
+                    if e.code == "resource_unavailable":
+                        msg = f"Could not get server of type '{flavor_option}' in location '{location.name}'"
+                        if len(flavor_options) > (idx + 1):
+                            warning(f"{msg}, trying the next configured flavor option.")
+                        else:
+                            warning(msg)
+                            error("No more flavors available to try. Define more flavors in 'flavor_options'.")
                     else:
-                        warning(msg)
-                        error("No more flavors available to try. Define more flavors in 'flavor_options'.")
+                        return {'result': 'failure', 'reason': json.dumps(e)}
+            if created_vm is not None:
+                break
 
         created_vm = created_vm.server
 

kvirt/version/git

@@ -1 +1 @@
-c6042e7 2025/12/17
+2269979 2025/12/18