_(Remove Images)_: -
+
diff --git a/plugins/dynamix.vm.manager/include/VMajax.php b/plugins/dynamix.vm.manager/include/VMajax.php index 6c7a05d90..fe1b839bf 100644 --- a/plugins/dynamix.vm.manager/include/VMajax.php +++ b/plugins/dynamix.vm.manager/include/VMajax.php @@ -263,6 +263,40 @@ case 'change-media': : ['error' => "Change Media Failed"]; break; +case 'change-media-both': + requireLibvirt(); + $res = $lv->get_domain_by_name($domName); + $cdroms = $lv->get_cdrom_stats($res) ; + $hda = $hdb = false ; + foreach ($lv->get_cdrom_stats($res) as $cd){ + if ($cd['device'] == 'hda') $hda = true ; + if ($cd['device'] == 'hdb') $hdb = true ; + } + $file= $_REQUEST['file']; + if ($file != "" && $hda == false) { + $cmdstr = "virsh attach-disk '$domName' '$file' hda --type cdrom --targetbus sata --config" ; + } else { + if ($file == "") $cmdstr = "virsh change-media '$domName' hda --eject --current"; + else $cmdstr = "virsh change-media '$domName' hda '$file'"; + } + $rtn=shell_exec($cmdstr) + ? ['success' => true] + : ['error' => "Change Media Failed"]; + + if (isset($rtn['error'])) return ; + + $file2 = $_REQUEST['file2']; + if ($file2 != "" && $hdb == false) { + $cmdstr = "virsh attach-disk '$domName' '$file2' hdb --type cdrom --targetbus sata --config" ; + } else { + if ($file2 == "") $cmdstr = "virsh change-media '$domName' hdb --eject --current"; + else $cmdstr = "virsh change-media '$domName' hdb '$file2' "; + } + $rtn=shell_exec($cmdstr) + ? ['success' => true] + : ['error' => "Change Media Failed"]; + break; + case 'memory-change': requireLibvirt(); $arrResponse = $lv->domain_set_memory($domName, $_REQUEST['memory']*1024) @@ -302,7 +336,7 @@ case 'snap-create': case 'snap-create-external': requireLibvirt(); - $arrResponse = vm_snapshot($domName,$_REQUEST['snapshotname']) ; + $arrResponse = vm_snapshot($domName,$_REQUEST['snapshotname'],$_REQUEST['free']) ; break; case 'snap-images': diff --git a/plugins/dynamix.vm.manager/include/libvirt.php b/plugins/dynamix.vm.manager/include/libvirt.php index 66a9c8e7f..bbf5bbac4 100644 --- a/plugins/dynamix.vm.manager/include/libvirt.php +++ b/plugins/dynamix.vm.manager/include/libvirt.php @@ -1846,7 +1846,7 @@ return false; } - function nvram_snapshot($uuid,$snapshotname) { + function nvram_create_snapshot($uuid,$snapshotname) { // snapshot backup OVMF VARS if this domain had them if (is_file('/etc/libvirt/qemu/nvram/'.$uuid.'_VARS-pure-efi.fd')) { copy('/etc/libvirt/qemu/nvram/'.$uuid.'_VARS-pure-efi.fd', '/etc/libvirt/qemu/nvram/'.$uuid.$snapshotname.'_VARS-pure-efi.fd'); @@ -1859,6 +1859,21 @@ return false; } + function nvram_revert_snapshot($uuid,$snapshotname) { + // snapshot backup OVMF VARS if this domain had them + if (is_file('/etc/libvirt/qemu/nvram/'.$uuid.$snapshotname.'_VARS-pure-efi.fd')) { + copy('/etc/libvirt/qemu/nvram/'.$uuid.$snapshotname.'_VARS-pure-efi.fd', '/etc/libvirt/qemu/nvram/'.$uuid.'_VARS-pure-efi.fd'); + unlink('/etc/libvirt/qemu/nvram/'.$uuid.$snapshotname.'_VARS-pure-efi.fd') ; + return true; + } + if (is_file('/etc/libvirt/qemu/nvram/'.$uuid.$snapshotname.'_VARS-pure-efi-tpm.fd')) { + copy('/etc/libvirt/qemu/nvram/'.$uuid.$snapshotname.'_VARS-pure-efi-tpm.fd', '/etc/libvirt/qemu/nvram/'.$uuid.'_VARS-pure-efi-tpm.fd'); + unlink('/etc/libvirt/qemu/nvram/'.$uuid.$snapshotname.'_VARS-pure-efi-tpm.fd') ; + return true; + } + return false; + } + function is_dir_empty($dir) { if (!is_readable($dir)) return NULL; $handle = opendir($dir); diff --git a/plugins/dynamix.vm.manager/include/libvirt_helpers.php b/plugins/dynamix.vm.manager/include/libvirt_helpers.php index 3a8c24a68..d7a14e3fe 100644 --- a/plugins/dynamix.vm.manager/include/libvirt_helpers.php +++ b/plugins/dynamix.vm.manager/include/libvirt_helpers.php @@ -1482,14 +1482,14 @@ private static $encoding = 'UTF-8'; $snaps[$vmsnap]["state"]= $b["state"]; $snaps[$vmsnap]["memory"]= $b["memory"]; $snaps[$vmsnap]["creationtime"]= $b["creationTime"]; - $snaps[$vmsnap]["disks"]= $b["disks"]; + if (array_key_exists(0 , $b["disks"]["disk"])) $snaps[$vmsnap]["disks"]= $b["disks"]["disk"]; else $snaps[$vmsnap]["disks"][0]= $b["disks"]["disk"]; } if (is_array($snaps)) uasort($snaps,'compare_creationtime') ; return $snaps ; } - function vm_snapshot($vm,$snapshotname,$memorysnap = "yes") { + function vm_snapshot($vm,$snapshotname,$free = "yes", $memorysnap = "yes") { global $lv ; #Get State @@ -1502,13 +1502,13 @@ private static $encoding = 'UTF-8'; $diskspec = "" ; $capacity = 0 ; if ($snapshotname == "--generate") $name= "S" . date("YmdHis") ; else $name=$snapshotname ; - $cmdstr = "virsh snapshot-create-as $vm --name $name --atomic " ; + $cmdstr = "virsh snapshot-create-as '$vm' --name '$name' --atomic " ; foreach($disks as $disk) { $file = $disk["file"] ; $pathinfo = pathinfo($file) ; $filenew = $pathinfo["dirname"].'/'.$pathinfo["filename"].'.'.$name.'qcow2' ; - $diskspec .= " --diskspec ".$disk["device"].",snapshot=external,file=".$filenew ; + $diskspec .= " --diskspec '".$disk["device"]."',snapshot=external,file='".$filenew."'" ; $capacity = $capacity + $disk["capacity"] ; } @@ -1516,8 +1516,8 @@ private static $encoding = 'UTF-8'; $mem = $lv->domain_get_memory_stats($vm) ; $memory = $mem[6] ; - if ($memorysnap = "yes") $memspec = " --memspec ".$pathinfo["dirname"].'/memory'.$name.".mem,snapshot=external" ; else $memspec = "" ; - $cmdstr = "virsh snapshot-create-as $vm --name $name --atomic" ; + if ($memorysnap = "yes") $memspec = " --memspec ".$pathinfo["dirname"].'/memory"'.$name.'".mem,snapshot=external' ; else $memspec = "" ; + $cmdstr = "virsh snapshot-create-as '$vm' --name '$name' --atomic" ; if ($state == "running") { @@ -1533,10 +1533,10 @@ private static $encoding = 'UTF-8'; $capacity *= 1 ; - #if ($dirfree < $capacity) { $arrResponse = ['error' => _("Insufficent Storage for Snapshot")]; return $arrResponse ;} + if ($free == "yes" && $dirfree < $capacity) { $arrResponse = ['error' => _("Insufficent Storage for Snapshot")]; return $arrResponse ;} #Copy nvram - if (!empty($lv->domain_get_ovmf($res))) $nvram = $lv->nvram_snapshot($lv->domain_get_uuid($vm),$name) ; + if (!empty($lv->domain_get_ovmf($res))) $nvram = $lv->nvram_create_snapshot($lv->domain_get_uuid($vm),$name) ; $test = false ; if ($test) exec($cmdstr." --print-xml 2>&1",$output,$return) ; else exec($cmdstr." 2>&1",$output,$return) ; @@ -1563,7 +1563,7 @@ private static $encoding = 'UTF-8'; foreach($disks as $disk) { $file = $disk["file"] ; $output = "" ; - exec("qemu-img info --backing-chain -U $file | grep image:",$output) ; + exec("qemu-img info --backing-chain -U '$file' | grep image:",$output) ; foreach($output as $key => $line) { $line=str_replace("image: ","",$line) ; $output[$key] = $line ; @@ -1581,7 +1581,6 @@ private static $encoding = 'UTF-8'; switch ($snapslist[$snap]['state']) { case "shutoff": - case "running": #VM must be shutdown. $res = $lv->get_domain_by_name($vm); $dom = $lv->domain_get_info($res); @@ -1594,7 +1593,7 @@ private static $encoding = 'UTF-8'; $xmlobj = custom::createArray('domain',$strXML) ; # Process disks and update path. - $disks=($snapslist[$snap]['disks']["disk"]) ; + $disks=($snapslist[$snap]['disks']) ; foreach ($disks as $disk) { $diskname = $disk["@attributes"]["name"] ; if ($diskname == "hda" || $diskname == "hdb") continue ; @@ -1602,10 +1601,9 @@ private static $encoding = 'UTF-8'; $item = array_search($path,$snaps[$vm][$diskname]) ; $newpath = $snaps[$vm][$diskname][$item + 1]; $json_info = getDiskImageInfo($newpath) ; - #echo "Newpath: $newpath image type ".$json_info["format"]."\n" ; foreach($xmlobj['devices']['disk'] as $ddk => $dd){ if ($dd['target']["@attributes"]['dev'] == $diskname) { - $xmlobj['devices']['disk'][$ddk]['source']["@attributes"]['file'] = $newpath ; + $xmlobj['devices']['disk'][$ddk]['source']["@attributes"]['file'] = "$newpath" ; $xmlobj['devices']['disk'][$ddk]['driver']["@attributes"]['type'] = $json_info["format"] ; } } @@ -1615,27 +1613,21 @@ private static $encoding = 'UTF-8'; if ($new) $arrResponse = ['success' => true] ; else $arrResponse = ['error' => $lv->get_last_error()] ; - - #echo "update xml \n" ; - - + # remove snapshot meta data and images for all snpahots. foreach ($disks as $disk) { $diskname = $disk["@attributes"]["name"] ; if ($diskname == "hda" || $diskname == "hdb") continue ; $path = $disk["source"]["@attributes"]["file"] ; - #echo "rm $path\n" ; - if (is_file($path) && $action == "yes") unlink($path) ; + if (is_file($path) && $action == "yes") unlink("$path") ; $item = array_search($path,$snaps[$vm]["r".$diskname]) ; $item++ ; while($item > 0) { if (!isset($snaps[$vm]["r".$diskname][$item])) break ; $newpath = $snaps[$vm]["r".$diskname][$item] ; - # rm $newpath - if (is_file($path) && $action == "yes") unlink($newpath) ; - #echo "rm $newpath\n" ; + if (is_file($path) && $action == "yes") unlink("$newpath") ; $item++ ; @@ -1644,23 +1636,20 @@ private static $encoding = 'UTF-8'; uasort($snapslist,'compare_creationtimelt') ; foreach($snapslist as $s) { - #var_dump($s['name']) ; $name = $s['name'] ; - #echo "delete snapshot --metadata ".$s["name"]."\n" ; #Delete Metadata only. if ($action == "yes") { - $ret = $lv->domain_snapshot_delete($vm, $name ,2) ; - #echo "Error: $ret\n" ; - } #else echo "Run domain_snapshot_delete($vm, $name ,2\n" ; + $ret = $lv->domain_snapshot_delete($vm, "$name" ,2) ; + } if ($s['name'] == $snap) break ; } #if VM was started restart. if ($state == 'running') { #echo "Restart VM\n" ; $arrResponse = $lv->domain_start($vm) ; - } #else echo "VM Shutdown\n" ; - + } + if (!empty($lv->domain_get_ovmf($res))) $nvram = $lv->nvram_revert_snapshot($lv->domain_get_uuid($vm),$name) ; break ; @@ -1708,8 +1697,7 @@ private static $encoding = 'UTF-8'; $line=str_replace("image: ","",$line) ; $output[$key] = $line ; } - - $snaps[$vm][$disk["device"]] = $output ; + $snaps[$vm][$disk["device"]] = $output ; $rev = "r".$disk["device"] ; $reversed = array_reverse($output) ; $snaps[$vm][$rev] = $reversed ; @@ -1718,13 +1706,12 @@ private static $encoding = 'UTF-8'; $diskspec .= " --diskspec ".$disk["device"].",snapshot=external,file=".$filenew ; $capacity = $capacity + $disk["capacity"] ; } - #var_dump($snaps) ; - $disks=($snapslist[$snap]['disks']["disk"]) ; - foreach ($disks as $disk) { - $diskname = $disk["@attributes"]["name"] ; + + $snapdisks= $snapslist[$snap]['disks'] ; + foreach ($snapdisks as $diskkey => $snapdisk) { + $diskname = $snapdisk["@attributes"]["name"] ; if ($diskname == "hda" || $diskname == "hdb") continue ; - $path = $disk["source"]["@attributes"]["file"] ; - #echo "rm $path\n" ; + $path = $snapdisk["source"]["@attributes"]["file"] ; if (is_file($path)) $data .= "$path
" ; $item = array_search($path,$snaps[$vm]["r".$diskname]) ; $item++ ; @@ -1733,10 +1720,7 @@ private static $encoding = 'UTF-8'; { if (!isset($snaps[$vm]["r".$diskname][$item])) break ; $newpath = $snaps[$vm]["r".$diskname][$item] ; - # rm $newpath - if (is_file($path)) $data .= "$path
" ; - #echo "rm $newpath\n" ; - + if (is_file($path)) $data .= "$newpath
" ; $item++ ; } @@ -1787,26 +1771,24 @@ private static $encoding = 'UTF-8'; $xmlobj = custom::createArray('domain',$strXML) ; # Process disks and update path. - $disks=($snapslist[$snap]['disks']["disk"]) ; + $disks=($snapslist[$snap]['disks']) ; foreach ($disks as $disk) { $diskname = $disk["@attributes"]["name"] ; if ($diskname == "hda" || $diskname == "hdb") continue ; $path = $disk["source"]["@attributes"]["file"] ; $item = array_search($path,$snaps[$vm][$diskname]) ; if (!$item) { - #if currently attached to VM error. $data = ["error" => "Image currently active for this domain."] ; return ($data) ; - } - #echo "Newpath: $newpath image type ".$json_info["format"]."\n" ; + } } - $disks=($snapslist[$snap]['disks']["disk"]) ; + $disks=($snapslist[$snap]['disks']) ; foreach ($disks as $disk) { $diskname = $disk["@attributes"]["name"] ; if ($diskname == "hda" || $diskname == "hdb") continue ; $path = $disk["source"]["@attributes"]["file"] ; - #if (is_file($path)) unlink($path) ; + #if (is_file($path)) unlink("$path") ; } #$ret = $lv->domain_snapshot_delete($vm, $snap ,2) ; From 3907be975848077f722cc136db94dddcd2eb47b3 Mon Sep 17 00:00:00 2001 From: SimonFair <39065407+SimonFair@users.noreply.github.com> Date: Thu, 11 May 2023 17:25:53 +0100 Subject: [PATCH 007/212] Add CD view to main VM detail --- .../dynamix.vm.manager/include/VMMachines.php | 29 +++++++++++++++++-- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/plugins/dynamix.vm.manager/include/VMMachines.php b/plugins/dynamix.vm.manager/include/VMMachines.php index a1df722ee..a19303379 100644 --- a/plugins/dynamix.vm.manager/include/VMMachines.php +++ b/plugins/dynamix.vm.manager/include/VMMachines.php @@ -52,6 +52,7 @@ foreach ($vms as $vm) { $image = substr($icon,-4)=='.png' ? "
"._($status)." $snapshotstcount
$snapshotstr
$snapshotstr
".my_time($snapshot["creationtime"],"H:i:s") ; $snapmenu = sprintf("onclick=\"addVMSnapContext('%s','%s','%s','%s','%s')\"", addslashes($vm),addslashes($uuid),addslashes($template),$state,$snapshot["name"]); - echo "
+_(VM Name)_:
+
+
+_(Snapshot Name)_: + + _(Check free space)_: +
+
From 0ad1be3c23996abaf510b9e9a72c5296a827a63d Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Sat, 13 May 2023 12:46:35 +0100
Subject: [PATCH 010/212] Updates to snapshots
---
plugins/dynamix.vm.manager/VMMachines.page | 45 ++++--
.../dynamix.vm.manager/include/VMMachines.php | 3 +-
plugins/dynamix.vm.manager/include/VMajax.php | 4 +-
.../include/libvirt_helpers.php | 135 +++++++++++++++---
.../javascript/vmmanager.js | 2 +-
plugins/dynamix/DashStats.page | 16 ++-
6 files changed, 167 insertions(+), 38 deletions(-)
diff --git a/plugins/dynamix.vm.manager/VMMachines.page b/plugins/dynamix.vm.manager/VMMachines.page
index fa0de4111..5438d131a 100644
--- a/plugins/dynamix.vm.manager/VMMachines.page
+++ b/plugins/dynamix.vm.manager/VMMachines.page
@@ -135,7 +135,7 @@ i.mover{margin-right:8px;display:none}
.dropdown-menu{z-index:10001}
+_(Snapshot Name)_: + + _(Check free space)_: +
+
| _(Name)_ | _(Description)_ | _(CPUs)_ | _(Memory)_ | _(vDisks/vCDs)_ | _(Graphics)_ | _(Autostart)_ | |
|---|---|---|---|---|---|---|---|
| _(Name)_ | _(Description)_ | _(CPUs)_ | _(Memory)_ | _(vDisks / vCDs)_ | _(Graphics)_ | _(Autostart)_ | |
-_(VM Name)_:
-
-
-_(Snapshot Name)_: +
+
--_(Snapshot Name)_: +
| _(VM Name)_: | + |
| _(Snapshot Name)_: |
_(Check free space)_:
- + |
| _(Description )_: | + |
+
\ No newline at end of file
diff --git a/plugins/dynamix.vm.manager/include/VMMachines.php b/plugins/dynamix.vm.manager/include/VMMachines.php
index d269f27a8..68c075827 100644
--- a/plugins/dynamix.vm.manager/include/VMMachines.php
+++ b/plugins/dynamix.vm.manager/include/VMMachines.php
@@ -21,6 +21,7 @@ require_once "$docroot/webGui/include/Helpers.php";
require_once "$docroot/plugins/dynamix.vm.manager/include/libvirt_helpers.php";
$user_prefs = '/boot/config/plugins/dynamix.vm.manager/userprefs.cfg';
+if (file_exists('/boot/config/plugins/dynamix.vm.manager/vmpreview')) $vmpreview = true ; else $vmpreview = false ;
$vms = $lv->get_domains();
if (empty($vms)) {
echo '
_(VM Name)_:
@@ -447,7 +462,11 @@ _(Snapshot Name)_:
_(Remove Images)_: - + +_(Remove Meta)_: + + +
diff --git a/plugins/dynamix.vm.manager/include/VMMachines.php b/plugins/dynamix.vm.manager/include/VMMachines.php index a19303379..d269f27a8 100644 --- a/plugins/dynamix.vm.manager/include/VMMachines.php +++ b/plugins/dynamix.vm.manager/include/VMMachines.php @@ -250,11 +250,12 @@ foreach ($vms as $vm) { $tab = " " ; foreach($snapshots as $snapshotname => $snapshot) { $snapshotstate = _(ucfirst($snapshot["state"])) ; + $snapshotdesc = $snapshot["desc"] ; $snapshotmemory = _(ucfirst($snapshot["memory"]["@attributes"]["snapshot"])) ; $snapshotparent = $snapshot["parent"]["name"] ? $snapshot["parent"]["name"] : "None"; $snapshotdatetime = my_time($snapshot["creationtime"],"Y-m-d" )."
".my_time($snapshot["creationtime"],"H:i:s") ; $snapmenu = sprintf("onclick=\"addVMSnapContext('%s','%s','%s','%s','%s')\"", addslashes($vm),addslashes($uuid),addslashes($template),$state,$snapshot["name"]); - echo "$tab|__ ".$snapshot["name"]." $snapshotdatetime $snapshotstate $snapshotparent $snapshotmemory $tab|__ ".$snapshot["name"]." $snapshotdesc $snapshotdatetime $snapshotstate $snapshotparent $snapshotmemory
Images and metadata to remove if tickbox checked.
" ; - #echo "Revert Vm: $vm snap: $snap\n" ; - $disks =$lv->get_disk_stats($vm) ; foreach($disks as $disk) { $file = $disk["file"] ; @@ -1761,16 +1756,13 @@ private static $encoding = 'UTF-8'; $reversed = array_reverse($output) ; $snaps[$vm][$rev] = $reversed ; $pathinfo = pathinfo($file) ; - $filenew = $pathinfo["dirname"].'/'.$pathinfo["filename"].'.'.$name.'qcow2' ; - $diskspec .= " --diskspec ".$disk["device"].",snapshot=external,file=".$filenew ; - $capacity = $capacity + $disk["capacity"] ; } # GetXML $strXML= $lv->domain_get_xml($res) ; $xmlobj = custom::createArray('domain',$strXML) ; - # Process disks and update path. + # Process disks. $disks=($snapslist[$snap]['disks']) ; foreach ($disks as $disk) { $diskname = $disk["@attributes"]["name"] ; @@ -1788,12 +1780,115 @@ private static $encoding = 'UTF-8'; $diskname = $disk["@attributes"]["name"] ; if ($diskname == "hda" || $diskname == "hdb") continue ; $path = $disk["source"]["@attributes"]["file"] ; - #if (is_file($path)) unlink("$path") ; + if (is_file($path)) { + if(!unlink("$path")) { + $data = ["error" => "Unable to remove image file $path"] ; + return ($data) ; + } + } } - #$ret = $lv->domain_snapshot_delete($vm, $snap ,2) ; - $data = ["success => 'true"] ; + $ret = $lv->domain_snapshot_delete($vm, $snap ,2) ; + if($ret) + $data = ["error" => "Unable to remove snap metadata $snap"] ; + else + $data = ["success => 'true"] ; + return($data) ; } + +function vm_blockcommit($vm,$path,$base,$top,$pivot,$action) { + /* + NAME + blockcommit - Start a block commit operation. + + SYNOPSIS + blockcommit [--bandwidth ] [--base ] [--shallow] [--top ] [--active] [--delete] [--wait] [--verbose] [--timeout ] [--pivot] [--keep-overlay] [--async] [--keep-relative] [--bytes]
+
+ DESCRIPTION
+ Commit changes from a snapshot down to its backing image.
+
+ OPTIONS
+ [--domain] domain name, id or uuid
+ [--path] fully-qualified path of disk
+ --bandwidth bandwidth limit in MiB/s
+ --base path of base file to commit into (default bottom of chain)
+ --shallow use backing file of top as base
+ --top path of top file to commit from (default top of chain)
+ --active trigger two-stage active commit of top file
+ --delete delete files that were successfully committed
+ --wait wait for job to complete (with --active, wait for job to sync)
+ --verbose with --wait, display the progress
+ --timeout implies --wait, abort if copy exceeds timeout (in seconds)
+ --pivot implies --active --wait, pivot when commit is synced
+ --keep-overlay implies --active --wait, quit when commit is synced
+ --async with --wait, don't wait for cancel to finish
+ --keep-relative keep the backing chain relatively referenced
+ --bytes the bandwidth limit is in bytes/s rather than MiB/s
+ */
+}
+
+function vm_blockcopy($vm,$path,$base,$top,$pivot,$action) {
+ /*
+ NAME
+ blockcopy - Start a block copy operation.
+
+ SYNOPSIS
+ blockcopy [--dest ] [--bandwidth ] [--shallow] [--reuse-external] [--blockdev] [--wait] [--verbose] [--timeout ] [--pivot] [--finish] [--async] [--xml ] [--format ] [--granularity ] [--buf-size ] [--bytes] [--transient-job] [--synchronous-writes] [--print-xml]
+
+ DESCRIPTION
+ Copy a disk backing image chain to dest.
+
+ OPTIONS
+ [--domain] domain name, id or uuid
+ [--path] fully-qualified path of source disk
+ --dest path of the copy to create
+ --bandwidth bandwidth limit in MiB/s
+ --shallow make the copy share a backing chain
+ --reuse-external reuse existing destination
+ --blockdev copy destination is block device instead of regular file
+ --wait wait for job to reach mirroring phase
+ --verbose with --wait, display the progress
+ --timeout implies --wait, abort if copy exceeds timeout (in seconds)
+ --pivot implies --wait, pivot when mirroring starts
+ --finish implies --wait, quit when mirroring starts
+ --async with --wait, don't wait for cancel to finish
+ --xml filename containing XML description of the copy destination
+ --format format of the destination file
+ --granularity power-of-two granularity to use during the copy
+ --buf-size maximum amount of in-flight data during the copy
+ --bytes the bandwidth limit is in bytes/s rather than MiB/s
+ --transient-job the copy job is not persisted if VM is turned off
+ --synchronous-writes the copy job forces guest writes to be synchronously written to the destination
+ --print-xml print the XML used to start the copy job instead of starting the job
+ */
+}
+
+function vm_blockpull($vm,$path,$base,$top,$pivot,$action) {
+ /*
+ NAME
+ blockpull - Populate a disk from its backing image.
+
+ SYNOPSIS
+ blockpull [--bandwidth ] [--base ] [--wait] [--verbose] [--timeout ] [--async] [--keep-relative] [--bytes]
+
+ DESCRIPTION
+ Populate a disk from its backing image.
+
+ OPTIONS
+ [--domain] domain name, id or uuid
+ [--path] fully-qualified path of disk
+ --bandwidth bandwidth limit in MiB/s
+ --base path of backing file in chain for a partial pull
+ --wait wait for job to finish
+ --verbose with --wait, display the progress
+ --timeout with --wait, abort if pull exceeds timeout (in seconds)
+ --async with --wait, don't wait for cancel to finish
+ --keep-relative keep the backing chain relatively referenced
+ --bytes the bandwidth limit is in bytes/s rather than MiB/s
+
+
+ */
+}
?>
diff --git a/plugins/dynamix.vm.manager/javascript/vmmanager.js b/plugins/dynamix.vm.manager/javascript/vmmanager.js
index d7ef4d57f..0654c87ac 100644
--- a/plugins/dynamix.vm.manager/javascript/vmmanager.js
+++ b/plugins/dynamix.vm.manager/javascript/vmmanager.js
@@ -151,7 +151,7 @@ function addVMContext(name, uuid, template, state, vmrcurl, vmrcprotocol, log, c
opts.push({divider:true});
opts.push({text:_("Create Snapshot"), icon:"fa-clone", action:function(e) {
e.preventDefault();
- selectsnapshot(uuid , name, "--generate" , "create",false) ;
+ selectsnapshot(uuid , name, "--generate" , "create",false,state) ;
}});
opts.push({text:_("Remove VM"), icon:"fa-minus", action:function(e) {
e.preventDefault();
diff --git a/plugins/dynamix/DashStats.page b/plugins/dynamix/DashStats.page
index 85d5167e3..f556fe7a3 100644
--- a/plugins/dynamix/DashStats.page
+++ b/plugins/dynamix/DashStats.page
@@ -766,17 +766,25 @@ function selectsnapshot(uuid, name ,snaps, opt, getlist){
if (!target ) {errorTarget(); return;}
} else target = '';
var remove = 'yes'
+ var keep = 'yes'
+ var removemeta = 'yes'
var free = 'yes'
+ var desc = ''
box.find('#targetsnap').prop('disabled',true);
if (opt == "revert") {
const x = box.find('#targetsnaprmv').prop('checked') ;
if (x) remove = 'yes' ; else remove = 'no' ;
+ x = box.find('#targetsnaprmvmeta').prop('checked') ;
+ if (x) removemeta = 'yes' ; else removemeta = 'no' ;
+ x = box.find('#targetsnapkeep').prop('checked') ;
+ if (x) keep = 'yes' ; else keep = 'no' ;
}
if (opt == "create") {
const x = box.find('#targetsnapfspc').prop('checked') ;
if (x) free = 'yes' ; else free = 'no' ;
+ var desc = box.find("#targetsnapdesc").prop('value') ;
}
- ajaxVMDispatch({action:"snap-" + opt +'-external', uuid:uuid , snapshotname:target , remove:remove, free:free } , "loadlist");
+ ajaxVMDispatch({action:"snap-" + opt +'-external', uuid:uuid , snapshotname:target , remove:remove, free:free, desc:desc } , "loadlist");
box.dialog('close');
},
"_(Cancel)_": function(){
@@ -1416,6 +1424,7 @@ $(function() {
$out"); + return $retval===0; + } + +#{action:"snap-", uuid:uuid , snapshotname:target , remove:remove, free:free ,removemeta:removemeta ,keep:keep, desc:desc} +$url = rawurldecode($argv[1]??''); +$waitID = "bob" ; +$style = [""; +$path = "--current" ; $pivot = "yes" ; $action = " " ; +write(implode($style).""); +write("","addLog\0","show_Wait\0$waitID"); + +foreach (explode('&', $url) as $chunk) { + $param = explode("=", $chunk); + if ($param) { +# write("addLog\0Parm" . sprintf("Value for parameter \"%s\" is \"%s\"
\n", urldecode($param[0]), urldecode($param[1]))); + ${urldecode($param[0])} = urldecode($param[1]) ; + } +} + +write("VMName $name "); +write("SNAP $snapshotname "); +write("Base $targetbase "); +write("Top $targettop "); +$path = "--current" ; $pivot = "yes" ; $action = " " ; +vm_blockcommit($name,$snapshotname,$path,$targetbase,$targettop,$pivot,$action) ; +#execCommand_nchan("ls /root") ; +write('_DONE_',''); + +?> \ No newline at end of file From 34c3de339e40af42d91715feedac2d83dd1caa2a Mon Sep 17 00:00:00 2001 From: SimonFair <39065407+SimonFair@users.noreply.github.com> Date: Sun, 21 May 2023 19:24:13 +0100 Subject: [PATCH 012/212] Updates for Blockcommit --- plugins/dynamix.vm.manager/VMMachines.page | 108 ++++++++++++++++-- plugins/dynamix.vm.manager/include/VMajax.php | 19 +++ .../include/libvirt_helpers.php | 97 ++++++++++++++-- .../javascript/vmmanager.js | 19 ++- plugins/dynamix/DashStats.page | 23 ++-- 5 files changed, 231 insertions(+), 35 deletions(-) diff --git a/plugins/dynamix.vm.manager/VMMachines.page b/plugins/dynamix.vm.manager/VMMachines.page index 5438d131a..0290b97fc 100644 --- a/plugins/dynamix.vm.manager/VMMachines.page +++ b/plugins/dynamix.vm.manager/VMMachines.page @@ -18,6 +18,7 @@ Markdown="false" */ ?> ; + var match= ".iso"; + var box = $("#dialogWindow2"); + box.html($("#templateblock").html()); + var height = 200; + const Capopt = opt.charAt(0).toUpperCase() + opt.slice(1) ; + var optiontext = Capopt + " Block Devices" ; + box.find('#VMName').html(name) ; + box.find('#targetsnap').val(snaps) ; + box.find('#targetsnapl').html(snaps) ; + + getlist = true ; + if (getlist) { + var only = 1 ; + if (opt == "remove") only = 0; + $.post("/plugins/dynamix.vm.manager/include/VMajax.php", {action:"snap-list", uuid:uuid }, function(data) { + if (data.html) { + var targetbase = document.getElementById("targetblockbase") ; + htmlstrbase = "" + htmlstrtop = "" + $("select.targetblockbase").replaceWith(htmlstrbase) ; + $("select.targetblocktop").replaceWith(htmlstrtop) ; + } + },'json'); + } + + document.getElementById("targetsnaprmv").checked = true ; + document.getElementById("targetsnaprmvmeta").checked = true ; + document.getElementById("targetsnapkeep").checked = true ; + document.getElementById("targetsnapfspc").checked = true ; + + box.dialog({ + title: "_("+optiontext+ ")_", + resizable: false, + width: 600, + height: 500, + modal: true, + show: {effect:'fade', duration:250}, + hide: {effect:'fade', duration:250}, + buttons: { + _("Action")_: function(){ + var target = box.find('#targetsnap'); + if (target.length) { + target = target.val(); + if (!target ) {errorTarget(); return;} + } else target = ''; + var remove = 'yes' + var keep = 'yes' + var removemeta = 'yes' + var free = 'yes' + var desc = '' + box.find('#targetsnap').prop('disabled',true); + if (opt == "create") { + var x = box.find('#targetsnapfspc').prop('checked') ; + if (x) free = 'yes' ; else free = 'no' ; + var desc = box.find("#targetsnapdesc").prop('value') ; + } + var targetbase = $('#targetblockbase').val() + var targettop = $('#targetblocktop').val() + //ajaxVMDispatch({action:"snap-", uuid:uuid , snapshotname:target , remove:remove, free:free ,removemeta:removemeta ,keep:keep, desc:desc} , "loadlist"); + Ajaxurl = "VMAjaxCall.php " + encodeURIComponent("/usr/local/emhttp/plugins/dynamix.vm.manager/include/VMajax.php&" + $.param({action:"snap-commit", name:name ,targetbase:targetbase, targettop:targettop , snapshotname:target , remove:remove, free:free ,removemeta:removemeta ,keep:keep})) ; + openPlugin((Ajaxurl),"Block Commit", "dynamix.vm.manager", "loadlist") ; + box.dialog('close'); + }, + "_(Cancel)_": function(){ + box.dialog('close'); + } + } + }); + dialogStyle(); +} + // ajaxVMDispatch({action:"snap-create-external", uuid:uuid}, "loadlist"); // ajaxVMDispatch({action:"snap-revert-external", uuid:uuid , snapshotname:snapshotname , remove:'yes'}, "loadlist"); @@ -442,13 +517,12 @@ _(CD2 ISO Image)_:
@@ -485,5 +559,25 @@ _(Snapshot Name)_:
+
\ No newline at end of file
diff --git a/plugins/dynamix.vm.manager/include/VMajax.php b/plugins/dynamix.vm.manager/include/VMajax.php
index 7f3906913..5c1fa042a 100644
--- a/plugins/dynamix.vm.manager/include/VMajax.php
+++ b/plugins/dynamix.vm.manager/include/VMajax.php
@@ -339,12 +339,31 @@ case 'snap-create-external':
$arrResponse = vm_snapshot($domName,$_REQUEST['snapshotname'],$_REQUEST['desc'],$_REQUEST['free']) ;
break;
+case 'snap-blockcommit':
+ requireLibvirt();
+ echo "Hello" ;
+ #$arrResponse = vm_snapshot($domName,'',$_REQUEST['base'],$_REQUEST['top'],"","") ;
+ break;
+
case 'snap-images':
requireLibvirt();
$html = vm_snapimages($domName,$_REQUEST['snapshotname'],$_REQUEST['only']) ;
$arrResponse = ['html' => $html , 'success' => true] ;
break;
+case 'snap-list':
+ requireLibvirt();
+ $arrResponse = ($data = getvmsnapshots($domName))
+ ? ['success' => true]
+ : ['error' => $lv->get_last_error()];
+ $datartn = "";
+ foreach($data as $snap=>$snapdetail) {
+ $snapshotdatetime = date("Y-m-d H:i:s",$snapdetail["creationtime"]) ;
+ $datartn .= "" ;
+ }
+ $arrResponse['html'] = $datartn ;
+ break;
+
case 'snap-revert-external':
requireLibvirt();
$arrResponse = vm_revert($domName,$_REQUEST['snapshotname'],$_REQUEST['remove'], $_REQUEST['removemeta']) ;
diff --git a/plugins/dynamix.vm.manager/include/libvirt_helpers.php b/plugins/dynamix.vm.manager/include/libvirt_helpers.php
index 302b66e53..b19b97fe3 100644
--- a/plugins/dynamix.vm.manager/include/libvirt_helpers.php
+++ b/plugins/dynamix.vm.manager/include/libvirt_helpers.php
@@ -1538,6 +1538,9 @@ private static $encoding = 'UTF-8';
#Copy nvram
if (!empty($lv->domain_get_ovmf($res))) $nvram = $lv->nvram_create_snapshot($lv->domain_get_uuid($vm),$name) ;
+
+ $xmlfile = $pathinfo["dirname"].'/"'.$name.'".running' ;
+ if ($state == "running") exec("virsh dumpxml '$vm' > $xmlfile",$outxml,$rtnxml) ;
$test = false ;
if ($test) exec($cmdstr." --print-xml 2>&1",$output,$return) ; else exec($cmdstr." 2>&1",$output,$return) ;
@@ -1577,8 +1580,9 @@ private static $encoding = 'UTF-8';
$capacity = $capacity + $disk["capacity"] ;
}
- switch ($snapslist[$snap]['state']) {
- case "shutoff":
+ switch ($snapslist[$snap]['state']) {
+ case "shutoff":
+ case "running":
#VM must be shutdown.
$res = $lv->get_domain_by_name($vm);
$dom = $lv->domain_get_info($res);
@@ -1596,6 +1600,10 @@ private static $encoding = 'UTF-8';
$diskname = $disk["@attributes"]["name"] ;
if ($diskname == "hda" || $diskname == "hdb") continue ;
$path = $disk["source"]["@attributes"]["file"] ;
+ if ($diskname == "hdc") {
+ $primarypathinfo = pathinfo($path) ;
+ $primarypath = $primarypathinfo['dirname'] ;
+ }
$item = array_search($path,$snaps[$vm][$diskname]) ;
$newpath = $snaps[$vm][$diskname][$item + 1];
$json_info = getDiskImageInfo($newpath) ;
@@ -1638,7 +1646,13 @@ private static $encoding = 'UTF-8';
#Delete Metadata only.
if ($actionmeta == "yes") {
$ret = $lv->domain_snapshot_delete($vm, "$name" ,2) ;
- }
+ }
+ # Remove running XML and memory.
+ $xmlfile = $primarypath."/$name.running" ;
+ $memoryfile = $primarypath."/memory$name.mem" ;
+ #var_dump(is_file($xmlfile), is_file($memoryfile)) ;
+ if (is_file($memoryfile) && $action == "yes") unlink($memoryfile) ;
+ if (is_file($xmlfile) && $action == "yes") unlink($xmlfile) ;
if ($s['name'] == $snap) break ;
}
#if VM was started restart.
@@ -1687,7 +1701,7 @@ private static $encoding = 'UTF-8';
foreach($disks as $disk) {
$file = $disk["file"] ;
$output = "" ;
- exec("qemu-img info --backing-chain -U $file | grep image:",$output) ;
+ exec("qemu-img info --backing-chain -U '$file' | grep image:",$output) ;
foreach($output as $key => $line) {
$line=str_replace("image: ","",$line) ;
$output[$key] = $line ;
@@ -1703,6 +1717,7 @@ private static $encoding = 'UTF-8';
}
$snapdisks= $snapslist[$snap]['disks'] ;
+ #var_dump($snaps) ;
foreach ($snapdisks as $diskkey => $snapdisk) {
$diskname = $snapdisk["@attributes"]["name"] ;
if ($diskname == "hda" || $diskname == "hdb") continue ;
@@ -1763,7 +1778,8 @@ private static $encoding = 'UTF-8';
$xmlobj = custom::createArray('domain',$strXML) ;
# Process disks.
- $disks=($snapslist[$snap]['disks']) ;
+ $disks=($snapslist[$snap]['disks']) ;
+ var_dump($disks,$snaps) ;
foreach ($disks as $disk) {
$diskname = $disk["@attributes"]["name"] ;
if ($diskname == "hda" || $diskname == "hdb") continue ;
@@ -1781,14 +1797,14 @@ private static $encoding = 'UTF-8';
if ($diskname == "hda" || $diskname == "hdb") continue ;
$path = $disk["source"]["@attributes"]["file"] ;
if (is_file($path)) {
- if(!unlink("$path")) {
- $data = ["error" => "Unable to remove image file $path"] ;
- return ($data) ;
- }
+ #if(!unlink("$path")) {
+ # $data = ["error" => "Unable to remove image file $path"] ;
+ # return ($data) ;
+ #}
}
}
- $ret = $lv->domain_snapshot_delete($vm, $snap ,2) ;
+ #$ret = $lv->domain_snapshot_delete($vm, $snap ,2) ;
if($ret)
$data = ["error" => "Unable to remove snap metadata $snap"] ;
else
@@ -1797,7 +1813,8 @@ private static $encoding = 'UTF-8';
return($data) ;
}
-function vm_blockcommit($vm,$path,$base,$top,$pivot,$action) {
+function vm_blockcommit($vm, $snap ,$path,$base,$top,$pivot,$action) {
+ global $lv ;
/*
NAME
blockcommit - Start a block commit operation.
@@ -1825,7 +1842,65 @@ function vm_blockcommit($vm,$path,$base,$top,$pivot,$action) {
--async with --wait, don't wait for cancel to finish
--keep-relative keep the backing chain relatively referenced
--bytes the bandwidth limit is in bytes/s rather than MiB/s
+
+ blockcommit Debian --path /mnt/user/domains/Debian/vdisk1.S20230513120410qcow2 --verbose --pivot --delete
*/
+ # Error if VM Not running.
+
+ $snapslist= getvmsnapshots($vm) ;
+ $disks =$lv->get_disk_stats($vm) ;
+ #var_dump($disks) ;
+ foreach($disks as $disk) {
+ $path = $disk['file'] ;
+ $cmdstr = "virsh blockcommit '$vm' --path '$path' --verbose --pivot --delete" ;
+ # Process disks and update path.
+ $snapdisks=($snapslist[$snap]['disks']) ;
+ if ($base != "--base" && $base != "") {
+ #get file name from snapshot.
+ $snapdisks=($snapslist[$base]['disks']) ;
+ $basepath = "" ;
+ foreach ($snapdisks as $snapdisk) {
+ $diskname = $snapdisk["@attributes"]["name"] ;
+ if ($diskname != $disk['device']) continue ;
+ $basepath = $snapdisk["source"]["@attributes"]["file"] ;
+ }
+ if ($basepath != "") $cmdstr .= " --base '$basepath' ";
+ }
+ if ($top != "--top" && $top !="") {
+ #get file name from snapshot.
+ $snapdisks=($snapslist[$top]['disks']) ;
+ $toppath = "" ;
+ foreach ($snapdisks as $snapdisk) {
+ $diskname = $snapdisk["@attributes"]["name"] ;
+ if ($diskname != $disk['device']) continue ;
+ $toppath = $snapdisk["source"]["@attributes"]["file"] ;
+ }
+ if ($toppath != "") $cmdstr .= " --top '$toppath' ";
+ }
+ if ($action) $cmdstr .= " $action ";
+
+
+ $test = false ;
+ if ($test) { $cmdstr .= " --print-xml " ; execCommand_nchan($cmdstr) ; } else execCommand_nchan($cmdstr) ;
+ #var_dump($cmdstr,$output) ;
+ if (strpos(" ".$output[0],"error") ) {
+ $arrResponse = ['error' => substr($output[0],6) ] ;
+ #return($arrResponse) ;
+ } else {
+ # Remove nvram snapshot
+ $arrResponse = ['success' => true] ;
+ }
+ #Error Check
+ }
+ #If complete ok remove meta data for snapshots.
+ if (!$test) $ret = $lv->domain_snapshot_delete($vm, $snap ,2) ;
+ if($ret)
+ $data = ["error" => "Unable to remove snap metadata $snap"] ;
+ else
+ $data = ["success => 'true"] ;
+
+ return $data ;
+
}
function vm_blockcopy($vm,$path,$base,$top,$pivot,$action) {
diff --git a/plugins/dynamix.vm.manager/javascript/vmmanager.js b/plugins/dynamix.vm.manager/javascript/vmmanager.js
index 0654c87ac..940afe673 100644
--- a/plugins/dynamix.vm.manager/javascript/vmmanager.js
+++ b/plugins/dynamix.vm.manager/javascript/vmmanager.js
@@ -106,6 +106,11 @@ function addVMContext(name, uuid, template, state, vmrcurl, vmrcprotocol, log, c
e.preventDefault();
ajaxVMDispatch( {action:"domain-destroy", uuid:uuid}, "loadlist");
}});
+ opts.push({divider:true});
+ opts.push({text:_("Create Snapshot"), icon:"fa-clone", action:function(e) {
+ e.preventDefault();
+ selectsnapshot(uuid , name, "--generate" , "create",false,state) ;
+ }});
} else if (state == "pmsuspended") {
opts.push({text:_("Resume"), icon:"fa-play", action:function(e) {
e.preventDefault();
@@ -141,7 +146,8 @@ function addVMContext(name, uuid, template, state, vmrcurl, vmrcprotocol, log, c
ajaxVMDispatchconsoleRV({action:"domain-start-consoleRV", uuid:uuid, vmrcurl:vmrcurl}, "loadlist") ;
}});
}
- }}
+ }
+ }
opts.push({divider:true});
if (log !== "") {
opts.push({text:_("Logs"), icon:"fa-navicon", action:function(e){e.preventDefault(); openTerminal('log',name,log);}});
@@ -198,10 +204,11 @@ function addVMSnapContext(name, uuid, template, state, snapshotname){
// e.preventDefault();
// ajaxVMDispatch({action:"snapshot-revert-externa", uuid:uuid, snapshotname:snapshotname}, "loadlist");
// }});
-// opts.push({text:_("Block Commit"), icon:"fa-stop", action:function(e) {
-// e.preventDefault();
-// ajaxVMDispatch({action:"domain-stop", uuid:uuid}, "loadlist");
-// }});
+ opts.push({text:_("Block Commit"), icon:"fa-hdd-o", action:function(e) {
+ $('#vm-'+uuid).find('i').removeClass('fa-play fa-square fa-pause').addClass('fa-refresh fa-spin');
+ e.preventDefault();
+ selectblock(uuid, name, snapshotname, "commit",true) ;
+ }});
// opts.push({text:_("Block Copy"), icon:"fa-stop", action:function(e) {
// e.preventDefault();
// ajaxVMDispatch({action:"domain-stop", uuid:uuid}, "loadlist");
@@ -212,7 +219,7 @@ function addVMSnapContext(name, uuid, template, state, snapshotname){
$('#vm-'+uuid).find('i').removeClass('fa-play fa-square fa-pause').addClass('fa-refresh fa-spin');
selectsnapshot(uuid, name, snapshotname, "revert",true) ;
}});
- opts.push({text:_("Remove snapshot(Delete Disabled)"), icon:"fa-trash", action:function(e) {
+ opts.push({text:_("Remove snapshot"), icon:"fa-trash", action:function(e) {
e.preventDefault();
$('#vm-'+uuid).find('i').removeClass('fa-play fa-square fa-pause').addClass('fa-refresh fa-spin');
selectsnapshot(uuid, name, snapshotname, "remove",true) ;
diff --git a/plugins/dynamix/DashStats.page b/plugins/dynamix/DashStats.page
index f556fe7a3..996ba3281 100644
--- a/plugins/dynamix/DashStats.page
+++ b/plugins/dynamix/DashStats.page
@@ -1124,8 +1124,8 @@ function sortTables() {
});
}
function addProperties() {
- $('tbody.system').addClass('sortable').attr('sort','_system_information_');
- $('tbody').not('.system').each(function(){
+ $('div.frame').find('tbody.system').addClass('sortable').attr('sort','_system_information_');
+ $('div.frame').find('tbody').not('.system').each(function(){
$(this).addClass('sortable').attr('sort',$(this).attr('title').marker());
$(this).find('td:first').prepend("");
});
@@ -1425,16 +1425,17 @@ $(function() {
-_(VM Name)_:
-
-
+
From c7b88354db031f1c896f6f633f7936098a337db6 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Wed, 24 May 2023 07:27:12 +0100
Subject: [PATCH 013/212] Make Script executable
---
.../dynamix.vm.manager/scripts/VMAjaxCall.php | 77 ++++++++++++-------
1 file changed, 51 insertions(+), 26 deletions(-)
mode change 100644 => 100755 plugins/dynamix.vm.manager/scripts/VMAjaxCall.php
diff --git a/plugins/dynamix.vm.manager/scripts/VMAjaxCall.php b/plugins/dynamix.vm.manager/scripts/VMAjaxCall.php
old mode 100644
new mode 100755
index 9e40bf79e..7fc64bf76
--- a/plugins/dynamix.vm.manager/scripts/VMAjaxCall.php
+++ b/plugins/dynamix.vm.manager/scripts/VMAjaxCall.php
@@ -12,31 +12,39 @@
?>
'http://localhost/pub/plugins?buffer_length=1',
- CURLOPT_UNIX_SOCKET_PATH => '/var/run/nginx.socket',
- CURLOPT_POST => 1,
- CURLOPT_RETURNTRANSFER => true
- ]);
- foreach ($messages as $message) {
- curl_setopt($com, CURLOPT_POSTFIELDS, $message);
- curl_exec($com);
+ $com = curl_init();
+ curl_setopt_array($com,[
+ CURLOPT_URL => 'http://localhost/pub/vmaction?buffer_length=1',
+ CURLOPT_UNIX_SOCKET_PATH => '/var/run/nginx.socket',
+ CURLOPT_POST => 1,
+ CURLOPT_RETURNTRANSFER => true
+ ]);
+ foreach ($messages as $message) {
+ curl_setopt($com, CURLOPT_POSTFIELDS, $message);
+ curl_exec($com);
+ }
+ curl_close($com);
}
- curl_close($com);
-}
function execCommand_nchan($command) {
$waitID = mt_rand();
[$cmd,$args] = explode(' ',$command,2);
write("","addLog\0","show_Wait\0$waitID");
+ write("addToID\0 99\0 $action") ;
$proc = popen("$command 2>&1",'r');
while ($out = fgets($proc)) {
$out = preg_replace("%[\t\n\x0B\f\r]+%", '',$out);
- write("addLog\0".htmlspecialchars($out));
+ write("addToID\0 99\0".htmlspecialchars($out));
+ sleep(5) ;
}
$retval = pclose($proc);
$out = $retval ? _('The command failed').'.' : _('The command finished successfully').'!';
@@ -46,31 +54,48 @@ function execCommand_nchan($command) {
#{action:"snap-", uuid:uuid , snapshotname:target , remove:remove, free:free ,removemeta:removemeta ,keep:keep, desc:desc}
$url = rawurldecode($argv[1]??'');
-$waitID = "bob" ;
+$waitID = mt_rand();
$style = ["";
-$path = "--current" ; $pivot = "yes" ; $action = " " ;
-write(implode($style)."");
-write("","addLog\0","show_Wait\0$waitID");
-
+$path = "--current" ; $pivot = "yes" ;
foreach (explode('&', $url) as $chunk) {
$param = explode("=", $chunk);
if ($param) {
-# write("addLog\0Parm" . sprintf("Value for parameter \"%s\" is \"%s\"
\n", urldecode($param[0]), urldecode($param[1]))); ${urldecode($param[0])} = urldecode($param[1]) ; } } +$id = 1 ; +write(implode($style).""); +write("addLog\0".htmlspecialchars("VMName $name ")); +write("addLog\0".htmlspecialchars("SNAP $snapshotname ")); +write("addLog\0".htmlspecialchars("Base $targetbase ")); +write("addLog\0".htmlspecialchars("Top $targettop ")); + sleep(3) ; + write("stop_Wait\0$waitID") ; +write("","addLog\0","show_Wait\0$waitID"); -write("VMName $name "); -write("SNAP $snapshotname "); -write("Base $targetbase "); -write("Top $targettop "); -$path = "--current" ; $pivot = "yes" ; $action = " " ; -vm_blockcommit($name,$snapshotname,$path,$targetbase,$targettop,$pivot,$action) ; -#execCommand_nchan("ls /root") ; + + sleep(3) ; + write("stop_Wait\0$waitID") ; +$path = "--current" ; $pivot = "yes" ; +write("addToID\0 99\0 $action") ; +switch ($action) { + case "commit": + # vm_blockcommit($name,$snapshotname,$path,$targetbase,$targettop,$pivot,' ') ; + break ; + case "copy": + # vm_blockcopy($name,$snapshotname,$path,$targetbase,$targettop,$pivot,' ') ; + break; + case "pull": + vm_blockpull($name,$snapshotname,$path,$targetbase,$targettop,$pivot,' ') ; + break ; + + } +#execCommand_nchan("ls /") ; +write("stop_Wait\0$waitID") ; write('_DONE_',''); ?> \ No newline at end of file From 0eec9f2ad72482dd478392654f1d6bf36da36c6f Mon Sep 17 00:00:00 2001 From: SimonFair <39065407+SimonFair@users.noreply.github.com> Date: Wed, 24 May 2023 07:44:29 +0100 Subject: [PATCH 014/212] WIP Update --- plugins/dynamix.vm.manager/VMMachines.page | 4 +- .../include/libvirt_helpers.php | 60 +++++++++++++++- .../javascript/vmmanager.js | 5 ++ plugins/dynamix/include/DefaultPageLayout.php | 72 ++++++++++++++++++- 4 files changed, 137 insertions(+), 4 deletions(-) diff --git a/plugins/dynamix.vm.manager/VMMachines.page b/plugins/dynamix.vm.manager/VMMachines.page index 0290b97fc..9b06fe820 100644 --- a/plugins/dynamix.vm.manager/VMMachines.page +++ b/plugins/dynamix.vm.manager/VMMachines.page @@ -389,8 +389,8 @@ function selectblock(uuid, name ,snaps, opt, getlist,state){ var targetbase = $('#targetblockbase').val() var targettop = $('#targetblocktop').val() //ajaxVMDispatch({action:"snap-", uuid:uuid , snapshotname:target , remove:remove, free:free ,removemeta:removemeta ,keep:keep, desc:desc} , "loadlist"); - Ajaxurl = "VMAjaxCall.php " + encodeURIComponent("/usr/local/emhttp/plugins/dynamix.vm.manager/include/VMajax.php&" + $.param({action:"snap-commit", name:name ,targetbase:targetbase, targettop:targettop , snapshotname:target , remove:remove, free:free ,removemeta:removemeta ,keep:keep})) ; - openPlugin((Ajaxurl),"Block Commit", "dynamix.vm.manager", "loadlist") ; + Ajaxurl = "VMAjaxCall.php " + encodeURIComponent("/usr/local/emhttp/plugins/dynamix.vm.manager/include/VMajax.php&" + $.param({action:opt , name:name ,targetbase:targetbase, targettop:targettop , snapshotname:target , remove:remove, free:free ,removemeta:removemeta ,keep:keep})) ; + openVMAction((Ajaxurl),"Block Commit", "dynamix.vm.manager", "loadlist") ; box.dialog('close'); }, "_(Cancel)_": function(){ diff --git a/plugins/dynamix.vm.manager/include/libvirt_helpers.php b/plugins/dynamix.vm.manager/include/libvirt_helpers.php index b19b97fe3..d9f08e203 100644 --- a/plugins/dynamix.vm.manager/include/libvirt_helpers.php +++ b/plugins/dynamix.vm.manager/include/libvirt_helpers.php @@ -1939,7 +1939,8 @@ function vm_blockcopy($vm,$path,$base,$top,$pivot,$action) { */ } -function vm_blockpull($vm,$path,$base,$top,$pivot,$action) { +function vm_blockpull($vm, $snap ,$path,$base,$top,$pivot,$action) { + global $lv ; /* NAME blockpull - Populate a disk from its backing image. @@ -1964,6 +1965,63 @@ function vm_blockpull($vm,$path,$base,$top,$pivot,$action) { */ + $snapslist= getvmsnapshots($vm) ; + $disks =$lv->get_disk_stats($vm) ; + #var_dump($disks) ; + foreach($disks as $disk) { + $path = $disk['file'] ; + $cmdstr = "virsh blockpull '$vm' --path '$path' --verbose --pivot --delete" ; + $cmdstr = "virsh blockpull '$vm' --path '$path' --verbose --wait" ; + # Process disks and update path. + $snapdisks=($snapslist[$snap]['disks']) ; + if ($base != "--base" && $base != "") { + #get file name from snapshot. + $snapdisks=($snapslist[$base]['disks']) ; + $basepath = "" ; + foreach ($snapdisks as $snapdisk) { + $diskname = $snapdisk["@attributes"]["name"] ; + if ($diskname != $disk['device']) continue ; + $basepath = $snapdisk["source"]["@attributes"]["file"] ; + } + if ($basepath != "") $cmdstr .= " --base '$basepath' "; + } + if ($top != "--top" && $top !="") { + #get file name from snapshot. + $snapdisks=($snapslist[$top]['disks']) ; + $toppath = "" ; + foreach ($snapdisks as $snapdisk) { + $diskname = $snapdisk["@attributes"]["name"] ; + if ($diskname != $disk['device']) continue ; + $toppath = $snapdisk["source"]["@attributes"]["file"] ; + } + if ($toppath != "") $cmdstr .= " --top '$toppath' "; + } + if ($action) $cmdstr .= " $action "; + + + $test = false ; + if ($test) { $cmdstr .= " --print-xml " ; execCommand_nchan($cmdstr) ; } else execCommand_nchan($cmdstr) ; + #var_dump($cmdstr,$output) ; + if (strpos(" ".$output[0],"error") ) { + $arrResponse = ['error' => substr($output[0],6) ] ; + #return($arrResponse) ; + } else { + # Remove nvram snapshot + $arrResponse = ['success' => true] ; + } + #Error Check + } + #If complete ok remove meta data for snapshots. + #if (!$test) $ret = $lv->domain_snapshot_delete($vm, $snap ,2) ; + if($ret) + $data = ["error" => "Unable to remove snap metadata $snap"] ; + else + $data = ["success => 'true"] ; + + return $data ; + } + + ?> diff --git a/plugins/dynamix.vm.manager/javascript/vmmanager.js b/plugins/dynamix.vm.manager/javascript/vmmanager.js index 940afe673..133dcbf35 100644 --- a/plugins/dynamix.vm.manager/javascript/vmmanager.js +++ b/plugins/dynamix.vm.manager/javascript/vmmanager.js @@ -209,6 +209,11 @@ function addVMSnapContext(name, uuid, template, state, snapshotname){ e.preventDefault(); selectblock(uuid, name, snapshotname, "commit",true) ; }}); + opts.push({text:_("Block Pull"), icon:"fa-hdd-o", action:function(e) { + $('#vm-'+uuid).find('i').removeClass('fa-play fa-square fa-pause').addClass('fa-refresh fa-spin'); + e.preventDefault(); + selectblock(uuid, name, snapshotname, "pull",true) ; + }}); // opts.push({text:_("Block Copy"), icon:"fa-stop", action:function(e) { // e.preventDefault(); // ajaxVMDispatch({action:"domain-stop", uuid:uuid}, "loadlist"); diff --git a/plugins/dynamix/include/DefaultPageLayout.php b/plugins/dynamix/include/DefaultPageLayout.php index 9d236569c..80aedd800 100644 --- a/plugins/dynamix/include/DefaultPageLayout.php +++ b/plugins/dynamix/include/DefaultPageLayout.php @@ -342,6 +342,29 @@ function openDocker(cmd,title,plg,func,start=0,button=0) { $('button.confirm').prop('disabled',button==0); }); } +function openVMAction(cmd,title,plg,func,start=0,button=0) { + // start = 0 : run command only when not already running (default) + // start = 1 : run command unconditionally + // button = 0 : hide CLOSE button (default) + // button = 1 : show CLOSE button + nchan_vmaction.start(); + $.post('/webGui/include/StartCommand.php',{cmd:cmd,start:start},function(pid) { + if (pid==0) { + nchan_docker.stop(); + $('div.spinner.fixed').hide(); + $(".upgrade_notice").addClass('alert'); + return; + } + swal({title:title,text:"
",html:true,animation:'none',showConfirmButton:button!=0,confirmButtonText:""},function(close){ + nchan_vmaction.stop(); + $('div.spinner.fixed').hide(); + $('.sweet-alert').hide('fast').removeClass('nchan'); + setTimeout(function(){bannerAlert(" ["+pid.toString().padStart(8,'0')+"]\" onclick='abortOperation("+pid+")'>",cmd,plg,func,start);}); + }); + $('.sweet-alert').addClass('nchan'); + $('button.confirm').prop('disabled',button==0); + }); +} function abortOperation(pid) { swal({title:"",text:"",html:true,animation:'none',type:'warning',showCancelButton:true,confirmButtonText:"",cancelButtonText:""},function(){ $.post('/webGui/include/StartCommand.php',{kill:pid},function() { @@ -915,7 +938,54 @@ nchan_docker.on('message', function(data) { } box.scrollTop(box[0].scrollHeight); }); - +var nchan_vmaction = new NchanSubscriber('/sub/vmaction',{subscriber:'websocket'}); +nchan_vmaction.on('message', function(data) { + if (!data || openDone(data)) return; + var box = $('pre#swaltext'); + data = data.split('\0'); + switch (data[0]) { + case 'addLog': + var rows = document.getElementsByClassName('logLine'); + if (rows.length) { + var row = rows[rows.length-1]; + row.innerHTML += data[1]+'
'; + } + break; + case 'progress': + var rows = document.getElementsByClassName('progress-'+data[1]); + if (rows.length) { + rows[rows.length-1].textContent = data[2]; + } + break; + case 'addToID': + var rows = document.getElementById(data[1]); + if (rows === null) { + rows = document.getElementsByClassName('logLine'); + if (rows.length) { + var row = rows[rows.length-1]; + row.innerHTML += 'VM ID ['+data[1]+']: '+data[2]+'.
'; + } + } else { + var rows_content = rows.getElementsByClassName('content'); + if (!rows_content.length || rows_content[rows_content.length-1].textContent != data[2]) { + rows.innerHTML += ''+data[2]+'.'; + } + } + break; + case 'show_Wait': + progress_span[data[1]] = document.getElementById('wait-'+data[1]); + progress_dots[data[1]] = setInterval(function(){if (((progress_span[data[1]].innerHTML += '.').match(/\./g)||[]).length > 9) progress_span[data[1]].innerHTML = progress_span[data[1]].innerHTML.replace(/\.+$/,'');},500); + break; + case 'stop_Wait': + clearInterval(progress_dots[data[1]]); + progress_span[data[1]].innerHTML = ''; + break; + default: + box.html(box.html()+data[0]); + break; + } + box.scrollTop(box[0].scrollHeight); +}); var backtotopoffset = 250; var backtotopduration = 500; $(window).scroll(function() { From ea5cc331356ef75e813990dca3b442903167a432 Mon Sep 17 00:00:00 2001 From: SimonFair <39065407+SimonFair@users.noreply.github.com> Date: Sun, 28 May 2023 18:46:51 +0100 Subject: [PATCH 015/212] WIP Update --- plugins/dynamix.vm.manager/VMMachines.page | 30 ++- .../dynamix.vm.manager/include/VMMachines.php | 5 +- plugins/dynamix.vm.manager/include/VMajax.php | 6 - .../include/libvirt_helpers.php | 206 +++++++++--------- .../javascript/vmmanager.js | 54 ++--- plugins/dynamix/include/DefaultPageLayout.php | 4 +- 6 files changed, 148 insertions(+), 157 deletions(-) diff --git a/plugins/dynamix.vm.manager/VMMachines.page b/plugins/dynamix.vm.manager/VMMachines.page index 9b06fe820..6a76fbd76 100644 --- a/plugins/dynamix.vm.manager/VMMachines.page +++ b/plugins/dynamix.vm.manager/VMMachines.page @@ -196,8 +196,7 @@ function getisoimageboth(uuid,dev,bus,file,dev2,bus2,file2){ "_(Update)_": function(){ var target = box.find('#target'); if (target.length) { - target = target.val(); - + target = target.val(); } else target = ''; var target2 = box.find('#target2'); if (target2.length) { @@ -359,6 +358,15 @@ function selectblock(uuid, name ,snaps, opt, getlist,state){ document.getElementById("targetsnaprmvmeta").checked = true ; document.getElementById("targetsnapkeep").checked = true ; document.getElementById("targetsnapfspc").checked = true ; + if (opt== "pull") { + $('.toprow').hide(); + $('.targetpivotrow').hide(); + $('.targetdeleterow').hide(); + } else { + $('.toprow').show(); + $('.targetpivotrow').show(); + $('.targetdeleterow').show(); + } box.dialog({ title: "_("+optiontext+ ")_", @@ -379,6 +387,8 @@ function selectblock(uuid, name ,snaps, opt, getlist,state){ var keep = 'yes' var removemeta = 'yes' var free = 'yes' + var delete_file = 'yes' + var pivot = 'yes' var desc = '' box.find('#targetsnap').prop('disabled',true); if (opt == "create") { @@ -388,7 +398,10 @@ function selectblock(uuid, name ,snaps, opt, getlist,state){ } var targetbase = $('#targetblockbase').val() var targettop = $('#targetblocktop').val() - //ajaxVMDispatch({action:"snap-", uuid:uuid , snapshotname:target , remove:remove, free:free ,removemeta:removemeta ,keep:keep, desc:desc} , "loadlist"); + x = box.find('#targetpivot').prop('checked') ; + if (x) pivot = 'yes' ; else pivot = 'no' ; + x = box.find('#targetdelete').prop('checked') ; + if (x) delete_file = 'yes' ; else delete_file = 'no' ; Ajaxurl = "VMAjaxCall.php " + encodeURIComponent("/usr/local/emhttp/plugins/dynamix.vm.manager/include/VMajax.php&" + $.param({action:opt , name:name ,targetbase:targetbase, targettop:targettop , snapshotname:target , remove:remove, free:free ,removemeta:removemeta ,keep:keep})) ; openVMAction((Ajaxurl),"Block Commit", "dynamix.vm.manager", "loadlist") ; box.dialog('close'); @@ -401,9 +414,6 @@ function selectblock(uuid, name ,snaps, opt, getlist,state){ dialogStyle(); } -// ajaxVMDispatch({action:"snap-create-external", uuid:uuid}, "loadlist"); - // ajaxVMDispatch({action:"snap-revert-external", uuid:uuid , snapshotname:snapshotname , remove:'yes'}, "loadlist"); - function dialogStyle() { $('.ui-dialog-titlebar-close').css({'background':'transparent','border':'none','font-size':'1.8rem','margin-top':'-14px','margin-right':'-18px'}).html('').prop('title'); $('.ui-dialog-title').css({'text-align':'center','width':'100%','font-size':'1.8rem'}); @@ -571,13 +581,15 @@ _(Snapshot Name)_:_(Base Image)_:
_(Top Image )_:
+ _(Top Image )_:
+ _(Pivot)_:
+ _(Delete)_:
+
-
@@ -447,7 +462,11 @@ _(Snapshot Name)_:
_(Remove Images)_: - + +_(Remove Meta)_: + + +
diff --git a/plugins/dynamix.vm.manager/include/VMMachines.php b/plugins/dynamix.vm.manager/include/VMMachines.php index a19303379..d269f27a8 100644 --- a/plugins/dynamix.vm.manager/include/VMMachines.php +++ b/plugins/dynamix.vm.manager/include/VMMachines.php @@ -250,11 +250,12 @@ foreach ($vms as $vm) { $tab = " " ; foreach($snapshots as $snapshotname => $snapshot) { $snapshotstate = _(ucfirst($snapshot["state"])) ; + $snapshotdesc = $snapshot["desc"] ; $snapshotmemory = _(ucfirst($snapshot["memory"]["@attributes"]["snapshot"])) ; $snapshotparent = $snapshot["parent"]["name"] ? $snapshot["parent"]["name"] : "None"; $snapshotdatetime = my_time($snapshot["creationtime"],"Y-m-d" )."
".my_time($snapshot["creationtime"],"H:i:s") ; $snapmenu = sprintf("onclick=\"addVMSnapContext('%s','%s','%s','%s','%s')\"", addslashes($vm),addslashes($uuid),addslashes($template),$state,$snapshot["name"]); - echo "
Images and metadata to remove if tickbox checked.
" ; - #echo "Revert Vm: $vm snap: $snap\n" ; - $disks =$lv->get_disk_stats($vm) ; foreach($disks as $disk) { $file = $disk["file"] ; @@ -1761,16 +1756,13 @@ private static $encoding = 'UTF-8'; $reversed = array_reverse($output) ; $snaps[$vm][$rev] = $reversed ; $pathinfo = pathinfo($file) ; - $filenew = $pathinfo["dirname"].'/'.$pathinfo["filename"].'.'.$name.'qcow2' ; - $diskspec .= " --diskspec ".$disk["device"].",snapshot=external,file=".$filenew ; - $capacity = $capacity + $disk["capacity"] ; } # GetXML $strXML= $lv->domain_get_xml($res) ; $xmlobj = custom::createArray('domain',$strXML) ; - # Process disks and update path. + # Process disks. $disks=($snapslist[$snap]['disks']) ; foreach ($disks as $disk) { $diskname = $disk["@attributes"]["name"] ; @@ -1788,12 +1780,115 @@ private static $encoding = 'UTF-8'; $diskname = $disk["@attributes"]["name"] ; if ($diskname == "hda" || $diskname == "hdb") continue ; $path = $disk["source"]["@attributes"]["file"] ; - #if (is_file($path)) unlink("$path") ; + if (is_file($path)) { + if(!unlink("$path")) { + $data = ["error" => "Unable to remove image file $path"] ; + return ($data) ; + } + } } - #$ret = $lv->domain_snapshot_delete($vm, $snap ,2) ; - $data = ["success => 'true"] ; + $ret = $lv->domain_snapshot_delete($vm, $snap ,2) ; + if($ret) + $data = ["error" => "Unable to remove snap metadata $snap"] ; + else + $data = ["success => 'true"] ; + return($data) ; } + +function vm_blockcommit($vm,$path,$base,$top,$pivot,$action) { + /* + NAME + blockcommit - Start a block commit operation. + + SYNOPSIS + blockcommit
+
_(VM Name)_:
+
+
From 1911da7fc38e28c8310d273f33e1e48364b9fcee Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Sun, 21 May 2023 19:04:35 +0100
Subject: [PATCH 011/212] Add VMAjaxCall for Block commands
---
.../dynamix.vm.manager/scripts/VMAjaxCall.php | 76 +++++++++++++++++++
1 file changed, 76 insertions(+)
create mode 100644 plugins/dynamix.vm.manager/scripts/VMAjaxCall.php
diff --git a/plugins/dynamix.vm.manager/scripts/VMAjaxCall.php b/plugins/dynamix.vm.manager/scripts/VMAjaxCall.php
new file mode 100644
index 000000000..9e40bf79e
--- /dev/null
+++ b/plugins/dynamix.vm.manager/scripts/VMAjaxCall.php
@@ -0,0 +1,76 @@
+#!/usr/bin/php -q
+
+ 'http://localhost/pub/plugins?buffer_length=1',
+ CURLOPT_UNIX_SOCKET_PATH => '/var/run/nginx.socket',
+ CURLOPT_POST => 1,
+ CURLOPT_RETURNTRANSFER => true
+ ]);
+ foreach ($messages as $message) {
+ curl_setopt($com, CURLOPT_POSTFIELDS, $message);
+ curl_exec($com);
+ }
+ curl_close($com);
+}
+function execCommand_nchan($command) {
+ $waitID = mt_rand();
+ [$cmd,$args] = explode(' ',$command,2);
+ write("","addLog\0","show_Wait\0$waitID");
+ $proc = popen("$command 2>&1",'r');
+ while ($out = fgets($proc)) {
+ $out = preg_replace("%[\t\n\x0B\f\r]+%", '',$out);
+ write("addLog\0".htmlspecialchars($out));
+ }
+ $retval = pclose($proc);
+ $out = $retval ? _('The command failed').'.' : _('The command finished successfully').'!';
+ write("stop_Wait\0$waitID","addLog\0$out"); + return $retval===0; + } + +#{action:"snap-", uuid:uuid , snapshotname:target , remove:remove, free:free ,removemeta:removemeta ,keep:keep, desc:desc} +$url = rawurldecode($argv[1]??''); +$waitID = "bob" ; +$style = [""; +$path = "--current" ; $pivot = "yes" ; $action = " " ; +write(implode($style).""); +write("","addLog\0","show_Wait\0$waitID"); + +foreach (explode('&', $url) as $chunk) { + $param = explode("=", $chunk); + if ($param) { +# write("addLog\0Parm" . sprintf("Value for parameter \"%s\" is \"%s\"
\n", urldecode($param[0]), urldecode($param[1]))); + ${urldecode($param[0])} = urldecode($param[1]) ; + } +} + +write("VMName $name "); +write("SNAP $snapshotname "); +write("Base $targetbase "); +write("Top $targettop "); +$path = "--current" ; $pivot = "yes" ; $action = " " ; +vm_blockcommit($name,$snapshotname,$path,$targetbase,$targettop,$pivot,$action) ; +#execCommand_nchan("ls /root") ; +write('_DONE_',''); + +?> \ No newline at end of file From 34c3de339e40af42d91715feedac2d83dd1caa2a Mon Sep 17 00:00:00 2001 From: SimonFair <39065407+SimonFair@users.noreply.github.com> Date: Sun, 21 May 2023 19:24:13 +0100 Subject: [PATCH 012/212] Updates for Blockcommit --- plugins/dynamix.vm.manager/VMMachines.page | 108 ++++++++++++++++-- plugins/dynamix.vm.manager/include/VMajax.php | 19 +++ .../include/libvirt_helpers.php | 97 ++++++++++++++-- .../javascript/vmmanager.js | 19 ++- plugins/dynamix/DashStats.page | 23 ++-- 5 files changed, 231 insertions(+), 35 deletions(-) diff --git a/plugins/dynamix.vm.manager/VMMachines.page b/plugins/dynamix.vm.manager/VMMachines.page index 5438d131a..0290b97fc 100644 --- a/plugins/dynamix.vm.manager/VMMachines.page +++ b/plugins/dynamix.vm.manager/VMMachines.page @@ -18,6 +18,7 @@ Markdown="false" */ ?> ; + var match= ".iso"; + var box = $("#dialogWindow2"); + box.html($("#templateblock").html()); + var height = 200; + const Capopt = opt.charAt(0).toUpperCase() + opt.slice(1) ; + var optiontext = Capopt + " Block Devices" ; + box.find('#VMName').html(name) ; + box.find('#targetsnap').val(snaps) ; + box.find('#targetsnapl').html(snaps) ; + + getlist = true ; + if (getlist) { + var only = 1 ; + if (opt == "remove") only = 0; + $.post("/plugins/dynamix.vm.manager/include/VMajax.php", {action:"snap-list", uuid:uuid }, function(data) { + if (data.html) { + var targetbase = document.getElementById("targetblockbase") ; + htmlstrbase = "" + htmlstrtop = "" + $("select.targetblockbase").replaceWith(htmlstrbase) ; + $("select.targetblocktop").replaceWith(htmlstrtop) ; + } + },'json'); + } + + document.getElementById("targetsnaprmv").checked = true ; + document.getElementById("targetsnaprmvmeta").checked = true ; + document.getElementById("targetsnapkeep").checked = true ; + document.getElementById("targetsnapfspc").checked = true ; + + box.dialog({ + title: "_("+optiontext+ ")_", + resizable: false, + width: 600, + height: 500, + modal: true, + show: {effect:'fade', duration:250}, + hide: {effect:'fade', duration:250}, + buttons: { + _("Action")_: function(){ + var target = box.find('#targetsnap'); + if (target.length) { + target = target.val(); + if (!target ) {errorTarget(); return;} + } else target = ''; + var remove = 'yes' + var keep = 'yes' + var removemeta = 'yes' + var free = 'yes' + var desc = '' + box.find('#targetsnap').prop('disabled',true); + if (opt == "create") { + var x = box.find('#targetsnapfspc').prop('checked') ; + if (x) free = 'yes' ; else free = 'no' ; + var desc = box.find("#targetsnapdesc").prop('value') ; + } + var targetbase = $('#targetblockbase').val() + var targettop = $('#targetblocktop').val() + //ajaxVMDispatch({action:"snap-", uuid:uuid , snapshotname:target , remove:remove, free:free ,removemeta:removemeta ,keep:keep, desc:desc} , "loadlist"); + Ajaxurl = "VMAjaxCall.php " + encodeURIComponent("/usr/local/emhttp/plugins/dynamix.vm.manager/include/VMajax.php&" + $.param({action:"snap-commit", name:name ,targetbase:targetbase, targettop:targettop , snapshotname:target , remove:remove, free:free ,removemeta:removemeta ,keep:keep})) ; + openPlugin((Ajaxurl),"Block Commit", "dynamix.vm.manager", "loadlist") ; + box.dialog('close'); + }, + "_(Cancel)_": function(){ + box.dialog('close'); + } + } + }); + dialogStyle(); +} + // ajaxVMDispatch({action:"snap-create-external", uuid:uuid}, "loadlist"); // ajaxVMDispatch({action:"snap-revert-external", uuid:uuid , snapshotname:snapshotname , remove:'yes'}, "loadlist"); @@ -442,13 +517,12 @@ _(CD2 ISO Image)_:
| _(VM Name)_: | - |
| _(VM Name)_: | + |
| _(Snapshot Name)_: | - - _(Check free space)_: - |
| _(Description )_: |
+
+_(VM Name)_:
+
+
+_(Snapshot Name)_: + +
+
+
+
+
+
+
+
+_(Snapshot Name)_: + +
+
+
| _(Base Image)_: | + | |
| _(Top Image )_: | + | + |
+
+
| _(VM Name)_: | + |
| _(Snapshot Name)_: | + +_(Check free space)_: + |
| _(Description )_: | + |
\n", urldecode($param[0]), urldecode($param[1]))); ${urldecode($param[0])} = urldecode($param[1]) ; } } +$id = 1 ; +write(implode($style).""); +write("addLog\0".htmlspecialchars("VMName $name ")); +write("addLog\0".htmlspecialchars("SNAP $snapshotname ")); +write("addLog\0".htmlspecialchars("Base $targetbase ")); +write("addLog\0".htmlspecialchars("Top $targettop ")); + sleep(3) ; + write("stop_Wait\0$waitID") ; +write("","addLog\0","show_Wait\0$waitID"); -write("VMName $name "); -write("SNAP $snapshotname "); -write("Base $targetbase "); -write("Top $targettop "); -$path = "--current" ; $pivot = "yes" ; $action = " " ; -vm_blockcommit($name,$snapshotname,$path,$targetbase,$targettop,$pivot,$action) ; -#execCommand_nchan("ls /root") ; + + sleep(3) ; + write("stop_Wait\0$waitID") ; +$path = "--current" ; $pivot = "yes" ; +write("addToID\0 99\0 $action") ; +switch ($action) { + case "commit": + # vm_blockcommit($name,$snapshotname,$path,$targetbase,$targettop,$pivot,' ') ; + break ; + case "copy": + # vm_blockcopy($name,$snapshotname,$path,$targetbase,$targettop,$pivot,' ') ; + break; + case "pull": + vm_blockpull($name,$snapshotname,$path,$targetbase,$targettop,$pivot,' ') ; + break ; + + } +#execCommand_nchan("ls /") ; +write("stop_Wait\0$waitID") ; write('_DONE_',''); ?> \ No newline at end of file From 0eec9f2ad72482dd478392654f1d6bf36da36c6f Mon Sep 17 00:00:00 2001 From: SimonFair <39065407+SimonFair@users.noreply.github.com> Date: Wed, 24 May 2023 07:44:29 +0100 Subject: [PATCH 014/212] WIP Update --- plugins/dynamix.vm.manager/VMMachines.page | 4 +- .../include/libvirt_helpers.php | 60 +++++++++++++++- .../javascript/vmmanager.js | 5 ++ plugins/dynamix/include/DefaultPageLayout.php | 72 ++++++++++++++++++- 4 files changed, 137 insertions(+), 4 deletions(-) diff --git a/plugins/dynamix.vm.manager/VMMachines.page b/plugins/dynamix.vm.manager/VMMachines.page index 0290b97fc..9b06fe820 100644 --- a/plugins/dynamix.vm.manager/VMMachines.page +++ b/plugins/dynamix.vm.manager/VMMachines.page @@ -389,8 +389,8 @@ function selectblock(uuid, name ,snaps, opt, getlist,state){ var targetbase = $('#targetblockbase').val() var targettop = $('#targetblocktop').val() //ajaxVMDispatch({action:"snap-", uuid:uuid , snapshotname:target , remove:remove, free:free ,removemeta:removemeta ,keep:keep, desc:desc} , "loadlist"); - Ajaxurl = "VMAjaxCall.php " + encodeURIComponent("/usr/local/emhttp/plugins/dynamix.vm.manager/include/VMajax.php&" + $.param({action:"snap-commit", name:name ,targetbase:targetbase, targettop:targettop , snapshotname:target , remove:remove, free:free ,removemeta:removemeta ,keep:keep})) ; - openPlugin((Ajaxurl),"Block Commit", "dynamix.vm.manager", "loadlist") ; + Ajaxurl = "VMAjaxCall.php " + encodeURIComponent("/usr/local/emhttp/plugins/dynamix.vm.manager/include/VMajax.php&" + $.param({action:opt , name:name ,targetbase:targetbase, targettop:targettop , snapshotname:target , remove:remove, free:free ,removemeta:removemeta ,keep:keep})) ; + openVMAction((Ajaxurl),"Block Commit", "dynamix.vm.manager", "loadlist") ; box.dialog('close'); }, "_(Cancel)_": function(){ diff --git a/plugins/dynamix.vm.manager/include/libvirt_helpers.php b/plugins/dynamix.vm.manager/include/libvirt_helpers.php index b19b97fe3..d9f08e203 100644 --- a/plugins/dynamix.vm.manager/include/libvirt_helpers.php +++ b/plugins/dynamix.vm.manager/include/libvirt_helpers.php @@ -1939,7 +1939,8 @@ function vm_blockcopy($vm,$path,$base,$top,$pivot,$action) { */ } -function vm_blockpull($vm,$path,$base,$top,$pivot,$action) { +function vm_blockpull($vm, $snap ,$path,$base,$top,$pivot,$action) { + global $lv ; /* NAME blockpull - Populate a disk from its backing image. @@ -1964,6 +1965,63 @@ function vm_blockpull($vm,$path,$base,$top,$pivot,$action) { */ + $snapslist= getvmsnapshots($vm) ; + $disks =$lv->get_disk_stats($vm) ; + #var_dump($disks) ; + foreach($disks as $disk) { + $path = $disk['file'] ; + $cmdstr = "virsh blockpull '$vm' --path '$path' --verbose --pivot --delete" ; + $cmdstr = "virsh blockpull '$vm' --path '$path' --verbose --wait" ; + # Process disks and update path. + $snapdisks=($snapslist[$snap]['disks']) ; + if ($base != "--base" && $base != "") { + #get file name from snapshot. + $snapdisks=($snapslist[$base]['disks']) ; + $basepath = "" ; + foreach ($snapdisks as $snapdisk) { + $diskname = $snapdisk["@attributes"]["name"] ; + if ($diskname != $disk['device']) continue ; + $basepath = $snapdisk["source"]["@attributes"]["file"] ; + } + if ($basepath != "") $cmdstr .= " --base '$basepath' "; + } + if ($top != "--top" && $top !="") { + #get file name from snapshot. + $snapdisks=($snapslist[$top]['disks']) ; + $toppath = "" ; + foreach ($snapdisks as $snapdisk) { + $diskname = $snapdisk["@attributes"]["name"] ; + if ($diskname != $disk['device']) continue ; + $toppath = $snapdisk["source"]["@attributes"]["file"] ; + } + if ($toppath != "") $cmdstr .= " --top '$toppath' "; + } + if ($action) $cmdstr .= " $action "; + + + $test = false ; + if ($test) { $cmdstr .= " --print-xml " ; execCommand_nchan($cmdstr) ; } else execCommand_nchan($cmdstr) ; + #var_dump($cmdstr,$output) ; + if (strpos(" ".$output[0],"error") ) { + $arrResponse = ['error' => substr($output[0],6) ] ; + #return($arrResponse) ; + } else { + # Remove nvram snapshot + $arrResponse = ['success' => true] ; + } + #Error Check + } + #If complete ok remove meta data for snapshots. + #if (!$test) $ret = $lv->domain_snapshot_delete($vm, $snap ,2) ; + if($ret) + $data = ["error" => "Unable to remove snap metadata $snap"] ; + else + $data = ["success => 'true"] ; + + return $data ; + } + + ?> diff --git a/plugins/dynamix.vm.manager/javascript/vmmanager.js b/plugins/dynamix.vm.manager/javascript/vmmanager.js index 940afe673..133dcbf35 100644 --- a/plugins/dynamix.vm.manager/javascript/vmmanager.js +++ b/plugins/dynamix.vm.manager/javascript/vmmanager.js @@ -209,6 +209,11 @@ function addVMSnapContext(name, uuid, template, state, snapshotname){ e.preventDefault(); selectblock(uuid, name, snapshotname, "commit",true) ; }}); + opts.push({text:_("Block Pull"), icon:"fa-hdd-o", action:function(e) { + $('#vm-'+uuid).find('i').removeClass('fa-play fa-square fa-pause').addClass('fa-refresh fa-spin'); + e.preventDefault(); + selectblock(uuid, name, snapshotname, "pull",true) ; + }}); // opts.push({text:_("Block Copy"), icon:"fa-stop", action:function(e) { // e.preventDefault(); // ajaxVMDispatch({action:"domain-stop", uuid:uuid}, "loadlist"); diff --git a/plugins/dynamix/include/DefaultPageLayout.php b/plugins/dynamix/include/DefaultPageLayout.php index 9d236569c..80aedd800 100644 --- a/plugins/dynamix/include/DefaultPageLayout.php +++ b/plugins/dynamix/include/DefaultPageLayout.php @@ -342,6 +342,29 @@ function openDocker(cmd,title,plg,func,start=0,button=0) { $('button.confirm').prop('disabled',button==0); }); } +function openVMAction(cmd,title,plg,func,start=0,button=0) { + // start = 0 : run command only when not already running (default) + // start = 1 : run command unconditionally + // button = 0 : hide CLOSE button (default) + // button = 1 : show CLOSE button + nchan_vmaction.start(); + $.post('/webGui/include/StartCommand.php',{cmd:cmd,start:start},function(pid) { + if (pid==0) { + nchan_docker.stop(); + $('div.spinner.fixed').hide(); + $(".upgrade_notice").addClass('alert'); + return; + } + swal({title:title,text:"
",html:true,animation:'none',showConfirmButton:button!=0,confirmButtonText:""},function(close){ + nchan_vmaction.stop(); + $('div.spinner.fixed').hide(); + $('.sweet-alert').hide('fast').removeClass('nchan'); + setTimeout(function(){bannerAlert(" ["+pid.toString().padStart(8,'0')+"]\" onclick='abortOperation("+pid+")'>",cmd,plg,func,start);}); + }); + $('.sweet-alert').addClass('nchan'); + $('button.confirm').prop('disabled',button==0); + }); +} function abortOperation(pid) { swal({title:"",text:"",html:true,animation:'none',type:'warning',showCancelButton:true,confirmButtonText:"",cancelButtonText:""},function(){ $.post('/webGui/include/StartCommand.php',{kill:pid},function() { @@ -915,7 +938,54 @@ nchan_docker.on('message', function(data) { } box.scrollTop(box[0].scrollHeight); }); - +var nchan_vmaction = new NchanSubscriber('/sub/vmaction',{subscriber:'websocket'}); +nchan_vmaction.on('message', function(data) { + if (!data || openDone(data)) return; + var box = $('pre#swaltext'); + data = data.split('\0'); + switch (data[0]) { + case 'addLog': + var rows = document.getElementsByClassName('logLine'); + if (rows.length) { + var row = rows[rows.length-1]; + row.innerHTML += data[1]+'
'; + } + break; + case 'progress': + var rows = document.getElementsByClassName('progress-'+data[1]); + if (rows.length) { + rows[rows.length-1].textContent = data[2]; + } + break; + case 'addToID': + var rows = document.getElementById(data[1]); + if (rows === null) { + rows = document.getElementsByClassName('logLine'); + if (rows.length) { + var row = rows[rows.length-1]; + row.innerHTML += 'VM ID ['+data[1]+']: '+data[2]+'.
'; + } + } else { + var rows_content = rows.getElementsByClassName('content'); + if (!rows_content.length || rows_content[rows_content.length-1].textContent != data[2]) { + rows.innerHTML += ''+data[2]+'.'; + } + } + break; + case 'show_Wait': + progress_span[data[1]] = document.getElementById('wait-'+data[1]); + progress_dots[data[1]] = setInterval(function(){if (((progress_span[data[1]].innerHTML += '.').match(/\./g)||[]).length > 9) progress_span[data[1]].innerHTML = progress_span[data[1]].innerHTML.replace(/\.+$/,'');},500); + break; + case 'stop_Wait': + clearInterval(progress_dots[data[1]]); + progress_span[data[1]].innerHTML = ''; + break; + default: + box.html(box.html()+data[0]); + break; + } + box.scrollTop(box[0].scrollHeight); +}); var backtotopoffset = 250; var backtotopduration = 500; $(window).scroll(function() { From ea5cc331356ef75e813990dca3b442903167a432 Mon Sep 17 00:00:00 2001 From: SimonFair <39065407+SimonFair@users.noreply.github.com> Date: Sun, 28 May 2023 18:46:51 +0100 Subject: [PATCH 015/212] WIP Update --- plugins/dynamix.vm.manager/VMMachines.page | 30 ++- .../dynamix.vm.manager/include/VMMachines.php | 5 +- plugins/dynamix.vm.manager/include/VMajax.php | 6 - .../include/libvirt_helpers.php | 206 +++++++++--------- .../javascript/vmmanager.js | 54 ++--- plugins/dynamix/include/DefaultPageLayout.php | 4 +- 6 files changed, 148 insertions(+), 157 deletions(-) diff --git a/plugins/dynamix.vm.manager/VMMachines.page b/plugins/dynamix.vm.manager/VMMachines.page index 9b06fe820..6a76fbd76 100644 --- a/plugins/dynamix.vm.manager/VMMachines.page +++ b/plugins/dynamix.vm.manager/VMMachines.page @@ -196,8 +196,7 @@ function getisoimageboth(uuid,dev,bus,file,dev2,bus2,file2){ "_(Update)_": function(){ var target = box.find('#target'); if (target.length) { - target = target.val(); - + target = target.val(); } else target = ''; var target2 = box.find('#target2'); if (target2.length) { @@ -359,6 +358,15 @@ function selectblock(uuid, name ,snaps, opt, getlist,state){ document.getElementById("targetsnaprmvmeta").checked = true ; document.getElementById("targetsnapkeep").checked = true ; document.getElementById("targetsnapfspc").checked = true ; + if (opt== "pull") { + $('.toprow').hide(); + $('.targetpivotrow').hide(); + $('.targetdeleterow').hide(); + } else { + $('.toprow').show(); + $('.targetpivotrow').show(); + $('.targetdeleterow').show(); + } box.dialog({ title: "_("+optiontext+ ")_", @@ -379,6 +387,8 @@ function selectblock(uuid, name ,snaps, opt, getlist,state){ var keep = 'yes' var removemeta = 'yes' var free = 'yes' + var delete_file = 'yes' + var pivot = 'yes' var desc = '' box.find('#targetsnap').prop('disabled',true); if (opt == "create") { @@ -388,7 +398,10 @@ function selectblock(uuid, name ,snaps, opt, getlist,state){ } var targetbase = $('#targetblockbase').val() var targettop = $('#targetblocktop').val() - //ajaxVMDispatch({action:"snap-", uuid:uuid , snapshotname:target , remove:remove, free:free ,removemeta:removemeta ,keep:keep, desc:desc} , "loadlist"); + x = box.find('#targetpivot').prop('checked') ; + if (x) pivot = 'yes' ; else pivot = 'no' ; + x = box.find('#targetdelete').prop('checked') ; + if (x) delete_file = 'yes' ; else delete_file = 'no' ; Ajaxurl = "VMAjaxCall.php " + encodeURIComponent("/usr/local/emhttp/plugins/dynamix.vm.manager/include/VMajax.php&" + $.param({action:opt , name:name ,targetbase:targetbase, targettop:targettop , snapshotname:target , remove:remove, free:free ,removemeta:removemeta ,keep:keep})) ; openVMAction((Ajaxurl),"Block Commit", "dynamix.vm.manager", "loadlist") ; box.dialog('close'); @@ -401,9 +414,6 @@ function selectblock(uuid, name ,snaps, opt, getlist,state){ dialogStyle(); } -// ajaxVMDispatch({action:"snap-create-external", uuid:uuid}, "loadlist"); - // ajaxVMDispatch({action:"snap-revert-external", uuid:uuid , snapshotname:snapshotname , remove:'yes'}, "loadlist"); - function dialogStyle() { $('.ui-dialog-titlebar-close').css({'background':'transparent','border':'none','font-size':'1.8rem','margin-top':'-14px','margin-right':'-18px'}).html('').prop('title'); $('.ui-dialog-title').css({'text-align':'center','width':'100%','font-size':'1.8rem'}); @@ -571,13 +581,15 @@ _(Snapshot Name)_:
".my_time($snapshot["creationtime"],"H:i:s") ; - $snapmenu = sprintf("onclick=\"addVMSnapContext('%s','%s','%s','%s','%s')\"", addslashes($vm),addslashes($uuid),addslashes($template),$state,$snapshot["name"]); + $snapmenu = sprintf("onclick=\"addVMSnapContext('%s','%s','%s','%s','%s','%s')\"", addslashes($vm),addslashes($uuid),addslashes($template),$state,$snapshot["name"],$vmpreview); echo "
'; + row.innerHTML += ''+data[1]+': '+data[2]+'.
'; } } else { var rows_content = rows.getElementsByClassName('content'); From 67f67430601af0ca1b9e243804760334feb59251 Mon Sep 17 00:00:00 2001 From: SimonFair <39065407+SimonFair@users.noreply.github.com> Date: Mon, 29 May 2023 17:07:04 +0100 Subject: [PATCH 016/212] WIP Update Remove using snapshot metadata and create own record. --- plugins/dynamix.vm.manager/VMMachines.page | 9 +- plugins/dynamix.vm.manager/include/VMajax.php | 4 +- .../include/libvirt_helpers.php | 163 ++++++++++++------ .../javascript/vmmanager.js | 12 +- .../dynamix.vm.manager/scripts/VMAjaxCall.php | 35 ++-- 5 files changed, 138 insertions(+), 85 deletions(-) diff --git a/plugins/dynamix.vm.manager/VMMachines.page b/plugins/dynamix.vm.manager/VMMachines.page index 6a76fbd76..6d32b5643 100644 --- a/plugins/dynamix.vm.manager/VMMachines.page +++ b/plugins/dynamix.vm.manager/VMMachines.page @@ -396,13 +396,14 @@ function selectblock(uuid, name ,snaps, opt, getlist,state){ if (x) free = 'yes' ; else free = 'no' ; var desc = box.find("#targetsnapdesc").prop('value') ; } - var targetbase = $('#targetblockbase').val() - var targettop = $('#targetblocktop').val() + var targetbase = box.find("#targetblockbase").prop('value') ; + var targettop = box.find("#targetblocktop").prop('value') ; + x = box.find('#targetpivot').prop('checked') ; if (x) pivot = 'yes' ; else pivot = 'no' ; x = box.find('#targetdelete').prop('checked') ; if (x) delete_file = 'yes' ; else delete_file = 'no' ; - Ajaxurl = "VMAjaxCall.php " + encodeURIComponent("/usr/local/emhttp/plugins/dynamix.vm.manager/include/VMajax.php&" + $.param({action:opt , name:name ,targetbase:targetbase, targettop:targettop , snapshotname:target , remove:remove, free:free ,removemeta:removemeta ,keep:keep})) ; + Ajaxurl = "VMAjaxCall.php " + encodeURIComponent("/usr/local/emhttp/plugins/dynamix.vm.manager/include/VMajax.php&" + $.param({action:opt , name:name ,targetbase:targetbase, targettop:targettop , snapshotname:target , remove:remove, targetpivot:pivot ,removemeta:removemeta ,targetdelete:delete_file})) ; openVMAction((Ajaxurl),"Block Commit", "dynamix.vm.manager", "loadlist") ; box.dialog('close'); }, @@ -579,7 +580,7 @@ _(Snapshot Name)_:
| _(Base Image)_: | - |
| _(Top Image )_: |
-lang="">
-
-
-
-
-
-
-
-">
-
-
-_(VM Being Cloned)_:
-
- -_(New VM)_: -
-
-_(Overwrite)_:
-
- -_(Start Cloned VM)_:
-
- -_(Edit VM after clone)_: -
- - - -
\ No newline at end of file
diff --git a/emhttp/plugins/dynamix.vm.manager/VMMachines.page b/emhttp/plugins/dynamix.vm.manager/VMMachines.page
index e53dbacea..06940322d 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMMachines.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMMachines.page
@@ -305,4 +305,42 @@ $(function() {
_(ISO Image)_:
:
+
+
+
+- -_(New VM)_: -
-
- -
- -_(Edit VM after clone)_: -
- - - -
+lang="">
+
+
+
+
+
+
+
+">
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/emhttp/plugins/dynamix.vm.manager/include/VMclone.php b/emhttp/plugins/dynamix.vm.manager/include/VMclone.php
deleted file mode 100644
index 233b74256..000000000
--- a/emhttp/plugins/dynamix.vm.manager/include/VMclone.php
+++ /dev/null
@@ -1,272 +0,0 @@
-
- '',
- 'icon' => $arrAllTemplates[$strSelectedTemplate]['icon'],
- 'autostart' => false,
- 'form' => $arrAllTemplates[$strSelectedTemplate]['form'],
- 'state' => 'shutoff'
-];
-$strIconURL = '/plugins/dynamix.vm.manager/templates/images/'.$arrLoad['icon'];
-
-if (isset($_GET['uuid'])) {
- // Edit VM mode
- $res = $lv->domain_get_domain_by_uuid(unscript($_GET['uuid']));
-
- if ($res === false) {
- echo "+
| _(VM Being Cloned)_: | +|
| _(New VM)_: | +|
| _(Overwrite)_: | +|
| _(Start Cloned VM)_: | +|
| _(Edit VM after clone)_: | +|
| _(Check Free Space)_: | +
"._('Invalid VM to edit').".
"; - return; - } - - $strIconURL = $lv->domain_get_icon_url($res); - $arrLoad = [ - 'name' => $lv->domain_get_name($res), - 'icon' => basename($strIconURL), - 'autostart' => $lv->domain_get_autostart($res), - 'form' => $arrAllTemplates[$strSelectedTemplate]['form'], - 'state' => $lv->domain_get_state($res) - ]; - - if (empty($_GET['template'])) { - // read vm-template attribute - $strTemplateOS = $lv->_get_single_xpath_result($res, '//domain/metadata/*[local-name()=\'vmtemplate\']/@os'); - $strLibreELEC = $lv->_get_single_xpath_result($res, '//domain/metadata/*[local-name()=\'vmtemplate\']/@libreelec'); - $strOpenELEC = $lv->_get_single_xpath_result($res, '//domain/metadata/*[local-name()=\'vmtemplate\']/@openelec'); - if ($strLibreELEC) $strSelectedTemplate = 'LibreELEC'; - elseif ($strOpenELEC) $strSelectedTemplate = 'OpenELEC'; - elseif ($strTemplateOS) { - $strSelectedTemplate = $lv->_get_single_xpath_result($res, '//domain/metadata/*[local-name()=\'vmtemplate\']/@name'); - } else { - // legacy VM support for <6.2 but need it going forward too - foreach ($arrAllTemplates as $strName => $arrTemplate) { - if (!empty($arrTemplate) && !empty($arrTemplate['os']) && $arrTemplate['os'] == $strTemplateOS) { - $strSelectedTemplate = $strName; - break; - } - } - } - if (empty($strSelectedTemplate) || empty($arrAllTemplates[$strSelectedTemplate])) { - $strSelectedTemplate = 'Windows 10'; //default to Windows 10 - } - } - $arrLoad['form'] = $arrAllTemplates[$strSelectedTemplate]['form']; -} -?> - - - - - - - -
-
-
-
-
-
-
-
-
diff --git a/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php b/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
index 7bf82d5cd..3a2efc8ee 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
@@ -1454,4 +1454,115 @@ private static $encoding = 'UTF-8';
if ($spicevmc || $qemuvdaagent) $copypaste = true ; else $copypaste = false ;
return $copypaste ;
}
+
+ function vm_clone($vm, $clone ,$overwrite,$start,$edit, $free, $waitID) {
+ global $lv,$domain_cfg ;
+ /*
+ Clone.
+
+ Stopped only.
+
+ Get new VM Name
+ Extract XML for VM to be cloned.
+ Check if directory exists.
+ Check for disk space
+
+ Stop VM Starting until clone is finished or fails.
+
+ Create new directory for Clone.
+ Update paths with new directory
+
+ Create new UUID
+ Create new MAC Address for NICs
+
+ Create VM Disks from source. Options full or Sparce. Method of copy?
+
+ release orginal VM to start.
+
+ If option to edit, show VMUpdate
+ */
+
+ #VM must be shutdown.
+ $res = $lv->get_domain_by_name($vm);
+ $dom = $lv->domain_get_info($res);
+ $state = $lv->domain_state_translate($dom['state']);
+ # if VM running shutdown. Record was running.
+ if ($state != 'shutdown') $arrResponse = $lv->domain_destroy($vm) ;
+ # Wait for shutdown?
+
+
+
+ $disks =$lv->get_disk_stats($vm) ;
+
+ $capacity = 0 ;
+
+ foreach($disks as $disk) {
+ $file = $disk["file"] ;
+ $pathinfo = pathinfo($file) ;
+ $filenew = $pathinfo["dirname"].'/'.$pathinfo["filename"].'.'.$name.'qcow2' ;
+ $diskspec .= " --diskspec '".$disk["device"]."',snapshot=external,file='".$filenew."'" ;
+ $capacity = $capacity + $disk["capacity"] ;
+ }
+ $dirpath = $pathinfo["dirname"] ;
+
+ #Check free space.
+ write("addLog\0".htmlspecialchars("Checking for free space"));
+ $dirfree = disk_free_space($pathinfo["dirname"]) ;
+
+ $capacity *= 1 ;
+
+ #if ($free == "yes" && $dirfree < $capacity) { $arrResponse = ['error' => _("Insufficent Storage for Clone")]; return $arrResponse ;}
+
+ #Clone XML
+ $res = $lv->domain_get_domain_by_uuid($uuid);
+
+ $strXML = $lv->domain_get_xml($res);
+ $uuid = $lv->domain_get_uuid($vm) ;
+ var_dump($uuid) ;
+ $config=domain_to_config($uuid) ;
+
+
+ #$config = array_replace_recursive($arrConfigDefaults, domain_to_config($uuid));
+ #$config = domain_to_config($uuid);
+ $config["domain"]["name"] = $clone ;
+ $config["domain"]["uuid"] = $lv->domain_generate_uuid() ;
+ $config["nic"]["0"]["mac"] = $lv->generate_random_mac_addr() ;
+ $config["domain"]["type"] = "kvm";
+
+
+ $files_exist = false ;
+ foreach ($config["disk"] as $diskid => $disk) {
+ $config["disk"][$diskid]["new"] = str_replace($name,$clonename,$config["disk"][$diskid]["new"]) ;
+ #var_dump(pathinfo($config["disk"][$diskid]["new"])) ;
+ $pi = pathinfo($config["disk"][$diskid]["new"]) ;
+ $isdir = is_dir($pi['dirname']) ;
+ if (is_file($config["disk"][$diskid]["new"])) $file_exists = true ;
+ #var_dump($isdir,$pi['dirname']) ;
+ }
+
+ $clonedir = $domain_cfg['DOMAINDIR'].$clone ;
+ #write("addLog\0".htmlspecialchars("Overwrite $overwrite Start $start Edit $edit Check Freespace $free"));
+ write("addLog\0".htmlspecialchars("Checking for image files"));
+ #if ($file_exists && $overwrite != "yes") { $arrResponse = ['error' => _("New image file names exist and Overwrite is no")]; return $arrResponse ;}
+
+ write("addLog\0".htmlspecialchars("Creating new XML $clone"));
+ $xml = $lv->config_to_xml($config) ;
+ file_put_contents("/tmp/xml" ,$xml) ;
+
+ foreach($disks as $disk) {
+ $cmdstr = "ls" ;
+ $error = execCommand_nchan($cmdstr,$path) ;
+ if (!$error) {
+ $arrResponse = ['error' => substr($output[0],6) ] ;
+ return($arrResponse) ;
+ } else {
+ $arrResponse = ['success' => true] ;
+ }
+
+ }
+ $arrResponse = ['error' => _("Insufficent Storage for Clone")];
+ return$arrResponse ;
+
+ }
+
?>
diff --git a/emhttp/plugins/dynamix.vm.manager/javascript/vmmanager.js b/emhttp/plugins/dynamix.vm.manager/javascript/vmmanager.js
index 15706b2c7..ab393079c 100644
--- a/emhttp/plugins/dynamix.vm.manager/javascript/vmmanager.js
+++ b/emhttp/plugins/dynamix.vm.manager/javascript/vmmanager.js
@@ -2,41 +2,6 @@ function displayconsole(url) {
window.open(url, '_blank', 'scrollbars=yes,resizable=yes');
}
-function getCloneName(name){
- var root = "" ;
- var match= ".iso" ;
- var box = $("#dialogWindow");
- box.html($("#templateClone").html());
-
- box.find('#VMBeingCloned').html(name).change() ;
-
- var height = 100;
- box.dialog({
- title: "Enter Clone Name",
- resizable: false,
- width: 600,
- height: 300,
- modal: true,
- show: {effect:'fade', duration:250},
- hide: {effect:'fade', duration:250},
- buttons: {
- "_(Insert)_": function(){
- var target = box.find('#target');
- if (target.length) {
- target = target.val();
- if (!target ) {errorTarget(); return;}
- } else target = '';
- box.find('#target').prop('disabled',true);
- ajaxVMDispatch({action:"change-media", uuid:uuid , cdrom:"" , dev:dev , bus:bus , file:target}, "loadlist"); ;
- box.dialog('close');
- },
- "_(Cancel)_": function(){
- box.dialog('close');
- }
- }
- });
- dialogStyle();
-}
function downloadFile(source) {
var a = document.createElement('a');
a.setAttribute('href',source);
@@ -182,25 +147,12 @@ function addVMContext(name, uuid, template, state, vmrcurl, vmrcprotocol, log, c
opts.push({text:_("Logs"), icon:"fa-navicon", action:function(e){e.preventDefault(); openTerminal('log',name,log);}});
}
opts.push({text:_("Edit"), icon:"fa-pencil", href:path+'/UpdateVM?uuid='+uuid});
- opts.push({text:_("Clone2"), icon:"fa-clone", href:path+'/CloneVM?uuid='+uuid});
if (state == "shutoff") {
opts.push({text:_("Clone"), icon:"fa-clone", action:function(e) {
e.preventDefault();
- var clonename = getCloneName(name) ;
- /*swal({
- title:_("Enter"),
- text:_("From VM:")+name,
- type:"warning",
- showCancelButton:true,
- confirmButtonText:_('Proceed'),
- cancelButtonText:_('Cancel')
- },function(){
- $('#vm-'+uuid).find('i').removeClass('fa-play fa-square fa-pause').addClass('fa-refresh fa-spin');
- ajaxVMDispatch({action:"domain-clone", uuid:uuid }, "loadlist");
- }) ;*/
-
+ var clonename = VMClone(uuid,name) ;
}});
opts.push({divider:true});
@@ -280,3 +232,95 @@ function addVM() {
if (x!=-1) path = path.substring(0,x);
location = path+"/VMTemplates";
}
+
+
+function getCloneName(uuid,name){
+ var root = "" ;
+ var match= ".iso" ;
+ var box = $("#dialogWindow");
+ box.html($("#templateClone").html());
+
+ box.find('#VMBeingCloned').html(name).change() ;
+
+ var height = 100;
+ box.dialog({
+ title: "Enter Clone Name",
+ resizable: false,
+ width: 600,
+ height: 300,
+ modal: true,
+ show: {effect:'fade', duration:250},
+ hide: {effect:'fade', duration:250},
+ buttons: {
+ "Clone": function(){
+ var target = box.find('#target');
+ if (target.length) {
+ target = target.val();
+ if (!target ) {errorTarget(); return;}
+ } else target = '';
+ box.find('#target').prop('disabled',true);
+ ajaxVMDispatch({action:"domain-clone", uuid:uuid , clone:target}, "loadlist"); ;
+ box.dialog('close');
+ },
+ "Cancel": function(){
+ box.dialog('close');
+ }
+ }
+ });
+ dialogStyle();
+}
+
+function VMClone(uuid, name){
+
+ //var root = ;
+ var match= ".iso";
+ var box = $("#dialogWindow");
+ box.html($("#templateblock").html());
+ var height = 200;
+ box.html($("#templateClone").html());
+
+ box.find('#VMBeingCloned').html(name).change() ;
+
+ //document.getElementById("targetsnaprmv").checked = true ;
+ //document.getElementById("targetsnaprmvmeta").checked = true ;
+ //document.getElementById("targetsnapkeep").checked = true ;
+ //document.getElementById("targetsnapfspc").checked = true ;
+
+ box.dialog({
+ title: "_(VM Clone)_",
+ resizable: false,
+ width: 600,
+ height: 500,
+ modal: true,
+ show: {effect:'fade', duration:250},
+ hide: {effect:'fade', duration:250},
+ buttons: {
+ "Clone" : function(){
+ var target = box.find('#target');
+ if (target.length) {
+ target = target.val();
+ if (!target ) {errorTarget(); return;}
+ } else target = '';
+
+ var clone = box.find("#target").prop('value') ;
+
+
+ x = box.find('#Start').prop('checked') ;
+ if (x) start = 'yes' ; else start = 'no' ;
+ x = box.find('#Edit').prop('checked') ;
+ if (x) edit = 'yes' ; else edit = 'no' ;
+ x = box.find('#Overwrite').prop('checked') ;
+ if (x) overwrite = 'yes' ; else overwrite = 'no' ;
+ x = box.find('#Free').prop('checked') ;
+ if (x) free = 'yes' ; else free = 'no' ;
+ scripturl = "VMClone.php " + encodeURIComponent("/usr/local/emhttp/plugins/dynamix.vm.manager/include/VMClone.php&" + $.param({action:"clone" , name:name ,clone:clone, overwrite:overwrite , edit:edit, start,start, free:free})) ;
+ openVMAction((scripturl),"VM Clone", "dynamix.vm.manager", "loadlist") ;
+ box.dialog('close');
+ },
+ "_(Cancel)_": function(){
+ box.dialog('close');
+ }
+ }
+ });
+ dialogStyle();
+}
\ No newline at end of file
diff --git a/emhttp/plugins/dynamix.vm.manager/scripts/VMClone.php b/emhttp/plugins/dynamix.vm.manager/scripts/VMClone.php
new file mode 100644
index 000000000..50d32782d
--- /dev/null
+++ b/emhttp/plugins/dynamix.vm.manager/scripts/VMClone.php
@@ -0,0 +1,90 @@
+#!/usr/bin/php -q
+
+ 'http://localhost/pub/vmaction?buffer_length=1',
+ CURLOPT_UNIX_SOCKET_PATH => '/var/run/nginx.socket',
+ CURLOPT_POST => 1,
+ CURLOPT_RETURNTRANSFER => true
+ ]);
+ foreach ($messages as $message) {
+ curl_setopt($com, CURLOPT_POSTFIELDS, $message);
+ curl_exec($com);
+ }
+ curl_close($com);
+ }
+function execCommand_nchan($command,$idx) {
+ $waitID = mt_rand();
+ [$cmd,$args] = explode(' ',$command,2);
+ write("","addLog\0","show_Wait\0$waitID");
+ write("addLog\0") ; + write("addToID\0$idx\0 $action") ; + $proc = popen("$command 2>&1",'r'); + while ($out = fgets($proc)) { + $out = preg_replace("%[\t\n\x0B\f\r]+%", '',$out); + if (substr($out,0,1) == "B") { ; + write("progress\0$idx\0".htmlspecialchars(substr($out,strrpos($out,"Block Pull")))) ; + } else echo write("addToID\0$idx\0 ".htmlspecialchars($out)); + } + $retval = pclose($proc); + $out = $retval ? _('The command failed').'.' : _('The command finished successfully').'!'; + write("stop_Wait\0$waitID","addLog\0
$out"); + return $retval===0; + } + +#{action:"snap-", uuid:uuid , snapshotname:target , remove:remove, free:free ,removemeta:removemeta ,keep:keep, desc:desc} +#VM ID [ 99]: pull. .Block Pull: [ 0 %]Block Pull: [100 %].Pull complete. +$url = rawurldecode($argv[1]??''); +$waitID = mt_rand(); +$style = [""; + +foreach (explode('&', $url) as $chunk) { + $param = explode("=", $chunk); + if ($param) { + ${urldecode($param[0])} = urldecode($param[1]) ; + } +} +$id = 1 ; +write(implode($style).""); +$process = " " ; +write("","addLog\0"); +write("addLog\0".htmlspecialchars("VMName $name ")); +write("addLog\0".htmlspecialchars("Clone $clone ")); +write("addLog\0".htmlspecialchars("Overwrite $overwrite Start $start Edit $edit Check Freespace $free")); + +switch ($action) { + case "clone": + vm_clone($name,$clone,$overwrite,$start,$edit,$free,$waitID) ; + break ; + } +#execCommand_nchan("ls /") ; +write("stop_Wait\0$waitID") ; +write('_DONE_',''); + +?> \ No newline at end of file diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout.php b/emhttp/plugins/dynamix/include/DefaultPageLayout.php index 1bf2f94dc..f3e67955f 100644 --- a/emhttp/plugins/dynamix/include/DefaultPageLayout.php +++ b/emhttp/plugins/dynamix/include/DefaultPageLayout.php @@ -342,6 +342,29 @@ function openDocker(cmd,title,plg,func,start=0,button=0) { $('button.confirm').prop('disabled',button==0); }); } +function openVMAction(cmd,title,plg,func,start=0,button=0) { + // start = 0 : run command only when not already running (default) + // start = 1 : run command unconditionally + // button = 0 : hide CLOSE button (default) + // button = 1 : show CLOSE button + nchan_vmaction.start(); + $.post('/webGui/include/StartCommand.php',{cmd:cmd,start:start},function(pid) { + if (pid==0) { + nchan_vmaction.stop(); + $('div.spinner.fixed').hide(); + $(".upgrade_notice").addClass('alert'); + return; + } + swal({title:title,text:"
",html:true,animation:'none',showConfirmButton:button!=0,confirmButtonText:""},function(close){ + nchan_vmaction.stop(); + $('div.spinner.fixed').hide(); + $('.sweet-alert').hide('fast').removeClass('nchan'); + setTimeout(function(){bannerAlert(" ["+pid.toString().padStart(8,'0')+"]\" onclick='abortOperation("+pid+")'>",cmd,plg,func,start);}); + }); + $('.sweet-alert').addClass('nchan'); + $('button.confirm').prop('disabled',button==0); + }); +} function abortOperation(pid) { swal({title:"",text:"",html:true,animation:'none',type:'warning',showCancelButton:true,confirmButtonText:"",cancelButtonText:""},function(){ $.post('/webGui/include/StartCommand.php',{kill:pid},function() { @@ -915,6 +938,54 @@ nchan_docker.on('message', function(data) { } box.scrollTop(box[0].scrollHeight); }); +var nchan_vmaction = new NchanSubscriber('/sub/vmaction',{subscriber:'websocket'}); +nchan_vmaction.on('message', function(data) { + if (!data || openDone(data)) return; + var box = $('pre#swaltext'); + data = data.split('\0'); + switch (data[0]) { + case 'addLog': + var rows = document.getElementsByClassName('logLine'); + if (rows.length) { + var row = rows[rows.length-1]; + row.innerHTML += data[1]+'
'; + } + break; + case 'progress': + var rows = document.getElementsByClassName('progress-'+data[1]); + if (rows.length) { + rows[rows.length-1].textContent = data[2]; + } + break; + case 'addToID': + var rows = document.getElementById(data[1]); + if (rows === null) { + rows = document.getElementsByClassName('logLine'); + if (rows.length) { + var row = rows[rows.length-1]; + row.innerHTML += ''+data[1]+': '+data[2]+'.
'; + } + } else { + var rows_content = rows.getElementsByClassName('content'); + if (!rows_content.length || rows_content[rows_content.length-1].textContent != data[2]) { + rows.innerHTML += ''+data[2]+'.'; + } + } + break; + case 'show_Wait': + progress_span[data[1]] = document.getElementById('wait-'+data[1]); + progress_dots[data[1]] = setInterval(function(){if (((progress_span[data[1]].innerHTML += '.').match(/\./g)||[]).length > 9) progress_span[data[1]].innerHTML = progress_span[data[1]].innerHTML.replace(/\.+$/,'');},500); + break; + case 'stop_Wait': + clearInterval(progress_dots[data[1]]); + progress_span[data[1]].innerHTML = ''; + break; + default: + box.html(box.html()+data[0]); + break; + } + box.scrollTop(box[0].scrollHeight); +}); var backtotopoffset = 250; var backtotopduration = 500; From 276406c830de993ad5147d5e6bea25c07e2cf0de Mon Sep 17 00:00:00 2001 From: SimonFair <39065407+SimonFair@users.noreply.github.com> Date: Sun, 25 Jun 2023 20:51:00 +0100 Subject: [PATCH 021/212] WIP Update --- .../dynamix.vm.manager/VMMachines.page | 2 +- .../include/libvirt_helpers.php | 49 +++++++++---------- .../javascript/vmmanager.js | 13 ++--- 3 files changed, 28 insertions(+), 36 deletions(-) diff --git a/emhttp/plugins/dynamix.vm.manager/VMMachines.page b/emhttp/plugins/dynamix.vm.manager/VMMachines.page index 579b1a05b..138664951 100644 --- a/emhttp/plugins/dynamix.vm.manager/VMMachines.page +++ b/emhttp/plugins/dynamix.vm.manager/VMMachines.page @@ -204,7 +204,7 @@ function getisoimage(uuid,dev,bus,file){ dialogStyle(); } function dialogStyle() { - $('.ui-dialog-titlebar-close').css({'background':'transparent','border':'none','font-size':'1.8rem','margin-top':'-14px','margin-right':'-18px'}).html('').prop('title',"_(Close)_").prop('onclick',null).off('click').click(function(){box.dialog('close');}); + $('.ui-dialog-titlebar-close').css({'background':'transparent','border':'none','font-size':'1.8rem','margin-top':'-14px','margin-right':'-18px'}).html('').prop('title') ; $('.ui-dialog-title').css({'text-align':'center','width':'100%','font-size':'1.8rem'}); $('.ui-dialog-content').css({'padding-top':'15px','vertical-align':'bottom'}); $('.ui-button-text').css({'padding':'0px 5px'}); diff --git a/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php b/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php index 3a2efc8ee..e80ada8a7 100644 --- a/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php +++ b/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php @@ -1490,8 +1490,6 @@ private static $encoding = 'UTF-8'; if ($state != 'shutdown') $arrResponse = $lv->domain_destroy($vm) ; # Wait for shutdown? - - $disks =$lv->get_disk_stats($vm) ; $capacity = 0 ; @@ -1511,55 +1509,52 @@ private static $encoding = 'UTF-8'; $capacity *= 1 ; - #if ($free == "yes" && $dirfree < $capacity) { $arrResponse = ['error' => _("Insufficent Storage for Clone")]; return $arrResponse ;} + if ($free == "yes" && $dirfree < $capacity) { $arrResponse = ['error' => _("Insufficent Storage for Clone")]; return $arrResponse ;} #Clone XML - $res = $lv->domain_get_domain_by_uuid($uuid); - - $strXML = $lv->domain_get_xml($res); $uuid = $lv->domain_get_uuid($vm) ; - var_dump($uuid) ; $config=domain_to_config($uuid) ; - - #$config = array_replace_recursive($arrConfigDefaults, domain_to_config($uuid)); - #$config = domain_to_config($uuid); $config["domain"]["name"] = $clone ; $config["domain"]["uuid"] = $lv->domain_generate_uuid() ; - $config["nic"]["0"]["mac"] = $lv->generate_random_mac_addr() ; + foreach($config["nic"] as $index => $detail) { + $config["nic"][$index]["mac"] = $lv->generate_random_mac_addr() ; + } $config["domain"]["type"] = "kvm"; - $files_exist = false ; foreach ($config["disk"] as $diskid => $disk) { - $config["disk"][$diskid]["new"] = str_replace($name,$clonename,$config["disk"][$diskid]["new"]) ; - #var_dump(pathinfo($config["disk"][$diskid]["new"])) ; + $config["disk"][$diskid]["new"] = str_replace($vm,$clone,$config["disk"][$diskid]["new"]) ; $pi = pathinfo($config["disk"][$diskid]["new"]) ; $isdir = is_dir($pi['dirname']) ; if (is_file($config["disk"][$diskid]["new"])) $file_exists = true ; - #var_dump($isdir,$pi['dirname']) ; + } $clonedir = $domain_cfg['DOMAINDIR'].$clone ; + if (!is_dir($clonedir)) mkdir($clonedir) ; #write("addLog\0".htmlspecialchars("Overwrite $overwrite Start $start Edit $edit Check Freespace $free")); write("addLog\0".htmlspecialchars("Checking for image files")); - #if ($file_exists && $overwrite != "yes") { $arrResponse = ['error' => _("New image file names exist and Overwrite is no")]; return $arrResponse ;} + if ($file_exists && $overwrite != "yes") { $arrResponse = ['error' => _("New image file names exist and Overwrite is no")]; return $arrResponse ;} + #Create duplicate files. + foreach($config["disk"] as $diskid => $disk) { + $cmdstr = "touch {$config['disk'][$diskid]['new']}" ; + $error = execCommand_nchan($cmdstr,$path) ; + if (!$error) { + $arrResponse = ['error' => substr($output[0],6) ] ; + return($arrResponse) ; + } else { + $arrResponse = ['success' => true] ; + } + + } + write("","addLog\0"); write("addLog\0".htmlspecialchars("Creating new XML $clone")); $xml = $lv->config_to_xml($config) ; file_put_contents("/tmp/xml" ,$xml) ; - foreach($disks as $disk) { - $cmdstr = "ls" ; - $error = execCommand_nchan($cmdstr,$path) ; - if (!$error) { - $arrResponse = ['error' => substr($output[0],6) ] ; - return($arrResponse) ; - } else { - $arrResponse = ['success' => true] ; - } - - } + $arrResponse = ['error' => _("Insufficent Storage for Clone")]; return$arrResponse ; diff --git a/emhttp/plugins/dynamix.vm.manager/javascript/vmmanager.js b/emhttp/plugins/dynamix.vm.manager/javascript/vmmanager.js index ab393079c..fed59144e 100644 --- a/emhttp/plugins/dynamix.vm.manager/javascript/vmmanager.js +++ b/emhttp/plugins/dynamix.vm.manager/javascript/vmmanager.js @@ -275,19 +275,16 @@ function VMClone(uuid, name){ //var root = ; var match= ".iso"; var box = $("#dialogWindow"); - box.html($("#templateblock").html()); var height = 200; box.html($("#templateClone").html()); - box.find('#VMBeingCloned').html(name).change() ; - - //document.getElementById("targetsnaprmv").checked = true ; - //document.getElementById("targetsnaprmvmeta").checked = true ; + document.getElementById("Free").checked = true ; + document.getElementById("Overwrite").checked = true ; //document.getElementById("targetsnapkeep").checked = true ; //document.getElementById("targetsnapfspc").checked = true ; box.dialog({ - title: "_(VM Clone)_", + title: "VM Clone", resizable: false, width: 600, height: 500, @@ -299,7 +296,7 @@ function VMClone(uuid, name){ var target = box.find('#target'); if (target.length) { target = target.val(); - if (!target ) {errorTarget(); return;} + //if (!target ) {errorTarget(); return;} } else target = ''; var clone = box.find("#target").prop('value') ; @@ -317,7 +314,7 @@ function VMClone(uuid, name){ openVMAction((scripturl),"VM Clone", "dynamix.vm.manager", "loadlist") ; box.dialog('close'); }, - "_(Cancel)_": function(){ + "Cancel": function(){ box.dialog('close'); } } From a39102314833c3c9a3998ccce6f3aee8938b5f34 Mon Sep 17 00:00:00 2001 From: SimonFair <39065407+SimonFair@users.noreply.github.com> Date: Sun, 25 Jun 2023 21:51:23 +0100 Subject: [PATCH 022/212] Make script executable --- emhttp/plugins/dynamix.vm.manager/scripts/VMClone.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 emhttp/plugins/dynamix.vm.manager/scripts/VMClone.php diff --git a/emhttp/plugins/dynamix.vm.manager/scripts/VMClone.php b/emhttp/plugins/dynamix.vm.manager/scripts/VMClone.php old mode 100644 new mode 100755 From 5c76b3c850534089f5dee7947a7632d7aaaf30f0 Mon Sep 17 00:00:00 2001 From: SimonFair <39065407+SimonFair@users.noreply.github.com> Date: Sun, 2 Jul 2023 08:45:21 +0100 Subject: [PATCH 023/212] WIP Update. --- .../dynamix.vm.manager/VMMachines.page | 6 +-- .../include/libvirt_helpers.php | 35 ++++++++------- .../javascript/vmmanager.js | 5 +-- .../dynamix.vm.manager/scripts/VMClone.php | 28 ++++++------ emhttp/plugins/dynamix/DashStats.page | 44 +++++++++++++++++++ .../dynamix/include/DefaultPageLayout.php | 10 ++++- 6 files changed, 90 insertions(+), 38 deletions(-) diff --git a/emhttp/plugins/dynamix.vm.manager/VMMachines.page b/emhttp/plugins/dynamix.vm.manager/VMMachines.page index 138664951..f2374e4c1 100644 --- a/emhttp/plugins/dynamix.vm.manager/VMMachines.page +++ b/emhttp/plugins/dynamix.vm.manager/VMMachines.page @@ -326,15 +326,15 @@ _(ISO Image)_:
") ; + write("addToID\0$idx\0 $action") ; - $proc = popen("$command 2>&1",'r'); - while ($out = fgets($proc)) { + $proc = popen("$command 2>&1 &",'r'); + while ($out = fread($proc,100)) { $out = preg_replace("%[\t\n\x0B\f\r]+%", '',$out); - if (substr($out,0,1) == "B") { ; - write("progress\0$idx\0".htmlspecialchars(substr($out,strrpos($out,"Block Pull")))) ; - } else echo write("addToID\0$idx\0 ".htmlspecialchars($out)); + $out = trim($out) ; + $values = explode(' ',$out) ; + $string = "Data copied: ".$values[0]." Percentage: ".$values[1]." Transfer Rate: ".$values[2]." Time remaining: ".$values[3]." ".$values[4]." ".$values[5]; + write("progress\0$idx\0".htmlspecialchars($string)) ; } $retval = pclose($proc); $out = $retval ? _('The command failed').'.' : _('The command finished successfully').'!'; @@ -73,18 +74,15 @@ foreach (explode('&', $url) as $chunk) { $id = 1 ; write(implode($style).""); $process = " " ; -write("","addLog\0"); -write("addLog\0".htmlspecialchars("VMName $name ")); -write("addLog\0".htmlspecialchars("Clone $clone ")); -write("addLog\0".htmlspecialchars("Overwrite $overwrite Start $start Edit $edit Check Freespace $free")); +$actiontxt = ucfirst($action) ; +write("","addLog\0"); +write("addLog\0".htmlspecialchars("Cloning $name to $clone")); switch ($action) { case "clone": - vm_clone($name,$clone,$overwrite,$start,$edit,$free,$waitID) ; - break ; + $rtn = vm_clone($name,$clone,$overwrite,$start,$edit,$free,$waitID) ; + break ; } -#execCommand_nchan("ls /") ; write("stop_Wait\0$waitID") ; -write('_DONE_',''); - +if ($rtn) write('_DONE_',''); else write('_ERROR_',''); ?> \ No newline at end of file diff --git a/emhttp/plugins/dynamix/DashStats.page b/emhttp/plugins/dynamix/DashStats.page index 20e17c8d0..acb7a3c65 100644 --- a/emhttp/plugins/dynamix/DashStats.page +++ b/emhttp/plugins/dynamix/DashStats.page @@ -181,6 +181,7 @@ div.last{padding-bottom:12px} div.leftside{float:left;width:66%} div.rightside{float:right;margin:0;text-align:center} div[id$=chart]{margin:-12px 8px -24px -18px} +div.template,div#dialogWindow,input#upload{display:none} span.green,span.red,span.orange{padding-left:0} span.ctrl{float:right;margin-top:0;margin-right:10px} span.ctrl span{font-size:2rem!important} @@ -1504,4 +1505,47 @@ $(function() { $.post('/webGui/include/InitCharts.php',{cmd:'set',data:JSON.stringify(data)}); }); }); + function dialogStyle() { + $('.ui-dialog-titlebar-close').css({'background':'transparent','border':'none','font-size':'1.8rem','margin-top':'-14px','margin-right':'-18px'}).html('').prop('title'); + $('.ui-dialog-title').css({'text-align':'center','width':'100%','font-size':'1.8rem'}); + $('.ui-dialog-content').css({'padding-top':'15px','vertical-align':'bottom'}); + $('.ui-button-text').css({'padding':'0px 5px'}); +} + + +
+lang="">
+
+
+
+
+
+
+
+">
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout.php b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
index f3e67955f..db36fda94 100644
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
@@ -410,6 +410,14 @@ function openDone(data) {
}
return false;
}
+function openError(data) {
+ if (data == '_ERROR_') {
+ $('div.spinner.fixed').hide();
+ $('button.confirm').text("").prop('disabled',false).show();
+ return true;
+ }
+ return false;
+}
function showStatus(name,plugin,job) {
$.post('/webGui/include/ProcessStatus.php',{name:name,plugin:plugin,job:job},function(status){$(".tabs").append(status);});
}
@@ -940,7 +948,7 @@ nchan_docker.on('message', function(data) {
});
var nchan_vmaction = new NchanSubscriber('/sub/vmaction',{subscriber:'websocket'});
nchan_vmaction.on('message', function(data) {
- if (!data || openDone(data)) return;
+ if (!data || openDone(data) || openError(data)) return;
var box = $('pre#swaltext');
data = data.split('\0');
switch (data[0]) {
From a08452c59eb7ddc656dd0c5b0825feca8752fc04 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Sun, 2 Jul 2023 20:45:59 +0100
Subject: [PATCH 024/212] Wip update.
---
.../dynamix.vm.manager/include/libvirt.php | 31 +++--
.../include/libvirt_helpers.php | 128 +++++++++---------
.../dynamix.vm.manager/scripts/VMClone.php | 7 +-
3 files changed, 91 insertions(+), 75 deletions(-)
diff --git a/emhttp/plugins/dynamix.vm.manager/include/libvirt.php b/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
index aa61c11bc..7b301426b 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
@@ -267,7 +267,7 @@
}
- function config_to_xml($config) {
+ function config_to_xml($config,$vmclone = false) {
$domain = $config['domain'];
$media = $config['media'];
$nics = $config['nic'];
@@ -463,19 +463,27 @@
$usbstr = '';
if (!empty($usb)) {
foreach($usb as $i => $v){
- $usbx = explode(':', $v);
+ if ($vmclone) $usbx = explode(':', $v['id']); else $usbx = explode(':', $v);
$startupPolicy = '' ;
- if (isset($usbopt[$v])) {
+ if (isset($usbopt[$v]) && !$vmclone ) {
if (strpos($usbopt[$v], "#remove") == false) $startupPolicy = 'startupPolicy="optional"' ; else $startupPolicy = '' ;
- }
+ }
+ if ($vmclone ) {
+ if ($v["startupPolicy"] == "optional" ) $startupPolicy = 'startupPolicy="optional"' ; else $startupPolicy = '' ;
+ #$startupPolicy = 'startupPolicy="optional"' ;
+ }
+
$usbstr .= "+
| _(VM Being Cloned)_: | +|
| _(New VM)_: | +|
| _(Overwrite)_: | +|
| _(Start Cloned VM)_: | +|
| _(Edit VM after clone)_: | +|
| _(Check Free Space)_: | +
$out"); return $retval===0; From 2b3990922d54931b2e9318e3a77242ba13a7d95d Mon Sep 17 00:00:00 2001 From: SimonFair <39065407+SimonFair@users.noreply.github.com> Date: Sun, 2 Jul 2023 21:37:11 +0100 Subject: [PATCH 025/212] Fix usb updates. --- emhttp/plugins/dynamix.vm.manager/include/libvirt.php | 5 ++--- .../plugins/dynamix.vm.manager/include/libvirt_helpers.php | 4 ++-- emhttp/plugins/dynamix/include/DefaultPageLayout.php | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/emhttp/plugins/dynamix.vm.manager/include/libvirt.php b/emhttp/plugins/dynamix.vm.manager/include/libvirt.php index 7b301426b..d55422197 100644 --- a/emhttp/plugins/dynamix.vm.manager/include/libvirt.php +++ b/emhttp/plugins/dynamix.vm.manager/include/libvirt.php @@ -468,9 +468,8 @@ if (isset($usbopt[$v]) && !$vmclone ) { if (strpos($usbopt[$v], "#remove") == false) $startupPolicy = 'startupPolicy="optional"' ; else $startupPolicy = '' ; } - if ($vmclone ) { + if (isset($v["startupPolicy"]) && $vmclone ) { if ($v["startupPolicy"] == "optional" ) $startupPolicy = 'startupPolicy="optional"' ; else $startupPolicy = '' ; - #$startupPolicy = 'startupPolicy="optional"' ; } $usbstr .= "
'; + row.innerHTML += ''+data[1]+' '+data[2]+'
'; } } else { var rows_content = rows.getElementsByClassName('content'); if (!rows_content.length || rows_content[rows_content.length-1].textContent != data[2]) { - rows.innerHTML += ''+data[2]+'.'; + rows.innerHTML += ''+data[2]+''; } } break; From cf13a33f00a53d0b8f6d5835a272f28fc7d560e7 Mon Sep 17 00:00:00 2001 From: SimonFair <39065407+SimonFair@users.noreply.github.com> Date: Sun, 2 Jul 2023 21:54:34 +0100 Subject: [PATCH 026/212] Fir directory permissions. --- .../plugins/dynamix.vm.manager/include/libvirt_helpers.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php b/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php index 5bea9798a..dab7136d1 100644 --- a/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php +++ b/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php @@ -1544,7 +1544,11 @@ private static $encoding = 'UTF-8'; } $clonedir = $domain_cfg['DOMAINDIR'].$clone ; - if (!is_dir($clonedir)) mkdir($clonedir) ; + if (!is_dir($clonedir)) { + mkdir($clonedir,0777,true) ; + chown($clonedir, 'nobody'); + chgrp($clonedir, 'users'); + } write("addLog\0".htmlspecialchars("Checking for image files")); if ($file_exists && $overwrite != "yes") { write("addLog\0".htmlspecialchars(_("New image file names exist and Overwrite is not allowed"))); return( false) ; } From b2ab922439cdba1a8081dac9a2b3a54aef0a615a Mon Sep 17 00:00:00 2001 From: SimonFair <39065407+SimonFair@users.noreply.github.com> Date: Mon, 3 Jul 2023 06:46:50 +0100 Subject: [PATCH 027/212] Fix Multilanguage buttons --- .../dynamix.vm.manager/VMMachines.page | 48 +++++++++++ .../javascript/vmmanager.js | 84 ------------------- .../dynamix.vm.manager/scripts/VMClone.php | 2 +- emhttp/plugins/dynamix/DashStats.page | 48 +++++++++++ 4 files changed, 97 insertions(+), 85 deletions(-) diff --git a/emhttp/plugins/dynamix.vm.manager/VMMachines.page b/emhttp/plugins/dynamix.vm.manager/VMMachines.page index f2374e4c1..946ebe37e 100644 --- a/emhttp/plugins/dynamix.vm.manager/VMMachines.page +++ b/emhttp/plugins/dynamix.vm.manager/VMMachines.page @@ -203,6 +203,54 @@ function getisoimage(uuid,dev,bus,file){ }); dialogStyle(); } +function VMClone(uuid, name){ + + //var root = ; + var match= ".iso"; + var box = $("#dialogWindow"); + var height = 200; + box.html($("#templateClone").html()); + box.find('#VMBeingCloned').html(name).change() ; + box.find('#target').val(name + "_clone") ; + document.getElementById("Free").checked = true ; + document.getElementById("Overwrite").checked = true ; + var Cancel = _("Cancel") ; + box.dialog({ + title: "VM Clone", + resizable: false, + width: 600, + height: 500, + modal: true, + show: {effect:'fade', duration:250}, + hide: {effect:'fade', duration:250}, + buttons: { + "_(Clone)_" : function(){ + var target = box.find('#target'); + if (target.length) { + target = target.val(); + //if (!target ) {errorTarget(); return;} + } else target = ''; + + var clone = box.find("#target").prop('value') ; + x = box.find('#Start').prop('checked') ; + if (x) start = 'yes' ; else start = 'no' ; + x = box.find('#Edit').prop('checked') ; + if (x) edit = 'yes' ; else edit = 'no' ; + x = box.find('#Overwrite').prop('checked') ; + if (x) overwrite = 'yes' ; else overwrite = 'no' ; + x = box.find('#Free').prop('checked') ; + if (x) free = 'yes' ; else free = 'no' ; + scripturl = "VMClone.php " + encodeURIComponent("/usr/local/emhttp/plugins/dynamix.vm.manager/include/VMClone.php&" + $.param({action:"clone" , name:name ,clone:clone, overwrite:overwrite , edit:edit, start,start, free:free})) ; + openVMAction((scripturl),"VM Clone", "dynamix.vm.manager", "loadlist") ; + box.dialog('close'); + }, + "_(Cancel)_": function(){ + box.dialog('close'); + } + } + }); + dialogStyle(); +} function dialogStyle() { $('.ui-dialog-titlebar-close').css({'background':'transparent','border':'none','font-size':'1.8rem','margin-top':'-14px','margin-right':'-18px'}).html('').prop('title') ; $('.ui-dialog-title').css({'text-align':'center','width':'100%','font-size':'1.8rem'}); diff --git a/emhttp/plugins/dynamix.vm.manager/javascript/vmmanager.js b/emhttp/plugins/dynamix.vm.manager/javascript/vmmanager.js index 8b82d5c72..3a80b979b 100644 --- a/emhttp/plugins/dynamix.vm.manager/javascript/vmmanager.js +++ b/emhttp/plugins/dynamix.vm.manager/javascript/vmmanager.js @@ -234,87 +234,3 @@ function addVM() { } -function getCloneName(uuid,name){ - var root = "" ; - var match= ".iso" ; - var box = $("#dialogWindow"); - box.html($("#templateClone").html()); - - box.find('#VMBeingCloned').html(name).change() ; - - var height = 100; - box.dialog({ - title: "Enter Clone Name", - resizable: false, - width: 600, - height: 300, - modal: true, - show: {effect:'fade', duration:250}, - hide: {effect:'fade', duration:250}, - buttons: { - "Clone": function(){ - var target = box.find('#target'); - if (target.length) { - target = target.val(); - if (!target ) {errorTarget(); return;} - } else target = ''; - box.find('#target').prop('disabled',true); - ajaxVMDispatch({action:"domain-clone", uuid:uuid , clone:target}, "loadlist"); ; - box.dialog('close'); - }, - "Cancel": function(){ - box.dialog('close'); - } - } - }); - dialogStyle(); -} - -function VMClone(uuid, name){ - - //var root = ; - var match= ".iso"; - var box = $("#dialogWindow"); - var height = 200; - box.html($("#templateClone").html()); - box.find('#VMBeingCloned').html(name).change() ; - box.find('#target').val(name + "_clone") ; - document.getElementById("Free").checked = true ; - document.getElementById("Overwrite").checked = true ; - - box.dialog({ - title: "VM Clone", - resizable: false, - width: 600, - height: 500, - modal: true, - show: {effect:'fade', duration:250}, - hide: {effect:'fade', duration:250}, - buttons: { - "Clone" : function(){ - var target = box.find('#target'); - if (target.length) { - target = target.val(); - //if (!target ) {errorTarget(); return;} - } else target = ''; - - var clone = box.find("#target").prop('value') ; - x = box.find('#Start').prop('checked') ; - if (x) start = 'yes' ; else start = 'no' ; - x = box.find('#Edit').prop('checked') ; - if (x) edit = 'yes' ; else edit = 'no' ; - x = box.find('#Overwrite').prop('checked') ; - if (x) overwrite = 'yes' ; else overwrite = 'no' ; - x = box.find('#Free').prop('checked') ; - if (x) free = 'yes' ; else free = 'no' ; - scripturl = "VMClone.php " + encodeURIComponent("/usr/local/emhttp/plugins/dynamix.vm.manager/include/VMClone.php&" + $.param({action:"clone" , name:name ,clone:clone, overwrite:overwrite , edit:edit, start,start, free:free})) ; - openVMAction((scripturl),"VM Clone", "dynamix.vm.manager", "loadlist") ; - box.dialog('close'); - }, - "Cancel": function(){ - box.dialog('close'); - } - } - }); - dialogStyle(); -} \ No newline at end of file diff --git a/emhttp/plugins/dynamix.vm.manager/scripts/VMClone.php b/emhttp/plugins/dynamix.vm.manager/scripts/VMClone.php index a960befd5..05f350e4c 100755 --- a/emhttp/plugins/dynamix.vm.manager/scripts/VMClone.php +++ b/emhttp/plugins/dynamix.vm.manager/scripts/VMClone.php @@ -47,7 +47,7 @@ function execCommand_nchan($command,$idx) { $out = preg_replace("%[\t\n\x0B\f\r]+%", '',$out); $out = trim($out) ; $values = explode(' ',$out) ; - $string = _("Data copied: ").$values[0]._(" Percentage: ").$values[1]._(" Transfer Rate: ").$values[2]._(" Time remaining: ").$values[3] ; + $string = _("Data copied: ").$values[0]._(" Percentage: ").$values[1]._(" Transfer Rate: ").$values[3]._(" Time remaining: ").$values[4].$values[5] ; write("progress\0$idx\0".htmlspecialchars($string)) ; if ($out) $stringsave=$string ; } diff --git a/emhttp/plugins/dynamix/DashStats.page b/emhttp/plugins/dynamix/DashStats.page index acb7a3c65..10d693aaa 100644 --- a/emhttp/plugins/dynamix/DashStats.page +++ b/emhttp/plugins/dynamix/DashStats.page @@ -1511,6 +1511,54 @@ $(function() { $('.ui-dialog-content').css({'padding-top':'15px','vertical-align':'bottom'}); $('.ui-button-text').css({'padding':'0px 5px'}); } +function VMClone(uuid, name){ + + //var root = ; + var match= ".iso"; + var box = $("#dialogWindow"); + var height = 200; + box.html($("#templateClone").html()); + box.find('#VMBeingCloned').html(name).change() ; + box.find('#target').val(name + "_clone") ; + document.getElementById("Free").checked = true ; + document.getElementById("Overwrite").checked = true ; + var Cancel = _("Cancel") ; + box.dialog({ + title: "VM Clone", + resizable: false, + width: 600, + height: 500, + modal: true, + show: {effect:'fade', duration:250}, + hide: {effect:'fade', duration:250}, + buttons: { + "_(Clone)_" : function(){ + var target = box.find('#target'); + if (target.length) { + target = target.val(); + //if (!target ) {errorTarget(); return;} + } else target = ''; + + var clone = box.find("#target").prop('value') ; + x = box.find('#Start').prop('checked') ; + if (x) start = 'yes' ; else start = 'no' ; + x = box.find('#Edit').prop('checked') ; + if (x) edit = 'yes' ; else edit = 'no' ; + x = box.find('#Overwrite').prop('checked') ; + if (x) overwrite = 'yes' ; else overwrite = 'no' ; + x = box.find('#Free').prop('checked') ; + if (x) free = 'yes' ; else free = 'no' ; + scripturl = "VMClone.php " + encodeURIComponent("/usr/local/emhttp/plugins/dynamix.vm.manager/include/VMClone.php&" + $.param({action:"clone" , name:name ,clone:clone, overwrite:overwrite , edit:edit, start,start, free:free})) ; + openVMAction((scripturl),"VM Clone", "dynamix.vm.manager", "loadlist") ; + box.dialog('close'); + }, + "_(Cancel)_": function(){ + box.dialog('close'); + } + } + }); + dialogStyle(); +} From ffe4f4a743b3277ed956e9413c1f8b21d2dfcda0 Mon Sep 17 00:00:00 2001 From: ljm42
{$output[0]}"); + $out = $return ? _('The command failed revert to rsync')."." : _('The command finished successfully').'!'; + write("stop_Wait\0$waitID","addLog\0
$out"); + } + + if ($reflinkok) { + return true ; + } else { + $waitID = mt_rand(); [$cmd,$args] = explode(' ',$command,2); write("","addLog\0","show_Wait\0$waitID"); - + write("addToID\0$idx\0Cloning VM: ") ; $proc = popen("$command 2>&1 &",'r'); while ($out = fread($proc,100)) { $out = preg_replace("%[\t\n\x0B\f\r]+%", '',$out); - $out = trim($out) ; - $values = explode(' ',$out) ; - $string = _("Data copied: ").$values[0]._(" Percentage: ").$values[1]._(" Transfer Rate: ").$values[3]._(" Time remaining: ").$values[4].$values[5] ; + $out = trim($out) ; + $values = explode(' ',$out) ; + $string = _("Data copied: ").$values[0].' '._(" Percentage: ").$values[1].' '._(" Transfer Rate: ").$values[2].' '._(" Time remaining: ").$values[4].$values[5] ; write("progress\0$idx\0".htmlspecialchars($string)) ; - if ($out) $stringsave=$string ; + if ($out) $stringsave=$string ; } $retval = pclose($proc); - write("progress\0$idx\0".htmlspecialchars($stringsave)) ; + write("progress\0$idx\0".htmlspecialchars($stringsave)) ; $out = $retval ? _('The command failed').'.' : _('The command finished successfully').'!'; write("stop_Wait\0$waitID","addLog\0
$out"); return $retval===0; } +} #{action:"snap-", uuid:uuid , snapshotname:target , remove:remove, free:free ,removemeta:removemeta ,keep:keep, desc:desc} #VM ID [ 99]: pull. .Block Pull: [ 0 %]Block Pull: [100 %].Pull complete. From 3aeba2f8717000fa291fd91084ad1bbe5f9a1a93 Mon Sep 17 00:00:00 2001 From: SimonFair <39065407+SimonFair@users.noreply.github.com> Date: Sat, 16 Sep 2023 00:27:23 +0100 Subject: [PATCH 036/212] Update reflink error display. --- emhttp/plugins/dynamix.vm.manager/scripts/VMClone.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/emhttp/plugins/dynamix.vm.manager/scripts/VMClone.php b/emhttp/plugins/dynamix.vm.manager/scripts/VMClone.php index 93a2fa7d1..89e36bc6c 100755 --- a/emhttp/plugins/dynamix.vm.manager/scripts/VMClone.php +++ b/emhttp/plugins/dynamix.vm.manager/scripts/VMClone.php @@ -42,8 +42,10 @@ function write(...$messages){ [$cmd,$args] = explode(' ',$refcmd,2); write("","addLog\0","show_Wait\0$waitID"); $rtn = exec("$refcmd 2>&1", $output,$return) ; - if ($return == 0) $reflinkok = true ; else $reflinkok = false ; - write("addLog\0
{$output[0]}"); + if ($return == 0) $reflinkok = true ; else { + $reflinkok = false ; + write("addLog\0
{$output[0]}"); + } $out = $return ? _('The command failed revert to rsync')."." : _('The command finished successfully').'!'; write("stop_Wait\0$waitID","addLog\0
$out"); } From 5e5fb2e7b6f092b2167430035a07b982670dc1ee Mon Sep 17 00:00:00 2001 From: SimonFair <39065407+SimonFair@users.noreply.github.com> Date: Sun, 17 Sep 2023 21:22:50 +0100 Subject: [PATCH 037/212] PHP Fix and Spice Audio Fix Fix some PHP errors Fix changing from spice to vnc if