You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@deltacloud.apache.org by fv...@redhat.com on 2011/08/18 12:05:38 UTC
Add has_datacenter? method and puts cleanup from rhevm driver
This patchset will:
1: add has_datacenter? method, this method is needed to be sure that every cluster have the datacenter field in it.
2: Clean old puts used for debugging reasons.
[PATCH core 1/2] Add has_datacenter? method for datacenter existence in cluster object creation
Posted by fv...@redhat.com.
From: Francesco Vollero <fv...@redhat.com>
Signed-off-by: Francesco Vollero <fv...@redhat.com>
---
.../lib/deltacloud/drivers/rhevm/rhevm_client.rb | 9 +++++++--
.../lib/deltacloud/drivers/rhevm/rhevm_driver.rb | 1 +
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/server/lib/deltacloud/drivers/rhevm/rhevm_client.rb b/server/lib/deltacloud/drivers/rhevm/rhevm_client.rb
index b4a2a80..0755ad6 100644
--- a/server/lib/deltacloud/drivers/rhevm/rhevm_client.rb
+++ b/server/lib/deltacloud/drivers/rhevm/rhevm_client.rb
@@ -131,8 +131,8 @@ module RHEVM
[ RHEVM::Cluster::new(self, vm)]
else
Client::parse_response(RHEVM::client(@api_entrypoint)["/clusters"].get(headers)).xpath('/clusters/cluster').collect do |vm|
- RHEVM::Cluster::new(self, vm)
- end
+ RHEVM::Cluster::new(self, vm) if has_datacenter?(vm)
+ end.compact
end
end
@@ -196,6 +196,10 @@ module RHEVM
Nokogiri::XML(response)
end
+ def has_datacenter?(vm)
+ value=!(vm/'data_center').empty?
+ value
+ end
end
class BaseObject
@@ -300,6 +304,7 @@ module RHEVM
@description = ((xml/'description').first.text rescue nil)
@datacenter = Link::new(@client, (xml/'data_center').first[:id], (xml/'data_center').first[:href])
end
+
end
class DataCenter < BaseObject
diff --git a/server/lib/deltacloud/drivers/rhevm/rhevm_driver.rb b/server/lib/deltacloud/drivers/rhevm/rhevm_driver.rb
index d0d528e..5190598 100644
--- a/server/lib/deltacloud/drivers/rhevm/rhevm_driver.rb
+++ b/server/lib/deltacloud/drivers/rhevm/rhevm_driver.rb
@@ -78,6 +78,7 @@ class RHEVMDriver < Deltacloud::BaseDriver
realm_arr = []
safely do
clusters = client.clusters
+ puts clusters.size
clusters.each do |r|
d = client.datacenters(:id => r.datacenter.id).first
realm_arr << convert_realm(r, d)
--
1.7.4.4
[PATCH core 2/2] Clean rhevm_client from debug puts
Posted by fv...@redhat.com.
From: Francesco Vollero <fv...@redhat.com>
Signed-off-by: Francesco Vollero <fv...@redhat.com>
---
.../lib/deltacloud/drivers/rhevm/rhevm_client.rb | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/server/lib/deltacloud/drivers/rhevm/rhevm_client.rb b/server/lib/deltacloud/drivers/rhevm/rhevm_client.rb
index 0755ad6..f644dd9 100644
--- a/server/lib/deltacloud/drivers/rhevm/rhevm_client.rb
+++ b/server/lib/deltacloud/drivers/rhevm/rhevm_client.rb
@@ -76,8 +76,6 @@ module RHEVM
def create_template(vm_id, opts={})
opts ||= {}
- puts vm_id
- puts opts.inspect
builder = Nokogiri::XML::Builder.new do
template_ {
name opts[:name]
@@ -92,7 +90,6 @@ module RHEVM
})
headers.merge!(auth_header)
template = RHEVM::client(@api_entrypoint)["/templates"].post(Nokogiri::XML(builder.to_xml).root.to_s, headers)
- puts template
RHEVM::Template::new(self, Nokogiri::XML(template).root)
end
--
1.7.4.4