You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ro...@apache.org on 2021/06/10 07:07:10 UTC
[cloudstack] branch 4.15 updated: vmware: Fix lsilogcsas controller
for deploy-as-is (#5076)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch 4.15
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.15 by this push:
new 9d9da01 vmware: Fix lsilogcsas controller for deploy-as-is (#5076)
9d9da01 is described below
commit 9d9da01626b571d9f4c6d0f68767500a8264c038
Author: Nicolas Vazquez <ni...@gmail.com>
AuthorDate: Thu Jun 10 04:06:53 2021 -0300
vmware: Fix lsilogcsas controller for deploy-as-is (#5076)
* Fix lsilogcsas controller for deploy-as-is
* Add virtual scsi controller type
* Rename virtual scsi key
---
.../com/cloud/hypervisor/vmware/mo/DiskControllerType.java | 4 +++-
.../com/cloud/hypervisor/vmware/mo/ScsiDiskControllerType.java | 10 ++++++----
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DiskControllerType.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DiskControllerType.java
index 3e6b8bb..2ee1e48 100644
--- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DiskControllerType.java
+++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/DiskControllerType.java
@@ -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)) {
diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/ScsiDiskControllerType.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/ScsiDiskControllerType.java
index 8b9a949..4fbe399 100644
--- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/ScsiDiskControllerType.java
+++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/ScsiDiskControllerType.java
@@ -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";
}