vTPM: use the default TPM version if an invalid version is passed

Author: weizhouapache

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

@@ -2411,7 +2411,7 @@ public TpmDef(String model, String version) {
                 this.version = Arrays.stream(TpmVersion.values())
                         .filter(tpmVersion -> tpmVersion.toString().equals(version))
                         .findFirst()
-                        .orElse(null);;
+                        .orElse(this.version);;
             }
         }
 
@@ -2426,9 +2426,11 @@ public TpmVersion getVersion() {
         @Override
         public String toString() {
             StringBuilder tpmBuidler = new StringBuilder();
-            tpmBuidler.append("<tpm model='").append(model).append("'>\n");
-            tpmBuidler.append("<backend type='emulator' version='").append(version).append("'/>\n");
-            tpmBuidler.append("</tpm>\n");
+            if (model != null) {
+                tpmBuidler.append("<tpm model='").append(model).append("'>\n");
+                tpmBuidler.append("<backend type='emulator' version='").append(version).append("'/>\n");
+                tpmBuidler.append("</tpm>\n");
+            }
             return tpmBuidler.toString();
         }
     }

plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java

@@ -6553,4 +6553,16 @@ public void testCreateTpmDef() {
         assertEquals(LibvirtVMDef.TpmDef.TpmModel.TIS, tpmDef.getModel());
         assertEquals(LibvirtVMDef.TpmDef.TpmVersion.V2_0, tpmDef.getVersion());
     }
+
+    @Test
+    public void testCreateTpmDefWithInvalidVersion() {
+        VirtualMachineTO virtualMachineTO = Mockito.mock(VirtualMachineTO.class);
+        Map<String, String> details = new HashMap<>();
+        details.put(VmDetailConstants.VIRTUAL_TPM_MODEL, "tpm-crb");
+        details.put(VmDetailConstants.VIRTUAL_TPM_VERSION, "3.0");
+        Mockito.when(virtualMachineTO.getDetails()).thenReturn(details);
+        LibvirtVMDef.TpmDef tpmDef = libvirtComputingResourceSpy.createTpmDef(virtualMachineTO);
+        assertEquals(LibvirtVMDef.TpmDef.TpmModel.CRB, tpmDef.getModel());
+        assertEquals(LibvirtVMDef.TpmDef.TpmVersion.V2_0, tpmDef.getVersion());
+    }
 }