kitchen-rackspace 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74152db3ba01adfd8f862730d7a4dc0f245c01f2
-  data.tar.gz: ddf0961e41044a4f3500164b1487fabf45dcff39
+  metadata.gz: 8dacbb23877f1f67c30152a721c63f8521854efe
+  data.tar.gz: ab8811181a0d17553edb3237bd0f4fe3706043f1
 SHA512:
-  metadata.gz: 8d811bfe76c0d67358e02773f86b6cc98732e812ca7d8dcdb48fe2a063a721e8228af965861909177bb39b5af519dca9a92d13be7ff320eb14506177369d9c05
-  data.tar.gz: e53324771f9655e09c2047022857a0e8415bdb7531af438b412dcf3a6c52cfff84a9a083716978e8d74816403262ede47cf09ab3dd264ebc4fe3dbbaed035aff
+  metadata.gz: 0d822a5e5f0d4c2da1b6c2dab7c0e9f09879cbe09c0737791cef8132367d2d636c785b8fa6a141befa9465eb481c51a3d28bd1fbc0c79219e908c960b0ea4ce1
+  data.tar.gz: 25aeb6db235c06d7dbe92ab1e3669034c8efff3389eaebee15d60093130278ca65036485e2b8e7d2a2eb716b45dd4a13c49b1e59cb1fda9d2100fd2a8e488128

data/.rubocop.yml

@@ -1,7 +1,9 @@
-# Allow additional lines until main driver class can be split 
+# Allow additional lines until main driver class can be split
 # into smaller classes.
 
 ClassLength:
-  Max: 120
+  Max: 125
 AbcSize:
-  Max: 17
+  Max: 20
+MethodLength:
+  Max: 15

data/.travis.yml

@@ -4,7 +4,11 @@ cache: bundler
 sudo: false
 
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1
   - 2.2
+  - ruby-head
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.19.0 / 2015-10-06
+
+* PR [#60][] - Update to latest image IDs
+* PR [#57][] - Add `servicelevel_wait` option; via [@martinb3][]
+* PR [#56][] - Add `no_passwd_lock` option; via [@martinb3][]
+
 # 0.18.0 / 2015-08-28
 
 * PR [#53][] - Update image IDs, update Arch to 2015.7, drop Fedora 20, add
@@ -144,6 +150,8 @@ boot times, via [@coderanger][]
 
 * Initial release! Woo!
 
+[#57]: https://github.com/test-kitchen/kitchen-rackspace/pull/57
+[#56]: https://github.com/test-kitchen/kitchen-rackspace/pull/56
 [#53]: https://github.com/test-kitchen/kitchen-rackspace/pull/53
 [#51]: https://github.com/test-kitchen/kitchen-rackspace/pull/51
 [#50]: https://github.com/test-kitchen/kitchen-rackspace/pull/50

data/README.md

@@ -59,6 +59,8 @@ for your specified platform. Additional, optional overrides can be provided:
     no_ssh_tcp_check_sleep: [NUM OF SECONDS TO SLEEP IF no_ssh_tcp_check IS SET]
     networks: [LIST OF RACKSPACE NETWORK UUIDS, DEFAULT PUBLICNET AND SERVICE NET]
     rackconnect_wait: ['true' IF USING RACKCONNECT TO WAIT FOR IT TO COMPLETE]
+    servicelevel_wait: ['true' IF USING MANAGED SERVICE LEVEL AUTOMATION TO WAIT FOR IT TO COMPLETE]
+    no_passwd_lock: ['true' IF FOG LIBRARY SHOULD NOT LOCK ROOT ACCOUNT]
     servicenet: ['true' IF USING THE SERVICENET IP ADDRESS TO CONNECT]
 
 You also have the option of providing some configs via environment variables:

data/Rakefile

@@ -9,12 +9,6 @@ Cane::RakeTask.new
 
 RuboCop::RakeTask.new
 
-desc 'Display LOC stats'
-task :loc do
-  puts "\n## LOC Stats"
-  sh 'countloc -r lib/kitchen'
-end
-
 RSpec::Core::RakeTask.new(:spec)
 
-task default: [:cane, :rubocop, :loc, :spec]
+task default: [:cane, :rubocop, :spec]

data/data/images.json

@@ -2,68 +2,68 @@
   "arch": "ade87903-9d82-4584-9cc1-204870011de0",
   "arch-2015": "ade87903-9d82-4584-9cc1-204870011de0",
   "arch-2015.7": "ade87903-9d82-4584-9cc1-204870011de0",
-  "centos": "c25f1ae0-30b3-4012-8ca6-5ecfcf05c965",
-  "centos-5": "d75bc322-b02c-493d-b414-097b3bcce4dd",
-  "centos-5.11": "d75bc322-b02c-493d-b414-097b3bcce4dd",
-  "centos-6": "aa68fd54-2f9a-42c3-9901-4035e2738830",
-  "centos-6.6": "aa68fd54-2f9a-42c3-9901-4035e2738830",
-  "centos-7": "c25f1ae0-30b3-4012-8ca6-5ecfcf05c965",
-  "centos-7.0": "c25f1ae0-30b3-4012-8ca6-5ecfcf05c965",
-  "coreos": "b05a6c75-158a-4fca-b5ad-fe9d644e04b4",
-  "coreos-0": "7cf9f618-3dd3-4e3e-bace-e44d857039e2",
-  "coreos-alpha": "6e4f6893-b973-4f91-b7e3-9f442a30a907",
-  "coreos-beta": "7cf9f618-3dd3-4e3e-bace-e44d857039e2",
-  "coreos-stable": "b05a6c75-158a-4fca-b5ad-fe9d644e04b4",
-  "debian": "19149d8b-bd6a-4b0b-a688-657780f9cf6c",
-  "debian-7": "c934d497-7b45-4764-ac63-5b67e1458a20",
-  "debian-7.0": "c934d497-7b45-4764-ac63-5b67e1458a20",
-  "debian-8": "19149d8b-bd6a-4b0b-a688-657780f9cf6c",
-  "debian-8.0": "19149d8b-bd6a-4b0b-a688-657780f9cf6c",
-  "debian-testing": "0535b46b-fae2-4813-945f-701949c53c2e",
+  "centos": "6595f1b7-e825-4bd2-addc-c7b1c803a37f",
+  "centos-5": "fdaf64c7-d9f3-446c-bd7c-70349305ae91",
+  "centos-5.11": "fdaf64c7-d9f3-446c-bd7c-70349305ae91",
+  "centos-6": "fabe045f-43f8-4991-9e6c-5cabd617538c",
+  "centos-6.7": "fabe045f-43f8-4991-9e6c-5cabd617538c",
+  "centos-7": "6595f1b7-e825-4bd2-addc-c7b1c803a37f",
+  "centos-7.0": "6595f1b7-e825-4bd2-addc-c7b1c803a37f",
+  "coreos": "415ca2e6-df92-44e6-ba95-8ee36b436b24",
+  "coreos-0": "415ca2e6-df92-44e6-ba95-8ee36b436b24",
+  "coreos-alpha": "2c12f6da-8540-40bc-b974-9a72040173e0",
+  "coreos-beta": "8dc7d5d8-4ad4-41b6-acf1-958dfeadcb17",
+  "coreos-stable": "415ca2e6-df92-44e6-ba95-8ee36b436b24",
+  "debian": "c3aacaf9-8d1e-4d41-bb47-045fbc392a1c",
+  "debian-7": "eaaf94d8-55a6-4bfa-b0a8-473febb012dc",
+  "debian-7.0": "eaaf94d8-55a6-4bfa-b0a8-473febb012dc",
+  "debian-8": "c3aacaf9-8d1e-4d41-bb47-045fbc392a1c",
+  "debian-8.0": "c3aacaf9-8d1e-4d41-bb47-045fbc392a1c",
+  "debian-testing": "081a8b12-515c-41c9-8ce4-13139e1904f7",
   "debian-unstable": "498c59a0-3c26-4357-92c0-dd938baca3db",
-  "fedora": "2cc5db1b-2fc8-42ae-8afb-d30c68037f02",
-  "fedora-21": "6c21b351-e12a-4ddf-a0a0-a6849c2b0037",
-  "fedora-21.0": "6c21b351-e12a-4ddf-a0a0-a6849c2b0037",
-  "fedora-22": "2cc5db1b-2fc8-42ae-8afb-d30c68037f02",
-  "fedora-22.0": "2cc5db1b-2fc8-42ae-8afb-d30c68037f02",
+  "fedora": "0976b31e-f6d7-4d74-81e9-007fca25067e",
+  "fedora-21": "46975098-7799-4e72-8ae0-d6ef9d2d26a1",
+  "fedora-21.0": "46975098-7799-4e72-8ae0-d6ef9d2d26a1",
+  "fedora-22": "0976b31e-f6d7-4d74-81e9-007fca25067e",
+  "fedora-22.0": "0976b31e-f6d7-4d74-81e9-007fca25067e",
   "freebsd": "7a1cf8de-7721-4d56-900b-1e65def2ada5",
   "freebsd-10": "7a1cf8de-7721-4d56-900b-1e65def2ada5",
   "freebsd-10.1": "7a1cf8de-7721-4d56-900b-1e65def2ada5",
-  "gentoo": "168c1be2-a3b0-423f-a619-f63cce550063",
-  "gentoo-15": "168c1be2-a3b0-423f-a619-f63cce550063",
-  "gentoo-15.3": "168c1be2-a3b0-423f-a619-f63cce550063",
-  "opensuse": "3cdcd2cc-238c-4f42-a9f4-0a80de217f7a",
-  "opensuse-13": "3cdcd2cc-238c-4f42-a9f4-0a80de217f7a",
-  "opensuse-13.2": "3cdcd2cc-238c-4f42-a9f4-0a80de217f7a",
-  "redhat": "bcc314ad-d971-4753-aea4-8b54d6219dfd",
+  "gentoo": "7451d607-426d-416f-8d29-97e57f6f3ad5",
+  "gentoo-15": "7451d607-426d-416f-8d29-97e57f6f3ad5",
+  "gentoo-15.3": "7451d607-426d-416f-8d29-97e57f6f3ad5",
+  "opensuse": "79436148-753f-41b7-aee9-5acbde16582c",
+  "opensuse-13": "79436148-753f-41b7-aee9-5acbde16582c",
+  "opensuse-13.2": "79436148-753f-41b7-aee9-5acbde16582c",
+  "redhat": "92f8a8b8-6019-4c27-949b-cf9910b84ffb",
   "redhat-5": "05dd965d-84ce-451b-9ca1-83a134e523c3",
   "redhat-5.11": "05dd965d-84ce-451b-9ca1-83a134e523c3",
-  "redhat-6": "8e3d8c5b-ac07-429f-8304-d2863e1a0636",
-  "redhat-6.7": "8e3d8c5b-ac07-429f-8304-d2863e1a0636",
-  "redhat-7": "bcc314ad-d971-4753-aea4-8b54d6219dfd",
-  "redhat-7.0": "bcc314ad-d971-4753-aea4-8b54d6219dfd",
-  "scientific": "ab5c119f-50ab-4213-b969-19b1853d41b0",
+  "redhat-6": "5176fde9-e9d6-4611-9069-1eecd55df440",
+  "redhat-6.7": "5176fde9-e9d6-4611-9069-1eecd55df440",
+  "redhat-7": "92f8a8b8-6019-4c27-949b-cf9910b84ffb",
+  "redhat-7.0": "92f8a8b8-6019-4c27-949b-cf9910b84ffb",
+  "scientific": "6118e449-3149-475f-bcbb-99d204cedd56",
   "scientific-6": "36076d08-3e8b-4436-9253-7a8868e4f4d7",
   "scientific-6.6": "36076d08-3e8b-4436-9253-7a8868e4f4d7",
-  "scientific-7": "ab5c119f-50ab-4213-b969-19b1853d41b0",
-  "scientific-7.0": "ab5c119f-50ab-4213-b969-19b1853d41b0",
-  "ubuntu": "4315b2dc-23fc-4d81-9e73-aa620357e1d8",
+  "scientific-7": "6118e449-3149-475f-bcbb-99d204cedd56",
+  "scientific-7.0": "6118e449-3149-475f-bcbb-99d204cedd56",
+  "ubuntu": "658a7d3b-4c58-4e29-b339-2509cca0de10",
   "ubuntu-12": "973775ab-0653-4ef8-a571-7a2777787735",
   "ubuntu-12.04": "973775ab-0653-4ef8-a571-7a2777787735",
   "ubuntu-14": "09de0a66-3156-48b4-90a5-1cf25a905207",
   "ubuntu-14.04": "09de0a66-3156-48b4-90a5-1cf25a905207",
-  "ubuntu-15": "4315b2dc-23fc-4d81-9e73-aa620357e1d8",
-  "ubuntu-15.04": "4315b2dc-23fc-4d81-9e73-aa620357e1d8",
+  "ubuntu-15": "658a7d3b-4c58-4e29-b339-2509cca0de10",
+  "ubuntu-15.04": "658a7d3b-4c58-4e29-b339-2509cca0de10",
   "vyatta": "faad95b7-396d-483e-b4ae-77afec7e7097",
   "vyatta-6": "faad95b7-396d-483e-b4ae-77afec7e7097",
   "vyatta-6.7": "faad95b7-396d-483e-b4ae-77afec7e7097",
   "vyatta-6.7R9": "faad95b7-396d-483e-b4ae-77afec7e7097",
-  "windows": "76964ffc-26eb-4a83-8301-50e77255b355",
-  "windows-2008": "d84bffa7-d4d4-4fd3-a7f7-06865e02467d",
-  "windows-2008.2": "d84bffa7-d4d4-4fd3-a7f7-06865e02467d",
-  "windows-2008R2": "d84bffa7-d4d4-4fd3-a7f7-06865e02467d",
-  "windows-2008R2SP1": "d84bffa7-d4d4-4fd3-a7f7-06865e02467d",
-  "windows-2012": "76964ffc-26eb-4a83-8301-50e77255b355",
-  "windows-2012.2": "76964ffc-26eb-4a83-8301-50e77255b355",
-  "windows-2012R2": "76964ffc-26eb-4a83-8301-50e77255b355"
+  "windows": "444a8d19-c99e-424a-8ffc-0d3d75a2f166",
+  "windows-2008": "ee71e392-12b0-4050-b097-8f75b4071831",
+  "windows-2008.2": "ee71e392-12b0-4050-b097-8f75b4071831",
+  "windows-2008R2": "ee71e392-12b0-4050-b097-8f75b4071831",
+  "windows-2008R2SP1": "ee71e392-12b0-4050-b097-8f75b4071831",
+  "windows-2012": "444a8d19-c99e-424a-8ffc-0d3d75a2f166",
+  "windows-2012.2": "444a8d19-c99e-424a-8ffc-0d3d75a2f166",
+  "windows-2012R2": "444a8d19-c99e-424a-8ffc-0d3d75a2f166"
 }

data/kitchen-rackspace.gemspec

@@ -28,7 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rubocop', '~> 0.29'
   spec.add_development_dependency 'cane', '~> 2.6'
-  spec.add_development_dependency 'countloc', '~> 0.4'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'simplecov', '~> 0.9'
   spec.add_development_dependency 'simplecov-console', '~> 0.2'

data/lib/kitchen/driver/rackspace.rb

@@ -37,9 +37,11 @@ module Kitchen
       default_config :no_ssh_tcp_check, false
       default_config :no_ssh_tcp_check_sleep, 120
       default_config :rackconnect_wait, false
+      default_config :servicelevel_wait, false
+      default_config :no_passwd_lock, false
       default_config :servicenet, false
-      default_config(:image_id) { |driver| driver.default_image }
-      default_config(:server_name) { |driver| driver.default_name }
+      default_config(:image_id, &:default_image)
+      default_config(:server_name, &:default_name)
       default_config :networks, nil
 
       default_config :public_key_path do
@@ -76,6 +78,7 @@ module Kitchen
         server.wait_for { ready? }
         puts '(server ready)'
         rackconnect_check(server) if config[:rackconnect_wait]
+        servicelevel_check(server) if config[:servicelevel_wait]
         state[:hostname] = hostname(server)
         tcp_check(state)
       rescue Fog::Errors::Error, Excon::Errors::Error => ex
@@ -127,11 +130,12 @@ module Kitchen
 
       def create_server
         server_def = { name: config[:server_name], networks: networks }
-        [:image_id, :flavor_id, :public_key_path].each do |opt|
+        [:image_id, :flavor_id, :public_key_path, :no_passwd_lock].each do |opt|
           server_def[opt] = config[opt]
         end
         # see @note on bootstrap def about rackconnect
-        server_def[:no_passwd_lock] = true if config[:rackconnect_wait]
+        no_passwd_lock = config[:rackconnect_wait] || config[:servicelevel_wait]
+        server_def[:no_passwd_lock] = no_passwd_lock if no_passwd_lock
         compute.servers.bootstrap(server_def)
       end
 
@@ -157,6 +161,12 @@ module Kitchen
         server.update # refresh accessIPv4 with new IP
       end
 
+      def servicelevel_check(server)
+        server.wait_for \
+          { metadata.all['rax_service_level_automation'] == 'Complete' }
+        puts '(service level automation complete)'
+      end
+
       def hostname(server)
         if config[:servicenet] == false
           server.public_ip_address

data/lib/kitchen/driver/rackspace_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   #
   # @author Jonathan Hartman <j@p4nt5.com>
   module Driver
-    RACKSPACE_VERSION = '0.18.0'
+    RACKSPACE_VERSION = '0.19.0'
   end
 end

data/spec/kitchen/driver/rackspace_spec.rb

@@ -97,17 +97,25 @@ describe Kitchen::Driver::Rackspace do
         expect(driver[:rackconnect_wait]).to eq(false)
       end
 
+      it 'defaults to not waiting for managed service level' do
+        expect(driver[:servicelevel_wait]).to eq(false)
+      end
+
       it 'defaults to the public ip address' do
         expect(driver[:servicenet]).to eq(false)
       end
+
+      it 'defaults to no_passwd_lock as false' do
+        expect(driver[:no_passwd_lock]).to eq(false)
+      end
     end
 
     platforms = {
       'ubuntu-12.04' => '973775ab-0653-4ef8-a571-7a2777787735',
       'ubuntu-12' => '973775ab-0653-4ef8-a571-7a2777787735',
-      'ubuntu' => '4315b2dc-23fc-4d81-9e73-aa620357e1d8',
-      'centos-5' => 'd75bc322-b02c-493d-b414-097b3bcce4dd',
-      'centos' => 'c25f1ae0-30b3-4012-8ca6-5ecfcf05c965'
+      'ubuntu' => '658a7d3b-4c58-4e29-b339-2509cca0de10',
+      'centos-5' => 'fdaf64c7-d9f3-446c-bd7c-70349305ae91',
+      'centos' => '6595f1b7-e825-4bd2-addc-c7b1c803a37f'
     }
     platforms.each do |platform, id|
       context "name is #{platform}" do
@@ -130,6 +138,7 @@ describe Kitchen::Driver::Rackspace do
         rackspace_region: 'ord',
         wait_for: 1200,
         rackconnect_wait: true,
+        servicelevel_wait: true,
         use_private_ip_address: true
       }
 
@@ -287,6 +296,67 @@ describe Kitchen::Driver::Rackspace do
     end
   end
 
+  describe '#create and servicelevel_wait' do
+    let(:server) do
+      double(id: 'test123',
+             wait_for: true,
+             public_ip_address: '1.2.3.4',
+             private_ip_address: '10.9.8.7',
+             update: nil)
+    end
+
+    before(:each) do
+      {
+        default_name: 'a_monkey!',
+        create_server: server,
+        tcp_check: true
+      }.each do |k, v|
+        allow_any_instance_of(described_class).to receive(k).and_return(v)
+      end
+    end
+
+    context 'username and API key only provided' do
+      let(:config) do
+        {
+          rackspace_username: 'hello',
+          rackspace_api_key: 'world',
+          wait_for: 1200,
+          servicelevel_wait: true
+        }
+      end
+
+      it 'generates a server name in the absence of one' do
+        driver.create(state)
+        expect(driver[:server_name]).to eq('a_monkey!')
+      end
+
+      it 'gets a proper server ID' do
+        driver.create(state)
+        expect(state[:server_id]).to eq('test123')
+      end
+
+      it 'gets a proper hostname (IP)' do
+        driver.create(state)
+        expect(state[:hostname]).to eq('1.2.3.4')
+      end
+
+      it 'calls tcp_check' do
+        expect(driver).to receive(:tcp_check)
+        driver.create(state)
+      end
+
+      it 'calls servicelevel_check ' do
+        expect(driver).to receive(:servicelevel_check)
+        driver.create(state)
+      end
+
+      it 'servicelevel_check waits for managed service level automation' do
+        expect(server).to receive(:wait_for)
+        driver.send(:servicelevel_check, server)
+      end
+    end
+  end
+
   describe '#create and use_private_ip_address' do
     let(:server) do
       double(id: 'test123',
@@ -429,6 +499,7 @@ describe Kitchen::Driver::Rackspace do
         image_id: 'there',
         flavor_id: 'captain',
         public_key_path: 'tarpals',
+        no_passwd_lock: false,
         networks: default_networks
       }
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-rackspace
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Jonathan Hartman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-28 00:00:00.000000000 Z
+date: 2015-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -94,20 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
-- !ruby/object:Gem::Dependency
-  name: countloc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -206,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen Rackspace driver built on Fog