Return-Path: X-Original-To: apmail-incubator-deltacloud-dev-archive@minotaur.apache.org Delivered-To: apmail-incubator-deltacloud-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2D0988F29 for ; Thu, 18 Aug 2011 10:06:26 +0000 (UTC) Received: (qmail 29247 invoked by uid 500); 18 Aug 2011 10:06:25 -0000 Delivered-To: apmail-incubator-deltacloud-dev-archive@incubator.apache.org Received: (qmail 29123 invoked by uid 500); 18 Aug 2011 10:06:16 -0000 Mailing-List: contact deltacloud-dev-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: deltacloud-dev@incubator.apache.org Delivered-To: mailing list deltacloud-dev@incubator.apache.org Received: (qmail 29101 invoked by uid 99); 18 Aug 2011 10:06:14 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Aug 2011 10:06:14 +0000 X-ASF-Spam-Status: No, hits=-5.0 required=5.0 tests=RCVD_IN_DNSWL_HI,SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of fvollero@redhat.com designates 209.132.183.28 as permitted sender) Received: from [209.132.183.28] (HELO mx1.redhat.com) (209.132.183.28) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Aug 2011 10:06:06 +0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p7IA5kON010532 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 18 Aug 2011 06:05:46 -0400 Received: from fermat.brq.redhat.com (dhcp-2-158.brq.redhat.com [10.34.2.158]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p7IA5hGO020244 for ; Thu, 18 Aug 2011 06:05:45 -0400 From: fvollero@redhat.com To: deltacloud-dev@incubator.apache.org Subject: [PATCH core 1/2] Add has_datacenter? method for datacenter existence in cluster object creation Date: Thu, 18 Aug 2011 12:05:39 +0200 Message-Id: <1313661940-29790-2-git-send-email-fvollero@redhat.com> In-Reply-To: <1313661940-29790-1-git-send-email-fvollero@redhat.com> References: <1313661940-29790-1-git-send-email-fvollero@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 From: Francesco Vollero Signed-off-by: Francesco Vollero --- .../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