Merge remote-tracking branch 'origin/4.15'

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

@@ -3486,17 +3486,12 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
             return DiskDef.DiskBus.IDE;
         } else if (platformEmulator.startsWith("Other PV Virtio-SCSI")) {
             return DiskDef.DiskBus.SCSI;
-        } else if (isUefiEnabled && platformEmulator.startsWith("Windows")) {
-            return DiskDef.DiskBus.SATA;
         } else if (platformEmulator.contains("Ubuntu") ||
-                platformEmulator.startsWith("Fedora") ||
+                org.apache.commons.lang3.StringUtils.startsWithAny(platformEmulator,
-                platformEmulator.startsWith("CentOS") ||
+                        "Fedora", "CentOS", "Red Hat Enterprise Linux", "Debian GNU/Linux", "FreeBSD", "Oracle", "Other PV")) {
-                platformEmulator.startsWith("Red Hat Enterprise Linux") ||
-                platformEmulator.startsWith("Debian GNU/Linux") ||
-                platformEmulator.startsWith("FreeBSD") ||
-                platformEmulator.startsWith("Oracle") ||
-                platformEmulator.startsWith("Other PV")) {
             return DiskDef.DiskBus.VIRTIO;
+        } else if (isUefiEnabled && org.apache.commons.lang3.StringUtils.startsWithAny(platformEmulator, "Windows", "Other")) {
+            return DiskDef.DiskBus.SATA;
         } else {
             return DiskDef.DiskBus.IDE;
         }

server/src/main/java/com/cloud/api/query/dao/ServiceOfferingJoinDaoImpl.java

@@ -45,6 +45,13 @@ public class ServiceOfferingJoinDaoImpl extends GenericDaoBase<ServiceOfferingJo
 
     private SearchBuilder<ServiceOfferingJoinVO> sofIdSearch;
 
+    /**
+     * Constant used to convert GB into Bytes (or the other way around).
+     * GB   *  MB  *  KB  = Bytes //
+     * 1024 * 1024 * 1024 = 1073741824
+     */
+    private static final long GB_TO_BYTES = 1073741824;
+
     protected ServiceOfferingJoinDaoImpl() {
 
         sofIdSearch = createSearchBuilder();
@@ -124,7 +131,8 @@ public class ServiceOfferingJoinDaoImpl extends GenericDaoBase<ServiceOfferingJo
             }
         }
 
-        offeringResponse.setRootDiskSize(offering.getRootDiskSize());
+        long rootDiskSizeInGb = (long) offering.getRootDiskSize() / GB_TO_BYTES;
+        offeringResponse.setRootDiskSize(rootDiskSizeInGb);
 
         return offeringResponse;
     }

server/src/main/java/com/cloud/template/TemplateManagerImpl.java

@@ -1302,10 +1302,10 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager,
 
         Command cmd = null;
         if (attach) {
-            cmd = new AttachCommand(disk, vmName);
+            cmd = new AttachCommand(disk, vmName, vmTO.getDetails());
             ((AttachCommand)cmd).setForced(forced);
         } else {
-            cmd = new DettachCommand(disk, vmName);
+            cmd = new DettachCommand(disk, vmName, vmTO.getDetails());
             ((DettachCommand)cmd).setForced(forced);
         }
         Answer a = _agentMgr.easySend(vm.getHostId(), cmd);

ui/src/components/view/DetailsTab.vue

@@ -35,7 +35,7 @@
         </div>
         <div v-else-if="$route.meta.name === 'computeoffering' && item === 'rootdisksize'">
           <div>
-            {{ parseFloat( resource.rootdisksize / (1024.0 * 1024.0 * 1024.0)).toFixed(1) }} GB
+            {{ resource.rootdisksize }} GB
           </div>
         </div>
         <div v-else-if="['name', 'type'].includes(item)">

ui/src/views/compute/wizard/ComputeOfferingSelection.vue

@@ -21,8 +21,7 @@
       style="width: 25vw;float: right;margin-bottom: 10px; z-index: 8"
       :placeholder="$t('label.search')"
       v-model="filter"
-      @search="handleSearch"
+      @search="handleSearch" />
-      autoFocus />
     <a-table
       :columns="columns"
       :dataSource="tableSource"

ui/src/views/compute/wizard/NetworkConfiguration.vue

@@ -33,7 +33,6 @@
     <template slot="ipAddress" slot-scope="text, record, index">
       <a-form-item v-if="record.type!=='L2' && index === 0">
         <a-input
-          :autoFocus="record.type!=='L2'"
           style="width: 150px;"
           v-decorator="['ipAddress' + record.id, {
             rules: [{
@@ -50,10 +49,9 @@
         </a-input>
       </a-form-item>
     </template>
-    <template slot="macAddress" slot-scope="text, record, index">
+    <template slot="macAddress" slot-scope="text, record">
       <a-form-item>
         <a-input
-          :autoFocus="record.type==='L2' && index === 0"
           style="width: 150px;"
           :placeholder="$t('label.macaddress')"
           v-decorator="[`macAddress` + record.id, {

vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DiskControllerType.java

@@ -29,6 +29,7 @@ public enum DiskControllerType {
         if (diskController == null || diskController.equalsIgnoreCase("osdefault")) {
             return DiskControllerType.osdefault;
         } else if (diskController.equalsIgnoreCase("vim.vm.device.VirtualLsiLogicSASController") || diskController.equalsIgnoreCase("VirtualLsiLogicSASController")
+                || diskController.equalsIgnoreCase(ScsiDiskControllerType.LSILOGIC_SAS_1068)
                 || diskController.equalsIgnoreCase(ScsiDiskControllerType.LSILOGIC_SAS)) {
             return DiskControllerType.lsisas1068;
         } else if (diskController.equalsIgnoreCase("vim.vm.device.VirtualLsiLogicController") || diskController.equalsIgnoreCase("VirtualLsiLogicController")
@@ -38,7 +39,8 @@ public enum DiskControllerType {
                 || diskController.equalsIgnoreCase("ide")) {
             return DiskControllerType.ide;
         } else if (diskController.equalsIgnoreCase("vim.vm.device.ParaVirtualSCSIController") || diskController.equalsIgnoreCase("ParaVirtualSCSIController")
-                || diskController.equalsIgnoreCase(ScsiDiskControllerType.VMWARE_PARAVIRTUAL)) {
+                || diskController.equalsIgnoreCase(ScsiDiskControllerType.VMWARE_PARAVIRTUAL)
+                || diskController.equalsIgnoreCase(ScsiDiskControllerType.VIRTUAL_SCSI)) {
             return DiskControllerType.pvscsi;
         } else if (diskController.equalsIgnoreCase("vim.vm.device.VirtualBusLogicController") || diskController.equalsIgnoreCase("VirtualBusLogicController")
                 || diskController.equalsIgnoreCase(ScsiDiskControllerType.BUSLOGIC)) {

vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/ScsiDiskControllerType.java

@@ -17,8 +17,10 @@
 package com.cloud.hypervisor.vmware.mo;
 
 public interface ScsiDiskControllerType {
-    public final static String LSILOGIC_PARALLEL = "lsilogic";
+    String LSILOGIC_PARALLEL = "lsilogic";
-    public final static String LSILOGIC_SAS = "lsisas1068";
+    String LSILOGIC_SAS = "lsilogicsas";
-    public final static String BUSLOGIC = "buslogic";
+    String LSILOGIC_SAS_1068 = "lsisas1068";
-    public final static String VMWARE_PARAVIRTUAL = "pvscsi";
+    String BUSLOGIC = "buslogic";
+    String VMWARE_PARAVIRTUAL = "pvscsi";
+    String VIRTUAL_SCSI = "VirtualSCSI";
 }