Merge branch 'feature-save_as-status' into 'master'

Feature Save As Status

circle/storage/models.py

@@ -474,7 +474,8 @@ class Disk(TimeStampedModel):
         queue_name = self.get_remote_queue_name("storage", priority="slow")
         queue_name = self.get_remote_queue_name("storage", priority="slow")
         remote = storage_tasks.merge.apply_async(kwargs={
         remote = storage_tasks.merge.apply_async(kwargs={
             "old_json": self.get_disk_desc(),
             "old_json": self.get_disk_desc(),
-            "new_json": disk.get_disk_desc()},
+            "new_json": disk.get_disk_desc(),
+            "parent_id": task.request.id},
             queue=queue_name
             queue=queue_name
         )  # Timeout
         )  # Timeout
         while True:
         while True:

circle/vm/operations.py

@@ -507,6 +507,7 @@ class SaveAsTemplateOperation(InstanceOperation):
                     "with users and groups.  Anyone who has access to a "
                     "with users and groups.  Anyone who has access to a "
                     "template (and to the networks it uses) will be able to "
                     "template (and to the networks it uses) will be able to "
                     "start an instance of it.")
                     "start an instance of it.")
+    has_percentage = True
     abortable = True
     abortable = True
     required_perms = ('vm.create_template', )
     required_perms = ('vm.create_template', )
     accept_states = ('RUNNING', 'STOPPED')
     accept_states = ('RUNNING', 'STOPPED')