vm: fix imports (wsgi)

circle/vm/models/instance.py

@@ -22,7 +22,6 @@ from taggit.managers import TaggableManager
 
 
 from acl.models import AclBase
 from acl.models import AclBase
 from common.operations import OperatedMixin
 from common.operations import OperatedMixin
-from storage.models import Disk
 from ..tasks import vm_tasks, agent_tasks
 from ..tasks import vm_tasks, agent_tasks
 from .activity import (ActivityInProgressError, instance_activity,
 from .activity import (ActivityInProgressError, instance_activity,
                        InstanceActivity)
                        InstanceActivity)
@@ -118,7 +117,7 @@ class InstanceTemplate(AclBase, VirtualMachineDescModel, TimeStampedModel):
     parent = ForeignKey('self', null=True, blank=True,
     parent = ForeignKey('self', null=True, blank=True,
                         verbose_name=_('parent template'),
                         verbose_name=_('parent template'),
                         help_text=_('Template which this one is derived of.'))
                         help_text=_('Template which this one is derived of.'))
-    disks = ManyToManyField(Disk, verbose_name=_('disks'),
+    disks = ManyToManyField('storage.Disk', verbose_name=_('disks'),
                             related_name='template_set',
                             related_name='template_set',
                             help_text=_('Disks which are to be mounted.'))
                             help_text=_('Disks which are to be mounted.'))
     owner = ForeignKey(User)
     owner = ForeignKey(User)
@@ -210,7 +209,7 @@ class Instance(AclBase, VirtualMachineDescModel, StatusModel, OperatedMixin,
                       related_name='instance_set',
                       related_name='instance_set',
                       help_text=_("Current hypervisor of this instance."),
                       help_text=_("Current hypervisor of this instance."),
                       verbose_name=_('host node'))
                       verbose_name=_('host node'))
-    disks = ManyToManyField(Disk, related_name='instance_set',
+    disks = ManyToManyField('storage.Disk', related_name='instance_set',
                             help_text=_("Set of mounted disks."),
                             help_text=_("Set of mounted disks."),
                             verbose_name=_('disks'))
                             verbose_name=_('disks'))
     vnc_port = IntegerField(blank=True, default=None, null=True,
     vnc_port = IntegerField(blank=True, default=None, null=True,