kitchen-softlayer 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff2b5f39f21a280384e2ce4d34577167122ed69b
-  data.tar.gz: 0f7bfc6d310e7f2157cbc871af048926009771c5
+  metadata.gz: b2970baee9c2a2f9df34f646297aaaea4098166a
+  data.tar.gz: 39be4922d63ed46addb9437c664c0f73ee3eb884
 SHA512:
-  metadata.gz: b35ee4c32f8f5f864899e95bf4532372d17e8d76089d3b11c12b8cf5e61646659dcbe0bf17cbc6f058720226421e001defa18246303032cb16bc3b5d2f295334
-  data.tar.gz: e54599699ea0a656ebcfb232b9c77fb4b62c8dd2bb4cdb0525f5d20ae0849a6a9793b881e643528054240e67f68c6818a532b7e2e9114105a4bb013b02103511
+  metadata.gz: fd8e31927b71615585a9502298454735d9e48dbeccef8545d9b9514d8123b8a5431c4104670620dd5986c88b22b89189fcd227585242c94cca1f63f4177e2d0b
+  data.tar.gz: 4465cc309e97b46ed3580d25df07791dcc6a1bde2c569e72716c181f4def63f5c4bc1cc69ad263a5d2af6aed34c13cc2a2e5be16264c4f7a6036a10799f63898

data/README.md

@@ -111,7 +111,7 @@ disk | nil | disk size
 flavor_id | nil | type of server i.e. m1.tiny
 bare_metal | false | server to be created on bare metal (takes longer)
 os_code | nil | softlayer's operating System Reference Code
-image_id | nil | image id for server
+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
@@ -127,12 +127,10 @@ private_network_only | false | if only a private network
 use_private_ip_with_public_network | false | otherwise uses public ip
 user_data | nil | user data for server
 uid | nil | softlayer global id
-vlan | nil | numeric id of private_vlan for server
+vlan | nil | numeric id of vlan for server
 private_vlan | nil | numeric id of private_vlan for server
 provision_script | nil | url of provision script to run
 
-NOTE: provision_script parameter needs pull request [#73](https://github.com/fog/fog-softlayer/pull/73)
-
 ## Contributing
 
 1. Fork it

data/lib/kitchen/driver/softlayer.rb

@@ -167,6 +167,37 @@ module Kitchen
         s
       end
 
+      def find_image(image_name)
+        id = nil
+        images = compute.images.all
+        images.each do |image|
+          if image.name == image_name
+            id = image.id
+            debug "Found public image #{id} for name #{image_name}"
+          end
+        end
+        images = compute.images.private
+        images.each do |image|
+          if image.name == image_name
+            id = image.id
+            debug "Found private image #{id} for name #{image_name}"
+          end
+        end
+        fail "No image found with name #{image_name}" if id.nil?
+        id
+      end
+
+      def find_network(vlan)
+        debug "Looking for network for vlan number #{vlan}"
+        response = network.list_networks
+        response.body.each do |r|
+          next unless r['vlanNumber'] == vlan
+          debug "Found network id #{r['id']} for vlan number #{r['vlanNumber']}"
+          return r['id']
+        end
+        fail "No network found for vlan number #{r['vlanNumber']}"
+      end
+
       def create_server
         server_def = init_configuration
         #   TODO: figure out network options
@@ -222,6 +253,13 @@ module Kitchen
         case c
         when :user_data
           File.open(config[c]).read if File.exist?(config[c])
+        when :vlan
+          find_network(config[c])
+        when :private_vlan
+          find_network(config[c])
+        when :image_id
+          return config[c] if config[c].match('^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}')
+          find_image(config[c])
         else
           config[c]
         end

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.4'
+    SOFTLAYER_VERSION = '0.0.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-softlayer
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-16 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen