fog-libvirt 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd4818202dc374ba257cfa9bea0403ba47121382
-  data.tar.gz: f79c02e9ff1d325c21ce21027825a142ee831560
+  metadata.gz: 73ae93cf9265f32976862d636f428a15e3f2251a
+  data.tar.gz: d2145c959320d0896a7bfb1adbc65f3832772a17
 SHA512:
-  metadata.gz: 5f08db40265498d09d6452db9f6bd7c08243a914b2ddb54f5ed90cb61ef8dde0a09a4ae2a718b17ac2d771383e8fcf4d0465132c1b313f2e25938f6cbebff4a4
-  data.tar.gz: 0599db4dc3d668b409e567170eef1319b0a499d8261309f721852bd8a1e30cf64f16579e0750cfb3ede34390b4f5a51979d257a3bbe7b38fc91d9a0ed86d96ee
+  metadata.gz: 42e3e30eaa431dca165573516c8c987d4c7562e57820edb1b4aab8aa4ea78747dffce9e7232ea8be9feb65d342876a7b218b12d39bfd474544abd1e07168c9cc
+  data.tar.gz: 940aa734cf58a59b24d424b43418407e4ad6d04d3b84f7e9ac22fa7aef608208b7b2b2de4a92408d36969516e6b6ba194cbce01290654545ffd16aad073381a4

data/fog-libvirt.gemspec

@@ -26,20 +26,26 @@ Gem::Specification.new do |s|
   s.add_dependency("fog-core", "~> 1.27", ">= 1.27.4")
   s.add_dependency("fog-json")
   s.add_dependency("fog-xml", "~> 0.1.1")
-  s.add_dependency('ruby-libvirt','>= 0.5.0', '< 0.7.0')
+  s.add_dependency('ruby-libvirt','>= 0.7.0')
   s.add_dependency('mime-types','< 2.0') if RUBY_VERSION < '1.9'
   s.add_dependency('nokogiri', '< 1.6') if RUBY_VERSION < '1.9'
   s.add_dependency('octokit', '< 3.0') if RUBY_VERSION < '1.9'
   s.add_dependency('rest-client', '<= 1.7.0') if RUBY_VERSION < '1.9'
+  s.add_dependency("tins", "<= 1.6.0") if RUBY_VERSION < "1.9"
 
-  # Fedora and derivates need explicit require
-  s.add_dependency("json")
+  # Fedora and derivates need explicit require.
+  # Also we cannot use newer JSON on Ruby 1.8 & 1.9.
+  if RUBY_VERSION < '2.0'
+    s.add_dependency("json", '< 2.0')
+  else
+    s.add_dependency("json")
+  end
 
   s.add_development_dependency("minitest")
   s.add_development_dependency("minitest-stub-const")
   s.add_development_dependency("pry")
   s.add_development_dependency("rake")
-  s.add_development_dependency("rubocop") if RUBY_VERSION > "1.9"
+  s.add_development_dependency("rubocop") if RUBY_VERSION > "2.0"
   s.add_development_dependency("shindo", "~> 0.3.4")
   s.add_development_dependency("simplecov")
   s.add_development_dependency("yard")

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

@@ -346,19 +346,16 @@ module Fog
             :network_interface_type => "network",
             :network_nat_network    => "default",
             :network_bridge_name    => "br0",
-            :boot_order             => default_boot_order,
+            :boot_order             => %w[hd cdrom network],
             :display                => default_display
           }
         end
 
-        def default_boot_order
-          %w[hd cdrom network]
-        end
-
         def verify_boot_order order = []
+          valid_boot_media = %w[cdrom fd hd network]
           if order
             order.each do |b|
-              raise "invalid boot order, possible values are: hd, network and/or cdrom" unless default_boot_order.include?(b)
+              raise "invalid boot order, possible values are any combination of: #{valid_boot_media.join(', ')}" unless valid_boot_media.include?(b)
             end
           end
         end

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

@@ -10,11 +10,21 @@ module Fog
           elsif filter.key?(:name)
             data << client.lookup_domain_by_name(filter[:name])
           else
-            client.list_defined_domains.each { |name| data << client.lookup_domain_by_name(name) } unless filter[:defined] == false
-            client.list_domains.each { |id| data << client.lookup_domain_by_id(id) } unless filter[:active] == false
+            client.list_defined_domains.each { |name| data << catchLibvirtExceptions { client.lookup_domain_by_name(name) } } unless filter[:defined] == false
+            client.list_domains.each { |id| data << catchLibvirtExceptions { client.lookup_domain_by_id(id) } } unless filter[:active] == false
           end
           data.compact.map { |d| domain_to_attributes d }.compact
         end
+
+        # Catch Libvirt exceptions to avoid race conditions involving
+        # concurrent libvirt operations from other processes. For example,
+        # domains being undefined while fog-libvirt is trying to work with
+        # domain lists.
+        def catchLibvirtExceptions
+          yield
+        rescue ::Libvirt::RetrieveError, ::Libvirt::Error
+          nil
+        end
       end
 
       module Shared

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

@@ -11,7 +11,7 @@ module Fog
           stream.sendall do |_opaque, n|
             begin
               r = image_file.read(n)
-              [r.length < n ? 0 : r.length, r]
+              r ? [r.length, r] : [0, ""]
             rescue Exception => e
               [-1, ""]
             end

data/lib/fog/libvirt/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - geemus (Wesley Beary)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-18 00:00:00.000000000 Z
+date: 2016-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -63,9 +63,6 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.0
-    - - "<"
       - !ruby/object:Gem::Version
         version: 0.7.0
   type: :runtime
@@ -73,9 +70,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.0
-    - - "<"
       - !ruby/object:Gem::Version
         version: 0.7.0
 - !ruby/object:Gem::Dependency
@@ -323,7 +317,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 2
 summary: Module for the 'fog' gem to support libvirt