fog 0.8.1 → 0.8.2

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

@@ -17,6 +17,8 @@ module Fog
         #     * 'keyFingerprint'<~String> - SHA-1 digest of DER encoded private key
         #     * 'keyName'<~String> - Name of key
         #     * 'requestId'<~String> - Id of request
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-ImportKeyPair.html]
         def import_key_pair(key_name, public_key_material)
           request(
             'Action'  => 'ImportKeyPair',
@@ -32,13 +34,13 @@ module Fog
 
         def import_key_pair(key_name, public_key_material)
           response = Excon::Response.new
-          unless @data[:key_pairs][key_name]
+          unless self.data[:key_pairs][key_name]
             response.status = 200
             data = {
               'keyFingerprint'  => Fog::AWS::Mock.key_fingerprint,
               'keyName'         => key_name
             }
-            @data[:key_pairs][key_name] = data
+            self.data[:key_pairs][key_name] = data
             response.body = {
               'requestId' => Fog::AWS::Mock.request_id
             }.merge!(data)

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

@@ -12,6 +12,10 @@ module Fog
         # * attribute<~String> - Attribute to modify, in ['launchPermission', 'productCodes']
         # * operation_type<~String> - Operation to perform on attribute, in ['add', 'remove']
         #
+        #
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-ModifyImageAttribute.html]
+        #
         def modify_image_attributes(image_id, attribute, operation_type, options = {})
           params = {}
           params.merge!(AWS.indexed_param('UserId', options['UserId']))

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

@@ -12,6 +12,10 @@ module Fog
         # * attribute<~String> - Attribute to modify, in ['createVolumePermission']
         # * operation_type<~String> - Operation to perform on attribute, in ['add', 'remove']
         #
+        #
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-ModifySnapshotAttribute.html]
+        #
         def modify_snapshot_attribute(snapshot_id, attribute, operation_type, options = {})
           params = {}
           params.merge!(AWS.indexed_param('UserId', options['UserId']))

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

@@ -17,6 +17,8 @@ module Fog
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'instancesSet': http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-ItemType-MonitorInstancesResponseSetItemType.html
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-MonitorInstances.html]
         def monitor_instances(instance_ids)
           params = AWS.indexed_param('InstanceId', instance_ids)
           request({
@@ -34,7 +36,7 @@ module Fog
           response        = Excon::Response.new
           response.status = 200
           [*instance_ids].each do |instance_id|
-            if instance = @data[:instances][instance_id]
+            if instance = self.data[:instances][instance_id]
               instance['monitoring']['state'] = 'enabled'
             else
               raise Fog::AWS::Compute::NotFound.new("The instance ID '#{instance_ids}' does not exist")

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

@@ -15,6 +15,8 @@ module Fog
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'return'<~Boolean> - success?
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-RebootInstances.html]
         def reboot_instances(instance_id = [])
           params = AWS.indexed_param('InstanceId', instance_id)
           request({
@@ -31,9 +33,9 @@ module Fog
         def reboot_instances(instance_id = [])
           response = Excon::Response.new
           instance_id = [*instance_id]
-          if (@data[:instances].keys & instance_id).length == instance_id.length
+          if (self.data[:instances].keys & instance_id).length == instance_id.length
             for instance_id in instance_id
-              @data[:instances][instance_id]['status'] = 'rebooting'
+              self.data[:instances][instance_id]['status'] = 'rebooting'
             end
             response.status = 200
             response.body = {

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

@@ -31,6 +31,10 @@ module Fog
         #   * body<~Hash>:
         #     * 'imageId'<~String> - Id of newly created AMI
 
+        #
+
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-RegisterImage.html]
+
         def register_image(name, description, location, block_devices=[], options={})
           common_options = {
             'Action'      => 'RegisterImage',

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

@@ -12,6 +12,8 @@ module Fog
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'return'<~Boolean> - success?
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-ReleaseAddress.html]
         def release_address(public_ip)
           request(
             'Action'    => 'ReleaseAddress',
@@ -27,7 +29,7 @@ module Fog
 
         def release_address(public_ip)
           response = Excon::Response.new
-          if (address = @data[:addresses].delete(public_ip))
+          if (address = self.data[:addresses].delete(public_ip))
             response.status = 200
             response.body = {
               'requestId' => Fog::AWS::Mock.request_id,

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

@@ -23,6 +23,8 @@ module Fog
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'return'<~Boolean> - success?
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-RevokeSecurityGroupIngress.html]
         def revoke_security_group_ingress(group_name, options = {})
           if group_name.is_a?(Hash)
             location = caller.first
@@ -54,7 +56,7 @@ module Fog
             group_name = options['GroupName']
           end
           response = Excon::Response.new
-          group = @data[:security_groups][group_name]
+          group = self.data[:security_groups][group_name]
           if group
             if options['SourceSecurityGroupName'] && options['SourceSecurityGroupOwnerId']
               group['ipPermissions'].delete_if {|permission|

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

@@ -79,6 +79,8 @@ module Fog
         #     * 'ownerId'<~String> - Id of owner
         #     * 'requestId'<~String> - Id of request
         #     * 'reservationId'<~String> - Id of reservation
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-RunInstances.html]
         def run_instances(image_id, min_count, max_count, options = {})
           if block_device_mapping = options.delete('BlockDeviceMapping')
             block_device_mapping.each_with_index do |mapping, index|
@@ -114,10 +116,14 @@ module Fog
           response = Excon::Response.new
           response.status = 200
 
-          group_set = [ (options['GroupId'] || 'default') ]
+          group_set = [ (options['SecurityGroup'] || 'default') ].flatten
           instances_set = []
           reservation_id = Fog::AWS::Mock.reservation_id
 
+          if options['KeyName'] && describe_key_pairs('key-name' => options['KeyName']).body['keySet'].empty?
+            raise Fog::AWS::Compute::NotFound.new("The key pair '#{options['KeyName']}' does not exist")
+          end
+
           min_count.times do |i|
             instance_id = Fog::AWS::Mock.instance_id
             instance = {
@@ -130,10 +136,10 @@ module Fog
               'instanceState'       => { 'code' => 0, 'name' => 'pending' },
               'instanceType'        => options['InstanceType'] || 'm1.small',
               'kernelId'            => options['KernelId'] || Fog::AWS::Mock.kernel_id,
-              # 'keyName'             => options['KeyName'],
+              'keyName'             => options['KeyName'],
               'launchTime'          => Time.now,
               'monitoring'          => { 'state' => options['Monitoring.Enabled'] || false },
-              'placement'           => { 'availabilityZone' => options['Placement.AvailabilityZone'] || Fog::AWS::Mock.availability_zone },
+              'placement'           => { 'availabilityZone' => options['Placement.AvailabilityZone'] || Fog::AWS::Mock.availability_zone(@region) },
               'privateDnsName'      => nil,
               'productCodes'        => [],
               'ramdiskId'           => options['RamdiskId'] || Fog::AWS::Mock.ramdisk_id,
@@ -141,10 +147,10 @@ module Fog
               'rootDeviceType'      => 'instance-store'
             }
             instances_set << instance
-            @data[:instances][instance_id] = instance.merge({
+            self.data[:instances][instance_id] = instance.merge({
               'architecture'        => 'i386',
               'groupSet'            => group_set,
-              'ownerId'             => @owner_id,
+              'ownerId'             => self.data[:owner_id],
               'privateIpAddress'    => nil,
               'reservationId'       => reservation_id,
               'stateReason'         => {},
@@ -154,7 +160,7 @@ module Fog
           response.body = {
             'groupSet'      => group_set,
             'instancesSet'  => instances_set,
-            'ownerId'       => @owner_id,
+            'ownerId'       => self.data[:owner_id],
             'requestId'     => Fog::AWS::Mock.request_id,
             'reservationId' => reservation_id
           }

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

@@ -15,6 +15,8 @@ module Fog
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * TODO: fill in the blanks
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-StartInstances.html]
         def start_instances(instance_id)
           params = AWS.indexed_param('InstanceId', instance_id)
           request({

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

@@ -15,6 +15,8 @@ module Fog
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * TODO: fill in the blanks
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-StopInstances.html]
         def stop_instances(instance_id)
           params = AWS.indexed_param('InstanceId', instance_id)
           request({

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

@@ -22,6 +22,8 @@ module Fog
         #       * 'shutdownState'<~Hash>: shutdown state of instance
         #         * 'code'<~Integer> - current status code
         #         * 'name'<~String> - name of current state
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-TerminateInstances.html]
         def terminate_instances(instance_id)
           params = AWS.indexed_param('InstanceId', instance_id)
           request({
@@ -38,15 +40,15 @@ module Fog
         def terminate_instances(instance_id)
           response = Excon::Response.new
           instance_id = [*instance_id]
-          if (@data[:instances].keys & instance_id).length == instance_id.length
+          if (self.data[:instances].keys & instance_id).length == instance_id.length
             response.body = {
               'requestId'     => Fog::AWS::Mock.request_id,
               'instancesSet'  => []
             }
             response.status = 200
             for id in instance_id
-              instance = @data[:instances][id]
-              @data[:deleted_at][id] = Time.now
+              instance = self.data[:instances][id]
+              self.data[:deleted_at][id] = Time.now
               code = case instance['instanceState']['name']
               when 'pending'
                 0

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

@@ -17,6 +17,8 @@ module Fog
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'instancesSet': http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-ItemType-MonitorInstancesResponseSetItemType.html
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-UnmonitorInstances.html]
         def unmonitor_instances(instance_ids)
           params = AWS.indexed_param('InstanceId', instance_ids)
           request({
@@ -34,7 +36,7 @@ module Fog
           response        = Excon::Response.new
           response.status = 200
           [*instance_ids].each do |instance_id|
-            if instance = @data[:instances][instance_id]
+            if instance = self.data[:instances][instance_id]
               instance['monitoring']['state'] = 'enabled'
             else
               raise Fog::AWS::Compute::NotFound.new("The instance ID '#{instance_ids}' does not exist")

data/lib/fog/compute/requests/go_grid/grid_image_get.rb

@@ -29,7 +29,7 @@ module Fog
         def grid_image_get(options={})
           #response = Excon::Response.new
 
-          #images = @data[:list].values
+          #images = self.data[:list].values
           #for image in images
           #  case image['state']
           #  when 'Available'

data/lib/fog/compute/requests/go_grid/grid_image_list.rb

@@ -32,7 +32,7 @@ module Fog
         def grid_image_list(options={})
           #response = Excon::Response.new
 
-          #images = @data[:list].values
+          #images = self.data[:list].values
           #for image in images
           #  case image['state']
           #  when 'Available'

data/lib/fog/compute/requests/linode/avail_datacenters.rb

@@ -2,7 +2,7 @@ module Fog
   module Linode
     class Compute
       class Real
-
+        
         # Get available data centers
         #
         # ==== Returns
@@ -16,7 +16,6 @@ module Fog
             :query    => { :api_action => 'avail.datacenters' }
           )
         end
-
       end
     end
   end

data/lib/fog/compute/requests/linode/avail_distributions.rb

@@ -11,7 +11,7 @@ module Fog
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~Array>:
-        # TODO: docs
+        # TODO: docs        
         def avail_distributions(distribution_id=nil)
           options = {}
           if distribution_id
@@ -23,7 +23,6 @@ module Fog
             :query    => { :api_action => 'avail.distributions' }.merge!(options)
           )
         end
-
       end
     end
   end

data/lib/fog/compute/requests/linode/avail_kernels.rb

@@ -6,22 +6,23 @@ module Fog
         # Get available kernels
         #
         # ==== Parameters
-        # * options<~Hash>:
-        #   * kernelId<~Integer>: id to limit results to
-        #   * isXen<~Integer>: if 1 limits results to only zen
+        # * kernelId<~Integer>: id to limit results to
         #
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~Array>:
         # TODO: docs
-        def avail_kernels(options={})
+        def avail_kernels(kernel_id=nil)
+          options = {}
+          if kernel_id
+            options.merge!(:kernelId => kernel_id)
+          end          
           request(
             :expects  => 200,
             :method   => 'GET',
             :query    => { :api_action => 'avail.kernels' }.merge!(options)
           )
         end
-
       end
     end
   end

data/lib/fog/compute/requests/linode/avail_linodeplans.rb

@@ -5,22 +5,28 @@ module Fog
 
         # Get available plans
         #
+        # ==== Parameters
+        # * linodeplanId<~Integer>: id to limit results to
+        #
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~Array>:
-        # TODO: docs
+        # TODO: docs        
         def avail_linodeplans(linodeplan_id = nil)
           options = {}
           if linodeplan_id
             options.merge!(:planId => linodeplan_id)
           end
-          request(
+          result = request(
             :expects  => 200,
             :method   => 'GET',
             :query    => { :api_action => 'avail.linodeplans' }.merge!(options)
           )
+          
+          #hack for plans not filtering by id like they should above, remove when they fix it.
+          result.body["DATA"] = result.body["DATA"].select { |item| item['PLANID'] == linodeplan_id } if linodeplan_id
+          result
         end
-
       end
     end
   end

data/lib/fog/compute/requests/linode/avail_stackscripts.rb

@@ -2,27 +2,15 @@ module Fog
   module Linode
     class Compute
       class Real
-
-        # Get available stack scripts
-        #
-        # ==== Parameters
-        # * options<~Hash>:
-        #   * distributionId<~Integer>: Limit the results to Stackscripts that can be applied to this distribution id
-        #   * distributionVendor<~String>: Debian, Ubuntu, Fedora, etc.
-        #   * keywords<~String>: Search terms
-        #
-        # ==== Returns
-        # * response<~Excon::Response>:
-        #   * body<~Array>:
-        # TODO: docs
         def avail_stackscripts(options={})
-          request(
+          result = request(
             :expects  => 200,
             :method   => 'GET',
             :query    => { :api_action => 'avail.stackscripts' }.merge!(options)
           )
+          result.body['DATA'].each { |r| r['DISTRIBUTIONIDLIST'] = r['DISTRIBUTIONIDLIST'].to_s }
+          result
         end
-
       end
     end
   end

data/lib/fog/compute/requests/linode/linode_boot.rb

@@ -0,0 +1,15 @@
+module Fog
+  module Linode
+    class Compute
+      class Real
+        def linode_boot(linode_id, config_id)
+          request(
+            :expects => 200,
+            :method => 'GET',
+            :query => { :api_action => 'linode.boot', :linodeId => linode_id, :configId => config_id }
+          )
+        end
+      end
+    end
+  end
+end

data/lib/fog/compute/requests/linode/linode_config_create.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Linode
+    class Compute
+      class Real
+        def linode_config_create(linode_id, kernel_id, name, disk_list)
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :query    => {
+              :api_action => 'linode.config.create',
+              :linodeId => linode_id,
+              :kernelId => kernel_id,
+              :label => name,
+              :diskList => disk_list
+            }
+          )
+        end
+      end
+    end
+  end
+end