You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2015/01/12 21:48:37 UTC

git commit: updated refs/heads/4.4 to f642b19

Repository: cloudstack
Updated Branches:
  refs/heads/4.4 1c78d5acc -> f642b1935


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>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f642b193
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f642b193
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f642b193

Branch: refs/heads/4.4
Commit: f642b193541dfaacf747dbb313cb1b47bd3312ec
Parents: 1c78d5a
Author: Sateesh Chodapuneedi <sa...@apache.org>
Authored: Tue May 13 15:00:29 2014 +0530
Committer: Daan Hoogland <da...@onecht.net>
Committed: Mon Jan 12 21:40:34 2015 +0100

----------------------------------------------------------------------
 .../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/f642b193/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);
             }
         }