diff --git a/src/cli/one_helper/oneimage_helper.rb b/src/cli/one_helper/oneimage_helper.rb index a446078726..7332873151 100644 --- a/src/cli/one_helper/oneimage_helper.rb +++ b/src/cli/one_helper/oneimage_helper.rb @@ -63,15 +63,17 @@ class OneImageHelper < OpenNebulaHelper::OneHelper CLIHelper.print_header(str_h1 % "IMAGE #{image['ID']} INFORMATION") puts str % ["ID", image.id.to_s] puts str % ["NAME", image.name] - puts str % ["TYPE", image.type_str] + puts str % ["USER", image['UNAME']] + puts str % ["GROUP", image['GNAME']] + puts str % ["TYPE", image.type_str] puts str % ["REGISTER TIME", OpenNebulaHelper.time_to_str(image['REGTIME'])] puts str % ["PUBLIC", OpenNebulaHelper.public_to_str(image['PUBLIC'])] puts str % ["PERSISTENT", OneImageHelper.persistent_to_str(image["PERSISTENT"])] - puts str % ["SOURCE", image['SOURCE']] + puts str % ["SOURCE", image['SOURCE']] puts str % ["STATE", image.short_state_str] - puts str % ["RUNNING_VMS", image['RUNNING_VMS']] + puts str % ["RUNNING_VMS", image['RUNNING_VMS']] puts CLIHelper.print_header(str_h1 % "IMAGE TEMPLATE",false) diff --git a/src/cli/one_helper/onetemplate_helper.rb b/src/cli/one_helper/onetemplate_helper.rb index 05199685c7..e2c406e7f1 100644 --- a/src/cli/one_helper/onetemplate_helper.rb +++ b/src/cli/one_helper/onetemplate_helper.rb @@ -48,6 +48,8 @@ class OneTemplateHelper < OpenNebulaHelper::OneHelper str_h1 % "TEMPLATE #{template['ID']} INFORMATION") puts str % ["ID", template.id.to_s] puts str % ["NAME", template.name] + puts str % ["USER", template['UNAME']] + puts str % ["GROUP", template['GNAME']] puts str % ["REGISTER TIME", OpenNebulaHelper.time_to_str(template['REGTIME'])] puts str % ["PUBLIC", diff --git a/src/cli/one_helper/onevm_helper.rb b/src/cli/one_helper/onevm_helper.rb index 7215a7a547..ed05c6cdcc 100644 --- a/src/cli/one_helper/onevm_helper.rb +++ b/src/cli/one_helper/onevm_helper.rb @@ -70,6 +70,8 @@ class OneVMHelper < OpenNebulaHelper::OneHelper str_h1 % "VIRTUAL MACHINE #{vm['ID']} INFORMATION") puts str % ["ID", vm.id.to_s] puts str % ["NAME", vm.name] + puts str % ["USER", vm['UNAME']] + puts str % ["GROUP", vm['GNAME']] puts str % ["STATE", vm.state_str] puts str % ["LCM_STATE", vm.lcm_state_str] puts str % ["HOSTNAME", @@ -78,7 +80,8 @@ class OneVMHelper < OpenNebulaHelper::OneHelper puts str % ["START TIME", OpenNebulaHelper.time_to_str(vm['STIME'])] puts str % ["END TIME", OpenNebulaHelper.time_to_str(vm['ETIME'])] value=vm['DEPLOY_ID'] - puts str % ["DEPLOY ID:", value=="" ? "-" : value] + puts str % ["DEPLOY ID", value=="" ? "-" : value] + puts CLIHelper.print_header(str_h1 % "VIRTUAL MACHINE MONITORING",false) @@ -208,7 +211,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper vm_hash=vm.to_hash - history=vm_hash['VM']['HISTORY_RECORDS']['HISTORY'] + history=[vm_hash['VM']['HISTORY_RECORDS']['HISTORY']].flatten table.show(history) end diff --git a/src/cli/one_helper/onevnet_helper.rb b/src/cli/one_helper/onevnet_helper.rb index 5ba12809ce..2fd9915cd9 100644 --- a/src/cli/one_helper/onevnet_helper.rb +++ b/src/cli/one_helper/onevnet_helper.rb @@ -52,9 +52,11 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper ["VIRTUAL NETWORK #{vn.id.to_s} INFORMATION"]) str="%-10s: %-20s" - puts str % ["ID: ", vn.id.to_s] - puts str % ["UID: ", vn["UID"]] + puts str % ["ID", vn.id.to_s] + puts str % ["USER", vn['UNAME']] + puts str % ["GROUP", vn['GNAME']] puts str % ["PUBLIC", OpenNebulaHelper.public_to_str(vn['PUBLIC'])] + puts CLIHelper.print_header(str_h1 % ["VIRTUAL NETWORK TEMPLATE"], false)