From 9f1c43b5a9c1a16837ca84bd02a4ceb50d2b0248 Mon Sep 17 00:00:00 2001
From: Javi Fontan <jfontan@opennebula.org>
Date: Tue, 26 Feb 2013 16:04:14 +0100
Subject: [PATCH] feature #1640: pass options to format_resource

---
 src/cli/one_helper.rb                     | 2 +-
 src/cli/one_helper/onecluster_helper.rb   | 2 +-
 src/cli/one_helper/onedatastore_helper.rb | 2 +-
 src/cli/one_helper/onegroup_helper.rb     | 2 +-
 src/cli/one_helper/onehost_helper.rb      | 2 +-
 src/cli/one_helper/oneimage_helper.rb     | 2 +-
 src/cli/one_helper/onetemplate_helper.rb  | 2 +-
 src/cli/one_helper/oneuser_helper.rb      | 2 +-
 src/cli/one_helper/onevm_helper.rb        | 2 +-
 src/cli/one_helper/onevnet_helper.rb      | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/cli/one_helper.rb b/src/cli/one_helper.rb
index d0dcbf83cb..5a148f1e90 100644
--- a/src/cli/one_helper.rb
+++ b/src/cli/one_helper.rb
@@ -342,7 +342,7 @@ EOT
             if options[:xml]
                 return 0, resource.to_xml(true)
             else
-                format_resource(resource)
+                format_resource(resource, options)
                 return 0
             end
         end
diff --git a/src/cli/one_helper/onecluster_helper.rb b/src/cli/one_helper/onecluster_helper.rb
index 6e521607be..33028ce83b 100644
--- a/src/cli/one_helper/onecluster_helper.rb
+++ b/src/cli/one_helper/onecluster_helper.rb
@@ -95,7 +95,7 @@ class OneClusterHelper < OpenNebulaHelper::OneHelper
         OpenNebula::ClusterPool.new(@client)
     end
 
-    def format_resource(cluster)
+    def format_resource(cluster, options = {})
         str="%-18s: %-20s"
         str_h1="%-80s"
 
diff --git a/src/cli/one_helper/onedatastore_helper.rb b/src/cli/one_helper/onedatastore_helper.rb
index 9512eed32d..b5ae134e07 100644
--- a/src/cli/one_helper/onedatastore_helper.rb
+++ b/src/cli/one_helper/onedatastore_helper.rb
@@ -95,7 +95,7 @@ class OneDatastoreHelper < OpenNebulaHelper::OneHelper
         OpenNebula::DatastorePool.new(@client)
     end
 
-    def format_resource(datastore)
+    def format_resource(datastore, options = {})
         str="%-15s: %-20s"
         str_h1="%-80s"
 
diff --git a/src/cli/one_helper/onegroup_helper.rb b/src/cli/one_helper/onegroup_helper.rb
index f9271bba9a..6e57657409 100644
--- a/src/cli/one_helper/onegroup_helper.rb
+++ b/src/cli/one_helper/onegroup_helper.rb
@@ -141,7 +141,7 @@ class OneGroupHelper < OpenNebulaHelper::OneHelper
         OpenNebula::GroupPool.new(@client)
     end
 
-    def format_resource(group)
+    def format_resource(group, options = {})
         system = System.new(@client)
         default_quotas = system.get_group_quotas()
 
diff --git a/src/cli/one_helper/onehost_helper.rb b/src/cli/one_helper/onehost_helper.rb
index 7382b70e37..a5c35ffb88 100644
--- a/src/cli/one_helper/onehost_helper.rb
+++ b/src/cli/one_helper/onehost_helper.rb
@@ -162,7 +162,7 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
         OpenNebula::HostPool.new(@client)
     end
 
-    def format_resource(host)
+    def format_resource(host, options = {})
         str    = "%-22s: %-20s"
         str_h1 = "%-80s"
 
diff --git a/src/cli/one_helper/oneimage_helper.rb b/src/cli/one_helper/oneimage_helper.rb
index 9f007f0c11..9628e4ed8b 100644
--- a/src/cli/one_helper/oneimage_helper.rb
+++ b/src/cli/one_helper/oneimage_helper.rb
@@ -262,7 +262,7 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
         OpenNebula::ImagePool.new(@client, user_flag)
     end
 
-    def format_resource(image)
+    def format_resource(image, options = {})
         str="%-15s: %-20s"
         str_h1="%-80s"
 
diff --git a/src/cli/one_helper/onetemplate_helper.rb b/src/cli/one_helper/onetemplate_helper.rb
index 1a4fdb753f..7d6a5626e3 100644
--- a/src/cli/one_helper/onetemplate_helper.rb
+++ b/src/cli/one_helper/onetemplate_helper.rb
@@ -91,7 +91,7 @@ EOT
         OpenNebula::TemplatePool.new(@client, user_flag)
     end
 
-    def format_resource(template)
+    def format_resource(template, options = {})
         str="%-15s: %-20s"
         str_h1="%-80s"
 
diff --git a/src/cli/one_helper/oneuser_helper.rb b/src/cli/one_helper/oneuser_helper.rb
index fbbdd21725..b9f6360116 100644
--- a/src/cli/one_helper/oneuser_helper.rb
+++ b/src/cli/one_helper/oneuser_helper.rb
@@ -245,7 +245,7 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
         OpenNebula::UserPool.new(@client)
     end
 
-    def format_resource(user)
+    def format_resource(user, options = {})
         system = System.new(@client)
         default_quotas = system.get_user_quotas()
 
diff --git a/src/cli/one_helper/onevm_helper.rb b/src/cli/one_helper/onevm_helper.rb
index 4d7202baac..cecbe1883a 100644
--- a/src/cli/one_helper/onevm_helper.rb
+++ b/src/cli/one_helper/onevm_helper.rb
@@ -196,7 +196,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         OpenNebula::VirtualMachinePool.new(@client, user_flag)
     end
 
-    def format_resource(vm)
+    def format_resource(vm, options = {})
         str_h1="%-80s"
         str="%-20s: %-20s"
 
diff --git a/src/cli/one_helper/onevnet_helper.rb b/src/cli/one_helper/onevnet_helper.rb
index 02e5b70c0e..e37e3bd846 100644
--- a/src/cli/one_helper/onevnet_helper.rb
+++ b/src/cli/one_helper/onevnet_helper.rb
@@ -98,7 +98,7 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
         OpenNebula::VirtualNetworkPool.new(@client, user_flag)
     end
 
-    def format_resource(vn)
+    def format_resource(vn, options = {})
         str_h1="%-80s"
         CLIHelper.print_header(str_h1 %
             ["VIRTUAL NETWORK #{vn.id.to_s} INFORMATION"])