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 7FA3397EE for ; Fri, 15 Jun 2012 09:36:34 +0000 (UTC) Received: (qmail 87401 invoked by uid 500); 15 Jun 2012 09:36:34 -0000 Delivered-To: apmail-deltacloud-dev-archive@deltacloud.apache.org Received: (qmail 86763 invoked by uid 500); 15 Jun 2012 09:36:27 -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 86716 invoked by uid 99); 15 Jun 2012 09:36:26 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Jun 2012 09:36:26 +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 marios@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; Fri, 15 Jun 2012 09:36:18 +0000 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q5F9ZuSC014044 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 15 Jun 2012 05:35:56 -0400 Received: from name.redhat.com (ovpn-112-38.ams2.redhat.com [10.36.112.38]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q5F9ZsM1030407 for ; Fri, 15 Jun 2012 05:35:55 -0400 From: marios@redhat.com To: dev@deltacloud.apache.org Subject: [PATCH] Fix issue with empty realms returned from EC2 ('unavailable' realms shouldn't be reported to client) Date: Fri, 15 Jun 2012 12:35:53 +0300 Message-Id: <1339752953-31209-1-git-send-email-marios@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 From: marios Signed-off-by: marios --- server/lib/deltacloud/drivers/ec2/ec2_driver.rb | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/server/lib/deltacloud/drivers/ec2/ec2_driver.rb b/server/lib/deltacloud/drivers/ec2/ec2_driver.rb index 318db1a..7629ffa 100644 --- a/server/lib/deltacloud/drivers/ec2/ec2_driver.rb +++ b/server/lib/deltacloud/drivers/ec2/ec2_driver.rb @@ -160,17 +160,19 @@ module Deltacloud def realms(credentials, opts={}) ec2 = new_client(credentials) + realms = [] safely do if opts[:id] and !opts[:id].empty? - return ec2.describe_availability_zones([opts[:id]]).collect do |realm| - convert_realm(realm) + ec2.describe_availability_zones([opts[:id]]).collect do |realm| + realms << convert_realm(realm) unless realm.empty? end else - return ec2.describe_availability_zones.collect do |realm| - convert_realm(realm) + ec2.describe_availability_zones.collect do |realm| + realms << convert_realm(realm) unless realm.empty? end end end + realms end def create_image(credentials, opts={}) -- 1.7.6.5