[ec2] misc mock fixes
This commit is contained in:
parent
ace2752ff8
commit
64a9f633dc
|
@ -62,7 +62,7 @@ module Fog
|
||||||
|
|
||||||
class Mock
|
class Mock
|
||||||
|
|
||||||
def describe_instances(instance_id = {})
|
def describe_instances(instance_id = [])
|
||||||
response = Excon::Response.new
|
response = Excon::Response.new
|
||||||
instance_id = [*instance_id]
|
instance_id = [*instance_id]
|
||||||
if instance_id != []
|
if instance_id != []
|
||||||
|
|
|
@ -43,11 +43,11 @@ module Fog
|
||||||
|
|
||||||
snapshot_set.each do |snapshot|
|
snapshot_set.each do |snapshot|
|
||||||
case snapshot['status']
|
case snapshot['status']
|
||||||
when 'creating'
|
when 'in progress', 'pending'
|
||||||
if Time.now - volume['createTime'] > 2
|
if Time.now - snapshot['startTime'] > 2
|
||||||
snapshot['progress'] = '100%'
|
snapshot['progress'] = '100%'
|
||||||
snapshot['status'] = 'completed'
|
snapshot['status'] = 'completed'
|
||||||
else
|
elsif Time.now - snapshot['startTime'] > 1
|
||||||
snapshot['progress'] = '50%'
|
snapshot['progress'] = '50%'
|
||||||
snapshot['status'] = 'in progress'
|
snapshot['status'] = 'in progress'
|
||||||
end
|
end
|
||||||
|
|
|
@ -102,7 +102,6 @@ module Fog
|
||||||
|
|
||||||
group_set = [ (options['GroupId'] || 'default') ]
|
group_set = [ (options['GroupId'] || 'default') ]
|
||||||
instances_set = []
|
instances_set = []
|
||||||
owner_id = @owner_id
|
|
||||||
reservation_id = Fog::AWS::Mock.reservation_id
|
reservation_id = Fog::AWS::Mock.reservation_id
|
||||||
|
|
||||||
min_count.times do |i|
|
min_count.times do |i|
|
||||||
|
@ -120,7 +119,7 @@ module Fog
|
||||||
'keyName' => options['KeyName'] || '',
|
'keyName' => options['KeyName'] || '',
|
||||||
'launchTime' => Time.now,
|
'launchTime' => Time.now,
|
||||||
'monitoring' => { 'state' => options['Monitoring.Enabled'] || false },
|
'monitoring' => { 'state' => options['Monitoring.Enabled'] || false },
|
||||||
'ownerId' => owner_id,
|
'ownerId' => @owner_id,
|
||||||
'placement' => { 'availabilityZone' => options['Placement.AvailabilityZone'] || Fog::AWS::Mock.availability_zone },
|
'placement' => { 'availabilityZone' => options['Placement.AvailabilityZone'] || Fog::AWS::Mock.availability_zone },
|
||||||
'privateDnsName' => '',
|
'privateDnsName' => '',
|
||||||
'productCodes' => [],
|
'productCodes' => [],
|
||||||
|
@ -135,7 +134,7 @@ module Fog
|
||||||
response.body = {
|
response.body = {
|
||||||
'groupSet' => group_set,
|
'groupSet' => group_set,
|
||||||
'instancesSet' => instances_set,
|
'instancesSet' => instances_set,
|
||||||
'ownerId' => owner_id,
|
'ownerId' => @owner_id,
|
||||||
'requestId' => Fog::AWS::Mock.request_id,
|
'requestId' => Fog::AWS::Mock.request_id,
|
||||||
'reservationId' => reservation_id
|
'reservationId' => reservation_id
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue