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

Fix ClassCastException.

Browse Source
This commit is contained in:
Min Chen 2013-02-07 16:23:56 -08:00
parent 640fa6be76
commit 14ef9151a5
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/com/cloud/configuration/Config.java
View File

@ -258,8 +258,8 @@ public enum Config {
VmwareAdditionalVncPortRangeSize("Advanced", ManagementServer.class, Integer.class, "vmware.additional.vnc.portrange.size", "1000", "Start port number of additional VNC port range", null), VmwareAdditionalVncPortRangeSize("Advanced", ManagementServer.class, Integer.class, "vmware.additional.vnc.portrange.size", "1000", "Start port number of additional VNC port range", null),
//VmwareGuestNicDeviceType("Advanced", ManagementServer.class, String.class, "vmware.guest.nic.device.type", "E1000", "Ethernet card type used in guest VM, valid values are E1000, PCNet32, Vmxnet2, Vmxnet3", null), //VmwareGuestNicDeviceType("Advanced", ManagementServer.class, String.class, "vmware.guest.nic.device.type", "E1000", "Ethernet card type used in guest VM, valid values are E1000, PCNet32, Vmxnet2, Vmxnet3", null),
VmwarePerClusterHostMax("Advanced", ManagementServer.class, Integer.class, "vmware.percluster.host.max", "8", "maxmium hosts per vCenter cluster(do not let it grow over 8)", "1-8"), VmwarePerClusterHostMax("Advanced", ManagementServer.class, Integer.class, "vmware.percluster.host.max", "8", "maxmium hosts per vCenter cluster(do not let it grow over 8)", "1-8"),
VmwareReserveCpu("Advanced", ManagementServer.class, Boolean.class, "vmware.reserve.cpu", "false", "Specify whether or not to reserve CPU based on CPU overprovisioning factor", null), VmwareReserveCpu("Advanced", ManagementServer.class, Boolean.class, "vmware.reserve.cpu", "true", "Specify whether or not to reserve CPU based on CPU overprovisioning factor", null),
VmwareReserveMem("Advanced", ManagementServer.class, Boolean.class, "vmware.reserve.mem", "false", "Specify whether or not to reserve memory based on memory overprovisioning factor", null), VmwareReserveMem("Advanced", ManagementServer.class, Boolean.class, "vmware.reserve.mem", "true", "Specify whether or not to reserve memory based on memory overprovisioning factor", null),
VmwareRootDiskControllerType("Advanced", ManagementServer.class, String.class, "vmware.root.disk.controller", "ide", "Specify the default disk controller for root volumes, valid values are scsi, ide", null), VmwareRootDiskControllerType("Advanced", ManagementServer.class, String.class, "vmware.root.disk.controller", "ide", "Specify the default disk controller for root volumes, valid values are scsi, ide", null),
VmwareSystemVmNicDeviceType("Advanced", ManagementServer.class, String.class, "vmware.systemvm.nic.device.type", "E1000", "Specify the default network device type for system VMs, valid values are E1000, PCNet32, Vmxnet2, Vmxnet3", null), VmwareSystemVmNicDeviceType("Advanced", ManagementServer.class, String.class, "vmware.systemvm.nic.device.type", "E1000", "Specify the default network device type for system VMs, valid values are E1000, PCNet32, Vmxnet2, Vmxnet3", null),
VmwareRecycleHungWorker("Advanced", ManagementServer.class, Boolean.class, "vmware.recycle.hung.wokervm", "false", "Specify whether or not to recycle hung worker VMs", null), VmwareRecycleHungWorker("Advanced", ManagementServer.class, Boolean.class, "vmware.recycle.hung.wokervm", "false", "Specify whether or not to recycle hung worker VMs", null),

30
vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
View File

@ -1663,10 +1663,10 @@ public class VirtualMachineMO extends BaseMO {
} }
public int getScsiDeviceControllerKey() throws Exception { public int getScsiDeviceControllerKey() throws Exception {
VirtualDevice[] devices = (VirtualDevice [])_context.getVimClient(). List<VirtualDevice> devices = (List<VirtualDevice>)_context.getVimClient().
getDynamicProperty(_mor, "config.hardware.device"); getDynamicProperty(_mor, "config.hardware.device");
if(devices != null && devices.length > 0) { if(devices != null && devices.size() > 0) {
for(VirtualDevice device : devices) { for(VirtualDevice device : devices) {
if(device instanceof VirtualLsiLogicController) { if(device instanceof VirtualLsiLogicController) {
return device.getKey(); return device.getKey();
@ -1679,10 +1679,10 @@ public class VirtualMachineMO extends BaseMO {
} }
public int getScsiDeviceControllerKeyNoException() throws Exception { public int getScsiDeviceControllerKeyNoException() throws Exception {
VirtualDevice[] devices = (VirtualDevice [])_context.getVimClient(). List<VirtualDevice> devices = (List<VirtualDevice>)_context.getVimClient().
getDynamicProperty(_mor, "config.hardware.device"); getDynamicProperty(_mor, "config.hardware.device");
if(devices != null && devices.length > 0) { if(devices != null && devices.size() > 0) {
for(VirtualDevice device : devices) { for(VirtualDevice device : devices) {
if(device instanceof VirtualLsiLogicController) { if(device instanceof VirtualLsiLogicController) {
return device.getKey(); return device.getKey();
@ -1909,10 +1909,10 @@ public class VirtualMachineMO extends BaseMO {
} }
public int getIDEDeviceControllerKey() throws Exception { public int getIDEDeviceControllerKey() throws Exception {
VirtualDevice[] devices = (VirtualDevice [])_context.getVimClient(). List<VirtualDevice> devices = (List<VirtualDevice>)_context.getVimClient().
getDynamicProperty(_mor, "config.hardware.device"); getDynamicProperty(_mor, "config.hardware.device");
if(devices != null && devices.length > 0) { if(devices != null && devices.size() > 0) {
for(VirtualDevice device : devices) { for(VirtualDevice device : devices) {
if(device instanceof VirtualIDEController) { if(device instanceof VirtualIDEController) {
return ((VirtualIDEController)device).getKey(); return ((VirtualIDEController)device).getKey();
@ -1930,9 +1930,9 @@ public class VirtualMachineMO extends BaseMO {
} }
public VirtualDevice getIsoDevice() throws Exception { public VirtualDevice getIsoDevice() throws Exception {
VirtualDevice[] devices = (VirtualDevice[])_context.getVimClient(). List<VirtualDevice> devices = (List<VirtualDevice>)_context.getVimClient().
getDynamicProperty(_mor, "config.hardware.device"); getDynamicProperty(_mor, "config.hardware.device");
if(devices != null && devices.length > 0) { if(devices != null && devices.size() > 0) {
for(VirtualDevice device : devices) { for(VirtualDevice device : devices) {
if(device instanceof VirtualCdrom) { if(device instanceof VirtualCdrom) {
return device; return device;
@ -1943,10 +1943,10 @@ public class VirtualMachineMO extends BaseMO {
} }
public int getPCIDeviceControllerKey() throws Exception { public int getPCIDeviceControllerKey() throws Exception {
VirtualDevice[] devices = (VirtualDevice [])_context.getVimClient(). List<VirtualDevice> devices = (List<VirtualDevice>)_context.getVimClient().
getDynamicProperty(_mor, "config.hardware.device"); getDynamicProperty(_mor, "config.hardware.device");
if(devices != null && devices.length > 0) { if(devices != null && devices.size() > 0) {
for(VirtualDevice device : devices) { for(VirtualDevice device : devices) {
if(device instanceof VirtualPCIController) { if(device instanceof VirtualPCIController) {
return ((VirtualPCIController)device).getKey(); return ((VirtualPCIController)device).getKey();
@ -1964,11 +1964,11 @@ public class VirtualMachineMO extends BaseMO {
} }
public int getNextDeviceNumber(int controllerKey) throws Exception { public int getNextDeviceNumber(int controllerKey) throws Exception {
VirtualDevice[] devices = (VirtualDevice[])_context.getVimClient(). List<VirtualDevice> devices = (List<VirtualDevice>)_context.getVimClient().
getDynamicProperty(_mor, "config.hardware.device"); getDynamicProperty(_mor, "config.hardware.device");
int deviceNumber = -1; int deviceNumber = -1;
if(devices != null && devices.length > 0) { if(devices != null && devices.size() > 0) {
for(VirtualDevice device : devices) { for(VirtualDevice device : devices) {
if(device.getControllerKey() != null && device.getControllerKey().intValue() == controllerKey) { if(device.getControllerKey() != null && device.getControllerKey().intValue() == controllerKey) {
if(device.getUnitNumber() != null && device.getUnitNumber().intValue() > deviceNumber) { if(device.getUnitNumber() != null && device.getUnitNumber().intValue() > deviceNumber) {
@ -1981,7 +1981,7 @@ public class VirtualMachineMO extends BaseMO {
} }
public VirtualDevice[] getNicDevices() throws Exception { public VirtualDevice[] getNicDevices() throws Exception {
VirtualDevice[] devices = (VirtualDevice[])_context.getVimClient(). List<VirtualDevice> devices = (List<VirtualDevice>)_context.getVimClient().
getDynamicProperty(_mor, "config.hardware.device"); getDynamicProperty(_mor, "config.hardware.device");
List<VirtualDevice> nics = new ArrayList<VirtualDevice>(); List<VirtualDevice> nics = new ArrayList<VirtualDevice>();
@ -1997,7 +1997,7 @@ public class VirtualMachineMO extends BaseMO {
} }
public Pair<Integer, VirtualDevice> getNicDeviceIndex(String networkNamePrefix) throws Exception { public Pair<Integer, VirtualDevice> getNicDeviceIndex(String networkNamePrefix) throws Exception {
VirtualDevice[] devices = (VirtualDevice[])_context.getVimClient(). List<VirtualDevice> devices = (List<VirtualDevice>)_context.getVimClient().
getDynamicProperty(_mor, "config.hardware.device"); getDynamicProperty(_mor, "config.hardware.device");
List<VirtualDevice> nics = new ArrayList<VirtualDevice>(); List<VirtualDevice> nics = new ArrayList<VirtualDevice>();
@ -2057,7 +2057,7 @@ public class VirtualMachineMO extends BaseMO {
List<VirtualDevice> returnList = new ArrayList<VirtualDevice>(); List<VirtualDevice> returnList = new ArrayList<VirtualDevice>();
VirtualDevice[] devices = (VirtualDevice[])_context.getVimClient(). List<VirtualDevice> devices = (List<VirtualDevice>)_context.getVimClient().
getDynamicProperty(_mor, "config.hardware.device"); getDynamicProperty(_mor, "config.hardware.device");
if(devices != null) { if(devices != null) {