Skip to content

CLOUDSTACK-9211: Support passing vRAM size to support 3D GPU on Vmware #1310

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
asfgit merged 4 commits into from
Feb 23, 2016
Merged

CLOUDSTACK-9211: Support passing vRAM size to support 3D GPU on Vmware #1310

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
656ae10
CLOUDSTACK-9211: Support passing vRAM size to support 3D GPU on Vmware
nvazquez Jan 5, 2016
448b43f
CLOUDSTACK-9211: Add javadoc and refactor method
nvazquez Jan 14, 2016
4fcebfc
CLOUDSTACK-9211: Refactor vm vram size setter method
nvazquez Jan 18, 2016
b73c053
CLOUDSTACK-9211: Unit test for 3dgpu support
nvazquez Jan 20, 2016
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
CLOUDSTACK-9211: Unit test for 3dgpu support
  • Loading branch information
@nvazquez
nvazquez committed Jan 20, 2016
commit b73c053abd59617b1faca18ad21ed26c5dc78e9f
2 changes: 1 addition & 1 deletion plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1953,7 +1953,7 @@ protected StartAnswer execute(StartCommand cmd) {
* @param vmMo virtual machine mo
* @param vmSpec virtual machine specs
*/
private void postVideoCardMemoryConfigBeforeStart(VirtualMachineMO vmMo, VirtualMachineTO vmSpec) {
protected void postVideoCardMemoryConfigBeforeStart(VirtualMachineMO vmMo, VirtualMachineTO vmSpec) {
String paramVRamSize = "svga.vramSize";
if (vmSpec.getDetails().containsKey(paramVRamSize)){
String value = vmSpec.getDetails().get(paramVRamSize);
Expand Down
29 changes: 28 additions & 1 deletion plugins/hypervisors/vmware/test/com/cloud/hypervisor/vmware/resource/VmwareResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,22 @@
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.any;

import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;

import org.junit.Before;
import org.junit.Test;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.mockito.Spy;

import com.vmware.vim25.VirtualDevice;
import com.vmware.vim25.VirtualMachineConfigSpec;

import com.vmware.vim25.VirtualMachineVideoCard;
import com.cloud.agent.api.Command;
import com.cloud.agent.api.ScaleVmAnswer;
import com.cloud.agent.api.ScaleVmCommand;
Expand Down Expand Up @@ -64,6 +71,10 @@ public VmwareHypervisorHost getHyperHost(VmwareContext context, Command cmd) {
VirtualMachineMO vmMo;
@Mock
VirtualMachineConfigSpec vmConfigSpec;
@Mock
VirtualMachineMO vmMo3dgpu;
@Mock
VirtualMachineTO vmSpec3dgpu;

@Before
public void setup() {
Expand All @@ -90,4 +101,20 @@ public void testScaleVMF1() throws Exception {
verify(_resource).execute(cmd);
}

@Test
public void testStartVm3dgpuEnabled() throws Exception{
Map<String, String> specDetails = new HashMap<String, String>();
specDetails.put("svga.vramSize", "131072");
when(vmSpec3dgpu.getDetails()).thenReturn(specDetails);

VirtualMachineVideoCard videoCard = mock(VirtualMachineVideoCard.class);
when(videoCard.getVideoRamSizeInKB()).thenReturn(65536l);
when(vmMo3dgpu.getAllDeviceList()).thenReturn(Arrays.asList((VirtualDevice) videoCard));

when(vmMo3dgpu.configureVm(any(VirtualMachineConfigSpec.class))).thenReturn(true);

_resource.postVideoCardMemoryConfigBeforeStart(vmMo3dgpu, vmSpec3dgpu);
verify(vmMo3dgpu).configureVm(any(VirtualMachineConfigSpec.class));
}

}