You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ko...@apache.org on 2013/12/26 12:52:07 UTC
git commit: updated refs/heads/master to ad33f0a
Updated Branches:
refs/heads/master 16763be77 -> ad33f0ad6
CLOUDSTACK-2560: Adding duplicate ASA device entity failure should be handled with API
Handling duplicate ASA appliance addition gracefully
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ad33f0ad
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ad33f0ad
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ad33f0ad
Branch: refs/heads/master
Commit: ad33f0ad66f11712d94ad3661dbaf7f72330402a
Parents: 16763be
Author: Koushik Das <ko...@apache.org>
Authored: Thu Dec 26 17:01:33 2013 +0530
Committer: Koushik Das <ko...@apache.org>
Committed: Thu Dec 26 17:21:58 2013 +0530
----------------------------------------------------------------------
.../src/com/cloud/network/element/CiscoVnmcElement.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ad33f0ad/plugins/network-elements/cisco-vnmc/src/com/cloud/network/element/CiscoVnmcElement.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/element/CiscoVnmcElement.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/element/CiscoVnmcElement.java
index e8b6aa2..03fac26 100644
--- a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/element/CiscoVnmcElement.java
+++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/element/CiscoVnmcElement.java
@@ -27,6 +27,7 @@ import java.util.UUID;
import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
+import javax.persistence.EntityExistsException;
import org.apache.log4j.Logger;
@@ -847,8 +848,12 @@ public class CiscoVnmcElement extends AdapterBase implements SourceNatServicePro
throw new InvalidParameterValueException("Could not find phyical network with ID: " + physicalNetworkId);
}
- ciscoAsa1000vResource = new CiscoAsa1000vDeviceVO(physicalNetworkId, cmd.getManagementIp(), cmd.getInPortProfile(), cmd.getClusterId());
- _ciscoAsa1000vDao.persist((CiscoAsa1000vDeviceVO)ciscoAsa1000vResource);
+ ciscoAsa1000vResource = new CiscoAsa1000vDeviceVO(physicalNetworkId, cmd.getManagementIp().trim(), cmd.getInPortProfile(), cmd.getClusterId());
+ try {
+ _ciscoAsa1000vDao.persist((CiscoAsa1000vDeviceVO)ciscoAsa1000vResource);
+ } catch (EntityExistsException e) {
+ throw new InvalidParameterValueException("An ASA 1000v appliance already exists with same configuration");
+ }
return ciscoAsa1000vResource;
}