kitchen-openstack 1.2.0 → 1.3.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NjAwZTAyMmFlODViMmNiOTllNDYwOWM3YzA2MjM1Yjc3ZDczZGZlZQ==
-  data.tar.gz: !binary |-
-    OGM1NTk4NjUxMmY5Y2E2MmNhMTVkZThmYTBjOGQxMmE4ZTAzNTRkZQ==
+SHA1:
+  metadata.gz: 23c44843c2f545b10ef08c9a7e798afff8acd4e3
+  data.tar.gz: 88bb1823d40b4929fef0de8d05a62ade24909d1c
 SHA512:
-  metadata.gz: !binary |-
-    YmNkY2I2YTJhZDg4N2U2MGUxZTk2NGE0NDAzMjhlNDgwZThmZWZkMGQ5MDUy
-    NWVkNDU3OWE0YzZmOWMwZjRmYzI4OGQzZjA5ZTM5NjgyZjRiYmFiYjhkZjNh
-    YjUwYTM3Yjk4ODk4M2QzYzI1NTE3MDI5NzViODRkM2IwOGFlOTI=
-  data.tar.gz: !binary |-
-    MmJhNTZlYWE3OTI1MDAwYTc1MzM4YWQxZTZkYTAwYmMxYTM0NjE5YzhiNDhk
-    OWIxMmI4NGU4YzVjNzUzZDg3OWM4NWVlNzE3ZWVlYzIxNTBlYmYwZWExYzE1
-    M2U5MTVjNWM5Y2M0NjAyZWE0N2NiMGVlMjdmYWFkYzgxNmI0MDY=
+  metadata.gz: cc92ccbd2840b79694c06fbbf9b631d5067ae7268b8c5f01b2739ff0cd7441eeba405d227b919f5048749ec253286adcbab5ff28e89c645418b5fe54ef10af04
+  data.tar.gz: bb10f75c4b1751658486c274f4a398fdd59baa2bfa77a1c7a3d4fbc4617003f7186c9abfb94ff84c2d48e0bc05f232ce1c921db8e4425f8e0a68798919bc12ca

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+# 1.3.0 / 2014-03-09
+
+### New Features
+
+* PR [#40][] - New `user_data` option; via [@wilreichert][]
+* PR [#39][] - New `network_ref` option to only provision a server with
+certain specified NICs; via [@monsterzz][]
+
+### Bug Fixes
+
+* PR [#41][] - Fix issue creating servers with custom SSH ports; via
+[@tenforward][]
+
 # 1.2.0 / 2014-01-30
 
 ### New Features
@@ -68,6 +81,9 @@
 
 * Initial release! Woo!
 
+[#41]: https://github.com/test-kitchen/kitchen-openstack/pull/41
+[#40]: https://github.com/test-kitchen/kitchen-openstack/pull/40
+[#39]: https://github.com/test-kitchen/kitchen-openstack/pull/39
 [#37]: https://github.com/test-kitchen/kitchen-openstack/pull/37
 [#31]: https://github.com/test-kitchen/kitchen-openstack/pull/31
 [#27]: https://github.com/test-kitchen/kitchen-openstack/pull/27
@@ -84,6 +100,9 @@
 [#7]: https://github.com/test-kitchen/kitchen-openstack/pull/7
 [#2]: https://github.com/test-kitchen/kitchen-openstack/pull/2
 
+[@wilreichert]: https://github.com/wilreichert
+[@tenforward]: https://github.com/tenforward
+[@monsterzz]: https://github.com/monsterzz
 [@bears4barrett]: https://github.com/bears4barrett
 [@jgawor]: https://github.com/jgawor
 [@hufman]: https://github.com/hufman

data/README.md

@@ -54,12 +54,15 @@ behavior can be overridden with additional options:
     openstack_tenant: [YOUR OPENSTACK TENANT ID]
     openstack_region: [A VALID OPENSTACK REGION]
     openstack_service_name: [YOUR OPENSTACK COMPUTE SERVICE NAME]
-    openstack_network_name: [YOUR OPENSTACK NETWORK NAME]
+    openstack_network_name: [YOUR OPENSTACK NETWORK NAME USED TO CONNECT]
     floating_ip: [A SPECIFIC FLOATING IP TO ASSIGN]
     floating_ip_pool: [AN OPENSTACK POOL NAME TO ASSIGN THE NEXT IP FROM]
     security_groups:
       - [A LIST OF...]
       - [...SECURITY GROUPS TO JOIN]
+    network_ref:
+      - [OPENSTACK NETWORK NAMES OR...]
+      - [...ID TO CREATE INSTANCE WITH]
 
 If a `key_name` is provided it will be used instead of any
 `public_key_path` that is specified.
@@ -68,6 +71,24 @@ If a `key_name` is provided without any `private_key_path`, unexpected
 behavior may result if your local RSA/DSA private key doesn't match that
 OpenStack key.
 
+The `network_ref` option can be specified as an exact id, an exact name,
+or as a regular expression matching the name of the network. You can pass one
+
+    network_ref: MYNET1
+
+or many networks
+
+    network_ref:
+      - MYNET1
+      - MYNET2
+
+The `openstack_network_name` is used to select IP address for SSH connection.
+It's recommended to specify this option in case of multiple networks used for
+instance to provide more control over network connectivity.
+
+Please note that `network_ref` relies on Network Services (`Fog::Network`) and
+it can be unavailable in your OpenStack installation.
+
     disable_ssl_validation: true
 
 Only disable SSL cert validation if you absolutely know what you are doing,
@@ -77,6 +98,7 @@ but are stuck with an OpenStack deployment without valid SSL certs.
 
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+3. Run style checks and RSpec tests (`bundle exec rake`)
+4. Commit your changes (`git commit -am 'Add some feature'`)
+5. Push to the branch (`git push origin my-new-feature`)
+6. Create new Pull Request

data/lib/kitchen/driver/openstack.rb

@@ -52,6 +52,7 @@ module Kitchen
       default_config :floating_ip_pool, nil
       default_config :floating_ip, nil
       default_config :security_groups, nil
+      default_config :network_ref, nil
 
       def create(state)
         config[:server_name] ||= generate_name(instance.name)
@@ -67,7 +68,8 @@ module Kitchen
         end
         state[:hostname] = get_ip(server)
         state[:ssh_key] = config[:private_key_path]
-        wait_for_sshd(state[:hostname]) ; info '(ssh ready)'
+        wait_for_sshd(state[:hostname], config[:username],
+          { :port => config[:port] }) ; info '(ssh ready)'
         if config[:key_name]
           info "Using OpenStack keypair <#{config[:key_name]}>"
         end
@@ -93,7 +95,7 @@ module Kitchen
 
       private
 
-      def compute
+      def openstack_server
         server_def = {
           :provider           => 'OpenStack',
           :openstack_username => config[:openstack_username],
@@ -106,36 +108,86 @@ module Kitchen
         optional.each do |o|
           config[o] and server_def[o] = config[o]
         end
-        Fog::Compute.new(server_def)
+        server_def
       end
 
-      def create_server
-        image = find_matching(compute.images, config[:image_ref])
-        raise ActionFailed, "Image not found" if !image
-        debug "Selected image: #{image.id} #{image.name}"
+      def network
+        Fog::Network.new(openstack_server)
+      end
 
-        flavor = find_matching(compute.flavors, config[:flavor_ref])
-        raise ActionFailed, "Flavor not found" if !flavor
-        debug "Selected flavor: #{flavor.id} #{flavor.name}"
+      def compute
+        Fog::Compute.new(openstack_server)
+      end
 
-        server_def = {
-          :name => config[:server_name],
-          :image_ref => image.id,
-          :flavor_ref => flavor.id,
-        }
-        if config[:security_groups] && config[:security_groups].kind_of?(Array)
-          server_def[:security_groups] = config[:security_groups]
+      def create_server
+        server_def = init_config
+
+        if config[:network_ref]
+          networks = [].concat([config[:network_ref]])
+          server_def[:nics] = networks.flatten.map do |net|
+            { 'net_id' => find_network(net).id }
+          end
         end
-        if config[:public_key_path]
-          server_def[:public_key_path] = config[:public_key_path]
+
+        [
+          :security_groups,
+          :public_key_path,
+          :key_name,
+          :user_data
+        ].each do |c|
+          server_def[c] = optional_config(c) if config[c]
         end
-        server_def[:key_name] = config[:key_name] if config[:key_name]
+
         # Can't use the Fog bootstrap and/or setup methods here; they require a
         # public IP address that can't be guaranteed to exist across all
         # OpenStack deployments (e.g. TryStack ARM only has private IPs).
         compute.servers.create(server_def)
       end
 
+      def init_config
+        {
+          :name       => config[:server_name],
+          :image_ref  => find_image(config[:image_ref]).id,
+          :flavor_ref => find_flavor(config[:flavor_ref]).id,
+        }
+      end
+
+      def optional_config(c)
+        case c
+        when :security_groups
+          if config[c].kind_of?(Array)
+            config[c]
+          end
+        when :user_data
+          if File.exist?(config[c])
+            File.open(config[c]) { |f| f.read }
+          end
+        else
+          config[c]
+        end
+      end
+
+      def find_image(image_ref)
+        image = find_matching(compute.images, image_ref)
+        raise ActionFailed, 'Image not found' if !image
+        debug "Selected image: #{image.id} #{image.name}"
+        image
+      end
+
+      def find_flavor(flavor_ref)
+        flavor = find_matching(compute.flavors, flavor_ref)
+        raise ActionFailed, 'Flavor not found' if !flavor
+        debug "Selected flavor: #{flavor.id} #{flavor.name}"
+        flavor
+      end
+
+      def find_network(network_ref)
+        net = find_matching(network.networks.all, network_ref)
+        raise ActionFailed, 'Network not found' if !net
+        debug "Selected net: #{net.id} #{net.name}"
+        net
+      end
+
       def generate_name(base)
         # Generate what should be a unique server name
         sep = '-'
@@ -178,7 +230,7 @@ module Kitchen
 
       def get_ip(server)
         if config[:openstack_network_name]
-          debug "Using configured network: #{config[:openstack_network_name]}"
+          debug "Using configured net: #{config[:openstack_network_name]}"
           return server.addresses[config[:openstack_network_name]].first['addr']
         end
         begin

data/lib/kitchen/driver/openstack_version.rb

@@ -19,7 +19,7 @@
 module Kitchen
   module Driver
     # Version string for OpenStack Kitchen driver
-    OPENSTACK_VERSION = '1.2.0'
+    OPENSTACK_VERSION = '1.3.0'
   end
 end
 

data/spec/kitchen/driver/openstack_spec.rb

@@ -104,7 +104,8 @@ describe Kitchen::Driver::Openstack do
         :openstack_region,
         :openstack_service_name,
         :floating_ip_pool,
-        :floating_ip
+        :floating_ip,
+        :network_ref
       ]
       nils.each do |i|
         it "defaults to no #{i}" do
@@ -127,7 +128,8 @@ describe Kitchen::Driver::Openstack do
           :openstack_service_name => 'the_service',
           :private_key_path => '/path/to/id_rsa',
           :floating_ip_pool => 'swimmers',
-          :floating_ip => '11111'
+          :floating_ip => '11111',
+          :network_ref => '0xCAFFE'
         }
       end
 
@@ -150,7 +152,10 @@ describe Kitchen::Driver::Openstack do
       d.instance = instance
       d.stub(:generate_name).with('potatoes').and_return('a_monkey!')
       d.stub(:create_server).and_return(server)
-      d.stub(:wait_for_sshd).with('1.2.3.4').and_return(true)
+      d.stub(:wait_for_sshd).with(
+        '1.2.3.4',
+        'root',
+        { :port => '22' }).and_return(true)
       d.stub(:get_ip).and_return('1.2.3.4')
       d.stub(:do_ssh_setup).and_return(true)
       d
@@ -284,6 +289,12 @@ describe Kitchen::Driver::Openstack do
         res = config.merge({ :provider => 'OpenStack' })
         expect(driver.send(:compute)).to eq(res)
       end
+
+      it 'creates a new network connection' do
+        Fog::Network.stub(:new) { |arg| arg }
+        res = config.merge({ :provider => 'OpenStack' })
+        expect(driver.send(:network)).to eq(res)
+      end
     end
 
     context 'only an API key provided' do
@@ -317,18 +328,31 @@ describe Kitchen::Driver::Openstack do
       s.stub(:create) { |arg| arg }
       s
     end
+    let(:vlan1_net) { double(:id => '1', :name => 'vlan1') }
+    let(:vlan2_net) { double(:id => '2', :name => 'vlan2') }
     let(:ubuntu_image) { double(:id => '111', :name => 'ubuntu') }
     let(:fedora_image) { double(:id => '222', :name => 'fedora') }
     let(:tiny_flavor) { double(:id => '1', :name => 'tiny') }
     let(:small_flavor) { double(:id => '2', :name => 'small') }
     let(:compute) do
-      double(:servers => servers, :images => [ubuntu_image, fedora_image],
-        :flavors => [tiny_flavor, small_flavor])
+      double(
+        :servers       => servers,
+        :images        => [ubuntu_image, fedora_image],
+        :flavors       => [tiny_flavor, small_flavor],
+      )
+    end
+    let(:network) do
+      double(
+        :networks => double(
+          :all => [vlan1_net, vlan2_net]
+        )
+      )
     end
     let(:driver) do
       d = Kitchen::Driver::Openstack.new(config)
       d.instance = instance
       d.stub(:compute).and_return(compute)
+      d.stub(:network).and_return(network)
       d
     end
 
@@ -467,6 +491,113 @@ describe Kitchen::Driver::Openstack do
         driver.send(:create_server)
       end
     end
+
+    context 'network specifies id' do
+      let(:config) do
+        {
+          :server_name => 'hello',
+          :image_ref => '111',
+          :flavor_ref => '1',
+          :public_key_path => 'tarpals',
+          :network_ref => '1'
+        }
+      end
+
+      it 'exact id match' do
+        networks = [
+          { 'net_id' => '1' }
+        ]
+        servers.should_receive(:create).with(
+          :name => 'hello',
+          :image_ref => '111',
+          :flavor_ref => '1',
+          :public_key_path => 'tarpals',
+          :nics => networks
+        )
+        driver.send(:create_server)
+      end
+    end
+
+    context 'network specifies name' do
+      let(:config) do
+        {
+          :server_name => 'hello',
+          :image_ref => '111',
+          :flavor_ref => '1',
+          :public_key_path => 'tarpals',
+          :network_ref => 'vlan1'
+        }
+      end
+
+      it 'exact id match' do
+        networks = [
+          { 'net_id' => '1' }
+        ]
+        servers.should_receive(:create).with(
+          :name => 'hello',
+          :image_ref => '111',
+          :flavor_ref => '1',
+          :public_key_path => 'tarpals',
+          :nics => networks
+        )
+        driver.send(:create_server)
+      end
+    end
+
+    context 'multiple networks specifies id' do
+      let(:config) do
+        {
+          :server_name => 'hello',
+          :image_ref => '111',
+          :flavor_ref => '1',
+          :public_key_path => 'tarpals',
+          :network_ref => %w(1 2)
+        }
+      end
+
+      it 'exact id match' do
+        networks = [
+          { 'net_id' => '1' },
+          { 'net_id' => '2' },
+        ]
+        servers.should_receive(:create).with(
+          :name => 'hello',
+          :image_ref => '111',
+          :flavor_ref => '1',
+          :public_key_path => 'tarpals',
+          :nics => networks
+        )
+        driver.send(:create_server)
+      end
+    end
+
+    context 'user_data specified' do
+      let(:config) do
+        {
+          :server_name => 'hello',
+          :image_ref => '111',
+          :flavor_ref => '1',
+          :public_key_path => 'tarpals',
+          :user_data => 'cloud-init.txt'
+        }
+      end
+      let(:data) { "#cloud-config\n" }
+
+      before(:each) do
+        File.stub(:exist?).and_return(true)
+        File.stub(:open).and_return(data)
+      end
+
+      it 'should pass file contents' do
+        servers.should_receive(:create).with(
+          :name => 'hello',
+          :image_ref => '111',
+          :flavor_ref => '1',
+          :public_key_path => 'tarpals',
+          :user_data => data)
+        driver.send(:create_server)
+      end
+    end
   end
 
   describe '#generate_name' do

metadata

@@ -1,181 +1,181 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-openstack
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Jonathan Hartman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.18'
 - !ruby/object:Gem::Dependency
   name: unf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tailor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cane
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: countloc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov-console
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A Test Kitchen OpenStack Nova driver
@@ -185,8 +185,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -207,17 +207,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen OpenStack Nova driver