From 8d065175388bdff4478fc63e87a583a55b6b4dfc Mon Sep 17 00:00:00 2001 From: Alvin Garcia Date: Fri, 17 Aug 2012 15:54:39 +0800 Subject: [PATCH] [openstack|image] Fixed update image and list public images mocks --- lib/fog/openstack/requests/image/list_public_images_detailed.rb | 2 +- lib/fog/openstack/requests/image/update_image.rb | 2 +- tests/openstack/requests/image/image_tests.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/fog/openstack/requests/image/list_public_images_detailed.rb b/lib/fog/openstack/requests/image/list_public_images_detailed.rb index d040121ce..63b14a026 100644 --- a/lib/fog/openstack/requests/image/list_public_images_detailed.rb +++ b/lib/fog/openstack/requests/image/list_public_images_detailed.rb @@ -19,7 +19,7 @@ module Fog end # class Real class Mock - def list_public_images_detailed + def list_public_images_detailed(attribute=nil, query=nil) response = Excon::Response.new response.status = [200, 204][rand(1)] response.body = {"images"=>[{ diff --git a/lib/fog/openstack/requests/image/update_image.rb b/lib/fog/openstack/requests/image/update_image.rb index 7daba7876..44698e428 100644 --- a/lib/fog/openstack/requests/image/update_image.rb +++ b/lib/fog/openstack/requests/image/update_image.rb @@ -56,7 +56,7 @@ module Fog "min_ram"=>0, "owner"=>"728ecc7c10614a1faa6fbabd1a68a4a0", "properties"=>{} - } + }.merge(Hash[attributes.map { |key, val| [key.to_s, val] }]) } response diff --git a/tests/openstack/requests/image/image_tests.rb b/tests/openstack/requests/image/image_tests.rb index 6b6d5c7e0..b49e22380 100644 --- a/tests/openstack/requests/image/image_tests.rb +++ b/tests/openstack/requests/image/image_tests.rb @@ -56,7 +56,7 @@ Shindo.tests('Fog::Image[:openstack] | image requests', ['openstack']) do end tests('#list_public_images_detailed').formats({'images' => [@image_format]}) do - Fog::Image[:openstack].list_public_images.body + Fog::Image[:openstack].list_public_images_detailed.body end tests('#create_image').formats({'image' => @image_format}) do