Repository: cloudstack Updated Branches: refs/heads/master 9b6d43017 -> a605ca09c
CLOUDSTACK-6652 CLONE - [Automation] Vmware- System's StartCommand failed with "NumberFormatException" while using VMware DVS vlan id format was like "vlan://<id>" instead of just "<id>". This causes numberformatexception while converting the vlan id to integer form from string form. this was fixed for standard vswitch in bug Cloudstack-5046. now fixed for other 2 cases of dvswitch as well as pvlan. Signed-off-by: Sateesh Chodapuneedi <sate...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a605ca09 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a605ca09 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a605ca09 Branch: refs/heads/master Commit: a605ca09cd3e40a8f25ae3e36ce37f1f24ac489b Parents: 9b6d430 Author: Sateesh Chodapuneedi <sate...@apache.org> Authored: Tue May 13 15:00:29 2014 +0530 Committer: Sateesh Chodapuneedi <sate...@apache.org> Committed: Tue May 13 15:02:46 2014 +0530 ---------------------------------------------------------------------- .../src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a605ca09/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 38b68b3..dd55439 100755 --- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java +++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java @@ -481,10 +481,10 @@ public class HypervisorHostHelper { if (vlanId != null && !UNTAGGED_VLAN_NAME.equalsIgnoreCase(vlanId)) { createGCTag = true; - vid = Integer.parseInt(BroadcastDomainType.getValue(vlanId)); + vid = Integer.parseInt(vlanId); } if (secondaryvlanId != null) { - spvlanid = Integer.parseInt(BroadcastDomainType.getValue(secondaryvlanId)); + spvlanid = Integer.parseInt(secondaryvlanId); } }
