kotovalexarian-likes-github/fog--fog
1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00
Code Releases Activity

Back to using Owner. A couple of tests for it too.

Browse source
This commit is contained in:
Dylan Egan 2011-08-04 15:18:48 -07:00
parent d2e06e96ca
commit 2165c31629
3 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/fog/compute/requests/aws/describe_images.rb
View file

@ -69,6 +69,14 @@ module Fog
Fog::Mock.not_implemented
end
if owner = filters.delete('Owner')
if owner == 'self'
filters['owner-id'] = self.data[:owner_id]
else
filters['owner-alias'] = owner
end
end
response = Excon::Response.new
aliases = {

2
lib/fog/compute/requests/aws/register_image.rb
View file

@ -79,7 +79,7 @@ module Fog
'ramdiskId' => Fog::AWS::Mock.ramdisk_id,
'platform' => 'Linux',
'stateReason' => {},
'imageOwnerAlias' => 'self',
'imageOwnerAlias' => self.data[:owner_id],
'name' => name,
'description' => description,
'rootDeviceType' => '',

12
tests/compute/requests/aws/image_tests.rb
View file

@ -44,10 +44,20 @@ Shindo.tests('Fog::Compute[:aws] | image requests', ['aws']) do
end
@image_id = @image['imageId']
tests("#describe_images('Owner' => 'self')").formats(@describe_images_format) do
Fog::Compute[:aws].describe_images('Owner' => 'self').body
end
end
tests("#describe_images('image-id' => '#{@image_id}')").formats(@describe_images_format) do
Fog::Compute[:aws].describe_images('image-id' => @image_id).body
@other_image = Fog::Compute[:aws].describe_images('image-id' => @image_id).body
end
unless Fog.mocking?
tests("#describe_images('Owner' => '#{@other_image['imageOwnerAlias']}', 'image-id' => '#{@image_id}')").formats(@describe_images_format) do
Fog::Compute[:aws].describe_images('Owner' => @other_image['imageOwnerAlias'], 'image-id' => @image_id).body
end
end
end
end