mirror of
https://github.com/fog/fog.git
synced 2022-11-09 13:51:43 -05:00
5e170965d2
lib/fog/aws.rb Previously chose 4xRandom numbers between 0 and 999, now uses the Mock random_ip which returns numbers that will be within acceptable number range. Old method was returning invalid numbers that then failed to pass range checks. lib/fog/aws/requests/compute/associate_address.rb Re-fetch address if we have to look up public-ip using allocation-id, otherwise it remains nil and the ip-address/instance aren't updated correctly. lib/fog/aws/requests/compute/describe_addresses.rb The allocate-address request uses allocation-id to look up ip address if allocation-id is given instead of public-ip, so added that as searchable in mock data.
66 lines
2.3 KiB
Ruby
66 lines
2.3 KiB
Ruby
module Fog
|
|
module Compute
|
|
class AWS
|
|
class Real
|
|
|
|
require 'fog/aws/parsers/compute/describe_addresses'
|
|
|
|
# Describe all or specified IP addresses.
|
|
#
|
|
# ==== Parameters
|
|
# * filters<~Hash> - List of filters to limit results with
|
|
#
|
|
# ==== Returns
|
|
# * response<~Excon::Response>:
|
|
# * body<~Hash>:
|
|
# * 'requestId'<~String> - Id of request
|
|
# * 'addressesSet'<~Array>:
|
|
# * 'instanceId'<~String> - instance for ip address
|
|
# * 'publicIp'<~String> - ip address for instance
|
|
#
|
|
# {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeAddresses.html]
|
|
def describe_addresses(filters = {})
|
|
unless filters.is_a?(Hash)
|
|
Fog::Logger.deprecation("describe_addresses with #{filters.class} param is deprecated, use describe_addresses('public-ip' => []) instead [light_black](#{caller.first})[/]")
|
|
filters = {'public-ip' => [*filters]}
|
|
end
|
|
params = Fog::AWS.indexed_filters(filters)
|
|
request({
|
|
'Action' => 'DescribeAddresses',
|
|
:idempotent => true,
|
|
:parser => Fog::Parsers::Compute::AWS::DescribeAddresses.new
|
|
}.merge!(params))
|
|
end
|
|
|
|
end
|
|
|
|
class Mock
|
|
|
|
def describe_addresses(filters = {})
|
|
unless filters.is_a?(Hash)
|
|
Fog::Logger.deprecation("describe_addresses with #{filters.class} param is deprecated, use describe_addresses('public-ip' => []) instead [light_black](#{caller.first})[/]")
|
|
filters = {'public-ip' => [*filters]}
|
|
end
|
|
|
|
response = Excon::Response.new
|
|
|
|
addresses_set = self.data[:addresses].values
|
|
|
|
aliases = {'public-ip' => 'publicIp', 'instance-id' => 'instanceId', 'allocation-id' => 'allocationId'}
|
|
for filter_key, filter_value in filters
|
|
aliased_key = aliases[filter_key]
|
|
addresses_set = addresses_set.reject{|address| ![*filter_value].include?(address[aliased_key])}
|
|
end
|
|
|
|
response.status = 200
|
|
response.body = {
|
|
'requestId' => Fog::AWS::Mock.request_id,
|
|
'addressesSet' => addresses_set
|
|
}
|
|
response
|
|
end
|
|
|
|
end
|
|
end
|
|
end
|
|
end
|