diff --git a/src/cli/one_helper.rb b/src/cli/one_helper.rb index 9920c2eba7..683d71f83f 100644 --- a/src/cli/one_helper.rb +++ b/src/cli/one_helper.rb @@ -331,11 +331,11 @@ EOT "OpenNebula #{poolname} name or id" end - def OpenNebulaHelper.public_to_str(str) + def OpenNebulaHelper.boolean_to_str(str) if str.to_i == 1 - public_str = "Y" + "Yes" else - public_str = "N" + "No" end end diff --git a/src/cli/one_helper/oneimage_helper.rb b/src/cli/one_helper/oneimage_helper.rb index 7332873151..f05aa50652 100644 --- a/src/cli/one_helper/oneimage_helper.rb +++ b/src/cli/one_helper/oneimage_helper.rb @@ -25,10 +25,6 @@ class OneImageHelper < OpenNebulaHelper::OneHelper "oneimage.yaml" end - def self.persistent_to_str(str) - str.to_i==1 ? "Yes" : "No" - end - def self.state_to_str(id) id = id.to_i state_str = Image::IMAGE_STATES[id] @@ -68,9 +64,10 @@ class OneImageHelper < OpenNebulaHelper::OneHelper 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 % ["PUBLIC", + OpenNebulaHelper.boolean_to_str(image['PUBLIC'])] puts str % ["PERSISTENT", - OneImageHelper.persistent_to_str(image["PERSISTENT"])] + OneImageHelper.boolean_to_str(image["PERSISTENT"])] puts str % ["SOURCE", image['SOURCE']] puts str % ["STATE", image.short_state_str] puts str % ["RUNNING_VMS", image['RUNNING_VMS']] @@ -112,12 +109,12 @@ class OneImageHelper < OpenNebulaHelper::OneHelper column :PUBLIC, "Whether the Image is public or not", :size=>3 do |d| - OpenNebulaHelper.public_to_str(d["PUBLIC"]) + OpenNebulaHelper.boolean_to_str(d["PUBLIC"]) end column :PERSISTENT, "Whether the Image is persistent or not", :size=>3 do |d| - OneImageHelper.persistent_to_str(d["PERSISTENT"]) + OneImageHelper.boolean_to_str(d["PERSISTENT"]) end column :STAT, "State of the Image", :size=>4 do |d| diff --git a/src/cli/one_helper/onetemplate_helper.rb b/src/cli/one_helper/onetemplate_helper.rb index e2c406e7f1..c1f24ac553 100644 --- a/src/cli/one_helper/onetemplate_helper.rb +++ b/src/cli/one_helper/onetemplate_helper.rb @@ -53,7 +53,7 @@ class OneTemplateHelper < OpenNebulaHelper::OneHelper puts str % ["REGISTER TIME", OpenNebulaHelper.time_to_str(template['REGTIME'])] puts str % ["PUBLIC", - OpenNebulaHelper.public_to_str(template['PUBLIC'])] + OpenNebulaHelper.boolean_to_str(template['PUBLIC'])] puts CLIHelper.print_header(str_h1 % "TEMPLATE CONTENTS",false) @@ -87,7 +87,7 @@ class OneTemplateHelper < OpenNebulaHelper::OneHelper column :PUBLIC, "Whether the Template is public or not", :size=>3 do |d| - OpenNebulaHelper.public_to_str(d["PUBLIC"]) + OpenNebulaHelper.boolean_to_str(d["PUBLIC"]) end default :ID, :USER, :GROUP, :NAME, :REGTIME, :PUBLIC diff --git a/src/cli/one_helper/oneuser_helper.rb b/src/cli/one_helper/oneuser_helper.rb index 7550d667b0..15409c569c 100644 --- a/src/cli/one_helper/oneuser_helper.rb +++ b/src/cli/one_helper/oneuser_helper.rb @@ -72,7 +72,8 @@ class OneUserHelper < OpenNebulaHelper::OneHelper puts str % ["NAME", user.name] puts str % ["MAIN_GROUP", user.gid] puts str % ["PASSWORD", user['PASSWORD']] - puts str % ["ENABLED", user['ENABLED']] + puts str % ["ENABLED", + OpenNebulaHelper.boolean_to_str(user['ENABLED'])] puts CLIHelper.print_header(str_h1 % "GROUPS", false) diff --git a/src/cli/one_helper/onevnet_helper.rb b/src/cli/one_helper/onevnet_helper.rb index 2fd9915cd9..3d46a45aad 100644 --- a/src/cli/one_helper/onevnet_helper.rb +++ b/src/cli/one_helper/onevnet_helper.rb @@ -55,7 +55,7 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper 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 str % ["PUBLIC", OpenNebulaHelper.boolean_to_str(vn['PUBLIC'])] puts CLIHelper.print_header(str_h1 % ["VIRTUAL NETWORK TEMPLATE"], false) @@ -107,8 +107,8 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper end column :PUBLIC, "Whether the Virtual Network is public or not", - :size=>3 do |d| - OpenNebulaHelper.public_to_str(d['PUBLIC']) + :size=>1 do |d| + OpenNebulaHelper.boolean_to_str(d['PUBLIC']) end column :LEASES, "Number of this Virtual Network's given leases",