Develop/v3 (#27)

Prepare release.
2024-06-09 22:54:42 +02:00 · 2024-06-09 22:54:42 +02:00 · 65a5cfd286
commit 65a5cfd286
parent 659463b3b4
39 changed files with 500 additions and 132 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -18,10 +18,9 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
      with:
        fetch-depth: 0
-        ref: main
    - name: Install graphviz
      run: sudo apt-get install graphviz
    - name: Install podman
--- a/README.md
+++ b/README.md
@ -10,4 +10,3 @@ based VMs in Kubernetes pods.

 See the [project's home page](https://mnlipp.github.io/VM-Operator/)
 for details.
-
--- a/buildSrc/src/org.jdrupes.vmoperator.java-common-conventions.gradle
+++ b/buildSrc/src/org.jdrupes.vmoperator.java-common-conventions.gradle
@ -5,6 +5,11 @@
 */

 plugins {
+    // Apply the common versioning conventions.
+    // Put this at the start, because accessing project.version before
+    // this is applied makes things fail.
+    id 'org.jdrupes.vmoperator.versioning-conventions'
+
    // Apply the java Plugin to add support for Java.
    id 'java'
    
@ -13,9 +18,6 @@ plugins {
    
    // Access to git information
    id 'org.ajoberstar.grgit'
-    
-    // Apply the common versioning conventions.
-    id 'org.jdrupes.vmoperator.versioning-conventions'
 }

 repositories {
--- a/buildSrc/src/org.jdrupes.vmoperator.versioning-conventions.gradle
+++ b/buildSrc/src/org.jdrupes.vmoperator.versioning-conventions.gradle
@ -21,11 +21,13 @@ scmVersion {
        }
        var p = shortened.replace('.', '-') + "-"
        if (grgit.branch.current.name != "main"
-            && !grgit.branch.current.name.startsWith("release")) {
+            && grgit.branch.current.name != "HEAD"
+            && !grgit.branch.current.name.startsWith("release")
+            && !grgit.branch.current.name.startsWith("develop")) {
            p = p + grgit.branch.current.name.replace('/', '-') + "-"
        }
        prefix = p
    }
 }
-version = scmVersion.version
+project.version = scmVersion.version
 ext.isSnapshot = version.endsWith('-SNAPSHOT')
--- a/deploy/crds/vms-crd.yaml
+++ b/deploy/crds/vms-crd.yaml
@ -1012,7 +1012,12 @@ spec:
                        type: array
                        items:
                          type: string
-                          enum: ["start", "stop", "accessConsole", "*"]
+                          enum:
+                          - start
+                          - stop
+                          - reset
+                          - accessConsole
+                          - "*"
                        default: []
                vm:
                  type: object
--- a/misc/stylesheet.css
+++ b/misc/stylesheet.css
@ -45,7 +45,7 @@
 body {
    background-color:#ffffff;
    color:#353833;
-    font: normal 16px/1.5 "DejaVu Serif", serif;
+    font: normal 16px/1.5 "DejaVu Sans", Arial, Helvetica, sans-serif;
    margin:0;
    padding:0;
    height:100%;
@ -71,37 +71,33 @@ a[name] {
    color:#353833;
 }
 pre {
-    font-family: "DejaVu Sans Mono", monospace;
+    font-family:'DejaVu Sans Mono', monospace;
 }
 h1 {
-    font-family: "DejaVu Sans", sans;
    font-size:20px;
 }
 h2 {
-    font-family: "DejaVu Sans", sans;
    font-size:18px;
 }
 h3 {
-    font-family: "DejaVu Sans", sans;
-    font-size:16px;
+    font-size:17px;
 }
 h4 {
-    font-family: "DejaVu Sans", sans;
-    font-size:15px;
+    font-size:16px;
+    margin-top: 1rem;
+    margin-bottom: 1rem;
 }
 h5 {
-    font-family: "DejaVu Sans", sans;
    font-size:14px;
 }
 h6 {
-    font-family: "DejaVu Sans", sans;
    font-size:13px;
 }
 ul {
    list-style-type:disc;
 }
 code, tt {
-    font-family: "DejaVu Sans Mono", monospace;
+    font-family:'DejaVu Sans Mono', monospace;
 }
 :not(h1, h2, h3, h4, h5, h6) > code,
 :not(h1, h2, h3, h4, h5, h6) > tt {
@ -111,12 +107,12 @@ code, tt {
    line-height:1.4em;
 }
 dt code {
-    font-family: "DejaVu Sans Mono", monospace;
+    font-family:'DejaVu Sans Mono', monospace;
    font-size:14px;
    padding-top:4px;
 }
 .summary-table dt code {
-    font-family: "DejaVu Sans Mono", monospace;
+    font-family:'DejaVu Sans Mono', monospace;
    font-size:14px;
    vertical-align:top;
    padding-top:4px;
@ -124,7 +120,9 @@ dt code {
 sup {
    font-size:8px;
 }
-
+button {
+    font-family: 'DejaVu Sans', Arial, Helvetica, sans-serif;
+}
 /*
 * Styles for HTML generated by javadoc.
 *
@ -185,7 +183,6 @@ sup {
    min-height:2.8em;
    padding-top:10px;
    overflow:hidden;
-    font-family: "DejaVu Sans", sans;
    font-size:80%;
 }
 .sub-nav {
@ -193,7 +190,6 @@ sup {
    float:left;
    width:100%;
    overflow:hidden;
-    font-family: "DejaVu Sans", sans;
    font-size:80%;
 }
 .sub-nav div {
@ -311,13 +307,16 @@ main {
    position:relative;
 }
 dl.notes > dt {
-    font-family: "DejaVu Sans", sans;
+    font-family: 'DejaVu Sans', Arial, Helvetica, sans-serif;
+    /* font-size:12px; */
    font-weight:bold;
    margin:10px 0 0 0;
    color:#4E4E4E;
 }
 dl.notes > dd {
-    margin:5px 10px 10px 0;
+    margin:5px 10px 0 0;
+    /* font-size:14px; */
+    font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
 }
 dl.name-value > dt {
    margin-left:1px;
@ -389,6 +388,11 @@ ul.see-list-long li:not(:last-child):after {
    border-bottom:1px solid #EEE;
    padding:0;
 }
+
+.summary-table .col-first {
+    font-family: "DejaVu Sans Mono", monospace;
+}
+
 .caption {
    position:relative;
    text-align:left;
@ -402,7 +406,6 @@ ul.see-list-long li:not(:last-child):after {
    padding-left:1px;
    margin:0;
    white-space:pre;
-    font-family: 'DejaVu Sans';
 }
 .caption a:link, .caption a:visited {
    color:#1f389c;
@ -450,9 +453,6 @@ div.table-tabs > button.table-tab {
    display: grid;
    grid-template-columns: minmax(10%, max-content) minmax(15%, max-content) minmax(15%, auto);
 }
-#method-summary-table .three-column-summary {
-    grid-template-columns: minmax(10%, 20%) minmax(15%, max-content) minmax(15%, auto);
-} 
 .four-column-summary {
    display: grid;
    grid-template-columns: minmax(10%, max-content) minmax(10%, max-content) minmax(10%, max-content) minmax(10%, auto);
@ -490,7 +490,6 @@ div.table-tabs > button.table-tab {
 }
 .table-header {
    background:#dee3e9;
-    font-family: 'DejaVu Sans';
    font-weight: bold;
 }
 /*
@ -508,7 +507,6 @@ div.table-tabs > button.table-tab {
 .col-last {
    white-space:normal;
 }
-/*
 .col-first a:link, .col-first a:visited,
 .col-second a:link, .col-second a:visited,
 .col-first a:link, .col-first a:visited,
@ -520,7 +518,6 @@ div.table-tabs > button.table-tab {
 .all-packages-container a:link, .all-packages-container a:visited {
    font-weight:bold;
 }
-*/
 .table-sub-heading-color {
    background-color:#EEEEFF;
 }
@ -537,12 +534,9 @@ div.table-tabs > button.table-tab {
    margin:0;
    padding:10px 0;
 }
-/*
 div.block {
-    font-size:14px;
    font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
 }
-*/
 .col-last div {
    padding-top:0;
 }
@ -553,8 +547,7 @@ div.block {
 .package-signature,
 .type-signature,
 .member-signature {
-    font-family: "DejaVu Sans Mono", monospace;
-    /* font-size:14px; */
+    font-family:'DejaVu Sans Mono', monospace;
    margin:14px 0;
    white-space: pre-wrap;
 }
@ -593,13 +586,8 @@ h1.hidden {
 .deprecated-label, .descfrm-type-label, .implementation-label, .member-name-label, .member-name-link,
 .module-label-in-package, .module-label-in-type, .override-specify-label, .package-label-in-type,
 .package-hierarchy-label, .type-name-label, .type-name-link, .search-tag-link, .preview-label {
-    font-family: "DejaVu Sans", sans;
    font-weight:bold;
 }
-.sub-title, .inheritance, .all-packages-table-tab1.col-first,
-    .summary-table .col-first {
-    font-family: "DejaVu Sans", sans;
-}
 .deprecation-comment, .help-footnote, .preview-comment {
    font-style:italic;
 }
@ -658,6 +646,7 @@ main, nav, header, footer, section {
 ul.ui-autocomplete {
    position:fixed;
    z-index:999999;
+    background-color: #FFFFFF;
 }
 ul.ui-autocomplete  li {
    float:left;
@ -667,6 +656,9 @@ ul.ui-autocomplete  li {
 .result-highlight {
    font-weight:bold;
 }
+.ui-autocomplete .result-item {
+    font-size: inherit;
+}
 #search-input {
    background-image:url('resources/glass.png');
    background-size:13px;
--- a/org.jdrupes.vmoperator.common/src/org/jdrupes/vmoperator/common/VmDefinitionModel.java
+++ b/org.jdrupes.vmoperator.common/src/org/jdrupes/vmoperator/common/VmDefinitionModel.java
@ -41,7 +41,8 @@ public class VmDefinitionModel extends K8sDynamicModel {
     * Permissions for accessing and manipulating the VM.
     */
    public enum Permission {
-        START("start"), STOP("stop"), ACCESS_CONSOLE("accessConsole");
+        START("start"), STOP("stop"), RESET("reset"),
+        ACCESS_CONSOLE("accessConsole");

        @SuppressWarnings("PMD.UseConcurrentHashMap")
        private static Map<String, Permission> reprs = new HashMap<>();
--- a/org.jdrupes.vmoperator.manager.events/src/org/jdrupes/vmoperator/manager/events/ResetVm.java
+++ b/org.jdrupes.vmoperator.manager.events/src/org/jdrupes/vmoperator/manager/events/ResetVm.java
@ -0,0 +1,48 @@
+/*
+ * 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;
+    }
+}
--- a/org.jdrupes.vmoperator.manager/build.gradle
+++ b/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.5.0,2)'
+    implementation 'org.jgrapes:org.jgrapes.webconsole.base:[1.7.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.3.0,2)'
+    implementation 'org.jgrapes:org.jgrapes.webconlet.oidclogin:[1.4.0,2)'
    implementation 'org.jgrapes:org.jgrapes.webconlet.markdowndisplay:[1.2.0,2)'
    
    runtimeOnly 'org.jgrapes:org.jgrapes.webconlet.sysinfo:[1.4.0,2)'
--- a/org.jdrupes.vmoperator.manager/resources/org/jdrupes/vmoperator/manager/runnerConfig.ftl.yaml
+++ b/org.jdrupes.vmoperator.manager/resources/org/jdrupes/vmoperator/manager/runnerConfig.ftl.yaml
@ -48,6 +48,12 @@ 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:
--- a/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/ConfigMapReconciler.java
+++ b/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/ConfigMapReconciler.java
@ -36,7 +36,6 @@ 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;
@ -62,7 +61,6 @@ import org.yaml.snakeyaml.constructor.SafeConstructor;
    /**
     * Reconcile.
     *
-     * @param event the event
     * @param model the model
     * @param channel the channel
     * @return the dynamic kubernetes object
@ -70,8 +68,8 @@ import org.yaml.snakeyaml.constructor.SafeConstructor;
     * @throws TemplateException the template exception
     * @throws ApiException the api exception
     */
-    public DynamicKubernetesObject reconcile(VmDefChanged event,
-            Map<String, Object> model, VmChannel channel)
+    public DynamicKubernetesObject reconcile(Map<String, Object> model,
+            VmChannel channel)
            throws IOException, TemplateException, ApiException {
        // Get API
        DynamicKubernetesApi cmApi = new DynamicKubernetesApi("", "v1",
--- a/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/Controller.java
+++ b/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/Controller.java
@ -181,13 +181,12 @@ public class Controller extends Component {
    @Handler
    public void onModifyVm(ModifyVm event, VmChannel channel)
            throws ApiException, IOException {
-        patchVmSpec(channel.client(), event.name(), event.path(),
+        patchVmDef(channel.client(), event.name(), "spec/vm/" + event.path(),
            event.value());
    }

-    private void patchVmSpec(K8sClient client, String name, String path,
-            Object value)
-            throws ApiException, IOException {
+    private void patchVmDef(K8sClient client, String name, String path,
+            Object value) throws ApiException, IOException {
        var vmStub = K8sDynamicStub.get(client,
            new GroupVersionKind(VM_OP_GROUP, "", VM_OP_KIND_VM), namespace,
            name);
@ -197,7 +196,7 @@ public class Controller extends Component {
            ? "\"" + value + "\""
            : value.toString();
        var res = vmStub.patch(V1Patch.PATCH_FORMAT_JSON_PATCH,
-            new V1Patch("[{\"op\": \"replace\", \"path\": \"/spec/vm/"
+            new V1Patch("[{\"op\": \"replace\", \"path\": \"/"
                + path + "\", \"value\": " + valueAsText + "}]"),
            client.defaultPatchOptions());
        if (!res.isPresent()) {
--- a/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/DisplaySecretMonitor.java
+++ b/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/DisplaySecretMonitor.java
@ -33,6 +33,7 @@ import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Scanner;
 import java.util.logging.Level;
 import static org.jdrupes.vmoperator.common.Constants.APP_NAME;
@ -180,7 +181,8 @@ public class DisplaySecretMonitor
        // Check validity
        var model = stub.model().get();
        @SuppressWarnings("PMD.StringInstantiation")
-        var expiry = new String(model.getData().get(DATA_PASSWORD_EXPIRY));
+        var expiry = Optional.ofNullable(model.getData()
+            .get(DATA_PASSWORD_EXPIRY)).map(b -> new String(b)).orElse(null);
        if (model.getData().get(DATA_DISPLAY_PASSWORD) != null
            && stillValid(expiry)) {
            event.setResult(
--- a/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/DisplaySecretReconciler.java
+++ b/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(false)) {
+            .map(JsonPrimitive::getAsBoolean).orElse(true)) {
            return;
        }

--- a/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/Reconciler.java
+++ b/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/Reconciler.java
@ -51,6 +51,7 @@ 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;
@ -209,13 +210,35 @@ 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(event, model, channel);
+        var configMap = cmReconciler.reconcile(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
--- a/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/VmMonitor.java
+++ b/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);
+            addDynamicData(channel.client(), vmDef, channel.vmDefinition());
            channel.setVmDefinition(vmDef);
        } else {
            // Reuse cached
@ -151,8 +151,16 @@ public class VmMonitor extends
        }
    }

-    private void addDynamicData(K8sClient client, K8sDynamicModel vmState) {
+    private void addDynamicData(K8sClient client, VmDefinitionModel 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", "");

--- a/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/package-info.java
+++ b/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/package-info.java
@ -57,7 +57,7 @@
 * ```
 *  
 * Developers may also be interested in the usage of channels
- * by the application's component:
+ * by the application's components:
 *
 * ![Main channels](app-channels.svg)
 * 
@ -74,6 +74,8 @@
 * 
 * Component NioDispatcher as NioDispatcher <<internal>>
 * [Manager] *-up- [NioDispatcher]
+ * Component HttpConnector as HttpConnector <<internal>>
+ * [Manager] *-up- [HttpConnector]
 * Component FileSystemWatcher as FileSystemWatcher <<internal>>
 * [Manager] *-up- [FileSystemWatcher]
 * Component YamlConfigurationStore as YamlConfigurationStore <<internal>>
@ -119,6 +121,7 @@
 * [WebConsole] *-- [RoleConfigurator]
 * [WebConsole] *-- [RoleConletFilter]
 * [WebConsole] *-left- [LoginConlet]
+ * [WebConsole] *-right- [OidcClient]
 * 
 * Component "ComponentCollector\nfor page resources" as cpr <<internal>>
 * [WebConsole] *-- [cpr]
@ -147,21 +150,35 @@
 * () "guiTransport" as hT
 * hT .up. [GuiSocketServer:8080]
 * hT .down. [GuiHttpServer]
+ * hT .right[hidden]. [HttpConnector]
 * 
 * [YamlConfigurationStore] -right[hidden]- hT
 * 
 * () "guiHttp" as http
 * http .up. [GuiHttpServer]
+ * http .up. [HttpConnector]
+ * note top of [HttpConnector]: transport layer com-\nponents omitted
 * 
- * [PreferencesStore] .right. http
+ * [PreferencesStore] .. http
+ * [OidcClient] .up. http
+ * [LanguageSelector] .left. http
 * [InMemorySessionManager] .up. http
- * [LanguageSelector] .up. http
 * 
 * package "Conceptual WebConsole" {
- *   [ConsoleWeblet] .left. http
+ *   [ConsoleWeblet] .right. http
 *   [ConsoleWeblet] *-down- [WebConsole]
 * }
 * 
+ * [Controller] .down[hidden]. [ConsoleWeblet]
+ * 
+ * () "console" as console
+ * console .. WebConsole
+ * 
+ * [OidcClient] .. console
+ * [LoginConlet] .right. console
+ * 
+ * note right of console: More conlets\nconnect here
+ * 
 * @enduml
 */
 package org.jdrupes.vmoperator.manager;
--- a/org.jdrupes.vmoperator.runner.qemu/config-sample.yaml
+++ b/org.jdrupes.vmoperator.runner.qemu/config-sample.yaml
@ -46,6 +46,12 @@
  # "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":
    # The VM's name (required)
--- a/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Configuration.java
+++ b/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Configuration.java
@ -82,6 +82,9 @@ 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;
--- a/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/DisplayController.java
+++ b/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/DisplayController.java
@ -116,8 +116,9 @@ public class DisplayController extends Component {
        }

        if (Objects.equals(this.currentPassword, password)) {
-            return false;
+            return true;
        }
+        this.currentPassword = password;
        logger.fine(() -> "Updating display password");
        fire(new MonitorCommand(new QmpSetDisplayPassword(protocol, password)));
        return true;
--- a/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Runner.java
+++ b/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Runner.java
@ -55,6 +55,7 @@ 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;
@ -215,6 +216,7 @@ 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 */
@ -615,7 +617,7 @@ public class Runner extends Component {
     * @param event the event
     */
    @Handler(priority = -1000)
-    public void onConfigureQemu(ConfigureQemu event) {
+    public void onConfigureQemuFinal(ConfigureQemu event) {
        if (state == State.STARTING) {
            fire(new MonitorCommand(new QmpCont()));
            state = State.RUNNING;
@ -624,6 +626,23 @@ 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.
     *
--- a/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/commands/QmpReset.java
+++ b/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/commands/QmpReset.java
@ -0,0 +1,43 @@
+/*
+ * 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()";
+    }
+
+}
--- a/org.jdrupes.vmoperator.util/src/org/jdrupes/vmoperator/util/GsonPtr.java
+++ b/org.jdrupes.vmoperator.util/src/org/jdrupes/vmoperator/util/GsonPtr.java
@ -265,6 +265,18 @@ 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))`.
     *
--- a/org.jdrupes.vmoperator.vmconlet/resources/org/jdrupes/vmoperator/vmconlet/VmConlet-view.ftl.html
+++ b/org.jdrupes.vmoperator.vmconlet/resources/org/jdrupes/vmoperator/vmconlet/VmConlet-view.ftl.html
@ -52,12 +52,14 @@
              v-html="controller.breakBeforeDots(entry[key])"></span>
          </td>
          <td class="jdrupes-vmoperator-vmconlet-view-action-list">
-            <span role="button" v-if="entry.spec.vm.state != 'Running'" 
+            <span role="button" 
+              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" v-if="entry.spec.vm.state != 'Stopped'"
+            <span role="button"
+              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"
--- a/org.jdrupes.vmoperator.vmviewer/build.gradle
+++ b/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.3.0,2)'
+    implementation 'org.jgrapes:org.jgrapes.webconsole.base:[1.7.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)'
--- a/org.jdrupes.vmoperator.vmviewer/resources/org/jdrupes/vmoperator/vmviewer/VmViewer-confirmReset.ftl.html
+++ b/org.jdrupes.vmoperator.vmviewer/resources/org/jdrupes/vmoperator/vmviewer/VmViewer-confirmReset.ftl.html
@ -0,0 +1,13 @@
+<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>
--- a/org.jdrupes.vmoperator.vmviewer/resources/org/jdrupes/vmoperator/vmviewer/VmViewer-edit.ftl.html
+++ b/org.jdrupes.vmoperator.vmviewer/resources/org/jdrupes/vmoperator/vmviewer/VmViewer-edit.ftl.html
@ -1,4 +1,5 @@
-<div title="${_("conletName")}" class="jdrupes-vmoperator-vmviewer-edit"
+<div title="${_("conletName")}"
+  class="jdrupes-vmoperator-vmviewer jdrupes-vmoperator-vmviewer-edit"
  data-jgwc-on-load="orgJDrupesVmOperatorVmViewer.initEdit"
  data-jgwc-on-action="orgJDrupesVmOperatorVmViewer.applyEdit"    
  data-jgwc-on-unload="JGConsole.jgwc.unmountVueApps">
--- a/org.jdrupes.vmoperator.vmviewer/resources/org/jdrupes/vmoperator/vmviewer/VmViewer-preview.ftl.html
+++ b/org.jdrupes.vmoperator.vmviewer/resources/org/jdrupes/vmoperator/vmviewer/VmViewer-preview.ftl.html
@ -1,4 +1,5 @@
-<div class="jdrupes-vmoperator-vmviewer jdrupes-vmoperator-vmviewer-preview"
+<div 
+  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"
--- a/org.jdrupes.vmoperator.vmviewer/resources/org/jdrupes/vmoperator/vmviewer/l10n.properties
+++ b/org.jdrupes.vmoperator.vmviewer/resources/org/jdrupes/vmoperator/vmviewer/l10n.properties
@ -1,3 +1,7 @@
 conletName = VM Console

 okayLabel = Apply and Close
+
+confirmResetTitle = Confirm reset
+confirmResetMsg = Resetting the VM may cause loss of data. \
+  Please confirm to continue.
--- a/org.jdrupes.vmoperator.vmviewer/resources/org/jdrupes/vmoperator/vmviewer/l10n_de.properties
+++ b/org.jdrupes.vmoperator.vmviewer/resources/org/jdrupes/vmoperator/vmviewer/l10n_de.properties
@ -5,4 +5,9 @@ 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.
--- a/org.jdrupes.vmoperator.vmviewer/resources/org/jdrupes/vmoperator/vmviewer/reset-icon.svg
+++ b/org.jdrupes.vmoperator.vmviewer/resources/org/jdrupes/vmoperator/vmviewer/reset-icon.svg
@ -0,0 +1,42 @@
+<?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>
--- a/org.jdrupes.vmoperator.vmviewer/src/org/jdrupes/vmoperator/vmviewer/VmViewer.java
+++ b/org.jdrupes.vmoperator.vmviewer/src/org/jdrupes/vmoperator/vmviewer/VmViewer.java
@ -20,6 +20,7 @@ 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;
@ -54,6 +55,7 @@ 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;
@ -90,10 +92,10 @@ import org.jgrapes.webconsole.base.events.UpdateConletType;
 import org.jgrapes.webconsole.base.freemarker.FreeMarkerConlet;

 /**
- * The Class VmConlet.
+ * The Class VmViewer.
 */
@SuppressWarnings({ "PMD.DataflowAnomalyAnalysis", "PMD.ExcessiveImports",
-    "PMD.CouplingBetweenObjects", "PMD.GodClass" })
+    "PMD.CouplingBetweenObjects", "PMD.GodClass", "PMD.TooManyMethods" })
 public class VmViewer extends FreeMarkerConlet<VmViewer.ViewerModel> {

    private static final String VM_NAME_PROPERTY = "vmName";
@ -465,12 +467,19 @@ public class VmViewer extends FreeMarkerConlet<VmViewer.ViewerModel> {

    @Override
    @SuppressWarnings({ "PMD.AvoidDecimalLiteralsInBigDecimalConstructor",
-        "PMD.ConfusingArgumentToVarargsMethod" })
+        "PMD.ConfusingArgumentToVarargsMethod", "PMD.NcssCount",
+        "PMD.AvoidLiteralsInIfCondition" })
    protected void doUpdateConletState(NotifyConletModel event,
            ConsoleConnection channel, ViewerModel model)
            throws Exception {
        event.stop();
-        var both = Optional.ofNullable(event.params().asString(0))
+        if ("selectedVm".equals(event.method())) {
+            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;
@ -479,14 +488,8 @@ 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));
@ -497,6 +500,16 @@ 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),
@ -510,6 +523,15 @@ 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);
@ -577,6 +599,20 @@ 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 {
--- a/org.jdrupes.vmoperator.vmviewer/src/org/jdrupes/vmoperator/vmviewer/browser/VmViewer-functions.ts
+++ b/org.jdrupes.vmoperator.vmviewer/src/org/jdrupes/vmoperator/vmviewer/browser/VmViewer-functions.ts
@ -31,8 +31,9 @@ declare global {
    interface Window {
        orgJDrupesVmOperatorVmViewer: { 
            initPreview?: (previewDom: HTMLElement, isUpdate: boolean) => void,
-            initEdit?: (viewDom: HTMLElement, isUpdate: boolean) => void
-            applyEdit?: (viewDom: HTMLElement, apply: boolean) => void
+            initEdit?: (viewDom: HTMLElement, isUpdate: boolean) => void,
+            applyEdit?: (viewDom: HTMLElement, apply: boolean) => void,
+            confirmReset?: (conletType: string, conletId: string) => void
        }
    }
 }
@ -63,7 +64,16 @@ window.orgJDrupesVmOperatorVmViewer.initPreview = (previewDom: HTMLElement,
                vmName: "",
                vmDefinition: {}
            });
-            const vmDef = computed(() => previewApi.vmDefinition);
+            const configured = computed(() => previewApi.vmDefinition.spec);
+            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 !== "") {
@ -73,41 +83,51 @@ window.orgJDrupesVmOperatorVmViewer.initPreview = (previewDom: HTMLElement,
        
            provideApi(previewDom, previewApi);

-            const vmAction = (vmName: string, action: string) => {
-                JGConsole.notifyConletModel(conletId, action, vmName);
+            const vmAction = (action: string) => {
+                JGConsole.notifyConletModel(conletId, action);
            };
        
-            return { localize, resourceBase, vmDef, vmAction };
+            return { localize, resourceBase, vmAction, configured,
+                        startable, stoppable, running, permissions };
        },
        template: `
          <table>
            <tbody>
              <tr>
-                <td><img role=button 
-                  :aria-disabled="!vmDef.running || !vmDef.userPermissions
-                    || !vmDef.userPermissions.includes('accessConsole')" 
-                  v-on:click="vmAction(vmDef.name, 'openConsole')"
-                  :src="resourceBase + (vmDef.running
+                <td rowspan="2" style="position: relative"><span
+                  style="position: absolute;" 
+                  :class="{ busy: configured && !startable && !stoppable }"
+                  ><img role=button :aria-disabled="!running
+                      || !permissions.includes('accessConsole')" 
+                  v-on:click="vmAction('openConsole')"
+                  :src="resourceBase + (running
                      ? 'computer.svg' : 'computer-off.svg')"
-                  :title="localize('Open console')"></td>
-                <td v-if="vmDef.spec"
-                  class="jdrupes-vmoperator-vmviewer-preview-action-list">
-                  <span role="button" v-if="vmDef.spec.vm.state != 'Running'"
-                    :aria-disabled="!vmDef.userPermissions.includes('start')" 
+                  :title="localize('Open console')"></span><span
+                  style="visibility: hidden;"><img
+                  :src="resourceBase + 'computer.svg'"></span></td>
+                <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(vmDef.name, 'start')"></span>
-                  <span role="button" v-else class="fa fa-play"
-                    aria-disabled="true" :title="localize('Start VM')"></span>
-                  <span role="button" v-if="vmDef.spec.vm.state != 'Stopped'"
-                    :aria-disabled="!vmDef.userPermissions.includes('stop')" 
+                    v-on:click="vmAction('start')"></span>
+                  <span role="button"
+                    :aria-disabled="!stoppable || !permissions.includes('stop')" 
                    tabindex="0" class="fa fa-stop" :title="localize('Stop VM')"
-                    v-on:click="vmAction(vmDef.name, 'stop')"></span>
-                  <span role="button" v-else class="fa fa-stop"
-                    aria-disabled="true" :title="localize('Stop VM')"></span>
-                </td>
-                <td v-else>
+                    v-on:click="vmAction('stop')"></span>
+                  <span role="button"
+                    :aria-disabled="!running || !permissions.includes('reset')" 
+                    tabindex="0" class="svg-icon" :title="localize('Reset VM')"
+                    v-on:click="vmAction('reset')">
+                    <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>`
    });
@ -209,3 +229,9 @@ 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");
+}
--- a/org.jdrupes.vmoperator.vmviewer/src/org/jdrupes/vmoperator/vmviewer/browser/VmViewer-style.scss
+++ b/org.jdrupes.vmoperator.vmviewer/src/org/jdrupes/vmoperator/vmviewer/browser/VmViewer-style.scss
@ -19,7 +19,24 @@
 /*
 * Conlet specific styles.
 */
-.jdrupes-vmoperator-vmviewer-preview {
+.jdrupes-vmoperator-vmviewer {
+  
+  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;
@ -28,6 +45,9 @@
      box-shadow: var(--darkening);
    }
  }
+}
+
+.jdrupes-vmoperator-vmviewer.jdrupes-vmoperator-vmviewer-preview {
  
  img {
    height: 3em;
@ -37,9 +57,42 @@
        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 {
+  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;
+    }
+  }
+  
+}