Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gelencsér Szabolcs
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
8c495823
authored
Apr 01, 2014
by
Dudás Ádám
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vm: move operations module
parent
0b3c50f3
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
8 deletions
+7
-8
circle/dashboard/tests/test_views.py
+1
-1
circle/vm/__init__.py
+1
-0
circle/vm/models/__init__.py
+1
-2
circle/vm/operations.py
+3
-4
circle/vm/tests/test_models.py
+1
-1
No files found.
circle/dashboard/tests/test_views.py
View file @
8c495823
...
@@ -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
...
...
circle/vm/__init__.py
View file @
8c495823
from
.
import
operations
# noqa
circle/vm/models/__init__.py
View file @
8c495823
...
@@ -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'
,
]
]
circle/vm/
models/operation
.py
→
circle/vm/
operations
.py
View file @
8c495823
...
@@ -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__
)
...
...
circle/vm/tests/test_models.py
View file @
8c495823
...
@@ -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
)
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment