You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2014/11/14 13:14:29 UTC
[2/4] git commit: updated refs/heads/4.3 to e2fd4ef
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 <sa...@apache.org>
(cherry picked from commit a605ca09cd3e40a8f25ae3e36ce37f1f24ac489b)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/17676d6b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/17676d6b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/17676d6b
Branch: refs/heads/4.3
Commit: 17676d6bb96a473facddba69be0809884db70d66
Parents: 1d7adf5
Author: Sateesh Chodapuneedi <sa...@apache.org>
Authored: Tue May 13 15:00:29 2014 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Fri Nov 14 17:25:34 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/17676d6b/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 645dec9..70581ea 100755
--- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
@@ -501,10 +501,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);
}
}