From 9e586e8ef0d7c2e15e254a6db340c4e3771f8eba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Tue, 10 Jan 2012 16:28:56 +0100 Subject: [PATCH] Feature #862: Remove PUBLIC attribute from CLI --- src/cli/etc/oneimage.yaml | 5 ----- src/cli/etc/onetemplate.yaml | 5 ----- src/cli/etc/onevnet.yaml | 5 ----- src/cli/one_helper/oneimage_helper.rb | 9 +-------- src/cli/one_helper/onetemplate_helper.rb | 9 +-------- src/cli/one_helper/onevnet_helper.rb | 8 +------- 6 files changed, 3 insertions(+), 38 deletions(-) diff --git a/src/cli/etc/oneimage.yaml b/src/cli/etc/oneimage.yaml index baf79e95ea..c8ddff7956 100644 --- a/src/cli/etc/oneimage.yaml +++ b/src/cli/etc/oneimage.yaml @@ -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 diff --git a/src/cli/etc/onetemplate.yaml b/src/cli/etc/onetemplate.yaml index def9c80b3d..809930f235 100644 --- a/src/cli/etc/onetemplate.yaml +++ b/src/cli/etc/onetemplate.yaml @@ -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 diff --git a/src/cli/etc/onevnet.yaml b/src/cli/etc/onevnet.yaml index 4193798813..12820657ad 100644 --- a/src/cli/etc/onevnet.yaml +++ b/src/cli/etc/onevnet.yaml @@ -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 diff --git a/src/cli/one_helper/oneimage_helper.rb b/src/cli/one_helper/oneimage_helper.rb index a53bccdf38..8e00897a27 100644 --- a/src/cli/one_helper/oneimage_helper.rb +++ b/src/cli/one_helper/oneimage_helper.rb @@ -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 diff --git a/src/cli/one_helper/onetemplate_helper.rb b/src/cli/one_helper/onetemplate_helper.rb index a100a81849..6d54b7a3ac 100644 --- a/src/cli/one_helper/onetemplate_helper.rb +++ b/src/cli/one_helper/onetemplate_helper.rb @@ -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 diff --git a/src/cli/one_helper/onevnet_helper.rb b/src/cli/one_helper/onevnet_helper.rb index 7746680746..0eda2614c3 100644 --- a/src/cli/one_helper/onevnet_helper.rb +++ b/src/cli/one_helper/onevnet_helper.rb @@ -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