apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

vmware: Fix lsilogcsas controller for deploy-as-is (#5076)

Browse Source 
* Fix lsilogcsas controller for deploy-as-is

* Add virtual scsi controller type

* Rename virtual scsi key
This commit is contained in:
Nicolas Vazquez 2021-06-10 04:06:53 -03:00 committed by GitHub
parent 2777391689
commit 9d9da01626
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DiskControllerType.java
View File

@ -29,6 +29,7 @@ public enum DiskControllerType {
if (diskController == null || diskController.equalsIgnoreCase("osdefault")) {
return DiskControllerType.osdefault;
} else if (diskController.equalsIgnoreCase("vim.vm.device.VirtualLsiLogicSASController") || diskController.equalsIgnoreCase("VirtualLsiLogicSASController")
|| diskController.equalsIgnoreCase(ScsiDiskControllerType.LSILOGIC_SAS_1068)
|| diskController.equalsIgnoreCase(ScsiDiskControllerType.LSILOGIC_SAS)) {
return DiskControllerType.lsisas1068;
} else if (diskController.equalsIgnoreCase("vim.vm.device.VirtualLsiLogicController") || diskController.equalsIgnoreCase("VirtualLsiLogicController")
@ -38,7 +39,8 @@ public enum DiskControllerType {
|| diskController.equalsIgnoreCase("ide")) {
return DiskControllerType.ide;
} else if (diskController.equalsIgnoreCase("vim.vm.device.ParaVirtualSCSIController") || diskController.equalsIgnoreCase("ParaVirtualSCSIController")
|| diskController.equalsIgnoreCase(ScsiDiskControllerType.VMWARE_PARAVIRTUAL)) {
|| diskController.equalsIgnoreCase(ScsiDiskControllerType.VMWARE_PARAVIRTUAL)
|| diskController.equalsIgnoreCase(ScsiDiskControllerType.VIRTUAL_SCSI)) {
return DiskControllerType.pvscsi;
} else if (diskController.equalsIgnoreCase("vim.vm.device.VirtualBusLogicController") || diskController.equalsIgnoreCase("VirtualBusLogicController")
|| diskController.equalsIgnoreCase(ScsiDiskControllerType.BUSLOGIC)) {

10
vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/ScsiDiskControllerType.java
View File

@ -17,8 +17,10 @@
package com.cloud.hypervisor.vmware.mo;
public interface ScsiDiskControllerType {
public final static String LSILOGIC_PARALLEL = "lsilogic";
public final static String LSILOGIC_SAS = "lsisas1068";
public final static String BUSLOGIC = "buslogic";
public final static String VMWARE_PARAVIRTUAL = "pvscsi";
String LSILOGIC_PARALLEL = "lsilogic";
String LSILOGIC_SAS = "lsilogicsas";
String LSILOGIC_SAS_1068 = "lsisas1068";
String BUSLOGIC = "buslogic";
String VMWARE_PARAVIRTUAL = "pvscsi";
String VIRTUAL_SCSI = "VirtualSCSI";
}