adding merge to tasks

1f0f1ade · Guba Sándor · e1497ebf · 1f0f1ade
Commit 1f0f1ade authored Sep 26, 2013 by Guba Sándor
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

storagedriver.py
+7 -0

No files found.
--- a/storagedriver.py
+++ b/storagedriver.py
@@ -26,6 +26,13 @@ def snapshot(json_data):


 @celery.task()
+def merge(old_json, new_json):
+    disk = Disk.import_from_json(old_json)
+    new_disk = Disk.import_from_json(new_json)
+    disk.merge(new_disk)
+
+
+@celery.task()
 def get_disk(json_data):
    disk = Disk.get(dir=json_data['dir'], name=json_data['name'])
    return disk.get_desc()