Return-Path: X-Original-To: apmail-incubator-deltacloud-dev-archive@minotaur.apache.org Delivered-To: apmail-incubator-deltacloud-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 054345988 for ; Thu, 12 May 2011 11:52:31 +0000 (UTC) Received: (qmail 85516 invoked by uid 500); 12 May 2011 11:52:30 -0000 Delivered-To: apmail-incubator-deltacloud-dev-archive@incubator.apache.org Received: (qmail 85492 invoked by uid 500); 12 May 2011 11:52:30 -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 85484 invoked by uid 99); 12 May 2011 11:52:30 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 May 2011 11:52:30 +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 (athena.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, 12 May 2011 11:52:24 +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.14.4/8.14.4) with ESMTP id p4CBq3E5014345 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 12 May 2011 07:52:03 -0400 Received: from dhcp-2-222.brq.redhat.com (dhcp-2-222.brq.redhat.com [10.34.2.222]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p4CBq0dX004299 for ; Thu, 12 May 2011 07:52:03 -0400 From: mfojtik@redhat.com To: deltacloud-dev@incubator.apache.org Subject: [PATCH core 2/4] Removed obsoleted flavors and accounts from JSON conversion helper Date: Thu, 12 May 2011 13:52:48 +0200 Message-Id: <1305201170-56690-3-git-send-email-mfojtik@redhat.com> In-Reply-To: <1305201170-56690-1-git-send-email-mfojtik@redhat.com> References: <1305201170-56690-1-git-send-email-mfojtik@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 From: Michal Fojtik Signed-off-by: Michal fojtik --- server/lib/deltacloud/helpers/conversion_helper.rb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/lib/deltacloud/helpers/conversion_helper.rb b/server/lib/deltacloud/helpers/conversion_helper.rb index e04cde7..da3aa60 100644 --- a/server/lib/deltacloud/helpers/conversion_helper.rb +++ b/server/lib/deltacloud/helpers/conversion_helper.rb @@ -19,7 +19,7 @@ require 'deltacloud/base_driver' module ConversionHelper def convert_to_json(type, obj) - if ( [ :flavor, :account, :image, :realm, :instance, :storage_volume, :storage_snapshot, :hardware_profile ].include?( type ) ) + if ( [ :image, :realm, :instance, :storage_volume, :storage_snapshot, :hardware_profile ].include?( type ) ) if Array.eql?(obj.class) data = obj.collect do |o| o.to_hash.merge({ :href => self.send(:"#{type}_url", type.eql?(:hardware_profile) ? o.name : o.id ) }) -- 1.7.4.1