diff --git a/src/cli/one_helper/oneimage_helper.rb b/src/cli/one_helper/oneimage_helper.rb index 587d67f5c7..53196e25d8 100644 --- a/src/cli/one_helper/oneimage_helper.rb +++ b/src/cli/one_helper/oneimage_helper.rb @@ -76,6 +76,18 @@ class OneImageHelper < OpenNebulaHelper::OneHelper puts str % ["RUNNING_VMS", image['RUNNING_VMS']] puts + CLIHelper.print_header(str_h1 % "PERMISSIONS",false) + + ["OWNER", "GROUP", "OTHER"].each { |e| + mask = "---" + mask[0] = "U" if image["PERMISSIONS/#{e}_U"] == "1" + mask[1] = "M" if image["PERMISSIONS/#{e}_M"] == "1" + mask[2] = "A" if image["PERMISSIONS/#{e}_A"] == "1" + + puts str % [e, mask] + } + puts + CLIHelper.print_header(str_h1 % "IMAGE TEMPLATE",false) puts image.template_str end diff --git a/src/cli/one_helper/onetemplate_helper.rb b/src/cli/one_helper/onetemplate_helper.rb index 83e50b572e..1d115ad300 100644 --- a/src/cli/one_helper/onetemplate_helper.rb +++ b/src/cli/one_helper/onetemplate_helper.rb @@ -72,6 +72,18 @@ class OneTemplateHelper < OpenNebulaHelper::OneHelper OpenNebulaHelper.boolean_to_str(template['PUBLIC'])] puts + CLIHelper.print_header(str_h1 % "PERMISSIONS",false) + + ["OWNER", "GROUP", "OTHER"].each { |e| + mask = "---" + mask[0] = "U" if template["PERMISSIONS/#{e}_U"] == "1" + mask[1] = "M" if template["PERMISSIONS/#{e}_M"] == "1" + mask[2] = "A" if template["PERMISSIONS/#{e}_A"] == "1" + + puts str % [e, mask] + } + puts + CLIHelper.print_header(str_h1 % "TEMPLATE CONTENTS",false) puts template.template_str end diff --git a/src/cli/one_helper/onevm_helper.rb b/src/cli/one_helper/onevm_helper.rb index 02a0d838e0..c73ce4f3ad 100644 --- a/src/cli/one_helper/onevm_helper.rb +++ b/src/cli/one_helper/onevm_helper.rb @@ -96,6 +96,18 @@ class OneVMHelper < OpenNebulaHelper::OneHelper poll_attrs.each { |k,v| puts str % [k,vm[v]] } puts + CLIHelper.print_header(str_h1 % "PERMISSIONS",false) + + ["OWNER", "GROUP", "OTHER"].each { |e| + mask = "---" + mask[0] = "U" if vm["PERMISSIONS/#{e}_U"] == "1" + mask[1] = "M" if vm["PERMISSIONS/#{e}_M"] == "1" + mask[2] = "A" if vm["PERMISSIONS/#{e}_A"] == "1" + + puts str % [e, mask] + } + puts + CLIHelper.print_header(str_h1 % "VIRTUAL MACHINE TEMPLATE",false) puts vm.template_str diff --git a/src/cli/one_helper/onevnet_helper.rb b/src/cli/one_helper/onevnet_helper.rb index e672d884b5..de242d1e98 100644 --- a/src/cli/one_helper/onevnet_helper.rb +++ b/src/cli/one_helper/onevnet_helper.rb @@ -63,8 +63,20 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper puts str % ["PHYSICAL DEVICE", vn["PHYDEV"]] if vn["PHYDEV"] puts str % ["VLAN ID", vn["VLAN_ID"]] if vn["VLAN_ID"] puts str % ["USED LEASES", vn['TOTAL_LEASES']] - puts + + CLIHelper.print_header(str_h1 % "PERMISSIONS",false) + + ["OWNER", "GROUP", "OTHER"].each { |e| + mask = "---" + mask[0] = "U" if vn["PERMISSIONS/#{e}_U"] == "1" + mask[1] = "M" if vn["PERMISSIONS/#{e}_M"] == "1" + mask[2] = "A" if vn["PERMISSIONS/#{e}_A"] == "1" + + puts str % [e, mask] + } + puts + CLIHelper.print_header(str_h1 % ["VIRTUAL NETWORK TEMPLATE"], false) puts vn.template_str(false)