kitchen-qemu 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4524644c5f8decc92563913b719bed878cb8481
-  data.tar.gz: 48e60f381449ce1e9b9b123d7874d24b4d5b67c2
+  metadata.gz: 4e90136f51889ebc9d9061dbbe2211746ef3d1f6
+  data.tar.gz: 3cc82a8034acdc525ae04d017b74f7aecc5a1fa3
 SHA512:
-  metadata.gz: 82fe2072030831acf5700f87178a8a889485dc949c8254540306dd9e290be1b657fd609688765ef85e548bfde5f1c9fb47a9df7cd26686035dac62639dccc244
-  data.tar.gz: 43b5e78b3dfb446405e0f2d809b33db8281fc44636851782c421d82321bbbbef755ea60149d0e4007e14c78ef4ea1c3293d3ddd961891a96622a7163a4251797
+  metadata.gz: d93624e70a7c938103cab552902e656f7ff0f0e81f16d5c2a35a1bdb2eaeb69924d6548b6f0c03cff6acda2d9ba4c278118153f4ae60ebe8476eef8224d45c56
+  data.tar.gz: 81e0ed59f7c674b6d8feeb65cd3cf27b560491a08d054f310c6945381c91d3c4a105bb4eb796cb73a1db01a50cba84f895f2cee0cbd67b21088fc881d652ac55

data/lib/kitchen/driver/qemu.rb

@@ -15,6 +15,7 @@
 # along with kitchen-qemu.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'open3'
+require 'socket'
 
 require 'kitchen'
 require 'kitchen/driver/qemu_version'
@@ -36,7 +37,8 @@ module Kitchen
       default_config :arch,       'x86_64'
       default_config :username,   'kitchen'
       default_config :password,   'kitchen'
-      default_config :port,       2222
+      default_config :port_min,   1025
+      default_config :port_max,   65535
       default_config :display,    'none'
       default_config :memory,     '512'
       default_config :nic_model,  'virtio'
@@ -134,12 +136,6 @@ module Kitchen
         fqdn = config[:hostname] || instance.name
         hostname = fqdn.match(/^([^.]+)/)[0]
 
-        state[:hostname]      = 'localhost'
-        state[:port]          = config[:port]
-        state[:username]      = config[:username]
-        state[:password]      = config[:password]
-        state[:acpi_poweroff] = config[:acpi_poweroff]
-
         cmd = [
           config[:binary], '-daemonize',
           '-display', config[:display].to_s,
@@ -147,8 +143,6 @@ module Kitchen
           '-mon', 'chardev=mon-qmp,mode=control,default',
           '-serial', "mon:unix:path=#{serial_path},server,nowait",
           '-m', config[:memory].to_s,
-          '-net', "nic,model=#{config[:nic_model]}",
-          '-net', "user,net=192.168.1.0/24,hostname=#{hostname},hostfwd=tcp::#{state[:port]}-:22",
         ]
 
         kvm = config[:kvm]
@@ -193,6 +187,13 @@ module Kitchen
                    '-device', "virtio-9p-pci,fsdev=fsdev#{i},mount_tag=path#{i}")
         end
 
+        port = config[:port]
+        port = random_free_port('127.0.0.1', config[:port_min], config[:port_max]) if port.nil?
+        cmd.push(
+          '-net', "nic,model=#{config[:nic_model]}",
+          '-net', "user,net=192.168.1.0/24,hostname=#{hostname},hostfwd=tcp::#{port}-:22",
+        )
+
         info 'Spawning QEMU..'
         error = nil
         Open3.popen3({ 'QEMU_AUDIO_DRV' => 'none' }, *cmd) do |_, _, err, thr|
@@ -205,6 +206,12 @@ module Kitchen
           raise ActionFailed, error
         end
 
+        state[:hostname]      = '127.0.0.1'
+        state[:port]          = port
+        state[:username]      = config[:username]
+        state[:password]      = config[:password]
+        state[:acpi_poweroff] = config[:acpi_poweroff]
+
         if hostname == fqdn
           names = fqdn
         else
@@ -318,6 +325,20 @@ tY4IM9IaSC2LuPFVc0Kx6TwObdeQScOokIxL3HfayfLKieTLC+w2
         File.open(path, File::CREAT|File::TRUNC|File::RDWR, 0600) { |f| f.write(@@PRIVKEY) }
       end
 
+      def random_free_port(host, min, max)
+        loop do
+          port = rand(max - min) + min
+          begin
+            serv = TCPServer.new(host, port)
+          rescue Errno::EADDRINUSE
+            # do nothing
+          else
+            serv.close
+            return port
+          end
+        end
+      end
+
       def cleanup!
         begin
           File.delete(monitor_path)

data/lib/kitchen/driver/qemu_version.rb

@@ -17,6 +17,6 @@
 module Kitchen
   module Driver
     # Version string for the QEMU Kitchen driver
-    QEMU_VERSION = '0.2.0'
+    QEMU_VERSION = '0.2.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-qemu
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Emil Renner Berthing
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-07 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen