CLOUDSTACK-6652 CLONE - [Automation] Vmware- System's StartCommand failed with "NumberFormatException" while using VMware DVS

Sateesh Chodapuneedi · Sateesh Chodapuneedi · commit a605ca09cd3e · 2014-05-13T15:02:46.000+05:30
vlan id format was like "vlan://&lt;id&gt;" instead of just "&lt;id&gt;". 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 &lt;sateesh@apache.org&gt;
diff --git 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 static Pair<ManagedObjectReference, String> prepareNetwork(String physica
 
             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);
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -481,10 +481,10 @@ public static Pair<ManagedObjectReference, String> prepareNetwork(String physica`
`481`	`481`
`482`	`482`	`if (vlanId != null && !UNTAGGED_VLAN_NAME.equalsIgnoreCase(vlanId)) {`
`483`	`483`	`createGCTag = true;`
`484`		`- vid = Integer.parseInt(BroadcastDomainType.getValue(vlanId));`
	`484`	`+ vid = Integer.parseInt(vlanId);`
`485`	`485`	`}`
`486`	`486`	`if (secondaryvlanId != null) {`
`487`		`- spvlanid = Integer.parseInt(BroadcastDomainType.getValue(secondaryvlanId));`
	`487`	`+ spvlanid = Integer.parseInt(secondaryvlanId);`
`488`	`488`	`}`
`489`	`489`	`}`
`490`	`490`