fog 0.9.0 → 0.10.0

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

@@ -0,0 +1,47 @@
+module Fog
+  module Compute
+    class AWS
+      class Real
+
+        require 'fog/compute/parsers/aws/spot_instance_requests'
+
+        # Describe all or specified spot instance requests
+        #
+        # ==== Parameters
+        # * filters<~Hash> - List of filters to limit results with
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'requestId'<~String> - Id of request
+        #     * 'spotInstanceRequestSet'<~Array>:
+        #       * 'createTime'<~Time> - time of instance request creation
+        #       * 'instanceId'<~String> - instance id if one has been launched to fulfill request
+        #       * 'launchedAvailabilityZone'<~String> - availability zone of instance if one has been launched to fulfill request
+        #       * 'launchSpecification'<~Hash>:
+        #         * 'blockDeviceMapping'<~Hash> - list of block device mappings for instance
+        #         * 'groupSet'<~String> - security group(s) for instance
+        #         * 'keyName'<~String> - keypair name for instance
+        #         * 'imageId'<~String> - AMI for instance
+        #         * 'instanceType'<~String> - type for instance
+        #         * 'monitoring'<~Boolean> - monitoring status for instance
+        #       * 'productDescription'<~String> - general description of AMI
+        #       * 'spotInstanceRequestId'<~String> - id of spot instance request
+        #       * 'spotPrice'<~Float> - maximum price for instances to be launched
+        #       * 'state'<~String> - spot instance request state
+        #       * 'type'<~String> - spot instance request type
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeSpotInstanceRequests.html]
+        def describe_spot_instance_requests(filters = {})
+          params = Fog::AWS.indexed_filters(filters)
+          request({
+            'Action'    => 'DescribeSpotInstanceRequests',
+            :idempotent => true,
+            :parser     => Fog::Parsers::Compute::AWS::SpotInstanceRequests.new
+          }.merge!(params))
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+module Fog
+  module Compute
+    class AWS
+      class Real
+
+        require 'fog/compute/parsers/aws/describe_spot_price_history'
+
+        # Describe all or specified spot price history
+        #
+        # ==== Parameters
+        # * filters<~Hash> - List of filters to limit results with
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'requestId'<~String> - Id of request
+        #     * 'spotPriceHistorySet'<~Array>:
+        #       * 'availabilityZone'<~String> - availability zone for instance
+        #       * 'instanceType'<~String> - the type of instance
+        #       * 'productDescription'<~String> - general description of AMI
+        #       * 'spotPrice'<~Float> - maximum price to launch one or more instances
+        #       * 'timestamp'<~Time> - date and time of request creation
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeSpotPriceHistory.html]
+        def describe_spot_price_history(filters = {})
+          params = Fog::AWS.indexed_filters(filters)
+          request({
+            'Action'    => 'DescribeSpotPriceHistory',
+            :idempotent => true,
+            :parser     => Fog::Parsers::Compute::AWS::DescribeSpotPriceHistory.new
+          }.merge!(params))
+        end
+
+      end
+    end
+  end
+end

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

@@ -74,7 +74,7 @@ module Fog
           }
           for filter_key, filter_value in filters
             if attachment_key = filter_key.split('attachment.')[1]
-              aliased_key = permission_aliases[filter_key]
+              aliased_key = attachment_aliases[filter_key]
               volume_set = volume_set.reject{|volume| !volume['attachmentSet'].detect {|attachment| [*filter_value].include?(attachment[aliased_key])}}
             else
               aliased_key = aliases[filter_key]

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

@@ -0,0 +1,63 @@
+module Fog
+  module Compute
+    class AWS
+      class Real
+
+        require 'fog/compute/parsers/aws/purchase_reserved_instances_offering'
+
+        # Purchases a Reserved Instance for use with your account.
+        #
+        # ==== Parameters
+        # * reserved_instances_offering_id<~String> - ID of the Reserved Instance offering you want to purchase.
+        # * instance_count<~Integer> - The number of Reserved Instances to purchase.
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'requestId'<~String> - Id of request
+        #     * 'reservedInstancesId'<~String> - Id of the purchased reserved instances.
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-PurchaseReservedInstancesOffering.html]
+        def purchase_reserved_instances_offering(reserved_instances_offering_id, instance_count = 1)
+          request({
+            'Action'                      => 'PurchaseReservedInstancesOffering',
+            'ReservedInstancesOfferingId' => reserved_instances_offering_id,
+            'InstanceCount'               => instance_count,
+            :idempotent                   => true,
+            :parser                       => Fog::Parsers::Compute::AWS::PurchaseReservedInstancesOffering.new
+          })
+        end
+
+      end
+
+      class Mock
+        def purchase_reserved_instances_offering(reserved_instances_offering_id, instance_count = 1)
+          response = Excon::Response.new
+          response.status = 200
+
+          # Need to implement filters in the mock to find this there instead of here
+          # Also there's no information about what to do when the specified reserved_instances_offering_id doesn't exist
+          raise unless reserved_instance_offering = Compute[:aws].describe_reserved_instances_offerings.body["reservedInstancesOfferingsSet"].find { |offering| offering["reservedInstancesOfferingId"] == reserved_instances_offering_id }
+
+          reserved_instances_id = Fog::AWS::Mock.reserved_instances_id
+          reserved_instance_offering.delete('reservedInstancesOfferingId')
+
+          self.data[:reserved_instances][reserved_instances_id] = reserved_instance_offering.merge({
+            'reservedInstancesId' => reserved_instances_id,
+            'start'               => Time.now,
+            'instanceCount'       => instance_count,
+            'state'               => 'payment-pending',
+            'tagSet'              => []
+          })
+
+          response.body = {
+            'reservedInstancesId' => reserved_instances_id,
+            'requestId' => Fog::AWS::Mock.request_id
+          }
+
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,83 @@
+module Fog
+  module Compute
+    class AWS
+      class Real
+
+        require 'fog/compute/parsers/aws/spot_instance_requests'
+
+        # Launch specified instances
+        #
+        # ==== Parameters
+        # * 'image_id'<~String> - Id of machine image to load on instances
+        # * 'instance_type'<~String> - Type of instance
+        # * 'spot_price'<~Float> - maximum hourly price for instances launched
+        # * options<~Hash>:
+        #   * 'AvailabilityZoneGroup'<~String> - specify whether or not to launch all instances in the same availability group
+        #   * 'InstanceCount'<~Integer> - maximum number of instances to launch
+        #   * 'LaunchGroup'<~String> - whether or not to launch/shutdown instances as a group
+        #   * 'LaunchSpecification.BlockDeviceMapping'<~Array>: array of hashes
+        #     * 'DeviceName'<~String> - where the volume will be exposed to instance
+        #     * 'VirtualName'<~String> - volume virtual device name
+        #     * 'Ebs.SnapshotId'<~String> - id of snapshot to boot volume from
+        #     * 'Ebs.NoDevice'<~String> - specifies that no device should be mapped
+        #     * 'Ebs.VolumeSize'<~String> - size of volume in GiBs required unless snapshot is specified
+        #     * 'Ebs.DeleteOnTermination'<~String> - specifies whether or not to delete the volume on instance termination
+        #   * 'LaunchSpecification.KeyName'<~String> - Name of a keypair to add to booting instances
+        #   * 'LaunchSpecification.Monitoring.Enabled'<~Boolean> - Enables monitoring, defaults to disabled
+        #   * 'LaunchSpecification.Placement.AvailabilityZone'<~String> - Placement constraint for instances
+        #   * 'LaunchSpecification.SecurityGroup'<~Array> or <~String> - Name of security group(s) for instances
+        #   * 'LaunchSpecification.UserData'<~String> -  Additional data to provide to booting instances
+        #   * 'Type'<~String> - spot instance request type in ['one-time', 'persistent']
+        #   * 'ValidFrom'<~Time> - start date for request
+        #   * 'ValidUntil'<~Time> - end date for request
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'requestId'<~String> - Id of request
+        #     * 'spotInstanceRequestSet'<~Array>:
+        #       * 'createTime'<~Time> - time of instance request creation
+        #       * 'instanceId'<~String> - instance id if one has been launched to fulfill request
+        #       * 'launchedAvailabilityZone'<~String> - availability zone of instance if one has been launched to fulfill request
+        #       * 'launchSpecification'<~Hash>:
+        #         * 'blockDeviceMapping'<~Hash> - list of block device mappings for instance
+        #         * 'groupSet'<~String> - security group(s) for instance
+        #         * 'keyName'<~String> - keypair name for instance
+        #         * 'imageId'<~String> - AMI for instance
+        #         * 'instanceType'<~String> - type for instance
+        #         * 'monitoring'<~Boolean> - monitoring status for instance
+        #       * 'productDescription'<~String> - general description of AMI
+        #       * 'spotInstanceRequestId'<~String> - id of spot instance request
+        #       * 'spotPrice'<~Float> - maximum price for instances to be launched
+        #       * 'state'<~String> - spot instance request state
+        #       * 'type'<~String> - spot instance request type
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-RequestSpotInstances.html]
+        def request_spot_instances(image_id, instance_type, spot_price, options = {})
+          if block_device_mapping = options.delete('LaunchSpecification.BlockDeviceMapping')
+            block_device_mapping.each_with_index do |mapping, index|
+              for key, value in mapping
+                options.merge!({ format("LaunchSpecification.BlockDeviceMapping.%d.#{key}", index) => value })
+              end
+            end
+          end
+          if security_groups = options.delete('LaunchSpecification.SecurityGroup')
+            options.merge!(Fog::AWS.indexed_param('LaunchSpecification.SecurityGroup', [*security_groups]))
+          end
+          if options['LaunchSpecification.UserData']
+            options['LaunchSpecification.UserData'] = Base64.encode64(options['LaunchSpecification.UserData'])
+          end
+
+          request({
+            'Action'                            => 'RequestSpotInstances',
+            'LaunchSpecification.ImageId'       => image_id,
+            'LaunchSpecification.InstanceType'  => instance_type,
+            'SpotPrice'                         => spot_price,
+            :parser                             => Fog::Parsers::Compute::AWS::SpotInstanceRequests.new
+          }.merge!(options))
+        end
+
+      end
+    end
+  end
+end

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

@@ -30,7 +30,7 @@ module Fog
         #   * 'SecurityGroup'<~Array> or <~String> - Name of security group(s) for instances (you must omit this parameter if using Virtual Private Clouds)
         #   * 'InstanceInitiatedShutdownBehaviour'<~String> - specifies whether volumes are stopped or terminated when instance is shutdown, in [stop, terminate]
         #   * 'InstanceType'<~String> - Type of instance to boot. Valid options
-        #     in ['m1.small', 'm1.large', 'm1.xlarge', 'c1.medium', 'c1.xlarge', 'm2.2xlarge', 'm2.4xlarge']
+        #     in ['t1.micro', 'm1.small', 'm1.large', 'm1.xlarge', 'c1.medium', 'c1.xlarge', 'm2.xlarge', m2.2xlarge', 'm2.4xlarge', 'cc1.4xlarge', 'cg1.4xlarge']
         #     default is 'm1.small'
         #   * 'KernelId'<~String> - Id of kernel with which to launch
         #   * 'KeyName'<~String> - Name of a keypair to add to booting instances
@@ -139,10 +139,9 @@ module Fog
               'keyName'             => options['KeyName'],
               'launchTime'          => Time.now,
               'monitoring'          => { 'state' => options['Monitoring.Enabled'] || false },
-              'placement'           => { 'availabilityZone' => options['Placement.AvailabilityZone'] || Fog::AWS::Mock.availability_zone(@region) },
+              'placement'           => { 'availabilityZone' => options['Placement.AvailabilityZone'] || Fog::AWS::Mock.availability_zone(@region), 'groupName' => nil, 'tenancy' => 'default' },
               'privateDnsName'      => nil,
               'productCodes'        => [],
-              'ramdiskId'           => options['RamdiskId'] || Fog::AWS::Mock.ramdisk_id,
               'reason'              => nil,
               'rootDeviceType'      => 'instance-store'
             }

data/lib/fog/compute/requests/brightbox/activate_console_server.rb

@@ -10,7 +10,7 @@ module Fog
             :method   => 'POST',
             :path     => "/1.0/servers/#{identifier}/activate_console",
             :headers  => {"Content-Type" => "application/json"},
-            :body     => options.to_json
+            :body     => MultiJson.encode(options)
           )
         end
 

data/lib/fog/compute/requests/brightbox/add_listeners_load_balancer.rb

@@ -10,7 +10,7 @@ module Fog
             :method   => 'POST',
             :path     => "/1.0/load_balancers/#{identifier}/add_listeners",
             :headers  => {"Content-Type" => "application/json"},
-            :body     => options.to_json
+            :body     => MultiJson.encode(options)
           )
         end
 

data/lib/fog/compute/requests/brightbox/add_nodes_load_balancer.rb

@@ -10,7 +10,7 @@ module Fog
             :method   => 'POST',
             :path     => "/1.0/load_balancers/#{identifier}/add_nodes",
             :headers  => {"Content-Type" => "application/json"},
-            :body     => options.to_json
+            :body     => MultiJson.encode(options)
           )
         end
 

data/lib/fog/compute/requests/brightbox/create_api_client.rb

@@ -9,7 +9,7 @@ module Fog
             :method   => 'POST',
             :path     => "/1.0/api_clients",
             :headers  => {"Content-Type" => "application/json"},
-            :body     => options.to_json
+            :body     => MultiJson.encode(options)
           )
         end
 

data/lib/fog/compute/requests/brightbox/create_cloud_ip.rb

@@ -9,7 +9,7 @@ module Fog
             :method   => 'POST',
             :path     => "/1.0/cloud_ips",
             :headers  => {"Content-Type" => "application/json"},
-            :body     => options.to_json
+            :body     => MultiJson.encode(options)
           )
         end
 

data/lib/fog/compute/requests/brightbox/create_image.rb

@@ -9,7 +9,7 @@ module Fog
             :method   => 'POST',
             :path     => "/1.0/images",
             :headers  => {"Content-Type" => "application/json"},
-            :body     => options.to_json
+            :body     => MultiJson.encode(options)
           )
         end
 

data/lib/fog/compute/requests/brightbox/create_load_balancer.rb

@@ -9,7 +9,7 @@ module Fog
             :method   => 'POST',
             :path     => "/1.0/load_balancers",
             :headers  => {"Content-Type" => "application/json"},
-            :body     => options.to_json
+            :body     => MultiJson.encode(options)
           )
         end
 

data/lib/fog/compute/requests/brightbox/create_server.rb

@@ -9,7 +9,7 @@ module Fog
             :method   => 'POST',
             :path     => "/1.0/servers",
             :headers  => {"Content-Type" => "application/json"},
-            :body     => options.to_json
+            :body     => MultiJson.encode(options)
           )
         end
 

data/lib/fog/compute/requests/brightbox/destroy_api_client.rb

@@ -10,7 +10,7 @@ module Fog
             :method   => 'DELETE',
             :path     => "/1.0/api_clients/#{identifier}",
             :headers  => {"Content-Type" => "application/json"},
-            :body     => options.to_json
+            :body     => MultiJson.encode(options)
           )
         end
 

data/lib/fog/compute/requests/brightbox/destroy_cloud_ip.rb

@@ -10,7 +10,7 @@ module Fog
             :method   => 'DELETE',
             :path     => "/1.0/cloud_ips/#{identifier}",
             :headers  => {"Content-Type" => "application/json"},
-            :body     => options.to_json
+            :body     => MultiJson.encode(options)
           )
         end
 

data/lib/fog/compute/requests/brightbox/destroy_image.rb

@@ -10,7 +10,7 @@ module Fog
             :method   => 'DELETE',
             :path     => "/1.0/images/#{identifier}",
             :headers  => {"Content-Type" => "application/json"},
-            :body     => options.to_json
+            :body     => MultiJson.encode(options)
           )
         end
 

data/lib/fog/compute/requests/brightbox/destroy_load_balancer.rb

@@ -10,7 +10,7 @@ module Fog
             :method   => 'DELETE',
             :path     => "/1.0/load_balancers/#{identifier}",
             :headers  => {"Content-Type" => "application/json"},
-            :body     => options.to_json
+            :body     => MultiJson.encode(options)
           )
         end
 

data/lib/fog/compute/requests/brightbox/destroy_server.rb

@@ -10,7 +10,7 @@ module Fog
             :method   => 'DELETE',
             :path     => "/1.0/servers/#{identifier}",
             :headers  => {"Content-Type" => "application/json"},
-            :body     => options.to_json
+            :body     => MultiJson.encode(options)
           )
         end
 

data/lib/fog/compute/requests/brightbox/get_account.rb

@@ -9,7 +9,7 @@ module Fog
             :method   => 'GET',
             :path     => "/1.0/account",
             :headers  => {"Content-Type" => "application/json"},
-            :body     => options.to_json
+            :body     => MultiJson.encode(options)
           )
         end
 

data/lib/fog/compute/requests/brightbox/get_api_client.rb

@@ -10,7 +10,7 @@ module Fog
             :method   => 'GET',
             :path     => "/1.0/api_clients/#{identifier}",
             :headers  => {"Content-Type" => "application/json"},
-            :body     => options.to_json
+            :body     => MultiJson.encode(options)
           )
         end
 

data/lib/fog/compute/requests/brightbox/get_cloud_ip.rb

@@ -10,7 +10,7 @@ module Fog
             :method   => 'GET',
             :path     => "/1.0/cloud_ips/#{identifier}",
             :headers  => {"Content-Type" => "application/json"},
-            :body     => options.to_json
+            :body     => MultiJson.encode(options)
           )
         end
 

data/lib/fog/compute/requests/brightbox/get_image.rb

@@ -10,7 +10,7 @@ module Fog
             :method   => 'GET',
             :path     => "/1.0/images/#{identifier}",
             :headers  => {"Content-Type" => "application/json"},
-            :body     => options.to_json
+            :body     => MultiJson.encode(options)
           )
         end
 

data/lib/fog/compute/requests/brightbox/get_interface.rb

@@ -10,7 +10,7 @@ module Fog
             :method   => 'GET',
             :path     => "/1.0/interfaces/#{identifier}",
             :headers  => {"Content-Type" => "application/json"},
-            :body     => options.to_json
+            :body     => MultiJson.encode(options)
           )
         end
 

data/lib/fog/compute/requests/brightbox/get_load_balancer.rb

@@ -10,7 +10,7 @@ module Fog
             :method   => 'GET',
             :path     => "/1.0/load_balancers/#{identifier}",
             :headers  => {"Content-Type" => "application/json"},
-            :body     => options.to_json
+            :body     => MultiJson.encode(options)
           )
         end