fog-ovirt 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1d12e8266299180109c82336ba2fa7f37ce393e
-  data.tar.gz: 2146dbd84ec0c8edd03d2cb229431b9105307830
+  metadata.gz: 60c557f87df7eed11973b2d486df972d4eb6d5e9
+  data.tar.gz: 012c8b79e06089c60b939780a883c8cfadaddf5a
 SHA512:
-  metadata.gz: efe0ea08f42a1d681644340608a9090d4b3b5cf2a2a331d2e885038833ec9d3dba06dab293c8922e5f4c6158f64f965d381465a08b42016d68d7c9cf07654569
-  data.tar.gz: deb41a6dcd13f22e4e4f970cbc93e4205535c9cf47d559878f10cf387f7f751857a7d931e6d448ddd1238587e901d0f9ebd5820acc2bfc9b31954332d31af0a0
+  metadata.gz: a9a46e1b06e95bb0256d8b4eb4fdc22e1e5b6431f8e2bb321f73b6a51136ff80215683aec5c7fb5b391705b47d6a16235d2e21a67f0cfbd1523daec712f89057
+  data.tar.gz: c33adf408dd6f3d9cc8fe2fa80a2ef9ac0039b1146b52e88fac340170968c036fc834698f1c1c30ea467a2b1343e75fb87e319bad26d83cbbced077539f66238

data/lib/fog/ovirt.rb

@@ -1,5 +1,6 @@
 require "fog/core"
 require "fog/xml"
+require "fog/json"
 
 module Fog
   module Compute

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

@@ -76,7 +76,7 @@ module Fog
             case value
             when OvirtSDK4::List
               value.to_a
-            when Array, Hash, DateTime, TrueClass, FalseClass
+            when Array, Hash, DateTime
               value
             when OvirtSDK4::HighAvailability
               opts[:ha] = value.enabled
@@ -107,6 +107,21 @@ module Fog
             end
           end
           # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
+
+          def convert_string_to_bool(opts)
+            opts.each do |key, value|
+              if value == "true"
+                opts[key] = true
+              elsif value == "false"
+                opts[key] = false
+              elsif value.is_a? Hash
+                convert_string_to_bool(value)
+              elsif value.is_a? Array
+                value.map { |item| convert_string_to_bool(item) }
+              end
+            end
+            opts
+          end
         end
 
         class Mock

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

@@ -9,7 +9,7 @@ module Fog
             vm = client.system_service.vms_service.vm_service(id)
             nics_service = vm.nics_service
             options = options.dup
-
+            options = convert_string_to_bool(options)
             if options[:network].present?
               network = client.system_service.networks_service.network_service(options[:network]).get
 

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

@@ -13,32 +13,30 @@ module Fog
             disk_attachments_service.add(disk)
           end
 
-          # rubocop:disable Metrics/AbcSize
+          # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
           def add_options_defaults(options)
             options = options.dup
+            options = convert_string_to_bool(options)
             search = options[:search] || format("datacenter=%<datacenter>s", :datacenter => datacenter)
-            options[:bootable] = options.delete(:bootable) == "true"
+            options[:bootable] = options.delete(:bootable)
             options[:interface] ||= OvirtSDK4::DiskInterface::VIRTIO
             options[:provisioned_size] = options[:size_gb].to_i * Fog::Compute::Ovirt::DISK_SIZE_TO_GB if options[:size_gb]
-
+            options[:sparse] = true if options[:sparse].nil?
             options[:storage_domain_id] = options[:storage_domain] || storagedomains(:role => "data", :search => search).first.id
             # If no size is given, default to a volume size of 8GB
             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
-
             options[:disk] ||= {}
+            options[:disk][:sparse] = options.delete(:sparse) if options[:disk][:sparse].nil?
             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)
-            options[:disk][:wipe_after_delete] ||= options.delete(:wipe_after_delete)
+            options[:disk][:wipe_after_delete] = options.delete(:wipe_after_delete) if options[:disk][:wipe_after_delete].nil?
             options
           end
-          # rubocop:enable Metrics/AbcSize
+          # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         end
 
         class Mock

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

@@ -3,30 +3,28 @@ module Fog
     class Ovirt
       class V4
         class Real
-          def check_for_option(opts, name)
-            opts[name.to_sym] || opts[(name + "_name").to_sym]
-          end
-
-          # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-          def process_vm_opts(opts)
-            return unless check_for_option(opts, "template") && check_for_option(opts, "storagedomain")
+          def create_disk_attachment_from_disk(disk_to_attachment)
+            storage_domain = client.system_service.storage_domains_service.storage_domain_service(disk_to_attachment["storage_domain"]).get
 
-            template_id = opts[:template] || client.system_service.templates_service.search(:name => opts[:template_name]).first.id
-            template_disks = client.system_service.templates_service.template_service(template_id).get.disk_attachments
-            storagedomain_id = opts[:storagedomain] || storagedomains.select { |s| s.name == opts[:storagedomain_name] }.first.id
+            disk = {
+              :id => disk_to_attachment["id"],
+              :format => disk_to_attachment.fetch("format", OvirtSDK4::DiskFormat::COW),
+              :sparse => disk_to_attachment.fetch("sparse", true),
+              :storage_domains => [storage_domain]
+            }
 
-            # Make sure the 'clone' option is set if any of the disks defined by
-            # the template is stored on a different storage domain than requested
-            opts[:clone] = true unless opts[:clone] == true || template_disks.empty? || template_disks.all? { |d| d.storage_domain == storagedomain_id }
+            OvirtSDK4::DiskAttachment.new(:disk => disk)
+          end
 
-            # Create disks map
-            opts[:disks] = template_disks.collect { |d| { :id => d.id, :storagedomain => storagedomain_id } }
+          def process_vm_disks(opts)
+            opts[:disk_attachments] = opts[:disks].map { |disk| create_disk_attachment_from_disk(disk) }
+            opts.delete(:disks)
           end
-          # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
           # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/MethodLength
           def create_vm(attrs)
             attrs = attrs.dup
+            attrs = convert_string_to_bool(attrs)
 
             if attrs[:cluster].present?
               attrs[:cluster] = client.system_service.clusters_service.cluster_service(attrs[:cluster]).get
@@ -60,10 +58,10 @@ module Fog
             attrs[:memory_policy] = OvirtSDK4::MemoryPolicy.new(:guaranteed => attrs[:memory]) if attrs[:memory].to_i < Fog::Compute::Ovirt::DISK_SIZE_TO_GB
             attrs[:high_availability] = OvirtSDK4::HighAvailability.new(:enabled => attrs[:ha] == "1") if attrs[:ha].present?
 
-            # TODO: handle cloning from template
-            process_vm_opts(attrs)
+            process_vm_disks(attrs) if attrs[:clone] == true && attrs[:disks].present?
+
             new_vm = OvirtSDK4::Vm.new(attrs)
-            vms_service.add(new_vm)
+            vms_service.add(new_vm, :clone => attrs[:clone])
           end
           # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/MethodLength
 

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

@@ -13,6 +13,7 @@ module Fog
           extend ::Fog::Compute::Ovirt::V4::Shared
 
           def update_interface(id, options)
+            options = convert_string_to_bool(options)
             check_arguments(id, options)
 
             interface_id = options[:id]

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

@@ -6,6 +6,7 @@ module Fog
           # rubocop:disable Metrics/AbcSize
           def update_vm(attrs)
             attrs = attrs.dup
+            attrs = convert_string_to_bool(attrs)
             vm_service = client.system_service.vms_service.vm_service(attrs[:id])
 
             if attrs[:cores].present?

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

@@ -14,7 +14,7 @@ module Fog
 
           def update_volume(id, options)
             check_arguments(id, options)
-
+            options = convert_string_to_bool(options)
             disk_id = options[:id]
             disk_attachment = client.system_service.vms_service.vm_service(id).disk_attachments_service.attachment_service(disk_id)
             disk_attachment.update(disk_attachment, options)

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

@@ -4,6 +4,7 @@ module Fog
       class V4
         class Real
           def vm_ticket(id, options = {})
+            options = convert_string_to_bool(options)
             client.system_service.vms_service.vm_service(id).ticket(options).value
           end
         end

data/lib/fog/ovirt/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Ovirt
-    VERSION = "1.1.4".freeze
+    VERSION = "1.1.5".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-ovirt
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Ori Rabin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-09 00:00:00.000000000 Z
+date: 2019-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core