vm: fix destroy_net in DestroyOperation

00227f21 · Bach Dániel · fdd67076 · 00227f21
Commit 00227f21 authored Jul 09, 2014 by Bach Dániel
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

circle/vm/operations.py
+5 -4

No files found.
--- a/circle/vm/operations.py
+++ b/circle/vm/operations.py
@@ -217,12 +217,13 @@ class DestroyOperation(InstanceOperation):
        activity.resultant_state = 'DESTROYED'

    def _operation(self, activity):
-        if self.instance.node:
-            # Destroy networks
-            with activity.sub_activity('destroying_net'):
+        # Destroy networks
+        with activity.sub_activity('destroying_net'):
+            if self.instance.node:
                self.instance.shutdown_net()
-                self.instance.destroy_net()
+            self.instance.destroy_net()

+        if self.instance.node:
            # Delete virtual machine
            with activity.sub_activity('destroying_vm'):
                self.instance.delete_vm()