incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke4...@apache.org
Subject [28/50] git commit: CS-9919 Support for Nexus Swiches (Cisco Vswitches)
Date Sun, 27 May 2012 22:30:44 GMT
CS-9919 Support for Nexus Swiches (Cisco Vswitches)

Description:

	Temporarily skipping exception until vsmresponse
	parser doesn't throw malformed exceptions after
	adding port profile for native access.


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

Branch: refs/heads/master
Commit: a20aace44eac64d010a9bdfd4cef6dc245f0de35
Parents: 187d320
Author: Sateesh Chodapuneedi <sateesh.chodapuneedi@citrix.com>
Authored: Tue May 15 05:31:40 2012 +0530
Committer: Vijayendra Bhamidipati <vijayendra.bhamidipati@citrix.com>
Committed: Fri May 25 18:08:28 2012 -0700

----------------------------------------------------------------------
 .../hypervisor/vmware/mo/HypervisorHostHelper.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a20aace4/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 b79636f..52addaf 100755
--- 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 class HypervisorHostHelper {
 		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 class HypervisorHostHelper {
         } 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);
+			}
 		}
 	}
 	


Mime
View raw message