fog 1.4.0 → 1.5.0

data/lib/fog/aws/requests/compute/create_vpc.rb

@@ -43,16 +43,17 @@ module Fog
           Excon::Response.new.tap do |response|
             if cidrBlock 
               response.status = 200
+              self.data[:vpcs].push({
+                'vpcId'         => Fog::AWS::Mock.request_id,
+                'state'         => 'pending',
+                'cidrBlock'     => cidrBlock,
+                'dhcpOptionsId' => Fog::AWS::Mock.request_id,
+                'tagSet'        => {}
             
+              })
               response.body = {
                 'requestId' => Fog::AWS::Mock.request_id,
-                'vpcSet'    => [
-                  'vpcId'         => Fog::AWS::Mock.request_id,
-                  'state'         => 'pending',
-                  'cidrBlock'     => cidrBlock,
-                  'dhcpOptionsId' => Fog::AWS::Mock.request_id,
-                  'tagSet'        => {}
-                ]
+                'vpcSet'    => self.data[:vpcs]
               }
             else
               response.status = 400

data/lib/fog/aws/requests/compute/delete_dhcp_options.rb

@@ -32,6 +32,7 @@ module Fog
           Excon::Response.new.tap do |response|
             if dhcp_options_id
               response.status = 200
+              self.data[:dhcp_options].reject! { |v| v['dhcpOptionsId'] == dhcp_options_id }
             
               response.body = {
                 'requestId' => Fog::AWS::Mock.request_id,

data/lib/fog/aws/requests/compute/delete_internet_gateway.rb

@@ -30,6 +30,7 @@ module Fog
           Excon::Response.new.tap do |response|
             if internet_gateway_id
               response.status = 200
+              self.data[:internet_gateways].reject! { |v| v['internetGatewayId'] == internet_gateway_id }
             
               response.body = {
                 'requestId' => Fog::AWS::Mock.request_id,

data/lib/fog/aws/requests/compute/delete_subnet.rb

@@ -30,6 +30,7 @@ module Fog
         def delete_subnet(subnet_id)
           Excon::Response.new.tap do |response|
             if subnet_id
+              self.data[:subnets].reject! { |v| v['subnetId'] == subnet_id }
               response.status = 200
             
               response.body = {

data/lib/fog/aws/requests/compute/delete_vpc.rb

@@ -34,7 +34,8 @@ module Fog
           Excon::Response.new.tap do |response|
             if vpc_id
               response.status = 200
-            
+              self.data[:vpcs].reject! { |v| v['vpcId'] == vpc_id }
+
               response.body = {
                 'requestId' => Fog::AWS::Mock.request_id,
                 'return' => true

data/lib/fog/aws/requests/compute/describe_availability_zones.rb

@@ -50,6 +50,7 @@ module Fog
             {"messageSet" => [], "regionName" => "us-east-1", "zoneName" => "us-east-1b", "zoneState" => "available"},
             {"messageSet" => [], "regionName" => "us-east-1", "zoneName" => "us-east-1c", "zoneState" => "available"},
             {"messageSet" => [], "regionName" => "us-east-1", "zoneName" => "us-east-1d", "zoneState" => "available"},
+            {"messageSet" => [], "regionName" => "us-east-1", "zoneName" => "us-east-1e", "zoneState" => "available"},
 
             {"messageSet" => [], "regionName" => "us-west-1", "zoneName" => "us-west-1a", "zoneState" => "available"},
             {"messageSet" => [], "regionName" => "us-west-1", "zoneName" => "us-west-1b", "zoneState" => "available"},

data/lib/fog/aws/requests/compute/describe_dhcp_options.rb

@@ -45,14 +45,7 @@ module Fog
             response.status = 200
             response.body = {
               'requestId' => Fog::AWS::Mock.request_id,
-              'dhcpOptionsSet'    => [
-                'dhcpOptionsId'        => Fog::AWS::Mock.dhcp_options_id,
-                'dhcpConfigurationSet' => {
-                  'key'                    => 'domain-name',
-                  'valueSet'               => ["example.com"],
-                },
-                'tagSet'                 =>  {}
-              ]
+              'dhcpOptionsSet'    => self.data[:dhcp_options]
             }
           end
         end

data/lib/fog/aws/requests/compute/describe_instances.rb

@@ -148,6 +148,8 @@ module Fog
             elsif state_reason_key = filter_key.split('state-reason-')[1]
               aliased_key = state_reason_aliases[state_reason_key]
               instance_set = instance_set.reject{|instance| ![*filter_value].include?(instance['stateReason'][aliased_key])}
+            elsif filter_key == "group-name"
+              instance_set = instance_set.reject {|instance| !instance['groupSet'].include?(filter_value)}
             else
               aliased_key = aliases[filter_key]
               instance_set = instance_set.reject {|instance| ![*filter_value].include?(instance[aliased_key])}
@@ -177,7 +179,7 @@ module Fog
                 instance['ipAddress']         = Fog::AWS::Mock.ip_address
                 instance['originalIpAddress'] = instance['ipAddress']
                 instance['dnsName']           = Fog::AWS::Mock.dns_name_for(instance['ipAddress'])
-                instance['privateIpAddress']  = Fog::AWS::Mock.ip_address
+                instance['privateIpAddress']  = Fog::AWS::Mock.private_ip_address
                 instance['privateDnsName']    = Fog::AWS::Mock.private_dns_name_for(instance['privateIpAddress'])
                 instance['instanceState']     = { 'code' => 16, 'name' => 'running' }
               end

data/lib/fog/aws/requests/compute/describe_internet_gateways.rb

@@ -44,14 +44,7 @@ module Fog
             response.status = 200
             response.body = {
               'requestId' => Fog::AWS::Mock.request_id,
-              'internetGatewaySet'    => [
-                'internetGatewayId'      => Fog::AWS::Mock.request_id,
-                'attachmentSet'          => {
-                  'vpcId'                  => Fog::AWS::Mock.request_id,
-                  'state'                  => 'pending',
-                },
-                'tagSet'                 =>  {}
-              ]
+              'internetGatewaySet'    => self.data[:internet_gateways]
             }
           end
         end

data/lib/fog/aws/requests/compute/describe_subnets.rb

@@ -48,15 +48,7 @@ module Fog
             response.status = 200
             response.body = {
               'requestId'  => Fog::AWS::Mock.request_id,
-              'subnetSet'  => [
-                'subnetId'                 => Fog::AWS::Mock.request_id,
-                'state'                    => 'pending',
-                'vpcId'                    => Fog::AWS::Mock.request_id,
-                'cidrBlock'                => '10.255.255.0/24',
-                'availableIpAddressCount'  => 255,
-                'availabilityZone'         => 'us-east-1c',
-                'tagSet'                   => {}
-              ]
+              'subnetSet'  => self.data[:subnets]
             }
           end
         end

data/lib/fog/aws/requests/compute/describe_vpcs.rb

@@ -45,14 +45,7 @@ module Fog
             response.status = 200
             response.body = {
               'requestId' => Fog::AWS::Mock.request_id,
-              'vpcSet'    => [
-                'vpcId'           => Fog::AWS::Mock.request_id,
-                'state'           => 'pending',
-                'cidrBlock'       => '10.255.255.0/24',
-                'dhcpOptionsId'   => Fog::AWS::Mock.request_id,
-                'instanceTenancy' => 'default',
-                'tagSet'          =>  {}
-              ]
+              'vpcSet'    => self.data[:vpcs]
             }
           end
         end

data/lib/fog/aws/requests/compute/release_address.rb

@@ -14,7 +14,7 @@ module Fog
         #     * 'return'<~Boolean> - success?
         #
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-ReleaseAddress.html]
-        # 
+        #
         # non-VPC: requires public_ip only
         #     VPC: requires allocation_id only
         def release_address(ip_or_allocation)
@@ -35,9 +35,17 @@ module Fog
 
       class Mock
 
-        def release_address(public_ip)
+        def release_address(public_ip_or_allocation_id)
           response = Excon::Response.new
-          if (address = self.data[:addresses].delete(public_ip))
+
+          address = self.data[:addresses][public_ip_or_allocation_id] || self.data[:addresses].values.detect {|a| a['allocationId'] == public_ip_or_allocation_id }
+
+          if address
+            if address['allocationId'] && public_ip_or_allocation_id == address['publicIp']
+              raise Fog::Compute::AWS::Error, "InvalidParameterValue => You must specify an allocation id when releasing a VPC elastic IP address"
+            end
+
+            self.data[:addresses].delete(address['publicIp'])
             response.status = 200
             response.body = {
               'requestId' => Fog::AWS::Mock.request_id,
@@ -45,7 +53,7 @@ module Fog
             }
             response
           else
-            raise Fog::Compute::AWS::Error.new("AuthFailure => The address '#{public_ip}' does not belong to you.")
+            raise Fog::Compute::AWS::Error.new("AuthFailure => The address '#{public_ip_or_allocation_id}' does not belong to you.")
           end
         end
 

data/lib/fog/aws/requests/compute/start_instances.rb

@@ -34,6 +34,7 @@ module Fog
 
           instance_set = self.data[:instances].values
           instance_set = apply_tag_filters(instance_set, {'instance_id' => instance_ids}, 'instanceId')
+          instance_set = instance_set.find_all {|x| instance_ids.include?(x["instanceId"]) }
 
           if instance_set.empty?
             raise Fog::Compute::AWS::NotFound.new("The instance ID '#{instance_ids.first}' does not exist")

data/lib/fog/aws/requests/compute/stop_instances.rb

@@ -35,6 +35,7 @@ module Fog
 
           instance_set = self.data[:instances].values
           instance_set = apply_tag_filters(instance_set, {'instance_id' => instance_ids}, 'instanceId')
+          instance_set = instance_set.find_all {|x| instance_ids.include?(x["instanceId"]) }
 
           if instance_set.empty?
             raise Fog::Compute::AWS::NotFound.new("The instance ID '#{instance_ids.first}' does not exist")

data/lib/fog/aws/requests/elasticache/create_cache_cluster.rb

@@ -43,7 +43,7 @@ module Fog
             'AutoMinorVersionUpgrade'     => options[:auto_minor_version_upgrade],
             'CacheParameterGroupName'     => options[:parameter_group_name],
             'EngineVersion'               => options[:engine_version],
-            'NotificationTopicArn'        => (options[:notification_topic_arn]).strip,
+            'NotificationTopicArn'        => options[:notification_topic_arn],
             'Port'                        => options[:port],
             'PreferredAvailabilityZone'   => options[:preferred_availablility_zone],
             'PreferredMaintenanceWindow'  => options[:preferred_maintenance_window],
@@ -54,9 +54,33 @@ module Fog
 
       class Mock
         def create_cache_cluster(id, options = {})
-          Fog::Mock.not_implemented
+          response        = Excon::Response.new
+          cluster         = { # create an in-memory representation of this cluster
+            'CacheClusterId'  => id.strip,
+            'NumCacheNodes'   => options[:num_nodes]      || 1,
+            'CacheNodeType'   => options[:node_type]      || 'cache.m1.large',
+            'Engine'          => options[:engine]         || 'memcached',
+            'EngineVersion'   => options[:engine_version] || '1.4.5',
+            'CacheClusterStatus'  => 'available',
+            'CacheNodes'          => create_cache_nodes(id.strip, options[:num_nodes]),
+            'CacheSecurityGroups' => [],
+            'CacheParameterGroup' => { 'CacheParameterGroupName' =>
+                options[:parameter_group_name] || 'default.memcached1.4' },
+            'PendingModifiedValues'       => {},
+            'AutoMinorVersionUpgrade'     =>
+              options[:auto_minor_version_upgrade]    || 'true',
+            'PreferredMaintenanceWindow'  =>
+              options[:preferred_maintenance_window]  || 'sun:05:00-sun:09:00',
+          }
+          self.data[:clusters][id] = cluster  # store the in-memory cluster
+          response.body = {
+            'CacheCluster' => cluster.merge({'CacheClusterStatus' => 'creating'}),
+            'ResponseMetadata' => { 'RequestId' => Fog::AWS::Mock.request_id }
+          }
+          response
         end
       end
+
     end
   end
 end

data/lib/fog/aws/requests/elasticache/delete_cache_cluster.rb

@@ -24,9 +24,18 @@ module Fog
 
       class Mock
         def delete_cache_cluster(cluster_id)
-          Fog::Mock.not_implemented
+          response        = Excon::Response.new
+          cluster         = self.data[:clusters][cluster_id]
+          cluster['CacheClusterStatus'] = 'deleting'
+          response.body = {
+            'CacheClusters'     => self.data[:clusters].values,
+            'ResponseMetadata'  => { 'RequestId' => Fog::AWS::Mock.request_id }
+          }
+          self.data[:clusters].delete(cluster_id)
+          response
         end
       end
+
     end
   end
 end

data/lib/fog/aws/requests/elasticache/describe_cache_clusters.rb

@@ -31,9 +31,24 @@ module Fog
 
       class Mock
         def describe_cache_clusters(id = nil, options = {})
-          Fog::Mock.not_implemented
+          response        = Excon::Response.new
+          all_clusters    = self.data[:clusters].values.map do |cluster|
+            cluster.merge!(options[:show_node_info] ? {
+              'CacheClusterCreateTime'    => DateTime.now - 60,
+              'PreferredAvailabilityZone' => 'us-east-1a'
+            } : {})
+          end
+          if (id != nil) && (all_clusters.empty?)
+            raise Fog::AWS::Elasticache::NotFound
+          end
+          response.body = {
+            'CacheClusters'     => all_clusters,
+            'ResponseMetadata'  => { 'RequestId' => Fog::AWS::Mock.request_id }
+          }
+          response
         end
       end
+
     end
   end
 end

data/lib/fog/aws/requests/elasticache/modify_cache_cluster.rb

@@ -51,7 +51,7 @@ module Fog
             'AutoMinorVersionUpgrade'     => options[:auto_minor_version_upgrade],
             'CacheParameterGroupName'     => options[:parameter_group_name],
             'EngineVersion'               => options[:engine_version],
-            'NotificationTopicArn'        => (options[:notification_topic_arn]).strip,
+            'NotificationTopicArn'        => options[:notification_topic_arn],
             'NotificationTopicStatus'     => options[:notification_topic_status],
             'PreferredMaintenanceWindow'  => options[:preferred_maintenance_window],
             :parser => Fog::Parsers::AWS::Elasticache::SingleCacheCluster.new
@@ -61,10 +61,42 @@ module Fog
       end
 
       class Mock
-        def modify_cache_cluster
-          Fog::Mock.not_implemented
+        def modify_cache_cluster(id, options = {})
+          response        = Excon::Response.new
+          cluster         = self.data[:clusters][id]
+          pending_values  = Hash.new
+          # For any given option, update the cluster's corresponding value
+          { :auto_minor_version_upgrade   => 'AutoMinorVersionUpgrade',
+            :preferred_maintenance_window => 'PreferredMaintenanceWindow',
+            :engine_version               => 'EngineVersion',
+            :num_nodes                    => 'NumCacheNodes',
+          }.each do |option, cluster_key|
+            if options[option] != nil
+              cluster[cluster_key] = options[option].to_s
+              pending_values[cluster_key] = options[option]
+            end
+          end
+          cache['CacheParameterGroup'] = {
+            'CacheParameterGroupName' => options[:parameter_group_name]
+          } if options[:parameter_group_name]
+          if options[:num_nodes] || options[:engine_version]
+            cluster['CacheNodes'] =
+              create_cache_nodes(cluster['CacheClusterId'], options[:num_nodes])
+            cluster['NumCacheNodes'] = cluster['CacheNodes'].size
+          end
+          if options[:nodes_to_remove]
+            pending_values['CacheNodeId'] = options[:nodes_to_remove].join(',')
+          end
+          response.body = {
+            'CacheCluster' => cluster.merge({
+              'PendingModifiedValues' => pending_values
+            }),
+            'ResponseMetadata' => { 'RequestId' => Fog::AWS::Mock.request_id }
+          }
+          response
         end
       end
+
     end
   end
 end

data/lib/fog/aws/requests/elasticache/reboot_cache_cluster.rb

@@ -35,10 +35,18 @@ module Fog
       end
 
       class Mock
-        def reboot_cache_cluster
-          Fog::Mock.not_implemented
+        def reboot_cache_cluster(id, nodes_to_reboot)
+          response        = Excon::Response.new
+          response.body   = {
+            'CacheCluster' => self.data[:clusters][id].merge({
+              'CacheClusterStatus' => 'rebooting cache cluster nodes'
+            }),
+            'ResponseMetadata'  => { 'RequestId' => Fog::AWS::Mock.request_id }
+          }
+          response
         end
       end
+
     end
   end
 end

data/lib/fog/aws/requests/elb/create_load_balancer.rb

@@ -76,7 +76,7 @@ module Fog
           self.data[:load_balancers][lb_name] = {
             'AvailabilityZones' => availability_zones,
             'Subnets' => options[:subnet_ids],
-            'Scheme' => options[:scheme],
+            'Scheme' => options[:scheme].nil? ? 'internet-facing' : options[:scheme],
             'SecurityGroups' => options[:security_groups],
             'CanonicalHostedZoneName' => '',
             'CanonicalHostedZoneNameID' => '',

data/lib/fog/aws/requests/rds/describe_db_instances.rb

@@ -58,7 +58,7 @@ module Fog
                  end
               when "rebooting" # I don't know how to show rebooting just once before it changes to available
                 # it applies pending modified values
-                if server["PendingModifiedValues"]
+                unless server["PendingModifiedValues"].empty?
                   server.merge!(server["PendingModifiedValues"])
                   server["PendingModifiedValues"] = {}
                   self.data[:tmp] ||= Time.now + Fog::Mock.delay * 2
@@ -69,13 +69,13 @@ module Fog
                 end
               when "modifying"
                 # TODO there are some fields that only applied after rebooting
-                if server["PendingModifiedValues"]
+                unless server["PendingModifiedValues"].empty?
                   server.merge!(server["PendingModifiedValues"])
                   server["PendingModifiedValues"] = {}
                   server["DBInstanceStatus"] = 'available'
                 end
               when "available" # I'm not sure if amazon does this
-                if server["PendingModifiedValues"]
+                unless server["PendingModifiedValues"].empty?
                   server["DBInstanceStatus"] = 'modifying'
                 end
 

data/lib/fog/aws/sqs.rb

@@ -40,7 +40,7 @@ module Fog
           setup_credentials(options)
           @region = options[:region] || 'us-east-1'
 
-          unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2'].include?(@region)
+          unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'sa-east-1'].include?(@region)
             raise ArgumentError, "Unknown region: #{@region.inspect}"
           end
         end

data/lib/fog/aws/storage.rb

@@ -284,7 +284,7 @@ module Fog
               "s3-#{options[:region]}.amazonaws.com"
             end
             @path       = options[:path]        || '/'
-            @persistent = options.fetch(:persistent, true)
+            @persistent = options.fetch(:persistent, false)
             @port       = options[:port]        || 443
             @scheme     = options[:scheme]      || 'https'
           end

data/lib/fog/bin/rackspace.rb

@@ -13,6 +13,10 @@ class Rackspace < Fog::Bin
         Fog::Rackspace::LoadBalancers
       when :dns
         Fog::DNS::Rackspace
+      when :identity
+        Fog::Rackspace::Identity
+      when :databases
+        Fog::Rackspace::Databases
       else
         raise ArgumentError, "Unrecognized service: #{key}"
       end