bosh_openstack_cpi 0.0.2 → 0.0.3

data/bin/bosh_openstack_console

@@ -49,6 +49,10 @@ module ConsoleHelpers
     cpi.openstack
   end
 
+  def glance
+    cpi.glance
+  end
+
   def registry
     cpi.registry
   end
@@ -70,5 +74,6 @@ end
 puts "=> Welcome to BOSH OpenStack CPI console"
 puts "You can use 'cpi' to access CPI methods"
 puts "You can use 'openstack' to access Fog::Compute::OpenStack methods"
+puts "You can use 'glance' to access Fog::Image::OpenStack methods"
 
 IRB.start

data/lib/cloud/openstack/cloud.rb

@@ -56,37 +56,72 @@ module Bosh::OpenStackCloud
     # @param [String] image_path local filesystem path to a stemcell image
     # @param [Hash] cloud_properties CPI-specific properties
     def create_stemcell(image_path, cloud_properties)
-      # TODO: refactor into several smaller methods
       with_thread_name("create_stemcell(#{image_path}...)") do
         begin
           Dir.mktmpdir do |tmp_dir|
             @logger.info("Extracting stemcell to `#{tmp_dir}'")
+            image_name = "BOSH-#{generate_unique_name}"
 
             # 1. Unpack image to temp directory
             unpack_image(tmp_dir, image_path)
             root_image = File.join(tmp_dir, "root.img")
 
-            # 2. Upload image using Glance service
+            # 2. If image contains a kernel file, upload it
+            kernel_id = nil
+            if cloud_properties["kernel_id"]
+              kernel_id = cloud_properties["kernel_id"]
+            elsif cloud_properties["kernel_file"]
+              kernel_image = File.join(tmp_dir, cloud_properties["kernel_file"])
+              unless File.exists?(kernel_image)
+                cloud_error("Kernel image is missing from stemcell archive")
+              end
+              kernel_params = {
+                :name => "AKI-#{image_name}",
+                :disk_format => "aki",
+                :container_format => "aki",
+                :location => kernel_image,
+                :properties => {
+                  :stemcell => image_name
+                }
+              }
+              kernel_id = upload_image(kernel_params)
+            end
+
+            # 3. If image contains a ramdisk file, upload it
+            ramdisk_id = nil
+            if cloud_properties["ramdisk_id"]
+              ramdisk_id = cloud_properties["ramdisk_id"]
+            elsif cloud_properties["ramdisk_file"]
+              ramdisk_image = File.join(tmp_dir, cloud_properties["ramdisk_file"])
+              unless File.exists?(kernel_image)
+                cloud_error("Ramdisk image is missing from stemcell archive")
+              end
+              ramdisk_params = {
+                :name => "ARI-#{image_name}",
+                :disk_format => "ari",
+                :container_format => "ari",
+                :location => ramdisk_image,
+                :properties => {
+                  :stemcell => image_name
+                }
+              }
+              ramdisk_id = upload_image(ramdisk_params)
+            end
+
+            # 4. Upload image using Glance service
             image_params = {
-              :name => "BOSH-#{generate_unique_name}",
+              :name => image_name,
               :disk_format => cloud_properties["disk_format"],
               :container_format => cloud_properties["container_format"],
-              :properties => {
-                :kernel_id => cloud_properties["kernel_id"],
-                :ramdisk_id => cloud_properties["ramdisk_id"],
-              },
               :location => root_image,
               :is_public => true
             }
+            image_properties = {}
+            image_properties[:kernel_id] = kernel_id if kernel_id
+            image_properties[:ramdisk_id] = ramdisk_id if ramdisk_id
+            image_params[:properties] = image_properties unless image_properties.empty?
 
-            @logger.info("Creating new image...")
-            image = @glance.images.create(image_params)
-            state = image.status
-
-            @logger.info("Creating new image `#{image.id}', state is `#{state}'")
-            wait_resource(image, state, :active)
-
-            image.id.to_s
+            upload_image(image_params)
           end
         rescue => e
           @logger.error(e)
@@ -101,7 +136,30 @@ module Bosh::OpenStackCloud
     def delete_stemcell(stemcell_id)
       with_thread_name("delete_stemcell(#{stemcell_id})") do
         @logger.info("Deleting `#{stemcell_id}' stemcell")
-        image = @openstack.images.get(stemcell_id)
+        image = @glance.images.find_by_id(stemcell_id)
+
+        kernel_id = image.properties["kernel_id"]
+        if kernel_id
+          kernel = @glance.images.find_by_id(kernel_id)
+          if kernel.properties["stemcell"]
+            if kernel.properties["stemcell"] == image.name
+              @logger.info("Deleting `#{stemcell_id}' stemcell kernel")
+              kernel.destroy
+            end
+          end
+        end
+
+        ramdisk_id = image.properties["ramdisk_id"]
+        if ramdisk_id
+          ramdisk = @glance.images.find_by_id(ramdisk_id)
+          if ramdisk.properties["stemcell"]
+            if ramdisk.properties["stemcell"] == image.name
+              @logger.info("Deleting `#{stemcell_id}' stemcell ramdisk")
+              ramdisk.destroy
+            end
+          end
+        end
+
         image.destroy
       end
     end
@@ -456,6 +514,20 @@ module Bosh::OpenStackCloud
       wait_resource(volume, state, :available)
     end
 
+    ##
+    # Uploads a new image to OpenStack via Glance
+    # @param [Hash] image_params Image params
+    def upload_image(image_params)
+      @logger.info("Creating new image...")
+      image = @glance.images.create(image_params)
+      state = image.status
+
+      @logger.info("Creating new image `#{image.id}', state is `#{state}'")
+      wait_resource(image, state, :active)
+
+      image.id.to_s
+    end
+
     ##
     # Reads current server id from OpenStack metadata. We are assuming
     # server id cannot change while current process is running

data/lib/cloud/openstack/version.rb

@@ -2,6 +2,6 @@
 
 module Bosh
   module OpenStackCloud
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/spec/unit/create_stemcell_spec.rb

@@ -10,7 +10,36 @@ describe Bosh::OpenStackCloud::Cloud do
 
   describe "Image upload based flow" do
 
-    it "creates stemcell by uploading an image via Glance" do
+    it "creates stemcell by uploading 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 = {
+        :name => "BOSH-#{unique_name}",
+        :disk_format => "ami",
+        :container_format => "ami",
+        :location => "#{@tmp_dir}/root.img",
+        :is_public => true
+      }
+
+      cloud = mock_glance do |glance|
+        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",
+        "disk_format" => "ami"
+      })
+
+      sc_id.should == "i-bar"
+    end
+
+    it "creates stemcell by uploading an image using 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 = {
@@ -39,7 +68,71 @@ describe Bosh::OpenStackCloud::Cloud do
         "container_format" => "ami",
         "disk_format" => "ami",
         "kernel_id" => "k-id",
-        "ramdisk_id" => "r-id"
+        "ramdisk_id" => "r-id",
+        "kernel_file" => "kernel.img",
+        "ramdisk_file" => "initrd.img"
+      })
+
+      sc_id.should == "i-bar"
+    end
+
+    it "creates stemcell by uploading image, kernel and ramdisk" 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}",
+        :disk_format => "aki",
+        :container_format => "aki",
+        :location => "#{@tmp_dir}/kernel.img",
+        :properties => {
+          :stemcell => "BOSH-#{unique_name}",
+        }
+      }
+      ramdisk_params = {
+        :name => "ARI-BOSH-#{unique_name}",
+        :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",
+        }
+      }
+
+      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)
+      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",
+        "disk_format" => "ami",
+        "kernel_file" => "kernel.img",
+        "ramdisk_file" => "initrd.img"
       })
 
       sc_id.should == "i-bar"

data/spec/unit/delete_stemcell_spec.rb

@@ -4,11 +4,65 @@ require File.expand_path("../../spec_helper", __FILE__)
 
 describe Bosh::OpenStackCloud::Cloud do
 
-  it "deregisters OpenStack image" do
-    image = double("image", :id => "i-foo")
+  it "deregisters OpenStack image with no kernel nor ramdisk associated" do
+    image = double("image", :id => "i-foo", :name => "i-foo",
+                   :properties => {})
 
-    cloud = mock_cloud do |openstack|
-      openstack.images.stub(:get).with("i-foo").and_return(image)
+    cloud = mock_glance do |glance|
+      glance.images.stub(:find_by_id).with("i-foo").and_return(image)
+    end
+
+    image.should_receive(:destroy)
+
+    cloud.delete_stemcell("i-foo")
+  end
+
+  it "deregisters OpenStack image, kernel and ramdisk" do
+    image = double("image", :id => "i-foo", :name => "i-foo",
+                   :properties => {"kernel_id" => "k-id", "ramdisk_id" => "r-id"})
+    kernel = double("image", :id => "k-id", :properties => {"stemcell" => "i-foo"})
+    ramdisk = double("image", :id => "r-id", :properties => {"stemcell" => "i-foo"})
+
+    cloud = mock_glance do |glance|
+      glance.images.stub(:find_by_id).with("i-foo").and_return(image)
+      glance.images.stub(:find_by_id).with("k-id").and_return(kernel)
+      glance.images.stub(:find_by_id).with("r-id").and_return(ramdisk)
+    end
+
+    kernel.should_receive(:destroy)
+    ramdisk.should_receive(:destroy)
+    image.should_receive(:destroy)
+
+    cloud.delete_stemcell("i-foo")
+  end
+
+  it "deregisters OpenStack image with kernel and ramdisk not uploaded by the CPI" do
+    image = double("image", :id => "i-foo", :name => "i-foo",
+                   :properties => {"kernel_id" => "k-id", "ramdisk_id" => "r-id"})
+    kernel = double("image", :id => "k-id", :properties => {})
+    ramdisk = double("image", :id => "r-id", :properties => {})
+
+    cloud = mock_glance do |glance|
+      glance.images.stub(:find_by_id).with("i-foo").and_return(image)
+      glance.images.stub(:find_by_id).with("k-id").and_return(kernel)
+      glance.images.stub(:find_by_id).with("r-id").and_return(ramdisk)
+    end
+
+    image.should_receive(:destroy)
+
+    cloud.delete_stemcell("i-foo")
+  end
+
+  it "deregisters OpenStack image with kernel and ramdisk that belongs to other stemcell" do
+    image = double("image", :id => "i-foo", :name => "i-foo",
+                   :properties => {"kernel_id" => "k-id", "ramdisk_id" => "r-id"})
+    kernel = double("image", :id => "k-id", :properties => {"stemcell" => "i-bar"})
+    ramdisk = double("image", :id => "r-id", :properties => {"stemcell" => "i-bar"})
+
+    cloud = mock_glance do |glance|
+      glance.images.stub(:find_by_id).with("i-foo").and_return(image)
+      glance.images.stub(:find_by_id).with("k-id").and_return(kernel)
+      glance.images.stub(:find_by_id).with("r-id").and_return(ramdisk)
     end
 
     image.should_receive(:destroy)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_openstack_cpi
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-18 00:00:00.000000000 Z
+date: 2012-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -156,7 +156,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -5012446851796113
+      hash: 4125051121174364727
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -165,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -5012446851796113
+      hash: 4125051121174364727
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24