Guba Sándor · @gubasandor · Őry Máté · 2c82e657 · Őry Máté · Őry Máté
--- a/circle/storage/models.py
+++ b/circle/storage/models.py
            if instance:
                instance.disks.add(disk)
            return disk
+
+    @classmethod
+    def create_from_url_async(cls, url, instance=None, params=None, user=None):
+        """Create disk object and download data from url asynchronusly.
+
+        :param url: image url to download.
+        :type url: url
--- a/circle/storage/models.py
+++ b/circle/storage/models.py
  
    @property
    def path(self):
+        """Get the path where the files are stored."""
        return self.datastore.path + '/' + self.filename
--- a/circle/storage/models.py
+++ b/circle/storage/models.py
+
+        Checks if all children and the disk itself is destroyed.
+        """
+
+        yesterday = timezone.now() - timedelta(days=1)
+        return (self.destroyed is not None
+                and self.destroyed < yesterday) and not self.has_active_child()
+
+    def has_active_child(self):
+        """Returns if disk has children that are not destroyed.
+        """
+
+        return any((not i.is_deletable() for i in self.derivatives.all()))
+
    def is_in_use(self):
+        """Returns True if disc is attached to an active VM else False"""
--- a/circle/storage/models.py
+++ b/circle/storage/models.py
        }
  
    def get_remote_queue_name(self, queue_id):
+        """Returns the proper queue name based on the datastore."""
--- a/circle/storage/models.py
+++ b/circle/storage/models.py
+        """Create empty Disk object asynchronusly.
+
+        :param instance: instnace object to connect disk
+        :type instane: vm.models.Instance
+        :param params: disk custom parameters
+        :type params: dict
+        :param user: owner of the disk
+        :type user: django.contrib.auth.User
+        """
+        return local_tasks.create_empty.apply_async(
+            args=[instance, params, user], queue="localhost.man")
+
+    @classmethod
+    def create_empty(cls, instance=None, params=None,
+                     user=None, task_uuid=None):
+        """Create empty Disk object.
--- a/circle/storage/models.py
+++ b/circle/storage/models.py
+    @classmethod
+    def create_from_url(cls, url, instance=None, params=None, user=None,
+                        task_uuid=None, abortable_task=None):
+        """Create disk object and download data from url synchronusly.
+
+        :param url: image url to download.
+        :type url: url
+        :param instance: instnace object to connect disk
+        :type instane: vm.models.Instance
+        :param params: disk custom parameters
+        :type params: dict
+        :param user: owner of the disk
+        :type user: django.contrib.auth.User
+
+        :return: Task
+        :rtype: AsyncResult
--- a/circle/storage/tests/test_models.py
+++ b/circle/storage/tests/test_models.py
+    def setUp(self):
+        self.ds = DataStore.objects.create(path="/datastore",
+                                           hostname="devenv", name="default")
+
+    def _disk(self, destroyed=None, base=None):
+        self.n += 1
+        n = "d%d" % self.n
+        return Disk.objects.create(name=n, filename=n, base=base, size=1,
+                                   destroyed=destroyed, datastore=self.ds)
+
+    def test_deletable_not_destroyed(self):
+        d = self._disk()
+        assert not d.is_deletable()
+
+    def test_deletable_newly_destroyed(self):
+        d = self._disk()