amazon-ec2 0.7.3 → 0.7.4

data/ChangeLog

@@ -1,3 +1,14 @@
+=== 0.7.4 2009-12-05
+ * Initial support for new EBS AMI's
+ * Updated EC2 API version
+ * Added US West 1 Data Center to list of valid endpoints. (us-west-1.ec2.amazonaws.com)
+ * Updated exceptions.rb to be in sync with latest documented exceptions.
+ * Updated #run_instances to support EBS AMI's and sync with latest options.
+ * Added new #stop_instances and #start_instances methods.
+ * Added new #create_image to allow bundling of a running instance to an EBS backed AMI.
+ * Added stub methods for all known missing EC2 methods. (Please help with patches + tests!)
+ * Added and updated tests for new/modified methods.
+
 === 0.6.1 2009-10-13
  * Additional commits for AutoScaling.  Thanks to Ari (auser)!
  * Updated README.rdoc installation instructions.  Reflects removal of deprecated GitHub gem building.

data/VERSION

@@ -1 +1 @@
-0.7.3
+0.7.4

data/amazon-ec2.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{amazon-ec2}
-  s.version = "0.7.3"
+  s.version = "0.7.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Glenn Rempe"]
-  s.date = %q{2009-11-16}
+  s.date = %q{2009-12-06}
   s.description = %q{A Ruby library for accessing the Amazon Web Services EC2, ELB, RDS, Cloudwatch, and Autoscaling API's.}
   s.email = %q{glenn@rempe.us}
   s.executables = ["ec2-gem-example.rb", "ec2-gem-profile.rb", "ec2sh", "setup.rb"]
@@ -42,6 +42,7 @@ Gem::Specification.new do |s|
      "lib/AWS/EC2.rb",
      "lib/AWS/EC2/availability_zones.rb",
      "lib/AWS/EC2/console.rb",
+     "lib/AWS/EC2/devpay.rb",
      "lib/AWS/EC2/elastic_ips.rb",
      "lib/AWS/EC2/image_attributes.rb",
      "lib/AWS/EC2/images.rb",
@@ -82,7 +83,8 @@ Gem::Specification.new do |s|
      "wsdl/2007-08-29.ec2.wsdl",
      "wsdl/2008-02-01.ec2.wsdl",
      "wsdl/2008-05-05.ec2.wsdl",
-     "wsdl/2008-12-01.ec2.wsdl"
+     "wsdl/2008-12-01.ec2.wsdl",
+     "wsdl/2009-10-31.ec2.wsdl"
   ]
   s.homepage = %q{http://github.com/grempe/amazon-ec2}
   s.rdoc_options = ["--title", "amazon-ec2 documentation", "--line-numbers", "--main", "README.rdoc"]

data/lib/AWS.rb

@@ -185,10 +185,14 @@ module AWS
       # ("People", [{:name=>'jon', :age=>'22'}, {:name=>'chris'}], {:name => 'Name', :age => 'Age'}) you should get
       # {"People.1.Name"=>"jon", "People.1.Age"=>'22', 'People.2.Name'=>'chris'}
       def pathhashlist(key, arr_of_hashes, mappings)
-        params ={}
+        raise ArgumentError, "expected a key that is a String" unless key.is_a? String
+        raise ArgumentError, "expected a arr_of_hashes that is an Array" unless arr_of_hashes.is_a? Array
+        arr_of_hashes.each{|h| raise ArgumentError, "expected each element of arr_of_hashes to be a Hash" unless h.is_a?(Hash)}
+        raise ArgumentError, "expected a mappings that is an Hash" unless mappings.is_a? Hash
+        params = {}
         arr_of_hashes.each_with_index do |hash, i|
           hash.each do |attribute, value|
-            params["#{key}.#{i+1}.#{mappings[attribute]}"] = value
+            params["#{key}.#{i+1}.#{mappings[attribute]}"] = value.to_s
           end
         end
         params
@@ -256,7 +260,7 @@ module AWS
       end
 
       # Raises the appropriate error if the specified Net::HTTPResponse object
-      # contains an Amazon EC2 error; returns +false+ otherwise.
+      # contains an AWS error; returns +false+ otherwise.
       def aws_error?(response)
 
         # return false if we got a HTTP 200 code,
@@ -277,7 +281,7 @@ module AWS
 
         # An valid error response looks like this:
         # <?xml version="1.0"?><Response><Errors><Error><Code>InvalidParameterCombination</Code><Message>Unknown parameter: foo</Message></Error></Errors><RequestID>291cef62-3e86-414b-900e-17246eccfae8</RequestID></Response>
-        # AWS EC2 throws some exception codes that look like Error.SubError.  Since we can't name classes this way
+        # AWS throws some exception codes that look like Error.SubError.  Since we can't name classes this way
         # we need to strip out the '.' in the error 'Code' and we name the error exceptions with this
         # non '.' name as well.
         error_code    = doc.root.elements['Errors'].elements['Error'].elements['Code'].text.gsub('.', '')

data/lib/AWS/EC2.rb

@@ -8,7 +8,7 @@ module AWS
     #   export EC2_URL='https://ec2.amazonaws.com'
     if ENV['EC2_URL']
       EC2_URL = ENV['EC2_URL']
-      VALID_HOSTS = ['https://ec2.amazonaws.com', 'https://us-east-1.ec2.amazonaws.com', 'https://eu-west-1.ec2.amazonaws.com']
+      VALID_HOSTS = ['https://ec2.amazonaws.com', 'https://us-east-1.ec2.amazonaws.com', 'https://us-west-1.ec2.amazonaws.com', 'https://eu-west-1.ec2.amazonaws.com']
       raise ArgumentError, "Invalid EC2_URL environment variable : #{EC2_URL}" unless VALID_HOSTS.include?(EC2_URL)
       DEFAULT_HOST = URI.parse(EC2_URL).host
     else
@@ -16,7 +16,7 @@ module AWS
       DEFAULT_HOST = 'ec2.amazonaws.com'
     end
 
-    API_VERSION = '2009-07-15'
+    API_VERSION = '2009-10-31'
 
     class Base < AWS::Base
       def api_version

data/lib/AWS/EC2/availability_zones.rb

@@ -15,6 +15,14 @@ module AWS
         return response_generator(:action => "DescribeAvailabilityZones", :params => params)
       end
 
+      # Not yet implemented
+      #
+      # @todo Implement this method
+      #
+      def describe_regions( options = {} )
+        raise "Not yet implemented"
+      end
+
     end
   end
 end

data/lib/AWS/EC2/console.rb

@@ -2,6 +2,7 @@ module AWS
   module EC2
     class Base < AWS::Base
 
+
       # The GetConsoleOutput operation retrieves console output that has been posted for the specified instance.
       #
       # Instance console output is buffered and posted shortly after instance boot, reboot and once the instance
@@ -17,6 +18,7 @@ module AWS
         return response_generator(:action => "GetConsoleOutput", :params => params)
       end
 
+
     end
   end
 end

data/lib/AWS/EC2/devpay.rb

@@ -0,0 +1,18 @@
+module AWS
+  module EC2
+    class Base < AWS::Base
+
+
+      # Not yet implemented
+      #
+      # @todo Implement this method
+      #
+      def confirm_product_instance( options = {} )
+        raise "Not yet implemented"
+      end
+
+
+    end
+  end
+end
+

data/lib/AWS/EC2/elastic_ips.rb

@@ -2,43 +2,13 @@ module AWS
   module EC2
     class Base < AWS::Base
 
+
       # The AllocateAddress operation acquires an elastic IP address for use with your account.
       #
       def allocate_address
         return response_generator(:action => "AllocateAddress")
       end
 
-      # The DescribeAddresses operation lists elastic IP addresses assigned to your account.
-      #
-      # @option options [Array] :public_ip ([]) an IP address to be described
-      #
-      def describe_addresses( options = {} )
-        options = { :public_ip => [] }.merge(options)
-        params = pathlist("PublicIp", options[:public_ip])
-        return response_generator(:action => "DescribeAddresses", :params => params)
-      end
-
-      # The ReleaseAddress operation releases an elastic IP address associated with your account.
-      #
-      # If you run this operation on an elastic IP address that is already released, the address
-      # might be assigned to another account which will cause Amazon EC2 to return an error.
-      #
-      # Note : Releasing an IP address automatically disassociates it from any instance
-      # with which it is associated. For more information, see DisassociateAddress.
-      #
-      # Important! After releasing an elastic IP address, it is released to the IP
-      # address pool and might no longer be available to your account. Make sure
-      # to update your DNS records and any servers or devices that communicate
-      # with the address.
-      #
-      # @option options [String] :public_ip ('') an IP address to be released.
-      #
-      def release_address( options = {} )
-        options = { :public_ip => '' }.merge(options)
-        raise ArgumentError, "No ':public_ip' provided" if options[:public_ip].nil? || options[:public_ip].empty?
-        params = { "PublicIp" => options[:public_ip] }
-        return response_generator(:action => "ReleaseAddress", :params => params)
-      end
 
       # The AssociateAddress operation associates an elastic IP address with an instance.
       #
@@ -60,6 +30,18 @@ module AWS
         return response_generator(:action => "AssociateAddress", :params => params)
       end
 
+
+      # The DescribeAddresses operation lists elastic IP addresses assigned to your account.
+      #
+      # @option options [Array] :public_ip ([]) an IP address to be described
+      #
+      def describe_addresses( options = {} )
+        options = { :public_ip => [] }.merge(options)
+        params = pathlist("PublicIp", options[:public_ip])
+        return response_generator(:action => "DescribeAddresses", :params => params)
+      end
+
+
       # The DisassociateAddress operation disassociates the specified elastic IP
       # address from the instance to which it is assigned. This is an idempotent
       # operation. If you enter it more than once, Amazon EC2 does not return
@@ -74,8 +56,31 @@ module AWS
         return response_generator(:action => "DisassociateAddress", :params => params)
       end
 
-    end
 
+      # The ReleaseAddress operation releases an elastic IP address associated with your account.
+      #
+      # If you run this operation on an elastic IP address that is already released, the address
+      # might be assigned to another account which will cause Amazon EC2 to return an error.
+      #
+      # Note : Releasing an IP address automatically disassociates it from any instance
+      # with which it is associated. For more information, see DisassociateAddress.
+      #
+      # Important! After releasing an elastic IP address, it is released to the IP
+      # address pool and might no longer be available to your account. Make sure
+      # to update your DNS records and any servers or devices that communicate
+      # with the address.
+      #
+      # @option options [String] :public_ip ('') an IP address to be released.
+      #
+      def release_address( options = {} )
+        options = { :public_ip => '' }.merge(options)
+        raise ArgumentError, "No ':public_ip' provided" if options[:public_ip].nil? || options[:public_ip].empty?
+        params = { "PublicIp" => options[:public_ip] }
+        return response_generator(:action => "ReleaseAddress", :params => params)
+      end
+
+
+    end
   end
 end
 

data/lib/AWS/EC2/images.rb

@@ -3,6 +3,46 @@ module AWS
 
     class Base < AWS::Base
 
+      # Creates an AMI that uses an Amazon EBS root device from a "running" or "stopped" instance.
+      #
+      # AMIs that use an Amazon EBS root device boot faster than AMIs that use instance stores.
+      # They can be up to 1 TiB in size, use storage that persists on instance failure, and can be
+      # stopped and started.
+      #
+      # @option options [String] :instance_id ("") The ID of the instance.
+      # @option options [String] :name ("") The name of the AMI that was provided during image creation. Constraints 3-128 alphanumeric characters, parenthesis (()), commas (,), slashes (/), dashes (-), or underscores(_)
+      # @option options [optional,String] :description ("") The description of the AMI that was provided during image creation.
+      # @option options [optional,Boolean] :no_reboot (false) By default this property is set to false, which means Amazon EC2 attempts to cleanly shut down the instance before image creation and reboots the instance afterwards. When set to true, Amazon EC2 does not shut down the instance before creating the image. When this option is used, file system integrity on the created image cannot be guaranteed.
+      #
+      def create_image( options = {} )
+        options = { :instance_id => "", :name => "" }.merge(options)
+        raise ArgumentError, "No :instance_id provided" if options.does_not_have? :instance_id
+        raise ArgumentError, "No :name provided" if options.does_not_have? :name
+        raise ArgumentError, "Invalid string length for :name provided" if options[:name] && options[:name].size < 3 || options[:name].size > 128
+        raise ArgumentError, "Invalid string length for :description provided (too long)" if options[:description] && options[:description].size > 255
+        raise ArgumentError, ":no_reboot option must be a Boolean" unless options[:no_reboot].nil? || [true, false].include?(options[:no_reboot])
+        params = {}
+        params["InstanceId"] = options[:instance_id].to_s
+        params["Name"] = options[:name].to_s
+        params["Description"] = options[:description].to_s
+        params["NoReboot"] = options[:no_reboot].to_s
+        return response_generator(:action => "CreateImage", :params => params)
+      end
+
+
+      # The DeregisterImage operation deregisters an AMI. Once deregistered, instances of the AMI may no
+      # longer be launched.
+      #
+      # @option options [String] :image_id ("")
+      #
+      def deregister_image( options = {} )
+        options = { :image_id => "" }.merge(options)
+        raise ArgumentError, "No :image_id provided" if options[:image_id].nil? || options[:image_id].empty?
+        params = { "ImageId" => options[:image_id] }
+        return response_generator(:action => "DeregisterImage", :params => params)
+      end
+
+
       # The RegisterImage operation registers an AMI with Amazon EC2. Images must be registered before
       # they can be launched.  Each AMI is associated with an unique ID which is provided by the EC2
       # service via the Registerimage operation. As part of the registration process, Amazon EC2 will
@@ -15,17 +55,13 @@ module AWS
       # @option options [String] :image_location ("")
       #
       def register_image( options = {} )
-
         options = {:image_location => ""}.merge(options)
-
         raise ArgumentError, "No :image_location provided" if options[:image_location].nil? || options[:image_location].empty?
-
         params = { "ImageLocation" => options[:image_location] }
-
         return response_generator(:action => "RegisterImage", :params => params)
-
       end
 
+
       # The DescribeImages operation returns information about AMIs available for use by the user. This
       # includes both public AMIs (those available for any user to launch) and private AMIs (those owned by
       # the user making the request and those owned by other users that the user making the request has explicit
@@ -67,35 +103,15 @@ module AWS
       # @option options [Array] :executable_by ([])
       #
       def describe_images( options = {} )
-
         options = { :image_id => [], :owner_id => [], :executable_by => [] }.merge(options)
-
         params = pathlist( "ImageId", options[:image_id] )
         params.merge!(pathlist( "Owner", options[:owner_id] ))
         params.merge!(pathlist( "ExecutableBy", options[:executable_by] ))
-
         return response_generator(:action => "DescribeImages", :params => params)
-
       end
 
-      # The DeregisterImage operation deregisters an AMI. Once deregistered, instances of the AMI may no
-      # longer be launched.
-      #
-      # @option options [String] :image_id ("")
-      #
-      def deregister_image( options = {} )
-
-        options = { :image_id => "" }.merge(options)
-
-        raise ArgumentError, "No :image_id provided" if options[:image_id].nil? || options[:image_id].empty?
-
-        params = { "ImageId" => options[:image_id] }
-
-        return response_generator(:action => "DeregisterImage", :params => params)
-
-      end
 
     end
-
   end
-end
+end
+

data/lib/AWS/EC2/instances.rb

@@ -1,96 +1,72 @@
 module AWS
   module EC2
-
     class Base < AWS::Base
 
-      # The RunInstances operation launches a specified number of instances.
-      #
-      # Note : The Query version of RunInstances only allows instances of a single AMI to be launched in
-      # one call. This is different from the SOAP API call of the same name but similar to the
-      # ec2-run-instances command line tool.
-      #
-      # If Amazon EC2 cannot launch the minimum number AMIs you request, no instances launch. If there
-      # is insufficient capacity to launch the maximum number of AMIs you request, Amazon EC2 launches
-      # as many as possible to satisfy the requested maximum values.
-      #
-      # Every instance is launched in a security group. If you do not specify a security group at
-      # launch, the instances start in the default security group.
-      #
-      # An optional instance type can be specified.  Currently supported types are 'm1.small', 'm1.large',
-      # 'm1.xlarge' and the high CPU types 'c1.medium' and 'c1.xlarge'.  'm1.small' is the default
-      # if no instance_type is specified.
-      #
-      # You can provide an optional key pair ID for each image in the launch request. All instances
-      # that are created from images that use this key pair will have access to the associated public
-      # key at boot. You can use this key to provide secure access to an instance of an image on a
-      # per-instance basis. Amazon EC2  public images use this feature to provide secure access
-      # without passwords.
-      #
-      # Important!  Launching public images without a key pair ID will leave them inaccessible.
-      #
-      # The public key material is made available to the instance at boot time by placing it in a file named
-      # openssh_id.pub on a logical device that is exposed to the instance as /dev/sda2 (the ephemeral
-      # store). The format of this file is suitable for use as an entry within ~/.ssh/authorized_keys (the
-      # OpenSSH format). This can be done at boot time (as part of rclocal, for example) allowing for secure
-      # password-less access.
-      #
-      # Optional user data can be provided in the launch request. All instances comprising the launch
-      # request have access to this data (see Instance Metadata for details).
-      #
-      # If any of the AMIs have product codes attached for which the user has not subscribed,
-      # the RunInstances call will fail.
-      #
-      # @option options [String] :image_id ("")
-      # @option options [Integer] :min_count (1)
-      # @option options [Integer] :max_count (1)
-      # @option options [optional, String] :key_name (nil)
-      # @option options [optional, Array] :group_id ([])
-      # @option options [optional, String] :user_data (nil)
-      # @option options [optional, String] :addressing_type ("public")
-      # @option options [optional, String] :instance_type ("m1.small")
-      # @option options [optional, String] :kernel_id (nil)
-      # @option options [optional, String] :availability_zone (nil)
+      # Launches a specified number of instances of an AMI for which you have permissions.
+      #
+      # Amazon API Docs : HTML[http://docs.amazonwebservices.com/AWSEC2/2009-10-31/APIReference/index.html?ApiReference-query-RunInstances.html]
+      #
+      # @option options [String] :image_id ("") Unique ID of a machine image.
+      # @option options [Integer] :min_count (1) Minimum number of instances to launch. If the value is more than Amazon EC2 can launch, no instances are launched at all.
+      # @option options [Integer] :max_count (1) Maximum number of instances to launch. If the value is more than Amazon EC2 can launch, the largest possible number above minCount will be launched instead.
+      # @option options [optional, String] :key_name (nil) The name of the key pair.
+      # @option options [optional, String] :security_group (nil) Name of the security group.
+      # @option options [optional, String] :additional_info (nil) Specifies additional information to make available to the instance(s).
+      # @option options [optional, String] :user_data (nil) MIME, Base64-encoded user data.
+      # @option options [optional, String] :instance_type (nil) Specifies the instance type.
+      # @option options [optional, String] :availability_zone (nil) Specifies the placement constraints (Availability Zones) for launching the instances.
+      # @option options [optional, String] :kernel_id (nil) The ID of the kernel with which to launch the instance.
+      # @option options [optional, String] :ramdisk_id (nil) The ID of the RAM disk with which to launch the instance. Some kernels require additional drivers at launch. Check the kernel requirements for information on whether you need to specify a RAM disk. To find kernel requirements, go to the Resource Center and search for the kernel ID.
+      # @option options [optional, Array] :block_device_mapping ([]) An array of Hashes representing the elements of the block device mapping.  e.g. [{:device_name => '/dev/sdh', :virtual_name => '', :ebs_snapshot_id => '', :ebs_volume_size => '', :ebs_delete_on_termination => ''},{},...]
+      # @option options [optional, Boolean] :monitoring_enabled (false) Enables monitoring for the instance.
+      # @option options [optional, String] :subnet_id (nil) Specifies the Amazon VPC subnet ID within which to launch the instance(s) for Amazon Virtual Private Cloud.
+      # @option options [optional, Boolean] :disable_api_termination (true) Specifies whether the instance can be terminated using the APIs. You must modify this attribute before you can terminate any "locked" instances from the APIs.
+      # @option options [optional, String] :instance_initiated_shutdown_behavior ('stop') Specifies whether the instance's Amazon EBS volumes are stopped or terminated when the instance is shut down. Valid values : 'stop', 'terminate'
       # @option options [optional, Boolean] :base64_encoded (false)
       #
       def run_instances( options = {} )
-
         options = { :image_id => "",
                     :min_count => 1,
                     :max_count => 1,
-                    :key_name => nil,
-                    :group_id => [],
-                    :user_data => nil,
-                    :addressing_type => "public",
-                    :instance_type => "m1.small",
-                    :kernel_id => nil,
-                    :availability_zone => nil,
                     :base64_encoded => false }.merge(options)
 
-        # Do some validation on the arguments provided
+        raise ArgumentError, ":addressing_type has been deprecated." if options[:addressing_type]
+        raise ArgumentError, ":group_id has been deprecated." if options[:group_id]
+
         raise ArgumentError, ":image_id must be provided" if options[:image_id].nil? || options[:image_id].empty?
         raise ArgumentError, ":min_count is not valid" unless options[:min_count].to_i > 0
-        raise ArgumentError, ":max_count is not valid" unless options[:max_count].to_i > 0
-        raise ArgumentError, ":addressing_type must be 'direct' or 'public'" unless ["public", "direct"].include?(options[:addressing_type])
-        raise ArgumentError, ":instance_type must specify a valid instance size" unless ["m1.small", "m1.large", "m1.xlarge", "c1.medium", "c1.xlarge", "m2.2xlarge", "m2.4xlarge"].include?(options[:instance_type])
+        raise ArgumentError, ":max_count is not valid or must be >= :min_count" unless options[:max_count].to_i > 0 && options[:max_count].to_i >= options[:min_count].to_i
+        raise ArgumentError, ":instance_type must specify a valid instance size" unless options[:instance_type].nil? || ["m1.small", "m1.large", "m1.xlarge", "c1.medium", "c1.xlarge", "m2.2xlarge", "m2.4xlarge"].include?(options[:instance_type])
+        raise ArgumentError, ":monitoring_enabled must be 'true' or 'false'" unless options[:monitoring_enabled].nil? || [true, false].include?(options[:monitoring_enabled])
+        raise ArgumentError, ":disable_api_termination must be 'true' or 'false'" unless options[:disable_api_termination].nil? || [true, false].include?(options[:disable_api_termination])
+        raise ArgumentError, ":instance_initiated_shutdown_behavior must be 'stop' or 'terminate'" unless options[:instance_initiated_shutdown_behavior].nil? || ["stop", "terminate"].include?(options[:instance_initiated_shutdown_behavior])
         raise ArgumentError, ":base64_encoded must be 'true' or 'false'" unless [true, false].include?(options[:base64_encoded])
 
         user_data = extract_user_data(options)
 
-        params = {
-          "ImageId"  => options[:image_id],
-          "MinCount" => options[:min_count].to_s,
-          "MaxCount" => options[:max_count].to_s,
-        }.merge(pathlist("SecurityGroup", options[:group_id]))
+        params = {}
 
-        params["KeyName"] = options[:key_name] unless options[:key_name].nil?
-        params["UserData"] = user_data unless user_data.nil?
-        params["AddressingType"] = options[:addressing_type]
-        params["InstanceType"] = options[:instance_type]
-        params["KernelId"] = options[:kernel_id] unless options[:kernel_id].nil?
-        params["Placement.AvailabilityZone"] = options[:availability_zone] unless options[:availability_zone].nil?
+        if options[:block_device_mapping]
+          params.merge!(pathhashlist('BlockDeviceMapping', options[:block_device_mapping].flatten, {:device_name => 'DeviceName', :virtual_name => 'VirtualName', :ebs_snapshot_id => 'Ebs.SnapshotId', :ebs_volume_size => 'Ebs.VolumeSize', :ebs_delete_on_termination => 'Ebs.DeleteOnTermination' }))
+        end
 
-        return response_generator(:action => "RunInstances", :params => params)
+        params["ImageId"]                           = options[:image_id]
+        params["MinCount"]                          = options[:min_count].to_s
+        params["MaxCount"]                          = options[:max_count].to_s
+        params["KeyName"]                           = options[:key_name] unless options[:key_name].nil?
+        params["SecurityGroup"]                     = options[:security_group] unless options[:security_group].nil?
+        params["AdditionalInfo"]                    = options[:additional_info] unless options[:additional_info].nil?
+        params["UserData"]                          = user_data unless user_data.nil?
+        params["InstanceType"]                      = options[:instance_type] unless options[:instance_type].nil?
+        params["Placement.AvailabilityZone"]        = options[:availability_zone] unless options[:availability_zone].nil?
+        params["KernelId"]                          = options[:kernel_id] unless options[:kernel_id].nil?
+        params["RamdiskId"]                         = options[:ramdisk_id] unless options[:ramdisk_id].nil?
+        params["Monitoring.Enabled"]                = options[:monitoring_enabled].to_s unless options[:monitoring_enabled].nil?
+        params["SubnetId"]                          = options[:subnet_id] unless options[:subnet_id].nil?
+        params["DisableApiTermination"]             = options[:disable_api_termination].to_s unless options[:disable_api_termination].nil?
+        params["InstanceInitiatedShutdownBehavior"] = options[:instance_initiated_shutdown_behavior] unless options[:instance_initiated_shutdown_behavior].nil?
 
+        return response_generator(:action => "RunInstances", :params => params)
       end
 
       # If :user_data is passed in then URL escape and Base64 encode it
@@ -122,13 +98,65 @@ module AWS
       # @option options [Array] :instance_id ([])
       #
       def describe_instances( options = {} )
-
         options = { :instance_id => [] }.merge(options)
-
         params = pathlist("InstanceId", options[:instance_id])
-
         return response_generator(:action => "DescribeInstances", :params => params)
+      end
 
+
+      # Not yet implemented
+      #
+      # @todo Implement this method
+      #
+      def describe_instance_attribute( options = {} )
+        raise "Not yet implemented"
+      end
+
+
+      # Not yet implemented
+      #
+      # @todo Implement this method
+      #
+      def modify_instance_attribute( options = {} )
+        raise "Not yet implemented"
+      end
+
+
+      # Not yet implemented
+      #
+      # @todo Implement this method
+      #
+      def reset_instance_attribute( options = {} )
+        raise "Not yet implemented"
+      end
+
+
+      # Starts an instance that uses an Amazon EBS volume as its root device.
+      #
+      # @option options [Array] :instance_id ([]) Array of unique instance ID's of stopped instances.
+      #
+      def start_instances( options = {} )
+        options = { :instance_id => [] }.merge(options)
+        raise ArgumentError, "No :instance_id provided" if options[:instance_id].nil? || options[:instance_id].empty?
+        params = {}
+        params.merge!(pathlist("InstanceId", options[:instance_id]))
+        return response_generator(:action => "StartInstances", :params => params)
+      end
+
+
+      # Stops an instance that uses an Amazon EBS volume as its root device.
+      #
+      # @option options [Array] :instance_id ([]) Unique instance ID of a running instance.
+      # @option options [optional, Boolean] :force (false) Forces the instance to stop. The instance will not have an opportunity to flush file system caches nor file system meta data. If you use this option, you must perform file system check and repair procedures. This option is not recommended for Windows instances.
+      #
+      def stop_instances( options = {} )
+        options = { :instance_id => [] }.merge(options)
+        raise ArgumentError, "No :instance_id provided" if options[:instance_id].nil? || options[:instance_id].empty?
+        raise ArgumentError, ":force must be 'true' or 'false'" unless options[:force].nil? || [true, false].include?(options[:force])
+        params = {}
+        params.merge!(pathlist("InstanceId", options[:instance_id]))
+        params["Force"] = options[:force].to_s unless options[:force].nil?
+        return response_generator(:action => "StopInstances", :params => params)
       end
 
 
@@ -139,16 +167,10 @@ module AWS
       # @option options [Array] :instance_id ([])
       #
       def reboot_instances( options = {} )
-
-        # defaults
         options = { :instance_id => [] }.merge(options)
-
         raise ArgumentError, "No instance IDs provided" if options[:instance_id].nil? || options[:instance_id].empty?
-
         params = pathlist("InstanceId", options[:instance_id])
-
         return response_generator(:action => "RebootInstances", :params => params)
-
       end
 
 
@@ -160,15 +182,10 @@ module AWS
       # @option options [Array] :instance_id ([])
       #
       def terminate_instances( options = {} )
-
         options = { :instance_id => [] }.merge(options)
-
         raise ArgumentError, "No :instance_id provided" if options[:instance_id].nil? || options[:instance_id].empty?
-
         params = pathlist("InstanceId", options[:instance_id])
-
         return response_generator(:action => "TerminateInstances", :params => params)
-
       end
 
 
@@ -177,37 +194,53 @@ module AWS
       # @option options [Array] :instance_id ([])
       #
       def monitor_instances( options = {} )
-
         options = { :instance_id => [] }.merge(options)
-
         raise ArgumentError, "No :instance_id provided" if options[:instance_id].nil? || options[:instance_id].empty?
-
         params = pathlist("InstanceId", options[:instance_id])
-
         return response_generator(:action => "MonitorInstances", :params => params)
-
       end
 
 
-
       # The UnmonitorInstances operation tells Cloudwatch to stop logging metrics from one or more EC2 instances
       #
       # @option options [Array] :instance_id ([])
       #
       def unmonitor_instances( options = {} )
-
         options = { :instance_id => [] }.merge(options)
-
         raise ArgumentError, "No :instance_id provided" if options[:instance_id].nil? || options[:instance_id].empty?
-
         params = pathlist("InstanceId", options[:instance_id])
-
         return response_generator(:action => "UnmonitorInstances", :params => params)
+      end
 
+
+      # Not yet implemented
+      #
+      # @todo Implement this method
+      #
+      def describe_reserved_instances( options = {} )
+        raise "Not yet implemented"
+      end
+
+
+      # Not yet implemented
+      #
+      # @todo Implement this method
+      #
+      def describe_reserved_instances_offerings( options = {} )
+        raise "Not yet implemented"
       end
 
-    end
 
+      # Not yet implemented
+      #
+      # @todo Implement this method
+      #
+      def purchase_reserved_instances_offering( options = {} )
+        raise "Not yet implemented"
+      end
+
+
+    end
   end
 end