disk download datastore

circle/dashboard/templates/dashboard/_disk-list-element.html

@@ -5,8 +5,7 @@
 {% if d.ci_disk %} <i class="fa fa-cloud-upload"></i>
 {% if d.ci_disk %} <i class="fa fa-cloud-upload"></i>
 {% endif %}
 {% endif %}
 
 
-{{ d.name }} (#{{ d.id }}) - {{ d.size|filesize }}
-
+{{ d.name }} (<i class="fa fa-database"></i> {{ d.datastore.name }}   #{{ d.id }}) - {{ d.size|filesize }}
 
 
 <span class="operation-wrapper pull-right">
 <span class="operation-wrapper pull-right">
   {% if d.is_exportable %}
   {% if d.is_exportable %}

circle/storage/models.py

@@ -470,7 +470,7 @@ class Disk(TimeStampedModel):
         return disk
         return disk
 
 
     @classmethod
     @classmethod
-    def download(cls, url, task, user=None, resize = None, **params):
+    def download(cls, url, task, user=None, resize = None, datastore = None, **params):
         """Create disk object and download data from url synchronusly.
         """Create disk object and download data from url synchronusly.
 
 
         :param url: image url to download.
         :param url: image url to download.
@@ -488,7 +488,9 @@ class Disk(TimeStampedModel):
         params.setdefault('name', url.split('/')[-1])
         params.setdefault('name', url.split('/')[-1])
         params.setdefault('type', 'iso')
         params.setdefault('type', 'iso')
         params.setdefault('size', None)
         params.setdefault('size', None)
-        disk = cls.__create(params=params, user=user)
+        if not datastore:
+            datastore = DataStore.objects.filter(name='default').get().name
+        disk = cls.__create(params=params, user=user, datastore=datastore)
         queue_name = disk.get_remote_queue_name('storage', priority='slow')
         queue_name = disk.get_remote_queue_name('storage', priority='slow')
         remote = storage_tasks.download.apply_async(
         remote = storage_tasks.download.apply_async(
             kwargs={'url': url, 'parent_id': task.request.id,
             kwargs={'url': url, 'parent_id': task.request.id,

circle/vm/operations.py

@@ -366,7 +366,7 @@ class DownloadDiskOperation(InstanceOperation):
     concurrency_check = False # warning!!!
     concurrency_check = False # warning!!!
 
 
     def _operation(self, user, url, task, activity, datastore, name=None):
     def _operation(self, user, url, task, activity, datastore, name=None):
-        disk = Disk.download(url=url, name=name, task=task)
+        disk = Disk.download(url=url, name=name, task=task, datastore=datastore.name)
         devnums = list(ascii_lowercase)
         devnums = list(ascii_lowercase)
         for d in self.instance.disks.all():
         for d in self.instance.disks.all():
             devnums.remove(d.dev_num)
             devnums.remove(d.dev_num)