From cc9233e64bc0a240f769beaf442f5b79dc67896b Mon Sep 17 00:00:00 2001
From: Javi Fontan <jfontan@opennebula.org>
Date: Tue, 26 Feb 2013 16:06:20 +0100
Subject: [PATCH] feature #1640: show all disk info with --all in onevm show

---
 src/cli/one_helper/onevm_helper.rb | 8 +++++++-
 src/cli/onevm                      | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/cli/one_helper/onevm_helper.rb b/src/cli/one_helper/onevm_helper.rb
index afc62d3f45..cd5a3d6cd8 100644
--- a/src/cli/one_helper/onevm_helper.rb
+++ b/src/cli/one_helper/onevm_helper.rb
@@ -65,6 +65,12 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         :format     => Time
     }
 
+    ALL_TEMPLATE = {
+        :name       => "all",
+        :large      => "--all",
+        :description => "Show all template data"
+    }
+
     def self.rname
         "VM"
     end
@@ -340,7 +346,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
 
             while vm.has_elements?("/VM/TEMPLATE/DISK")
                 vm.delete_element("/VM/TEMPLATE/DISK")
-            end
+            end if !options[:all]
 
             puts
         end
diff --git a/src/cli/onevm b/src/cli/onevm
index 3577adf771..f98081f8d9 100755
--- a/src/cli/onevm
+++ b/src/cli/onevm
@@ -650,7 +650,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :show, show_desc, :vmid,
-            :options=>OpenNebulaHelper::XML do
+            :options=>[OpenNebulaHelper::XML, OneVMHelper::ALL_TEMPLATE] do
         helper.show_resource(args[0],options)
     end