kitchen-softlayer 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a682dc5e86608aba4f73514a566c33a5bf3facb3
-  data.tar.gz: 97350b99e4b7ece3b87fc0b3a3f54c631d99706e
+  metadata.gz: 490411db2bd36714e967aabfbd5517b83e9f93e0
+  data.tar.gz: 43689042ddcf3bebcc6a6a84aa313f22119e61dd
 SHA512:
-  metadata.gz: 89573962a152f004c8a476485017c9836d7504a2dfaf5d563efbf88e7c5ffccb661674677b9cd3a66e0b26062c6bf6ebac3411b5dd031133b2e79740eccf0d14
-  data.tar.gz: a4dd15a31f74a36f05c692583a64fae72401d862efeb2b3ef2708abda5c4a80f305454fa45e1695a61152d7961b61daab4ad9d71080dbb51f3ba6caa5d8d2551
+  metadata.gz: 077925f2ca58b015d1097b7401b77ef6f8fa04aaa7aa7dc2e489f7079924b348e65071c8fc157b7d4721f426d863d17329010215ac3d3bd1fff7e9857c187761
+  data.tar.gz: 9df0820590baad9db937adcdff8957737f4d55ea0b02aab3d91205eb4b1b67b69d6cbb0626e7be0700e80449b5335a9e8304ea7a7b921af9c8591dbd8d23fcb4

data/README.md

@@ -96,6 +96,7 @@ softlayer_api_key | ENV['softlayer_api_key']
 softlayer_default_datacenter | ENV['softlayer_default_datacenter']
 softlayer_default_domain | ENV['softlayer_default_domain']
 server_name | nil | Server Name
+server_name_prefix | nil | If you want to have a static prefix for a random server name.
 key_name | nil | the label of the uploaded key
 ssh_key| nil | file location of private key
 disable_ssl_validation | false | ssl validation for fog softlayer api

data/kitchen-softlayer.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   candidates += ['CHANGELOG.md', 'kitchen-softlayer.gemspec']
   spec.files = candidates.sort
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.0.0'
+  spec.required_ruby_version = '>= 2.1.0'
   spec.add_dependency 'test-kitchen', '~> 1.4'
   spec.add_dependency 'fog', '~> 1.18'
   spec.add_dependency 'fog-softlayer', '~> 1'

data/lib/kitchen/driver/softlayer.rb

@@ -23,6 +23,7 @@ module Kitchen
     # rubocop:disable Metrics/LineLength
     class Softlayer < Kitchen::Driver::SSHBase
       default_config :server_name, nil
+      default_config :server_name_prefix, nil
       default_config :key_name, nil
       required_config :key_name
       default_config :ssh_key do
@@ -76,7 +77,7 @@ module Kitchen
       default_config :alternate_ip, nil
 
       def create(state)
-        config[:server_name] = default_name unless config[:server_name]
+        config_server_name
         config[:disable_ssl_validation] && disable_ssl_validation
         server = find_server(config[:hostname])
         server = create_server unless server
@@ -88,13 +89,13 @@ module Kitchen
         end
         info "\n(server ready)"
         tag_server(server)
-        if config[:ssh_via_hostname]
-          state[:hostname] = config[:hostname]
-        elsif config[:alternate_ip]
-          state[:hostname] = config[:alternate_ip]
-        else
-          state[:hostname] = get_ip(server)
-        end
+        state[:hostname] = if config[:ssh_via_hostname]
+                             config[:hostname]
+                           elsif config[:alternate_ip]
+                             config[:alternate_ip]
+                           else
+                             get_ip(server)
+                           end
         setup_ssh(server, state)
         wait_for_ssh_key_access(state)
       rescue Fog::Errors::Error, Excon::Errors::Error => ex
@@ -115,6 +116,17 @@ module Kitchen
 
       private
 
+      # Set the proper server name in the config
+      def config_server_name
+        return if config[:server_name]
+
+        config[:server_name] = if config[:server_name_prefix]
+                                 server_name_prefix(config[:server_name_prefix])
+                               else
+                                 default_name
+                               end
+      end
+
       def wait_for_server_to_delete(state)
         ((config[:destroy_timeout].to_i / 15).floor).times do
           info 'Deleting server in softlayer'
@@ -122,7 +134,7 @@ module Kitchen
           server = compute.servers.get(state[:server_id])
           return if server.nil? || server.id.nil?
         end
-        fail "#{config[:destroy_timeout]} seconds went by and server not deleted by softlayer"
+        raise "#{config[:destroy_timeout]} seconds went by and server not deleted by softlayer"
       end
 
       def wait_for_ssh_key_access(state)
@@ -142,7 +154,7 @@ module Kitchen
             return
           end
         end
-        fail "#{config[:ssh_timeout]} seconds went by and we couldn't connect, somethings broken"
+        raise "#{config[:ssh_timeout]} seconds went by and we couldn't connect, somethings broken"
       end
 
       def compute
@@ -191,7 +203,7 @@ module Kitchen
             debug "Found private image #{id} for name #{image_name}"
           end
         end
-        fail "No image found with name #{image_name}" if id.nil?
+        raise "No image found with name #{image_name}" if id.nil?
         id
       end
 
@@ -203,7 +215,7 @@ module Kitchen
           debug "Found network id #{r['id']} for vlan number #{r['vlanNumber']}"
           return r['id']
         end
-        fail "No network found for vlan number #{r['vlanNumber']}"
+        raise "No network found for vlan number #{r['vlanNumber']}"
       end
 
       def create_server
@@ -288,6 +300,32 @@ module Kitchen
         ].join('-')
       end
 
+      def server_name_prefix(server_name_prefix)
+        # Generate what should be a unique server name with given prefix
+        # of up to 63 total chars
+        #
+        # Provided prefix:  variable, max 54
+        # Separator:        1
+        # Random string:    8
+        # ===================
+        # Max:              63
+        #
+        if server_name_prefix.length > 54
+          warn 'Server name prefix too long, truncated to 54 characters'
+          server_name_prefix = server_name_prefix[0..53]
+        end
+
+        server_name_prefix.gsub!(/\W/, '')
+
+        if server_name_prefix.empty?
+          warn 'Server name prefix empty or invalid; using fully generated name'
+          default_name
+        else
+          random_suffix = ('a'..'z').to_a.sample(8).join
+          server_name_prefix + '-' + random_suffix
+        end
+      end
+
       # TODO: code has support for multiple ips but not used.
 
       def get_public_private_ips(server)
@@ -301,14 +339,10 @@ module Kitchen
         pub, priv = parse_ips(pub, priv)
         pub[config[:public_ip_order].to_i] ||
           priv[config[:private_ip_order].to_i] ||
-          fail(ActionFailed, 'Could not find an IP')
-        if config[:use_private_ip_with_public_network] && !config[:private_network_only]
-          return priv[0]
-        elsif config[:private_network_only]
-          return priv[0]
-        else
-          return pub[0]
-        end
+          raise(ActionFailed, 'Could not find an IP')
+        return priv[0] if config[:use_private_ip_with_public_network] && !config[:private_network_only]
+        return priv[0] if config[:private_network_only]
+        pub[0]
       end
 
       def parse_ips(pub, priv)

data/lib/kitchen/driver/softlayer_version.rb

@@ -15,6 +15,6 @@
 module Kitchen
   # Version string for Softlayer Kitchen driver
   module Driver
-    SOFTLAYER_VERSION = '0.0.7'
+    SOFTLAYER_VERSION = '0.1.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-softlayer
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-16 00:00:00.000000000 Z
+date: 2017-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -77,7 +77,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Test Kitchen Softlayer driver