kitchen-openstack 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e830463daf8d4d150001659002c7ff5fa7c4c4de
-  data.tar.gz: c13997f2c1b6ace249a892d02f34e5f9072a1b2e
+  metadata.gz: d66ce0ff71e2179911c7fa1b6537621df9807ac0
+  data.tar.gz: d1c8922782d6c668225bb025bbbadb49db017c89
 SHA512:
-  metadata.gz: 4f4e9a1af44350c69f720ab08c04141a38460a4ade5d0515a3376e18271e3f8ca010dcd8a68afbf281ee89913a8f5654759c5e2c264624b04ad44055f1fae3a0
-  data.tar.gz: 7c17dc8168d7ca657373d9ee09da2a25aea19be14caa1b456b92154059c609a57e9c3b209ba46e4bffe0fd44e550b380bea5f95f2aff2a90cd8cf25eec0919e1
+  metadata.gz: 4938e5b6b9ee42907c96afdb8440699c85dc61d8572d92371d40a1497a8bbe333502277bb9836e3b5b11a59ea0ea130b4ebc8230d0442d475abbb2bd3293e5af
+  data.tar.gz: 6dcd850d52c56601b4b77426cd45fdb7afc23992f0cd0a049cfd4886f2a648df5ae35aa420c0ddcdedc291bf380f81fd5cd0778ce8139022257c11ed3b7d3708

data/CHANGELOG.md

@@ -1,11 +1,19 @@
 # Change Log
 
-## [v3.2.0](https://github.com/test-kitchen/kitchen-openstack/tree/v3.2.0)
+## [v3.3.0](https://github.com/test-kitchen/kitchen-openstack/tree/v3.3.0)
 
+[Full Changelog](https://github.com/test-kitchen/kitchen-openstack/compare/v3.2.0...v3.3.0)
+
+**Merged pull requests:**
+
+- Uuids [\#159](https://github.com/test-kitchen/kitchen-openstack/pull/159) ([boc-tothefuture](https://github.com/boc-tothefuture))
+
+## [v3.2.0](https://github.com/test-kitchen/kitchen-openstack/tree/v3.2.0) (2017-03-02)
 [Full Changelog](https://github.com/test-kitchen/kitchen-openstack/compare/v3.1.0...v3.2.0)
 
 **Closed issues:**
 
+- Expose excon timeouts to kitchen  [\#157](https://github.com/test-kitchen/kitchen-openstack/issues/157)
 - Enhancement: generate openstack keypair on create [\#150](https://github.com/test-kitchen/kitchen-openstack/issues/150)
 - kitchen-openstack should use SSH Agent [\#149](https://github.com/test-kitchen/kitchen-openstack/issues/149)
 - Permission Denied on kitchen runs after first [\#146](https://github.com/test-kitchen/kitchen-openstack/issues/146)
@@ -14,6 +22,7 @@
 
 **Merged pull requests:**
 
+- Prep for v3.2.0 [\#158](https://github.com/test-kitchen/kitchen-openstack/pull/158) ([jjasghar](https://github.com/jjasghar))
 - Expose excon timeout configuration [\#156](https://github.com/test-kitchen/kitchen-openstack/pull/156) ([MariusCC](https://github.com/MariusCC))
 - Dynamically allocate Floating IP for the test server. [\#155](https://github.com/test-kitchen/kitchen-openstack/pull/155) ([dannytrigo](https://github.com/dannytrigo))
 - Defer ssh key handling to transport. [\#154](https://github.com/test-kitchen/kitchen-openstack/pull/154) ([cliles](https://github.com/cliles))

data/README.md

@@ -87,11 +87,23 @@ All of Fog's `openstack` options (`openstack_domain_name`, `openstack_project_na
 
 ### image\_ref
 
-**Required** Server Image ID.
+**image_ref or image_id required** Server Image Name or ID.
+
+### image\_id
+
+**image_ref or image_id required** Server Image ID.  Specifying the ID instead of reference results in a faster create time.
+
+**Note** If the image UUID changes this value will need to be updated. 
 
 ### flavor\_ref
 
-**Required** Server Flavor ID.
+**flavor_ref or flavor_id required** Server Flavor Name or ID.
+
+### flavor\_ref
+
+**flavor_ref or flavor_id required** Server Flavor ID.  Specifying the ID instead of reference results in a faster create time.
+
+**Note** If the flavor UUID changes this value will need to be updated.
 
 ### server\_name
 
@@ -190,12 +202,24 @@ If your vms require config drive.
 
 ### network\_ref
 
-**Deprecated** A list of network names or ids to create instances with.
+**Deprecated** A list of network names to create instances with.
+
+```yaml
+network_ref:
+   - [OPENSTACK NETWORK NAMES]
+   - [CREATE INSTANCE WITH]
+```
+
+### network\_id
+
+A list of network ids to create instances with.  Specifying the id instead of reference results in a faster create time.
+
+**Note** If the network UUID changes this value will need to be updated. 
 
 ```yaml
 network_ref:
-   - [OPENSTACK NETWORK NAMES OR...]
-   - [...ID TO CREATE INSTANCE WITH]
+   - [OPENSTACK NETWORK UUIDs]
+   - [TO CREATE INSTANCE WITH]
 ```
 
 ### no\_ssh\_tcp\_check

data/lib/kitchen/driver/openstack.rb

@@ -51,6 +51,7 @@ module Kitchen
       default_config :availability_zone, nil
       default_config :security_groups, nil
       default_config :network_ref, nil
+      default_config :network_id, nil
       default_config :no_ssh_tcp_check, false
       default_config :no_ssh_tcp_check_sleep, 120
       default_config :glance_cache_wait_timeout, 600
@@ -166,7 +167,13 @@ module Kitchen
 
       def create_server
         server_def = init_configuration
-        if config[:network_ref]
+        fail(ActionFailed, 'Cannot specify both network_ref and network_id') if config[:network_id] && config[:network_ref] # rubocop:disable Metrics/LineLength, SignalException
+        if config[:network_id]
+          networks = [].concat([config[:network_id]])
+          server_def[:nics] = networks.flatten.map do |net_id|
+            { 'net_id' => net_id }
+          end
+        elsif config[:network_ref]
           networks = [].concat([config[:network_ref]])
           server_def[:nics] = networks.flatten.map do |net|
             { 'net_id' => find_network(net).id }
@@ -193,10 +200,12 @@ module Kitchen
       end
 
       def init_configuration
+        fail(ActionFailed, 'Cannot specify both image_ref and image_id') if config[:image_id] && config[:image_ref] # rubocop:disable Metrics/LineLength, SignalException
+        fail(ActionFailed, 'Cannot specify both flavor_ref and flavor_id') if config[:flavor_id] && config[:flavor_ref] # rubocop:disable Metrics/LineLength, SignalException
         {
           name: config[:server_name],
-          image_ref: find_image(config[:image_ref]).id,
-          flavor_ref: find_flavor(config[:flavor_ref]).id,
+          image_ref: config[:image_id] || find_image(config[:image_ref]).id,
+          flavor_ref: config[:flavor_id] || find_flavor(config[:flavor_ref]).id,
           availability_zone: config[:availability_zone]
         }
       end
@@ -315,6 +324,7 @@ module Kitchen
         [pub, priv]
       end
 
+      # rubocop:disable AbcSize
       def get_ip(server)
         if config[:floating_ip]
           debug "Using floating ip: #{config[:floating_ip]}"

data/lib/kitchen/driver/openstack_version.rb

@@ -22,6 +22,6 @@ module Kitchen
   #
   # @author Jonathan Hartman <j@p4nt5.com>
   module Driver
-    OPENSTACK_VERSION = '3.2.0'.freeze
+    OPENSTACK_VERSION = '3.3.0'.freeze
   end
 end

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

@@ -9,7 +9,6 @@ require 'rspec'
 require 'kitchen'
 require 'ohai'
 
-# rubocop: disable Metrics/BlockLength
 describe Kitchen::Driver::Openstack::Volume do
   let(:os) do
     {

data/spec/kitchen/driver/openstack_spec.rb

@@ -15,7 +15,6 @@ require 'ohai'
 require 'excon'
 require 'fog'
 
-# rubocop: disable Metrics/BlockLength
 describe Kitchen::Driver::Openstack do
   let(:logged_output) { StringIO.new }
   let(:logger) { Logger.new(logged_output) }
@@ -92,7 +91,9 @@ describe Kitchen::Driver::Openstack do
       let(:config) do
         {
           image_ref: '22',
+          image_id: '4391b03e-f7fb-46fd-a356-fa5e42f6d728',
           flavor_ref: '33',
+          flavor_id: '19a2281e-591e-4b47-be06-631c3c7704e8',
           public_key_path: '/tmp',
           username: 'admin',
           port: '2222',
@@ -104,6 +105,7 @@ describe Kitchen::Driver::Openstack do
           floating_ip_pool: 'swimmers',
           floating_ip: '11111',
           network_ref: '0xCAFFE',
+          network_id: '57d6e41a-f369-4c92-9ebe-1fbf198bc783',
           use_ssh_agent: true,
           connect_timeout: 123,
           read_timeout: 234,
@@ -520,6 +522,78 @@ describe Kitchen::Driver::Openstack do
       end
     end
 
+    context 'image_id specified' do
+      let(:config) do
+        {
+          server_name: 'hello',
+          image_id: '1e1f4346-e3ea-48ba-9d1b-0002bfcb8981',
+          flavor_ref: '1'
+        }
+      end
+
+      it 'exact id match' do
+        expect(servers).to receive(:create).with(
+          name: 'hello',
+          image_ref: '1e1f4346-e3ea-48ba-9d1b-0002bfcb8981',
+          flavor_ref: '1',
+          availability_zone: nil
+        )
+        driver.send(:create_server)
+      end
+    end
+
+    context 'image_id and image_ref specified' do
+      let(:config) do
+        {
+          server_name: 'hello',
+          image_id: '1e1f4346-e3ea-48ba-9d1b-0002bfcb8981',
+          image_ref: '111',
+          flavor_ref: '1'
+        }
+      end
+
+      it 'raises an exception' do
+        expect { driver.send(:create_server) }.to \
+          raise_error(Kitchen::ActionFailed)
+      end
+    end
+
+    context 'flavor_id specified' do
+      let(:config) do
+        {
+          server_name: 'hello',
+          flavor_id: '1e1f4346-e3ea-48ba-9d1b-0002bfcb8981',
+          image_ref: '111'
+        }
+      end
+
+      it 'exact id match' do
+        expect(servers).to receive(:create).with(
+          name: 'hello',
+          flavor_ref: '1e1f4346-e3ea-48ba-9d1b-0002bfcb8981',
+          image_ref: '111',
+          availability_zone: nil
+        )
+        driver.send(:create_server)
+      end
+    end
+
+    context 'flavor_id and flavor_ref specified' do
+      let(:config) do
+        {
+          server_name: 'hello',
+          image_id: '1e1f4346-e3ea-48ba-9d1b-0002bfcb8981',
+          flavor_id: '1e1f4346-e3ea-48ba-9d1b-0002bfcb8981',
+          flavor_ref: '1'
+        }
+      end
+
+      it 'raises an exception' do
+        expect { driver.send(:create_server) }.to \
+          raise_error(Kitchen::ActionFailed)
+      end
+    end
+
     context 'image/flavor specifies id' do
       let(:config) do
         {
@@ -575,6 +649,46 @@ describe Kitchen::Driver::Openstack do
       end
     end
 
+    context 'network specifies network_id' do
+      let(:config) do
+        {
+          server_name: 'hello',
+          image_ref: '111',
+          flavor_ref: '1',
+          network_id: '0922b7aa-0a2f-4e68-8ff7-2886c4fc472d'
+        }
+      end
+
+      it 'exact id match' do
+        networks = [
+          { 'net_id' => '0922b7aa-0a2f-4e68-8ff7-2886c4fc472d' }
+        ]
+        expect(servers).to receive(:create).with(name: 'hello',
+                                                 image_ref: '111',
+                                                 flavor_ref: '1',
+                                                 availability_zone: nil,
+                                                 nics: networks)
+        driver.send(:create_server)
+      end
+    end
+
+    context 'network_id and network_ref specified' do
+      let(:config) do
+        {
+          server_name: 'hello',
+          image_id: '1e1f4346-e3ea-48ba-9d1b-0002bfcb8981',
+          flavor_id: '1e1f4346-e3ea-48ba-9d1b-0002bfcb8981',
+          network_id: '0922b7aa-0a2f-4e68-8ff7-2886c4fc472d',
+          network_ref: '1'
+        }
+      end
+
+      it 'raises an exception' do
+        expect { driver.send(:create_server) }.to \
+          raise_error(Kitchen::ActionFailed)
+      end
+    end
+
     context 'network specifies id' do
       let(:config) do
         {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-openstack
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Jonathan Hartman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-02 00:00:00.000000000 Z
+date: 2017-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen