etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 11814: rename option names, API server does not recognize dot separated name correctly.

This commit is contained in:
Kelven Yang 2011-12-08 16:50:03 -08:00
parent 7021fd3cb5
commit dfdb2d24c2
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
View File

@ -1342,18 +1342,18 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
controllerKey = ideControllerKey;
} else {
if(vol.getType() == Volume.Type.ROOT) {
if(vmSpec.getDetails() != null && vmSpec.getDetails().get("root.disk.controller") != null)
{
if(vmSpec.getDetails().get("root.disk.controller").equalsIgnoreCase("scsi"))
controllerKey = scsiControllerKey;
else
controllerKey = ideControllerKey;
} else {
if(_rootDiskController == DiskControllerType.scsi)
controllerKey = scsiControllerKey;
else
controllerKey = ideControllerKey;
}
if(vmSpec.getDetails() != null && vmSpec.getDetails().get(VmDetailConstants.ROOK_DISK_CONTROLLER) != null)
{
if(vmSpec.getDetails().get(VmDetailConstants.ROOK_DISK_CONTROLLER).equalsIgnoreCase("scsi"))
controllerKey = scsiControllerKey;
else
controllerKey = ideControllerKey;
} else {
if(_rootDiskController == DiskControllerType.scsi)
controllerKey = scsiControllerKey;
else
controllerKey = ideControllerKey;
}
} else {
// data volume always uses SCSI
controllerKey = scsiControllerKey;

3
core/src/com/cloud/vm/VmDetailConstants.java
View File

@ -19,5 +19,6 @@ package com.cloud.vm;
public interface VmDetailConstants {
public static final String KEYBOARD = "keyboard";
public static final String NIC_ADAPTER = "nic_adapter";
public static final String NIC_ADAPTER = "nicAdapter";
public static final String ROOK_DISK_CONTROLLER = "rootDiskController";
}