fog-libvirt 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73ae93cf9265f32976862d636f428a15e3f2251a
-  data.tar.gz: d2145c959320d0896a7bfb1adbc65f3832772a17
+  metadata.gz: 4afcefce8f2992462c7cf5d12ac7ffc9cd38f4cd
+  data.tar.gz: 9fa64b79e0aaad64571f7bc97e3a0dce4d093e18
 SHA512:
-  metadata.gz: 42e3e30eaa431dca165573516c8c987d4c7562e57820edb1b4aab8aa4ea78747dffce9e7232ea8be9feb65d342876a7b218b12d39bfd474544abd1e07168c9cc
-  data.tar.gz: 940aa734cf58a59b24d424b43418407e4ad6d04d3b84f7e9ac22fa7aef608208b7b2b2de4a92408d36969516e6b6ba194cbce01290654545ffd16aad073381a4
+  metadata.gz: c744b112ac1546eca142ca8792ba010a272cf82e7ba58e8163f11397c8f634cd64281fe5a5c52468fb5bfe1c9d71e97676113ccf18e292382a4ef33d64393663
+  data.tar.gz: ad1ec45643362138a52382e17fb297eef06b6bdfd589e13f7d075f1747068c6ea8749ed7683d2336a69e9f794d546894d3e23340f23a2f50c1129257acf7c8b1

data/CONTRIBUTORS.md

@@ -21,3 +21,4 @@
 * Steve Smith <github@scsworld.co.uk>
 * Vincent Demeester <vincent+git@demeester.fr>
 * Wesley Beary <geemus@gmail.com>
+* Tomer Brisker <tbrisker@redhat.com>

data/lib/fog/libvirt/models/compute/server.rb

@@ -27,6 +27,7 @@ module Fog
         attribute :active
         attribute :boot_order
         attribute :display
+        attribute :cpu
 
         attribute :state
 
@@ -186,7 +187,7 @@ module Fog
 
           credentials[:proxy]= ssh_proxy unless ssh_proxy.nil?
           credentials[:password] = password unless self.password.nil?
-          credentails[:key_data] = [private_key] if self.private_key
+          credentials[:key_data] = [private_key] if self.private_key
 
           commands = [
             %{mkdir .ssh},
@@ -236,7 +237,7 @@ module Fog
 
           isofile = Tempfile.new(['init', '.iso']).path
           unless system("genisoimage -output #{isofile} -volid cidata -joliet -rock #{File.join(dir_path, 'user-data')} #{File.join(dir_path, 'meta-data')}")
-            raise Fog::Errors::Error("Couldn't generate cloud-init iso disk.")
+            raise Fog::Errors::Error.new("Couldn't generate cloud-init iso disk with genisoimage.")
           end
           blk.call(isofile)
         end
@@ -347,7 +348,8 @@ module Fog
             :network_nat_network    => "default",
             :network_bridge_name    => "br0",
             :boot_order             => %w[hd cdrom network],
-            :display                => default_display
+            :display                => default_display,
+            :cpu                    => {}
           }
         end
 

data/lib/fog/libvirt/models/compute/templates/server.xml.erb

@@ -13,6 +13,23 @@
     <apic/>
     <pae/>
   </features>
+<% if !cpu.empty? -%>
+<% if cpu[:mode] -%>
+  <cpu mode='<%= cpu[:mode] %>'>
+<% else -%>
+  <cpu>
+<% end -%>
+<%
+  fallback = 'allow'
+  model = ''
+  if cpu[:model]
+    fallback = cpu[:model][:fallback] if cpu[:model][:fallback]
+    model    = cpu[:model][:name]     if cpu[:model][:name]
+  end
+-%>
+    <model fallback='<%= fallback %>'><%= model %></model>
+  </cpu>
+<% end -%>
   <clock offset='utc'/>
   <devices>
 <% volumes.each do |vol| -%>
@@ -46,7 +63,26 @@
     </console>
     <input type='tablet' bus='usb'/>
     <input type='mouse' bus='ps2'/>
-    <graphics type='<%= display[:type] %>' port='<%= display[:port] %>' autoport='yes' <% if display[:listen] and !(display[:listen].empty?)  %> listen='<%= display[:listen] %>'<% end %> <% if display[:password] and !(display[:password].empty?) %>passwd='<%=display[:password] %>'<% end %> />
+<%
+display_type = display[:type]
+
+if display[:port].empty?
+  display_port = display[:port]
+  autoport = 'no'
+else
+  display_port = '-1'
+  autoport = 'yes'
+end
+
+unless display[:listen].empty?
+  display_listen = "listen='#{display[:listen]}'"
+end
+
+unless display[:password].empty?
+  display_password = "passwd='#{display[:password]}'"
+end
+-%>
+    <graphics type='<%= display_type %>' port='<%= display_port %>' autoport='<%= autoport %>' <%= display_listen %> <%= display_password %> />
     <video>
       <model type='cirrus' vram='9216' heads='1'/>
     </video>

data/lib/fog/libvirt/requests/compute/update_display.rb

@@ -4,17 +4,21 @@ module Fog
       class Real
         def update_display(options = { })
           raise ArgumentError, "uuid is a required parameter" unless options.key? :uuid
+
+          domain = client.lookup_domain_by_uuid(options[:uuid])
+
           display          = { }
           display[:type]   = options[:type] || 'vnc'
           display[:port]   = (options[:port] || -1).to_s
           display[:listen] = options[:listen].to_s   if options[:listen]
           display[:passwd] = options[:password].to_s if options[:password]
           display[:autoport] = 'yes' if display[:port] == '-1'
+          display[:keymap] = options[:keymap] || xml_elements(domain.xml_desc, "graphics", "keymap")
 
           builder = Nokogiri::XML::Builder.new { graphics_ (display) }
           xml     = Nokogiri::XML(builder.to_xml).root.to_s
 
-          client.lookup_domain_by_uuid(options[:uuid]).update_device(xml, 0)
+          domain.update_device(xml, 0)
           # if we got no exceptions, then we're good'
           true
         end

data/lib/fog/libvirt/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Libvirt
-    VERSION = '0.3.0'
+    VERSION = '0.4.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - geemus (Wesley Beary)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-24 00:00:00.000000000 Z
+date: 2017-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -317,7 +317,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 2
 summary: Module for the 'fog' gem to support libvirt
@@ -344,4 +344,3 @@ test_files:
 - tests/libvirt/requests/compute/define_domain_tests.rb
 - tests/libvirt/requests/compute/dhcp_leases_tests.rb
 - tests/libvirt/requests/compute/update_display.rb
-has_rdoc: