projects
/
invirt/packages/invirt-web.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
HVM/ParaVM
[invirt/packages/invirt-web.git]
/
templates
/
main.py
diff --git
a/templates/main.py
b/templates/main.py
index
9493de4
..
cb8229c
100755
(executable)
--- a/
templates/main.py
+++ b/
templates/main.py
@@
-274,7
+274,12
@@
def listVms(user, fields):
on = {}
has_vnc = {}
uptimes = getUptimes(machines)
on = {}
has_vnc = {}
uptimes = getUptimes(machines)
- on = has_vnc = uptimes
+ on = uptimes
+ for m in machines:
+ if on.get(m.name) and m.type.hvm:
+ has_vnc[m.name] = True
+ else:
+ has_vnc[m.name] = False
# for m in machines:
# status = statusInfo(m)
# on[m.name] = status is not None
# for m in machines:
# status = statusInfo(m)
# on[m.name] = status is not None
@@
-436,6
+441,7
@@
def info(user, fields):
display_fields = [('name', 'Name'),
('owner', 'Owner'),
('contact', 'Contact'),
display_fields = [('name', 'Name'),
('owner', 'Owner'),
('contact', 'Contact'),
+ ('type', 'Type'),
'NIC_INFO',
('uptime', 'uptime'),
('cputime', 'CPU usage'),
'NIC_INFO',
('uptime', 'uptime'),
('cputime', 'CPU usage'),
@@
-452,6
+458,7
@@
def info(user, fields):
]
fields = []
machine_info = {}
]
fields = []
machine_info = {}
+ machine_info['type'] = machine.type.hvm and 'HVM' or 'ParaVM'
machine_info['owner'] = machine.owner
machine_info['contact'] = machine.contact
machine_info['owner'] = machine.owner
machine_info['contact'] = machine.contact