Guba Sándor · @gubasandor · Őry Máté · 9958e0cb · Bach Dániel · Guba Sándor
--- a/circle/dashboard/forms.py
+++ b/circle/dashboard/forms.py
            queryset=choices, initial=default, required=True,
            empty_label=None, label=_('Disk')))
  
-    def clean_size(self):
+    def clean(self):
+        cleaned_data = super(VmDiskResizeForm, self).clean()
        size_in_bytes = self.cleaned_data.get("size")
+        disk = self.cleaned_data.get('disk')
        if not size_in_bytes.isdigit() and len(size_in_bytes) > 0:
            raise forms.ValidationError(_("Invalid format, you can use "
                                          " GB or MB!"))
-        return size_in_bytes
+        if float(size_in_bytes) < float(disk.size):
--- a/circle/vm/operations.py
+++ b/circle/vm/operations.py
 register_operation(CreateDiskOperation)
  
  
+class ResizeDiskOperation(InstanceOperation):
+
+    activity_code_suffix = 'resize_disk'
+    id = 'resize_disk'
+    name = _("resize disk")
+    description = _("Resize the virtual disk image. "
+                    "Size must be greater value than the actual size.")
+    required_perms = ('vm.resize_disk', )
--- a/circle/dashboard/templates/dashboard/_disk-list-element.html
+++ b/circle/dashboard/templates/dashboard/_disk-list-element.html
  >
  <i class="fa fa-times"></i>{% if long_remove %} {% trans "Remove" %}{% endif %}
 </a>
+<span class="operation-wrapper">
--- a/circle/vm/models/instance.py
+++ b/circle/vm/models/instance.py
            else:
                raise
  
+    def resize_disk_live(self, disk, size, timeout=15):
+        try:
+            queue_name = self.get_remote_queue_name('vm', 'slow')
+            return vm_tasks.resize_disk.apply_async(
+                args=[self.vm_name, disk.path, size],
+                queue=queue_name).get(timeout=timeout)
+        except:
+            raise
--- a/circle/vm/models/instance.py
+++ b/circle/vm/models/instance.py
            else:
                raise
  
+    def resize_disk_live(self, disk, size, timeout=15):
--- a/circle/vm/operations.py
+++ b/circle/vm/operations.py
 register_operation(CreateDiskOperation)
  
  
+class ResizeDiskOperation(InstanceOperation):
+
+    activity_code_suffix = 'resize_disk'
+    id = 'resize_disk'
+    name = _("resize disk")
+    description = _("Resize the virtual disk image. "
+                    "Size must be greater value than the actual size.")
+    required_perms = ('storage.resize_disk', )
+    accept_states = ('RUNNING', )
+    async_queue = "localhost.man.slow"
+
+    def _operation(self, user, disk, size, activity):
+        if self.instance.is_running:
--- a/circle/dashboard/views/vm.py
+++ b/circle/dashboard/views/vm.py
+class VmDiskResizeView(FormOperationMixin, VmOperationView):
+
+    op = 'resize_disk'
+    form_class = VmDiskResizeForm
+    show_in_toolbar = False
+    icon = 'arrows-alt'
+    effect = "success"
+
+    def get_form_kwargs(self):
+        choices = self.get_op().instance.disks
+        disk_pk = self.request.GET.get('disk')
+        if disk_pk:
+            try:
+                default = choices.get(pk=disk_pk)
+            except (ValueError, Disk.DoesNotExist):
+                raise SuspiciousOperation()
--- a/circle/dashboard/views/vm.py
+++ b/circle/dashboard/views/vm.py
+    op = 'resize_disk'
+    form_class = VmDiskResizeForm
+    show_in_toolbar = False
+    icon = 'arrows-alt'
+    effect = "success"
+
+    def get_form_kwargs(self):
+        choices = self.get_op().instance.disks
+        disk_pk = self.request.GET.get('disk')
+        if disk_pk:
+            try:
+                default = choices.get(pk=disk_pk)
+            except (ValueError, Disk.DoesNotExist):
+                raise SuspiciousOperation()
+        else:
+            raise SuspiciousOperation()
--- a/circle/vm/models/instance.py
+++ b/circle/vm/models/instance.py
                raise
  
    def resize_disk_live(self, disk, size, timeout=15):
-        try:
-            queue_name = self.get_remote_queue_name('vm', 'slow')
-            return vm_tasks.resize_disk.apply_async(