kitchen-softlayer 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 490411db2bd36714e967aabfbd5517b83e9f93e0
-  data.tar.gz: 43689042ddcf3bebcc6a6a84aa313f22119e61dd
+  metadata.gz: 013a71150cbda12647fd0f2e3d6ad97f2850d1f2
+  data.tar.gz: 8f64d3f54079265ed045b44c40e130b9a4746d21
 SHA512:
-  metadata.gz: 077925f2ca58b015d1097b7401b77ef6f8fa04aaa7aa7dc2e489f7079924b348e65071c8fc157b7d4721f426d863d17329010215ac3d3bd1fff7e9857c187761
-  data.tar.gz: 9df0820590baad9db937adcdff8957737f4d55ea0b02aab3d91205eb4b1b67b69d6cbb0626e7be0700e80449b5335a9e8304ea7a7b921af9c8591dbd8d23fcb4
+  metadata.gz: 7a8c6226624125539e56202788b6dd9bfc7216da135b5f4e771351be166f332cc8ef0cd7f0ba3c5137109c53c2fcb0a5e80f1d50c1a9b2b0844117d6a29cf019
+  data.tar.gz: 907cd8365b975128a949da19c842832708488440914f7528f0a32b687a932dd0a2c3e2d3773380c212cb633bf96dc59f8876fcb3549445c48b546da38fef48e3

data/README.md

@@ -45,11 +45,10 @@ An example of the driver options in your `.kitchen.yml` file:
         ssh_key: C:/mykeys/my_private_sshkey.pem
         username: root
         server_name: 'myserver-test'
-        hostname: 'MyProject-test01'
+        domain: softlayer.com        
         flavor_id: m1.tiny
      #  image_id: '3b235124-a190-40b5-9720-c020e61b99e1'
         os_code: 'CENTOS_7_64'
-        domain: softlayer.com
         private_network_only: true
         cpu: 1,
         ram: 1024,
@@ -77,9 +76,9 @@ For test-kitchen to access the server via ssh it needs to be on the softlayer pr
 The `image_ref` and `flavor_ref` options can be specified as an exact id,
 an exact name, or as a regular expression matching the name of the image or flavor.
 
-### hostname
+### server_name
 
-the driver checks for a server with the hostname and will use that server instead of creating another one.
+the driver checks for a server with the server_name and will use that server instead of creating another one.
 
 ### disable_ssl_validation
 
@@ -103,7 +102,6 @@ disable_ssl_validation | false | ssl validation for fog softlayer api
 username | 'root' | server's administration user
 password | nil | server's administration password
 port | '22' | ssh port of servef
-hostname| nil | hostname of server
 domain | ENV['softlayer_default_domain'] | domain nane of server
 fqdn | nil | fully qualified domain name
 cpu | nil | no of cpus
@@ -116,7 +114,7 @@ image_id | nil | image name or internal id
 ephemeral_storage | nil | storage
 network_components | nil | network
 ssh_timeout | 300 | timeout to ssh when server starting
-ssh_via_hostname | false | use hostname for ssh instead of IP
+ssh_via_hostname | false | use server_name for ssh instead of IP
 alternate_ip | nil | alternate ip address for ssh access
 destroy_wait | true | wait for destroy to complete
 destroy_timeout | 300 | timeout to wait until server destroyed

data/lib/kitchen/driver/softlayer.rb

@@ -1,4 +1,5 @@
 # Encoding: utf-8
+
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -27,7 +28,7 @@ module Kitchen
       default_config :key_name, nil
       required_config :key_name
       default_config :ssh_key do
-        %w(id_rsa id_dsa).map do |k|
+        %w[id_rsa id_dsa].map do |k|
           f = File.expand_path("~/.ssh/#{k}")
           f if File.exist?(f)
         end.compact.first
@@ -38,7 +39,6 @@ module Kitchen
       default_config :username, 'root'
       default_config :password, nil
       default_config :port, '22'
-      default_config :hostname, nil
       default_config :domain, ENV['softlayer_default_domain']
       default_config :fqdn, nil
       default_config :cpu, nil
@@ -75,12 +75,19 @@ module Kitchen
       default_config :provision_script, nil
       default_config :ssh_via_hostname, false
       default_config :alternate_ip, nil
+      default_config :connect_timeout, 120
+      default_config :read_timeout, 120
+      default_config :write_timeout, 120
 
+      # rubocop:disable Metrics/AbcSize
       def create(state)
         config_server_name
         config[:disable_ssl_validation] && disable_ssl_validation
-        server = find_server(config[:hostname])
-        server = create_server unless server
+        config[:fqdn] = "#{config[:server_name]}.#{config[:domain]}"
+        debug "fqdn: #{config[:fqdn]}"
+        debug "server_name: #{config[:server_name]}"
+        debug "server_name_prefix: #{config[:server_name_prefix]}"
+        server = create_server unless find_server(config[:fqdn])
         state[:server_id] = server.id
         info "Softlayer instance <#{state[:server_id]}> created."
         server.wait_for do
@@ -89,8 +96,9 @@ module Kitchen
         end
         info "\n(server ready)"
         tag_server(server)
+        # set state[:hostname] to be able to setup ssh using Fog::SSH
         state[:hostname] = if config[:ssh_via_hostname]
-                             config[:hostname]
+                             config[:server_name]
                            elsif config[:alternate_ip]
                              config[:alternate_ip]
                            else
@@ -111,7 +119,7 @@ module Kitchen
         wait_for_server_to_delete(state) if config[:destroy_wait]
         info "Softlayer instance <#{state[:server_id]}> destroyed."
         state.delete(:server_id)
-        state.delete(:hostname)
+        state.delete(:server_name)
       end
 
       private
@@ -175,14 +183,12 @@ module Kitchen
         )
       end
 
-      def find_server(hostname)
+      def find_server(fqdn)
         s = nil
-        servers = compute.servers.all
-        servers.each do |server|
-          if server.name == hostname
-            s = server
-            info "Server with hostname #{hostname} already created"
-          end
+        srvs = compute.servers.all.select { |x| x.fqdn == fqdn }
+        unless srvs.empty?
+          s = srvs[0]
+          info "Server with fqdn #{fqdn} already created"
         end
         s
       end
@@ -227,30 +233,30 @@ module Kitchen
         #        { 'net_id' => find_network(net).id }
         #      end
         #    end
-        [
-          :username,
-          :password,
-          :port,
-          :domain,
-          :fqdn,
-          :cpu,
-          :ram,
-          :disk,
-          :flavor_id,
-          :bare_metal,
-          :os_code,
-          :image_id,
-          :ephemeral_storage,
-          :network_components,
-          :account_id,
-          :single_tenant,
-          :global_identifier,
-          :tags,
-          :user_data,
-          :uid,
-          :vlan,
-          :private_vlan,
-          :provision_script
+        %i[
+          username
+          password
+          port
+          domain
+          fqdn
+          cpu
+          ram
+          disk
+          flavor_id
+          bare_metal
+          os_code
+          image_id
+          ephemeral_storage
+          network_components
+          account_id
+          single_tenant
+          global_identifier
+          tags
+          user_data
+          uid
+          vlan
+          private_vlan
+          provision_script
         ].each do |c|
           server_def[c] = optional_config(c) if config[c]
         end
@@ -262,7 +268,6 @@ module Kitchen
         {
           name: config[:server_name],
           key_pairs: [compute.key_pairs.by_label(config[:key_name])],
-          hostname: config[:hostname],
           datacenter: config[:datacenter],
           hourly_billing_flag: config[:hourly_billing_flag],
           private_network_only: config[:private_network_only]

data/lib/kitchen/driver/softlayer_version.rb

@@ -1,4 +1,5 @@
 # Encoding: UTF-8
+
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,6 +16,6 @@
 module Kitchen
   # Version string for Softlayer Kitchen driver
   module Driver
-    SOFTLAYER_VERSION = '0.1.0'.freeze
+    SOFTLAYER_VERSION = '1.0.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-softlayer
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-23 00:00:00.000000000 Z
+date: 2017-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen