[PATCH aeolus-conductor] BZ#753917 Updated API to return Provider/Account on Push

Petr Blaho pblaho at redhat.com
Tue Dec 13 16:08:05 UTC 2011


On Thursday, December 08, 2011 06:32:27 PM mtaylor at redhat.com 
wrote:
> From: Martyn Taylor <mtaylor at redhat.com>
> 
> ---
>  .../controllers/api/provider_images_controller.rb  |    1 +
>  .../_factory_provider_image.xml.haml               |    4 +++-
>  .../api/provider_images_controller_spec.rb         |    4 ++--
>  3 files changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/src/app/controllers/api/provider_images_controller.rb
> b/src/app/controllers/api/provider_images_controller.rb index
> 78c6c0d..7055cb4 100644
> --- a/src/app/controllers/api/provider_images_controller.rb
> +++ b/src/app/controllers/api/provider_images_controller.rb
> @@ -150,6 +150,7 @@ module Api
> 
>                                                                    :b
>                                                                    :u
>                                                                    :i
>                                                                    :l
>                                                                    :d
>                                                                    :_
>                                                                    :i
>                                                                    :d
>                                                                    :
>                                                                    :=
>                                                                    :>
>                                                                    :
>                                                                    :t
>                                                                    :a
>                                                                    :r
>                                                                    :g
>                                                                    :e
>                                                                    :t
>                                                                    :_
>                                                                    :i
>                                                                    :m
>                                                                    :a
>                                                                    :g
>                                                                    :e
>                                                                    :.
>                                                                    :b
>                                                                    :u
>                                                                    :i
>                                                                    :l
>                                                                    :d
>                                                                    :.
>                                                                    :i
>                                                                    :d
>                                                                    :,
>                                                                    :
>                                                                    :t
>                                                                    :a
>                                                                    :r
>                                                                    :g
>                                                                    :e
>                                                                    :t
>                                                                    :_
>                                                                    :i
>                                                                    :m
>                                                                    :a
>                                                                    :g
>                                                                    :e
>                                                                    :_
>                                                                    :i
>                                                                    :d
>                                                                    :
>                                                                    :=
>                                                                    :>
>                                                                    :
>                                                                    :t
>                                                                    :a
>                                                                    :r
>                                                                    :g
>                                                                    :e
>                                                                    :t
>                                                                    :_
>                                                                    :i
>                                                                    :m
>                                                                    :a
>                                                                    :g
>                                                                    :e
>                                                                    :.
>                                                                    :i
>                                                                    :d
>                                                                    :
>                                                                    :}
>                                                                    :)
>        provider_image.save!
> +      provider_image.account = account.label
>        provider_image
>      end
> 
> diff --git
> 
a/src/app/views/api/provider_images/_factory_provider_image.xml.haml
> 
b/src/app/views/api/provider_images/_factory_provider_image.xml.haml 
index
> aa849a2..0145d87 100644
> --- 
a/src/app/views/api/provider_images/_factory_provider_image.xml.haml
> +++ 
b/src/app/views/api/provider_images/_factory_provider_image.xml.haml
> @@ -1,3 +1,5 @@
>  !!!XML
>  %provider_image{:id => provider_image.id, :href =>
> api_provider_image_url(provider_image.id) } - 
> 
%status=Aeolus::Image::Factory::ProviderImage.status(provider_image.id) 
\
> No newline at end of file
> +  
%status=Aeolus::Image::Factory::ProviderImage.status(provider_image.id)
> +  %provider=provider_image.provider
> +  %account=provider_image.account
> \ No newline at end of file
> diff --git 
a/src/spec/controllers/api/provider_images_controller_spec.rb
> b/src/spec/controllers/api/provider_images_controller_spec.rb index
> 85fcfd2..162f9ee 100644
> --- a/src/spec/controllers/api/provider_images_controller_spec.rb
> +++ b/src/spec/controllers/api/provider_images_controller_spec.rb
> @@ -108,9 +108,9 @@ describe Api::ProviderImagesController do
> 
>                       :provider_name =>
>                       :'provider_name',
>                       :provider => "provider",
>                       :object_type =>
>                       :'provider_image',
> 
> +                     :account => 'account',
> 
>                       :target_identifier => '80',
>                       :target_image => @timage)
> 
> -
>      end
> 
>      context "when authenticated as admin" do
> @@ -369,8 +369,8 @@ describe Api::ProviderImagesController do
>              @target_image.stub(:build).and_return(@build1)
> 
>              
Aeolus::Image::Warehouse::Image.stub(:find).and_return(@image)
> +            controller.stub(:send_push_request).and_return(@pimage)
> 
> -            @pimage.stub(:save!)
>              request.env['RAW_POST_DATA'] = xml.to_xml
>              post :create
>            end
Works for me, ACK

-- 

With regards
Petr Blaho



More information about the aeolus-devel mailing list