ovirt 0.15.1 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f1291e7052af708971542c29b9676d305eb2a93
-  data.tar.gz: e8a451d1d92e40b5e41aeb0578ee7f94fd3f0009
+  metadata.gz: ca8376a9e571b169ccc200f2253351d25bdf372f
+  data.tar.gz: fb7e94f300d6b15fe516abd9863fc8ded1e48de5
 SHA512:
-  metadata.gz: e0ac2e628c80665ab358fbb31dd32bc298831ace60e975eb6909627526280139d289b868e8feea694a9bb5201b563c925e1d53ddd23c00194540be95f03e8ee9
-  data.tar.gz: ef088b6b423f3052ce2991c38ad473b45656b75b6505a1648c90125ce762b3383bdac3e92b8eff5bfe7575cac1bd4c4ed4e27fc2e0612ceae0aec195fb54000c
+  metadata.gz: 718d159c9f4843c3e27d0e74d36423581f963bed85fc1b46f6f3d73783544f42feca09d5eae83185f0803419b535e5073fc4afe78ea5cb26ee4fe694254398ce
+  data.tar.gz: 145272f9111a8cbe13cfdc3888035db4bb713360395f3ae8132b243770e67ff55cb9d06cf5ca20956e9623c23071d120e91b9e21d7192e39f4b60d2dc2271d7c

data/lib/ovirt/version.rb

@@ -1,3 +1,3 @@
 module Ovirt
-  VERSION = "0.15.1".freeze
+  VERSION = "0.16.0".freeze
 end

data/lib/ovirt/vm.rb

@@ -181,10 +181,9 @@ module Ovirt
     def payload_version
       version = service.version
 
-      if version[:major].to_i >= 3
-        return "3_0" if version[:minor].to_i < 3
-        return "3_3"
-      end
+      # Note that in this context "3_3" actually means 3.3 *or newer*, including 3.6 and 4.0.
+      return "3_0" if version[:major].to_i == 3 && version[:minor].to_i < 3
+      "3_3"
     end
 
     def attach_payload_3_0(payloads)
@@ -304,6 +303,9 @@ module Ovirt
         gi.xpath('ips/ip').each do |ip|
           ips << {:address => ip[:address]}
         end
+
+        fqdn = gi.xpath('fqdn').text
+        hash[:guest_info][:fqdn] = fqdn unless fqdn.blank?
       end
 
       hash

data/spec/vm_spec.rb

@@ -484,4 +484,31 @@ EOX
       vm.cloud_init = cloud_config
     end
   end
+
+  context "#payload_version" do
+    it "returns 3_0 for version older than 3.3" do
+      expect(service).to receive(:version).and_return(:major => "3", :minor => "1")
+      expect(vm.payload_version).to eql("3_0")
+    end
+
+    it "returns 3_3 for version equal to 3.3" do
+      expect(service).to receive(:version).and_return(:major => "3", :minor => "3")
+      expect(vm.payload_version).to eql("3_3")
+    end
+
+    it "returns 3_3 for version 3.6" do
+      expect(service).to receive(:version).and_return(:major => "3", :minor => "6")
+      expect(vm.payload_version).to eql("3_3")
+    end
+
+    it "returns 3_3 for version 4.0" do
+      expect(service).to receive(:version).and_return(:major => "4", :minor => "0")
+      expect(vm.payload_version).to eql("3_3")
+    end
+
+    it "returns 3_3 for version 4.1" do
+      expect(service).to receive(:version).and_return(:major => "4", :minor => "1")
+      expect(vm.payload_version).to eql("3_3")
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ovirt
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.16.0
 platform: ruby
 authors:
 - Jason Frey
@@ -25,7 +25,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-22 00:00:00.000000000 Z
+date: 2017-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -244,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Ovirt provides a simple Object Oriented interface to the REST API of oVirt