Return-Path: Delivered-To: apmail-incubator-deltacloud-dev-archive@minotaur.apache.org Received: (qmail 8449 invoked from network); 15 Nov 2010 12:47:12 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 15 Nov 2010 12:47:12 -0000 Received: (qmail 50398 invoked by uid 500); 15 Nov 2010 12:47:43 -0000 Delivered-To: apmail-incubator-deltacloud-dev-archive@incubator.apache.org Received: (qmail 50379 invoked by uid 500); 15 Nov 2010 12:47:43 -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 50363 invoked by uid 99); 15 Nov 2010 12:47:43 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Nov 2010 12:47:43 +0000 X-ASF-Spam-Status: No, hits=-5.0 required=10.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; Mon, 15 Nov 2010 12:47:35 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oAFClEMW024225 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 15 Nov 2010 07:47:14 -0500 Received: from patashnik.brq.redhat.com (dhcp-2-138.brq.redhat.com [10.34.2.138]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id oAFCkvtk007166 for ; Mon, 15 Nov 2010 07:47:13 -0500 From: mfojtik@redhat.com To: deltacloud-dev@incubator.apache.org Subject: [PATCH core 10/14] Fixed some small bugs in EC2 driver Date: Mon, 15 Nov 2010 13:46:52 +0100 Message-Id: <1289825216-10939-11-git-send-email-mfojtik@redhat.com> In-Reply-To: <1289825216-10939-1-git-send-email-mfojtik@redhat.com> References: <1289825216-10939-1-git-send-email-mfojtik@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Virus-Checked: Checked by ClamAV on apache.org From: Michal Fojtik --- server/lib/deltacloud/drivers/ec2/ec2_driver.rb | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/server/lib/deltacloud/drivers/ec2/ec2_driver.rb b/server/lib/deltacloud/drivers/ec2/ec2_driver.rb index a0fd919..c58c1b4 100644 --- a/server/lib/deltacloud/drivers/ec2/ec2_driver.rb +++ b/server/lib/deltacloud/drivers/ec2/ec2_driver.rb @@ -143,7 +143,7 @@ module Deltacloud def realms(credentials, opts={}) ec2 = new_client(credentials) - zone_id = opts ? opts[:id] : [] + zone_id = opts ? opts[:id] : nil safely do return ec2.describe_availability_zones(zone_id).collect do |realm| convert_realm(realm) @@ -200,7 +200,7 @@ module Deltacloud ec2 = new_client(credentials) opts ||= {} safely do - ec2.describe_key_pairs(opts[:id] || []).collect do |key| + ec2.describe_key_pairs(opts[:id] || nil).collect do |key| convert_key(key) end end @@ -212,12 +212,21 @@ module Deltacloud def create_key(credentials, opts={}) ec2 = new_client(credentials) - puts opts.inspect safely do convert_key(ec2.create_key_pair(opts[:key_name])) end end + def destroy_key(credentials, opts={}) + ec2 = new_client(credentials) + original_key = key(credentials, opts) + safely do + ec2.delete_key_pair(original_key.id) + original_key= original_key.state = "DELETED" + end + original_key + end + def buckets(credentials, opts) buckets = [] safely do @@ -273,7 +282,7 @@ module Deltacloud def storage_volumes(credentials, opts={}) ec2 = new_client( credentials ) - volume_list = (opts and opts[:id]) ? opts[:id] : [] + volume_list = (opts and opts[:id]) ? opts[:id] : nil safely do ec2.describe_volumes(volume_list).collect do |volume| convert_volume(volume) @@ -409,7 +418,8 @@ module Deltacloud :id => key[:aws_key_name], :fingerprint => key[:aws_fingerprint], :credential_type => :key, - :pem_rsa_key => key[:aws_material] + :pem_rsa_key => key[:aws_material], + :state => "AVAILABLE" ) end -- 1.7.3.2