CLOUDSTACK-9074: Error handling when conflicts in NSX side

Author: nvazquez

engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java

@@ -4575,7 +4575,13 @@ private Pair<JobInfo.Status, String> orchestrateStart(final VmWorkStart work) th
         }
         assert vm != null;
 
-        orchestrateStart(vm.getUuid(), work.getParams(), work.getPlan(), _dpMgr.getDeploymentPlannerByName(work.getDeploymentPlanner()));
+        try{
+            orchestrateStart(vm.getUuid(), work.getParams(), work.getPlan(), _dpMgr.getDeploymentPlannerByName(work.getDeploymentPlanner()));
+        }
+        catch (CloudRuntimeException e){
+            s_logger.info("[NSX_PLUGIN_LOG] Caught CloudRuntimeException, returning job failed");
+            return new Pair<JobInfo.Status, String>(JobInfo.Status.FAILED, null);
+        }
         return new Pair<JobInfo.Status, String>(JobInfo.Status.SUCCEEDED, null);
     }
 

engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java

@@ -1033,10 +1033,14 @@ public Pair<NetworkGuru, NetworkVO> implementNetwork(long networkId, DeployDesti
         } catch (NoTransitionException e) {
             s_logger.error(e.getMessage());
             return null;
+        } catch (CloudRuntimeException e) {
+            s_logger.error("[NSX_PLUGIN_LOG] NetworkOrchestor caught exception " + e.getMessage() + " returning null");
+            return null;
         } finally {
             if (implemented.first() == null) {
                 s_logger.debug("Cleaning up because we're unable to implement the network " + network);
                 try {
+                    s_logger.info("[NSX_PLUGIN_LOG] isSharedNetworkWithServices? " + isSharedNetworkWithServices(network));
                     if (isSharedNetworkWithServices(network)) {
                         network.setState(Network.State.Shutdown);
                         _networksDao.update(networkId, network);

plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/resource/wrapper/NiciraNvpConfigureSharedNetworkUuidCommandWrapper.java

@@ -70,7 +70,6 @@ public Answer execute(ConfigureSharedNetworkUuidCommand command, NiciraNvpResour
             ipAddresses.add(portIpAddress);
             lrpi.setIpAddresses(ipAddresses);
             lrpi = niciraNvpApi.createLogicalRouterPort(logicalRouterUuid, lrpi);
-
             try {
                 // Create the inside port on the lswitch
                 lsp = new LogicalSwitchPort(niciraNvpResource.truncate(networkId + "-shared-att-port", NAME_MAX_LEN), tags, true);
@@ -89,22 +88,16 @@ public Answer execute(ConfigureSharedNetworkUuidCommand command, NiciraNvpResour
                         niciraNvpApi.deleteLogicalSwitchPort(logicalSwitchUuid, lsp.getUuid());
                     }
                 } catch (NiciraNvpApiException ex) {
+                    throw new NiciraNvpApiException(e.getMessage() + " and " + ex.getMessage());
                 }
                 throw e;
             }
 
+            return new ConfigureSharedNetworkUuidAnswer(command, true, "OK");
         }
         catch (final NiciraNvpApiException e) {
-            try {
-                String msg = "Attempt to add overlapping networks to the routing domain. Router ID " +
-                       logicalRouterUuid + ". Network gateway " + portIpAddress +
-                       " (" + e.getMessage() + ")";
-                throw new NiciraNvpApiException(msg);
-            } catch (NiciraNvpApiException e1) {
-            }
+            return new ConfigureSharedNetworkUuidAnswer(command, false, e.getMessage());
         }
-
-        return new ConfigureSharedNetworkUuidAnswer(command, true, "OK");
     }
 
 }

plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/resource/wrapper/NiciraNvpConfigureSharedNetworkVlanIdCommandWrapper.java

@@ -74,20 +74,20 @@ public Answer execute(ConfigureSharedNetworkVlanIdCommand command, NiciraNvpReso
             }
             catch (NiciraNvpApiException e){
                 try {
+                    s_logger.info("Error while updating lswitch port: " + e.getMessage() + " , deleting lswitch port" );
                     niciraNvpApi.deleteLogicalSwitchPort(logicalSwitchUuid, lsp.getUuid());
                 } catch (NiciraNvpApiException e1) {
+                    throw new NiciraNvpApiException(e.getMessage() + " and " + e1.getMessage());
                 }
                 throw e;
             }
+
+            return new ConfigureSharedNetworkVlanIdAnswer(command, true, "OK");
         }
         catch (NiciraNvpApiException e){
-            try {
-                throw e;
-            } catch (NiciraNvpApiException e1) {
-            }
+            return new ConfigureSharedNetworkVlanIdAnswer(command, false, e.getMessage());
         }
 
-        return new ConfigureSharedNetworkVlanIdAnswer(command, true, "OK");
     }
 
 }