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 8590ED96B for ; Thu, 22 Nov 2012 09:47:12 +0000 (UTC) Received: (qmail 60640 invoked by uid 500); 22 Nov 2012 09:47:10 -0000 Delivered-To: apmail-deltacloud-dev-archive@deltacloud.apache.org Received: (qmail 59882 invoked by uid 500); 22 Nov 2012 09:47:06 -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 59688 invoked by uid 99); 22 Nov 2012 09:47:02 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Nov 2012 09:47:02 +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, 22 Nov 2012 09:46:57 +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 qAM9kZ0A009087 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 22 Nov 2012 04:46:35 -0500 Received: from boosh.local (vpn1-7-165.ams2.redhat.com [10.36.7.165]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qAM9kYvE018353; Thu, 22 Nov 2012 04:46:35 -0500 Message-ID: <50ADF47A.50500@redhat.com> Date: Thu, 22 Nov 2012 10:46:34 +0100 From: Michal Fojtik Organization: Red Hat Inc. User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121016 Thunderbird/16.0.1 MIME-Version: 1.0 To: dev@deltacloud.apache.org Subject: Re: [PATCH] CIMI - Fixes nits on MachineImage model - DTACLOUD-378 References: <1353572656-19174-1-git-send-email-marios@redhat.com> In-Reply-To: <1353572656-19174-1-git-send-email-marios@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-Virus-Checked: Checked by ClamAV on apache.org On 11/22/2012 09:24 AM, marios@redhat.com wrote: ACK. > From: marios > > https://issues.apache.org/jira/browse/DTACLOUD-378 > > Signed-off-by: marios > --- > server/lib/cimi/models/machine_image.rb | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/server/lib/cimi/models/machine_image.rb b/server/lib/cimi/models/machine_image.rb > index 3e1e604..6034e5b 100644 > --- a/server/lib/cimi/models/machine_image.rb > +++ b/server/lib/cimi/models/machine_image.rb > @@ -18,8 +18,9 @@ class CIMI::Model::MachineImage < CIMI::Model::Base > acts_as_root_entity > > text :state > - href :image_location > - text :image_data > + text :type > + text :image_location > + href :related_image > > array :operations do > scalar :rel, :href > @@ -41,9 +42,10 @@ class CIMI::Model::MachineImage < CIMI::Model::Base > :name => image.id, > :id => context.machine_image_url(image.id), > :state => image.state || 'UNKNOWN', > + :type => "IMAGE", > :description => image.description, > :created => Time.now.xmlschema, > - :image_location => { :href => "#{context.driver.name}://#{image.id}" } # FIXME > + :image_location => "#{context.driver.name}://#{image.id}" # FIXME > ) > end > > -- Michal Fojtik Deltacloud API, CloudForms