Mailing-List: contact deltacloud-dev-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: deltacloud-dev@incubator.apache.org
Received-SPF: pass (athena.apache.org: domain of mfojtik@redhat.com designates
 209.132.183.28 as permitted sender)
Subject: Re: [PATCH core] Added check for datacenter in cluster
Mime-Version: 1.0 (Apple Message framework v1244.3)
Content-Type: text/plain; charset=us-ascii
From: Michal Fojtik <mfojtik@redhat.com>
In-Reply-To: <1313658222-27227-1-git-send-email-fvollero@redhat.com>
Date: Thu, 18 Aug 2011 11:13:03 +0200
Content-Transfer-Encoding: quoted-printable
Message-Id: <320D0114-1DC2-477A-AC7D-44E78876B6DC@redhat.com>
References: <1313658222-27227-1-git-send-email-fvollero@redhat.com>
To: deltacloud-dev@incubator.apache.org

On Aug 18, 2011, at 11:03 AM, fvollero@redhat.com wrote:

ACK. With small inline doubts :)

  -- Michal

> From: Francesco Vollero <fvollero@redhat.com>
>=20
> Signed-off-by: Francesco Vollero <fvollero@redhat.com>
> ---
> .../lib/deltacloud/drivers/rhevm/rhevm_client.rb   |   10 ++++++++--
> .../lib/deltacloud/drivers/rhevm/rhevm_driver.rb   |    1 +
> 2 files changed, 9 insertions(+), 2 deletions(-)
>=20
> diff --git a/server/lib/deltacloud/drivers/rhevm/rhevm_client.rb =
b/server/lib/deltacloud/drivers/rhevm/rhevm_client.rb
> index b4a2a80..fcc25e2 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(hea=
ders)).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
>=20
> @@ -196,6 +196,11 @@ module RHEVM
>       Nokogiri::XML(response)
>     end
>=20
> +    def has_datacenter?(vm)
> +      value=3D!(vm/'data_center').empty?
> +      puts "has_datacenter value: #{value}"
> +      value
> +    end
>   end
>=20
>   class BaseObject
> @@ -300,6 +305,7 @@ module RHEVM
>       @description =3D ((xml/'description').first.text rescue nil)
>       @datacenter =3D Link::new(@client, =
(xml/'data_center').first[:id], (xml/'data_center').first[:href])
>     end
> +

This new line is not necessary here.

>   end
>=20
>   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 =3D []
>     safely do
>       clusters =3D client.clusters
> +      puts clusters.size

Forgot to remove some debugging stuff?

>       clusters.each do |r|
>         d =3D client.datacenters(:id =3D> r.datacenter.id).first
>         realm_arr << convert_realm(r, d)
> --=20
> 1.7.4.4
>=20

 -- Michal

------------------------------------------------------
Michal Fojtik, mfojtik@redhat.com
Deltacloud API: http://deltacloud.org