vm: fix suboperation calls in {Destroy,Sleep}Operation (add missing system arg) (quickfix)

circle/vm/operations.py

@@ -405,7 +405,7 @@ class DestroyOperation(InstanceOperation):
     required_perms = ()
     required_perms = ()
     resultant_state = 'DESTROYED'
     resultant_state = 'DESTROYED'
 
 
-    def _operation(self, activity):
+    def _operation(self, activity, system):
         # Destroy networks
         # Destroy networks
         with activity.sub_activity(
         with activity.sub_activity(
                 'destroying_net',
                 'destroying_net',
@@ -415,7 +415,7 @@ class DestroyOperation(InstanceOperation):
             self.instance.destroy_net()
             self.instance.destroy_net()
 
 
         if self.instance.node:
         if self.instance.node:
-            self.instance._delete_vm(parent_activity=activity)
+            self.instance._delete_vm(parent_activity=activity, system=system)
 
 
         # Destroy disks
         # Destroy disks
         with activity.sub_activity(
         with activity.sub_activity(
@@ -425,7 +425,8 @@ class DestroyOperation(InstanceOperation):
 
 
         # Delete mem. dump if exists
         # Delete mem. dump if exists
         try:
         try:
-            self.instance._delete_mem_dump(parent_activity=activity)
+            self.instance._delete_mem_dump(parent_activity=activity,
+                                           system=system)
         except:
         except:
             pass
             pass
 
 
@@ -779,12 +780,12 @@ class SleepOperation(InstanceOperation):
         else:
         else:
             activity.resultant_state = 'ERROR'
             activity.resultant_state = 'ERROR'
 
 
-    def _operation(self, activity):
+    def _operation(self, activity, system):
         with activity.sub_activity('shutdown_net',
         with activity.sub_activity('shutdown_net',
                                    readable_name=ugettext_noop(
                                    readable_name=ugettext_noop(
                                        "shutdown network")):
                                        "shutdown network")):
             self.instance.shutdown_net()
             self.instance.shutdown_net()
-        self.instance._suspend_vm(parent_activity=activity)
+        self.instance._suspend_vm(parent_activity=activity, system=system)
         self.instance.yield_node()
         self.instance.yield_node()
 
 
     @register_operation
     @register_operation