fog-ovirt 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88ead8cc94b6a7acb2e54a922633619a62e86d54
-  data.tar.gz: 2ced4f951fa5a6950bdf854bbae056437410e26f
+  metadata.gz: 2e47fa7e306962a88299505ea5723bf4374c3f1c
+  data.tar.gz: 9cc07868f6ed1a2f8dd5a96f93c62d4b4b8650df
 SHA512:
-  metadata.gz: f8ab39302130b3697d45fc13dfd8693f2b58e00b28d15386654e8e7551633bb8c644bb7fe5c525bb6059620b1b9ecb4ea43c2c9b4681210e1aaaf1b9caefbd59
-  data.tar.gz: c2fe9a22bd7f3821cb226d3afa92eb39c5cdf1ead6d5886d0a49a46745b18eb0e18776d05c015100419995c0b56ff7d14aefc529b4cb08acfb9c3c7d6b1941c3
+  metadata.gz: 3aa5058b8381d5859cb654a192c30e1067722f435f9acbca22dce5763b42518ab6d0ac30f4f1def9f6ac768a7a0d384f6551618da679e7d7e462d99cdacf71ca
+  data.tar.gz: 296fe2cff9e9e6fa0e9b0e93e86ecc2bdb32897152a2acd7ba5a5947bde8d8504fee2861e3414d91d4a4561bf2ffc5a91131e08d3c643a29aff4aab0068f12b6

data/.rubocop.yml

@@ -18,3 +18,6 @@ Style/SignalException:
   Description: 'Do not enforce use of fail when raising exceptions.'
   # Valid values are: semantic, only_raise and only_fail
   EnforcedStyle: only_raise
+
+Layout/EmptyLineAfterGuardClause:
+  Enabled: false

data/lib/fog/ovirt/compute/v4.rb

@@ -63,9 +63,7 @@ module Fog
               # ignore nil values
               next if value.nil?
 
-              if key != :data_center && value.respond_to?(:href) && value.href && value.respond_to?(:id)
-                opts[key] = value.id
-              end
+              opts[key] = value.id if key != :data_center && value.respond_to?(:href) && value.href && value.respond_to?(:id)
 
               opts[key] ||= get_attr_value(value, opts)
             end
@@ -78,10 +76,11 @@ module Fog
             case value
             when OvirtSDK4::List
               value.to_a
-            when Array, Hash, DateTime
+            when Array, Hash, DateTime, TrueClass, FalseClass
               value
             when OvirtSDK4::HighAvailability
               opts[:ha] = value.enabled
+              value
             when OvirtSDK4::TemplateVersion
               OpenStruct.new(:version_name => value.version_name, :version_number => value.version_number)
             when OvirtSDK4::Mac
@@ -144,7 +143,7 @@ module Fog
             url        = options[:ovirt_url]        || "https://#{server}:#{port}#{api_path}"
 
             connection_opts = {
-              :url      => url,
+              :url => url,
               :username => username,
               :password => password
             }

data/lib/fog/ovirt/requests/compute/v4/add_volume.rb

@@ -26,6 +26,7 @@ module Fog
             options[:provisioned_size] ||= 8 * Fog::Compute::Ovirt::DISK_SIZE_TO_GB
             options[:type] ||= OvirtSDK4::DiskType::DATA
             options[:format] ||= OvirtSDK4::DiskFormat::COW
+
             options[:sparse] = true unless options[:sparse].present?
             options[:quota] = options[:quota].present? ? client.system_service.data_centers_service.data_center_service(datacenter).quotas_service.quota_service(options[:quota]).get : nil
 
@@ -33,8 +34,8 @@ module Fog
             options[:disk][:storage_domains] ||= [client.system_service.storage_domains_service.storage_domain_service(options[:storage_domain_id]).get]
             options[:disk][:provisioned_size] ||= options.delete(:provisioned_size)
             options[:disk][:format] ||= options.delete(:format)
-            options[:disk][:sparse] ||= options.delete(:sparse) == "true"
-            options[:disk][:wipe_after_delete] ||= options.delete(:wipe_after_delete) == "true"
+            options[:disk][:sparse] ||= options.delete(:sparse)
+            options[:disk][:wipe_after_delete] ||= options.delete(:wipe_after_delete)
             options
           end
           # rubocop:enable Metrics/AbcSize

data/lib/fog/ovirt/requests/compute/v4/list_template_volumes.rb

@@ -3,15 +3,22 @@ module Fog
     class Ovirt
       class V4
         class Real
+          # rubocop:disable Metrics/AbcSize
           def list_template_volumes(template_id)
             template = client.system_service.templates_service.template_service(template_id).get
-
             attachments = client.follow_link(template.disk_attachments)
-
             attachments.map do |attachment|
-              ovirt_attrs client.follow_link(attachment.disk)
+              attachment_disk = client.follow_link(attachment.disk)
+              attachment = client.follow_link(attachment)
+              bootable = attachment.bootable
+              interface = attachment.interface
+              attachment_disk.bootable = bootable if attachment_disk.bootable.nil?
+              attachment_disk.interface = interface if attachment_disk.interface.nil?
+              attachment_disk.storage_domain = attachment_disk.storage_domains[0].id if attachment_disk.storage_domains[0].present?
+              ovirt_attrs attachment_disk
             end
           end
+          # rubocop:enable Metrics/AbcSize
         end
         class Mock
           def list_template_volumes(_template_id)

data/lib/fog/ovirt/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Ovirt
-    VERSION = "1.1.2".freeze
+    VERSION = "1.1.3".freeze
   end
 end

data/tests/helpers/mock_helper.rb

@@ -8,7 +8,7 @@ Fog.mock! if ENV["FOG_MOCK"] == "true"
 if Fog.mock?
   Fog.credentials = {
     :ovirt_url => "http://ovirt:8080/api",
-    :ovirt_username                   => "admin@internal",
-    :ovirt_password                   => "123123"
+    :ovirt_username => "admin@internal",
+    :ovirt_password => "123123"
   }.merge(Fog.credentials)
 end

data/tests/ovirt/requests/compute/v3/destroy_vm_tests.rb

@@ -1,8 +1,6 @@
 Shindo.tests("Fog::Compute[:ovirt] | vm_destroy request", ["ovirt"]) do
   compute = Fog::Compute[:ovirt]
-  if compute.servers.all(:search => "fog-*").empty?
-    compute.create_vm(:name => "fog-" + Time.now.to_i.to_s, :cluster_name => "Default")
-  end
+  compute.create_vm(:name => "fog-" + Time.now.to_i.to_s, :cluster_name => "Default") if compute.servers.all(:search => "fog-*").empty?
   vm_id = compute.servers.all(:search => "fog-*").last.id
 
   tests("The response should") do

data/tests/ovirt/requests/compute/v3/update_vm_tests.rb

@@ -1,8 +1,6 @@
 Shindo.tests("Fog::Compute[:ovirt] | vm_update request", ["ovirt"]) do
   compute = Fog::Compute[:ovirt]
-  if compute.servers.all(:search => "fog-*").empty?
-    compute.create_vm(:name => "fog-" + Time.now.to_i.to_s, :cluster_name => "Default")
-  end
+  compute.create_vm(:name => "fog-" + Time.now.to_i.to_s, :cluster_name => "Default") if compute.servers.all(:search => "fog-*").empty?
   vm = compute.servers.all(:search => "fog-*").last
 
   tests("The response should") do

data/tests/ovirt/requests/compute/v3/update_volume_tests.rb

@@ -1,8 +1,6 @@
 Shindo.tests("Fog::Compute[:ovirt] | update_volume request", ["ovirt"]) do
   compute = Fog::Compute[:ovirt]
-  if compute.servers.all(:search => "fog-*").empty?
-    compute.create_vm(:name => "fog-" + Time.now.to_i.to_s, :cluster_name => "Default")
-  end
+  compute.create_vm(:name => "fog-" + Time.now.to_i.to_s, :cluster_name => "Default") if compute.servers.all(:search => "fog-*").empty?
   vm_id = compute.servers.all(:search => "fog-*").last
 
   tests("The expected options") do

data/tests/ovirt/requests/compute/v4/destroy_vm_tests.rb

@@ -1,8 +1,6 @@
 Shindo.tests("Fog::Compute[:ovirt] v4 | vm_destroy request", ["ovirt"]) do
   compute = Fog::Compute.new(:provider => :ovirt, :api_version => "v4")
-  if compute.servers.all(:search => "fog-*").empty?
-    compute.create_vm(:name => "fog-" + Time.now.to_i.to_s, :cluster_name => "Default")
-  end
+  compute.create_vm(:name => "fog-" + Time.now.to_i.to_s, :cluster_name => "Default") if compute.servers.all(:search => "fog-*").empty?
   vm_id = compute.servers.all(:search => "fog-*").last.id
 
   tests("The response should") do

data/tests/ovirt/requests/compute/v4/update_volume_tests.rb

@@ -1,8 +1,6 @@
 Shindo.tests("Fog::Compute[:ovirt] v4 | update_volume request", ["ovirt"]) do
   compute = Fog::Compute.new(:provider => :ovirt, :api_version => "v4")
-  if compute.servers.all(:search => "fog-*").empty?
-    compute.create_vm(:name => "fog-" + Time.now.to_i.to_s, :cluster_name => "Default")
-  end
+  compute.create_vm(:name => "fog-" + Time.now.to_i.to_s, :cluster_name => "Default") if compute.servers.all(:search => "fog-*").empty?
   vm_id = compute.servers.all(:search => "fog-*").last
 
   tests("The expected options") do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-ovirt
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Ori Rabin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-30 00:00:00.000000000 Z
+date: 2018-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core