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
b49b026a
authored
May 08, 2014
by
cloud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
something
parent
64037295
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
5 deletions
+4
-5
circle/vm/models/instance.py
+4
-5
No files found.
circle/vm/models/instance.py
View file @
b49b026a
...
@@ -792,7 +792,7 @@ class Instance(AclBase, VirtualMachineDescModel, StatusModel, OperatedMixin,
...
@@ -792,7 +792,7 @@ class Instance(AclBase, VirtualMachineDescModel, StatusModel, OperatedMixin,
queue
=
queue_name
queue
=
queue_name
)
.
get
(
timeout
=
timeout
)
)
.
get
(
timeout
=
timeout
)
def
__deploy_local_vm
(
self
,
act
,
timeout
=
15
):
def
__deploy
ii
_local_vm
(
self
,
act
,
timeout
=
15
):
"""Local deploy the virtual machine.
"""Local deploy the virtual machine.
:param self: The virtual machine.
:param self: The virtual machine.
...
@@ -803,11 +803,10 @@ class Instance(AclBase, VirtualMachineDescModel, StatusModel, OperatedMixin,
...
@@ -803,11 +803,10 @@ class Instance(AclBase, VirtualMachineDescModel, StatusModel, OperatedMixin,
# create hardlink
# create hardlink
hlinkname
=
''
.
join
(
random
.
choice
(
string
.
ascii_uppercase
+
hlinkname
=
''
.
join
(
random
.
choice
(
string
.
ascii_uppercase
+
string
.
digits
)
for
_
in
range
(
20
))
string
.
digits
)
for
_
in
range
(
20
))
return
pass
remotedest
=
'/home/gergo/vmdisks/'
+
hlinkname
remotedest
=
'/home/gergo/vmdisks/'
+
hlinkname
localsrc
=
descriptor
[
'disk_list'
][
0
][
'source'
]
localsrc
=
descriptor
[
'disk_list'
][
0
][
'source'
]
descriptor
[
'disk_list'
][
0
][
'source'
]
=
remotedest
descriptor
[
'disk_list'
][
0
][
'source'
]
=
remotedest
return
descriptor
return
""
def
deploy_local
(
self
,
user
=
None
,
task_uuid
=
None
):
def
deploy_local
(
self
,
user
=
None
,
task_uuid
=
None
):
"""Deploy new virtual machine with network
"""Deploy new virtual machine with network
...
@@ -832,8 +831,8 @@ ecuted
...
@@ -832,8 +831,8 @@ ecuted
with
instance_activity
(
code_suffix
=
'local_deploy'
,
instance
=
self
,
with
instance_activity
(
code_suffix
=
'local_deploy'
,
instance
=
self
,
on_commit
=
__on_commit
,
task_uuid
=
task_uuid
,
on_commit
=
__on_commit
,
task_uuid
=
task_uuid
,
user
=
user
)
as
act
:
user
=
user
)
as
act
:
return
""
return
self
.
__deploy_local_vm
(
act
)
#
return self.__deploy_local_vm(act)
def
migrate_vm
(
self
,
to_node
,
timeout
=
120
):
def
migrate_vm
(
self
,
to_node
,
timeout
=
120
):
queue_name
=
self
.
get_remote_queue_name
(
'vm'
)
queue_name
=
self
.
get_remote_queue_name
(
'vm'
)
...
...
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