bosh_aws_cpi 0.6.0 → 0.6.2

data/lib/cloud/aws/cloud.rb

@@ -261,6 +261,10 @@ module Bosh::AwsCloud
       end
     end
 
+    # Configures network for a running instance
+    # @param [String] instance_id instance identifier
+    # @param [Hash] network_spec network properties
+    # @raises [Bosh::Clouds:NotSupported] if the security groups change
     def configure_networks(instance_id, network_spec)
       with_thread_name("configure_networks(#{instance_id}, ...)") do
         @logger.info("Configuring `#{instance_id}' to use the following " \
@@ -269,6 +273,18 @@ module Bosh::AwsCloud
         network_configurator = NetworkConfigurator.new(network_spec)
         instance = @ec2.instances[instance_id]
 
+        actual = instance.security_groups.collect {|sg| sg.name }.sort
+        new = network_configurator.security_groups(@default_security_groups)
+
+        # If the security groups change, we need to recreate the VM
+        # as you can't change the security group of a running instance,
+        # we need to send the InstanceUpdater a request to do it for us
+        unless actual == new
+          raise Bosh::Clouds::NotSupported,
+                "security groups change requires VM recreation: %s to %s" %
+                [actual.join(", "), new.join(", ")]
+        end
+
         network_configurator.configure(@ec2, instance)
 
         update_agent_settings(instance) do |settings|

data/lib/cloud/aws/dynamic_network.rb

@@ -17,8 +17,8 @@ module Bosh::AwsCloud
     ##
     # Configures EC2 dynamic network. Right now it's a no-op,
     # as dynamic networks are completely managed by EC2
-    # @param [AWS:EC2] instance EC2 client
-    # @param [AWS::EC2::Instance] EC2 instance to configure
+    # @param [AWS:EC2] ec2 instance EC2 client
+    # @param [AWS::EC2::Instance] instance EC2 instance to configure
     def configure(ec2, instance)
     end
 

data/lib/cloud/aws/network_configurator.rb

@@ -37,14 +37,14 @@ module Bosh::AwsCloud
             cloud_error("More than one dynamic network for `#{name}'")
           else
             @dynamic_network = DynamicNetwork.new(name, spec)
-            # only extract security groups for dynamic networks
-            extract_security_groups(spec)
+            @security_groups += extract_security_groups(spec)
           end
         when "vip"
           if @vip_network
             cloud_error("More than one vip network for `#{name}'")
           else
             @vip_network = VipNetwork.new(name, spec)
+            @security_groups += extract_security_groups(spec)
           end
         else
           cloud_error("Invalid network type `#{network_type}': AWS CPI " \
@@ -58,6 +58,9 @@ module Bosh::AwsCloud
       end
     end
 
+    # Applies network configuration to the vm
+    # @param [AWS:EC2] ec2 instance EC2 client
+    # @param [AWS::EC2::Instance] instance EC2 instance to configure
     def configure(ec2, instance)
       @dynamic_network.configure(ec2, instance)
 
@@ -84,27 +87,30 @@ module Bosh::AwsCloud
     # @return [Array] security groups
     def security_groups(default)
       if @security_groups.empty? && default
-        return default
+        default.sort
       else
-        return @security_groups
+        @security_groups.sort
       end
     end
 
+    private
+
     ##
     # Extracts the security groups from the network configuration
     # @param [Hash] network_spec Network specification
     # @raise [ArgumentError] if the security groups in the network_spec
     #   is not an Array
-    def extract_security_groups(spec)
-      if spec && spec["cloud_properties"]
-        cloud_properties = spec["cloud_properties"]
+    def extract_security_groups(network_spec)
+      if network_spec && network_spec["cloud_properties"]
+        cloud_properties = network_spec["cloud_properties"]
         if cloud_properties && cloud_properties["security_groups"]
           unless cloud_properties["security_groups"].is_a?(Array)
             raise ArgumentError, "security groups must be an Array"
           end
-          @security_groups += cloud_properties["security_groups"]
+          return cloud_properties["security_groups"]
         end
       end
+      []
     end
 
   end

data/lib/cloud/aws/version.rb

@@ -2,6 +2,6 @@
 
 module Bosh
   module AwsCloud
-    VERSION = "0.6.0"
+    VERSION = "0.6.2"
   end
 end

data/spec/spec_helper.rb

@@ -86,7 +86,12 @@ def mock_cloud(options = nil)
 end
 
 def dynamic_network_spec
-  { "type" => "dynamic" }
+  {
+      "type" => "dynamic",
+      "cloud_properties" => {
+          "security_groups" => %w[default]
+      }
+  }
 end
 
 def vip_network_spec

data/spec/unit/configure_networks_spec.rb

@@ -8,9 +8,28 @@ describe Bosh::AwsCloud::Cloud do
     @registry = mock_registry
   end
 
+  it "forces recreation when security groups differ" do
+    sec_grp = double("security_group", :name => "newgroup")
+    instance = double("instance",
+                      :id => "i-foobar",
+                      :security_groups => [sec_grp])
+
+    cloud = mock_cloud do |ec2|
+      ec2.instances.stub(:[]).
+          with("i-foobar").
+          and_return(instance)
+    end
+
+    lambda {
+      cloud.configure_networks("i-foobar", combined_network_spec)
+    }.should raise_error Bosh::Clouds::NotSupported
+  end
+
   it "adds elastic ip from to the instance for vip network" do
+    sec_grp = double("security_group", :name => "default")
     instance = double("instance",
-                      :id => "i-foobar")
+                      :id => "i-foobar",
+                      :security_groups => [sec_grp])
 
     cloud = mock_cloud do |ec2|
       ec2.instances.stub(:[]).
@@ -33,8 +52,10 @@ describe Bosh::AwsCloud::Cloud do
   end
 
   it "removes elastic ip from the instance if vip network is gone" do
+    sec_grp = double("security_group", :name => "default")
     instance = double("instance",
-                      :id => "i-foobar")
+                      :id => "i-foobar",
+                      :security_groups => [sec_grp])
 
     cloud = mock_cloud do |ec2|
       ec2.instances.stub(:[]).

data/spec/unit/create_vm_spec.rb

@@ -54,14 +54,16 @@ describe Bosh::AwsCloud::Cloud, "create_vm" do
       }
     }
 
+    sec_grp = double("security_group", :name => "default")
     instance = double("instance",
                       :id => "i-test",
-                      :elastic_ip => nil)
+                      :elastic_ip => nil,
+                      :security_groups => [sec_grp])
     client = double("client", :describe_images => fake_image_set)
 
     cloud = mock_cloud do |ec2|
       ec2.instances.should_receive(:create).
-        with(ec2_params(user_data)).
+        with(ec2_params(user_data, %w[default])).
         and_return(instance)
       ec2.should_receive(:client).and_return(client)
     end
@@ -90,10 +92,11 @@ describe Bosh::AwsCloud::Cloud, "create_vm" do
 
     instance = double("instance",
                       :id => "i-test",
-                      :elastic_ip => nil)
+                      :elastic_ip => nil,
+                      :security_groups => [])
     client = double("client", :describe_images => fake_image_set)
 
-    security_groups = %w[foo bar]
+    security_groups = %w[bar foo]
     network_spec = dynamic_network_spec
     network_spec["cloud_properties"] = {
       "security_groups" => security_groups
@@ -120,9 +123,11 @@ describe Bosh::AwsCloud::Cloud, "create_vm" do
   end
 
   it "associates instance with elastic ip if vip network is provided" do
+    sec_grp = double("security_group", :name => "default")
     instance = double("instance",
                       :id => "i-test",
-                      :elastic_ip => nil)
+                      :elastic_ip => nil,
+                      :security_groups => [sec_grp])
     client = double("client", :describe_images => fake_image_set)
 
     cloud = mock_cloud do |ec2|

data/spec/unit/network_configurator_spec.rb

@@ -17,7 +17,7 @@ describe Bosh::AwsCloud::NetworkConfigurator do
   end
 
   describe "security groups" do
-    it "should only be extracted from dynamic network" do
+    it "should be extracted from both dynamic and vip network" do
       spec = {}
       spec["network_a"] = dynamic_network_spec
       set_security_groups(spec["network_a"], %w[foo])
@@ -25,12 +25,12 @@ describe Bosh::AwsCloud::NetworkConfigurator do
       set_security_groups(spec["network_b"], %w[bar])
 
       nc = Bosh::AwsCloud::NetworkConfigurator.new(spec)
-      nc.security_groups(nil).should == %w[foo]
+      nc.security_groups(nil).should == %w[bar foo]
     end
 
     it "should return the default groups if none are extracted" do
       spec = {}
-      spec["network_a"] = dynamic_network_spec
+      spec["network_a"] = {"type" => "dynamic"}
 
       nc = Bosh::AwsCloud::NetworkConfigurator.new(spec)
       nc.security_groups(%w[foo]).should == %w[foo]
@@ -38,7 +38,7 @@ describe Bosh::AwsCloud::NetworkConfigurator do
 
     it "should return an empty list if no default group is set" do
       spec = {}
-      spec["network_a"] = dynamic_network_spec
+      spec["network_a"] = {"type" => "dynamic"}
 
       nc = Bosh::AwsCloud::NetworkConfigurator.new(spec)
       nc.security_groups(nil).should == []

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_aws_cpi
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-23 00:00:00.000000000 Z
+date: 2012-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -158,7 +158,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3392403251669276232
+      hash: -2760126620918151960
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3392403251669276232
+      hash: -2760126620918151960
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24