kitchen-openstack 1.5.3 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7616b4cab10679974a5948b4136caa7740e88154
-  data.tar.gz: 5fde868ddac4a5d8c64cc8b21d2cade8821588c6
+  metadata.gz: aaa67866b7346e3d53a47909387604044676368d
+  data.tar.gz: 8a63780cf40fd676075a000ec5430ebba442e0ff
 SHA512:
-  metadata.gz: b39b884a8057e61c4891a7438a866aa6651372e65baf6a0e899a6ad96dc5e0737916dbc6314e0494ab4463d81d3244325677fc12d9a67f2d067755171d1a49d8
-  data.tar.gz: fcc37f270a4c08495604f6d5efcc0882c1056ae7e6626373107261f6de4d4f71f81254598479a33c4b527d1fe7f484e10d285deebd91923eb5f706e5be754c93
+  metadata.gz: 768a16ad10875cd5117bd4bc963b5040a48c6e03ae9cf36f2fc3a3dc53ca3b06968abce37fda1f064663a20da56c4983a681a46055a4f8c384ef92361d50197e
+  data.tar.gz: 7960728018b0817c36fb6fe09b2237ed31235ca5c6210eacc74759419e3f3b7f2a71eee218d53c8fe4384b026368fb1dc99b4ee03d39006f15c15c46d3e8e2e6

data/.rubocop.yml

@@ -6,3 +6,5 @@ ClassLength:
   Enabled: false
 ClassVars:
   Enabled: false
+PerceivedComplexity:
+  Max: 10

data/.travis.yml

@@ -4,7 +4,6 @@ gemfile:
   - Gemfile
 
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
   - 2.1.1

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+# 1.6.0 / 2014-09.04
+
+### Improvements
+
+* PR [#56][] - Fall back to the first valid IP if no public or private nets can
+be found; via [@jer][]
+* PR [#55][] - Give a floating IP priority over an IP pool if both are present;
+via [@StaymanHou][]
+
+### Bug Fixes
+
+* PR [#58][] - Prevent errors when run without a login shell
+
 # 1.5.3 / 2014-08-01
 
 * PR [#53][] - Rework how server names are generated, disallowing possibly
@@ -106,6 +119,9 @@ certain specified NICs; via [@monsterzz][]
 
 * Initial release! Woo!
 
+[#58]: https://github.com/test-kitchen/kitchen-openstack/pull/58
+[#56]: https://github.com/test-kitchen/kitchen-openstack/pull/56
+[#55]: https://github.com/test-kitchen/kitchen-openstack/pull/55
 [#53]: https://github.com/test-kitchen/kitchen-openstack/pull/53
 [#50]: https://github.com/test-kitchen/kitchen-openstack/pull/50
 [#49]: https://github.com/test-kitchen/kitchen-openstack/pull/49
@@ -130,6 +146,8 @@ 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
 
+[@StaymanHou]: https://github.com/StaymanHou
+[@jer]: https://github.com/jer
 [@dschlenk]: https://github.com/dschlenk
 [@wilreichert]: https://github.com/wilreichert
 [@tenforward]: https://github.com/tenforward

data/kitchen-openstack.gemspec

@@ -19,6 +19,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(/^(test|spec|features)\//)
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = '>= 1.9.3'
+
   spec.add_dependency 'test-kitchen', '~> 1.1'
   spec.add_dependency 'fog', '~> 1.18'
   # Newer Fogs throw a warning if unf isn't there :(

data/lib/kitchen/driver/openstack.rb

@@ -56,7 +56,7 @@ module Kitchen
       default_config :network_ref, nil
 
       def create(state)
-        config[:server_name] ||= generate_name(instance.name)
+        config[:server_name] ||= default_name
         config[:disable_ssl_validation] && disable_ssl_validation
         server = create_server
         state[:server_id] = server.id
@@ -66,22 +66,14 @@ module Kitchen
           ready?
         end
         info "\n(server ready)"
-        if config[:floating_ip_pool]
-          attach_ip_from_pool(server, config[:floating_ip_pool])
-        elsif config[:floating_ip]
+        if config[:floating_ip]
           attach_ip(server, config[:floating_ip])
+        elsif config[:floating_ip_pool]
+          attach_ip_from_pool(server, config[:floating_ip_pool])
         end
         state[:hostname] = get_ip(server)
-        state[:ssh_key] = config[:private_key_path]
-        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
-        info "Using public SSH key <#{config[:public_key_path]}>"
-        info "Using private SSH key <#{config[:private_key_path]}>"
+        setup_ssh(server, state)
         add_ohai_hint(state)
-        do_ssh_setup(state, config, server) unless config[:key_name]
       rescue Fog::Errors::Error, Excon::Errors::Error => ex
         raise ActionFailed, ex.message
       end
@@ -197,16 +189,13 @@ module Kitchen
       # Separators:    3
       # ================
       # Total:        63
-      def generate_name(base)
-        sep = '-'
-        pieces = [
-          base.gsub(/\W/, '')[0..14],
-          Etc.getlogin.gsub(/\W/, '')[0..14],
+      def default_name
+        [
+          instance.name.gsub(/\W/, '')[0..14],
+          (Etc.getlogin || 'nologin').gsub(/\W/, '')[0..14],
           Socket.gethostname.gsub(/\W/, '')[0..22],
           Array.new(7) { rand(36).to_s(36) }.join
-        ]
-        puts "Name: #{pieces.join(sep)}"
-        pieces.join(sep)
+        ].join('-')
       end
 
       def attach_ip_from_pool(server, pool)
@@ -229,6 +218,18 @@ module Kitchen
         (server.addresses['public'] ||= []) << { 'version' => 4, 'addr' => ip }
       end
 
+      def get_public_private_ips(server)
+        begin
+          pub, priv = server.public_ip_addresses, server.private_ip_addresses
+        rescue Fog::Compute::OpenStack::NotFound, Excon::Errors::Forbidden
+          # See Fog issue: https://github.com/fog/fog/issues/2160
+          addrs = server.addresses
+          addrs['public'] && pub = addrs['public'].map { |i| i['addr'] }
+          addrs['private'] && priv = addrs['private'].map { |i| i['addr'] }
+        end
+        [pub, priv]
+      end
+
       def get_ip(server)
         unless config[:floating_ip].nil?
           debug "Using floating ip: #{config[:floating_ip]}"
@@ -238,14 +239,8 @@ module Kitchen
           debug "Using configured net: #{config[:openstack_network_name]}"
           return server.addresses[config[:openstack_network_name]].first['addr']
         end
-        begin
-          pub, priv = server.public_ip_addresses, server.private_ip_addresses
-        rescue Fog::Compute::OpenStack::NotFound
-          # See Fog issue: https://github.com/fog/fog/issues/2160
-          addrs = server.addresses
-          addrs['public'] && pub = addrs['public'].map { |i| i['addr'] }
-          addrs['private'] && priv = addrs['private'].map { |i| i['addr'] }
-        end
+        pub, priv = get_public_private_ips(server)
+        priv ||= server.ip_addresses unless pub
         pub, priv = parse_ips(pub, priv)
         pub.first || priv.first || fail(ActionFailed, 'Could not find an IP')
       end
@@ -269,6 +264,18 @@ module Kitchen
         ])
       end
 
+      def setup_ssh(server, state)
+        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
+        info "Using public SSH key <#{config[:public_key_path]}>"
+        info "Using private SSH key <#{config[:private_key_path]}>"
+        state[:ssh_key] = config[:private_key_path]
+        do_ssh_setup(state, config, server) unless config[:key_name]
+      end
+
       def do_ssh_setup(state, config, server)
         info "Setting up SSH access for key <#{config[:public_key_path]}>"
         ssh = Fog::SSH.new(state[:hostname],

data/lib/kitchen/driver/openstack_version.rb

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

data/spec/kitchen/driver/openstack_spec.rb

@@ -31,10 +31,11 @@ describe Kitchen::Driver::Openstack do
   let(:state) { Hash.new }
   let(:dsa) { File.expand_path('~/.ssh/id_dsa') }
   let(:rsa) { File.expand_path('~/.ssh/id_rsa') }
+  let(:instance_name) { 'potatoes' }
 
   let(:instance) do
     double(
-      name: 'potatoes', logger: logger, to_str: 'instance'
+      name: instance_name, logger: logger, to_str: 'instance'
     )
   end
 
@@ -148,8 +149,7 @@ describe Kitchen::Driver::Openstack do
     let(:driver) do
       d = Kitchen::Driver::Openstack.new(config)
       d.instance = instance
-      allow(d).to receive(:generate_name).with('potatoes')
-        .and_return('a_monkey!')
+      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')
         .and_return(true)
@@ -625,52 +625,56 @@ describe Kitchen::Driver::Openstack do
     end
   end
 
-  describe '#generate_name' do
+  describe '#default_name' do
+    let(:login) { 'user' }
+    let(:hostname) { 'host' }
+
     before(:each) do
-      allow(Etc).to receive(:getlogin).and_return('user')
-      allow(Socket).to receive(:gethostname).and_return('host')
+      allow(Etc).to receive(:getlogin).and_return(login)
+      allow(Socket).to receive(:gethostname).and_return(hostname)
     end
 
     it 'generates a name' do
-      expect(driver.send(:generate_name, 'monkey')).to match(
-        /^monkey-user-host-/)
+      expect(driver.send(:default_name)).to match(/^potatoes-user-host-(\S*)/)
     end
 
     context 'local node with a long hostname' do
-      before(:each) do
-        allow(Socket).to receive(:gethostname).and_return('ab.c' * 20)
-      end
+      let(:hostname) { 'ab.c' * 20 }
 
       it 'limits the generated name to 63 characters' do
-        expect(driver.send(:generate_name, 'long').length).to be <= (63)
+        expect(driver.send(:default_name).length).to be <= (63)
       end
     end
 
     context 'node with a long hostname, username, and base name' do
-      before(:each) do
-        allow(Socket).to receive(:gethostname).and_return('abc' * 20)
-        allow(Etc).to receive(:getlogin).and_return('user' * 20)
-      end
+      let(:login) { 'abcd' * 20 }
+      let(:hostname) { 'efgh' * 20 }
+      let(:instance_name) { 'ijkl' * 20 }
 
       it 'limits the generated name to 63 characters' do
-        expect(driver.send(:generate_name, 'long' * 20).length).to eq(63)
+        expect(driver.send(:default_name).length).to eq(63)
       end
     end
 
     context 'a login and hostname with punctuation in them' do
-      let(:base) { 'a.base-name' }
-
-      before(:each) do
-        allow(Etc).to receive(:getlogin).and_return('some.u-se-r' * 20)
-        allow(Socket).to receive(:gethostname).and_return('a.host-name' * 20)
-      end
+      let(:login) { 'some.u-se-r' }
+      let(:hostname) { 'a.host-name' }
+      let(:instance_name) { 'a.instance-name' }
 
       it 'strips out the dots to prevent bad server names' do
-        expect(driver.send(:generate_name, base)).to_not include('.')
+        expect(driver.send(:default_name)).to_not include('.')
       end
 
       it 'strips out all but the three hyphen separators' do
-        expect(driver.send(:generate_name, base).count('-')).to eq(3)
+        expect(driver.send(:default_name).count('-')).to eq(3)
+      end
+    end
+
+    context 'a non-login shell' do
+      let(:login) { nil }
+
+      it 'subs in a placeholder login string' do
+        expect(driver.send(:default_name)).to match(/^potatoes-nologin-/)
       end
     end
   end
@@ -726,6 +730,7 @@ describe Kitchen::Driver::Openstack do
     let(:addresses) { nil }
     let(:public_ip_addresses) { nil }
     let(:private_ip_addresses) { nil }
+    let(:ip_addresses) { nil }
     let(:parsed_ips) { [[], []] }
     let(:driver) do
       d = Kitchen::Driver::Openstack.new(config)
@@ -736,7 +741,8 @@ describe Kitchen::Driver::Openstack do
     let(:server) do
       double(addresses: addresses,
              public_ip_addresses: public_ip_addresses,
-             private_ip_addresses: private_ip_addresses)
+             private_ip_addresses: private_ip_addresses,
+             ip_addresses: ip_addresses)
     end
 
     context 'both public and private IPs' do
@@ -767,6 +773,15 @@ describe Kitchen::Driver::Openstack do
       end
     end
 
+    context 'no predictable network name' do
+      let(:ip_addresses) { %w(3::1 5.5.5.5) }
+      let(:parsed_ips) { [[], %w(5.5.5.5)] }
+
+      it 'returns the first IP that matches the IP version' do
+        expect(driver.send(:get_ip, server)).to eq('5.5.5.5')
+      end
+    end
+
     context 'IPs in user-defined network group' do
       let(:config) { { openstack_network_name: 'mynetwork' } }
       let(:addresses) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-openstack
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.6.0
 platform: ruby
 authors:
 - Jonathan Hartman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-01 00:00:00.000000000 Z
+date: 2014-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -224,7 +224,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -232,7 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen OpenStack Nova driver