Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
CIRCLE
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
94
Merge Requests
10
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
9db57446
authored
Mar 02, 2014
by
Őry Máté
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vm: make scheduler's result public
parent
f6687581
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
4 deletions
+7
-4
circle/vm/models/instance.py
+7
-4
No files found.
circle/vm/models/instance.py
View file @
9db57446
...
@@ -583,10 +583,13 @@ class Instance(AclBase, VirtualMachineDescModel, TimeStampedModel):
...
@@ -583,10 +583,13 @@ class Instance(AclBase, VirtualMachineDescModel, TimeStampedModel):
self
.
pw
))
self
.
pw
))
self
.
save
()
self
.
save
()
def
__schedule_vm
(
self
,
act
):
def
select_node
(
self
):
"""Schedule the virtual machine.
"""Returns the node the VM should be deployed or migrated to.
"""
return
scheduler
.
select_node
(
self
,
Node
.
objects
.
all
())
:param self: The virtual machine.
def
__schedule_vm
(
self
,
act
):
"""Schedule the virtual machine as part of a higher level activity.
:param act: Parent activity.
:param act: Parent activity.
"""
"""
...
@@ -596,7 +599,7 @@ class Instance(AclBase, VirtualMachineDescModel, TimeStampedModel):
...
@@ -596,7 +599,7 @@ class Instance(AclBase, VirtualMachineDescModel, TimeStampedModel):
# Schedule
# Schedule
if
self
.
node
is
None
:
if
self
.
node
is
None
:
self
.
node
=
s
cheduler
.
select_node
(
self
,
Node
.
objects
.
all
()
)
self
.
node
=
s
elf
.
select_node
(
)
self
.
save
()
self
.
save
()
...
...
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