From 84acb6d1ca056a347c83c82ae50c7ec8a506d060 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Mon, 13 Jun 2011 16:17:38 +0200 Subject: [PATCH] feature #661: Use user table conf file --- src/cli/one_helper.rb | 10 ++++++++++ src/cli/one_helper/onegroup_helper.rb | 9 ++++++--- src/cli/one_helper/onehost_helper.rb | 3 ++- src/cli/one_helper/oneimage_helper.rb | 3 ++- src/cli/one_helper/onetemplate_helper.rb | 3 ++- src/cli/one_helper/oneuser_helper.rb | 3 ++- src/cli/one_helper/onevm_helper.rb | 3 ++- src/cli/one_helper/onevnet_helper.rb | 3 ++- 8 files changed, 28 insertions(+), 9 deletions(-) diff --git a/src/cli/one_helper.rb b/src/cli/one_helper.rb index 1ba68f8018..4aebfa9215 100644 --- a/src/cli/one_helper.rb +++ b/src/cli/one_helper.rb @@ -229,6 +229,16 @@ user #{self.rname} of the user identified by the username EOT end + def self.table_conf + path = "#{ENV["HOME"]}/.one/cli/#{self.conf_file}" + + if File.exists?(path) + return path + else + return "#{TABLE_CONF_PATH}/#{self.conf_file}" + end + end + private def retrieve_resource(id) diff --git a/src/cli/one_helper/onegroup_helper.rb b/src/cli/one_helper/onegroup_helper.rb index 8896f93616..c20f0794a0 100644 --- a/src/cli/one_helper/onegroup_helper.rb +++ b/src/cli/one_helper/onegroup_helper.rb @@ -17,12 +17,14 @@ require 'one_helper' class OneGroupHelper < OpenNebulaHelper::OneHelper - TABLE_CONF_FILE="#{OpenNebulaHelper::TABLE_CONF_PATH}/onegroup.yaml" - def self.rname "GROUP" end + def self.conf_file + "onegroup.yaml" + end + private def factory(id=nil) @@ -40,7 +42,8 @@ class OneGroupHelper < OpenNebulaHelper::OneHelper end def format_pool(pool, options, top=false) - table=CLIHelper::ShowTable.new(TABLE_CONF_FILE, self) do + config_file=self.class.table_conf + table=CLIHelper::ShowTable.new(config_file, self) do column :ID, "ONE identifier for the Group", :size=>4 do |d| d["ID"] end diff --git a/src/cli/one_helper/onehost_helper.rb b/src/cli/one_helper/onehost_helper.rb index 51b22454df..9ef34283a5 100644 --- a/src/cli/one_helper/onehost_helper.rb +++ b/src/cli/one_helper/onehost_helper.rb @@ -70,7 +70,8 @@ class OneHostHelper < OpenNebulaHelper::OneHelper end def format_pool(pool, options, top=false) - table=CLIHelper::ShowTable.new(TABLE_CONF_FILE, self) do + config_file=self.class.table_conf + table=CLIHelper::ShowTable.new(config_file, self) do column :ID, "ONE identifier for Host", :size=>4 do |d| d["ID"] end diff --git a/src/cli/one_helper/oneimage_helper.rb b/src/cli/one_helper/oneimage_helper.rb index d47ae59fd9..a2b7f05dce 100644 --- a/src/cli/one_helper/oneimage_helper.rb +++ b/src/cli/one_helper/oneimage_helper.rb @@ -59,7 +59,8 @@ class OneImageHelper < OpenNebulaHelper::OneHelper end def format_pool(pool, options, top=false) - table=CLIHelper::ShowTable.new(TABLE_CONF_FILE, self) do + config_file=self.class.table_conf + table=CLIHelper::ShowTable.new(config_file, self) do column :ID, "ONE identifier for the Image", :size=>4 do |d| d["ID"] end diff --git a/src/cli/one_helper/onetemplate_helper.rb b/src/cli/one_helper/onetemplate_helper.rb index 46e52c0593..fdf77a7741 100644 --- a/src/cli/one_helper/onetemplate_helper.rb +++ b/src/cli/one_helper/onetemplate_helper.rb @@ -54,7 +54,8 @@ class OneTemplateHelper < OpenNebulaHelper::OneHelper end def format_pool(pool, options, top=false) - table=CLIHelper::ShowTable.new(TABLE_CONF_FILE, self) do + config_file=self.class.table_conf + table=CLIHelper::ShowTable.new(config_file, self) do column :ID, "ONE identifier for the Template", :size=>4 do |d| d["ID"] end diff --git a/src/cli/one_helper/oneuser_helper.rb b/src/cli/one_helper/oneuser_helper.rb index eb94d7912e..2022cc122a 100644 --- a/src/cli/one_helper/oneuser_helper.rb +++ b/src/cli/one_helper/oneuser_helper.rb @@ -62,7 +62,8 @@ class OneUserHelper < OpenNebulaHelper::OneHelper end def format_pool(pool, options, top=false) - table=CLIHelper::ShowTable.new(TABLE_CONF_FILE, self) do + config_file=self.class.table_conf + table=CLIHelper::ShowTable.new(config_file, self) do column :ID, "ONE identifier for the User", :size=>4 do |d| d["ID"] end diff --git a/src/cli/one_helper/onevm_helper.rb b/src/cli/one_helper/onevm_helper.rb index ef3c4c987f..38dbd9c4d3 100644 --- a/src/cli/one_helper/onevm_helper.rb +++ b/src/cli/one_helper/onevm_helper.rb @@ -68,7 +68,8 @@ class OneVMHelper < OpenNebulaHelper::OneHelper end def format_pool(pool, options, top=false) - table=CLIHelper::ShowTable.new(TABLE_CONF_FILE, self) do + config_file=self.class.table_conf + table=CLIHelper::ShowTable.new(config_file, self) do column :ID, "ONE identifier for Virtual Machine", :size=>4 do |d| d["ID"] end diff --git a/src/cli/one_helper/onevnet_helper.rb b/src/cli/one_helper/onevnet_helper.rb index 8f22e206b9..8def0ae2d4 100644 --- a/src/cli/one_helper/onevnet_helper.rb +++ b/src/cli/one_helper/onevnet_helper.rb @@ -61,7 +61,8 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper end def format_pool(pool, options, top=false) - table=CLIHelper::ShowTable.new(TABLE_CONF_FILE, self) do + config_file=self.class.table_conf + table=CLIHelper::ShowTable.new(config_file, self) do column :ID, "ONE identifier for Virtual Network", :size=>4 do |d| d["ID"] end