README.md

@@ -1,4 +1,4 @@
-[![Java CI with Gradle](https://github.com/mnlipp/VM-Operator/actions/workflows/gradle.yml/badge.svg)](https://github.com/mnlipp/VM-Operator/actions/workflows/gradle.yml)
+[![Java CI with Gradle](https://github.com/mnlipp/VM-Operator/actions/workflows/gradle.yml/badge.svg)](https://github.com/mnlipp/VM-Operator/actions/workflows/gradle.yml) 
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/2277842dac894de4b663c6aa2779077e)](https://app.codacy.com/gh/mnlipp/VM-Operator/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
 ![Latest Manager](https://img.shields.io/github/v/tag/mnlipp/vm-operator?filter=manager*&label=latest)
 ![Latest Runner](https://img.shields.io/github/v/tag/mnlipp/vm-operator?filter=runner-qemu*&label=latest)
@@ -6,7 +6,8 @@
 # Run Qemu in Kubernetes Pods
 
 The goal of this project is to provide the means for running Qemu
-based VMs in Kubernetes pods.
+based VMs in Kubernetes pods. 
 
 See the [project's home page](https://mnlipp.github.io/VM-Operator/)
 for details.
+

deploy/crds/vms-crd.yaml

@@ -1012,12 +1012,7 @@ spec:
                         type: array
                         items:
                           type: string
-                          enum:
+                          enum: ["start", "stop", "accessConsole", "*"]
-                          - start
-                          - stop
-                          - reset
-                          - accessConsole
-                          - "*"
                         default: []
                 vm:
                   type: object

dev-example/Readme.md

@@ -1,16 +1,16 @@
 # Example setup for development
 
-The CRD must be deployed independently. Apart from that, the
+The CRD must be deployed independently. Apart from that, the 
 `kustomize.yaml` 
 
 *   creates a small cdrom image repository and
-
+ 
 *   deploys the operator in namespace `vmop-dev` with a replica of 0.
-
+ 
 This allows you to run the manager in your IDE.
 
 The `kustomize.yaml` also changes the container image repository for
-the operator to a private repository for development. You have to
+the operator to a private repository for development. You have to 
 adapt this to your own repository if you also want to test your
 development version in a container.
 

example/local-path/Readme.md

@@ -1,17 +1,17 @@
 # Example setup
 
-The CRD must be deployed independently.
+The CRD must be deployed independently. 
 
 ```sh
 kubectl apply -f https://github.com/mnlipp/VM-Operator/raw/main/deploy/crds/vms-crd.yaml
 ```
 
-Apart from that, the `kustomize.yaml` defines a namespace for the manager
+Apart from that, the `kustomize.yaml` defines a namespace for the manager 
 (and the VMs managed by it) and patches the repository PVC to create
 a small volume using local-path.
 
-A second patch provides a new configuration file for the manager
+A second patch provides a new configuration file for the manager 
-that makes it use the local-path storage class when creating the
+that makes it use the local-path storage class when creating the 
 small volume for a runner's data.
 
 The `kustomize.yaml` does not include the test VM. Before creating

example/rook-ceph/Readme.md

@@ -1,12 +1,12 @@
 # Example setup
 
-The CRD must be deployed independently.
+The CRD must be deployed independently. 
 
 ```sh
 kubectl apply -f https://github.com/mnlipp/VM-Operator/raw/main/deploy/crds/vms-crd.yaml
 ```
 
-Apart from that, the `kustomize.yaml` defines a namespace for the manager
+Apart from that, the `kustomize.yaml` defines a namespace for the manager 
 (and the VMs managed by it) and applies patches to use `rook-cephfs` as
 storage class (instead of the default storage class).
 

org.jdrupes.vmoperator.common/src/org/jdrupes/vmoperator/common/VmDefinitionModel.java

@@ -41,8 +41,7 @@ public class VmDefinitionModel extends K8sDynamicModel {
      * Permissions for accessing and manipulating the VM.
      */
     public enum Permission {
-        START("start"), STOP("stop"), RESET("reset"),
+        START("start"), STOP("stop"), ACCESS_CONSOLE("accessConsole");
-        ACCESS_CONSOLE("accessConsole");
 
         @SuppressWarnings("PMD.UseConcurrentHashMap")
         private static Map<String, Permission> reprs = new HashMap<>();

org.jdrupes.vmoperator.manager.events/src/org/jdrupes/vmoperator/manager/events/ResetVm.java

@@ -1,48 +0,0 @@
-/*
- * VM-Operator
- * Copyright (C) 2024 Michael N. Lipp
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package org.jdrupes.vmoperator.manager.events;
-
-import org.jgrapes.core.Event;
-
-/**
- * Triggers a reset of the VM.
- */
-@SuppressWarnings("PMD.DataClass")
-public class ResetVm extends Event<String> {
-
-    private final String vmName;
-
-    /**
-     * Instantiates a new event.
-     *
-     * @param vmName the vm name
-     */
-    public ResetVm(String vmName) {
-        this.vmName = vmName;
-    }
-
-    /**
-     * Gets the vm name.
-     *
-     * @return the vm name
-     */
-    public String vmName() {
-        return vmName;
-    }
-}

org.jdrupes.vmoperator.manager/build.gradle

@@ -18,10 +18,10 @@ dependencies {
     implementation 'org.jgrapes:org.jgrapes.http:[3.1.0,4)'
     implementation 'org.jgrapes:org.jgrapes.util:[1.34.0,2)'
     
-    implementation 'org.jgrapes:org.jgrapes.webconsole.base:[1.7.0,2)'
+    implementation 'org.jgrapes:org.jgrapes.webconsole.base:[1.5.0,2)'
     implementation 'org.jgrapes:org.jgrapes.webconsole.vuejs:[1.5.0,2)'
     implementation 'org.jgrapes:org.jgrapes.webconsole.rbac:[1.3.0,2)'
-    implementation 'org.jgrapes:org.jgrapes.webconlet.oidclogin:[1.4.0,2)'
+    implementation 'org.jgrapes:org.jgrapes.webconlet.oidclogin:[1.3.0,2)'
     implementation 'org.jgrapes:org.jgrapes.webconlet.markdowndisplay:[1.2.0,2)'
     
     runtimeOnly 'org.jgrapes:org.jgrapes.webconlet.sysinfo:[1.4.0,2)'

org.jdrupes.vmoperator.manager/resources/org/jdrupes/vmoperator/manager/ManagerIntro-Preview.md

@@ -1,5 +1,5 @@
-You can use the "puzzle piece" icon on the top right corner of the
+You can use the "puzzle piece" icon on the top right corner of the 
 page to add display widgets (conlets) to the overview tab.
 
 Use the "full screen" icon on the top right corner of any
-conlet (if available) to get a detailed view.
+conlet (if available) to get a detailed view.

org.jdrupes.vmoperator.manager/resources/org/jdrupes/vmoperator/manager/ManagerIntro-Preview_de.md

@@ -1,4 +1,4 @@
-Verwenden Sie das "Puzzle"-Icon auf der rechten oberen Ecke
+Verwenden Sie das "Puzzle"-Icon auf der rechten oberen Ecke 
 der Seite, um Anzeige-Widgets (Conlets) hinzuzufügen.
 
 Wenn sich in der rechten oberen Ecke eines Conlets ein Vollbild-Icon

org.jdrupes.vmoperator.manager/resources/org/jdrupes/vmoperator/manager/runnerConfig.ftl.yaml

@@ -48,12 +48,6 @@ data:
       # Whether a shutdown initiated by the guest stops the pod deployment
       guestShutdownStops: ${ cr.spec.guestShutdownStops!false?c }
       
-      # When incremented, the VM is reset. The value has no default value,
-      # i.e. if you start the VM without a value for this property, and
-      # decide to trigger a reset later, you have to first set the value
-      # and then inrement it.
-      resetCounter: ${ cr.resetCount }
-
       # Forward the cloud-init data if provided
       <#if cr.spec.cloudInit??>    
       cloudInit:

org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/ConfigMapReconciler.java

@@ -36,6 +36,7 @@ import org.jdrupes.vmoperator.common.K8s;
 import static org.jdrupes.vmoperator.manager.Constants.APP_NAME;
 import static org.jdrupes.vmoperator.manager.Constants.VM_OP_NAME;
 import org.jdrupes.vmoperator.manager.events.VmChannel;
+import org.jdrupes.vmoperator.manager.events.VmDefChanged;
 import org.yaml.snakeyaml.LoaderOptions;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.SafeConstructor;
@@ -61,6 +62,7 @@ import org.yaml.snakeyaml.constructor.SafeConstructor;
     /**
      * Reconcile.
      *
+     * @param event the event
      * @param model the model
      * @param channel the channel
      * @return the dynamic kubernetes object
@@ -68,8 +70,8 @@ import org.yaml.snakeyaml.constructor.SafeConstructor;
      * @throws TemplateException the template exception
      * @throws ApiException the api exception
      */
-    public DynamicKubernetesObject reconcile(Map<String, Object> model,
+    public DynamicKubernetesObject reconcile(VmDefChanged event,
-            VmChannel channel)
+            Map<String, Object> model, VmChannel channel)
             throws IOException, TemplateException, ApiException {
         // Get API
         DynamicKubernetesApi cmApi = new DynamicKubernetesApi("", "v1",

org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/Controller.java

@@ -181,12 +181,13 @@ public class Controller extends Component {
     @Handler
     public void onModifyVm(ModifyVm event, VmChannel channel)
             throws ApiException, IOException {
-        patchVmDef(channel.client(), event.name(), "spec/vm/" + event.path(),
+        patchVmSpec(channel.client(), event.name(), event.path(),
             event.value());
     }
 
-    private void patchVmDef(K8sClient client, String name, String path,
+    private void patchVmSpec(K8sClient client, String name, String path,
-            Object value) throws ApiException, IOException {
+            Object value)
+            throws ApiException, IOException {
         var vmStub = K8sDynamicStub.get(client,
             new GroupVersionKind(VM_OP_GROUP, "", VM_OP_KIND_VM), namespace,
             name);
@@ -196,7 +197,7 @@ public class Controller extends Component {
             ? "\"" + value + "\""
             : value.toString();
         var res = vmStub.patch(V1Patch.PATCH_FORMAT_JSON_PATCH,
-            new V1Patch("[{\"op\": \"replace\", \"path\": \"/"
+            new V1Patch("[{\"op\": \"replace\", \"path\": \"/spec/vm/"
                 + path + "\", \"value\": " + valueAsText + "}]"),
             client.defaultPatchOptions());
         if (!res.isPresent()) {

org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/DisplaySecretReconciler.java

@@ -64,7 +64,7 @@ import org.jose4j.base64url.Base64;
         var display = GsonPtr.to(event.vmDefinition().data()).to("spec", "vm",
             "display");
         if (!display.get(JsonPrimitive.class, "spice", "generateSecret")
-            .map(JsonPrimitive::getAsBoolean).orElse(true)) {
+            .map(JsonPrimitive::getAsBoolean).orElse(false)) {
             return;
         }
 

org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/Reconciler.java

@@ -51,7 +51,6 @@ import org.jdrupes.vmoperator.common.K8sDynamicModel;
 import org.jdrupes.vmoperator.common.K8sObserver;
 import org.jdrupes.vmoperator.common.K8sV1SecretStub;
 import static org.jdrupes.vmoperator.manager.Constants.COMP_DISPLAY_SECRET;
-import org.jdrupes.vmoperator.manager.events.ResetVm;
 import org.jdrupes.vmoperator.manager.events.VmChannel;
 import org.jdrupes.vmoperator.manager.events.VmDefChanged;
 import org.jdrupes.vmoperator.util.ExtendedObjectWrapper;
@@ -210,35 +209,13 @@ public class Reconciler extends Component {
         // Reconcile, use "augmented" vm definition for model
         Map<String, Object> model
             = prepareModel(channel.client(), patchCr(event.vmDefinition()));
-        var configMap = cmReconciler.reconcile(model, channel);
+        var configMap = cmReconciler.reconcile(event, model, channel);
         model.put("cm", configMap.getRaw());
         dsReconciler.reconcile(event, model, channel);
         stsReconciler.reconcile(event, model, channel);
         lbReconciler.reconcile(event, model, channel);
     }
 
-    /**
-     * Reset the VM by incrementing the reset count and doing a 
-     * partial reconcile (configmap only).
-     *
-     * @param event the event
-     * @param channel the channel
-     * @throws IOException 
-     * @throws ApiException 
-     * @throws TemplateException 
-     */
-    @Handler
-    public void onResetVm(ResetVm event, VmChannel channel)
-            throws ApiException, IOException, TemplateException {
-        var defRoot
-            = GsonPtr.to(channel.vmDefinition().data()).get(JsonObject.class);
-        defRoot.addProperty("resetCount",
-            defRoot.get("resetCount").getAsLong() + 1);
-        Map<String, Object> model
-            = prepareModel(channel.client(), patchCr(channel.vmDefinition()));
-        cmReconciler.reconcile(model, channel);
-    }
-
     private DynamicKubernetesObject patchCr(K8sDynamicModel vmDef) {
         var json = vmDef.data().deepCopy();
         // Adjust cdromImage path

org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/VmMonitor.java

@@ -25,13 +25,13 @@ import io.kubernetes.client.openapi.models.V1ObjectMeta;
 import io.kubernetes.client.util.Watch;
 import io.kubernetes.client.util.generic.options.ListOptions;
 import java.io.IOException;
-import java.util.Optional;
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
 import static org.jdrupes.vmoperator.common.Constants.VM_OP_GROUP;
 import org.jdrupes.vmoperator.common.K8s;
 import org.jdrupes.vmoperator.common.K8sClient;
+import org.jdrupes.vmoperator.common.K8sDynamicModel;
 import org.jdrupes.vmoperator.common.K8sDynamicStub;
 import org.jdrupes.vmoperator.common.K8sObserver.ResponseType;
 import org.jdrupes.vmoperator.common.K8sV1ConfigMapStub;
@@ -121,7 +121,7 @@ public class VmMonitor extends
         }
         if (vmDef.data() != null) {
             // New data, augment and save
-            addDynamicData(channel.client(), vmDef, channel.vmDefinition());
+            addDynamicData(channel.client(), vmDef);
             channel.setVmDefinition(vmDef);
         } else {
             // Reuse cached
@@ -151,16 +151,8 @@ public class VmMonitor extends
         }
     }
 
-    private void addDynamicData(K8sClient client, VmDefinitionModel vmState,
+    private void addDynamicData(K8sClient client, K8sDynamicModel vmState) {
-            VmDefinitionModel prevState) {
         var rootNode = GsonPtr.to(vmState.data()).get(JsonObject.class);
-
-        // Maintain (or initialize) the resetCount
-        rootNode.addProperty("resetCount", Optional.ofNullable(prevState)
-            .map(ps -> GsonPtr.to(ps.data()))
-            .flatMap(d -> d.getAsLong("resetCount")).orElse(0L));
-
-        // Add defaults in case the VM is not running
         rootNode.addProperty("nodeName", "");
         rootNode.addProperty("nodeAddress", "");
 

org.jdrupes.vmoperator.runner.qemu/config-sample.yaml

@@ -45,12 +45,6 @@
   # property in the CRD.  
   # "guestShutdownStops":
   #   false
-  
-  # When incremented, the VM is reset. The value has no default value,
-  # i.e. if you start the VM without a value for this property, and
-  # decide to trigger a reset later, you have to first set the value
-  # and then inrement it.
-  # "resetCounter": 1
 
   # Define the VM (required)
   "vm":

org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Configuration.java

@@ -82,9 +82,6 @@ public class Configuration implements Dto {
     /** If guest shutdown changes CRD .vm.state to "Stopped". */
     public boolean guestShutdownStops;
 
-    /** Increments of the reset counter trigger a reset of the VM. */
-    public Integer resetCounter;
-
     /** The vm. */
     @SuppressWarnings("PMD.ShortVariable")
     public Vm vm;

org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/DisplayController.java

@@ -116,9 +116,8 @@ public class DisplayController extends Component {
         }
 
         if (Objects.equals(this.currentPassword, password)) {
-            return true;
+            return false;
         }
-        this.currentPassword = password;
         logger.fine(() -> "Updating display password");
         fire(new MonitorCommand(new QmpSetDisplayPassword(protocol, password)));
         return true;

org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Runner.java

@@ -55,7 +55,6 @@ import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import static org.jdrupes.vmoperator.common.Constants.APP_NAME;
 import org.jdrupes.vmoperator.runner.qemu.commands.QmpCont;
-import org.jdrupes.vmoperator.runner.qemu.commands.QmpReset;
 import org.jdrupes.vmoperator.runner.qemu.events.ConfigureQemu;
 import org.jdrupes.vmoperator.runner.qemu.events.Exit;
 import org.jdrupes.vmoperator.runner.qemu.events.MonitorCommand;
@@ -216,7 +215,6 @@ public class Runner extends Component {
     private CommandDefinition cloudInitImgDefinition;
     private CommandDefinition qemuDefinition;
     private final QemuMonitor qemuMonitor;
-    private Integer resetCounter;
     private State state = State.INITIALIZING;
 
     /** Preparatory actions for QEMU start */
@@ -617,7 +615,7 @@ public class Runner extends Component {
      * @param event the event
      */
     @Handler(priority = -1000)
-    public void onConfigureQemuFinal(ConfigureQemu event) {
+    public void onConfigureQemu(ConfigureQemu event) {
         if (state == State.STARTING) {
             fire(new MonitorCommand(new QmpCont()));
             state = State.RUNNING;
@@ -626,23 +624,6 @@ public class Runner extends Component {
         }
     }
 
-    /**
-     * On configure qemu.
-     *
-     * @param event the event
-     */
-    @Handler
-    public void onConfigureQemu(ConfigureQemu event) {
-        if (state == State.RUNNING) {
-            if (resetCounter != null
-                && event.configuration().resetCounter != null
-                && event.configuration().resetCounter > resetCounter) {
-                fire(new MonitorCommand(new QmpReset()));
-            }
-            resetCounter = event.configuration().resetCounter;
-        }
-    }
-
     /**
      * On process exited.
      *

org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/commands/QmpReset.java

@@ -1,43 +0,0 @@
-/*
- * VM-Operator
- * Copyright (C) 2023 Michael N. Lipp
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package org.jdrupes.vmoperator.runner.qemu.commands;
-
-import com.fasterxml.jackson.databind.JsonNode;
-
-/**
- * A {@link QmpCommand} that send a system_reset to the VM.
- */
-public class QmpReset extends QmpCommand {
-
-    @SuppressWarnings({ "PMD.FieldNamingConventions",
-        "PMD.VariableNamingConventions" })
-    private static final JsonNode jsonTemplate
-        = parseJson("{ \"execute\": \"system_reset\" }");
-
-    @Override
-    public JsonNode toJson() {
-        return jsonTemplate.deepCopy();
-    }
-
-    @Override
-    public String toString() {
-        return "QmpReset()";
-    }
-
-}

org.jdrupes.vmoperator.util/src/org/jdrupes/vmoperator/util/GsonPtr.java

@@ -265,18 +265,6 @@ public class GsonPtr {
         return set(selector, new JsonPrimitive(value));
     }
 
-    /**
-     * Short for `set(selector, new JsonPrimitive(value))`.
-     *
-     * @param selector the selector
-     * @param value the value
-     * @return the gson ptr
-     * @see #set(Object, JsonElement)
-     */
-    public GsonPtr set(Object selector, Long value) {
-        return set(selector, new JsonPrimitive(value));
-    }
-
     /**
      * Short for `set(selector, new JsonPrimitive(value))`.
      *

org.jdrupes.vmoperator.vmconlet/resources/org/jdrupes/vmoperator/vmconlet/VmConlet-view.ftl.html

@@ -52,14 +52,12 @@
               v-html="controller.breakBeforeDots(entry[key])"></span>
           </td>
           <td class="jdrupes-vmoperator-vmconlet-view-action-list">
-            <span role="button" 
+            <span role="button" v-if="entry.spec.vm.state != 'Running'" 
-              v-if="entry.spec.vm.state != 'Running' && !entry['running']" 
               tabindex="0" class="fa fa-play" :title="localize('Start VM')"
               v-on:click="vmAction(entry.name, 'start')"></span>
             <span role="button" v-else class="fa fa-play"
               aria-disabled="true" :title="localize('Start VM')"></span>
-            <span role="button"
+            <span role="button" v-if="entry.spec.vm.state != 'Stopped'"
-              v-if="entry.spec.vm.state != 'Stopped' && entry['running']"
               tabindex="0" class="fa fa-stop" :title="localize('Stop VM')"
               v-on:click="vmAction(entry.name, 'stop')"></span>
             <span role="button" v-else class="fa fa-stop"

org.jdrupes.vmoperator.vmviewer/build.gradle

@@ -5,7 +5,7 @@ plugins {
 dependencies {
     implementation project(':org.jdrupes.vmoperator.manager.events')
     
-    implementation 'org.jgrapes:org.jgrapes.webconsole.base:[1.7.0,2)'
+    implementation 'org.jgrapes:org.jgrapes.webconsole.base:[1.3.0,2)'
     implementation 'org.jgrapes:org.jgrapes.webconsole.provider.vue:[1,2)'
     implementation 'org.jgrapes:org.jgrapes.webconsole.provider.jgwcvuecomponents:[1.2,2)'
     implementation 'org.jgrapes:org.jgrapes.webconsole.provider.chartjs:[1.2,2)'

org.jdrupes.vmoperator.vmviewer/resources/org/jdrupes/vmoperator/vmviewer/VmViewer-confirmReset.ftl.html

@@ -1,13 +0,0 @@
-<div 
-  class="jdrupes-vmoperator-vmviewer jdrupes-vmoperator-vmviewer-confirm-reset">
-  <p>${_("confirmResetMsg")}</p>
-  <p>
-    <span role="button" tabindex="0" class="svg-icon"
-      onclick="orgJDrupesVmOperatorVmViewer.confirmReset('${conletType}', '${conletId}')">
-      <svg viewBox="0 0 1541.33 1535.5083">
-        <path d="m 0,127.9968 v 448 c 0,35 29,64 64,64 h 448 c 35,0 64,-29 64,-64 0,-17 -6.92831,-33.07213 -19,-45 C 264.23058,241.7154 337.19508,314.89599 109,82.996795 c -11.999999,-12 -28,-19 -45,-19 -35,0 -64,29 -64,64.000005 z" />
-        <path d="m 772.97656,1535.5046 c 117.57061,0.3623 236.06134,-26.2848 345.77544,-81.4687 292.5708,-147.1572 459.8088,-465.37411 415.5214,-790.12504 C 1489.9861,339.15993 1243.597,77.463924 922.29883,14.342498 601.00067,-48.778928 274.05699,100.37563 110.62891,384.39133 c -34.855139,60.57216 -14.006492,137.9313 46.5664,172.78516 60.57172,34.85381 137.92941,14.00532 172.78321,-46.56641 109.97944,-191.12927 327.69604,-290.34657 543.53515,-247.94336 215.83913,42.40321 380.18953,216.77543 410.00973,435.44141 29.8203,218.66598 -81.8657,430.94957 -278.4863,529.84567 -196.6206,98.8962 -432.84043,61.8202 -589.90233,-92.6777 -24.91016,-24.5038 -85.48587,-83.3326 -119.02246,-52.9832 -24.01114,21.7292 -35.41741,29.5454 -59.9209,54.4559 -24.50381,24.9102 -35.33636,36.9034 -57.54543,60.4713 -38.1335,40.4667 34.10761,93.9685 59.01808,118.472 145.96311,143.5803 339.36149,219.2087 535.3125,219.8125 z"/>
-      </svg>
-    </span>
-  </p>
-</div>

org.jdrupes.vmoperator.vmviewer/resources/org/jdrupes/vmoperator/vmviewer/VmViewer-edit.ftl.html

@@ -1,8 +1,7 @@
-<div title="${_("conletName")}"
+<div title="${_("conletName")}" class="jdrupes-vmoperator-vmviewer-edit"
-  class="jdrupes-vmoperator-vmviewer jdrupes-vmoperator-vmviewer-edit"
+    data-jgwc-on-load="orgJDrupesVmOperatorVmViewer.initEdit"
-  data-jgwc-on-load="orgJDrupesVmOperatorVmViewer.initEdit"
+    data-jgwc-on-action="orgJDrupesVmOperatorVmViewer.applyEdit"    
-  data-jgwc-on-action="orgJDrupesVmOperatorVmViewer.applyEdit"    
+    data-jgwc-on-unload="JGConsole.jgwc.unmountVueApps">
-  data-jgwc-on-unload="JGConsole.jgwc.unmountVueApps">
   <form :id="formId" ref="formDom" onsubmit="return false;">
     <section>
       <span>{{ localize("Select VM") }}</span>

org.jdrupes.vmoperator.vmviewer/resources/org/jdrupes/vmoperator/vmviewer/VmViewer-preview.ftl.html

@@ -1,5 +1,4 @@
-<div 
+<div class="jdrupes-vmoperator-vmviewer jdrupes-vmoperator-vmviewer-preview"
-  class="jdrupes-vmoperator-vmviewer jdrupes-vmoperator-vmviewer-preview"
   data-conlet-grid-rows="2" data-conlet-grid-columns="2"
   data-jgwc-on-load="orgJDrupesVmOperatorVmViewer.initPreview"
   data-jgwc-on-unload="JGConsole.jgwc.unmountVueApps"

org.jdrupes.vmoperator.vmviewer/resources/org/jdrupes/vmoperator/vmviewer/l10n.properties

@@ -1,7 +1,3 @@
 conletName = VM Console
 
 okayLabel = Apply and Close
-
-confirmResetTitle = Confirm reset
-confirmResetMsg = Resetting the VM may cause loss of data. \
-  Please confirm to continue.

org.jdrupes.vmoperator.vmviewer/resources/org/jdrupes/vmoperator/vmviewer/l10n_de.properties

@@ -5,9 +5,4 @@ Select\ VM = VM ausw
 
 Start\ VM = VM starten
 Stop\ VM = VM anhalten
-Reset\ VM = VM zurücksetzen
 Open\ console = Konsole anzeigen
-
-confirmResetTitle = Zurücksetzen bestätigen
-confirmResetMsg = Zurücksetzen der VM kann zu Datenverlust führen. \
-  Bitte bestätigen um fortzufahren.

org.jdrupes.vmoperator.vmviewer/resources/org/jdrupes/vmoperator/vmviewer/reset-icon.svg

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   width="1541.33"
-   height="1535.5083"
-   version="1.1"
-   id="svg1"
-   sodipodi:docname="reset-icon2.svg"
-   inkscape:version="1.3.2 (091e20ef0f, 2023-11-25)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs1" />
-  <sodipodi:namedview
-     id="namedview1"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:zoom="0.34987054"
-     inkscape:cx="704.54631"
-     inkscape:cy="711.69181"
-     inkscape:window-width="1920"
-     inkscape:window-height="1011"
-     inkscape:window-x="0"
-     inkscape:window-y="32"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg1" />
-  <path
-     d="m 0,127.9968 v 448 c 0,35 29,64 64,64 h 448 c 35,0 64,-29 64,-64 0,-17 -6.92831,-33.07213 -19,-45 C 264.23058,241.7154 337.19508,314.89599 109,82.996795 c -11.999999,-12 -28,-19 -45,-19 -35,0 -64,29 -64,64.000005 z"
-     id="path1"
-     sodipodi:nodetypes="sssssscss" />
-  <path
-     style="color:#000000;fill:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;-inkscape-stroke:none;paint-order:fill markers stroke"
-     d="m 772.97656,1535.5046 c 117.57061,0.3623 236.06134,-26.2848 345.77544,-81.4687 292.5708,-147.1572 459.8088,-465.37411 415.5214,-790.12504 C 1489.9861,339.15993 1243.597,77.463924 922.29883,14.342498 601.00067,-48.778928 274.05699,100.37563 110.62891,384.39133 c -34.855139,60.57216 -14.006492,137.9313 46.5664,172.78516 60.57172,34.85381 137.92941,14.00532 172.78321,-46.56641 109.97944,-191.12927 327.69604,-290.34657 543.53515,-247.94336 215.83913,42.40321 380.18953,216.77543 410.00973,435.44141 29.8203,218.66598 -81.8657,430.94957 -278.4863,529.84567 -196.6206,98.8962 -432.84043,61.8202 -589.90233,-92.6777 -24.91016,-24.5038 -85.48587,-83.3326 -119.02246,-52.9832 -24.01114,21.7292 -35.41741,29.5454 -59.9209,54.4559 -24.50381,24.9102 -35.33636,36.9034 -57.54543,60.4713 -38.1335,40.4667 34.10761,93.9685 59.01808,118.472 145.96311,143.5803 339.36149,219.2087 535.3125,219.8125 z"
-     id="path2"
-     sodipodi:nodetypes="sssscccssscscscs" />
-</svg>

org.jdrupes.vmoperator.vmviewer/src/org/jdrupes/vmoperator/vmviewer/VmViewer.java

@@ -20,7 +20,6 @@ package org.jdrupes.vmoperator.vmviewer;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.google.gson.JsonObject;
@@ -55,7 +54,6 @@ import org.jdrupes.vmoperator.common.VmDefinitionModel.Permission;
 import org.jdrupes.vmoperator.manager.events.ChannelCache;
 import org.jdrupes.vmoperator.manager.events.GetDisplayPassword;
 import org.jdrupes.vmoperator.manager.events.ModifyVm;
-import org.jdrupes.vmoperator.manager.events.ResetVm;
 import org.jdrupes.vmoperator.manager.events.VmChannel;
 import org.jdrupes.vmoperator.manager.events.VmDefChanged;
 import org.jdrupes.vmoperator.util.GsonPtr;
@@ -92,10 +90,10 @@ import org.jgrapes.webconsole.base.events.UpdateConletType;
 import org.jgrapes.webconsole.base.freemarker.FreeMarkerConlet;
 
 /**
- * The Class VmViewer.
+ * The Class VmConlet.
  */
 @SuppressWarnings({ "PMD.DataflowAnomalyAnalysis", "PMD.ExcessiveImports",
-    "PMD.CouplingBetweenObjects", "PMD.GodClass", "PMD.TooManyMethods" })
+    "PMD.CouplingBetweenObjects", "PMD.GodClass" })
 public class VmViewer extends FreeMarkerConlet<VmViewer.ViewerModel> {
 
     private static final String VM_NAME_PROPERTY = "vmName";
@@ -467,19 +465,12 @@ public class VmViewer extends FreeMarkerConlet<VmViewer.ViewerModel> {
 
     @Override
     @SuppressWarnings({ "PMD.AvoidDecimalLiteralsInBigDecimalConstructor",
-        "PMD.ConfusingArgumentToVarargsMethod", "PMD.NcssCount",
+        "PMD.ConfusingArgumentToVarargsMethod" })
-        "PMD.AvoidLiteralsInIfCondition" })
     protected void doUpdateConletState(NotifyConletModel event,
             ConsoleConnection channel, ViewerModel model)
             throws Exception {
         event.stop();
-        if ("selectedVm".equals(event.method())) {
+        var both = Optional.ofNullable(event.params().asString(0))
-            selectVm(event, channel, model);
-            return;
-        }
-
-        // Handle command for selected VM
-        var both = Optional.ofNullable(model.vmName())
             .flatMap(vm -> channelManager.both(vm));
         if (both.isEmpty()) {
             return;
@@ -488,8 +479,14 @@ public class VmViewer extends FreeMarkerConlet<VmViewer.ViewerModel> {
         var vmDef = both.get().associated;
         var vmName = vmDef.metadata().getName();
         var perms = permissions(vmDef, channel.session());
-        var resourceBundle = resourceBundle(channel.locale());
         switch (event.method()) {
+        case "selectedVm":
+            model.setVmName(event.params().asString(0));
+            String jsonState = objectMapper.writeValueAsString(model);
+            channel.respond(new KeyValueStoreUpdate().update(storagePath(
+                channel.session(), model.getConletId()), jsonState));
+            updateConfig(channel, model);
+            break;
         case "start":
             if (perms.contains(Permission.START)) {
                 fire(new ModifyVm(vmName, "state", "Running", vmChannel));
@@ -500,16 +497,6 @@ public class VmViewer extends FreeMarkerConlet<VmViewer.ViewerModel> {
                 fire(new ModifyVm(vmName, "state", "Stopped", vmChannel));
             }
             break;
-        case "reset":
-            if (perms.contains(Permission.RESET)) {
-                confirmReset(event, channel, model, resourceBundle);
-            }
-            break;
-        case "resetConfirmed":
-            if (perms.contains(Permission.RESET)) {
-                fire(new ResetVm(vmName), vmChannel);
-            }
-            break;
         case "openConsole":
             if (perms.contains(Permission.ACCESS_CONSOLE)) {
                 var pwQuery = Event.onCompletion(new GetDisplayPassword(vmDef),
@@ -523,15 +510,6 @@ public class VmViewer extends FreeMarkerConlet<VmViewer.ViewerModel> {
         }
     }
 
-    private void selectVm(NotifyConletModel event, ConsoleConnection channel,
-            ViewerModel model) throws JsonProcessingException {
-        model.setVmName(event.params().asString(0));
-        String jsonState = objectMapper.writeValueAsString(model);
-        channel.respond(new KeyValueStoreUpdate().update(storagePath(
-            channel.session(), model.getConletId()), jsonState));
-        updateConfig(channel, model);
-    }
-
     private void openConsole(String vmName, ConsoleConnection connection,
             ViewerModel model, String password) {
         var vmDef = channelManager.associated(vmName).orElse(null);
@@ -599,20 +577,6 @@ public class VmViewer extends FreeMarkerConlet<VmViewer.ViewerModel> {
             .findFirst().or(() -> addrs.stream().findFirst());
     }
 
-    private void confirmReset(NotifyConletModel event,
-            ConsoleConnection channel, ViewerModel model,
-            ResourceBundle resourceBundle) throws TemplateNotFoundException,
-            MalformedTemplateNameException, ParseException, IOException {
-        Template tpl = freemarkerConfig()
-            .getTemplate("VmViewer-confirmReset.ftl.html");
-        channel.respond(new OpenModalDialog(type(), model.getConletId(),
-            processTemplate(event, tpl,
-                fmModel(event, channel, model.getConletId(), model)))
-                    .addOption("cancelable", true).addOption("closeLabel", "")
-                    .addOption("title",
-                        resourceBundle.getString("confirmResetTitle")));
-    }
-
     @Override
     protected boolean doSetLocale(SetLocale event, ConsoleConnection channel,
             String conletId) throws Exception {

org.jdrupes.vmoperator.vmviewer/src/org/jdrupes/vmoperator/vmviewer/browser/VmViewer-functions.ts

@@ -31,9 +31,8 @@ declare global {
     interface Window {
         orgJDrupesVmOperatorVmViewer: { 
             initPreview?: (previewDom: HTMLElement, isUpdate: boolean) => void,
-            initEdit?: (viewDom: HTMLElement, isUpdate: boolean) => void,
+            initEdit?: (viewDom: HTMLElement, isUpdate: boolean) => void
-            applyEdit?: (viewDom: HTMLElement, apply: boolean) => void,
+            applyEdit?: (viewDom: HTMLElement, apply: boolean) => void
-            confirmReset?: (conletType: string, conletId: string) => void
         }
     }
 }
@@ -64,16 +63,7 @@ window.orgJDrupesVmOperatorVmViewer.initPreview = (previewDom: HTMLElement,
                 vmName: "",
                 vmDefinition: {}
             });
-            const configured = computed(() => previewApi.vmDefinition.spec);
+            const vmDef = computed(() => previewApi.vmDefinition);
-            const startable = computed(() => previewApi.vmDefinition.spec &&
-                previewApi.vmDefinition.spec.vm.state !== 'Running' 
-                && !previewApi.vmDefinition.running);
-            const stoppable = computed(() => previewApi.vmDefinition.spec &&
-                previewApi.vmDefinition.spec.vm.state !== 'Stopped' 
-                && previewApi.vmDefinition.running);
-            const running = computed(() => previewApi.vmDefinition.running);
-            const permissions = computed(() => previewApi.vmDefinition.spec
-                ? previewApi.vmDefinition.userPermissions : []);
 
             watch(() => previewApi.vmName, (name: string) => {
                 if (name !== "") {
@@ -83,50 +73,40 @@ window.orgJDrupesVmOperatorVmViewer.initPreview = (previewDom: HTMLElement,
         
             provideApi(previewDom, previewApi);
 
-            const vmAction = (action: string) => {
+            const vmAction = (vmName: string, action: string) => {
-                JGConsole.notifyConletModel(conletId, action);
+                JGConsole.notifyConletModel(conletId, action, vmName);
             };
         
-            return { localize, resourceBase, vmAction, configured,
+            return { localize, resourceBase, vmDef, vmAction };
-                        startable, stoppable, running, permissions };
         },
         template: `
           <table>
             <tbody>
               <tr>
-                <td rowspan="2" style="position: relative"><span
+                <td><img role=button 
-                  style="position: absolute;" 
+                  :aria-disabled="!vmDef.running || !vmDef.userPermissions
-                  :class="{ busy: configured && !startable && !stoppable }"
+                    || !vmDef.userPermissions.includes('accessConsole')" 
-                  ><img role=button :aria-disabled="!running
+                  v-on:click="vmAction(vmDef.name, 'openConsole')"
-                      || !permissions.includes('accessConsole')" 
+                  :src="resourceBase + (vmDef.running
-                  v-on:click="vmAction('openConsole')"
+                  ? 'computer.svg' : 'computer-off.svg')"
-                  :src="resourceBase + (running
+                  :title="localize('Open console')"></td>
-                      ? 'computer.svg' : 'computer-off.svg')"
+                <td v-if="vmDef.spec"
-                  :title="localize('Open console')"></span><span
+                  class="jdrupes-vmoperator-vmviewer-preview-action-list">
-                  style="visibility: hidden;"><img
+                  <span role="button" v-if="vmDef.spec.vm.state != 'Running'"
-                  :src="resourceBase + 'computer.svg'"></span></td>
+                    :aria-disabled="!vmDef.userPermissions.includes('start')" 
-                <td class="jdrupes-vmoperator-vmviewer-preview-action-list">
-                  <span role="button" 
-                    :aria-disabled="!startable || !permissions.includes('start')" 
                     tabindex="0" class="fa fa-play" :title="localize('Start VM')"
-                    v-on:click="vmAction('start')"></span>
+                    v-on:click="vmAction(vmDef.name, 'start')"></span>
-                  <span role="button"
+                  <span role="button" v-else class="fa fa-play"
-                    :aria-disabled="!stoppable || !permissions.includes('stop')" 
+                    aria-disabled="true" :title="localize('Start VM')"></span>
+                  <span role="button" v-if="vmDef.spec.vm.state != 'Stopped'"
+                    :aria-disabled="!vmDef.userPermissions.includes('stop')" 
                     tabindex="0" class="fa fa-stop" :title="localize('Stop VM')"
-                    v-on:click="vmAction('stop')"></span>
+                    v-on:click="vmAction(vmDef.name, 'stop')"></span>
-                  <span role="button"
+                  <span role="button" v-else class="fa fa-stop"
-                    :aria-disabled="!running || !permissions.includes('reset')" 
+                    aria-disabled="true" :title="localize('Stop VM')"></span>
-                    tabindex="0" class="svg-icon" :title="localize('Reset VM')"
+                </td>
-                    v-on:click="vmAction('reset')">
+                <td v-else>
-                    <svg viewBox="0 0 1541.33 1535.5083">
-                      <path d="m 0,127.9968 v 448 c 0,35 29,64 64,64 h 448 c 35,0 64,-29 64,-64 0,-17 -6.92831,-33.07213 -19,-45 C 264.23058,241.7154 337.19508,314.89599 109,82.996795 c -11.999999,-12 -28,-19 -45,-19 -35,0 -64,29 -64,64.000005 z" />
-                      <path d="m 772.97656,1535.5046 c 117.57061,0.3623 236.06134,-26.2848 345.77544,-81.4687 292.5708,-147.1572 459.8088,-465.37411 415.5214,-790.12504 C 1489.9861,339.15993 1243.597,77.463924 922.29883,14.342498 601.00067,-48.778928 274.05699,100.37563 110.62891,384.39133 c -34.855139,60.57216 -14.006492,137.9313 46.5664,172.78516 60.57172,34.85381 137.92941,14.00532 172.78321,-46.56641 109.97944,-191.12927 327.69604,-290.34657 543.53515,-247.94336 215.83913,42.40321 380.18953,216.77543 410.00973,435.44141 29.8203,218.66598 -81.8657,430.94957 -278.4863,529.84567 -196.6206,98.8962 -432.84043,61.8202 -589.90233,-92.6777 -24.91016,-24.5038 -85.48587,-83.3326 -119.02246,-52.9832 -24.01114,21.7292 -35.41741,29.5454 -59.9209,54.4559 -24.50381,24.9102 -35.33636,36.9034 -57.54543,60.4713 -38.1335,40.4667 34.10761,93.9685 59.01808,118.472 145.96311,143.5803 339.36149,219.2087 535.3125,219.8125 z"/>
-                    </svg>
-                  </span>
                 </td>
-              </tr>
-              <tr>
-                <td></td>
               </tr>
             </tbody>
           </table>`
@@ -229,9 +209,3 @@ window.orgJDrupesVmOperatorVmViewer.applyEdit =
     const vmName = getApi<ref<string>>(dialogDom!)!.value;
     JGConsole.notifyConletModel(conletId, "selectedVm", vmName);
 }
-
-window.orgJDrupesVmOperatorVmViewer.confirmReset = 
-        (conletType: string, conletId: string) => {
-    JGConsole.instance.closeModalDialog(conletType, conletId);
-    JGConsole.notifyConletModel(conletId, "resetConfirmed");
-}

org.jdrupes.vmoperator.vmviewer/src/org/jdrupes/vmoperator/vmviewer/browser/VmViewer-style.scss

@@ -19,24 +19,7 @@
 /*
  * Conlet specific styles.
  */
-.jdrupes-vmoperator-vmviewer {
+.jdrupes-vmoperator-vmviewer-preview {
-  
-  span[role="button"].svg-icon {
-    display: inline-block;
-    line-height: 1;
-    /* Align with forkawesome */
-    font-size: 14px;
-    fill: var(--primary);
-
-    &[aria-disabled="true"], &[aria-disabled=""] {
-      fill: var(--disabled);
-    }
-    
-    svg {
-      height: 2ex;
-      width: 1em;
-    }
-  }
 
   [role=button] {
     padding: 0.25rem;
@@ -45,10 +28,7 @@
       box-shadow: var(--darkening);
     }
   }
-}
 
-.jdrupes-vmoperator-vmviewer.jdrupes-vmoperator-vmviewer-preview {
-  
   img {
     height: 3em;
     padding: 0.25rem;
@@ -57,42 +37,14 @@
         opacity: 0.4;
     }
   }
-  
-  .jdrupes-vmoperator-vmviewer-preview-action-list {
-    white-space: nowrap;
-  }
-  
-  span.busy::before {
-    font: normal normal normal 14px/1 ForkAwesome;
-    font-size: 1.125em;
-    content: "\f1ce";
-    left: 1.45em;
-    top: 0.7em;
-    color: var(--info);
-    position: absolute;
-    animation: spin 2s linear infinite;
-    z-index: 100;
-  }  
 }
 
-.jdrupes-vmoperator-vmviewer.jdrupes-vmoperator-vmviewer-edit {
+.jdrupes-vmoperator-vmviewer-preview-action-list {
+  white-space: nowrap;
+}
+
+.jdrupes-vmoperator-vmviewer-edit {
   select {
     width: 15em;
   }
-}
+}
-
-.jdrupes-vmoperator-vmviewer.jdrupes-vmoperator-vmviewer-confirm-reset {
-  p {
-    text-align: center;
-  }
-  
-  span[role="button"].svg-icon {
-    fill: var(--danger);
-
-    svg {
-      width: 2.5em;
-      height: 2.5em;
-    }
-  }
-  
-}