CS-9919 Support for Nexus Swiches (Cisco Vswitches)

Sateesh Chodapuneedi · Vijayendra Bhamidipati · commit a20aace44eac · 2012-05-25T18:08:28.000-07:00
Description:

	Temporarily skipping exception until vsmresponse
	parser doesn't throw malformed exceptions after
	adding port profile for native access.
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
@@ -133,7 +133,7 @@ public static Map<String, String> getValidatedVsmCredentials(VmwareContext conte
 		if(vsmCredentials == null || vsmCredentials.size() != 3) {
 			msg = "Failed to retrieve required credentials of Nexus VSM from database.";
 			s_logger.error(msg);
-			throw new Exception(msg);
+            throw new Exception(msg);
 		}
 		
 		String vsmIp = vsmCredentials.containsKey("vsmip") ? vsmCredentials.get("vsmip") : null;
@@ -191,7 +191,10 @@ public static void createPortProfile(VmwareContext context, String ethPortProfil
         } catch (CloudRuntimeException e) {
             msg = "Failed to add vEthernet port profile " + networkName + ". Exception: " + e.toString();
 			s_logger.error(msg);
-			throw new CloudRuntimeException(msg);
+			if(vlanId == null) {
+                s_logger.warn("Ignoring exception : " + e.toString());
+                // throw new CloudRuntimeException(msg);
+			}
 		}
 	}
 	

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ public static Map<String, String> getValidatedVsmCredentials(VmwareContext conte`
`133`	`133`	`if(vsmCredentials == null \|\| vsmCredentials.size() != 3) {`
`134`	`134`	`msg = "Failed to retrieve required credentials of Nexus VSM from database.";`
`135`	`135`	`s_logger.error(msg);`
`136`		`- throw new Exception(msg);`
	`136`	`+ throw new Exception(msg);`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`String vsmIp = vsmCredentials.containsKey("vsmip") ? vsmCredentials.get("vsmip") : null;`
`@@ -191,7 +191,10 @@ public static void createPortProfile(VmwareContext context, String ethPortProfil`
`191`	`191`	`} catch (CloudRuntimeException e) {`
`192`	`192`	`msg = "Failed to add vEthernet port profile " + networkName + ". Exception: " + e.toString();`
`193`	`193`	`s_logger.error(msg);`
`194`		`- throw new CloudRuntimeException(msg);`
	`194`	`+ if(vlanId == null) {`
	`195`	`+ s_logger.warn("Ignoring exception : " + e.toString());`
	`196`	`+ // throw new CloudRuntimeException(msg);`
	`197`	`+ }`
`195`	`198`	`}`
`196`	`199`	`}`
`197`	`200`