kitchen-qemu 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae36680bcd2808d461d0d57e9be6d0c55a919c43
-  data.tar.gz: 05b1439ddc31ba48f31b607e2bb96607c428d5ab
+  metadata.gz: a4524644c5f8decc92563913b719bed878cb8481
+  data.tar.gz: 48e60f381449ce1e9b9b123d7874d24b4d5b67c2
 SHA512:
-  metadata.gz: e4013ca5ceba2813668ea367f656baa9bb6d9d7886d885c93ddf4112a32863f3796a43e0d1425735d43406203900e34c9b1b88c1f2d832f01f42b90273dd6b32
-  data.tar.gz: 029c25cec633dcd7ba9d2a7fc3ca4b5ec9a6a8be80c82691ec43bfb40a1e76fa245a2d93a60ca2e898c5af687d967f342992549dc858563ec81c627d76e9d9c3
+  metadata.gz: 82fe2072030831acf5700f87178a8a889485dc949c8254540306dd9e290be1b657fd609688765ef85e548bfde5f1c9fb47a9df7cd26686035dac62639dccc244
+  data.tar.gz: 43b5e78b3dfb446405e0f2d809b33db8281fc44636851782c421d82321bbbbef755ea60149d0e4007e14c78ef4ea1c3293d3ddd961891a96622a7163a4251797

data/lib/kitchen/driver/qemu.rb

@@ -33,13 +33,14 @@ module Kitchen
       kitchen_driver_api_version 2
       plugin_version Kitchen::Driver::QEMU_VERSION
 
-      default_config :arch,      'x86_64'
-      default_config :username,  'kitchen'
-      default_config :password,  'kitchen'
-      default_config :port,      2222
-      default_config :display,   'none'
-      default_config :memory,    '512'
-      default_config :nic_model, 'virtio'
+      default_config :arch,       'x86_64'
+      default_config :username,   'kitchen'
+      default_config :password,   'kitchen'
+      default_config :port,       2222
+      default_config :display,    'none'
+      default_config :memory,     '512'
+      default_config :nic_model,  'virtio'
+      default_config :hostshares, []
 
       required_config :image do |_attr, value, _subject|
         raise UserError, 'Must specify image file' unless value
@@ -60,6 +61,52 @@ module Kitchen
           config[:binary] = @@ARCHBINARY[config[:arch]] or
             raise UserError, "Unknown architecture '#{config[:arch]}'"
         end
+
+        # kitchen-vagrant compatibility
+        config[:hostname] = config[:vm_hostname] if config[:hostname].nil?
+
+        acpi_poweroff = false
+        if config[:image].kind_of?(String)
+          config[:image] = [{
+            :file     => config[:image],
+            :readonly => true,
+            :snapshot => true,
+          }]
+        else
+          raise UserError, "Invalid image entry for #{instance.to_str}" unless
+            config[:image].kind_of?(Array)
+          config[:image].each do |image|
+            raise UserError, "Invalid image entry for #{instance.to_str}" unless
+              image.kind_of?(Hash) && image[:file]
+            image[:snapshot] = true             if image[:snapshot].nil?
+            image[:readonly] = image[:snapshot] if image[:readonly].nil?
+            acpi_poweroff = true unless image[:readonly]
+          end
+        end
+        config[:acpi_poweroff] = acpi_poweroff if config[:acpi_poweroff].nil?
+
+        raise UserError, "Invalid share entry for #{instance.to_str}" unless
+          config[:hostshares].kind_of?(Array)
+        # kitchen-vagrant compatibility
+        if config[:hostshares].empty? && config[:synced_folders].kind_of?(Array)
+          config[:synced_folders].each do |folder|
+            if !folder[0].kind_of?(String) || !folder[1].kind_of?(String)
+              config[:hostshares].clear
+              break
+            end
+            config[:hostshares].push({ :path => folder[0], :mountpoint => folder[1] })
+          end
+        else
+          config[:hostshares].each do |share|
+            raise UserError, "Invalid share entry for #{instance.to_str}" unless
+              share.kind_of?(Hash) && share[:path]
+            raise UserError, "No mountpoint defined for share '#{share[:path]}' of #{instance.to_str}" unless
+              share[:mountpoint]
+            raise UserError, "Invalid mount options for share '#{share[:path]}' of #{instance.to_str}" unless
+              share[:mount_options].nil? || share[:mount_options].kind_of?(Array)
+          end
+        end
+
         config[:vga] = 'qxl' if config[:spice] && !config[:vga]
         self
       end
@@ -69,7 +116,7 @@ module Kitchen
       # @param state [Hash] mutable instance and driver state
       # @raise [ActionFailed] if the action could not be completed
       def create(state)
-        monitor = monitor_qmp_path
+        monitor = monitor_path
         if File.exist?(monitor)
           begin
             mon = UNIXSocket.new(monitor)
@@ -84,28 +131,24 @@ module Kitchen
 
         create_privkey or raise ActionFailed, "Unable to create file '#{privkey_path}'"
 
-        fqdn = config[:vm_hostname] || instance.name
+        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[: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,
           '-chardev', "socket,id=mon-qmp,path=#{monitor},server,nowait",
           '-mon', 'chardev=mon-qmp,mode=control,default',
-          '-chardev', "socket,id=mon-rdl,path=#{monitor_readline_path},server,nowait",
-          '-mon', 'chardev=mon-rdl,mode=readline',
+          '-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",
-          '-device', 'virtio-scsi-pci,id=scsi',
-          '-device', 'scsi-hd,drive=root',
-          '-drive', "if=none,id=root,readonly,file=#{config[:image]}",
-          '-snapshot',
         ]
 
         kvm = config[:kvm]
@@ -131,6 +174,25 @@ module Kitchen
         cmd.push('-spice', config[:spice].to_s) if config[:spice]
         cmd.push('-vnc',   config[:vnc].to_s)   if config[:vnc]
 
+        cmd.push('-device', 'virtio-scsi-pci,id=scsi')
+        config[:image].each_with_index do |image, i|
+          drive = ['if=none', "id=drive#{i}"]
+          drive.push('readonly')    if image[:readonly]
+          drive.push('snapshot=on') if image[:snapshot]
+          drive.push("file=#{image[:file]}")
+          cmd.push('-device', "scsi-hd,drive=drive#{i}",
+                   '-drive', drive.join(','))
+        end
+
+        config[:hostshares].each_with_index do |share, i|
+          path = share[:path]
+          path = "#{config[:kitchen_root]}/#{path}" unless path[0] == '/'
+          raise ActionFailed, "Share path '#{path}' not a directory" unless
+            ::File.directory?(path)
+          cmd.push('-fsdev', "local,id=fsdev#{i},security_model=none,path=#{path}",
+                   '-device', "virtio-9p-pci,fsdev=fsdev#{i},mount_tag=path#{i}")
+        end
+
         info 'Spawning QEMU..'
         error = nil
         Open3.popen3({ 'QEMU_AUDIO_DRV' => 'none' }, *cmd) do |_, _, err, thr|
@@ -155,6 +217,11 @@ module Kitchen
         conn.execute("sudo sh -c 'echo 127.0.0.1 #{names} >> /etc/hosts; hostnamectl set-hostname #{hostname} || hostname #{hostname} || true' 2>/dev/null")
         conn.execute('install -dm700 "$HOME/.ssh"')
         conn.execute("echo '#{@@PUBKEY}' > \"$HOME/.ssh/authorized_keys\"")
+        config[:hostshares].each_with_index do |share, i|
+          options = share[:mount_options] ?
+            share[:mount_options].join(',') : 'cache=none,access=any,version=9p2000.L'
+          conn.execute("sudo sh -c 'install -dm755 \"#{share[:mountpoint]}\" && mount -t 9p -o trans=virtio,#{options} path#{i} \"#{share[:mountpoint]}\"'")
+        end
         conn.close
         state[:ssh_key] = privkey_path
       end
@@ -164,16 +231,22 @@ module Kitchen
       # @param state [Hash] mutable instance state
       # @raise [ActionFailed] if the action could not be completed
       def destroy(state)
-        monitor = monitor_qmp_path
+        monitor = monitor_path
         return unless File.exist?(monitor)
 
         instance.transport.connection(state).close
 
         begin
           mon = QMPClient.new(UNIXSocket.new(monitor), 2)
-          info 'Quitting QEMU..'
-          mon.execute('quit')
-          mon.wait_for_eof(5)
+          if state[:acpi_poweroff]
+            info 'Sending ACPI poweroff..'
+            mon.execute('system_powerdown')
+            mon.wait_for_eof(30)
+          else
+            info 'Quitting QEMU..'
+            mon.execute('quit')
+            mon.wait_for_eof(5)
+          end
           mon.close
         rescue Errno::ECONNREFUSED
           info 'Connection to monitor refused. Assuming QEMU already quit.'
@@ -231,11 +304,11 @@ tY4IM9IaSC2LuPFVc0Kx6TwObdeQScOokIxL3HfayfLKieTLC+w2
         File.join(config[:kitchen_root], '.kitchen', 'kitchen-qemu.key')
       end
 
-      def monitor_qmp_path
+      def monitor_path
         File.join(config[:kitchen_root], '.kitchen', "#{instance.name}.qmp")
       end
 
-      def monitor_readline_path
+      def serial_path
         File.join(config[:kitchen_root], '.kitchen', "#{instance.name}.mon")
       end
 
@@ -247,12 +320,12 @@ tY4IM9IaSC2LuPFVc0Kx6TwObdeQScOokIxL3HfayfLKieTLC+w2
 
       def cleanup!
         begin
-          File.delete(monitor_qmp_path)
+          File.delete(monitor_path)
         rescue Errno::ENOENT
           # do nothing
         end
         begin
-          File.delete(monitor_readline_path)
+          File.delete(serial_path)
         rescue Errno::ENOENT
           # do nothing
         end

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.1.3'
+    QEMU_VERSION = '0.2.0'
   end
 end

metadata

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