ovirt 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d19cf0b487e8c1dcb5745dfb0f95cdf74d1d8d6d
-  data.tar.gz: 4f108899a953512df3a0b6c3d60a690d26a4abf0
+  metadata.gz: 71f1b7bb31e4d2232067a664b1a7c69b89ef97f1
+  data.tar.gz: f64da9916927aab357ba1b3afb33584f41edc5ed
 SHA512:
-  metadata.gz: a2a468b2dca4fabb50842d9dfaf1c1cafb614496ca40fa18823fe364f1ba968adba5650e853c1cf66992929b9766c13a9fd31b7cb8f16287a51063effe6d9610
-  data.tar.gz: c5b3a92c5dfabbaeaeadaeb49bb9853d025a6120b79e7470a964a02583fe8137fe51c1e9e9e5197f46417108409af9fcbbf580ccb732c4092ae2d55ed6308553
+  metadata.gz: f00947dba22ddf24e1ed1e1653aa02b1b7a8b5aaccbac6af1dd4d206f80a737fe4acd716b1b8c207b6fe4ddc6b04a86a32f989ae31d278b67b6648be88925522
+  data.tar.gz: add18edf2497bad5478a0dfced3d550332b0e5ada97e88d1702666e64c1404e02d621a49552c82c7f9fdeb267dcc79dc36a8fcf9f0109519903450c582daec9d

data/lib/ovirt/api.rb

@@ -2,7 +2,7 @@ module Ovirt
   class Api < Base
     def self.parse_node_extended(node, hash)
       parse_first_node(node, :product_info, hash,
-                       :node => [:name, :vendor])
+                       :node => [:name, :vendor, :full_version])
 
       parse_first_node_with_hash(node, 'product_info/version', hash[:product_info][:version] = {},
                                  :attribute => [:major, :minor, :build, :revision])

data/lib/ovirt/service.rb

@@ -52,7 +52,8 @@ module Ovirt
     end
 
     def version
-      @version ||= product_info[:version]
+      # HACK: using full_version if available due to version being wrong, https://bugzilla.redhat.com/show_bug.cgi?id=1284654
+      @version ||= full_version || product_info[:version]
     end
 
     def version_string
@@ -336,5 +337,12 @@ module Ovirt
         end
       end
     end
+
+    def full_version
+      v = product_info[:full_version]
+      return if v.blank?
+      v = v.sub("-", ".").split(".")[0..3]
+      Hash[[:major, :minor, :revision, :build].zip(v)]
+    end
   end
 end

data/lib/ovirt/version.rb

@@ -1,3 +1,3 @@
 module Ovirt
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/lib/ovirt/vm.rb

@@ -367,8 +367,7 @@ module Ovirt
       require 'yaml'
       raw_content          = YAML.load(content)
       hash                 = ovirt_cloud_init_keys.each_with_object({}) { |k, h| h[k] = raw_content.delete(k) }
-      custom_script        = YAML.dump(raw_content).to_s.sub("---\n", "")
-      hash[:custom_script] = custom_script unless custom_script.blank?
+      hash[:custom_script] = YAML.dump(raw_content).sub("---\n", "") if raw_content.present?
       hash.delete_nils
     end
   end

data/spec/service_spec.rb

@@ -101,4 +101,16 @@ EOX
       expect(subject).to eq("https://nobody.com:443")
     end
   end
+
+  context "#version" do
+    it "with :full_version" do
+      allow(service).to receive(:product_info).and_return(:full_version => "3.4.5-0.3.el6ev", :version => {:major => "3", :minor => "4", :build => "0", :revision => "0"})
+      expect(service.version).to eq(:major => "3", :minor => "4", :revision => "5", :build => "0")
+    end
+
+    it "without :full_version" do
+      allow(service).to receive(:product_info).and_return(:version => {:major => "3", :minor => "4", :build => "0", :revision => "0"})
+      expect(service.version).to eq(:major => "3", :minor => "4", :revision => "0", :build => "0")
+    end
+  end
 end

data/spec/vm_spec.rb

@@ -287,26 +287,9 @@ EOX
     end
   end
 
-  it "cloud_init= Ovirt 3.4 and newer" do
-    cloud_config = <<-EOCC.chomp
-#cloud_config
-regenerate_ssh_keys: false
-root_password: some_password
-fqdn: example.example.com
-debug: True
-EOCC
-
-    expected_data = <<-EOX.chomp
-<vm>
-  <initialization>
-    <regenerate_ssh_keys>false</regenerate_ssh_keys>
-    <root_password>some_password</root_password>
-    <custom_script>fqdn: example.example.com\ndebug: true\n</custom_script>
-  </initialization>
-</vm>
-EOX
-
-    return_data = <<-EOX.chomp
+  context "#cloud_init= Ovirt 3.4 and newer" do
+    let(:return_data) do
+      <<-EOX.chomp
 <vm href="/api/vms/128f9ffd-b82c-41e4-8c00-9742ed173bac" id="128f9ffd-b82c-41e4-8c00-9742ed173bac">
   <name>bd-skeletal-clone-from-template</name>
   <cpu>
@@ -325,9 +308,51 @@ EOX
   </memory_policy>
 </vm>
 EOX
+    end
+
+    it "with custom_script" do
+      cloud_config = <<-EOCC.chomp
+#cloud_config
+regenerate_ssh_keys: false
+root_password: some_password
+fqdn: example.example.com
+debug: True
+EOCC
+
+      expected_data = <<-EOX.chomp
+<vm>
+  <initialization>
+    <regenerate_ssh_keys>false</regenerate_ssh_keys>
+    <root_password>some_password</root_password>
+    <custom_script>fqdn: example.example.com\ndebug: true\n</custom_script>
+  </initialization>
+</vm>
+EOX
+
+      expect(service).to receive(:api).and_return(:product_info => {:version => {:major => "3", :minor => "4", :revision => "0", :build => "0"}})
+      expect(service).to receive(:resource_put).once.with(vm.attributes[:href], expected_data).and_return(return_data)
+      vm.cloud_init = cloud_config
+    end
 
-    expect(service).to receive(:api).and_return(:product_info => {:version => {:major => "3", :minor => "4", :revision => "0", :build => "0"}})
-    expect(service).to receive(:resource_put).once.with(vm.attributes[:href], expected_data).and_return(return_data)
-    vm.cloud_init = cloud_config
+    it "without custom_script" do
+      cloud_config = <<-EOCC.chomp
+#cloud_config
+regenerate_ssh_keys: false
+root_password: some_password
+EOCC
+
+      expected_data = <<-EOX.chomp
+<vm>
+  <initialization>
+    <regenerate_ssh_keys>false</regenerate_ssh_keys>
+    <root_password>some_password</root_password>
+  </initialization>
+</vm>
+EOX
+
+      expect(service).to receive(:api).and_return(:product_info => {:version => {:major => "3", :minor => "4", :revision => "0", :build => "0"}})
+      expect(service).to receive(:resource_put).once.with(vm.attributes[:href], expected_data).and_return(return_data)
+      vm.cloud_init = cloud_config
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ovirt
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Jason Frey
@@ -16,7 +16,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-21 00:00:00.000000000 Z
+date: 2015-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler