From 9cd3d3df1b80919f3d1abecaf9c3b1d583ef4688 Mon Sep 17 00:00:00 2001
From: Daniel Molina <danmolin@fdi.ucm.es>
Date: Tue, 14 Feb 2012 11:28:36 +0100
Subject: [PATCH] Add verbose option to OCCI resources

---
 src/cloud/occi/lib/ImageOCCI.rb              | 2 +-
 src/cloud/occi/lib/ImagePoolOCCI.rb          | 2 +-
 src/cloud/occi/lib/UserOCCI.rb               | 2 +-
 src/cloud/occi/lib/UserPoolOCCI.rb           | 2 +-
 src/cloud/occi/lib/VirtualMachineOCCI.rb     | 2 +-
 src/cloud/occi/lib/VirtualNetworkOCCI.rb     | 2 +-
 src/cloud/occi/lib/VirtualNetworkPoolOCCI.rb | 3 ++-
 7 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/cloud/occi/lib/ImageOCCI.rb b/src/cloud/occi/lib/ImageOCCI.rb
index 777876fdcd..f95f4f65bc 100755
--- a/src/cloud/occi/lib/ImageOCCI.rb
+++ b/src/cloud/occi/lib/ImageOCCI.rb
@@ -84,7 +84,7 @@ class ImageOCCI < Image
     end
 
     # Creates the OCCI representation of an Image
-    def to_occi(base_url)
+    def to_occi(base_url, verbose=false)
         begin
             occi_im = ERB.new(OCCI_IMAGE)
             occi_im_text = occi_im.result(binding)
diff --git a/src/cloud/occi/lib/ImagePoolOCCI.rb b/src/cloud/occi/lib/ImagePoolOCCI.rb
index ee38636867..db1d89d306 100755
--- a/src/cloud/occi/lib/ImagePoolOCCI.rb
+++ b/src/cloud/occi/lib/ImagePoolOCCI.rb
@@ -30,7 +30,7 @@ class ImagePoolOCCI < ImagePool
     }
     
     # Creates the OCCI representation of a Virtual Machine Pool
-    def to_occi(base_url)
+    def to_occi(base_url, verbose=false)
         begin
             occi = ERB.new(OCCI_IMAGE_POOL)
             occi_text = occi.result(binding) 
diff --git a/src/cloud/occi/lib/UserOCCI.rb b/src/cloud/occi/lib/UserOCCI.rb
index fa8a960ef2..ecb71deb37 100644
--- a/src/cloud/occi/lib/UserOCCI.rb
+++ b/src/cloud/occi/lib/UserOCCI.rb
@@ -51,7 +51,7 @@ class UserOCCI < User
     end
 
     # Creates the OCCI representation of a User
-    def to_occi(base_url)
+    def to_occi(base_url, verbose=false)
         quota = Quota.new
         user_usage = quota.get_usage(self.id, nil, FORCE_USAGE)
         user_usage.delete(:uid)
diff --git a/src/cloud/occi/lib/UserPoolOCCI.rb b/src/cloud/occi/lib/UserPoolOCCI.rb
index 2745020dc7..6455a2c3b8 100644
--- a/src/cloud/occi/lib/UserPoolOCCI.rb
+++ b/src/cloud/occi/lib/UserPoolOCCI.rb
@@ -30,7 +30,7 @@ class UserPoolOCCI < UserPool
     }
 
     # Creates the OCCI representation of a User Pool
-    def to_occi(base_url)
+    def to_occi(base_url, verbose=false)
         begin
             occi = ERB.new(OCCI_USER_POOL)
             occi_text = occi.result(binding)
diff --git a/src/cloud/occi/lib/VirtualMachineOCCI.rb b/src/cloud/occi/lib/VirtualMachineOCCI.rb
index 4cb8754653..3a190e571a 100755
--- a/src/cloud/occi/lib/VirtualMachineOCCI.rb
+++ b/src/cloud/occi/lib/VirtualMachineOCCI.rb
@@ -122,7 +122,7 @@ class VirtualMachineOCCI < VirtualMachine
     end
 
     # Creates the VMI representation of a Virtual Machine
-    def to_occi(base_url)
+    def to_occi(base_url, verbose=false)
         begin
             occi_vm = ERB.new(OCCI_VM)
             occi_vm_text = occi_vm.result(binding)
diff --git a/src/cloud/occi/lib/VirtualNetworkOCCI.rb b/src/cloud/occi/lib/VirtualNetworkOCCI.rb
index 68edb59c7f..6efe071bba 100755
--- a/src/cloud/occi/lib/VirtualNetworkOCCI.rb
+++ b/src/cloud/occi/lib/VirtualNetworkOCCI.rb
@@ -54,7 +54,7 @@ class VirtualNetworkOCCI < VirtualNetwork
     end
 
     # Creates the OCCI representation of a Virtual Network
-    def to_occi(base_url)
+    def to_occi(base_url, verbose=false)
         network_address = nil
         network_size    = nil
 
diff --git a/src/cloud/occi/lib/VirtualNetworkPoolOCCI.rb b/src/cloud/occi/lib/VirtualNetworkPoolOCCI.rb
index 3de2469ae9..a88fdf6d0c 100755
--- a/src/cloud/occi/lib/VirtualNetworkPoolOCCI.rb
+++ b/src/cloud/occi/lib/VirtualNetworkPoolOCCI.rb
@@ -31,7 +31,8 @@ class VirtualNetworkPoolOCCI < VirtualNetworkPool
     
     
     # Creates the OCCI representation of a Virtual Machine Pool
-    def to_occi(base_url)begin
+    def to_occi(base_url, verbose=false)
+        begin
             occi = ERB.new(OCCI_NETWORK_POOL)
             occi_text = occi.result(binding) 
         rescue Exception => e