Add a --replace option

This adds a --replace option to the various device addition commands to allow for "modifying" devices. Affects: #25
io7m · Jul 19, 2020 · 667d393 · 667d393
1 parent 434ed7e
commit 667d393
Show file tree

Hide file tree

Showing 27 changed files with 746 additions and 158 deletions.
diff --git a/...mill.cmdline/src/main/java/com/io7m/waxmill/cmdline/internal/WXMCommandVMAddAHCIDisk.java b/...mill.cmdline/src/main/java/com/io7m/waxmill/cmdline/internal/WXMCommandVMAddAHCIDisk.java
@@ -23,13 +23,13 @@
 import com.io7m.waxmill.client.api.WXMClientType;
 import com.io7m.waxmill.machines.WXMDeviceAHCIDisk;
 import com.io7m.waxmill.machines.WXMDeviceSlot;
-import com.io7m.waxmill.machines.WXMDeviceSlots;
 import com.io7m.waxmill.machines.WXMDeviceType;
 import com.io7m.waxmill.machines.WXMMachineMessages;
 import com.io7m.waxmill.machines.WXMOpenOption;
 import com.io7m.waxmill.machines.WXMStorageBackendFile;
 import com.io7m.waxmill.machines.WXMStorageBackendZFSVolume;
 import com.io7m.waxmill.machines.WXMVirtualMachine;
+import com.io7m.waxmill.machines.WXMVirtualMachines;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -87,6 +87,14 @@ public final class WXMCommandVMAddAHCIDisk extends
   )
   private WXMStorageBackendType backend;
 
+  @Parameter(
+    names = "--replace",
+    description = "Replace an existing device, if one exists",
+    required = false,
+    arity = 1
+  )
+  private boolean replace;
+
   /**
    * Construct a command.
    *
@@ -163,12 +171,6 @@ protected Status executeActualWithConfiguration(
   {
     try (var client = WXMServices.clients().open(configurationPath)) {
       final var machine = client.vmFind(this.id);
-      this.deviceSlot =
-        WXMDeviceSlots.checkDeviceSlotNotUsed(
-          WXMMachineMessages.create(),
-          machine,
-          this.deviceSlot
-        );
 
       switch (this.backend.kind()) {
         case WXM_STORAGE_FILE:
@@ -198,10 +200,12 @@ protected Status executeActualWithConfiguration(
           .build();
 
       final var updatedMachine =
-        WXMVirtualMachine.builder()
-          .from(machine)
-          .addDevices(disk)
-          .build();
+        WXMVirtualMachines.updateWithDevice(
+          WXMMachineMessages.create(),
+          machine,
+          disk,
+          this.replace
+        );
 
       client.vmUpdate(updatedMachine);
       this.showCreated(client, machine);

diff --git a/...l.cmdline/src/main/java/com/io7m/waxmill/cmdline/internal/WXMCommandVMAddAHCIOptical.java b/...l.cmdline/src/main/java/com/io7m/waxmill/cmdline/internal/WXMCommandVMAddAHCIOptical.java
@@ -21,10 +21,9 @@
 import com.io7m.claypot.core.CLPCommandContextType;
 import com.io7m.waxmill.machines.WXMDeviceAHCIOpticalDisk;
 import com.io7m.waxmill.machines.WXMDeviceSlot;
-import com.io7m.waxmill.machines.WXMDeviceSlots;
 import com.io7m.waxmill.machines.WXMDeviceType;
 import com.io7m.waxmill.machines.WXMMachineMessages;
-import com.io7m.waxmill.machines.WXMVirtualMachine;
+import com.io7m.waxmill.machines.WXMVirtualMachines;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -64,6 +63,14 @@ public final class WXMCommandVMAddAHCIOptical extends
   )
   private WXMDeviceSlot deviceSlot;
 
+  @Parameter(
+    names = "--replace",
+    description = "Replace an existing device, if one exists",
+    required = false,
+    arity = 1
+  )
+  private boolean replace;
+
   /**
    * Construct a command.
    *
@@ -89,12 +96,6 @@ protected Status executeActualWithConfiguration(
   {
     try (var client = WXMServices.clients().open(configurationPath)) {
       final var machine = client.vmFind(this.id);
-      this.deviceSlot =
-        WXMDeviceSlots.checkDeviceSlotNotUsed(
-          WXMMachineMessages.create(),
-          machine,
-          this.deviceSlot
-        );
 
       final WXMDeviceType disk =
         WXMDeviceAHCIOpticalDisk.builder()
@@ -103,10 +104,12 @@ protected Status executeActualWithConfiguration(
           .build();
 
       final var updatedMachine =
-        WXMVirtualMachine.builder()
-          .from(machine)
-          .addDevices(disk)
-          .build();
+        WXMVirtualMachines.updateWithDevice(
+          WXMMachineMessages.create(),
+          machine,
+          disk,
+          this.replace
+        );
 
       client.vmUpdate(updatedMachine);
     }

diff --git a/...ne/src/main/java/com/io7m/waxmill/cmdline/internal/WXMCommandVMAddE1000NetworkDevice.java b/...ne/src/main/java/com/io7m/waxmill/cmdline/internal/WXMCommandVMAddE1000NetworkDevice.java
@@ -21,11 +21,11 @@
 import com.io7m.claypot.core.CLPCommandContextType;
 import com.io7m.waxmill.machines.WXMDeviceE1000;
 import com.io7m.waxmill.machines.WXMDeviceSlot;
-import com.io7m.waxmill.machines.WXMDeviceSlots;
 import com.io7m.waxmill.machines.WXMMachineMessages;
+import com.io7m.waxmill.machines.WXMNetworkDeviceBackendType;
 import com.io7m.waxmill.machines.WXMTap;
 import com.io7m.waxmill.machines.WXMVMNet;
-import com.io7m.waxmill.machines.WXMVirtualMachine;
+import com.io7m.waxmill.machines.WXMVirtualMachines;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -35,8 +35,6 @@
 
 import static com.io7m.claypot.core.CLPCommandType.Status.SUCCESS;
 
-import com.io7m.waxmill.machines.WXMNetworkDeviceBackendType;
-
 @Parameters(commandDescription = "Add an e1000 network device to a virtual machine.")
 public final class WXMCommandVMAddE1000NetworkDevice
   extends WXMAbstractCommandWithConfiguration
@@ -75,6 +73,14 @@ public final class WXMCommandVMAddE1000NetworkDevice
   )
   private WXMNetworkDeviceBackendType backend;
 
+  @Parameter(
+    names = "--replace",
+    description = "Replace an existing device, if one exists",
+    required = false,
+    arity = 1
+  )
+  private boolean replace;
+
   /**
    * Construct a command.
    *
@@ -110,12 +116,6 @@ protected Status executeActualWithConfiguration(
   {
     try (var client = WXMServices.clients().open(configurationPath)) {
       final var machine = client.vmFind(this.id);
-      this.deviceSlot =
-        WXMDeviceSlots.checkDeviceSlotNotUsed(
-          WXMMachineMessages.create(),
-          machine,
-          this.deviceSlot
-        );
 
       final var virtio =
         WXMDeviceE1000.builder()
@@ -125,10 +125,12 @@ protected Status executeActualWithConfiguration(
           .build();
 
       final var updatedMachine =
-        WXMVirtualMachine.builder()
-          .from(machine)
-          .addDevices(virtio)
-          .build();
+        WXMVirtualMachines.updateWithDevice(
+          WXMMachineMessages.create(),
+          machine,
+          virtio,
+          this.replace
+        );
 
       client.vmUpdate(updatedMachine);
 

diff --git a/...ine/src/main/java/com/io7m/waxmill/cmdline/internal/WXMCommandVMAddFramebufferDevice.java b/...ine/src/main/java/com/io7m/waxmill/cmdline/internal/WXMCommandVMAddFramebufferDevice.java
@@ -21,9 +21,8 @@
 import com.io7m.claypot.core.CLPCommandContextType;
 import com.io7m.waxmill.machines.WXMDeviceFramebuffer;
 import com.io7m.waxmill.machines.WXMDeviceSlot;
-import com.io7m.waxmill.machines.WXMDeviceSlots;
 import com.io7m.waxmill.machines.WXMMachineMessages;
-import com.io7m.waxmill.machines.WXMVirtualMachine;
+import com.io7m.waxmill.machines.WXMVirtualMachines;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -109,6 +108,14 @@ public final class WXMCommandVMAddFramebufferDevice
   )
   private boolean waitForVNC;
 
+  @Parameter(
+    names = "--replace",
+    description = "Replace an existing device, if one exists",
+    required = false,
+    arity = 1
+  )
+  private boolean replace;
+
   /**
    * Construct a command.
    *
@@ -143,12 +150,6 @@ protected Status executeActualWithConfiguration(
   {
     try (var client = WXMServices.clients().open(configurationPath)) {
       final var machine = client.vmFind(this.id);
-      this.deviceSlot =
-        WXMDeviceSlots.checkDeviceSlotNotUsed(
-          WXMMachineMessages.create(),
-          machine,
-          this.deviceSlot
-        );
 
       final var virtio =
         WXMDeviceFramebuffer.builder()
@@ -163,10 +164,12 @@ protected Status executeActualWithConfiguration(
           .build();
 
       final var updatedMachine =
-        WXMVirtualMachine.builder()
-          .from(machine)
-          .addDevices(virtio)
-          .build();
+        WXMVirtualMachines.updateWithDevice(
+          WXMMachineMessages.create(),
+          machine,
+          virtio,
+          this.replace
+        );
 
       client.vmUpdate(updatedMachine);
     }

diff --git a/...m.waxmill.cmdline/src/main/java/com/io7m/waxmill/cmdline/internal/WXMCommandVMAddLPC.java b/...m.waxmill.cmdline/src/main/java/com/io7m/waxmill/cmdline/internal/WXMCommandVMAddLPC.java
@@ -21,13 +21,12 @@
 import com.io7m.claypot.core.CLPCommandContextType;
 import com.io7m.waxmill.machines.WXMDeviceLPC;
 import com.io7m.waxmill.machines.WXMDeviceSlot;
-import com.io7m.waxmill.machines.WXMDeviceSlots;
 import com.io7m.waxmill.machines.WXMMachineMessages;
 import com.io7m.waxmill.machines.WXMTTYBackendFile;
 import com.io7m.waxmill.machines.WXMTTYBackendNMDM;
 import com.io7m.waxmill.machines.WXMTTYBackendStdio;
 import com.io7m.waxmill.machines.WXMTTYBackends;
-import com.io7m.waxmill.machines.WXMVirtualMachine;
+import com.io7m.waxmill.machines.WXMVirtualMachines;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -81,6 +80,14 @@ public final class WXMCommandVMAddLPC extends
   )
   private List<WXMTTYBackendType> backends = List.of();
 
+  @Parameter(
+    names = "--replace",
+    description = "Replace an existing device, if one exists",
+    required = false,
+    arity = 1
+  )
+  private boolean replace;
+
   /**
    * Construct a command.
    *
@@ -116,12 +123,6 @@ protected Status executeActualWithConfiguration(
   {
     try (var client = WXMServices.clients().open(configurationPath)) {
       final var machine = client.vmFind(this.id);
-      this.deviceSlot =
-        WXMDeviceSlots.checkDeviceSlotNotUsed(
-          WXMMachineMessages.create(),
-          machine,
-          this.deviceSlot
-        );
 
       final Map<String, WXMTTYBackendType> backendMap = new HashMap<>(3);
       for (final WXMTTYBackendType backend : this.backends) {
@@ -140,10 +141,12 @@ protected Status executeActualWithConfiguration(
           .build();
 
       final var updatedMachine =
-        WXMVirtualMachine.builder()
-          .from(machine)
-          .addDevices(lpc)
-          .build();
+        WXMVirtualMachines.updateWithDevice(
+          WXMMachineMessages.create(),
+          machine,
+          lpc,
+          this.replace
+        );
 
       client.vmUpdate(updatedMachine);
 

diff --git a/...mill.cmdline/src/main/java/com/io7m/waxmill/cmdline/internal/WXMCommandVMAddPassthru.java b/...mill.cmdline/src/main/java/com/io7m/waxmill/cmdline/internal/WXMCommandVMAddPassthru.java
@@ -21,9 +21,8 @@
 import com.io7m.claypot.core.CLPCommandContextType;
 import com.io7m.waxmill.machines.WXMDevicePassthru;
 import com.io7m.waxmill.machines.WXMDeviceSlot;
-import com.io7m.waxmill.machines.WXMDeviceSlots;
 import com.io7m.waxmill.machines.WXMMachineMessages;
-import com.io7m.waxmill.machines.WXMVirtualMachine;
+import com.io7m.waxmill.machines.WXMVirtualMachines;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -71,6 +70,14 @@ public final class WXMCommandVMAddPassthru extends
   )
   private WXMDeviceSlot hostDeviceSlot;
 
+  @Parameter(
+    names = "--replace",
+    description = "Replace an existing device, if one exists",
+    required = false,
+    arity = 1
+  )
+  private boolean replace;
+
   /**
    * Construct a command.
    *
@@ -106,12 +113,6 @@ protected Status executeActualWithConfiguration(
   {
     try (var client = WXMServices.clients().open(configurationPath)) {
       final var machine = client.vmFind(this.id);
-      this.deviceSlot =
-        WXMDeviceSlots.checkDeviceSlotNotUsed(
-          WXMMachineMessages.create(),
-          machine,
-          this.deviceSlot
-        );
 
       final var passthru =
         WXMDevicePassthru.builder()
@@ -121,10 +122,12 @@ protected Status executeActualWithConfiguration(
           .build();
 
       final var updatedMachine =
-        WXMVirtualMachine.builder()
-          .from(machine)
-          .addDevices(passthru)
-          .build();
+        WXMVirtualMachines.updateWithDevice(
+          WXMMachineMessages.create(),
+          machine,
+          passthru,
+          this.replace
+        );
 
       client.vmUpdate(updatedMachine);
     }