Merge pull request #1131 from shapeblue/4.5-vmware-diskcontrollers [4.5] CLOUDSTACK-4787 - vmware diskcontrollershttps://issues.apache.org/jira/browse/CLOUDSTACK-4787
Allows users to configure (root and data) disk controllers for vm and vm templates. Select disk controller while registering VM in UI:  Verified custom disk controller on vCenter/vSphere client:  * pr/1131: CLOUDSTACK-4787: Allow users to select disk controller for VM/template CLOUDSTACK-4787 Allow selection of scsi controller type in vSphere Signed-off-by: Rohit Yadav <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9e374c56 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9e374c56 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9e374c56 Branch: refs/heads/4.5 Commit: 9e374c56791559a9e2391794433a71b01099c5c2 Parents: 67a67ff c7d6762 Author: Rohit Yadav <[email protected]> Authored: Thu Dec 17 01:28:48 2015 +0530 Committer: Rohit Yadav <[email protected]> Committed: Thu Dec 17 01:28:48 2015 +0530 ---------------------------------------------------------------------- api/src/com/cloud/vm/VmDetailConstants.java | 1 + .../storage/command/AttachCommand.java | 16 + .../com/cloud/hypervisor/guru/VMwareGuru.java | 7 + .../vmware/manager/VmwareManager.java | 1 + .../vmware/manager/VmwareManagerImpl.java | 8 + .../vmware/resource/VmwareResource.java | 209 +++++++- .../resource/VmwareStorageProcessor.java | 62 ++- server/src/com/cloud/configuration/Config.java | 2 +- .../com/cloud/storage/VolumeApiServiceImpl.java | 6 + server/src/com/cloud/vm/UserVmManagerImpl.java | 14 + ui/scripts/templates.js | 20 + .../cloud/hypervisor/vmware/mo/ClusterMO.java | 35 +- .../vmware/mo/DiskControllerType.java | 31 +- .../com/cloud/hypervisor/vmware/mo/HostMO.java | 17 +- .../vmware/mo/HypervisorHostHelper.java | 112 +++- .../vmware/mo/ScsiDiskControllerType.java | 24 + .../hypervisor/vmware/mo/VirtualMachineMO.java | 524 ++++++++++++++++++- .../hypervisor/vmware/mo/VmdkAdapterType.java | 48 ++ .../vmware/mo/VmdkFileDescriptor.java | 70 +++ .../vmware/mo/VmwareHypervisorHost.java | 5 +- .../hypervisor/vmware/util/VmwareHelper.java | 24 + 21 files changed, 1166 insertions(+), 70 deletions(-) ----------------------------------------------------------------------
