CS-15717: fail to delete the network when corresponding network elements fail to be destroyed

Alena Prokharchyk · chipchilders · commit 2943dc22d75b · 2012-07-27T23:37:46.000-04:00
diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -3215,7 +3215,10 @@ public boolean destroyNetwork(long networkId, ReservationContext context) {
                         s_logger.debug("Sending destroy to " + element);
                     }
 
-                    element.destroy(network);
+                    if (!element.destroy(network)) {
+                        success = false;
+                        s_logger.warn("Unable to complete destroy of the network: failed to destroy network element " + element.getName());
+                    }
                 } catch (ResourceUnavailableException e) {
                     s_logger.warn("Unable to complete destroy of the network due to element: " + element.getName(), e);
                     success = false;
@@ -3225,7 +3228,7 @@ public boolean destroyNetwork(long networkId, ReservationContext context) {
                 } catch (Exception e) {
                     s_logger.warn("Unable to complete destroy of the network due to element: " + element.getName(), e);
                     success = false;
-                }
+                } 
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -3215,7 +3215,10 @@ public boolean destroyNetwork(long networkId, ReservationContext context) {`
`3215`	`3215`	`s_logger.debug("Sending destroy to " + element);`
`3216`	`3216`	`}`
`3217`	`3217`
`3218`		`- element.destroy(network);`
	`3218`	`+ if (!element.destroy(network)) {`
	`3219`	`+ success = false;`
	`3220`	`+ s_logger.warn("Unable to complete destroy of the network: failed to destroy network element " + element.getName());`
	`3221`	`+ }`
`3219`	`3222`	`} catch (ResourceUnavailableException e) {`
`3220`	`3223`	`s_logger.warn("Unable to complete destroy of the network due to element: " + element.getName(), e);`
`3221`	`3224`	`success = false;`
`@@ -3225,7 +3228,7 @@ public boolean destroyNetwork(long networkId, ReservationContext context) {`
`3225`	`3228`	`} catch (Exception e) {`
`3226`	`3229`	`s_logger.warn("Unable to complete destroy of the network due to element: " + element.getName(), e);`
`3227`	`3230`	`success = false;`
`3228`		`- }`
	`3231`	`+ }`
`3229`	`3232`	`}`
`3230`	`3233`	`}`
`3231`	`3234`