Return-Path: 
 <dev-return-8466-apmail-deltacloud-dev-archive=deltacloud.apache.org@deltacloud.apache.org>
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 6FD41EDC8
	for <apmail-deltacloud-dev-archive@www.apache.org>;
 Mon, 25 Feb 2013 11:24:25 +0000 (UTC)
Received: (qmail 30389 invoked by uid 500); 25 Feb 2013 11:24:25 -0000
Delivered-To: apmail-deltacloud-dev-archive@deltacloud.apache.org
Received: (qmail 30265 invoked by uid 500); 25 Feb 2013 11:24:24 -0000
Mailing-List: contact dev-help@deltacloud.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@deltacloud.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@deltacloud.apache.org>
List-Post: <mailto:dev@deltacloud.apache.org>
List-Id: <dev.deltacloud.apache.org>
Reply-To: dev@deltacloud.apache.org
Delivered-To: mailing list dev@deltacloud.apache.org
Received: (qmail 30238 invoked by uid 99); 25 Feb 2013 11:24:23 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Feb 2013 11:24:23 +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 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, 25 Feb 2013 11:24:17 +0000
Received: from int-mx10.intmail.prod.int.phx2.redhat.com
 (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23])
	by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r1PBNt68003327
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
	for <dev@deltacloud.apache.org>; Mon, 25 Feb 2013 06:23:55 -0500
Received: from boosh.local (dhcp-29-236.brq.redhat.com [10.34.29.236])
	by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id
 r1PAU0qZ025102
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO);
	Mon, 25 Feb 2013 05:30:05 -0500
Date: Mon, 25 Feb 2013 11:29:59 +0100
From: Michal Fojtik <mfojtik@redhat.com>
To: dev@deltacloud.apache.org
Subject: Re: [PATCH] CIMI: replace volume related attachment_point and
 protocol attributes with initial_location as per published cimi spec
Message-ID: <20130225102959.GA12092@boosh.local>
References: <1361748208-6272-1-git-send-email-diesk@fast.au.fujitsu.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <1361748208-6272-1-git-send-email-diesk@fast.au.fujitsu.com>
User-Agent: Mutt/1.5.21 (2010-09-15)
X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23
X-Virus-Checked: Checked by ClamAV on apache.org

On 02/25, diesk@fast.au.fujitsu.com wrote:

ACK. Two minor non-review-blockers issues found below :)

  -- Michal

> From: Dies Koper <diesk@fast.au.fujitsu.com>
> 
> ---
>  server/lib/cimi/data/default_res/machine.col.xml | 4 ++--

I just discovered this directory :-) I think we should move all
sample CIMI XML/JSON to server/support/cimi.

I use this directory to store various CIMI XML files I used for entity
creation during testing/etc.

>  server/lib/cimi/models/base.rb                   | 4 ++--
>  server/lib/cimi/models/machine.rb                | 2 +-
>  server/lib/cimi/models/machine_configuration.rb  | 2 +-
>  server/lib/cimi/models/machine_template.rb       | 6 ++----
>  server/lib/cimi/models/volume.rb                 | 4 ++--
>  server/tests/cimi/data/machine_template.json     | 3 +--
>  server/tests/cimi/data/machine_template.xml      | 2 +-
>  8 files changed, 12 insertions(+), 15 deletions(-)
> 

<snip/>

> +++ b/server/lib/cimi/models/volume.rb
> @@ -77,13 +77,13 @@ class CIMI::Model::Volume < CIMI::Model::Base
>    def self.find_to_attach_from_json(json_in, context)
>      json = JSON.parse(json_in)
>      json["volumes"].map{|v| {:volume=>self.find(v["volume"]["href"].split("/volumes/").last, context),
> -                             :attachment_point=>v["attachmentPoint"]  }}
> +                             :initial_location=>v["initialLocation"]  }}
>    end
>  
>    def self.find_to_attach_from_xml(xml_in, context)
>      xml = XmlSimple.xml_in(xml_in)
>      xml["volume"].map{|v| {:volume => self.find(v["href"].split("/volumes/").last, context),
> -                           :attachment_point=>v["attachmentPoint"] }}
> +                           :initial_location=>v["initialLocation"] }}
>    end

I tried to locate where we use these two method in code but no luck :(

 ~/code/core/server › ack find_to_attach_from_json

lib/cimi/models/volume.rb
77:  def self.find_to_attach_from_json(json_in, context)

lib/cimi/models/machine_volume.rb
64:  def self.find_to_attach_from_json(json_in, context)

lib/cimi/collections/machines.rb
175:            volume_to_attach, location = MachineVolume.find_to_attach_from_json(request.body.read, self)

I think this method was obsoleted and so should be removed.

  -- Michal

-- 
Michal Fojtik <mfojtik@redhat.com>
Deltacloud API, CloudForms