From a20aace44eac64d010a9bdfd4cef6dc245f0de35 Mon Sep 17 00:00:00 2001 From: Sateesh Chodapuneedi Date: Tue, 15 May 2012 05:31:40 +0530 Subject: [PATCH] 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. --- .../cloud/hypervisor/vmware/mo/HypervisorHostHelper.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 b79636ff698..52addafe46d 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); + } } }