Skip to content

Commit 580b1cb

Browse files
committed
vTPM: add unit test in LibvirtComputingResourceTest
1 parent 6a461b1 commit 580b1cb

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2859,7 +2859,7 @@ private CpuModeDef createCpuModeDef(VirtualMachineTO vmTO, int vcpus) {
28592859
return cmd;
28602860
}
28612861

2862-
private TpmDef createTpmDef(VirtualMachineTO vmTO) {
2862+
protected TpmDef createTpmDef(VirtualMachineTO vmTO) {
28632863
Map<String, String> details = vmTO.getDetails();
28642864
if (MapUtils.isEmpty(details)) {
28652865
return null;

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6541,4 +6541,16 @@ public void testGetDiskModelFromVMDetailVirtioBlk() {
65416541
DiskDef.DiskBus diskBus = libvirtComputingResourceSpy.getDiskModelFromVMDetail(virtualMachineTO);
65426542
assertEquals(DiskDef.DiskBus.VIRTIOBLK, diskBus);
65436543
}
6544+
6545+
@Test
6546+
public void testCreateTpmDef() {
6547+
VirtualMachineTO virtualMachineTO = Mockito.mock(VirtualMachineTO.class);
6548+
Map<String, String> details = new HashMap<>();
6549+
details.put(VmDetailConstants.VIRTUAL_TPM_MODEL, "tpm-tis");
6550+
details.put(VmDetailConstants.VIRTUAL_TPM_VERSION, "2.0");
6551+
Mockito.when(virtualMachineTO.getDetails()).thenReturn(details);
6552+
LibvirtVMDef.TpmDef tpmDef = libvirtComputingResourceSpy.createTpmDef(virtualMachineTO);
6553+
assertEquals(LibvirtVMDef.TpmDef.TpmModel.TIS, tpmDef.getModel());
6554+
assertEquals(LibvirtVMDef.TpmDef.TpmVersion.V2_0, tpmDef.getVersion());
6555+
}
65446556
}

0 commit comments

Comments
 (0)