shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-04-01 06:50:25 +03:00
Code Releases Wiki Activity

bug #1838: states with vnc access are now consistent

Browse Source
This commit is contained in:
Daniel Molina 2013-04-03 17:23:37 +02:00
parent 072716ef38
commit e7d13c0803
2 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/sunstone/OpenNebulaVNC.rb
View File

@ -24,6 +24,41 @@ require 'opennebula'
TOKEN_EXPIRE_SECONDS = 4
VNC_STATES = [
#0, #LCM_INIT
#1, #PROLOG
#2, #BOOT
3, #RUNNING
4, #MIGRATE
#5, #SAVE_STOP
#6, #SAVE_SUSPEND
#7, #SAVE_MIGRATE
#8, #PROLOG_MIGRATE
#9, #PROLOG_RESUME
#10, #EPILOG_STOP
#11, #EPILOG
12, #SHUTDOWN
13, #CANCEL
#14, #FAILURE
#15, #CLEANUP_RESUBMIT
16, #UNKNOWN
17, #HOTPLUG
18, #SHUTDOWN_POWEROFF
#19, #BOOT_UNKNOWN
#20, #BOOT_POWEROFF
#21, #BOOT_SUSPENDED
#22, #BOOT_STOPPED
#23, #CLEANUP_DELETE
24, #HOTPLUG_SNAPSHOT
25, #HOTPLUG_NIC
26, #HOTPLUG_SAVEAS
27, #HOTPLUG_SAVEAS_POWEROFF
28, #HOTPLUG_SAVEAS_SUSPENDED
29 #SHUTDOWN_UNDEPLOY
#30, #EPILOG_UNDEPLOY
#31 #PROLOG_UNDEPLOY
]
class OpenNebulaVNC
attr_reader :proxy_port

10
src/sunstone/public/js/plugins/vms-tab.js
View File

@ -24,7 +24,7 @@ function loadVNC(){
}
loadVNC();
var VNCstates=["RUNNING","SHUTDOWN","SHUTDOWN_POWEROFF","UNKNOWN","HOTPLUG","CANCEL","MIGRATE", "HOTPLUG_SNAPSHOT", "HOTPLUG_NIC", "HOTPLUG_SAVEAS", "HOTPLUG_SAVEAS_POWEROFF", "HOTPLUG_SAVEAS_SUSPENDED"];
var VNCstates=["RUNNING","SHUTDOWN","SHUTDOWN_POWEROFF","UNKNOWN","HOTPLUG","CANCEL","MIGRATE", "HOTPLUG_SNAPSHOT", "HOTPLUG_NIC", "HOTPLUG_SAVEAS", "HOTPLUG_SAVEAS_POWEROFF", "HOTPLUG_SAVEAS_SUSPENDED", "SHUTDOWN_UNDEPLOY"];
//Permanent storage for last value of aggregated network usage
//Used to calculate bandwidth
@ -1970,6 +1970,7 @@ function setupAttachDiskDialog(){
</h3>\
</div>\
<form id="attach_disk_form" action="">\
<div class="reveal-body">\
<div class="row centered">\
<div class="four columns">\
<label class="inline right" for="vm_id">'+tr("Virtual Machine ID")+':</label>\
@ -1982,7 +1983,8 @@ function setupAttachDiskDialog(){
</div>\
</div>' +
generate_disk_tab_content("attach_disk", "attach_disk") +
'<hr>\
'</div>\
<hr>\
<div class="form_buttons">\
<button class="button radius right success" id="attach_disk_button" type="submit" value="VM.attachdisk">'+tr("Attach")+'</button>\
<button class="close-reveal-modal button secondary radius" type="button" value="close">' + tr("Close") + '</button>\
@ -2231,6 +2233,7 @@ function setupAttachNicDialog(){
</h3>\
</div>\
<form id="attach_nic_form" action="">\
<div class="reveal-body">\
<div class="row centered">\
<div class="four columns">\
<label class="inline right" for="vm_id">'+tr("Virtual Machine ID")+':</label>\
@ -2243,7 +2246,8 @@ function setupAttachNicDialog(){
</div>\
</div>' +
generate_nic_tab_content("attach_nic", "attach_nic") +
'<hr>\
'</div>\
<hr>\
<div class="form_buttons">\
<button class="button radius right success" id="attach_nic_button" type="submit" value="VM.attachnic">'+tr("Attach")+'</button>\
<button class="close-reveal-modal button secondary radius" type="button" value="close">' + tr("Close") + '</button>\