bosh_openstack_cpi 0.0.4 → 0.0.5

data/spec/spec_helper.rb

@@ -111,7 +111,12 @@ def mock_glance(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/attach_disk_spec.rb

@@ -15,14 +15,17 @@ describe Bosh::OpenStackCloud::Cloud do
     attachment = double("attachment", :device => "/dev/vdc")
 
     cloud = mock_cloud do |openstack|
-      openstack.servers.should_receive(:get).with("i-test").and_return(server)
-      openstack.volumes.should_receive(:get).with("v-foobar").and_return(volume)
-      openstack.should_receive(:get_server_volumes).and_return(volume_attachments)
+      openstack.servers.should_receive(:get).
+        with("i-test").and_return(server)
+      openstack.volumes.should_receive(:get).
+        with("v-foobar").and_return(volume)
+      openstack.should_receive(:get_server_volumes).
+        and_return(volume_attachments)
     end
 
-    volume.should_receive(:attach).with(server.id, "/dev/vdc").and_return(attachment)
-    volume.should_receive(:status).and_return(:available)
-    cloud.should_receive(:wait_resource).with(volume, :available, :"in-use")
+    volume.should_receive(:attach).
+      with(server.id, "/dev/vdc").and_return(attachment)
+    cloud.should_receive(:wait_resource).with(volume, :"in-use")
 
     old_settings = { "foo" => "bar" }
     new_settings = {
@@ -34,8 +37,10 @@ describe Bosh::OpenStackCloud::Cloud do
       }
     }
 
-    @registry.should_receive(:read_settings).with("i-test").and_return(old_settings)
-    @registry.should_receive(:update_settings).with("i-test", new_settings)
+    @registry.should_receive(:read_settings).
+      with("i-test").and_return(old_settings)
+    @registry.should_receive(:update_settings).
+      with("i-test", new_settings)
 
     cloud.attach_disk("i-test", "v-foobar")
   end
@@ -43,18 +48,23 @@ describe Bosh::OpenStackCloud::Cloud do
   it "picks available device name" do
     server = double("server", :id => "i-test", :name => "i-test")
     volume = double("volume", :id => "v-foobar")
-    volume_attachments = double("body", :body => {"volumeAttachments" => [{"device" => "/dev/vdc"}, {"device" => "/dev/vdd"}]})
+    volume_attachments = double("body", :body => {"volumeAttachments" =>
+                                                  [{"device" => "/dev/vdc"},
+                                                   {"device" => "/dev/vdd"}]})
     attachment = double("attachment", :device => "/dev/vdd")
 
     cloud = mock_cloud do |openstack|
-      openstack.servers.should_receive(:get).with("i-test").and_return(server)
-      openstack.volumes.should_receive(:get).with("v-foobar").and_return(volume)
-      openstack.should_receive(:get_server_volumes).and_return(volume_attachments)
+      openstack.servers.should_receive(:get).
+        with("i-test").and_return(server)
+      openstack.volumes.should_receive(:get).
+        with("v-foobar").and_return(volume)
+      openstack.should_receive(:get_server_volumes).
+        and_return(volume_attachments)
     end
 
-    volume.should_receive(:attach).with(server.id, "/dev/vde").and_return(attachment)
-    volume.should_receive(:status).and_return(:available)
-    cloud.should_receive(:wait_resource).with(volume, :available, :"in-use")
+    volume.should_receive(:attach).
+      with(server.id, "/dev/vde").and_return(attachment)
+    cloud.should_receive(:wait_resource).with(volume, :"in-use")
 
     old_settings = { "foo" => "bar" }
     new_settings = {
@@ -66,8 +76,10 @@ describe Bosh::OpenStackCloud::Cloud do
       }
     }
 
-    @registry.should_receive(:read_settings).with("i-test").and_return(old_settings)
-    @registry.should_receive(:update_settings).with("i-test", new_settings)
+    @registry.should_receive(:read_settings).
+      with("i-test").and_return(old_settings)
+    @registry.should_receive(:update_settings).
+      with("i-test", new_settings)
 
     cloud.attach_disk("i-test", "v-foobar")
   end
@@ -79,12 +91,16 @@ describe Bosh::OpenStackCloud::Cloud do
       array << {"device" => "/dev/vd#{char}"}
       array
     end
-    volume_attachments = double("body", :body => {"volumeAttachments" => all_mappings})
+    volume_attachments = double("body", :body => {"volumeAttachments" =>
+                                                   all_mappings})
 
     cloud = mock_cloud do |openstack|
-      openstack.servers.should_receive(:get).with("i-test").and_return(server)
-      openstack.volumes.should_receive(:get).with("v-foobar").and_return(volume)
-      openstack.should_receive(:get_server_volumes).and_return(volume_attachments)
+      openstack.servers.should_receive(:get).
+        with("i-test").and_return(server)
+      openstack.volumes.should_receive(:get).
+        with("v-foobar").and_return(volume)
+      openstack.should_receive(:get_server_volumes).
+        and_return(volume_attachments)
     end
 
     expect {

data/spec/unit/configure_networks_spec.rb

@@ -8,13 +8,34 @@ describe Bosh::OpenStackCloud::Cloud do
     @registry = mock_registry
   end
 
+  it "forces recreation when security groups differ" do
+    server = double("server", :id => "i-test", :name => "i-test")
+    sec_grp = double("security_group",
+                     :body => {"security_groups" => [{"name"=> "newgroup" }]})
+
+    cloud = mock_cloud do |openstack|
+      openstack.servers.should_receive(:get).with("i-test").and_return(server)
+      openstack.should_receive(:list_security_groups).
+          with("i-test").and_return(sec_grp)
+    end
+
+    expect {
+      cloud.configure_networks("i-test", combined_network_spec)
+    }.to raise_error Bosh::Clouds::NotSupported
+  end
+
   it "adds floating ip to the server for vip network" do
     server = double("server", :id => "i-test", :name => "i-test")
-    address = double("address", :id => "a-test", :ip => "10.0.0.1", :instance_id => nil)
+    address = double("address", :id => "a-test", :ip => "10.0.0.1",
+                     :instance_id => nil)
+    sec_grp = double("security_group",
+                     :body => {"security_groups" => [{"name"=> "default" }]})
 
     cloud = mock_cloud do |openstack|
       openstack.servers.should_receive(:get).with("i-test").and_return(server)
-      openstack.addresses.should_receive(:each).and_yield(address)
+      openstack.addresses.should_receive(:find).and_return(address)
+      openstack.should_receive(:list_security_groups).
+          with("i-test").and_return(sec_grp)
     end
 
     address.should_receive(:server=).with(server)
@@ -22,7 +43,8 @@ describe Bosh::OpenStackCloud::Cloud do
     old_settings = { "foo" => "bar", "networks" => "baz" }
     new_settings = { "foo" => "bar", "networks" => combined_network_spec }
 
-    @registry.should_receive(:read_settings).with("i-test").and_return(old_settings)
+    @registry.should_receive(:read_settings).with("i-test").
+        and_return(old_settings)
     @registry.should_receive(:update_settings).with("i-test", new_settings)
 
     cloud.configure_networks("i-test", combined_network_spec)
@@ -30,53 +52,54 @@ describe Bosh::OpenStackCloud::Cloud do
 
   it "removes floating ip from the server if vip network is gone" do
     server = double("server", :id => "i-test", :name => "i-test")
-    address = double("address", :id => "a-test", :ip => "10.0.0.1", :instance_id => "i-test")
+    address = double("address", :id => "a-test", :ip => "10.0.0.1",
+                     :instance_id => "i-test")
+    sec_grp = double("security_group",
+                     :body => {"security_groups" => [{"name"=> "default" }]})
 
     cloud = mock_cloud do |openstack|
       openstack.servers.should_receive(:get).with("i-test").and_return(server)
       openstack.addresses.should_receive(:each).and_yield(address)
+      openstack.should_receive(:list_security_groups).
+          with("i-test").and_return(sec_grp)
     end
 
     address.should_receive(:server=).with(nil)
 
-    old_settings = { "foo" => "bar", "networks" => combined_network_spec }
-    new_settings = { "foo" => "bar", "networks" => { "net_a" => dynamic_network_spec } }
+    old_settings = { "foo" => "bar",
+                     "networks" => combined_network_spec }
+    new_settings = { "foo" => "bar",
+                     "networks" => { "net_a" => dynamic_network_spec } }
 
-    @registry.should_receive(:read_settings).with("i-test").and_return(old_settings)
+    @registry.should_receive(:read_settings).with("i-test").
+        and_return(old_settings)
     @registry.should_receive(:update_settings).with("i-test", new_settings)
 
     cloud.configure_networks("i-test", "net_a" => dynamic_network_spec)
   end
 
   it "performs network sanity check" do
-    server = double("server", :id => "i-test", :name => "i-test")
-
     expect {
-      cloud = mock_cloud do |openstack|
-        openstack.servers.should_receive(:get).with("i-test").and_return(server)
-      end
-      cloud.configure_networks("i-test", "net_a" => vip_network_spec)
-    }.to raise_error(Bosh::Clouds::CloudError, "At least one dynamic network should be defined")
+      mock_cloud.configure_networks("i-test",
+                                    "net_a" => vip_network_spec)
+    }.to raise_error(Bosh::Clouds::CloudError,
+                     "At least one dynamic network should be defined")
 
     expect {
-      cloud = mock_cloud do |openstack|
-        openstack.servers.should_receive(:get).with("i-test").and_return(server)
-      end
-      cloud.configure_networks("i-test", "net_a" => vip_network_spec, "net_b" => vip_network_spec)
+      mock_cloud.configure_networks("i-test",
+                                    "net_a" => vip_network_spec,
+                                    "net_b" => vip_network_spec)
     }.to raise_error(Bosh::Clouds::CloudError, /More than one vip network/)
 
     expect {
-      cloud = mock_cloud do |openstack|
-        openstack.servers.should_receive(:get).with("i-test").and_return(server)
-      end
-      cloud.configure_networks("i-test", "net_a" => dynamic_network_spec, "net_b" => dynamic_network_spec)
+      mock_cloud.configure_networks("i-test",
+                                    "net_a" => dynamic_network_spec,
+                                    "net_b" => dynamic_network_spec)
     }.to raise_error(Bosh::Clouds::CloudError, /More than one dynamic network/)
 
     expect {
-      cloud = mock_cloud do |openstack|
-        openstack.servers.should_receive(:get).with("i-test").and_return(server)
-      end
-      cloud.configure_networks("i-test", "net_a" => { "type" => "foo" })
+      mock_cloud.configure_networks("i-test",
+                                    "net_a" => { "type" => "foo" })
     }.to raise_error(Bosh::Clouds::CloudError, /Invalid network type `foo'/)
   end
 

data/spec/unit/create_disk_spec.rb

@@ -9,18 +9,17 @@ describe Bosh::OpenStackCloud::Cloud do
     disk_params = {
       :name => "volume-#{unique_name}",
       :description => "",
-      :size => 2,
-      :availability_zone => "nova"
+      :size => 2
     }
     volume = double("volume", :id => "v-foobar")
 
     cloud = mock_cloud do |openstack|
-      openstack.volumes.should_receive(:create).with(disk_params).and_return(volume)
+      openstack.volumes.should_receive(:create).
+        with(disk_params).and_return(volume)
     end
 
     cloud.should_receive(:generate_unique_name).and_return(unique_name)
-    volume.should_receive(:status).and_return(:creating)
-    cloud.should_receive(:wait_resource).with(volume, :creating, :available)
+    cloud.should_receive(:wait_resource).with(volume, :available)
 
     cloud.create_disk(2048).should == "v-foobar"
   end
@@ -30,18 +29,17 @@ describe Bosh::OpenStackCloud::Cloud do
     disk_params = {
       :name => "volume-#{unique_name}",
       :description => "",
-      :size => 3,
-      :availability_zone => "nova"
+      :size => 3
     }
     volume = double("volume", :id => "v-foobar")
 
     cloud = mock_cloud do |openstack|
-      openstack.volumes.should_receive(:create).with(disk_params).and_return(volume)
+      openstack.volumes.should_receive(:create).
+        with(disk_params).and_return(volume)
     end
 
     cloud.should_receive(:generate_unique_name).and_return(unique_name)
-    volume.should_receive(:status).and_return(:creating)
-    cloud.should_receive(:wait_resource).with(volume, :creating, :available)
+    cloud.should_receive(:wait_resource).with(volume, :available)
 
     cloud.create_disk(2049)
   end
@@ -49,11 +47,11 @@ describe Bosh::OpenStackCloud::Cloud do
   it "check min and max disk size" do
     expect {
       mock_cloud.create_disk(100)
-    }.to raise_error(Bosh::Clouds::CloudError, /minimum disk size is 1 GiB/)
+    }.to raise_error(Bosh::Clouds::CloudError, /Minimum disk size is 1 GiB/)
 
     expect {
       mock_cloud.create_disk(2000 * 1024)
-    }.to raise_error(Bosh::Clouds::CloudError, /maximum disk size is 1 TiB/)
+    }.to raise_error(Bosh::Clouds::CloudError, /Maximum disk size is 1 TiB/)
   end
 
   it "puts disk in the same AZ as a server" do
@@ -64,17 +62,19 @@ describe Bosh::OpenStackCloud::Cloud do
       :size => 1,
       :availability_zone => "foobar-land"
     }
-    server = double("server", :id => "i-test", :availability_zone => "foobar-land")
+    server = double("server", :id => "i-test",
+                    :availability_zone => "foobar-land")
     volume = double("volume", :id => "v-foobar")
 
     cloud = mock_cloud do |openstack|
-      openstack.servers.should_receive(:get).with("i-test").and_return(server)
-      openstack.volumes.should_receive(:create).with(disk_params).and_return(volume)
+      openstack.servers.should_receive(:get).
+        with("i-test").and_return(server)
+      openstack.volumes.should_receive(:create).
+        with(disk_params).and_return(volume)
     end
 
     cloud.should_receive(:generate_unique_name).and_return(unique_name)
-    volume.should_receive(:status).and_return(:creating)
-    cloud.should_receive(:wait_resource).with(volume, :creating, :available)
+    cloud.should_receive(:wait_resource).with(volume, :available)
 
     cloud.create_disk(1024, "i-test")
   end

data/spec/unit/create_stemcell_spec.rb

@@ -10,7 +10,7 @@ describe Bosh::OpenStackCloud::Cloud do
 
   describe "Image upload based flow" do
 
-    it "creates stemcell by uploading an image without kernel nor ramdisk" do
+    it "creates stemcell using an image without kernel nor ramdisk" do
       image = double("image", :id => "i-bar", :name => "i-bar")
       unique_name = UUIDTools::UUID.random_create.to_s
       image_params = {
@@ -22,14 +22,13 @@ describe Bosh::OpenStackCloud::Cloud do
       }
 
       cloud = mock_glance do |glance|
-        glance.images.should_receive(:create).with(image_params).and_return(image)
+        glance.images.should_receive(:create).
+          with(image_params).and_return(image)
       end
 
       Dir.should_receive(:mktmpdir).and_yield(@tmp_dir)
       cloud.should_receive(:unpack_image).with(@tmp_dir, "/tmp/foo")
       cloud.should_receive(:generate_unique_name).and_return(unique_name)
-      image.should_receive(:status).and_return(:queued)
-      cloud.should_receive(:wait_resource).with(image, :queued, :active)
 
       sc_id = cloud.create_stemcell("/tmp/foo", {
         "container_format" => "ami",
@@ -39,7 +38,7 @@ describe Bosh::OpenStackCloud::Cloud do
       sc_id.should == "i-bar"
     end
 
-    it "creates stemcell by uploading an image using kernel and ramdisk id's" do
+    it "creates stemcell using an image with kernel and ramdisk id's" do
       image = double("image", :id => "i-bar", :name => "i-bar")
       unique_name = UUIDTools::UUID.random_create.to_s
       image_params = {
@@ -55,14 +54,13 @@ describe Bosh::OpenStackCloud::Cloud do
       }
 
       cloud = mock_glance do |glance|
-        glance.images.should_receive(:create).with(image_params).and_return(image)
+        glance.images.should_receive(:create).
+          with(image_params).and_return(image)
       end
 
       Dir.should_receive(:mktmpdir).and_yield(@tmp_dir)
       cloud.should_receive(:unpack_image).with(@tmp_dir, "/tmp/foo")
       cloud.should_receive(:generate_unique_name).and_return(unique_name)
-      image.should_receive(:status).and_return(:queued)
-      cloud.should_receive(:wait_resource).with(image, :queued, :active)
 
       sc_id = cloud.create_stemcell("/tmp/foo", {
         "container_format" => "ami",
@@ -76,13 +74,13 @@ describe Bosh::OpenStackCloud::Cloud do
       sc_id.should == "i-bar"
     end
 
-    it "creates stemcell by uploading image, kernel and ramdisk" do
+    it "creates stemcell using an image with kernel and ramdisk files" do
       image = double("image", :id => "i-bar", :name => "i-bar")
       kernel = double("image", :id => "k-img-id", :name => "k-img-id")
       ramdisk = double("image", :id => "r-img-id", :name => "r-img-id")
       unique_name = UUIDTools::UUID.random_create.to_s
       kernel_params = {
-        :name => "AKI-BOSH-#{unique_name}",
+        :name => "BOSH-#{unique_name}-AKI",
         :disk_format => "aki",
         :container_format => "aki",
         :location => "#{@tmp_dir}/kernel.img",
@@ -91,7 +89,7 @@ describe Bosh::OpenStackCloud::Cloud do
         }
       }
       ramdisk_params = {
-        :name => "ARI-BOSH-#{unique_name}",
+        :name => "BOSH-#{unique_name}-ARI",
         :disk_format => "ari",
         :container_format => "ari",
         :location => "#{@tmp_dir}/initrd.img",
@@ -112,21 +110,18 @@ describe Bosh::OpenStackCloud::Cloud do
       }
 
       cloud = mock_glance do |glance|
-        glance.images.should_receive(:create).with(kernel_params).and_return(kernel)
-        glance.images.should_receive(:create).with(ramdisk_params).and_return(ramdisk)
-        glance.images.should_receive(:create).with(image_params).and_return(image)
+        glance.images.should_receive(:create).
+          with(kernel_params).and_return(kernel)
+        glance.images.should_receive(:create).
+          with(ramdisk_params).and_return(ramdisk)
+        glance.images.should_receive(:create).
+          with(image_params).and_return(image)
       end
 
       Dir.should_receive(:mktmpdir).and_yield(@tmp_dir)
       cloud.should_receive(:unpack_image).with(@tmp_dir, "/tmp/foo")
       File.stub(:exists?).and_return(true)
       cloud.should_receive(:generate_unique_name).and_return(unique_name)
-      kernel.should_receive(:status).and_return(:queued)
-      cloud.should_receive(:wait_resource).with(kernel, :queued, :active)
-      ramdisk.should_receive(:status).and_return(:queued)
-      cloud.should_receive(:wait_resource).with(ramdisk, :queued, :active)
-      image.should_receive(:status).and_return(:queued)
-      cloud.should_receive(:wait_resource).with(image, :queued, :active)
 
       sc_id = cloud.create_stemcell("/tmp/foo", {
         "container_format" => "ami",
@@ -138,6 +133,69 @@ describe Bosh::OpenStackCloud::Cloud do
       sc_id.should == "i-bar"
     end
 
+    it "sets image properies from cloud_properties" do
+      image = double("image", :id => "i-bar", :name => "i-bar")
+      kernel = double("image", :id => "k-img-id", :name => "k-img-id")
+      ramdisk = double("image", :id => "r-img-id", :name => "r-img-id")
+      unique_name = UUIDTools::UUID.random_create.to_s
+      kernel_params = {
+        :name => "BOSH-#{unique_name}-AKI",
+        :disk_format => "aki",
+        :container_format => "aki",
+        :location => "#{@tmp_dir}/kernel.img",
+        :properties => {
+          :stemcell => "BOSH-#{unique_name}",
+        }
+      }
+      ramdisk_params = {
+        :name => "BOSH-#{unique_name}-ARI",
+        :disk_format => "ari",
+        :container_format => "ari",
+        :location => "#{@tmp_dir}/initrd.img",
+        :properties => {
+          :stemcell => "BOSH-#{unique_name}",
+        }
+      }
+      image_params = {
+        :name => "BOSH-#{unique_name}",
+        :disk_format => "ami",
+        :container_format => "ami",
+        :location => "#{@tmp_dir}/root.img",
+        :is_public => true,
+        :properties => {
+          :kernel_id => "k-img-id",
+          :ramdisk_id => "r-img-id",
+          :stemcell_name => "bosh-stemcell",
+          :stemcell_version => "x.y.z"
+        }
+      }
+
+      cloud = mock_glance do |glance|
+        glance.images.should_receive(:create).
+          with(kernel_params).and_return(kernel)
+        glance.images.should_receive(:create).
+          with(ramdisk_params).and_return(ramdisk)
+        glance.images.should_receive(:create).
+          with(image_params).and_return(image)
+      end
+
+      Dir.should_receive(:mktmpdir).and_yield(@tmp_dir)
+      cloud.should_receive(:unpack_image).with(@tmp_dir, "/tmp/foo")
+      File.stub(:exists?).and_return(true)
+      cloud.should_receive(:generate_unique_name).and_return(unique_name)
+
+      sc_id = cloud.create_stemcell("/tmp/foo", {
+        "name" => "bosh-stemcell",
+        "version" => "x.y.z",
+        "container_format" => "ami",
+        "disk_format" => "ami",
+        "kernel_file" => "kernel.img",
+        "ramdisk_file" => "initrd.img"
+      })
+
+      sc_id.should == "i-bar"
+    end
+
   end
 
 end