kitchen-openstack 1.7.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ada2dfc8390553bc3b419e50b3561a97a52dcb18
-  data.tar.gz: 91b3b46bd248411691f9bff8fa424c3225580cc9
+  metadata.gz: 140b00aba886334a4da296bc6d3e6fb8777f002c
+  data.tar.gz: 1220ac0c3fa7569c320a732923bbe37704227517
 SHA512:
-  metadata.gz: cbf3719c9a0baf7c0e54a8618598525be1484910efe0a8d1ec3714a0c9fc3a8b705bc9776db5b2ece5f1e5b532334db814ad2e601a4b5c326a35c5cbb699a493
-  data.tar.gz: e4af2de8a2b0433441a58e50bad8557c63800d18bc07cc45633dadac0878808100e1581c8c20b39499a44b5101c054934b14e762069f278b6be557c1300debb2
+  metadata.gz: e4c827d8f26500ac3cf9650d56db7202c5616e4da400ef0ce5d78943bab7bfa305422a46e8cb0683c86421d1baa7d6f144a25690d11a8b032e0cb3fb0f0b9a13
+  data.tar.gz: 8e780867cc2b7b8163fb3fbb6b144fae3329028cfc07aaa2a505f00ee0aa833300083d06a1980575db46d15239df1843509387c51ae4487aacbe179333061105

data/.travis.yml

@@ -3,7 +3,20 @@ cache: bundler
 
 sudo: false
 
+gemfile:
+  - Gemfile
+  - Gemfile.ohai-7
+
 rvm:
   - 1.9.3
   - 2.0.0
   - ruby-head
+
+matrix:
+  exclude:
+    - rvm: 1.9.3
+      gemfile: Gemfile
+    - rvm: 2.0.0
+      gemfile: Gemfile.ohai-7
+    - rvm: ruby-head
+      gemfile: Gemfile.ohai-7

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 1.8.0 / 2015-04-08
+
+### New Features
+
+* PR [#74][] - Support attaching block storage volumes; via [@LiamHaworth][]
+
 # 1.7.1 / 2015-01-07
 
 * PR [#70][] - Use configured password for SSH access, if provided
@@ -138,6 +144,7 @@ certain specified NICs; via [@monsterzz][]
 
 * Initial release! Woo!
 
+[#74]: https://github.com/test-kitchen/kitchen-openstack/pull/74
 [#70]: https://github.com/test-kitchen/kitchen-openstack/pull/70
 [#66]: https://github.com/test-kitchen/kitchen-openstack/pull/66
 [#63]: https://github.com/test-kitchen/kitchen-openstack/pull/63
@@ -170,6 +177,7 @@ certain specified NICs; via [@monsterzz][]
 [#7]: https://github.com/test-kitchen/kitchen-openstack/pull/7
 [#2]: https://github.com/test-kitchen/kitchen-openstack/pull/2
 
+[@LiamHaworth]: https://github.com/LiamHaworth
 [@ftclausen]: https://github.com/ftclausen
 [@fortable1999]: https://github.com/fortable1999
 [@stevejmason]: https://github.com/stevejmason

data/Gemfile.ohai-7

@@ -0,0 +1,8 @@
+# Encoding: UTF-8
+
+source 'https://rubygems.org'
+
+gem 'ohai', '~> 7.0'
+
+# Specify your gem's dependencies in kitchen-openstack.gemspec
+gemspec

data/README.md

@@ -66,7 +66,16 @@ behavior can be overridden with additional options:
       - [...ID TO CREATE INSTANCE WITH]
     no_ssh_tcp_check: [DEFAULTS TO false, SKIPS TCP CHECK WHEN true]
     no_ssh_tcp_check_sleep: [NUM OF SECONDS TO SLEEP IF no_ssh_tcp_check IS SET]
-
+    block_device_mapping:
+      make_volume: [DEFAULTS TO false, MAKES A NEW VOLUME WHEN true]
+      snapshot_id: [WHEN SET WILL MAKE VOLUME FROM VOLUME SNAPSHOT]
+      volume_id: [WILL ATTACH VOLUME WHEN SET]
+      volume_size: [THE SIZE OF THE VOLUME TO BE ATTACHED/MADE]
+      device_name: [SET TO vda UNLESS YOU KNOW WHAT YOU ARE DOING]
+      availability_zone: [THE BLOCK STORAGE AVAILABILITY ZONE, DEFAULTS TO nova]
+      volume_type: [THE VOLUME TYPE, THIS IS OPTIONAL]
+      delete_on_termination: [WILL DELETE VOLUME ON INSTANCE DESTROY WHEN true, OTHERWISE SET TO false]
+       
 If a `server_name_prefix` is specified then this prefix will be used when 
 generating random names of the form `<NAME PREFIX>-<RANDOM STRING>` e.g.
 `myproject-asdfghjk`. If both `server_name_prefix` and `server_name` are 

data/kitchen-openstack.gemspec

@@ -15,13 +15,13 @@ Gem::Specification.new do |spec|
   spec.license       = 'Apache'
 
   spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
-  spec.executables   = spec.files.grep(/^bin\//) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(/^(test|spec|features)\//)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
   spec.required_ruby_version = '>= 1.9.3'
 
-  spec.add_dependency 'test-kitchen', '~> 1.1'
+  spec.add_dependency 'test-kitchen', '~> 1.2'
   spec.add_dependency 'fog', '~> 1.18'
   # Newer Fogs throw a warning if unf isn't there :(
   spec.add_dependency 'unf'

data/lib/kitchen/driver/openstack.rb

@@ -2,7 +2,7 @@
 #
 # Author:: Jonathan Hartman (<j@p4nt5.com>)
 #
-# Copyright (C) 2013, Jonathan Hartman
+# Copyright (C) 2013-2015, Jonathan Hartman
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@ require 'etc'
 require 'ipaddr'
 require 'socket'
 require 'ohai'
+require_relative 'openstack/volume'
 
 module Kitchen
   module Driver
@@ -59,6 +60,7 @@ module Kitchen
       default_config :network_ref, nil
       default_config :no_ssh_tcp_check, false
       default_config :no_ssh_tcp_check_sleep, 120
+      default_config :block_device_mapping, nil
 
       def create(state)
         unless config[:server_name]
@@ -129,6 +131,14 @@ module Kitchen
         Fog::Compute.new(openstack_server)
       end
 
+      def volume
+        Volume.new
+      end
+
+      def get_bdm(config)
+        volume.get_bdm(config, openstack_server)
+      end
+
       def create_server
         server_def = init_configuration
 
@@ -139,6 +149,10 @@ module Kitchen
           end
         end
 
+        if config[:block_device_mapping]
+          server_def[:block_device_mapping] = get_bdm(config)
+        end
+
         [
           :security_groups,
           :public_key_path,
@@ -233,7 +247,7 @@ module Kitchen
           warn 'Server name prefix empty or invalid; using fully generated name'
           default_name
         else
-          random_suffix = ('a'..'z').to_a.shuffle[0, 8].join
+          random_suffix = ('a'..'z').to_a.sample(8).join
           server_name_prefix + '-' + random_suffix
         end
       end

data/lib/kitchen/driver/openstack/volume.rb

@@ -0,0 +1,68 @@
+# Encoding: UTF-8
+#
+# Author:: Jonathan Hartman (<j@p4nt5.com>)
+#
+# Copyright (C) 2013-2015, Jonathan Hartman
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'fog'
+require 'kitchen'
+
+module Kitchen
+  module Driver
+    class Openstack < Kitchen::Driver::SSHBase
+      # A class to allow the Kitchen Openstack driver
+      # to use Openstack volumes
+      #
+      # @author Liam Haworth <liam.haworth@bluereef.com.au>
+      class Volume
+        def volume(openstack_server)
+          Fog::Volume.new(openstack_server)
+        end
+
+        def volume_ready?(vol_id, os)
+          resp = volume(os).get_volume_details(vol_id)
+          status = resp[:body]['volume']['status']
+          fail "Failed to make volume <#{vol_id}>" if status == 'error'
+          status == 'available'
+        end
+
+        def create_volume(config, os)
+          opt = {}
+          bdm = config[:block_device_mapping]
+          vanilla_options = [:snapshot_id, :imageRef, :volume_type,
+                             :source_volid, :availability_zone]
+          vanilla_options.select { |o| bdm[o] }.each do |key|
+            opt[key] = bdm[key]
+          end
+          resp = volume(os).create_volume("#{config[:server_name]}-volume",
+                                          "#{config[:server_name]} volume",
+                                          bdm[:volume_size],
+                                          opt)
+          vol_id = resp[:body]['volume']['id']
+          sleep(1) until volume_ready?(vol_id, os)
+          vol_id
+        end
+
+        def get_bdm(config, os)
+          bdm = config[:block_device_mapping]
+          bdm[:volume_id] = create_volume(config, os) if bdm[:make_volume]
+          bdm.delete_if { |k, _| k == :make_volume }
+          bdm.delete_if { |k, _| k == :snapshot_id }
+          bdm
+        end
+      end
+    end
+  end
+end

data/lib/kitchen/driver/openstack_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   #
   # @author Jonathan Hartman <j@p4nt5.com>
   module Driver
-    OPENSTACK_VERSION = '1.7.1'
+    OPENSTACK_VERSION = '1.8.0'
   end
 end

data/spec/kitchen/driver/openstack/volume_spec.rb

@@ -0,0 +1,121 @@
+# Encoding: UTF-8
+
+require_relative '../../../spec_helper'
+require_relative '../../../../lib/kitchen/driver/openstack/volume'
+
+require 'logger'
+require 'stringio'
+require 'rspec'
+require 'kitchen'
+require 'ohai'
+
+describe Kitchen::Driver::Openstack::Volume do
+  let(:os) do
+    {
+      openstack_username: 'twilight',
+      openstack_api_key: 'sparkle',
+      openstack_auth_url: 'http:',
+      openstack_tenant: 'trixie',
+      openstack_region: 'syd',
+      openstack_service_name: 'the_service'
+    }
+  end
+
+  describe '#volume' do
+    let(:vol_driver) do
+      described_class.new
+    end
+
+    it 'creates a new block device connection' do
+      allow(Fog::Volume).to receive(:new) { |arg| arg }
+      expect(vol_driver.send(:volume, os)).to eq(os)
+    end
+  end
+
+  describe '#volume_ready?' do
+    let(:volume_details) do
+      {
+        body: { 'volume' => { 'status' => 'available' } }
+      }
+    end
+
+    let(:volume) do
+      double(
+        get_volume_details: volume_details
+      )
+    end
+
+    let(:vol_driver) do
+      d = described_class.new
+      allow(d).to receive(:volume).and_return(volume)
+      d
+    end
+
+    it 'checks if the volume is ready' do
+      expect(vol_driver.send(:volume_ready?, '333', os)).to eq(true)
+    end
+  end
+
+  describe '#create_volume' do
+    let(:config) do
+      {
+        server_name: 'applejack',
+        block_device_mapping: {
+          snapshot_id: '444',
+          volume_size: '5'
+        }
+      }
+    end
+
+    let(:create_volume) do
+      {
+        body: { 'volume' => { 'id' => '555' } }
+      }
+    end
+
+    let(:volume) do
+      double(
+        create_volume: create_volume
+      )
+    end
+
+    let(:vol_driver) do
+      d = described_class.new
+      allow(d).to receive(:volume).and_return(volume)
+      allow(d).to receive(:volume_ready?).and_return(true)
+      d
+    end
+
+    it 'creates a volume' do
+      expect(vol_driver.send(:create_volume, config, os)).to eq('555')
+    end
+  end
+
+  describe '#get_bdm' do
+    let(:config) do
+      {
+        block_device_mapping: {
+          make_volue: true,
+          snapshot_id: '333',
+          volume_id: '555',
+          volume_size: '5',
+          volume_device_name: 'vda',
+          delete_on_termination: true
+        }
+      }
+    end
+
+    let(:vol_driver) do
+      d = described_class.new
+      allow(d).to receive(:create_volume).and_return('555')
+      d
+    end
+
+    it 'returns the block device mapping config' do
+      expects = config[:block_device_mapping]
+      expects.delete_if { |k, _| k == :make_volume }
+      expects.delete_if { |k, _| k == :snapshot_id }
+      expect(vol_driver.send(:get_bdm, config, os)).to eq(expects)
+    end
+  end
+end

data/spec/kitchen/driver/openstack_spec.rb

@@ -1,22 +1,7 @@
 # Encoding: UTF-8
-#
-# Author:: Jonathan Hartman (<j@p4nt5.com>)
-#
-# Copyright (C) 2013, Jonathan Hartman
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
 
 require_relative '../../spec_helper'
+require_relative '../../../lib/kitchen/driver/openstack'
 
 require 'logger'
 require 'stringio'
@@ -39,13 +24,11 @@ describe Kitchen::Driver::Openstack do
     )
   end
 
-  let(:driver) do
-    d = Kitchen::Driver::Openstack.new(config)
-    d.instance = instance
-    d
-  end
+  let(:driver) { described_class.new(config) }
 
   before(:each) do
+    allow_any_instance_of(described_class).to receive(:instance)
+      .and_return(instance)
     allow(File).to receive(:exist?).and_call_original
     allow(File).to receive(:exist?).with(dsa).and_return(true)
     allow(File).to receive(:exist?).with(rsa).and_return(true)
@@ -140,7 +123,15 @@ describe Kitchen::Driver::Openstack do
           private_key_path: '/path/to/id_rsa',
           floating_ip_pool: 'swimmers',
           floating_ip: '11111',
-          network_ref: '0xCAFFE'
+          network_ref: '0xCAFFE',
+          block_device_mapping: {
+            make_volume: true,
+            snapshot_id: '44',
+            volume_id: '55',
+            volume_size: '5',
+            device_name: 'vda',
+            delete_on_termination: true
+          }
         }
       end
 
@@ -162,8 +153,7 @@ describe Kitchen::Driver::Openstack do
       double(id: 'test123', wait_for: true, public_ip_addresses: %w(1.2.3.4))
     end
     let(:driver) do
-      d = Kitchen::Driver::Openstack.new(config)
-      d.instance = instance
+      d = super()
       allow(d).to receive(:default_name).and_return('a_monkey!')
       allow(d).to receive(:create_server).and_return(server)
       allow(d).to receive(:wait_for_sshd).with('1.2.3.4', 'root', port: '22')
@@ -224,8 +214,7 @@ describe Kitchen::Driver::Openstack do
     let(:compute) { double(servers: servers) }
 
     let(:driver) do
-      d = Kitchen::Driver::Openstack.new(config)
-      d.instance = instance
+      d = super()
       allow(d).to receive(:compute).and_return(compute)
       d
     end
@@ -262,8 +251,7 @@ describe Kitchen::Driver::Openstack do
       end
       let(:compute) { double(servers: servers) }
       let(:driver) do
-        d = Kitchen::Driver::Openstack.new(config)
-        d.instance = instance
+        d = super()
         allow(d).to receive(:compute).and_return(compute)
         d
       end
@@ -370,7 +358,13 @@ describe Kitchen::Driver::Openstack do
         image_ref: '111',
         flavor_ref: '1',
         availability_zone: nil,
-        public_key_path: 'tarpals'
+        public_key_path: 'tarpals',
+        block_device_mapping: {
+          volume_size: '5',
+          volume_id: '333',
+          volume_device_name: 'vda',
+          delete_on_termination: 'true'
+        }
       }
     end
     let(:servers) do
@@ -394,11 +388,19 @@ describe Kitchen::Driver::Openstack do
     let(:network) do
       double(networks: double(all: [vlan1_net, vlan2_net]))
     end
+    let(:block_device_mapping) do
+      {
+        volume_id: '333',
+        volume_size: '5',
+        volume_device_name: 'vda',
+        delete_on_termination: 'true'
+      }
+    end
     let(:driver) do
-      d = Kitchen::Driver::Openstack.new(config)
-      d.instance = instance
+      d = super()
       allow(d).to receive(:compute).and_return(compute)
       allow(d).to receive(:network).and_return(network)
+      allow(d).to receive(:get_bdm).and_return(block_device_mapping)
       d
     end
 
@@ -828,8 +830,7 @@ describe Kitchen::Driver::Openstack do
     let(:ip_addresses) { nil }
     let(:parsed_ips) { [[], []] }
     let(:driver) do
-      d = Kitchen::Driver::Openstack.new(config)
-      d.instance = instance
+      d = super()
       allow(d).to receive(:parse_ips).and_return(parsed_ips)
       d
     end

data/spec/spec_helper.rb

@@ -1,21 +1,4 @@
 # Encoding: UTF-8
-#
-# Author:: Jonathan Hartman (<j@p4nt5.com>)
-#
-# Copyright (C) 2013, Jonathan Hartman
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
 
 require 'rspec'
 require 'simplecov'
@@ -31,5 +14,3 @@ SimpleCov.minimum_coverage 90
 SimpleCov.start do
   add_filter '/vendor/'
 end
-
-require_relative '../lib/kitchen/driver/openstack'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-openstack
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0
 platform: ruby
 authors:
 - Jonathan Hartman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2015-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
@@ -204,12 +204,15 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.ohai-7
 - LICENSE.txt
 - README.md
 - Rakefile
 - kitchen-openstack.gemspec
 - lib/kitchen/driver/openstack.rb
+- lib/kitchen/driver/openstack/volume.rb
 - lib/kitchen/driver/openstack_version.rb
+- spec/kitchen/driver/openstack/volume_spec.rb
 - spec/kitchen/driver/openstack_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/test-kitchen/kitchen-openstack
@@ -237,6 +240,7 @@ signing_key:
 specification_version: 4
 summary: A Test Kitchen OpenStack Nova driver
 test_files:
+- spec/kitchen/driver/openstack/volume_spec.rb
 - spec/kitchen/driver/openstack_spec.rb
 - spec/spec_helper.rb
 has_rdoc: