Return-Path: X-Original-To: apmail-deltacloud-dev-archive@www.apache.org Delivered-To: apmail-deltacloud-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B86F0C553 for ; Thu, 31 May 2012 09:28:12 +0000 (UTC) Received: (qmail 14342 invoked by uid 500); 31 May 2012 09:28:12 -0000 Delivered-To: apmail-deltacloud-dev-archive@deltacloud.apache.org Received: (qmail 14209 invoked by uid 500); 31 May 2012 09:28:11 -0000 Mailing-List: contact dev-help@deltacloud.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@deltacloud.apache.org Delivered-To: mailing list dev@deltacloud.apache.org Received: (qmail 14168 invoked by uid 99); 31 May 2012 09:28:10 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 31 May 2012 09:28:10 +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 (nike.apache.org: domain of mfojtik@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, 31 May 2012 09:28:02 +0000 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q4V9RfjH029108 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 31 May 2012 05:27:41 -0400 Received: from dhcp-29-121.brq.redhat.com (dhcp-29-121.brq.redhat.com [10.34.29.121]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q4V9RcU5025154 for ; Thu, 31 May 2012 05:27:40 -0400 From: mfojtik@redhat.com To: dev@deltacloud.apache.org Subject: [PATCH core 2/3] EC2: Fixed the way how we handle describe_availability_zones to be 1.9 compatible Date: Thu, 31 May 2012 11:27:55 +0200 Message-Id: <1338456476-69367-2-git-send-email-mfojtik@redhat.com> In-Reply-To: <1338456476-69367-1-git-send-email-mfojtik@redhat.com> References: <1338456476-69367-1-git-send-email-mfojtik@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 From: Michal Fojtik Signed-off-by: Michal fojtik --- server/lib/deltacloud/drivers/ec2/ec2_driver.rb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/server/lib/deltacloud/drivers/ec2/ec2_driver.rb b/server/lib/deltacloud/drivers/ec2/ec2_driver.rb index f7ef826..6454cce 100644 --- a/server/lib/deltacloud/drivers/ec2/ec2_driver.rb +++ b/server/lib/deltacloud/drivers/ec2/ec2_driver.rb @@ -159,10 +159,15 @@ module Deltacloud def realms(credentials, opts={}) ec2 = new_client(credentials) - zone_id = opts ? opts[:id] : nil safely do - return ec2.describe_availability_zones(zone_id).collect do |realm| - convert_realm(realm) + if opts[:id] and !opts[:id].empty? + return ec2.describe_availability_zones([opts[:id]]).collect do |realm| + convert_realm(realm) + end + else + return ec2.describe_availability_zones.collect do |realm| + convert_realm(realm) + end end end end -- 1.7.10.2