Commit 8c495823 by Dudás Ádám

vm: move operations module

parent 0b3c50f3
...@@ -6,7 +6,7 @@ from django.core.urlresolvers import reverse ...@@ -6,7 +6,7 @@ from django.core.urlresolvers import reverse
from django.contrib.auth.models import Permission from django.contrib.auth.models import Permission
from vm.models import Instance, InstanceTemplate, Lease, Node from vm.models import Instance, InstanceTemplate, Lease, Node
from vm.models.operation import WakeUpOperation from vm.operations import WakeUpOperation
from ..models import Profile from ..models import Profile
from ..views import VmRenewView from ..views import VmRenewView
from storage.models import Disk from storage.models import Disk
......
from . import operations # noqa
...@@ -16,12 +16,11 @@ from .instance import pre_state_changed ...@@ -16,12 +16,11 @@ from .instance import pre_state_changed
from .network import InterfaceTemplate from .network import InterfaceTemplate
from .network import Interface from .network import Interface
from .node import Node from .node import Node
from .operation import Operation
__all__ = [ __all__ = [
'InstanceActivity', 'InstanceActiveManager', 'BaseResourceConfigModel', 'InstanceActivity', 'InstanceActiveManager', 'BaseResourceConfigModel',
'NamedBaseResourceConfig', 'VirtualMachineDescModel', 'InstanceTemplate', 'NamedBaseResourceConfig', 'VirtualMachineDescModel', 'InstanceTemplate',
'Instance', 'instance_activity', 'post_state_changed', 'pre_state_changed', 'Instance', 'instance_activity', 'post_state_changed', 'pre_state_changed',
'InterfaceTemplate', 'Interface', 'Trait', 'Node', 'NodeActivity', 'Lease', 'InterfaceTemplate', 'Interface', 'Trait', 'Node', 'NodeActivity', 'Lease',
'node_activity', 'Operation', 'node_activity',
] ]
...@@ -10,10 +10,9 @@ from celery.exceptions import TimeLimitExceeded ...@@ -10,10 +10,9 @@ from celery.exceptions import TimeLimitExceeded
from common.models import activity_context from common.models import activity_context
from storage.models import Disk from storage.models import Disk
from ..tasks import vm_tasks from .tasks import vm_tasks
from ..tasks.local_tasks import async_operation from .tasks.local_tasks import async_operation
from .activity import InstanceActivity from .models import Instance, InstanceActivity, InstanceTemplate
from .instance import Instance, InstanceTemplate
logger = getLogger(__name__) logger = getLogger(__name__)
......
...@@ -9,7 +9,7 @@ from ..models import ( ...@@ -9,7 +9,7 @@ from ..models import (
Lease, Node, Interface, Instance, InstanceTemplate, InstanceActivity, Lease, Node, Interface, Instance, InstanceTemplate, InstanceActivity,
) )
from ..models.instance import find_unused_port, ActivityInProgressError from ..models.instance import find_unused_port, ActivityInProgressError
from ..models.operation import ( from ..operations import (
DeployOperation, DestroyOperation, MigrateOperation DeployOperation, DestroyOperation, MigrateOperation
) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment