Ac 88 delay vm boot (#31)

* New param on start vm command to specify a boot delay implemented through the kvm boot menu timeout

* Translating the profile param to a concrete field in the transfer object.

* Adding the boot delay to the admin start vm form.

* Adding default value to form.

* Fixing default value for form

* Adding boot delay option to user form. Fixing text to indicate to the user the units.

* Adding help text and fixing label to not wrap.

* Missed a few languages.

Author: nlgordon

api/src/com/cloud/agent/api/to/VirtualMachineTO.java

@@ -51,6 +51,7 @@ public class VirtualMachineTO {
     String os;
     String platformEmulator;
     String bootArgs;
+    Integer bootDelay = 0;
     String[] bootupScripts;
     boolean enableHA;
     boolean limitCpuUse;
@@ -223,6 +224,14 @@ public void setBootArgs(Map<String, String> bootParams) {
         bootArgs = buf.toString();
     }
 
+    public Integer getBootDelay() {
+        return bootDelay;
+    }
+
+    public void setBootDelay(Integer bootDelay) {
+        this.bootDelay = bootDelay;
+    }
+
     public String[] getBootupScripts() {
         return bootupScripts;
     }

api/src/com/cloud/vm/VirtualMachineProfile.java

@@ -60,6 +60,7 @@ public static class Param {
         public static final Param PxeSeverType = new Param("PxeSeverType");
         public static final Param HaTag = new Param("HaTag");
         public static final Param HaOperation = new Param("HaOperation");
+        public static final Param BootDelay = new Param("BootDelay");
 
         private String name;
 

api/src/org/apache/cloudstack/api/ApiConstants.java

@@ -717,6 +717,7 @@ public class ApiConstants {
     public static final String HAS_ANNOTATION = "hasannotation";
     public static final String LAST_ANNOTATED = "lastannotated";
     public static final String LDAP_DOMAIN = "ldapdomain";
+    public static final String BOOT_DELAY = "bootdelay";
 
 
     public enum HostDetails {

api/src/org/apache/cloudstack/api/command/user/vm/StartVMCmd.java

@@ -70,6 +70,9 @@ public class StartVMCmd extends BaseAsyncCmd {
     @Parameter(name = ApiConstants.DEPLOYMENT_PLANNER, type = CommandType.STRING, description = "Deployment planner to use for vm allocation. Available to ROOT admin only", since = "4.4", authorized = { RoleType.Admin })
     private String deploymentPlanner;
 
+    @Parameter(name = ApiConstants.BOOT_DELAY, type = CommandType.INTEGER, description = "Seconds to delay the boot at the boot menu", since = "4.11.3")
+    private Integer bootDelay;
+
     // ///////////////////////////////////////////////////
     // ///////////////// Accessors ///////////////////////
     // ///////////////////////////////////////////////////
@@ -99,6 +102,10 @@ public String getDeploymentPlanner() {
         return deploymentPlanner;
     }
 
+    public Integer getBootDelay() {
+        return bootDelay;
+    }
+
     @Override
     public long getEntityOwnerId() {
         UserVm vm = _responseGenerator.findUserVmById(getId());

plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java

@@ -2047,6 +2047,7 @@ public LibvirtVMDef createVMFromSpec(final VirtualMachineTO vmTO) {
         guest.setUuid(uuid);
         guest.setBootOrder(GuestDef.BootOrder.CDROM);
         guest.setBootOrder(GuestDef.BootOrder.HARDISK);
+        guest.setBootDelay(vmTO.getBootDelay());
 
         vm.addComp(guest);
 

plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java

@@ -68,6 +68,7 @@ public String toString() {
         private String _uuid;
         private final List<BootOrder> _bootdevs = new ArrayList<BootOrder>();
         private String _machine;
+        private Integer _bootDelay = 0;
 
         public void setGuestType(GuestType type) {
             _type = type;
@@ -104,6 +105,10 @@ public void setUuid(String uuid) {
             _uuid = uuid;
         }
 
+        public void setBootDelay(Integer bootDelay) {
+            this._bootDelay = bootDelay;
+        }
+
         @Override
         public String toString() {
             if (_type == GuestType.KVM) {
@@ -132,6 +137,10 @@ public String toString() {
                     }
                 }
                 guestDef.append("<smbios mode='sysinfo'/>\n");
+                if (_bootDelay != null && _bootDelay > 0) {
+                    s_logger.info("Delaying VM start " + this._uuid);
+                    guestDef.append("<bootmenu enable='yes' timeout='" + _bootDelay * 1000 + "'/>");
+                }
                 guestDef.append("</os>\n");
                 return guestDef.toString();
             } else if (_type == GuestType.LXC) {

server/src/com/cloud/hypervisor/HypervisorGuruBase.java

@@ -134,6 +134,9 @@ protected VirtualMachineTO toVirtualMachineTO(VirtualMachineProfile vmProfile) {
         VirtualMachineTO to = new VirtualMachineTO(vm.getId(), vm.getInstanceName(), vm.getType(), offering.getCpu(), minspeed, maxspeed, minMemory * 1024l * 1024l,
                 offering.getRamSize() * 1024l * 1024l, null, null, vm.isHaEnabled(), vm.limitCpuUse(), vm.getVncPassword());
         to.setBootArgs(vmProfile.getBootArgs());
+        if (vmProfile.getParameter(VirtualMachineProfile.Param.BootDelay) != null)
+            s_logger.info("Delaying start of VM " + vm.getId());
+            to.setBootDelay((Integer) vmProfile.getParameter(VirtualMachineProfile.Param.BootDelay));
 
         List<NicProfile> nicProfiles = vmProfile.getNics();
         NicTO[] nics = new NicTO[nicProfiles.size()];

server/src/com/cloud/vm/UserVmManagerImpl.java

@@ -2707,7 +2707,12 @@ protected boolean applyUserData(HypervisorType hyperVisorType, UserVm vm, Nic ni
     @Override
     @ActionEvent(eventType = EventTypes.EVENT_VM_START, eventDescription = "starting Vm", async = true)
     public UserVm startVirtualMachine(StartVMCmd cmd) throws ExecutionException, ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException {
-        return startVirtualMachine(cmd.getId(), cmd.getHostId(), null, cmd.getDeploymentPlanner()).first();
+        Map<VirtualMachineProfile.Param, Object> additionalParams = null;
+        if (cmd.getBootDelay() != null && cmd.getBootDelay() > 0) {
+            additionalParams = new HashMap<>();
+            additionalParams.put(VirtualMachineProfile.Param.BootDelay, cmd.getBootDelay());
+        }
+        return startVirtualMachine(cmd.getId(), cmd.getHostId(), additionalParams, cmd.getDeploymentPlanner()).first();
     }
 
     @Override

ui/l10n/ar.js

@@ -474,6 +474,7 @@ var dictionary = {
     "label.blade.id": "Blade ID",
     "label.blades": "Blades",
     "label.bootable": "Bootable",
+    "label.bootDelay": "Boot Delay",
     "label.broadcast.domain.range": "Broadcast domain range",
     "label.broadcast.domain.type": "Broadcast Domain Type",
     "label.broadcast.uri": "بث الرابط",

ui/l10n/ca.js

@@ -474,6 +474,7 @@ var dictionary = {
     "label.blade.id": "Blade ID",
     "label.blades": "Blades",
     "label.bootable": "Bootable",
+    "label.bootDelay": "Boot Delay",
     "label.broadcast.domain.range": "Rang del domini de broadcast",
     "label.broadcast.domain.type": "Broadcast Domain Type",
     "label.broadcast.uri": "Broadcast URI",