feature #661: Use user table conf file

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)

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

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

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

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

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

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

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