dashboard: data store selector for download disk operation

circle/dashboard/forms.py

@@ -910,6 +910,18 @@ class VmDownloadDiskForm(OperationForm):
     name = forms.CharField(max_length=100, label=_("Name"), required=False)
     url = forms.CharField(label=_('URL'), validators=[URLValidator(), ])
 
+    def __init__(self, *args, **kwargs):
+        datastore_choices = kwargs.pop('datastore_choices')
+        super(VmDownloadDiskForm, self).__init__(*args, **kwargs)
+
+        datastore_field = forms.ModelChoiceField(
+            queryset=datastore_choices, required=False, initial=None,
+            label=_('Data store'))
+        if not datastore_choices:
+            datastore_field.widget.attrs['disabled'] = 'disabled'
+            datastore_field.empty_label = _('No more data stores.')
+        self.fields['datastore'] = datastore_field
+
     def clean(self):
         cleaned_data = super(VmDownloadDiskForm, self).clean()
         if not cleaned_data['name']:

circle/dashboard/views/vm.py

@@ -430,6 +430,11 @@ class VmDownloadDiskView(FormOperationMixin, VmOperationView):
     is_disk_operation = True
     with_reload = True
 
+    def get_form_kwargs(self):
+        val = super(VmDownloadDiskView, self).get_form_kwargs()
+        val['datastore_choices'] = DataStore.get_all()
+        return val
+
 
 class VmMigrateView(FormOperationMixin, VmOperationView):
 

circle/storage/models.py

@@ -542,7 +542,7 @@ class Disk(TimeStampedModel):
         return disk
 
     @classmethod
-    def download(cls, url, task, user=None, **params):
+    def download(cls, url, datastore, task, user=None, **params):
         """Create disk object and download data from url synchronusly.
 
         :param url: image url to download.
@@ -560,6 +560,7 @@ class Disk(TimeStampedModel):
         params.setdefault('name', url.split('/')[-1])
         params.setdefault('type', 'iso')
         params.setdefault('size', None)
+        params.setdefault('datastore', datastore)
         disk = cls.__create(params=params, user=user)
         queue_name = disk.get_remote_queue_name('storage', priority='slow')
         remote = storage_tasks.download.apply_async(

circle/vm/operations.py

@@ -333,10 +333,16 @@ class DownloadDiskOperation(InstanceOperation):
     accept_states = ('STOPPED', 'PENDING', 'RUNNING')
     async_queue = "localhost.man.slow"
 
-    def _operation(self, user, url, task, activity, name=None):
-        from storage.models import Disk
+    def _operation(self, user, url, datastore, task, activity, name=None):
+        from storage.models import Disk, DataStore
+
+        if not datastore:
+            datastore = self.instance.get_most_used_datastore()
+            if not datastore:
+                datastore = DataStore.get_default_datastore()
 
-        disk = Disk.download(url=url, name=name, task=task)
+        disk = Disk.download(url=url, name=name, task=task,
+                             datastore=datastore)
         devnums = list(ascii_lowercase)
         for d in self.instance.disks.all():
             devnums.remove(d.dev_num)