qemu-toolkit 0.5.0 → 0.5.1

data/lib/qemu-toolkit/vm.rb

@@ -214,7 +214,7 @@ module QemuToolkit
         if model == 'virtio'
           cmd << '-device virtio-net-pci,'+
             parameter_list(
-              mac: macaddr, 
+              mac: vnic.macaddr, 
               tx: 'timer', x_txtimer: 200000, x_txburst: 128, 
               vlan: vlan) 
         else
@@ -222,7 +222,7 @@ module QemuToolkit
             parameter_list(
               vlan: vlan, name: nic_name, 
               model: model,
-              macaddr: macaddr)
+              macaddr: vnic.macaddr)
         end
 
         vlan += 1
@@ -230,6 +230,8 @@ module QemuToolkit
       
       # networking: net
       nets.each do |type, parameters|
+        map(parameters, :macaddr) { |a| Network::MacAddress.new(a) }
+        
         cmd << "-net #{type},"+
           parameter_list(parameters)
       end
@@ -338,6 +340,13 @@ module QemuToolkit
       socket.close
     end
   
+    # Maps a key from a hash to a new value returned by the block. 
+    #
+    def map hash, key, &block
+      return unless hash.has_key? key
+      hash[key] = block.call(hash[key])
+    end
+  
     def socket_chardev(name, path)
       "-chardev socket,id=#{name},path=#{path},server,nowait"
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qemu-toolkit
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-26 00:00:00.000000000 Z
+date: 2013-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -92,9 +92,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Manages QEMU kvm virtual machines on Illumos hosts.
 test_files: []
-has_rdoc: