shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00
Code Releases Wiki Activity

Feature #2486: Show the context cdrom with the other disks in cli and sunstone

Browse Source
This commit is contained in:
Carlos Martín 2015-03-11 18:49:54 +01:00
parent 97515e6da3
commit 59778f8c5b
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/cli/one_helper/onevm_helper.rb
View File

@ -384,7 +384,28 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
puts str % [e, mask]
}
vm_disks = []
if vm.has_elements?("/VM/TEMPLATE/DISK")
vm_disks = [vm.to_hash['VM']['TEMPLATE']['DISK']].flatten
end
if vm.has_elements?("/VM/TEMPLATE/CONTEXT")
context_disk = vm.to_hash['VM']['TEMPLATE']['CONTEXT']
context_disk["IMAGE"] = "CONTEXT"
context_disk["DATASTORE"] = "-"
context_disk["TYPE"] = "-"
context_disk["READONLY"] = "-"
context_disk["SAVE"] = "-"
context_disk["CLONE"] = "-"
context_disk["SAVE_AS"] = "-"
vm_disks.push(context_disk)
end
if !vm_disks.empty?
puts
CLIHelper.print_header(str_h1 % "VM DISKS",false)
CLIHelper::ShowTable.new(nil, self) do
@ -440,7 +461,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
default :ID, :TARGET, :IMAGE, :TYPE,
:SAVE, :SAVE_AS
end.show([vm.to_hash['VM']['TEMPLATE']['DISK']].flatten, {})
end.show(vm_disks, {})
while vm.has_elements?("/VM/TEMPLATE/DISK")
vm.delete_element("/VM/TEMPLATE/DISK")

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

@ -1930,6 +1930,15 @@ function printDisks(vm_info){
else if (!$.isEmptyObject(vm_info.TEMPLATE.DISK))
disks = [vm_info.TEMPLATE.DISK]
if (!$.isEmptyObject(vm_info.TEMPLATE.CONTEXT)){
var context_disk = vm_info.TEMPLATE.CONTEXT;
context_disk["IMAGE"] = tr("Context");
context_disk["CONTEXT"] = true;
disks.push(context_disk);
}
if (!disks.length){
html += '\
<tr id="no_disks_tr">\
@ -1993,7 +2002,7 @@ function printDisks(vm_info){
}
if (Config.isTabActionEnabled("vms-tab", "VM.detachdisk")) {
if (vm_info.STATE == "3" && vm_info.LCM_STATE == "3") {
if (vm_info.STATE == "3" && vm_info.LCM_STATE == "3" && !disk.CONTEXT) {
actions += '<a href="VM.detachdisk" class="detachdisk" ><i class="fa fa-times"/>'+tr("Detach")+'</a>'
}
}