refactor Disk and StorageDriver to different modules

disk.py

+import json
+import os
+import subprocess
+import re
+
+re_qemu_img = re.compile(r'(file format: (?P<format>(qcow2|raw))|'
+                         r'virtual size: \w+ \((?P<size>[0-9]+) bytes\)|'
+                         r'backing file: \S+ \(actual path: (?P<base>\S+)\))$')
+
+
+class Disk(object):
+
+    def __init__(self, dir, name, format, size, base_name, type):
+        # TODO: tests
+        self.name = name
+        self.dir = os.path.realpath(dir)
+        if format not in ['qcow2', 'raw']:
+            raise Exception('Invalid format: %s' % format)
+        self.format = format
+        self.size = int(size)
+        self.base_name = base_name
+        if type not in ['normal', 'snapshot']:
+            raise Exception('Invalid type: %s' % type)
+        self.type = type
+
+    def get_path(self):
+        return os.path.realpath(self.dir + '/' + self.name)
+
+    def get_base(self):
+        return os.path.realpath(self.dir + '/' + self.base_name)
+
+    def __unicode__(self):
+        return u'%s %s %s %s' % (self.get_path(), self.format,
+                                 self.size, self.get_base())
+
+    @classmethod
+    def import_from_json(cls, json_data):
+        obj = json.loads(json_data)
+        return Disk(obj['dir'], obj['name'], obj['format'], obj['size'],
+                    obj['base_name'], obj['type'])
+
+    @classmethod
+    def get(cls, dir, name):
+        path = os.path.realpath(dir + '/' + name)
+        output = subprocess.check_output(['qemu-img', 'info', path])
+
+        type = 'normal'
+        base = None
+        for line in output.split('\n'):
+            m = re_qemu_img.search(line)
+            if m:
+                res = m.groupdict()
+                if res.get('format', None) is not None:
+                    format = res['format']
+                if res.get('size', None) is not None:
+                    size = res['size']
+                if res.get('base', None) is not None:
+                    base = os.path.basename(res['base'])
+                    type = 'snapshot'
+
+        return Disk(dir, name, format, size, base, type)
+
+    def create(self):
+        if os.path.isfile(self.get_path()):
+            raise Exception('File already exists: %s' % self.get_path())
+        cmdline = ['qemu-img',
+                   'create',
+                   '-f', self.format]
+        if self.type == 'snapshot':
+            cmdline.append('-b')
+            cmdline.append(self.get_base())
+        cmdline.append(self.get_path())
+        if self.type != 'snapshot':
+            cmdline.append(str(self.size))
+        print ' '.join(cmdline)
+        subprocess.check_output(cmdline)
+
+    def delete(self):
+        if os.path.isfile(self.get_path()):
+            os.unlink(self.get_path())
+
+    @classmethod
+    def list(cls, dir):
+        return [cls.get(dir, file) for file in os.listdir(dir)]

storagedriver.py

-#!/usr/bin/env python
-
-# import logging
-import json
-import os
-import re
-import subprocess
 import jsonpickle
-from celery.contrib.methods import task_method
+
 from celery import Celery
 
-re_qemu_img = re.compile(r'(file format: (?P<format>(qcow2|raw))|'
-                         r'virtual size: \w+ \((?P<size>[0-9]+) bytes\)|'
-                         r'backing file: \S+ \(actual path: (?P<base>\S+)\))$')
+from disk import Disk
 
 BROKER_URL = 'amqp://nyuszi:teszt@localhost:5672/django'
 celery = Celery('tasks', broker=BROKER_URL, backend='amqp')
 celery.config_from_object('celeryconfig')
 
 
-class Disk():
-
-    def __init__(self, dir, name, format, size, base_name, type):
-        # TODO: tests
-        self.name = name
-        self.dir = os.path.realpath(dir)
-        if format not in ['qcow2', 'raw']:
-            raise Exception('Invalid format: %s' % format)
-        self.format = format
-        self.size = int(size)
-        self.base_name = base_name
-        if type not in ['normal', 'snapshot']:
-            raise Exception('Invalid type: %s' % type)
-        self.type = type
-
-    def get_path(self):
-        return os.path.realpath(self.dir + '/' + self.name)
-
-    def get_base(self):
-        return os.path.realpath(self.dir + '/' + self.base_name)
-
-    def __unicode__(self):
-        return u'%s %s %s %s' % (self.get_path(), self.format,
-                                 self.size, self.get_base())
-
-    @classmethod
-    def import_from_json(cls, json_data):
-        obj = json.loads(json_data)
-        return Disk(obj['dir'], obj['name'], obj['format'], obj['size'],
-                    obj['base_name'], obj['type'])
-
-    @classmethod
-    def get(cls, dir, name):
-        path = os.path.realpath(dir + '/' + name)
-        output = subprocess.check_output(['qemu-img', 'info', path])
-
-        type = 'normal'
-        base = None
-        for line in output.split('\n'):
-            m = re_qemu_img.search(line)
-            if m:
-                res = m.groupdict()
-                if res.get('format', None) is not None:
-                    format = res['format']
-                if res.get('size', None) is not None:
-                    size = res['size']
-                if res.get('base', None) is not None:
-                    base = os.path.basename(res['base'])
-                    type = 'snapshot'
-
-        return Disk(dir, name, format, size, base, type)
-
-    def create(self):
-        if os.path.isfile(self.get_path()):
-            raise Exception('File already exists: %s' % self.get_path())
-        cmdline = ['qemu-img',
-                   'create',
-                   '-f', self.format]
-        if self.type == 'snapshot':
-            cmdline.append('-b')
-            cmdline.append(self.get_base())
-        cmdline.append(self.get_path())
-        if self.type != 'snapshot':
-            cmdline.append(str(self.size))
-        print ' '.join(cmdline)
-        subprocess.check_output(cmdline)
-
-    def delete(self):
-        if os.path.isfile(self.get_path()):
-            os.unlink(self.get_path())
+@celery.task()
+def list_disks():
+    return jsonpickle.encode(Disk.list('/home/cloud/images'),
+                             unpicklable=False)
 
-    @classmethod
-    def list(cls, dir):
-        return [cls.get(dir, file) for file in os.listdir(dir)]
 
+@celery.task()
+def create_disk(json_data):
+    disk = Disk.import_from_json(json_data)
+    disk.create()
 
-class StorageDriver:
-    @celery.task(filter=task_method)
-    def list_disks():
-        return jsonpickle.encode(Disk.list('/home/cloud/images'),
-                                 unpicklable=False)
 
-    @celery.task(filter=task_method)
-    def create_disk(json_data):
-        disk = Disk.import_from_json(json_data)
-        disk.create()
+@celery.task()
+def delete_disk(json_data):
+    disk = Disk.import_from_json(json_data)
+    disk.delete()
 
-    @celery.task(filter=task_method)
-    def delete_disk(json_data):
-        disk = Disk.import_from_json(json_data)
-        disk.delete()
 
-    @celery.task(filter=task_method)
-    def get_disk(json_data):
-        disk = Disk.import_from_json(json_data)
-        return jsonpickle.encode(disk, unpicklable=False)
+@celery.task()
+def get_disk(json_data):
+    disk = Disk.import_from_json(json_data)
+    return jsonpickle.encode(disk, unpicklable=False)