kcli 99.0.202601100917__py3-none-any.whl → 99.0.202601131259__py3-none-any.whl

{kcli-99.0.202601100917.dist-info → kcli-99.0.202601131259.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kcli
-Version: 99.0.202601100917
+Version: 99.0.202601131259
 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.202601100917.dist-info → kcli-99.0.202601131259.dist-info}/RECORD

@@ -1,9 +1,9 @@
-kcli-99.0.202601100917.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+kcli-99.0.202601131259.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
 kvirt/cli.py,sha256=EuroGNpbC4Ze7dOtE-mjjsxZ913pOTsrrbEXIyG9bPw,265630
-kvirt/config.py,sha256=Vw_9kP7IYRk4kiY-95Ku98TWdt6ZVSGNMGFSNspoYhk,184633
+kvirt/config.py,sha256=JGXaAj4YjCl3woml15PLwJ5cNc36SzX-g9_MSbfCB2Q,184556
 kvirt/containerconfig.py,sha256=qbvOWwFlyU2F-4rZn9PLj97wDnSBIwAYA6Xlxr13OOc,2329
 kvirt/defaults.py,sha256=vZFFUI_hegVf2W2Zle0fTcSQNhcStJGWXtrBXTYE22E,12401
 kvirt/ekstoken.py,sha256=MjK_tcLFl2VKxqgTSB4ve_kybZw5dBj2H6BezGGtBpM,1475
@@ -315,7 +315,7 @@ kvirt/cluster/rke2/kcli_default.yml,sha256=CgX1rl9bGwts6on784Uy8zUb-XkldzTZJ990P
 kvirt/cluster/rke2/keepalived.conf,sha256=Sr_aHMyb5LNoWW3rtsvsRP0HurRiwfx9AS3LMZyuZHc,588
 kvirt/cluster/rke2/keepalived.sh,sha256=QMLjKiVtOa4S4-zBEnXWOoN8a6-FhNxKbSgovw-koOg,424
 kvirt/cluster/rke2/workers.yml,sha256=YTnQ9j0xqCeyaT7Kcbl_vXYrL6ps74nIMljUKb2vah4,636
-kvirt/common/__init__.py,sha256=07myuqh8f7FOmHz1T6uesWgUaWHZA-1ZzyGGvANpCEc,112907
+kvirt/common/__init__.py,sha256=fHY_nGHTqDIaHTf4GLdol6dfn_6n7XM8H-e_aaYKSTg,112358
 kvirt/common/autoscale.yaml.j2,sha256=fCKt-ooHIr0oeAIZWQLlIcVJD0msW5A7BkNyVbO6Dj0,1406
 kvirt/common/fake_kubeconfig.json,sha256=XxFI3MSxrYbA6-4U8W5vSVFxrQmOeTOxAVzc7e1ngNc,8945
 kvirt/common/ignition.j2,sha256=eZN_uM9itflZCvrakYU25HFdQLdLxqZAN9pEzYmEDCE,669
@@ -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=8MSD6k0DgUTCkx3wTj8MaPbgtDfYvi51OmccSYF5_F8,19
+kvirt/version/git,sha256=o7nxCsABJophTqCsT3DBLt0baPBK82D7B1hbANzfEdo,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.202601100917.dist-info/METADATA,sha256=gbaMD5y9D2xKrC7ggzYJrCPuKAeZME6-083VYU-eujM,4645
-kcli-99.0.202601100917.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-kcli-99.0.202601100917.dist-info/entry_points.txt,sha256=e5EB5e2acrwl3_sYA0GrjE42UMcMfiijMJqXb6TZRmQ,245
-kcli-99.0.202601100917.dist-info/top_level.txt,sha256=FwVTxtMIWdr8QBk5mTfd0f_GheFlRR_vn4zl6p5N57s,6
-kcli-99.0.202601100917.dist-info/RECORD,,
+kcli-99.0.202601131259.dist-info/METADATA,sha256=b5ZpHhc5YgKUZ5RfowLY9qaNy4wrAMmUENiWTQhvf74,4645
+kcli-99.0.202601131259.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+kcli-99.0.202601131259.dist-info/entry_points.txt,sha256=e5EB5e2acrwl3_sYA0GrjE42UMcMfiijMJqXb6TZRmQ,245
+kcli-99.0.202601131259.dist-info/top_level.txt,sha256=FwVTxtMIWdr8QBk5mTfd0f_GheFlRR_vn4zl6p5N57s,6
+kcli-99.0.202601131259.dist-info/RECORD,,

kvirt/common/__init__.py

@@ -945,16 +945,7 @@ def ssh(name, ip='', user=None, local=None, remote=None, tunnel=False, tunnelhos
             sshcommand = f'{sshcommand} "{cmd}"'
         if tunnelhost is not None and tunnelhost not in ['localhost', '127.0.0.1'] and tunnel and\
                 tunneluser is not None:
-            if insecure:
-                tunnelcommand = "-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o LogLevel=ERROR "
-            else:
-                tunnelcommand = ""
-            tunnelcommand += f"-qp {tunnelport} -W %h:%p {tunneluser}@{tunnelhost}"
-            if identityfile is not None:
-                tunnelcommand = f"-i {identityfile} {tunnelcommand}"
-            sshcommand = f"-o ProxyCommand='ssh {tunnelcommand}' {sshcommand}"
-            if ':' in ip:
-                sshcommand = sshcommand.replace(ip, f'[{ip}]')
+            sshcommand = f"-J {tunneluser}@{tunnelhost}:{tunnelport} {sshcommand}"
         if local is not None:
             sshcommand = f"-L {local} {sshcommand}"
         if remote is not None:
@@ -981,8 +972,7 @@ def scp(name, ip='', user=None, source=None, destination=None, recursive=None, t
         arguments = ''
         if tunnelhost is not None and tunnelhost not in ['localhost', '127.0.0.1'] and\
                 tunnel and tunneluser is not None:
-            h = "[%h]" if ':' in ip else "%h"
-            arguments += f"-o ProxyCommand='ssh -qp {tunnelport} -W {h}:%p {tunneluser}@{tunnelhost}'"
+            arguments += f"-J {tunneluser}@{tunnelhost}:{tunnelport}"
         if insecure:
             arguments += " -o LogLevel=quiet -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
         scpcommand = 'scp -q'

kvirt/config.py

@@ -320,7 +320,6 @@ class Kconfig(Kbaseconfig):
                         isofolder = isofolder[1:]
                     isofolder = f'[{isopool}]/{isofolder}'
                 filtervms = options.get('filtervms', VSPHERE['filtervms'])
-                filtervms = options.get('filteruser', VSPHERE['filteruser'])
                 filteruser = options.get('filteruser', VSPHERE['filteruser'])
                 filtertag = options.get('filtertag')
                 category = options.get('category', VSPHERE['category'])

kvirt/version/git

@@ -1 +1 @@
-67d8a78 2026/01/10
+5d92d70 2026/01/13