fog-ovirt 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 231279bba2577e46d1eaebb4707b5fbeda1237de
-  data.tar.gz: 1d2a2562c87a264601c73f99b86d592770e3bfca
+  metadata.gz: ae44f7ed66761842e8171bb18c980ac4da26c48e
+  data.tar.gz: a1e45426a36e13357584f8adfe82307070f98ee8
 SHA512:
-  metadata.gz: 1adc82676c9e21ca1d7a545613357b4ab51eae18aa40dfa57c6f31637344f6f845c44d78fb917ceb340f8805474bf3c6567b9f94101012e02791c8678b93c37b
-  data.tar.gz: 6dc5a477f43f45ba167ddafe3787b4806a5d77ea31a74367810daebfbc8c0244127f47831f6d6e935807321228a757673cb2f9aaf7bd2b4d05308b90e2088259
+  metadata.gz: 424c2016c3f2d01ad833c65f6f6ade596c0327f1eef47b388adcb5caeccf4bac3380896c0d8d3687627ca7e9ba05f99b54ed753f6a0b580c8b3b114faf217646
+  data.tar.gz: 5a4244fd04d8101d108fe6fce9a75b315785bb4ca42a1d30a5c47d053c97fc190677b4a77be7dbe730973e984f8bdb28ee4a8ab23e4c43c554f40500d1a435c3

data/.rubocop_todo.yml

@@ -14,7 +14,7 @@ Metrics/ClassLength:
 # Offense count: 2
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 20
+  Max: 25
 
 # Offense count: 1
 Style/ClassVars:

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

@@ -80,6 +80,7 @@ module Fog
               value.address
             when OvirtSDK4::Cpu
               opts[:cores] = value.topology.nil? ? nil : value.topology.cores
+              opts[:sockets] = value.topology.nil? ? nil : value.topology.sockets
             when OvirtSDK4::Display
               subject = value.certificate.subject if value.certificate
               {

data/lib/fog/ovirt/compute.rb

@@ -26,12 +26,14 @@ module Fog
       model      :affinity_group
       collection :affinity_groups
 
+      DISK_SIZE_TO_GB = 1024 * 1024 * 1024
+
       class ExceptionWrapper
         def initialize(client)
           @client = client
         end
 
-        # rubocop:disable Style/MethodMissing
+        # rubocop:disable Style/MethodMissingSuper, Style/MissingRespondToMissing
         def method_missing(symbol, *args)
           if block_given?
             @client.__send__(symbol, *args) do |*block_args|
@@ -47,7 +49,7 @@ module Fog
         def respond_to?(symbol, include_all = false)
           @client.respond_to?(symbol, include_all)
         end
-        # rubocop:enable Style/MethodMissing
+        # rubocop:enable Style/MethodMissingSuper, Style/MissingRespondToMissing
       end
 
       require "fog/ovirt/compute/v3"
@@ -65,7 +67,7 @@ module Fog
         # rubocop:enable Style/ConditionalAssignment
       end
 
-      # rubocop:disable Style/MethodMissing
+      # rubocop:disable Style/MethodMissingSuper, Style/MissingRespondToMissing
       def method_missing(symbol, *args)
         @client.__send__(symbol, *args)
       end
@@ -73,7 +75,7 @@ module Fog
       def respond_to?(symbol, include_all = false)
         @client.respond_to?(symbol, include_all)
       end
-      # rubocop:enable Style/MethodMissing
+      # rubocop:enable Style/MethodMissingSuper, Style/MissingRespondToMissing
 
       class Mock
         def initialize(options = {})
@@ -86,7 +88,7 @@ module Fog
           end
         end
 
-        # rubocop:disable Style/MethodMissing
+        # rubocop:disable Style/MethodMissingSuper, Style/MissingRespondToMissing
         def method_missing(symbol, *args)
           @client.__send__(symbol, *args)
         end
@@ -94,7 +96,7 @@ module Fog
         def respond_to?(symbol, include_all = false)
           @client.respond_to?(symbol, include_all)
         end
-        # rubocop:enable Style/MethodMissing
+        # rubocop:enable Style/MethodMissingSuper, Style/MissingRespondToMissing
       end
 
       class Real
@@ -108,7 +110,7 @@ module Fog
           end
         end
 
-        # rubocop:disable Style/MethodMissing
+        # rubocop:disable Style/MethodMissingSuper, Style/MissingRespondToMissing
         def method_missing(symbol, *args)
           @client.send(symbol, *args)
         end
@@ -116,7 +118,7 @@ module Fog
         def respond_to?(symbol, include_all = false)
           @client.respond_to?(symbol, include_all)
         end
-        # rubocop:enable Style/MethodMissing
+        # rubocop:enable Style/MethodMissingSuper, Style/MissingRespondToMissing
       end
     end
   end

data/lib/fog/ovirt/models/compute/server.rb

@@ -19,6 +19,7 @@ module Fog
         attribute :ip
         attribute :status
         attribute :cores, :aliases => "cpus"
+        attribute :sockets
         attribute :memory
         attribute :host
         attribute :cluster

data/lib/fog/ovirt/models/compute/volume.rb

@@ -3,7 +3,6 @@ module Fog
     class Ovirt
       class Volume < Fog::Model
         attr_accessor :raw
-        DISK_SIZE_TO_GB = 1_073_741_824
         identity :id
 
         attribute :storage_domain
@@ -20,11 +19,11 @@ module Fog
         attribute :wipe_after_delete
 
         def size_gb
-          attributes[:size_gb] ||= attributes[:size].to_i / DISK_SIZE_TO_GB if attributes[:size]
+          attributes[:size_gb] ||= attributes[:size].to_i / Fog::Compute::Ovirt::DISK_SIZE_TO_GB if attributes[:size]
         end
 
         def size_gb=(size)
-          attributes[:size] = size.to_i * DISK_SIZE_TO_GB if size
+          attributes[:size] = size.to_i * Fog::Compute::Ovirt::DISK_SIZE_TO_GB if size
         end
 
         def to_s

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

@@ -17,7 +17,7 @@ module Fog
 
               profile = profiles.detect { |x| x.name == network.name }
 
-              profile ||= profiles.sort_by(&:name).first
+              profile ||= profiles.min_by(&:name)
 
               options.delete(:network)
               options[:vnic_profile] = { :id => profile.id }

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

@@ -3,8 +3,6 @@ module Fog
     class Ovirt
       class V4
         class Real
-          DISK_SIZE_TO_GB = 1024 * 1024 * 1024
-
           def add_volume(id, options = {})
             raise ArgumentError, "instance id is a required parameter" unless id
 
@@ -21,11 +19,11 @@ module Fog
             search = options[:search] || format("datacenter=%<datacenter>s", :datacenter => datacenter)
             options[:bootable] ||= "true"
             options[:interface] ||= OvirtSDK4::DiskInterface::VIRTIO
-            options[:provisioned_size] = options[:size_gb].to_i * DISK_SIZE_TO_GB if options[:size_gb]
+            options[:provisioned_size] = options[:size_gb].to_i * Fog::Compute::Ovirt::DISK_SIZE_TO_GB if options[:size_gb]
 
             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 * DISK_SIZE_TO_GB
+            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?

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
+          # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
           def create_vm(attrs)
             attrs = attrs.dup
             attrs[:cluster_name] ||= datacenter.clusters.first.name unless attrs[:cluster]
@@ -40,19 +40,21 @@ module Fog
 
             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
-
-            if attrs[:cores].present?
-              cpu_topology = OvirtSDK4::CpuTopology.new(:cores => attrs[:cores], :sockets => "1")
+            if attrs[:cores].present? || attrs[:sockets].present?
+              cpu_topology = OvirtSDK4::CpuTopology.new(:cores => attrs.fetch(:cores, "1"), :sockets => attrs.fetch(:sockets, "1"))
               attrs[:cpu] = OvirtSDK4::Cpu.new(:topology => cpu_topology)
             end
 
+            if attrs[:memory].to_i < Fog::Compute::Ovirt::DISK_SIZE_TO_GB
+              attrs[:memory_policy] = OvirtSDK4::MemoryPolicy.new(:guaranteed => attrs[:memory])
+            end
+
             # 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
+          # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         end
 
         class Mock

data/lib/fog/ovirt/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Ovirt
-    VERSION = "1.0.3".freeze
+    VERSION = "1.0.4".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-ovirt
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Ori Rabin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-11 00:00:00.000000000 Z
+date: 2018-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core