deltacloud-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From David Lutterkort <lut...@redhat.com>
Subject Re: [PATCH core 3/4] CIMI: Removed event_logs and unused vars
Date Fri, 05 Oct 2012 21:27:25 GMT
On Wed, 2012-10-03 at 18:10 +0200, mfojtik@redhat.com wrote:
> From: Michal Fojtik <mfojtik@redhat.com>
> 
> 
> Signed-off-by: Michal fojtik <mfojtik@redhat.com>
> ---
>  server/lib/cimi/models/machine.rb      |    2 --
>  server/lib/cimi/models/network.rb      |    2 --
>  server/lib/cimi/models/network_port.rb |    2 --
>  server/lib/cimi/models/volume.rb       |   11 +++++------
>  4 files changed, 5 insertions(+), 12 deletions(-)

ACK, though you also need to remove eventLog in the test fixtures
(incremental patch attached)

> diff --git a/server/lib/cimi/models/volume.rb b/server/lib/cimi/models/volume.rb
> index 8d32c66..5e761f4 100644
> --- a/server/lib/cimi/models/volume.rb
> +++ b/server/lib/cimi/models/volume.rb
> @@ -68,14 +68,14 @@ class CIMI::Model::Volume < CIMI::Model::Base
>  
>    def self.find_to_attach_from_json(json_in, context)
>      json = JSON.parse(json_in)
> -    volumes = json["volumes"].map{|v| {:volume=>self.find(v["volume"]["href"].split("/volumes/").last,
context),
> -                                       :attachment_point=>v["attachmentPoint"]  }}
> +    json["volumes"].map{|v| {:volume=>self.find(v["volume"]["href"].split("/volumes/").last,
context),
> +                             :attachment_point=>v["attachmentPoint"]  }}
>    end
>  
>    def self.find_to_attach_from_xml(xml_in, context)
>      xml = XmlSimple.xml_in(xml_in)
> -    volumes = xml["volume"].map{|v| {:volume => self.find(v["href"].split("/volumes/").last,
context),
> -                                      :attachment_point=>v["attachmentPoint"] }}
> +    xml["volume"].map{|v| {:volume => self.find(v["href"].split("/volumes/").last,
context),
> +                           :attachment_point=>v["attachmentPoint"] }}
>    end

This hunk seems to only change formatting - please leave that out of
this patch.

David


Mime
View raw message