amazon-ec2 0.9.6 → 0.9.7

data/ChangeLog

@@ -1,3 +1,6 @@
+=== 0.9.7 2010-03-14
+ * Added EC2 describe_subnets support (petitbon)
+
 === 0.9.0 2010-01-19
  * Added EC2 Spot Instance Request Support (nirvdrum)
  * Added EC2 describe_spot_price_history (tlossen)

data/VERSION

@@ -1 +1 @@
-0.9.6
+0.9.7

data/amazon-ec2.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{amazon-ec2}
-  s.version = "0.9.6"
+  s.version = "0.9.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Glenn Rempe"]
-  s.date = %q{2010-02-25}
+  s.date = %q{2010-03-14}
   s.description = %q{A Ruby library for accessing the Amazon Web Services EC2, ELB, RDS, Cloudwatch, and Autoscaling APIs.}
   s.email = %q{glenn@rempe.us}
   s.executables = ["ec2-gem-example.rb", "ec2-gem-profile.rb", "ec2sh", "setup.rb"]
@@ -53,6 +53,7 @@ Gem::Specification.new do |s|
      "lib/AWS/EC2/snapshots.rb",
      "lib/AWS/EC2/spot_instance_requests.rb",
      "lib/AWS/EC2/spot_prices.rb",
+     "lib/AWS/EC2/subnets.rb",
      "lib/AWS/EC2/volumes.rb",
      "lib/AWS/ELB.rb",
      "lib/AWS/ELB/load_balancers.rb",
@@ -80,6 +81,7 @@ Gem::Specification.new do |s|
      "test/test_EC2_snapshots.rb",
      "test/test_EC2_spot_instance_requests.rb",
      "test/test_EC2_spot_prices.rb",
+     "test/test_EC2_subnets.rb",
      "test/test_EC2_volumes.rb",
      "test/test_ELB_load_balancers.rb",
      "test/test_RDS.rb",
@@ -114,6 +116,7 @@ Gem::Specification.new do |s|
      "test/test_EC2_snapshots.rb",
      "test/test_EC2_spot_instance_requests.rb",
      "test/test_EC2_spot_prices.rb",
+     "test/test_EC2_subnets.rb",
      "test/test_EC2_volumes.rb",
      "test/test_ELB_load_balancers.rb",
      "test/test_helper.rb",

data/lib/AWS/EC2/subnets.rb

@@ -0,0 +1,20 @@
+module AWS
+  module EC2
+    class Base < AWS::Base
+
+      # The DescribeSubnets operation returns information about subnets available for use by the user
+      # making the request. Selected subnets may be specified or the list may be left empty if information for
+      # all registered subnets is required.
+      #
+      # @option options [Array] :subnet_id ([])
+      #
+      def describe_subnets( options = {} )
+        options = { :subnet_id => [] }.merge(options)
+        params = pathlist("SubnetId", options[:subnet_id] )
+        return response_generator(:action => "DescribeSubnets", :params => params)
+      end
+
+    end
+  end
+end
+

data/test/test_EC2_subnets.rb

@@ -0,0 +1,65 @@
+#--
+# Amazon Web Services EC2 Query API Ruby library
+#
+# Ruby Gem Name::  amazon-ec2
+# Author::    Glenn Rempe  (mailto:glenn@rempe.us)
+# Copyright:: Copyright (c) 2007-2010 Glenn Rempe
+# License::   Distributes under the same terms as Ruby
+# Home::      http://github.com/grempe/amazon-ec2/tree/master
+#++
+
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+context "The EC2 subnets " do
+
+  before do
+    @ec2 = AWS::EC2::Base.new( :access_key_id => "not a key", :secret_access_key => "not a secret" )
+
+    @describe_subnets_response_body = <<-RESPONSE
+      <DescribeSubnetsResponse xmlns="http://ec2.amazonaws.com/doc/2008-02-01">
+        <subnetSet>
+          <item>
+            <state>available</state>
+            <availableIpAddressCount>251</availableIpAddressCount>
+            <subnetId>subnet-000000e0</subnetId>
+            <cidrBlock>10.225.251.0/24</cidrBlock>
+            <vpcId>vpc-b00000db</vpcId>
+            <availabilityZone>us-east-1a</availabilityZone>
+         </item>
+          <item>
+            <state>available</state>
+            <availableIpAddressCount>251</availableIpAddressCount>
+            <subnetId>subnet-11111!e1</subnetId>
+            <cidrBlock>10.225.251.0/24</cidrBlock>
+            <vpcId>vpc-b00000db</vpcId>
+            <availabilityZone>us-east-1a</availabilityZone>
+         </item>
+       </subnetSet>
+    </DescribeSubnetsResponse>
+    RESPONSE
+
+  end
+
+
+  specify "should be able to be described with no params and return a subnetSet" do
+    @ec2.stubs(:make_request).with('DescribeSubnets', {}).
+      returns stub(:body => @describe_subnets_response_body, :is_a? => true)
+    @ec2.describe_subnets.subnetSet.item.length.should.equal 2
+  end
+
+
+  specify "should be able to be described with describe_subnet" do
+    @ec2.stubs(:make_request).with('DescribeSubnets', {"SubnetId.1"=>"subnet-000000e0"}).
+      returns stub(:body => @describe_subnets_response_body, :is_a? => true)
+    @ec2.describe_subnets( :subnet_id => "subnet-000000e0" ).should.be.an.instance_of Hash
+    response = @ec2.describe_subnets( :subnet_id => "subnet-000000e0" )
+    response.subnetSet.item[0].state.should.equal "available"
+    response.subnetSet.item[0].availableIpAddressCount.should.equal "251"
+    response.subnetSet.item[0].subnetId.should.equal "subnet-000000e0"
+    response.subnetSet.item[0].cidrBlock.should.equal "10.225.251.0/24"
+    response.subnetSet.item[0].vpcId.should.equal "vpc-b00000db"
+    response.subnetSet.item[0].availabilityZone.should.equal "us-east-1a"
+  end
+
+end
+

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 6
-  version: 0.9.6
+  - 7
+  version: 0.9.7
 platform: ruby
 authors: 
 - Glenn Rempe
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-25 00:00:00 -08:00
+date: 2010-03-14 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -135,6 +135,7 @@ files:
 - lib/AWS/EC2/snapshots.rb
 - lib/AWS/EC2/spot_instance_requests.rb
 - lib/AWS/EC2/spot_prices.rb
+- lib/AWS/EC2/subnets.rb
 - lib/AWS/EC2/volumes.rb
 - lib/AWS/ELB.rb
 - lib/AWS/ELB/load_balancers.rb
@@ -162,6 +163,7 @@ files:
 - test/test_EC2_snapshots.rb
 - test/test_EC2_spot_instance_requests.rb
 - test/test_EC2_spot_prices.rb
+- test/test_EC2_subnets.rb
 - test/test_EC2_volumes.rb
 - test/test_ELB_load_balancers.rb
 - test/test_RDS.rb
@@ -223,6 +225,7 @@ test_files:
 - test/test_EC2_snapshots.rb
 - test/test_EC2_spot_instance_requests.rb
 - test/test_EC2_spot_prices.rb
+- test/test_EC2_subnets.rb
 - test/test_EC2_volumes.rb
 - test/test_ELB_load_balancers.rb
 - test/test_helper.rb