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

Merge pull request #469 from dylanegan/mock_image_states

Browse source 
[compute|aws] Allow image mocks to support state (except failed).
This commit is contained in:
Wesley Beary 2011-08-17 07:37:14 -07:00
commit 40aaf4397a
4 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/fog/compute/models/aws/image.rb
View file

@ -37,6 +37,10 @@ module Fog
end
end
def ready?
state == 'available'
end
end
end

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

@ -109,6 +109,16 @@ module Fog
end
end
image_set = image_set.map do |image|
case image['imageState']
when 'pending'
if Time.now - image['registered'] >= Fog::Mock.delay
image['imageState'] = 'available'
end
end
image.reject { |key, value| ['registered'].include?(key) }
end
response.status = 200
response.body = {
'requestId' => Fog::AWS::Mock.request_id,

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

@ -69,7 +69,7 @@ module Fog
image = {
'imageId' => Fog::AWS::Mock.image_id,
'imageLocation' => '',
'imageState' => 'available',
'imageState' => 'pending',
'imageOwnerId' => self.data[:owner_id],
'isPublic' => false,
'productCodes' => [],
@ -87,7 +87,8 @@ module Fog
'blockDeviceMapping' => [],
'virtualizationType' => 'paravirtual',
'tagSet' => {},
'hypervisor' => 'xen'
'hypervisor' => 'xen',
'registered' => Time.now
}
if location[/^\/dev\/sd[a-p]\d{0,2}$/]

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

@ -44,10 +44,15 @@ Shindo.tests('Fog::Compute[:aws] | image requests', ['aws']) do
end
@image_id = @image['imageId']
sleep 1
tests("#describe_images('Owner' => 'self')").formats(@describe_images_format) do
Fog::Compute[:aws].describe_images('Owner' => 'self').body
end
tests("#describe_images('state' => 'available')").formats(@describe_images_format) do
Fog::Compute[:aws].describe_images('state' => 'available').body
end
end
tests("#describe_images('image-id' => '#{@image_id}')").formats(@describe_images_format) do