kotovalexarian-likes-github
/
fog--fog
mirror of https://github.com/fog/fog.git
1
0
Fork 0
Code Releases Activity

[ec2] misc mock fixes

This commit is contained in:
geemus (Wesley Beary) 2010-04-07 20:53:59 -07:00
parent ace2752ff8
commit 64a9f633dc
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/fog/aws/requests/ec2/describe_instances.rb
View File

@ -62,7 +62,7 @@ module Fog
class Mock
def describe_instances(instance_id = {})
def describe_instances(instance_id = [])
response = Excon::Response.new
instance_id = [*instance_id]
if instance_id != []

6
lib/fog/aws/requests/ec2/describe_snapshots.rb
View File

@ -43,11 +43,11 @@ module Fog
snapshot_set.each do |snapshot|
case snapshot['status']
when 'creating'
if Time.now - volume['createTime'] > 2
when 'in progress', 'pending'
if Time.now - snapshot['startTime'] > 2
snapshot['progress'] = '100%'
snapshot['status'] = 'completed'
else
elsif Time.now - snapshot['startTime'] > 1
snapshot['progress'] = '50%'
snapshot['status'] = 'in progress'
end

5
lib/fog/aws/requests/ec2/run_instances.rb
View File

@ -102,7 +102,6 @@ module Fog
group_set = [ (options['GroupId'] || 'default') ]
instances_set = []
owner_id = @owner_id
reservation_id = Fog::AWS::Mock.reservation_id
min_count.times do |i|
@ -120,7 +119,7 @@ module Fog
'keyName' => options['KeyName'] || '',
'launchTime' => Time.now,
'monitoring' => { 'state' => options['Monitoring.Enabled'] || false },
'ownerId' => owner_id,
'ownerId' => @owner_id,
'placement' => { 'availabilityZone' => options['Placement.AvailabilityZone'] || Fog::AWS::Mock.availability_zone },
'privateDnsName' => '',
'productCodes' => [],
@ -135,7 +134,7 @@ module Fog
response.body = {
'groupSet' => group_set,
'instancesSet' => instances_set,
'ownerId' => owner_id,
'ownerId' => @owner_id,
'requestId' => Fog::AWS::Mock.request_id,
'reservationId' => reservation_id
}