Skip to content

Commit 14ef915

Browse files
minchen07minchen07
committed
Fix ClassCastException.
1 parent 640fa6b commit 14ef915

2 files changed

Lines changed: 18 additions & 18 deletions

File tree

‎server/src/com/cloud/configuration/Config.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -258,8 +258,8 @@ public enum Config {
258258
VmwareAdditionalVncPortRangeSize("Advanced", ManagementServer.class, Integer.class, "vmware.additional.vnc.portrange.size", "1000", "Start port number of additional VNC port range", null),
259259
//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),
260260
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"),
261-
VmwareReserveCpu("Advanced", ManagementServer.class, Boolean.class, "vmware.reserve.cpu", "false", "Specify whether or not to reserve CPU based on CPU overprovisioning factor", null),
262-
VmwareReserveMem("Advanced", ManagementServer.class, Boolean.class, "vmware.reserve.mem", "false", "Specify whether or not to reserve memory based on memory overprovisioning factor", null),
261+
VmwareReserveCpu("Advanced", ManagementServer.class, Boolean.class, "vmware.reserve.cpu", "true", "Specify whether or not to reserve CPU based on CPU overprovisioning factor", null),
262+
VmwareReserveMem("Advanced", ManagementServer.class, Boolean.class, "vmware.reserve.mem", "true", "Specify whether or not to reserve memory based on memory overprovisioning factor", null),
263263
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),
264264
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),
265265
VmwareRecycleHungWorker("Advanced", ManagementServer.class, Boolean.class, "vmware.recycle.hung.wokervm", "false", "Specify whether or not to recycle hung worker VMs", null),
@@ -358,7 +358,7 @@ public enum Config {
358358
ConcurrentSnapshotsThresholdPerHost("Advanced", ManagementServer.class, Long.class, "concurrent.snapshots.threshold.perhost",
359359
null, "Limits number of snapshots that can be handled by the host concurrently; default is NULL - unlimited", null),
360360
NetworkIPv6SearchRetryMax("Network", ManagementServer.class, Integer.class, "network.ipv6.search.retry.max", "10000", "The maximum number of retrying times to search for an available IPv6 address in the table", null),
361-
361+
362362
ExternalBaremetalSystemUrl("Advanced", ManagementServer.class, String.class, "external.baremetal.system.url", null, "url of external baremetal system that CloudStack will talk to", null),
363363
ExternalBaremetalResourceClassName("Advanced", ManagementServer.class, String.class, "external,baremetal.resource.classname", null, "class name for handling external baremetal resource", null),
364364
EnableBaremetalSecurityGroupAgentEcho("Advanced", ManagementServer.class, Boolean.class, "enable.baremetal.securitygroup.agent.echo", "false", "After starting provision process, periodcially echo security agent installed in the template. Treat provisioning as success only if echo successfully", null),

‎vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1663,10 +1663,10 @@ public int getNextScsiDiskDeviceNumber() throws Exception {
16631663
}
16641664

16651665
public int getScsiDeviceControllerKey() throws Exception {
1666-
VirtualDevice[] devices = (VirtualDevice [])_context.getVimClient().
1666+
List<VirtualDevice> devices = (List<VirtualDevice>)_context.getVimClient().
16671667
getDynamicProperty(_mor, "config.hardware.device");
16681668

1669-
if(devices != null && devices.length > 0) {
1669+
if(devices != null && devices.size() > 0) {
16701670
for(VirtualDevice device : devices) {
16711671
if(device instanceof VirtualLsiLogicController) {
16721672
return device.getKey();
@@ -1679,10 +1679,10 @@ public int getScsiDeviceControllerKey() throws Exception {
16791679
}
16801680

16811681
public int getScsiDeviceControllerKeyNoException() throws Exception {
1682-
VirtualDevice[] devices = (VirtualDevice [])_context.getVimClient().
1682+
List<VirtualDevice> devices = (List<VirtualDevice>)_context.getVimClient().
16831683
getDynamicProperty(_mor, "config.hardware.device");
16841684

1685-
if(devices != null && devices.length > 0) {
1685+
if(devices != null && devices.size() > 0) {
16861686
for(VirtualDevice device : devices) {
16871687
if(device instanceof VirtualLsiLogicController) {
16881688
return device.getKey();
@@ -1909,10 +1909,10 @@ public int tryGetIDEDeviceControllerKey() throws Exception {
19091909
}
19101910

19111911
public int getIDEDeviceControllerKey() throws Exception {
1912-
VirtualDevice[] devices = (VirtualDevice [])_context.getVimClient().
1912+
List<VirtualDevice> devices = (List<VirtualDevice>)_context.getVimClient().
19131913
getDynamicProperty(_mor, "config.hardware.device");
19141914

1915-
if(devices != null && devices.length > 0) {
1915+
if(devices != null && devices.size() > 0) {
19161916
for(VirtualDevice device : devices) {
19171917
if(device instanceof VirtualIDEController) {
19181918
return ((VirtualIDEController)device).getKey();
@@ -1930,9 +1930,9 @@ public int getNextIDEDeviceNumber() throws Exception {
19301930
}
19311931

19321932
public VirtualDevice getIsoDevice() throws Exception {
1933-
VirtualDevice[] devices = (VirtualDevice[])_context.getVimClient().
1933+
List<VirtualDevice> devices = (List<VirtualDevice>)_context.getVimClient().
19341934
getDynamicProperty(_mor, "config.hardware.device");
1935-
if(devices != null && devices.length > 0) {
1935+
if(devices != null && devices.size() > 0) {
19361936
for(VirtualDevice device : devices) {
19371937
if(device instanceof VirtualCdrom) {
19381938
return device;
@@ -1943,10 +1943,10 @@ public VirtualDevice getIsoDevice() throws Exception {
19431943
}
19441944

19451945
public int getPCIDeviceControllerKey() throws Exception {
1946-
VirtualDevice[] devices = (VirtualDevice [])_context.getVimClient().
1946+
List<VirtualDevice> devices = (List<VirtualDevice>)_context.getVimClient().
19471947
getDynamicProperty(_mor, "config.hardware.device");
19481948

1949-
if(devices != null && devices.length > 0) {
1949+
if(devices != null && devices.size() > 0) {
19501950
for(VirtualDevice device : devices) {
19511951
if(device instanceof VirtualPCIController) {
19521952
return ((VirtualPCIController)device).getKey();
@@ -1964,11 +1964,11 @@ public int getNextPCIDeviceNumber() throws Exception {
19641964
}
19651965

19661966
public int getNextDeviceNumber(int controllerKey) throws Exception {
1967-
VirtualDevice[] devices = (VirtualDevice[])_context.getVimClient().
1967+
List<VirtualDevice> devices = (List<VirtualDevice>)_context.getVimClient().
19681968
getDynamicProperty(_mor, "config.hardware.device");
19691969

19701970
int deviceNumber = -1;
1971-
if(devices != null && devices.length > 0) {
1971+
if(devices != null && devices.size() > 0) {
19721972
for(VirtualDevice device : devices) {
19731973
if(device.getControllerKey() != null && device.getControllerKey().intValue() == controllerKey) {
19741974
if(device.getUnitNumber() != null && device.getUnitNumber().intValue() > deviceNumber) {
@@ -1981,7 +1981,7 @@ public int getNextDeviceNumber(int controllerKey) throws Exception {
19811981
}
19821982

19831983
public VirtualDevice[] getNicDevices() throws Exception {
1984-
VirtualDevice[] devices = (VirtualDevice[])_context.getVimClient().
1984+
List<VirtualDevice> devices = (List<VirtualDevice>)_context.getVimClient().
19851985
getDynamicProperty(_mor, "config.hardware.device");
19861986

19871987
List<VirtualDevice> nics = new ArrayList<VirtualDevice>();
@@ -1997,7 +1997,7 @@ public VirtualDevice[] getNicDevices() throws Exception {
19971997
}
19981998

19991999
public Pair<Integer, VirtualDevice> getNicDeviceIndex(String networkNamePrefix) throws Exception {
2000-
VirtualDevice[] devices = (VirtualDevice[])_context.getVimClient().
2000+
List<VirtualDevice> devices = (List<VirtualDevice>)_context.getVimClient().
20012001
getDynamicProperty(_mor, "config.hardware.device");
20022002

20032003
List<VirtualDevice> nics = new ArrayList<VirtualDevice>();
@@ -2057,7 +2057,7 @@ public VirtualDevice[] getMatchedDevices(Class<?>[] deviceClasses) throws Except
20572057

20582058
List<VirtualDevice> returnList = new ArrayList<VirtualDevice>();
20592059

2060-
VirtualDevice[] devices = (VirtualDevice[])_context.getVimClient().
2060+
List<VirtualDevice> devices = (List<VirtualDevice>)_context.getVimClient().
20612061
getDynamicProperty(_mor, "config.hardware.device");
20622062

20632063
if(devices != null) {

0 commit comments

Comments
 (0)