vTPM: let uses to add UEFI on vmware

Author: weizhouapache

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

@@ -2600,7 +2600,7 @@ protected StartAnswer execute(StartCommand cmd) {
             setBootOptions(vmSpec, bootMode, vmConfigSpec);
 
             // Config vTPM
-            configureVirtualTPM(vmMo, vmSpec, vmConfigSpec, bootMode);
+            configureVirtualTPM(vmMo, vmSpec, vmConfigSpec);
 
             if (StringUtils.isNotEmpty(vmStoragePolicyId)) {
                 vmConfigSpec.getVmProfile().add(vmProfileSpec);
@@ -3217,27 +3217,24 @@ protected void configureSpecVideoCardNewVRamSize(VirtualMachineVideoCard videoCa
      * @param vmConfigSpec virtual machine config spec
      * @throws Exception exception
      */
-    protected void configureVirtualTPM(VirtualMachineMO vmMo, VirtualMachineTO vmSpec, VirtualMachineConfigSpec vmConfigSpec, String bootMode) throws Exception {
+    protected void configureVirtualTPM(VirtualMachineMO vmMo, VirtualMachineTO vmSpec, VirtualMachineConfigSpec vmConfigSpec) throws Exception {
         String virtualTPMEnabled = vmSpec.getDetails().getOrDefault(VmDetailConstants.VIRTUAL_TPM_ENABLED, null);
         if (Boolean.parseBoolean(virtualTPMEnabled)) {
-            if (StringUtils.isBlank(bootMode) || !bootMode.equalsIgnoreCase("uefi")) {
-                throw new Exception("VM instance with Virtual TPM must use UEFI boot mode");
-            }
             for (VirtualDevice device : vmMo.getAllDeviceList()) {
                 if (device instanceof VirtualTPM) {
-                    logger.debug("Virtual TPM device has already been added, returning");
+                    logger.debug(String.format("Virtual TPM device has already been added to VM , returning", vmMo.getVmName()));
                     return;
                 }
             }
             logger.debug("Adding Virtual TPM device");
             addVirtualTPMDevice(vmConfigSpec);
         } else if (virtualTPMEnabled == null) {
-            logger.debug("Virtual TPM device is neither enabled nor disabled, skipping");
+            logger.debug(String.format("Virtual TPM device is neither enabled nor disabled for VM %s, skipping", vmMo.getVmName()));
         } else {
-            logger.debug(String.format("Virtual TPM device is disabled. It is enabled when boot mode is UEFI (actually %s) and vTPM is enabled (actually %s)", bootMode, virtualTPMEnabled));
+            logger.debug(String.format("Virtual TPM device is disabled for VM %s", vmMo.getVmName()));
             for (VirtualDevice device : vmMo.getAllDeviceList()) {
                 if (device instanceof VirtualTPM) {
-                    logger.debug("Removing Virtual TPM device as it is disabled");
+                    logger.debug(String.format("Removing Virtual TPM device from VM %s as it is disabled", vmMo.getVmName()));
                     removeVirtualTPMDevice(vmConfigSpec, (VirtualTPM) device);
                 }
             }

plugins/hypervisors/vmware/src/test/java/com/cloud/hypervisor/vmware/resource/VmwareResourceTest.java

@@ -858,7 +858,7 @@ public void testAddVirtualTPMDevice() throws Exception {
         List<VirtualDeviceConfigSpec> deviceChanges = Mockito.mock(List.class);
         when(vmConfigSpec.getDeviceChange()).thenReturn(deviceChanges);
 
-        vmwareResource.configureVirtualTPM(vmMo, vmSpec, vmConfigSpec, "uefi");
+        vmwareResource.configureVirtualTPM(vmMo, vmSpec, vmConfigSpec);
         Mockito.verify(vmwareResource, Mockito.times(1)).addVirtualTPMDevice(vmConfigSpec);
         Mockito.verify(deviceChanges, Mockito.times(1)).add(any(VirtualDeviceConfigSpec.class));
     }
@@ -877,7 +877,7 @@ public void testRemoveVirtualTPMDevice() throws Exception {
         List<VirtualDeviceConfigSpec> deviceChanges = Mockito.mock(List.class);
         when(vmConfigSpec.getDeviceChange()).thenReturn(deviceChanges);
 
-        vmwareResource.configureVirtualTPM(vmMo, vmSpec, vmConfigSpec, "uefi");
+        vmwareResource.configureVirtualTPM(vmMo, vmSpec, vmConfigSpec);
         Mockito.verify(vmwareResource, Mockito.times(1)).removeVirtualTPMDevice(vmConfigSpec, tpm);
         Mockito.verify(deviceChanges, Mockito.times(1)).add(any(VirtualDeviceConfigSpec.class));
     }