Updated Branches: refs/heads/master 7a042e233 -> 94f9b31c9
CLOUDSTACK-5046:Vmware- System's StartCommand failed with "NumberFormatException". Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/94f9b31c Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/94f9b31c Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/94f9b31c Branch: refs/heads/master Commit: 94f9b31c9a4c7ae67feabbe16d2ea753e3183289 Parents: 7a042e2 Author: Min Chen <[email protected]> Authored: Tue Nov 5 16:35:12 2013 -0800 Committer: Min Chen <[email protected]> Committed: Tue Nov 5 16:36:05 2013 -0800 ---------------------------------------------------------------------- .../com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/94f9b31c/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java ---------------------------------------------------------------------- diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java index 3a70744..cd2c3e8 100755 --- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java +++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java @@ -937,7 +937,7 @@ public class HypervisorHostHelper { if(vlanId != null && !UNTAGGED_VLAN_NAME.equalsIgnoreCase(vlanId) ) { createGCTag = true; - vid = Integer.parseInt(BroadcastDomainType.getValue(vlanId)); + vid = Integer.parseInt(vlanId); } } @@ -1205,7 +1205,7 @@ public class HypervisorHostHelper { return false; } - public static VirtualMachineMO createWorkerVM(VmwareHypervisorHost hyperHost, + public static VirtualMachineMO createWorkerVM(VmwareHypervisorHost hyperHost, DatastoreMO dsMo, String vmName) throws Exception { // Allow worker VM to float within cluster so that we will have better chance to @@ -1247,7 +1247,7 @@ public class HypervisorHostHelper { if(workingVM != null) { workingVM.setCustomFieldValue(CustomFieldConstants.CLOUD_WORKER, "true"); - String workerTag = String.format("%d-%s", System.currentTimeMillis(), + String workerTag = String.format("%d-%s", System.currentTimeMillis(), hyperHost.getContext().getStockObject("noderuninfo")); workingVM.setCustomFieldValue(CustomFieldConstants.CLOUD_WORKER_TAG, workerTag); }
