From dfdb2d24c2c5a23258057f088569704d76648288 Mon Sep 17 00:00:00 2001 From: Kelven Yang Date: Thu, 8 Dec 2011 16:50:03 -0800 Subject: [PATCH] bug 11814: rename option names, API server does not recognize dot separated name correctly. --- .../vmware/resource/VmwareResource.java | 24 +++++++++---------- core/src/com/cloud/vm/VmDetailConstants.java | 3 ++- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java index 896805bc999..2dff13af186 100755 --- a/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java +++ b/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java @@ -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; diff --git a/core/src/com/cloud/vm/VmDetailConstants.java b/core/src/com/cloud/vm/VmDetailConstants.java index dd819975f96..d177ab80811 100644 --- a/core/src/com/cloud/vm/VmDetailConstants.java +++ b/core/src/com/cloud/vm/VmDetailConstants.java @@ -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"; }