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

Boolean variables are printed by common boolean_to_str

Browse Source
This commit is contained in:
Javi Fontan 2011-07-11 16:05:45 +02:00
parent 3c24186274
commit 8bed6dbb16
5 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cli/one_helper.rb
View File

@ -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

13
src/cli/one_helper/oneimage_helper.rb
View File

@ -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|

4
src/cli/one_helper/onetemplate_helper.rb
View File

@ -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

3
src/cli/one_helper/oneuser_helper.rb
View File

@ -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)

6
src/cli/one_helper/onevnet_helper.rb
View File

@ -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",