ovirt 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89f156bda5b4ff94f3844c5039630cce59eb70b9
-  data.tar.gz: 304522e896dde670c8949a01e7e218a60552454d
+  metadata.gz: f613c2d824b0dbb9ba03acef085787bb0a173c35
+  data.tar.gz: d3678ad7665af01b60c8b2c9bdb2e1a1c013db76
 SHA512:
-  metadata.gz: bc6be10d2a3d4dcb3240ea0489d941eda4d209202ea7aa29228ab0aea945a6e87fb8d1416315313f13e3c8b51454d94af85d6fb381c319fd4413ef72acd80e81
-  data.tar.gz: 8456ee3d7d0db568137e21425a2762d03e22b045171980f76b7816394bf1b104a326ded7349655e02fd9a45cfcac144227dbebe7b64acd94eacc250cab6befd7
+  metadata.gz: c9acc652791095ccdaf69511f4fb51fc0b2b5a8c009ef2d68cf949c94a8848f29249f79e125f89f70811c78db247fdad41c3d4ea37412d9531f817465cdb7978
+  data.tar.gz: 3ad7fb06019661a9899bdf3dbc058b4fc2140c4c76ecc67be09c6c1ab0253a1b7ed6b5edea07fcd008bb6be779ed5250be5c270b6a4586280523574aa65787d5

data/README.md

@@ -5,6 +5,7 @@
 [![Code Climate](https://codeclimate.com/github/ManageIQ/ovirt.svg)](https://codeclimate.com/github/ManageIQ/ovirt)
 [![Coverage Status](https://coveralls.io/repos/ManageIQ/ovirt/badge.svg)](https://coveralls.io/github/ManageIQ/ovirt)
 [![Dependency Status](https://gemnasium.com/ManageIQ/ovirt.svg)](https://gemnasium.com/ManageIQ/ovirt)
+[![Security](https://hakiri.io/github/ManageIQ/ovirt/master.svg)](https://hakiri.io/github/ManageIQ/ovirt/master)
 
 Ovirt provides a simple Object Oriented interface to the REST API of oVirt and RHEV-M servers.
 

data/lib/ovirt/inventory.rb

@@ -130,7 +130,7 @@ module Ovirt
     SECONDARY_ITEMS = {
       # Key          RHEVM API methods
       :datacenter => [:storagedomains],
-      :host       => [:statistics, :nics], # :cdroms, tags
+      :host       => [:statistics, :host_nics], # :cdroms, tags
       :vm         => [:disks, :snapshots, :nics],
       :template   => [:disks]
     }
@@ -163,6 +163,9 @@ module Ovirt
       results = collect_in_parallel(jobs) do |key, ems_ref|
         if ems_ref.kind_of?(Array)
           ems_ref.flat_map { |item| get_resources_by_uri_path(item) rescue Array.new }
+        elsif ems_ref.kind_of?(Hash)
+          collection, element_name = ems_ref.first
+          standard_collection(collection, element_name, true)
         else
           get_resources_by_uri_path(ems_ref) rescue Array.new
         end

data/lib/ovirt/service.rb

@@ -173,6 +173,8 @@ module Ovirt
         request.get
       rescue RestClient::Exception => exception
         response = exception.response
+        logger.error "#{self.class.name}#probe_api_path: exception probing uri: '#{uri}'. Exception: #{$ERROR_INFO}"
+        return false if response.nil?
         if response.code == 401
           www_authenticate = response.headers[:www_authenticate]
           if www_authenticate =~ /^Basic realm="?(RESTAPI|ENGINE)"?$/
@@ -307,6 +309,7 @@ module Ovirt
     def parse_error_response(response, resource)
       logger.error "#{self.class.name}#parse_error_response Return from URL: <#{resource.url}> Data:#{response}"
       raise Ovirt::MissingResourceError if response.code == 404
+      raise RestClient::Unauthorized if response.code == 401
       doc    = Nokogiri::XML(response)
       action = doc.xpath("action").first
       node   = action || doc

data/lib/ovirt/template.rb

@@ -44,6 +44,10 @@ module Ovirt
       attributes.fetch_path(:os, :type) || 'unassigned'
     end
 
+    def boot_order
+      attributes.fetch_path(:os, :boot_order) || []
+    end
+
     def getCfg(_snap = nil)
       # TODO: Remove the following MiqException and any others
       raise MiqException::MiqVimError, "Failed to retrieve configuration information for VM" if attributes.nil?
@@ -102,7 +106,8 @@ module Ovirt
       (CLONE_ATTRIBUTES_WITH_SCALARS + CLONE_ATTRIBUTES_WITH_HASHES).each do |key|
         options[key] ||= self[key]
       end
-      options[:os_type] ||= os_type
+      options[:os] = self[:os].dup
+      options[:os][:type] = options[:os_type] || os_type
 
       skeleton_options = options.dup
       skeleton_options[:clone_type] = :linked
@@ -152,8 +157,12 @@ module Ovirt
             end
           end
 
-          xml.os(:type => options[:os_type] || os_type) do
-            xml.boot(:dev => 'hd')
+          options_os_type = options.fetch_path(:os, :type) || options[:os_type]
+          xml.os(:type => options_os_type || os_type) do
+            options_boot_order = options.fetch_path(:os, :boot_order)
+            (options_boot_order || boot_order).each do |boot|
+              xml.boot(:dev => boot[:dev])
+            end
           end
 
           if options[:clone_type] == :full

data/lib/ovirt/version.rb

@@ -1,3 +1,3 @@
 module Ovirt
-  VERSION = "0.12.0"
+  VERSION = "0.12.1"
 end

data/spec/factories/template.rb

@@ -34,4 +34,35 @@ FactoryGirl.define do
          )
     end
   end
+
+  factory :template_blank, :parent => :template do
+    initialize_with do
+      new(service,
+          :id                => "00000000-0000-0000-0000-000000000000",
+          :href              => "/api/vms/00000000-0000-0000-0000-000000000000",
+          :cluster           => {
+            :id   => "5be5d08a-a60b-11e2-bee6-005056a217db",
+            :href => "/api/clusters/5be5d08a-a60b-11e2-bee6-005056a217db"},
+          :template          => {
+            :id   => "00000000-0000-0000-0000-000000000000",
+            :href => "/api/templates/00000000-0000-0000-0000-000000000000"},
+          :name              => "Blank",
+          :origin            => "rhev",
+          :type              => "server",
+          :memory            => 1_073_741_824,
+          :stateless         => false,
+          :creation_time     => "2013-09-04 16:24:20 -0400",
+          :status            => {:state => "down"},
+          :display           => {:type => "spice", :monitors => 1},
+          :usb               => {:enabled => false},
+          :cpu               => {:topology => {:sockets => 1, :cores => 1}},
+          :high_availability => {:priority => 1, :enabled => false},
+          :os                => {:type => "other", :boot_order => [{:dev => "hd"}]},
+          :custom_attributes => [],
+          :placement_policy  => {:affinity => "migratable", :host => {}},
+          :memory_policy     => {:guaranteed => 536_870_912},
+          :guest_info        => {}
+         )
+    end
+  end
 end

data/spec/service_spec.rb

@@ -229,6 +229,47 @@ EOX
 
   end
 
+  context "#probe_api_path" do
+    let(:rest_client_resource_double) { double("RestClient::Resource") }
+
+    before do
+      allow(RestClient::Resource).to receive(:new).and_return(rest_client_resource_double)
+    end
+
+    def rest_exception(code = nil, headers = {})
+      response = double('response').as_null_object
+      expect(response).to receive(:code).and_return(code)
+      allow(response).to receive(:headers).and_return(headers)
+      RestClient::Exception.new(response)
+    end
+
+    it "returns false for nil response" do
+      allow(rest_client_resource_double).to receive(:get).and_raise(RestClient::Exception.new)
+      expect(service.probe_api_path('http://some', 'path')).to eq(false)
+    end
+
+    it "returns false for 401 and empty headers" do
+      allow(rest_client_resource_double).to receive(:get).and_raise(rest_exception(401))
+      expect(service.probe_api_path('http://some', 'path')).to eq(false)
+    end
+
+    it "returns false for other code" do
+      allow(rest_client_resource_double).to receive(:get).and_raise(rest_exception(404))
+      expect(service.probe_api_path('http://some', 'path')).to eq(false)
+    end
+
+    it "returns false if no exception thrown" do
+      allow(rest_client_resource_double).to receive(:get)
+      expect(service.probe_api_path('http://some', 'path')).to eq(false)
+    end
+
+    it "returns true for 401 and correct headers" do
+      allow(rest_client_resource_double).to receive(:get).and_raise(
+        rest_exception(401, :www_authenticate => "Basic realm=RESTAPI"))
+      expect(service.probe_api_path('http://some', 'path')).to eq(true)
+    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"})

data/spec/template_spec.rb

@@ -1,11 +1,12 @@
 describe Ovirt::Template do
   let(:service)  { template.service }
   let(:template) { build(:template_full) }
+  let(:blank_template) { build(:template_blank) }
 
   context "#create_vm" do
     it "clones properties for skeletal clones" do
       options       = {:clone_type => :skeletal}
-      expected_data = {
+      expected_options = {
         :clone_type        => :linked,
         :memory            => 536_870_912,
         :stateless         => false,
@@ -14,14 +15,61 @@ describe Ovirt::Template do
         :usb               => {:enabled => false},
         :cpu               => {:topology => {:sockets => 1, :cores => 1}},
         :high_availability => {:priority => 1, :enabled => false},
-        :os_type           => "rhel5_64"}
+        :os                => {:type => 'rhel5_64', :boot_order => [{:dev => 'hd'}]}}
       allow(template).to receive(:nics).and_return([])
       allow(template).to receive(:disks).and_return([])
       allow(service).to  receive(:blank_template).and_return(double('blank template'))
-      expect(service.blank_template).to receive(:create_vm).once.with(expected_data)
+      expect(service.blank_template).to receive(:create_vm).once.with(expected_options)
       template.create_vm(options)
     end
 
+    it "clones boot order from blank template" do
+      options = {
+        :clone_type => :linked,
+        :name       => 'new name',
+        :memory     => 536_870_912,
+        :cluster    => 'fb27f9a0-cb75-4e0f-8c07-8dec0c5ab483',
+        :os         => {:type => 'test', :boot_order => [{:dev => 'net'}, {:dev => 'iso'}]}}
+      allow(blank_template).to receive(:nics).and_return([])
+      allow(blank_template).to receive(:disks).and_return([])
+      expected_xml = <<-EOX.chomp
+<vm>
+  <name>new name</name>
+  <cluster id=\"fb27f9a0-cb75-4e0f-8c07-8dec0c5ab483\"/>
+  <template id=\"00000000-0000-0000-0000-000000000000\"/>
+  <memory>536870912</memory>
+  <stateless>false</stateless>
+  <type>server</type>
+  <display>
+    <type>spice</type>
+    <monitors>1</monitors>
+  </display>
+  <usb>
+    <enabled>false</enabled>
+  </usb>
+  <cpu>
+    <topology sockets="1" cores="1"/>
+  </cpu>
+  <high_availability>
+    <priority>1</priority>
+    <enabled>false</enabled>
+  </high_availability>
+  <os type=\"test\">
+    <boot dev=\"net\"/>
+    <boot dev=\"iso\"/>
+  </os>
+</vm>
+EOX
+      response_xml = <<-EOX.chomp
+<vm>
+  <os type='foo'/>
+  <placement_policy><affinity>foo</affinity></placement_policy>
+</vm>
+EOX
+      expect(blank_template.service).to receive(:resource_post).with(:vms, expected_xml).and_return(response_xml)
+      blank_template.create_vm(options)
+    end
+
     it "overrides properties for linked clones" do
       expected_data = <<-EOX.chomp
 <vm>
@@ -105,6 +153,37 @@ EOX
         expect(node["cores"].to_i).to   eq(1)
         expect(node["sockets"].to_i).to eq(1)
       end
+
+      it "Properly sets vm/os/boot_order from template when passed :os_type" do
+        allow(Ovirt::Base).to receive(:object_to_id)
+        xml = template.send(:build_clone_xml, :os_type => 'test_os')
+        nodeset = Nokogiri::XML.parse(xml).xpath('//vm/os')
+        expect(nodeset.length).to eq(1)
+
+        os = nodeset.first
+        expect_os(os, :type => 'test_os', :boot_order => %w(hd))
+      end
+
+      it "Properly sets vm/os/boot_order from :os hash" do
+        allow(Ovirt::Base).to receive(:object_to_id)
+        xml = template.send(:build_clone_xml,
+                            :os => {:type => "test_os", :boot_order => [{:dev => 'net'}, {:dev => 'iso'}]})
+        nodeset = Nokogiri::XML.parse(xml).xpath('//vm/os')
+        expect(nodeset.length).to eq(1)
+
+        os = nodeset.first
+        expect_os(os, :type => 'test_os', :boot_order => %w(net iso))
+      end
+
+      def expect_os(os, type: nil, boot_order: nil)
+        expect(os['type']).to eq(type)
+        boot_devices = []
+        os.xpath('boot').each do |boot|
+          dev = boot['dev']
+          boot_devices << dev unless dev.blank?
+        end
+        expect(boot_devices).to eq(boot_order)
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ovirt
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Jason Frey
@@ -17,11 +17,14 @@ authors:
 - Dávid Halász
 - pkliczewski
 - Juan Hernandez
+- Oleg Barenboim
 - Martin Betak
+- Tomas Jelinek
+- Piotr Kliczewski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-09 00:00:00.000000000 Z
+date: 2016-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -127,14 +130,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.8
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -179,7 +182,10 @@ email:
 - dhalasz@redhat.com
 - piotr.kliczewski@gmail.com
 - juan.hernandez@redhat.com
+- chessbyte@gmail.com
 - mbetak@redhat.com
+- tjelinek@redhat.com
+- piotr.kliczewski@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []