[Ovirt-devel] [PATCH server 4/8] API: include storage_volumes; indicate type for individual pools

[David Lutterkort]

---
 src/app/controllers/storage_controller.rb |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/app/controllers/storage_controller.rb b/src/app/controllers/storage_controller.rb
index 160d22e..ee9f116 100644
--- a/src/app/controllers/storage_controller.rb
+++ b/src/app/controllers/storage_controller.rb
@@ -32,7 +32,7 @@ class StorageController < ApplicationController
     list
     respond_to do |format|
       format.html { render :action => 'list' }
-      format.xml { render :xml => @storage_pools.to_xml }
+      format.xml { render :xml => @storage_pools.to_xml( :include => :storage_volumes) }
     end
   end
 
@@ -80,7 +80,12 @@ class StorageController < ApplicationController
     else
       respond_to do |format|
         format.html { render :layout => 'selection' }
-        format.xml { render :xml => @storage_pool.to_xml }
+        format.xml {
+          xml_txt = @storage_pool.to_xml(:include => :storage_volumes) do |xml|
+            xml.type @storage_pool.class.name
+          end
+          render :xml => xml_txt
+        }
       end
     end
   end
-- 
1.6.0.6