CLOUDSTACK-2560: Adding duplicate ASA device entity failure should be handled with API

koushik-das · koushik-das · commit ad33f0ad66f1 · 2013-12-26T17:21:58.000+05:30
Handling duplicate ASA appliance addition gracefully
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
@@ -27,6 +27,7 @@
 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 CiscoAsa1000vDevice addCiscoAsa1000vResource(AddCiscoAsa1000vResourceCmd
             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;
     }
