[Ovirt-devel] [PATCH server 3/8] Include CPU's in host information

[David Lutterkort]

---
 src/app/controllers/hardware_controller.rb |    7 ++++++-
 src/app/controllers/host_controller.rb     |    2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/app/controllers/hardware_controller.rb b/src/app/controllers/hardware_controller.rb
index 5c14eec..30e80b2 100644
--- a/src/app/controllers/hardware_controller.rb
+++ b/src/app/controllers/hardware_controller.rb
@@ -50,7 +50,12 @@ class HardwareController < PoolController
     end
 
     respond_to do |format|
-      format.xml { render :xml => @pools.to_xml(XML_OPTS) }
+      format.xml {
+        opts = XML_OPTS.dup
+        opts[:include] = opts[:include].inject({}) { |m, k| m[k] = {}; m }
+        opts[:include][:hosts] = { :include => :cpus }
+        render :xml => @pools.to_xml(opts)
+      }
     end
   end
 
diff --git a/src/app/controllers/host_controller.rb b/src/app/controllers/host_controller.rb
index da630f7..8cf2aed 100644
--- a/src/app/controllers/host_controller.rb
+++ b/src/app/controllers/host_controller.rb
@@ -60,7 +60,7 @@ class HostController < ApplicationController
     else
       respond_to do |format|
         format.html { render :layout => 'selection' }
-        format.xml { render :xml => @host.to_xml }
+        format.xml { render :xml => @host.to_xml(:include => [ :cpus ] ) }
       end
     end
   end
-- 
1.6.0.6