Skip to content

Commit e78a69a

Browse files
committed
CLOUDSTACK-9428: Refactor
1 parent 882bd11 commit e78a69a

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

api/src/com/cloud/vm/VmDetailConstants.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,5 @@ public interface VmDetailConstants {
2323
public static final String NESTED_VIRTUALIZATION_FLAG = "nestedVirtualizationFlag";
2424
public static final String HYPERVISOR_TOOLS_VERSION = "hypervisortoolsversion";
2525
public static final String DATA_DISK_CONTROLLER = "dataDiskController";
26+
public static final String SVGA_VRAM_SIZE = "svga.vramSize";
2627
}

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1947,7 +1947,7 @@ protected StartAnswer execute(StartCommand cmd) {
19471947
Arrays.asList(configureVnc(extraOptions.toArray(new OptionValue[0]), hyperHost, vmInternalCSName, vmSpec.getVncPassword(), keyboardLayout)));
19481948

19491949
// config video card
1950-
videoCardMemoryConfig(vmMo, vmSpec, vmConfigSpec);
1950+
videoCardConfig(vmMo, vmSpec, vmConfigSpec);
19511951

19521952
//
19531953
// Configure VM
@@ -2023,10 +2023,9 @@ protected StartAnswer execute(StartCommand cmd) {
20232023
* @param vmSpec virtual machine specs
20242024
* @param vmConfigSpec virtual machine config spec
20252025
*/
2026-
protected void videoCardMemoryConfig(VirtualMachineMO vmMo, VirtualMachineTO vmSpec, VirtualMachineConfigSpec vmConfigSpec) {
2027-
String paramVRamSize = "svga.vramSize";
2028-
if (vmSpec.getDetails().containsKey(paramVRamSize)){
2029-
String value = vmSpec.getDetails().get(paramVRamSize);
2026+
protected void videoCardConfig(VirtualMachineMO vmMo, VirtualMachineTO vmSpec, VirtualMachineConfigSpec vmConfigSpec) {
2027+
if (vmSpec.getDetails().containsKey(VmDetailConstants.SVGA_VRAM_SIZE)){
2028+
String value = vmSpec.getDetails().get(VmDetailConstants.SVGA_VRAM_SIZE);
20302029
try {
20312030
long svgaVmramSize = Long.parseLong(value);
20322031
setNewVRamSizeVmVideoCard(vmMo, svgaVmramSize, vmConfigSpec);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ public void testStartVm3dgpuEnabled() throws Exception {
140140
specDetails.put("svga.vramSize", String.valueOf(VRAM_MEMORY_SIZE));
141141
when(vmSpec3dgpu.getDetails()).thenReturn(specDetails);
142142

143-
_resource.videoCardMemoryConfig(vmMo3dgpu, vmSpec3dgpu, vmConfigSpec);
143+
_resource.videoCardConfig(vmMo3dgpu, vmSpec3dgpu, vmConfigSpec);
144144
verify(_resource).setNewVRamSizeVmVideoCard(vmMo3dgpu, VRAM_MEMORY_SIZE, vmConfigSpec);
145145
}
146146

0 commit comments

Comments
 (0)