Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Fukász Rómeó Ervin
/
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
359d05b7
authored
Apr 21, 2014
by
Bach Dániel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vm: fix imports (wsgi)
parent
cc6205bd
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
circle/vm/models/instance.py
+2
-3
No files found.
circle/vm/models/instance.py
View file @
359d05b7
...
...
@@ -22,7 +22,6 @@ from taggit.managers import TaggableManager
from
acl.models
import
AclBase
from
common.operations
import
OperatedMixin
from
storage.models
import
Disk
from
..tasks
import
vm_tasks
,
agent_tasks
from
.activity
import
(
ActivityInProgressError
,
instance_activity
,
InstanceActivity
)
...
...
@@ -118,7 +117,7 @@ class InstanceTemplate(AclBase, VirtualMachineDescModel, TimeStampedModel):
parent
=
ForeignKey
(
'self'
,
null
=
True
,
blank
=
True
,
verbose_name
=
_
(
'parent template'
),
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'
,
help_text
=
_
(
'Disks which are to be mounted.'
))
owner
=
ForeignKey
(
User
)
...
...
@@ -210,7 +209,7 @@ class Instance(AclBase, VirtualMachineDescModel, StatusModel, OperatedMixin,
related_name
=
'instance_set'
,
help_text
=
_
(
"Current hypervisor of this instance."
),
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."
),
verbose_name
=
_
(
'disks'
))
vnc_port
=
IntegerField
(
blank
=
True
,
default
=
None
,
null
=
True
,
...
...
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