kitchen-qemu 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb38771a7b4755414d61c8766b9503fc79cce395
-  data.tar.gz: 6aec6dcc6dabcb1b6dfaaf4b9ab39c9a50aa4f47
+  metadata.gz: 8dd24ef6c0204e58e644cca85f42a7bec9e0fc75
+  data.tar.gz: 4840059137e31c53f4327582b39c6cb173d767ae
 SHA512:
-  metadata.gz: 5ab29a56d741c00fb0bbfc41eaf470a0274bc5a33df3d70ff891e563a044fb31e40c7efc88f5b84737d792f3930de3370f64639b54ae95dd2302fc3419243568
-  data.tar.gz: 49f495ef2d79e9b53106a217c475a19808b5fd1f405af98bcb14647892ecb7bcf106119a8802ebb739776be3f147ddbfeb17e436fa00a578a92618e174c97914
+  metadata.gz: af40db104231ae9fc40c536adf0041b7a4209c8105b344bcc7d54917b6eaf4120443056ab0279ffcd17bd80be6f1d6a452b9e31dfbba90f0227720248b34c8cb
+  data.tar.gz: c5abe718f9d579b699cc2deaa38beb0ec2f46d9426395d185bca3b207aca3226b22c7f83ee5411c38ba8ece4542e533120f1f781c5f20972b1397f0fb46183fa

data/lib/kitchen/driver/qemu.rb

@@ -41,7 +41,6 @@ module Kitchen
       default_config :port_max,   65535
       default_config :display,    'none'
       default_config :memory,     '512'
-      default_config :nic_model,  'virtio'
       default_config :hostshares, []
 
       default_config :image_path do |_|
@@ -79,6 +78,24 @@ module Kitchen
         # kitchen-vagrant compatibility
         config[:hostname] = config[:vm_hostname] unless config.has_key?(:hostname)
 
+        # add default network
+        if !config.has_key?(:networks)
+          config[:networks] = [{
+            :netdev => 'user,id=user,net=192.168.1.0/24,hostname=%h,hostfwd=tcp::%p-:22',
+            :device => 'virtio-net-pci,netdev=user',
+          }]
+        else
+          raise UserError, "Invalid network entry for #{instance.to_str}" unless
+            config[:networks].kind_of?(Array)
+
+          config[:networks].each_with_index do |network, i|
+            raise UserError, "Invalid network entry #{i+1} for #{instance.to_str}" unless
+              network.kind_of?(Hash) && network[:device].kind_of?(String)
+            raise UserError, "Invalid network entry #{i+1} for #{instance.to_str}" if
+              network.has_key?(:device) && !network[:device].kind_of?(String)
+          end
+        end
+
         acpi_poweroff = false
         if config[:image].kind_of?(String)
           config[:image] = [{
@@ -185,6 +202,18 @@ module Kitchen
           info 'KVM disabled'
         end
 
+        port = config[:port]
+        port = random_free_port('127.0.0.1', config[:port_min], config[:port_max]) if port.nil?
+        config[:networks].each do |network|
+          cmd.push(
+            '-netdev',
+            network[:netdev]
+              .gsub(/hostfwd=[^,]*/) { |x| x.gsub('%p', port.to_s) }
+              .gsub(/hostname=%h/, "hostname=#{hostname}")
+          ) if network[:netdev]
+          cmd.push('-device', network[:device])
+        end
+
         cmd.push('-vga',   config[:vga].to_s)   if config[:vga]
         cmd.push('-spice', config[:spice].to_s) if config[:spice]
         cmd.push('-vnc',   config[:vnc].to_s)   if config[:vnc]
@@ -224,13 +253,6 @@ 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|

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.5'
+    QEMU_VERSION = '0.2.6'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-qemu
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Emil Renner Berthing
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-19 00:00:00.000000000 Z
+date: 2016-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen