Feature #862: Remove PUBLIC attribute from CLI

This commit is contained in:
Carlos Martín committed 2012-01-10 16:28:56 +01:00
1 parent 319c191459
commit 9e586e8ef0
6 files changed
+3 -38

No files matched your search

-5
View File
@@ -30,10 +30,6 @@
:desc: Registration time of the Image
:size: 16
:PUBLIC:
:desc: Whether the Image is public or not
:size: 3
:PERSISTENT:
:desc: Whether the Image is persistent or not
:size: 3
@@ -54,7 +50,6 @@
- :SIZE
- :TYPE
- :REGTIME
- :PUBLIC
- :PERSISTENT
- :STAT
- :RVMS
-5
View File
@@ -22,14 +22,9 @@
:desc: Registration time of the Template
:size: 20
:PUBLIC:
:desc: Whether the Template is public or not
:size: 3
:default:
- :ID
- :USER
- :GROUP
- :NAME
- :REGTIME
- :PUBLIC
-5
View File
@@ -30,10 +30,6 @@
:desc: Bridge associated to the Virtual Network
:size: 6
:PUBLIC:
:desc: Whether the Virtual Network is public or not
:size: 3
:LEASES:
:desc: Number of this Virtual Networks given leases
:size: 7
@@ -45,5 +41,4 @@
- :NAME
- :TYPE
- :BRIDGE
- :PUBLIC
- :LEASES
+1 -8
View File
@@ -64,8 +64,6 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
puts str % ["TYPE", image.type_str]
puts str % ["REGISTER TIME",
OpenNebulaHelper.time_to_str(image['REGTIME'])]
puts str % ["PUBLIC",
OpenNebulaHelper.boolean_to_str(image['PUBLIC'])]
puts str % ["PERSISTENT",
OpenNebulaHelper.boolean_to_str(image["PERSISTENT"])]
puts str % ["SOURCE",image['SOURCE']]
@@ -123,11 +121,6 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
OpenNebulaHelper.time_to_str(d["REGTIME"])
end
column :PUBLIC, "Whether the Image is public or not",
:size=>3 do |d|
OpenNebulaHelper.boolean_to_str(d["PUBLIC"])
end
column :PERSISTENT, "Whether the Image is persistent or not",
:size=>3 do |d|
OpenNebulaHelper.boolean_to_str(d["PERSISTENT"])
@@ -147,7 +140,7 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
OpenNebulaHelper.unit_to_str(d['SIZE'].to_i,options,"M")
end
default :ID, :USER, :GROUP, :NAME, :SIZE, :TYPE, :REGTIME, :PUBLIC,
default :ID, :USER, :GROUP, :NAME, :SIZE, :TYPE, :REGTIME,
:PERSISTENT , :STAT, :RVMS
end
+1 -8
View File
@@ -68,8 +68,6 @@ class OneTemplateHelper < OpenNebulaHelper::OneHelper
puts str % ["GROUP", template['GNAME']]
puts str % ["REGISTER TIME",
OpenNebulaHelper.time_to_str(template['REGTIME'])]
puts str % ["PUBLIC",
OpenNebulaHelper.boolean_to_str(template['PUBLIC'])]
puts
CLIHelper.print_header(str_h1 % "PERMISSIONS",false)
@@ -114,12 +112,7 @@ class OneTemplateHelper < OpenNebulaHelper::OneHelper
OpenNebulaHelper.time_to_str(d["REGTIME"])
end
column :PUBLIC, "Whether the Template is public or not",
:size=>3 do |d|
OpenNebulaHelper.boolean_to_str(d["PUBLIC"])
end
default :ID, :USER, :GROUP, :NAME, :REGTIME, :PUBLIC
default :ID, :USER, :GROUP, :NAME, :REGTIME
end
table
+1 -7
View File
@@ -56,7 +56,6 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
puts str % ["NAME", vn['NAME']]
puts str % ["USER", vn['UNAME']]
puts str % ["GROUP", vn['GNAME']]
puts str % ["PUBLIC", OpenNebulaHelper.boolean_to_str(vn['PUBLIC'])]
puts str % ["TYPE", vn.type_str]
puts str % ["BRIDGE", vn["BRIDGE"]]
puts str % ["VLAN", OpenNebulaHelper.boolean_to_str(vn['VLAN'])]
@@ -139,17 +138,12 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
d["BRIDGE"]
end
column :PUBLIC, "Whether the Virtual Network is public or not",
:size=>1 do |d|
OpenNebulaHelper.boolean_to_str(d['PUBLIC'])
end
column :LEASES, "Number of this Virtual Network's given leases",
:size=>7 do |d|
d["TOTAL_LEASES"]
end
default :ID, :USER, :GROUP, :NAME, :TYPE, :BRIDGE, :PUBLIC, :LEASES
default :ID, :USER, :GROUP, :NAME, :TYPE, :BRIDGE, :LEASES
end
table