Return-Path: X-Original-To: apmail-deltacloud-commits-archive@www.apache.org Delivered-To: apmail-deltacloud-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1B591E251 for ; Thu, 17 Jan 2013 16:15:50 +0000 (UTC) Received: (qmail 29435 invoked by uid 500); 17 Jan 2013 16:15:50 -0000 Delivered-To: apmail-deltacloud-commits-archive@deltacloud.apache.org Received: (qmail 29406 invoked by uid 500); 17 Jan 2013 16:15:49 -0000 Mailing-List: contact commits-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 commits@deltacloud.apache.org Received: (qmail 29392 invoked by uid 99); 17 Jan 2013 16:15:49 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Jan 2013 16:15:49 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2B4261FEF9; Thu, 17 Jan 2013 16:15:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: marios@apache.org To: commits@deltacloud.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: Fix for DTACLOUD-419 - Typos in Intance model to_hash Message-Id: <20130117161549.2B4261FEF9@tyr.zones.apache.org> Date: Thu, 17 Jan 2013 16:15:49 +0000 (UTC) Updated Branches: refs/heads/master 599df2fc4 -> a75ed47a6 Fix for DTACLOUD-419 - Typos in Intance model to_hash https://issues.apache.org/jira/browse/DTACLOUD-419 Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/a75ed47a Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/a75ed47a Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/a75ed47a Branch: refs/heads/master Commit: a75ed47a6746deacf21a8cc53d34aa5ed30e4671 Parents: 599df2f Author: marios Authored: Wed Jan 16 18:07:11 2013 +0200 Committer: marios Committed: Wed Jan 16 18:07:11 2013 +0200 ---------------------------------------------------------------------- server/lib/deltacloud/models/instance.rb | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltacloud/blob/a75ed47a/server/lib/deltacloud/models/instance.rb ---------------------------------------------------------------------- diff --git a/server/lib/deltacloud/models/instance.rb b/server/lib/deltacloud/models/instance.rb index fcfe092..8396529 100644 --- a/server/lib/deltacloud/models/instance.rb +++ b/server/lib/deltacloud/models/instance.rb @@ -64,15 +64,15 @@ class Instance < BaseModel } r.merge!(:launch_time => launch_time) r.merge!(:create_image => create_image) if create_image - r.merge!(:firewalls => firewalls.map { |f| { :id => f.id, :href => context.firewall_url(f.id), :rel => :firewall }}) if firewalls + r.merge!(:firewalls => firewalls.map { |f| { :id => f, :href => context.firewall_url(f), :rel => :firewall }}) if firewalls if storage_volumes - r.merge!(:storage_volumes => storage_volumes.map { |f| { :id => f.id, :href => context.storage_volume_url(f.id), :rel => :storage_volume }}) + r.merge!(:storage_volumes => storage_volumes.map { |v| { :id => v.keys.first, :href => context.storage_volume_url(v.keys.first), :rel => :storage_volume }}) end if context.driver.class.has_feature?(:instances, :authentication_key) r.merge!(:authentication => { :keyname => keyname }) if keyname end if context.driver.class.has_feature?(:instances, :authentication_password) - r.merge!(:authentication => { :user => username, :password => password }) if user + r.merge!(:authentication => { :user => username, :password => password }) if username end r end