vm: operation for removing a disk from the VM

circle/dashboard/views.py

@@ -2160,7 +2160,7 @@ class DiskRemoveView(DeleteView):
         disk = self.get_object()
         disk = self.get_object()
         app = disk.get_appliance()
         app = disk.get_appliance()
 
 
-        app.disks.remove(disk)
+        app.remove_disk(disk=disk, user=request.user)
         disk.destroy()
         disk.destroy()
 
 
         next_url = request.POST.get("next")
         next_url = request.POST.get("next")

circle/vm/operations.py

@@ -197,6 +197,26 @@ class RebootOperation(InstanceOperation):
 register_instance_operation(RebootOperation)
 register_instance_operation(RebootOperation)
 
 
 
 
+class RemoveDiskOperation(InstanceOperation):
+    activity_code_suffix = 'remove_disk'
+    id = 'remove_disk'
+    name = _("remove disk")
+    description = _("Remove the specified disk from the VM.")
+
+    def check_precond(self):
+        super(RemoveDiskOperation, self).check_precond()
+        # TODO remove check when hot-detach is implemented
+        if self.instance.status not in ['STOPPED']:
+            raise self.instance.WrongStateError(self.instance)
+
+    def _operation(self, activity, user, system, disk):
+        # TODO implement with hot-detach when it'll be available
+        return self.instance.disks.remove(disk)
+
+
+register_instance_operation(RemoveDiskOperation)
+
+
 class ResetOperation(InstanceOperation):
 class ResetOperation(InstanceOperation):
     activity_code_suffix = 'reset'
     activity_code_suffix = 'reset'
     id = 'reset'
     id = 'reset'

[Kálmán Viktor]

get_appliance() can return an InstanceTemplate too which doesn't have that operation

[Dudás Ádám]

fixed in 07190c6d