Skip to content

vTPM: support KVM and VMware #10543

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Pearl1594 merged 17 commits into from
Apr 26, 2025
Merged

vTPM: support KVM and VMware #10543

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
c9186a8
KVM: add Virtual TPM model and version
weizhouapache Mar 11, 2025
5378192
KVM: add admin-only VM setting GUEST.CPU.MODE and GUEST.CPU.MODEL
weizhouapache Mar 11, 2025
686b714
VMware: add vTPM
weizhouapache Mar 11, 2025
771dfce
vTPM: do not set Key due to 'Cannot add multiple devices using the sa…
weizhouapache Mar 11, 2025
7f0b828
vTPM: add unit test testTpmModel
weizhouapache Mar 13, 2025
5c90596
engine/schema: remove user vm details for guest CPU mode/model
weizhouapache Mar 13, 2025
aabee5e
vTPM: extra methods as Daan's requests
weizhouapache Mar 13, 2025
3588be7
vTPM: add unit tests in VmwareResourceTest
weizhouapache Mar 14, 2025
6a461b1
vTPM: update unit tests in VmwareResourceTest
weizhouapache Mar 14, 2025
580b1cb
vTPM: add unit test in LibvirtComputingResourceTest
weizhouapache Mar 14, 2025
c74f339
vTPM: use the default TPM version if an invalid version is passed
weizhouapache Mar 14, 2025
81e26ab
vTPM: requires UEFI on vmware and do nothing if it is not enabled/dis…
weizhouapache Mar 17, 2025
8c99e65
vTPM: let uses to add UEFI on vmware
weizhouapache Mar 17, 2025
1c33015
Update plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/…
weizhouapache Mar 19, 2025
310bf89
Update plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/…
weizhouapache Mar 19, 2025
e1a4ed2
vTPM: remove template details for guest CPU mode/model
weizhouapache Mar 28, 2025
8bfd8f8
UI: boot vm from ISO into UEFI/SECURE mode
weizhouapache Apr 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
vTPM: update unit tests in VmwareResourceTest
  • Loading branch information
@weizhouapache
weizhouapache committed Mar 14, 2025
commit 6a461b14b05138141902a56db6b54decb8d23139
8 changes: 6 additions & 2 deletions ...rvisors/vmware/src/test/java/com/cloud/hypervisor/vmware/resource/VmwareResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -855,10 +855,12 @@ public void testAddVirtualTPMDevice() throws Exception {
details.put(VmDetailConstants.VIRTUAL_TPM_ENABLED, "true");
when(vmSpec.getDetails()).thenReturn(details);
when(vmMo.getAllDeviceList()).thenReturn(new ArrayList<>());
Mockito.doNothing().when(vmwareResource).addVirtualTPMDevice(vmConfigSpec);
List<VirtualDeviceConfigSpec> deviceChanges = Mockito.mock(List.class);
when(vmConfigSpec.getDeviceChange()).thenReturn(deviceChanges);

vmwareResource.configureVirtualTPM(vmMo, vmSpec, vmConfigSpec, "uefi");
Mockito.verify(vmwareResource, Mockito.times(1)).addVirtualTPMDevice(vmConfigSpec);
Mockito.verify(deviceChanges, Mockito.times(1)).add(any(VirtualDeviceConfigSpec.class));
}

@Test
Expand All @@ -872,9 +874,11 @@ public void testRemoveVirtualTPMDevice() throws Exception {
when(vmSpec.getDetails()).thenReturn(details);
VirtualTPM tpm = new VirtualTPM();
when(vmMo.getAllDeviceList()).thenReturn(List.of(tpm));
Mockito.doNothing().when(vmwareResource).removeVirtualTPMDevice(vmConfigSpec, tpm);
List<VirtualDeviceConfigSpec> deviceChanges = Mockito.mock(List.class);
when(vmConfigSpec.getDeviceChange()).thenReturn(deviceChanges);

vmwareResource.configureVirtualTPM(vmMo, vmSpec, vmConfigSpec, "uefi");
Mockito.verify(vmwareResource, Mockito.times(1)).removeVirtualTPMDevice(vmConfigSpec, tpm);
Mockito.verify(deviceChanges, Mockito.times(1)).add(any(VirtualDeviceConfigSpec.class));
}
}