bosh_aws_registry 0.2.1 → 0.2.2

data/lib/aws_registry/instance_manager.rb

@@ -31,7 +31,7 @@ module Bosh::AwsRegistry
     #        check will be performed to see if it instance id
     #        actually has this IP address according to EC2.
     def read_settings(instance_id, remote_ip = nil)
-      check_instance_ip(remote_ip, instance_id) if remote_ip
+      check_instance_ips(remote_ip, instance_id) if remote_ip
 
       get_instance(instance_id).settings
     end
@@ -42,12 +42,13 @@ module Bosh::AwsRegistry
 
     private
 
-    def check_instance_ip(ip, instance_id)
+    def check_instance_ips(ip, instance_id)
       return if ip == "127.0.0.1"
-      actual_ip = instance_private_ip(instance_id)
-      unless ip == actual_ip
+      actual_ips = instance_ips(instance_id)
+      unless actual_ips.include?(ip)
         raise InstanceError, "Instance IP mismatch, expected IP is " \
-                             "`%s', actual IP is `%s'" % [ ip, actual_ip ]
+                             "`%s', actual IP(s): `%s'" %
+                             [ ip, actual_ips.join(", ") ]
       end
     end
 
@@ -61,8 +62,14 @@ module Bosh::AwsRegistry
       instance
     end
 
-    def instance_private_ip(instance_id)
-      @ec2.instances[instance_id].private_ip_address
+    # Get the list of IPs belonging to this instance
+    def instance_ips(instance_id)
+      instance = @ec2.instances[instance_id]
+      ips = [instance.private_ip_address, instance.public_ip_address]
+      if instance.has_elastic_ip?
+        ips << instance.elastic_ip.public_ip
+      end
+      ips
     rescue AWS::Errors::Base => e
       raise Bosh::AwsRegistry::AwsError, "AWS error: #{e}"
     end

data/lib/aws_registry/version.rb

@@ -2,6 +2,6 @@
 
 module Bosh
   module AwsRegistry
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

data/spec/unit/instance_manager_spec.rb

@@ -17,30 +17,44 @@ describe Bosh::AwsRegistry::InstanceManager do
     Bosh::AwsRegistry::Models::AwsInstance.create(params)
   end
 
-  def actual_ip_is(ip)
+  def actual_ip_is(public_ip, private_ip, eip=nil)
     instances = mock("instances")
     instance = mock("instance")
+    if eip
+      elastic_ip = mock("elastic_ip", :public_ip => eip)
+      instance.should_receive(:has_elastic_ip?).and_return(true)
+      instance.should_receive(:elastic_ip).and_return(elastic_ip)
+    else
+      instance.should_receive(:has_elastic_ip?).and_return(false)
+    end
     @ec2.should_receive(:instances).and_return(instances)
     instances.should_receive(:[]).with("foo").and_return(instance)
-    instance.should_receive(:private_ip_address).and_return(ip)
+    instance.should_receive(:private_ip_address).and_return(public_ip)
+    instance.should_receive(:public_ip_address).and_return(private_ip)
   end
 
   describe "reading settings" do
     it "returns settings after verifying IP address" do
       create_instance(:instance_id => "foo", :settings => "bar")
-      actual_ip_is("10.0.0.1")
+      actual_ip_is("10.0.0.1", "10.0.1.1")
       manager.read_settings("foo", "10.0.0.1").should == "bar"
     end
 
+    it "returns settings after verifying elastic IP address" do
+      create_instance(:instance_id => "foo", :settings => "bar")
+      actual_ip_is("10.0.0.1", "10.0.1.1", "10.0.3.1")
+      manager.read_settings("foo", "10.0.3.1").should == "bar"
+    end
+
     it "raises an error if IP cannot be verified" do
       create_instance(:instance_id => "foo", :settings => "bar")
-      actual_ip_is("10.0.0.2")
+      actual_ip_is("10.0.0.1", "10.0.1.1")
 
       expect {
-        manager.read_settings("foo", "10.0.0.1")
+        manager.read_settings("foo", "10.0.3.1")
       }.to raise_error(Bosh::AwsRegistry::InstanceError,
-                       "Instance IP mismatch, expected IP is `10.0.0.1', " \
-                       "actual IP is `10.0.0.2'")
+                       "Instance IP mismatch, expected IP is `10.0.3.1', " \
+                       "actual IP(s): `10.0.0.1, 10.0.1.1'")
     end
 
     it "doesn't check remote IP if it's not provided" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_aws_registry
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-12 00:00:00.000000000 Z
+date: 2012-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -132,7 +132,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3082160961986360018
+      hash: -294461121857325008
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3082160961986360018
+      hash: -294461121857325008
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24