fog 0.9.0 → 0.10.0

data/lib/fog/compute/parsers/aws/spot_datafeed_subscription.rb

@@ -0,0 +1,29 @@
+module Fog
+  module Parsers
+    module Compute
+      module AWS
+
+        class SpotDatafeedSubscription < Fog::Parsers::Base
+
+          def reset
+            @response = { 'spotDatafeedSubscription' => {} }
+          end
+
+          def end_element(name)
+            case name
+            when 'bucket', 'ownerId', 'prefix', 'state'
+              @response['spotDatafeedSubscription'][name] = value
+            when 'code', 'message'
+              @response['spotDatafeedSubscription']['fault'] ||= {}
+              @response['spotDatafeedSubscription'][name] = value
+            when 'requestId'
+              @response[name] = value
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/compute/parsers/aws/spot_instance_requests.rb

@@ -0,0 +1,67 @@
+module Fog
+  module Parsers
+    module Compute
+      module AWS
+
+        class SpotInstanceRequests < Fog::Parsers::Base
+
+          def reset
+            @block_device_mapping = []
+            @context = []
+            @contexts = ['blockDeviceMapping', 'groupSet']
+            @spot_instance_request = { 'launchSpecification' => { 'blockDeviceMapping' => [], 'groupSet' => [] } }
+            @response = { 'spotInstanceRequestSet' => [] }
+          end
+
+          def start_element(name, attrs = [])
+            super
+            if @contexts.include?(name)
+              @context.push(name)
+            end
+          end
+
+          def end_element(name)
+            case name
+            when 'attachTime'
+              @block_device_mapping[name] = Time.parse(value)
+            when *@contexts
+              @context.pop
+            when 'code', 'message'
+              @spot_instance_request['fault'] ||= {}
+              @spot_instance_request['fault'][name] = value
+            when 'createTime'
+              @spot_instance_request[name] = Time.parse(value)
+            when 'deleteOnTermination'
+              @block_device_mapping[name] = (value == 'true')
+            when 'deviceName', 'status', 'volumeId'
+              @block_device_mapping[name] = value
+            when 'groupId'
+              @spot_instance_request['launchSpecification']['groupSet'] << value
+            when 'instanceId', 'launchedAvailabilityZone', 'productDescription', 'spotInstanceRequestId', 'state', 'type'
+              @spot_instance_request[name] = value
+            when 'item'
+              case @context.last
+              when 'blockDeviceMapping'
+                @instance['blockDeviceMapping'] << @block_device_mapping
+                @block_device_mapping = {}
+              when nil
+                @response['spotInstanceRequestSet'] << @spot_instance_request
+                @spot_instance_request = { 'launchSpecification' => { 'blockDeviceMapping' => [], 'groupSet' => [] } }
+              end
+            when 'imageId', 'instanceType', 'keyname'
+              @spot_instance_request['launchSpecification'][name] = value
+            when 'enabled'
+              @spot_instance_request['launchSpecification']['monitoring'] = (value == 'true')
+            when 'requestId'
+              @response[name] = value
+            when 'spotPrice'
+              @spot_instance_request[name] = value.to_f
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/compute/rackspace.rb

@@ -58,6 +58,7 @@ module Fog
         end
 
         def initialize(options={})
+          require 'multi_json'
           @rackspace_username = options[:rackspace_username]
         end
 
@@ -74,7 +75,7 @@ module Fog
       class Real
 
         def initialize(options={})
-          require 'json'
+          require 'multi_json'
           @rackspace_api_key = options[:rackspace_api_key]
           @rackspace_username = options[:rackspace_username]
           @rackspace_auth_url = options[:rackspace_auth_url]
@@ -93,7 +94,7 @@ module Fog
 
         def request(params)
           begin
-            response = @connection.request(params.merge!({
+            response = @connection.request(params.merge({
               :headers  => {
                 'Content-Type' => 'application/json',
                 'X-Auth-Token' => @auth_token
@@ -103,11 +104,11 @@ module Fog
               :query    => ('ignore_awful_caching' << Time.now.to_i.to_s)
             }))
           rescue Excon::Errors::Unauthorized => error
-            if JSON.parse(response.body)['unauthorized']['message'] == 'Invalid authentication token.  Please renew.'
+            if error.response.body != 'Bad username or password' # token expiration
               @rackspace_must_reauthenticate = true
               authenticate
               retry
-            else
+            else # bad credentials
               raise error
             end
           rescue Excon::Errors::HTTPStatusError => error
@@ -119,7 +120,7 @@ module Fog
             end
           end
           unless response.body.empty?
-            response.body = JSON.parse(response.body)
+            response.body = MultiJson.decode(response.body)
           end
           response
         end

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

@@ -0,0 +1,34 @@
+module Fog
+  module Compute
+    class AWS
+      class Real
+
+        require 'fog/compute/parsers/aws/cancel_spot_instance_requests'
+
+        # Terminate specified spot instance requests
+        #
+        # ==== Parameters
+        # * spot_instance_request_id<~Array> - Ids of instances to terminates
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'requestId'<~String> id of request
+        #     * 'spotInstanceRequestSet'<~Array>:
+        #       * 'spotInstanceRequestId'<~String> - id of cancelled spot instance
+        #       * 'state'<~String> - state of cancelled spot instance
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-CancelSpotInstanceRequests.html]
+        def cancel_spot_instance_requests(spot_instance_request_id)
+          params = Fog::AWS.indexed_param('SpotInstanceRequestId', spot_instance_request_id)
+          request({
+            'Action'    => 'CancelSpotInstanceRequests',
+            :idempotent => true,
+            :parser     => Fog::Parsers::Compute::AWS::CancelSpotInstanceRequests.new
+          }.merge!(params))
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,34 @@
+module Fog
+  module Compute
+    class AWS
+      class Real
+
+        require 'fog/compute/parsers/aws/basic'
+
+        # Create a new placement group
+        #
+        # ==== Parameters
+        # * group_name<~String> - Name of the placement group.
+        # * strategy<~String> - Placement group strategy. Valid options in ['cluster']
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'requestId'<~String> - Id of request
+        #     * 'return'<~Boolean> - success?
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-CreatePlacementGroup.html]
+        def create_placement_group(name, strategy)
+          request(
+            'Action'            => 'CreatePlacementGroup',
+            'GroupName'         => name,
+            'Strategy'          => strategy,
+            :parser             => Fog::Parsers::Compute::AWS::Basic.new
+          )
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,41 @@
+module Fog
+  module Compute
+    class AWS
+      class Real
+
+        require 'fog/compute/parsers/aws/spot_datafeed_subscription'
+
+        # Create a spot datafeed subscription
+        #
+        # ==== Parameters
+        # * bucket<~String> - bucket name to store datafeed in
+        # * prefix<~String> - prefix to store data with
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'requestId'<~String> - Id of request
+        #     * 'spotDatafeedSubscription'<~Hash>:
+        #       * 'bucket'<~String> - S3 bucket where data is stored
+        #       * 'fault'<~Hash>:
+        #         * 'code'<~String> - fault code
+        #         * 'reason'<~String> - fault reason
+        #       * 'ownerId'<~String> - AWS id of account owner
+        #       * 'prefix'<~String> - prefix for datafeed items
+        #       * 'state'<~String> - state of datafeed subscription
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-CreateSpotDatafeedSubscription.html]
+        def create_spot_datafeed_subscription(bucket, prefix)
+          request(
+            'Action'    => 'CreateSpotDatafeedSubscription',
+            'Bucket'    => bucket,
+            'Prefix'    => prefix,
+            :idempotent => true,
+            :parser     => Fog::Parsers::Compute::AWS::SpotDatafeedSubscription.new
+          )
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+module Fog
+  module Compute
+    class AWS
+      class Real
+
+        require 'fog/compute/parsers/aws/basic'
+
+        # Delete a placement group that you own
+        #
+        # ==== Parameters
+        # * group_name<~String> - Name of the placement group.
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'requestId'<~String> - Id of request
+        #     * 'return'<~Boolean> - success?
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DeletePlacementGroup.html]
+        def delete_placement_group(name)
+          request(
+            'Action'    => 'DeletePlacementGroup',
+            'GroupName' => name,
+            :idempotent => true,
+            :parser     => Fog::Parsers::Compute::AWS::Basic.new
+          )
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+module Fog
+  module Compute
+    class AWS
+      class Real
+
+        require 'fog/compute/parsers/aws/basic'
+
+        # Delete a spot datafeed subscription
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'requestId'<~String> id of request
+        #     * 'return'<~Boolean> - success?
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DeleteSpotDatafeedSubscription.html]
+        def delete_spot_datafeed_subscription
+          request(
+            'Action'    => 'DeleteSpotDatafeedSubscription',
+            :idempotent => true,
+            :parser     => Fog::Parsers::Compute::AWS::Basic.new
+          )
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,35 @@
+module Fog
+  module Compute
+    class AWS
+      class Real
+
+        require 'fog/compute/parsers/aws/describe_placement_groups'
+
+        # Describe all or specified placement groups
+        #
+        # ==== Parameters
+        # * filters<~Hash> - List of filters to limit results with
+        #
+        # === Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'requestId'<~String> - Id of request
+        #     * 'placementGroupSet'<~Array>:
+        #       * 'groupName'<~String> - Name of placement group
+        #       * 'strategy'<~String> - Strategy of placement group
+        #       * 'state'<~String> - State of placement group
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribePlacementGroups.html]
+        def describe_placement_groups(filters = {})
+          params = Fog::AWS.indexed_filters(filters)
+          request({
+            'Action'    => 'DescribePlacementGroups',
+            :idempotent => true,
+            :parser     => Fog::Parsers::Compute::AWS::DescribePlacementGroups.new
+          }.merge!(params))
+        end
+
+      end
+    end
+  end
+end

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

@@ -41,6 +41,20 @@ module Fog
         end
 
       end
+
+      class Mock
+        def describe_reserved_instances(filters = {})
+          response = Excon::Response.new
+          response.status = 200
+
+          response.body = {
+            'reservedInstancesSet' => self.data[:reserved_instances].values,
+            'requestId' => Fog::AWS::Mock.request_id
+          }
+
+          response
+        end
+      end
     end
   end
 end

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

@@ -32,7 +32,32 @@ module Fog
             :parser     => Fog::Parsers::Compute::AWS::DescribeReservedInstancesOfferings.new
           }.merge!(params))
         end
+      end
+
+      class Mock
+        def describe_reserved_instances_offerings(filters = {})
+          response = Excon::Response.new
+          response.status = 200
 
+          self.data[:reserved_instances_offerings] ||= [{
+            'reservedInstancesOfferingId' => Fog::AWS::Mock.reserved_instances_offering_id,
+            'instanceType'        => 'm1.small',
+            'availabilityZone'    => 'us-east-1d',
+            'duration'            => 31536000,
+            'fixedPrice'          => 350.0,
+            'usagePrice'          => 0.03,
+            'productDescription'  => 'Linux/UNIX',
+            'instanceTenancy'     => 'default',
+            'currencyCode'         => 'USD'
+          }]
+
+          response.body = {
+            'reservedInstancesOfferingsSet' => self.data[:reserved_instances_offerings],
+            'requestId' => Fog::AWS::Mock.request_id
+          }
+
+          response
+        end
       end
     end
   end

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

@@ -0,0 +1,35 @@
+module Fog
+  module Compute
+    class AWS
+      class Real
+
+        require 'fog/compute/parsers/aws/spot_datafeed_subscription'
+
+        # Describe spot datafeed subscription
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'requestId'<~String> - Id of request
+        #     * 'spotDatafeedSubscription'<~Hash>:
+        #       * 'bucket'<~String> - S3 bucket where data is stored
+        #       * 'fault'<~Hash>:
+        #         * 'code'<~String> - fault code
+        #         * 'reason'<~String> - fault reason
+        #       * 'ownerId'<~String> - AWS id of account owner
+        #       * 'prefix'<~String> - prefix for datafeed items
+        #       * 'state'<~String> - state of datafeed subscription
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeSpotDatafeedSubscription.html]
+        def describe_spot_datafeed_subscription
+          request({
+            'Action'    => 'DescribeSpotDatafeedSubscription',
+            :idempotent => true,
+            :parser     => Fog::Parsers::Compute::AWS::SpotDatafeedSubscription.new
+          })
+        end
+
+      end
+    end
+  end
+end