From fb66cd4849e96da70b05d13004f4c1ec2be150d7 Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@Daniel-Molinas-MacBook-Pro.local>
Date: Fri, 9 Jul 2010 11:55:14 +0200
Subject: [PATCH] feature #201 Added Cluster info to Host

---
 src/cli/onehost                 | 10 +++++++++-
 src/oca/ruby/OpenNebula/Host.rb |  6 +++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/cli/onehost b/src/cli/onehost
index fcaafaad3f..84d33cec82 100755
--- a/src/cli/onehost
+++ b/src/cli/onehost
@@ -46,6 +46,13 @@ ShowTableHost={
         :left => true,
         :proc => lambda {|d,e| d.name }
     },
+    :cluster => {
+        :name => "CLUSTER",
+        :desc => "Clustername",
+        :size => 25,
+        :left => true,
+        :proc => lambda {|d,e| d.cluster }
+    },
     :rvm => {
         :name => "RVM",
         :desc => "Number of virtual machines running",
@@ -98,7 +105,7 @@ ShowTableHost={
     },
     
 
-    :default => [:id, :name, :rvm, :tcpu, :fcpu, :acpu, :tmem, :fmem, :stat]
+    :default => [:id, :name, :cluster, :rvm, :tcpu, :fcpu, :acpu, :tmem, :fmem, :stat]
 }
 
 class HostShow
@@ -257,6 +264,7 @@ when "show"
 
         puts str % ["ID", host[:id]]
         puts str % ["NAME", host[:name]]
+        puts str % ["CLUSTER", host[:cluster]]
         puts str % ["STATE", host.state_str]
         puts str % ["IM_MAD", host[:im_mad]]
         puts str % ["VM_MAD", host[:vm_mad]]
diff --git a/src/oca/ruby/OpenNebula/Host.rb b/src/oca/ruby/OpenNebula/Host.rb
index ceb718e60b..e8aadd0bb2 100644
--- a/src/oca/ruby/OpenNebula/Host.rb
+++ b/src/oca/ruby/OpenNebula/Host.rb
@@ -86,12 +86,16 @@ module OpenNebula
             HOST_STATES[state]
         end
 
-
         # Returns the state of the Host (string value)
         def short_state_str
             SHORT_HOST_STATES[state_str]
         end
 
+        # Returns the cluster of the Host 
+        def cluster
+            self['CLUSTER']
+        end
+
 
     private
         def set_enabled(enabled)