Possible to choose format when exporting disk

circle/dashboard/forms.py

@@ -831,6 +831,10 @@ class VmCreateDiskForm(OperationForm):
 
 
 
 
 class VmDiskExportForm(OperationForm):
 class VmDiskExportForm(OperationForm):
+    format = forms.ChoiceField(
+        choices=Disk.EXPORT_FORMATS,
+        label=_('Format'))
+
     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):
         choices = kwargs.pop('choices')
         choices = kwargs.pop('choices')
         self.disk = kwargs.pop('default')
         self.disk = kwargs.pop('default')
@@ -853,7 +857,7 @@ class VmDiskExportForm(OperationForm):
                     HTML(_("<label>Disk:</label> %s") % escape(self.disk)),
                     HTML(_("<label>Disk:</label> %s") % escape(self.disk)),
                     css_class="form-group",
                     css_class="form-group",
                 ),
                 ),
-                Field("disk"),
+                Field('disk'), Field('format')
             )
             )
         return helper
         return helper
 
 

circle/storage/models.py

@@ -125,6 +125,10 @@ class Disk(TimeStampedModel):
     TYPES = [('qcow2-norm', 'qcow2 normal'), ('qcow2-snap', 'qcow2 snapshot'),
     TYPES = [('qcow2-norm', 'qcow2 normal'), ('qcow2-snap', 'qcow2 snapshot'),
              ('iso', 'iso'), ('raw-ro', 'raw read-only'), ('raw-rw', 'raw')]
              ('iso', 'iso'), ('raw-ro', 'raw read-only'), ('raw-rw', 'raw')]
     BUS_TYPES = (('virtio', 'virtio'), ('ide', 'ide'), ('scsi', 'scsi'))
     BUS_TYPES = (('virtio', 'virtio'), ('ide', 'ide'), ('scsi', 'scsi'))
+    EXPORT_FORMATS = (('vmdk', _('VMware disk image')),
+                      ('qcow2', _('QEMU disk image')),
+                      ('vdi', _('VirtualBox disk image')),
+                      ('vpc', _('HyperV disk image')))
     name = CharField(blank=True, max_length=100, verbose_name=_("name"))
     name = CharField(blank=True, max_length=100, verbose_name=_("name"))
     filename = CharField(max_length=256, unique=True,
     filename = CharField(max_length=256, unique=True,
                          verbose_name=_("filename"))
                          verbose_name=_("filename"))