fog 0.10.0 → 0.11.0

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

@@ -72,6 +72,7 @@ module Fog
             'instance-id' => 'instanceId',
             'status'      => 'status'
           }
+
           for filter_key, filter_value in filters
             if attachment_key = filter_key.split('attachment.')[1]
               aliased_key = attachment_aliases[filter_key]

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

@@ -0,0 +1,39 @@
+module Fog
+  module Compute
+    class AWS
+      class Real
+
+        require 'fog/compute/parsers/aws/basic'
+
+        # Modify image attributes
+        #
+        # ==== Parameters
+        # * image_id<~String> - Id of machine image to modify
+        # * attributes<~Hash>:
+        #   * 'Add.Group'<~Array> - One or more groups to grant launch permission to
+        #   * 'Add.UserId'<~Array> - One or more account ids to grant launch permission to
+        #   * 'Description.Value'<String> - New description for image
+        #   * 'ProductCode'<~Array> - One or more product codes to add to image (these can not be removed)
+        #   * 'Remove.Group'<~Array> - One or more groups to revoke launch permission from
+        #   * 'Remove.UserId'<~Array> - One or more account ids to revoke launch permission from
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-ModifyImageAttribute.html]
+        #
+        def modify_image_attribute(image_id, attributes)
+          params = {}
+          params.merge!(Fog::AWS.indexed_param('LaunchPermission.Add.%d.Group', attributes['Add.Group'] || []))
+          params.merge!(Fog::AWS.indexed_param('LaunchPermission.Add.%d.UserId', attributes['Add.UserId'] || []))
+          params.merge!(Fog::AWS.indexed_param('LaunchPermission.Remove.%d.Group', attributes['Remove.Group'] || []))
+          params.merge!(Fog::AWS.indexed_param('LaunchPermission.Remove.%d.UserId', attributes['Remove.UserId'] || []))
+          params.merge!(Fog::AWS.indexed_param('ProductCode', attributes['ProductCode'] || []))
+          request({
+            'Action'        => 'ModifyImageAttribute',
+            :idempotent     => true,
+            :parser         => Fog::Parsers::Compute::AWS::Basic.new
+          }.merge!(params))
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+module Fog
+  module Compute
+    class AWS
+      class Real
+
+        require 'fog/compute/parsers/aws/basic'
+
+        # Modify instance attributes
+        #
+        # ==== Parameters
+        # * image_id<~String> - Id of machine image to modify
+        # * attributes<~Hash>:
+        #   'InstanceType.Value'<~String> - New instance type
+        #   'Kernel.Value'<~String> - New kernel value
+        #   'Ramdisk.Value'<~String> - New ramdisk value
+        #   'UserData.Value'<~String> - New userdata value
+        #   'DisableApiTermination.Value'<~Boolean> - Change api termination value
+        #   'InstanceInitiatedShutdownBehavior.Value'<~String> - New instance initiated shutdown behaviour, in ['stop', 'terminate']
+        #   'SourceDestCheck.Value'<~Boolean> - New sourcedestcheck value
+        #   'GroupId'<~Array> - One or more groups to add instance to (VPC only)
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-ModifyInstanceAttribute.html]
+        #
+        def modify_instance_attributes(image_id, attributes)
+          params = {}
+          params.merge!(Fog::AWS.indexed_param('GroupId', attributes['GroupId'] || []))
+          request({
+            'Action'        => 'ModifyInstanceAttribute',
+            :idempotent     => true,
+            :parser         => Fog::Parsers::Compute::AWS::Basic.new
+          }.merge!(params))
+        end
+
+      end
+    end
+  end
+end

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

@@ -9,22 +9,22 @@ module Fog
         #
         # ==== Parameters
         # * snapshot_id<~String> - Id of snapshot to modify
-        # * attribute<~String> - Attribute to modify, in ['createVolumePermission']
-        # * operation_type<~String> - Operation to perform on attribute, in ['add', 'remove']
-        #
-        #
+        # * attributes<~Hash>:
+        #   * 'Add.Group'<~Array> - One or more groups to grant volume create permission to
+        #   * 'Add.UserId'<~Array> - One or more account ids to grant volume create permission to
+        #   * 'Remove.Group'<~Array> - One or more groups to revoke volume create permission from
+        #   * 'Remove.UserId'<~Array> - One or more account ids to revoke volume create permission from
         #
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-ModifySnapshotAttribute.html]
         #
-        def modify_snapshot_attribute(snapshot_id, attribute, operation_type, options = {})
+        def modify_snapshot_attribute(snapshot_id, attributes)
           params = {}
-          params.merge!(Fog::AWS.indexed_param('UserId', options['UserId']))
-          params.merge!(Fog::AWS.indexed_param('UserGroup', options['UserGroup']))
+          params.merge!(Fog::AWS.indexed_param('CreateVolumePermission.Add.%d.Group', attributes['Add.Group'] || []))
+          params.merge!(Fog::AWS.indexed_param('CreateVolumePermission.Add.%d.UserId', attributes['Add.UserId'] || []))
+          params.merge!(Fog::AWS.indexed_param('CreateVolumePermission.Remove.%d.Group', attributes['Remove.Group'] || []))
+          params.merge!(Fog::AWS.indexed_param('CreateVolumePermission.Remove.%d.UserId', attributes['Remove.UserId'] || []))
           request({
             'Action'        => 'ModifySnapshotAttribute',
-            'Attribute'     => attribute,
-            'SnapshotId'    => snapshot_id,
-            'OperationType' => operation_type,
             :idempotent     => true,
             :parser         => Fog::Parsers::Compute::AWS::Basic.new
           }.merge!(params))

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

@@ -2,7 +2,6 @@ module Fog
   module Compute
     class AWS
       class Real
-
         require 'fog/compute/parsers/aws/register_image'
 
         # register an image
@@ -50,32 +49,75 @@ module Fog
             common_options['ImageLocation'] = location
           end
 
-          bdi = 0
-          block_devices.each do |bd|
-            bdi += 1
+          block_devices.each_with_index do |bd, index|
+            index += 1
             ["DeviceName","VirtualName"].each do |n|
-              common_options["BlockDeviceMapping.#{bdi}.#{n}"] = bd["#{n}"] if bd["#{n}"]
+              common_options["BlockDeviceMapping.#{index}.#{n}"] = bd[n] if bd[n]
             end
             ["SnapshotId","VolumeSize","NoDevice","DeleteOnTermination"].each do |n|
-              common_options["BlockDeviceMapping.#{bdi}.Ebs.#{n}"] = bd["#{n}"] if bd["#{n}"]
+              common_options["BlockDeviceMapping.#{index}.Ebs.#{n}"] = bd[n] if bd[n]
             end
-
           end
 
           request(common_options.merge!(options))
         end
-
       end
 
       class Mock
-
         def register_image(name, description, location, block_devices=[], options={})
-          response = Excon::Response.new
-          if !name.empty?
+          unless name.empty?
+            image = {
+              'imageId' => Fog::AWS::Mock.image_id,
+              'imageLocation' => '',
+              'imageState' => 'pending',
+              'imageOwnerId' => self.data[:owner_id],
+              'isPublic' => false,
+              'productCodes' => [],
+              'architecture' => 'i386',
+              'imageType' => 'machine',
+              'kernelId' => Fog::AWS::Mock.kernel_id,
+              'ramdiskId' => Fog::AWS::Mock.ramdisk_id,
+              'platform' => 'Linux',
+              'stateReason' => {},
+              'imageOwnerAlias' => self.data[:owner_id],
+              'name' => name,
+              'description' => description,
+              'rootDeviceType' => '',
+              'rootDeviceName' => '',
+              'blockDeviceMapping' => [],
+              'virtualizationType' => 'paravirtual',
+              'tagSet' => {},
+              'hypervisor' => 'xen',
+              'registered' => Time.now
+            }
+
+            if location[/^\/dev\/sd[a-p]\d{0,2}$/]
+              image['rootDeviceName'] = location
+              image['rootDeviceType'] = 'ebs'
+            else
+              image['imageLocation'] = location
+            end
+
+            block_devices.each do |bd|
+              block_device_mapping = {
+                'ebs' => {}
+              }
+              ["DeviceName","VirtualName"].each do |n|
+                block_device_mapping = bd[n] if bd[n]
+              end
+              ["SnapshotId","VolumeSize","NoDevice","DeleteOnTermination"].each do |n|
+                block_device_mapping['ebs'][n] = bd[n] if bd[n]
+              end
+              image['blockDeviceMapping'] << block_device_mapping
+            end
+
+            self.data[:images][image['imageId']] = image
+
+            response = Excon::Response.new
             response.status = 200
             response.body = {
               'requestId' => Fog::AWS::Mock.request_id,
-              'imageId' => Fog::AWS::Mock.image_id
+              'imageId' => image['imageId']
             }
             response
           else
@@ -86,7 +128,6 @@ module Fog
             raise Fog::Compute::AWS::Error.new(message)
           end
         end
-
       end
     end
   end

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

@@ -20,6 +20,8 @@ module Fog
         #   (by default the maximum for an account is 20)
         # * options<~Hash>:
         #   * 'Placement.AvailabilityZone'<~String> - Placement constraint for instances
+        #   * 'Placement.GroupName'<~String> - Name of existing placement group to launch instance into
+        #   * 'Placement.Tenancy'<~String> - Tenancy option in ['dedicated', 'default'], defaults to 'default'
         #   * 'BlockDeviceMapping'<~Array>: array of hashes
         #     * 'DeviceName'<~String> - where the volume will be exposed to instance
         #     * 'VirtualName'<~String> - volume virtual device name
@@ -27,6 +29,7 @@ module Fog
         #     * '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
         #   * 'ClientToken'<~String> - unique case-sensitive token for ensuring idempotency
+        #   * 'DisableApiTermination'<~Boolean> - specifies whether or not to allow termination of the instance from the api
         #   * '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
@@ -36,7 +39,9 @@ module Fog
         #   * 'KeyName'<~String> - Name of a keypair to add to booting instances
         #   * 'Monitoring.Enabled'<~Boolean> - Enables monitoring, defaults to
         #     disabled
+        #   * 'PrivateIpAddress<~String> - VPC option to specify ip address within subnet
         #   * 'RamdiskId'<~String> - Id of ramdisk with which to launch
+        #   * 'SubnetId'<~String> - VPC option to specify subnet to launch instance into
         #   * 'UserData'<~String> -  Additional data to provide to booting instances
         #
         # ==== Returns

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

@@ -17,8 +17,9 @@ module Fog
         #     * TODO: fill in the blanks
         #
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-StopInstances.html]
-        def stop_instances(instance_id)
+        def stop_instances(instance_id, force = false)
           params = Fog::AWS.indexed_param('InstanceId', instance_id)
+          params.merge!('Force' => 'true') if force
           request({
             'Action'    => 'StopInstances',
             :idempotent => true,

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

@@ -3,15 +3,9 @@ module Fog
     class Brightbox
       class Real
 
-        def activate_console_server(identifier, options = {})
+        def activate_console_server(identifier)
           return nil if identifier.nil? || identifier == ""
-          request(
-            :expects  => [202],
-            :method   => 'POST',
-            :path     => "/1.0/servers/#{identifier}/activate_console",
-            :headers  => {"Content-Type" => "application/json"},
-            :body     => MultiJson.encode(options)
-          )
+          request("post", "/1.0/servers/#{identifier}/activate_console", [202])
         end
 
       end

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

@@ -3,15 +3,9 @@ module Fog
     class Brightbox
       class Real
 
-        def add_listeners_load_balancer(identifier, options = {})
+        def add_listeners_load_balancer(identifier, options)
           return nil if identifier.nil? || identifier == ""
-          request(
-            :expects  => [202],
-            :method   => 'POST',
-            :path     => "/1.0/load_balancers/#{identifier}/add_listeners",
-            :headers  => {"Content-Type" => "application/json"},
-            :body     => MultiJson.encode(options)
-          )
+          request("post", "/1.0/load_balancers/#{identifier}/add_listeners", [202], options)
         end
 
       end

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

@@ -3,15 +3,9 @@ module Fog
     class Brightbox
       class Real
 
-        def add_nodes_load_balancer(identifier, options = {})
+        def add_nodes_load_balancer(identifier, options)
           return nil if identifier.nil? || identifier == ""
-          request(
-            :expects  => [202],
-            :method   => 'POST',
-            :path     => "/1.0/load_balancers/#{identifier}/add_nodes",
-            :headers  => {"Content-Type" => "application/json"},
-            :body     => MultiJson.encode(options)
-          )
+          request("post", "/1.0/load_balancers/#{identifier}/add_nodes", [202], options)
         end
 
       end

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

@@ -3,14 +3,8 @@ module Fog
     class Brightbox
       class Real
 
-        def create_api_client(options = {})
-          request(
-            :expects  => [201],
-            :method   => 'POST',
-            :path     => "/1.0/api_clients",
-            :headers  => {"Content-Type" => "application/json"},
-            :body     => MultiJson.encode(options)
-          )
+        def create_api_client(options)
+          request("post", "/1.0/api_clients", [201], options)
         end
 
       end

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

@@ -3,14 +3,8 @@ module Fog
     class Brightbox
       class Real
 
-        def create_cloud_ip(options = {})
-          request(
-            :expects  => [201],
-            :method   => 'POST',
-            :path     => "/1.0/cloud_ips",
-            :headers  => {"Content-Type" => "application/json"},
-            :body     => MultiJson.encode(options)
-          )
+        def create_cloud_ip
+          request("post", "/1.0/cloud_ips", [201])
         end
 
       end

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

@@ -3,14 +3,8 @@ module Fog
     class Brightbox
       class Real
 
-        def create_image(options = {})
-          request(
-            :expects  => [201],
-            :method   => 'POST',
-            :path     => "/1.0/images",
-            :headers  => {"Content-Type" => "application/json"},
-            :body     => MultiJson.encode(options)
-          )
+        def create_image(options)
+          request("post", "/1.0/images", [201], options)
         end
 
       end

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

@@ -3,14 +3,8 @@ module Fog
     class Brightbox
       class Real
 
-        def create_load_balancer(options = {})
-          request(
-            :expects  => [202],
-            :method   => 'POST',
-            :path     => "/1.0/load_balancers",
-            :headers  => {"Content-Type" => "application/json"},
-            :body     => MultiJson.encode(options)
-          )
+        def create_load_balancer(options)
+          request("post", "/1.0/load_balancers", [202], options)
         end
 
       end

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

@@ -3,14 +3,8 @@ module Fog
     class Brightbox
       class Real
 
-        def create_server(options = {})
-          request(
-            :expects  => [202],
-            :method   => 'POST',
-            :path     => "/1.0/servers",
-            :headers  => {"Content-Type" => "application/json"},
-            :body     => MultiJson.encode(options)
-          )
+        def create_server(options)
+          request("post", "/1.0/servers", [202], options)
         end
 
       end

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

@@ -3,15 +3,9 @@ module Fog
     class Brightbox
       class Real
 
-        def destroy_api_client(identifier, options = {})
+        def destroy_api_client(identifier)
           return nil if identifier.nil? || identifier == ""
-          request(
-            :expects  => [200],
-            :method   => 'DELETE',
-            :path     => "/1.0/api_clients/#{identifier}",
-            :headers  => {"Content-Type" => "application/json"},
-            :body     => MultiJson.encode(options)
-          )
+          request("delete", "/1.0/api_clients/#{identifier}", [200])
         end
 
       end

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

@@ -3,15 +3,9 @@ module Fog
     class Brightbox
       class Real
 
-        def destroy_cloud_ip(identifier, options = {})
+        def destroy_cloud_ip(identifier)
           return nil if identifier.nil? || identifier == ""
-          request(
-            :expects  => [200],
-            :method   => 'DELETE',
-            :path     => "/1.0/cloud_ips/#{identifier}",
-            :headers  => {"Content-Type" => "application/json"},
-            :body     => MultiJson.encode(options)
-          )
+          request("delete", "/1.0/cloud_ips/#{identifier}", [200])
         end
 
       end