Vmware secure boot fixes

Author: Pavan Kumar Aravapalli

api/src/main/java/com/cloud/host/Host.java

@@ -52,7 +52,7 @@ public static String[] toStrings(Host.Type... types) {
             return strs;
         }
     }
-    public static final String HOST_UEFI_ENABLE = "Host.Uefi.Enable";
+    public static final String HOST_UEFI_ENABLE = "host.uefi.enable";
 
     /**
      * @return name of the machine.

engine/orchestration/src/main/java/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java

@@ -29,6 +29,7 @@
 import org.apache.cloudstack.engine.cloud.entity.api.db.dao.VMReservationDao;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
 import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
+import org.apache.commons.collections.MapUtils;
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
 
@@ -148,11 +149,14 @@ public String reserveVirtualMachine(VMEntityVO vmEntityVO, DeploymentPlanner pla
         VMInstanceVO vm = _vmDao.findByUuid(vmEntityVO.getUuid());
         VirtualMachineProfileImpl vmProfile = new VirtualMachineProfileImpl(vm);
         vmProfile.setServiceOffering(_serviceOfferingDao.findByIdIncludingRemoved(vm.getId(), vm.getServiceOfferingId()));
-        if (vmEntityVO.getDetails() != null) {
+        if (MapUtils.isNotEmpty(vmEntityVO.getDetails()) &&
+                vmEntityVO.getDetails().containsKey(VirtualMachineProfile.Param.UefiFlag.getName()) &&
+                "yes".equalsIgnoreCase(vmEntityVO.getDetails().get(VirtualMachineProfile.Param.UefiFlag.getName())))
+        {
             Map<String, String> details = vmEntityVO.getDetails();
-            if (details.containsKey(VirtualMachineProfile.Param.BootType.getName())) {
-                vmProfile.getParameters().put(VirtualMachineProfile.Param.BootType, details.get(VirtualMachineProfile.Param.BootType.getName()));
-            }
+            vmProfile.getParameters().put(VirtualMachineProfile.Param.BootType, details.get(VirtualMachineProfile.Param.BootType));
+            vmProfile.getParameters().put(VirtualMachineProfile.Param.BootMode, details.get(VirtualMachineProfile.Param.BootMode));
+
         }
         DataCenterDeployment plan = new DataCenterDeployment(vm.getDataCenterId(), vm.getPodIdToDeployIn(), null, null, null, null);
         if (planToDeploy != null && planToDeploy.getDataCenterId() != 0) {

plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java

@@ -45,6 +45,7 @@
 import com.cloud.exception.DiscoveryException;
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.exception.ResourceInUseException;
+import com.cloud.host.Host;
 import com.cloud.host.HostVO;
 import com.cloud.hypervisor.Hypervisor;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
@@ -367,6 +368,10 @@ public VmwareServerDiscoverer() {
                 details.put("url", hostMo.getHostName());
                 details.put("username", username);
                 details.put("password", password);
+                boolean uefiLegacySupported = hostMo.isUefiLegacySupported();
+                if (uefiLegacySupported) {
+                    details.put(Host.HOST_UEFI_ENABLE, "true");
+                }
                 String guid = morHost.getType() + ":" + morHost.getValue() + "@" + url.getHost();
                 details.put("guid", guid);
 

plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java

@@ -2764,6 +2764,9 @@ private static void configNvpExtraOption(List<OptionValue> extraOptions, Virtual
     private static void configCustomExtraOption(List<OptionValue> extraOptions, VirtualMachineTO vmSpec) {
         // we no longer to validation anymore
         for (Map.Entry<String, String> entry : vmSpec.getDetails().entrySet()) {
+            if(entry.getKey().equalsIgnoreCase(VmDetailConstants.BOOT_MODE)) {
+                continue;
+            }
             OptionValue newVal = new OptionValue();
             newVal.setKey(entry.getKey());
             newVal.setValue(entry.getValue());

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

@@ -3910,6 +3910,11 @@ public UserVmVO doInTransaction(TransactionStatus status) throws InsufficientCap
                     } else {
                         vm.setDetail(key, customParameters.get(key));
                     }
+
+                    if(key.equalsIgnoreCase("uefi")) {
+                        vm.setDetail(key,customParameters.get(key));
+                        continue;
+                    }
                 }
                 vm.setDetail(VmDetailConstants.DEPLOY_VM, "true");
 
@@ -4212,13 +4217,21 @@ public UserVm startVirtualMachine(DeployVMCmd cmd) throws ResourceUnavailableExc
         Long podId = null;
         Long clusterId = null;
         Long hostId = cmd.getHostId();
+        Map<VirtualMachineProfile.Param, Object> additonalParams = null;
         Map<Long, DiskOffering> diskOfferingMap = cmd.getDataDiskTemplateToDiskOfferingMap();
         if (cmd instanceof DeployVMCmdByAdmin) {
             DeployVMCmdByAdmin adminCmd = (DeployVMCmdByAdmin)cmd;
             podId = adminCmd.getPodId();
             clusterId = adminCmd.getClusterId();
         }
-        return startVirtualMachine(vmId, podId, clusterId, hostId, diskOfferingMap, null, cmd.getDeploymentPlanner());
+        if(MapUtils.isNotEmpty(cmd.getDetails()) && cmd.getDetails().containsKey("UEFI") ) {
+            additonalParams = new HashMap<VirtualMachineProfile.Param,Object>();
+            Map<String, String> map = cmd.getDetails();
+            additonalParams.put(VirtualMachineProfile.Param.UefiFlag, "Yes");
+            additonalParams.put(VirtualMachineProfile.Param.BootType, "UEFI");
+            additonalParams.put(VirtualMachineProfile.Param.BootMode, map.get("UEFI"));
+        }
+        return startVirtualMachine(vmId, podId, clusterId, hostId, diskOfferingMap, additonalParams, cmd.getDeploymentPlanner());
     }
 
     private UserVm startVirtualMachine(long vmId, Long podId, Long clusterId, Long hostId, Map<Long, DiskOffering> diskOfferingMap, Map<VirtualMachineProfile.Param, Object> additonalParams, String deploymentPlannerToUse)
@@ -4672,6 +4685,7 @@ public Pair<UserVmVO, Map<VirtualMachineProfile.Param, Object>> startVirtualMach
                 throw new InvalidParameterValueException("Can't find a planner by name " + deploymentPlannerToUse);
             }
         }
+        vmEntity.setParamsToEntity(additionalParams);
 
         String reservationId = vmEntity.reserve(planner, plan, new ExcludeList(), Long.toString(callerUser.getId()));
         vmEntity.deploy(reservationId, Long.toString(callerUser.getId()), params, deployOnGivenHost);

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

@@ -1184,4 +1184,17 @@ public ManagedObjectReference waitForPortGroup(String networkName, long timeOutM
         }
         return morNetwork;
     }
+
+    public String getProductVersion() throws Exception {
+        return getHostAboutInfo().getVersion();
+    }
+
+    public boolean isUefiLegacySupported() throws Exception {
+        String hostVersion = getProductVersion();
+        if (hostVersion.compareTo(VmwareHelper.MIN_VERSION_UEFI_LEGACY) >= 0) {
+            return true;
+        }
+        return false;
+    }
+
 }

vmware-base/src/main/java/com/cloud/hypervisor/vmware/util/VmwareHelper.java

@@ -92,6 +92,7 @@ public class VmwareHelper {
     public static final int MAX_IDE_CONTROLLER_COUNT = 2;
     public static final int MAX_ALLOWED_DEVICES_IDE_CONTROLLER = 2;
     public static final int MAX_ALLOWED_DEVICES_SCSI_CONTROLLER = 15;
+    public static final String MIN_VERSION_UEFI_LEGACY = "5.5";
 
     public static boolean isReservedScsiDeviceNumber(int deviceNumber) {
         return deviceNumber == 7;