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
f49834d1
authored
Jul 04, 2014
by
Őry Máté
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: highlight preferred operations
based on instance status
parent
f816770a
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
37 additions
and
3 deletions
+37
-3
circle/dashboard/templates/dashboard/vm-detail/_operations.html
+13
-3
circle/dashboard/views.py
+3
-0
circle/vm/operations.py
+21
-0
No files found.
circle/dashboard/templates/dashboard/vm-detail/_operations.html
View file @
f49834d1
...
@@ -2,10 +2,20 @@
...
@@ -2,10 +2,20 @@
{% for op in ops %}
{% for op in ops %}
{% if op.show_in_toolbar %}
{% if op.show_in_toolbar %}
<a
href=
"{{op.get_url}}"
class=
"operation operation-{{op.op}} btn btn-default btn-xs"
title=
"{{op.name}}: {{op.description}}"
>
{% if op.disabled %}
<span
class=
"operation operation-{{op.op}} btn btn-{{op.effect}} disabled btn-xs"
>
{% else %}
<a
href=
"{{op.get_url}}"
class=
"operation operation-{{op.op}} btn
btn-{{op.effect}} btn-xs"
title=
"{{op.name}}: {{op.description}}"
>
{% endif %}
<i
class=
"icon-{{op.icon}}"
></i>
<i
class=
"icon-{{op.icon}}"
></i>
<span
class=
"sr-only"
>
{{op.name}}
</span>
<span
{%
if
not
op
.
is_preferred
%}
class=
"sr-only"
{%
endif
%}
>
{{op.name}}
</span>
{% if op.disabled %}
</span>
{% else %}
</a>
</a>
{% endif %}
{% endif %}
{% endif %}
{% endfor %}
{% endfor %}
circle/dashboard/views.py
View file @
f49834d1
...
@@ -534,6 +534,9 @@ class OperationView(DetailView):
...
@@ -534,6 +534,9 @@ class OperationView(DetailView):
def
description
(
self
):
def
description
(
self
):
return
self
.
get_op
()
.
description
return
self
.
get_op
()
.
description
def
is_preferred
(
self
):
return
self
.
get_op
()
.
is_preferred
()
@classmethod
@classmethod
def
get_urlname
(
cls
):
def
get_urlname
(
cls
):
return
'dashboard.vm.op.
%
s'
%
cls
.
op
return
'dashboard.vm.op.
%
s'
%
cls
.
op
...
...
circle/vm/operations.py
View file @
f49834d1
...
@@ -75,6 +75,11 @@ class InstanceOperation(Operation):
...
@@ -75,6 +75,11 @@ class InstanceOperation(Operation):
code_suffix
=
self
.
activity_code_suffix
,
instance
=
self
.
instance
,
code_suffix
=
self
.
activity_code_suffix
,
instance
=
self
.
instance
,
user
=
user
)
user
=
user
)
def
is_preferred
(
self
):
"""If this is the recommended op in the current state of the instance.
"""
return
False
class
AddInterfaceOperation
(
InstanceOperation
):
class
AddInterfaceOperation
(
InstanceOperation
):
activity_code_suffix
=
'add_interface'
activity_code_suffix
=
'add_interface'
...
@@ -154,6 +159,10 @@ class DeployOperation(InstanceOperation):
...
@@ -154,6 +159,10 @@ class DeployOperation(InstanceOperation):
name
=
_
(
"deploy"
)
name
=
_
(
"deploy"
)
description
=
_
(
"Deploy new virtual machine with network."
)
description
=
_
(
"Deploy new virtual machine with network."
)
def
is_preferred
(
self
):
return
self
.
instance
.
status
in
(
self
.
instance
.
STATUS
.
STOPPED
,
self
.
instance
.
STATUS
.
ERROR
)
def
on_commit
(
self
,
activity
):
def
on_commit
(
self
,
activity
):
activity
.
resultant_state
=
'RUNNING'
activity
.
resultant_state
=
'RUNNING'
...
@@ -337,6 +346,10 @@ class SaveAsTemplateOperation(InstanceOperation):
...
@@ -337,6 +346,10 @@ class SaveAsTemplateOperation(InstanceOperation):
"""
)
"""
)
abortable
=
True
abortable
=
True
def
is_preferred
(
self
):
return
(
self
.
instance
.
is_base
and
self
.
instance
.
status
==
self
.
instance
.
STATUS
.
RUNNING
)
@staticmethod
@staticmethod
def
_rename
(
name
):
def
_rename
(
name
):
m
=
search
(
r" v(\d+)$"
,
name
)
m
=
search
(
r" v(\d+)$"
,
name
)
...
@@ -472,6 +485,10 @@ class SleepOperation(InstanceOperation):
...
@@ -472,6 +485,10 @@ class SleepOperation(InstanceOperation):
name
=
_
(
"sleep"
)
name
=
_
(
"sleep"
)
description
=
_
(
"Suspend virtual machine with memory dump."
)
description
=
_
(
"Suspend virtual machine with memory dump."
)
def
is_preferred
(
self
):
return
(
not
self
.
instance
.
is_base
and
self
.
instance
.
status
==
self
.
instance
.
STATUS
.
RUNNING
)
def
check_precond
(
self
):
def
check_precond
(
self
):
super
(
SleepOperation
,
self
)
.
check_precond
()
super
(
SleepOperation
,
self
)
.
check_precond
()
if
self
.
instance
.
status
not
in
[
'RUNNING'
]:
if
self
.
instance
.
status
not
in
[
'RUNNING'
]:
...
@@ -511,6 +528,10 @@ class WakeUpOperation(InstanceOperation):
...
@@ -511,6 +528,10 @@ class WakeUpOperation(InstanceOperation):
Power on Virtual Machine and load its memory from dump.
Power on Virtual Machine and load its memory from dump.
"""
)
"""
)
def
is_preferred
(
self
):
return
(
self
.
instance
.
is_base
and
self
.
instance
.
status
==
self
.
instance
.
STATUS
.
SUSPENDED
)
def
check_precond
(
self
):
def
check_precond
(
self
):
super
(
WakeUpOperation
,
self
)
.
check_precond
()
super
(
WakeUpOperation
,
self
)
.
check_precond
()
if
self
.
instance
.
status
not
in
[
'SUSPENDED'
]:
if
self
.
instance
.
status
not
in
[
'SUSPENDED'
]:
...
...
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