fog-ovirt 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0db74060b4baf3e164228414dea50eee4b190456
-  data.tar.gz: 37ac7fce1061b02648cf17b1650f8266ab264a0f
+  metadata.gz: 88ead8cc94b6a7acb2e54a922633619a62e86d54
+  data.tar.gz: 2ced4f951fa5a6950bdf854bbae056437410e26f
 SHA512:
-  metadata.gz: cc1bdbba0adf313e68d6e2278cb8d0bbe642f6ec5b708c7ed649e028c3202867394696418a36cee09958207d24c603765e91d40ab70cb1aac40c8bc2f659acf6
-  data.tar.gz: 9aa2938661ac3506c0f84e85de7fe1c1ca9914d5598dc85e7d2b32e3e1f6b2854a74e1313a400abf4f262a1dcb87bb1d9fff678acad3cf71f7bcfced78fdefb2
+  metadata.gz: f8ab39302130b3697d45fc13dfd8693f2b58e00b28d15386654e8e7551633bb8c644bb7fe5c525bb6059620b1b9ecb4ea43c2c9b4681210e1aaaf1b9caefbd59
+  data.tar.gz: c2fe9a22bd7f3821cb226d3afa92eb39c5cdf1ead6d5886d0a49a46745b18eb0e18776d05c015100419995c0b56ff7d14aefc529b4cb08acfb9c3c7d6b1941c3

data/README.md

@@ -46,7 +46,7 @@ Version 1.0.2 adds support API V4 as well.
 The first version does not give full support.
 The supported requests for API V4 are:
 
-    :vm_action, :destroy_vm, :create_vm
+    :vm_action, :destroy_vm, :create_vm, :update_vm (without os changes)
     :datacenters
     :storage_domains
     :list_virtual_machines, :get_virtual_machine

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

@@ -56,7 +56,7 @@ module Fog
               end
 
               if key == :provisioned_size
-                opts[:size] = value
+                opts[:size] = value.to_s
                 next
               end
 
@@ -148,7 +148,6 @@ module Fog
               :username => username,
               :password => password
             }
-
             @datacenter = options[:ovirt_datacenter]
             connection_opts[:ca_file]  = options[:ca_file]
             connection_opts[:ca_certs] = [OpenSSL::X509::Certificate.new(options[:public_key])] if options[:public_key].present?
@@ -167,6 +166,7 @@ module Fog
           end
 
           def datacenter_hash
+            @datacenter_hash ||= datacenters.find { |x| x[:id] == @datacenter } if @datacenter
             @datacenter_hash ||= datacenters.first
           end
 
@@ -174,6 +174,13 @@ module Fog
             @blank_template ||= client.system_service.get.special_objects.blank_template
           end
 
+          def create_search_by_datacenter(search:, datacenter:, page: nil)
+            search ||= ""
+            search += " datacenter=#{datacenter}" if datacenter
+            search += " page #{page}" if page
+            search
+          end
+
           private
 
           attr_reader :client

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

@@ -13,11 +13,11 @@ module Fog
             disk_attachments_service.add(disk)
           end
 
-          # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
+          # rubocop:disable Metrics/AbcSize
           def add_options_defaults(options)
             options = options.dup
             search = options[:search] || format("datacenter=%<datacenter>s", :datacenter => datacenter)
-            options[:bootable] ||= "true"
+            options[:bootable] = options.delete(:bootable) == "true"
             options[:interface] ||= OvirtSDK4::DiskInterface::VIRTIO
             options[:provisioned_size] = options[:size_gb].to_i * Fog::Compute::Ovirt::DISK_SIZE_TO_GB if options[:size_gb]
 
@@ -32,12 +32,12 @@ module Fog
             options[:disk] ||= {}
             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][:type] ||= options.delete(:type)
             options[:disk][:format] ||= options.delete(:format)
-            options[:disk][:sparse] = options.delete(:sparse) unless options[:disk][:sparse].present?
+            options[:disk][:sparse] ||= options.delete(:sparse) == "true"
+            options[:disk][:wipe_after_delete] ||= options.delete(:wipe_after_delete) == "true"
             options
           end
-          # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
+          # rubocop:enable Metrics/AbcSize
         end
 
         class Mock

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

@@ -24,7 +24,7 @@ module Fog
           end
           # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
-          # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+          # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/MethodLength
           def create_vm(attrs)
             attrs = attrs.dup
 
@@ -44,11 +44,12 @@ module Fog
             vms_service = client.system_service.vms_service
             attrs[:instance_type] = attrs[:instance_type].present? ? client.system_service.instance_types_service.instance_type_service(attrs[:instance_type]).get : nil
 
-            attrs[:template] = if attrs[:template].present?
-                                 client.system_service.templates_service.template_service(attrs[:template]).get
-                               else
-                                 client.system_service.get.special_objects.blank_template
-                               end
+            if attrs[:template].present?
+              attrs[:template] = client.system_service.templates_service.template_service(attrs[:template]).get
+            else
+              attrs[:template] = client.system_service.get.special_objects.blank_template
+              update_os_attrs(attrs)
+            end
 
             attrs[:comment] ||= ""
             attrs[:quota] = attrs[:quota].present? ? client.system_service.data_centers_service.data_center_service(datacenter).quotas_service.quota_service(attrs[:quota]).get : nil
@@ -56,15 +57,26 @@ module Fog
               cpu_topology = OvirtSDK4::CpuTopology.new(:cores => attrs.fetch(:cores, "1"), :sockets => attrs.fetch(:sockets, "1"))
               attrs[:cpu] = OvirtSDK4::Cpu.new(:topology => cpu_topology)
             end
-
             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)
             new_vm = OvirtSDK4::Vm.new(attrs)
             vms_service.add(new_vm)
           end
-          # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+          # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/MethodLength
+
+          # rubocop:disable Metrics/AbcSize
+          def update_os_attrs(attrs)
+            attrs[:os] ||= {}
+            attrs[:os][:type] ||= "Other OS"
+            attrs[:os][:boot] ||= [attrs.fetch(:boot_dev1, OvirtSDK4::BootDevice::NETWORK), attrs.fetch(:boot_dev2, OvirtSDK4::BootDevice::HD)]
+            attrs[:os][:boot] = attrs[:os][:boot].without(attrs["first_boot_dev"]).prepend(attrs["first_boot_dev"]) if attrs["first_boot_dev"]
+
+            attrs[:os] = OvirtSDK4::OperatingSystem.new(:type => attrs[:os][:type], :boot => OvirtSDK4::Boot.new(:devices => attrs[:os][:boot]))
+          end
+          # rubocop:enable Metrics/AbcSize
         end
 
         class Mock

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

@@ -3,8 +3,9 @@ module Fog
     class Ovirt
       class V4
         class Real
-          def list_clusters(filters = {})
-            client.system_service.clusters_service.list(filters).map { |ovirt_obj| ovirt_attrs ovirt_obj }
+          def list_clusters(opts = {})
+            opts[:search] = create_search_by_datacenter(:search => opts[:search], :datacenter => datacenter_hash[:name])
+            client.system_service.clusters_service.list(opts).map { |ovirt_obj| ovirt_attrs(ovirt_obj) }
           end
         end
         class Mock

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

@@ -7,10 +7,8 @@ module Fog
             filters = filters.dup
             page = filters.delete(:page)
             without_details = filters.delete(:without_details)
-
             filters[:all_content] = true unless without_details
-            filters[:search] ||= ""
-            filters[:search] += " page #{page}"
+            filters[:search] = create_search_by_datacenter(:search => filters[:search], :datacenter => datacenter_hash[:name], :page => page)
             client.system_service.vms_service.list(filters).map { |ovirt_obj| ovirt_attrs ovirt_obj }
           end
         end

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

@@ -3,18 +3,22 @@ module Fog
     class Ovirt
       class V4
         class Real
+          # rubocop:disable Metrics/AbcSize
           def list_vm_volumes(vm_id)
-            # disk_attachments_service = client.system_service.vms_service.vm_service(vm_id).disk_attachments_service
-            # disk_attachments_service.list.map {|ovirt_obj| ovirt_attrs client.system_service.disks_service.disk_service(ovirt_obj.id).get}
-
             vm = client.system_service.vms_service.vm_service(vm_id).get
-
             attachments = client.follow_link(vm.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
+              ovirt_attrs attachment_disk
             end
           end
+          # rubocop:enable Metrics/AbcSize
         end
         class Mock
           def list_vm_volumes(_vm_id)

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

@@ -25,7 +25,7 @@ module Fog
             wrap_attribute(attrs, :host, OvirtSDK4::Host)
             wrap_attribute(attrs, :quota, OvirtSDK4::Quota)
             wrap_attribute(attrs, :instance_type, OvirtSDK4::InstanceType)
-            attrs[:high_availability] = OvirtSDK4::HighAvailability.new(:enabled => attrs[:ha]) unless attrs[:ha].nil?
+            attrs[:high_availability] = OvirtSDK4::HighAvailability.new(:enabled => attrs[:ha] == "1") if attrs[:ha].present?
             attrs[:original_template] = if attrs[:original_template].present?
                                           OvirtSDK4::Template.new(:id => attrs[:original_template])
                                         else

data/lib/fog/ovirt/version.rb

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

metadata

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