fog-ovirt 1.1.6 → 1.2.0

data/lib/fog/ovirt/requests/compute/v3/vm_start_with_cloudinit.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Ovirt
+  module Ovirt
+    class Compute
       class V3
         class Real
           def vm_start_with_cloudinit(options = {})

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Ovirt
+  module Ovirt
+    class Compute
       class V3
         class Real
           def vm_ticket(id, options = {})

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Ovirt
+  module Ovirt
+    class Compute
       class V4
         class Real
           # rubocop:disable Metrics/AbcSize

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Ovirt
+  module Ovirt
+    class Compute
       class V4
         class Real
           def add_volume(id, options = {})
@@ -17,20 +17,19 @@ module Fog
           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)
             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[:provisioned_size] = options[:size_gb].to_i * Fog::Ovirt::Compute::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
+            options[:storage_domain_id] = options[:storage_domain] if options[:storage_domain]
             # If no size is given, default to a volume size of 8GB
-            options[:provisioned_size] ||= 8 * Fog::Compute::Ovirt::DISK_SIZE_TO_GB
+            options[:provisioned_size] ||= 8 * Fog::Ovirt::Compute::DISK_SIZE_TO_GB
             options[:type] ||= OvirtSDK4::DiskType::DATA
             options[:format] ||= OvirtSDK4::DiskFormat::COW
             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][:storage_domains] ||= [client.system_service.storage_domains_service.storage_domain_service(options[:storage_domain_id]).get] if options[:storage_domain_id]
             options[:disk][:provisioned_size] ||= options.delete(:provisioned_size)
             options[:disk][:format] ||= options.delete(:format)
             options[:disk][:wipe_after_delete] = options.delete(:wipe_after_delete) if options[:disk][:wipe_after_delete].nil?

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Ovirt
+  module Ovirt
+    class Compute
       class V4
         class Real
           def create_disk_attachment_from_disk(disk_to_attachment)
@@ -55,7 +55,7 @@ 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[:memory_policy] = OvirtSDK4::MemoryPolicy.new(:guaranteed => attrs[:memory]) if attrs[:memory].to_i < Fog::Ovirt::Compute::DISK_SIZE_TO_GB
             attrs[:high_availability] = OvirtSDK4::HighAvailability.new(:enabled => attrs[:ha] == "1") if attrs[:ha].present?
 
             process_vm_disks(attrs) if attrs[:clone] == true && attrs[:disks].present?

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Ovirt
+  module Ovirt
+    class Compute
       class V4
         class Real
           def datacenters(filter = {})

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Ovirt
+  module Ovirt
+    class Compute
       class V4
         class Real
           def destroy_interface(id, options)

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Ovirt
+  module Ovirt
+    class Compute
       class V4
         class Real
           def destroy_vm(options = {})

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Ovirt
+  module Ovirt
+    class Compute
       class V4
         class Real
           def destroy_volume(id, options)

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Ovirt
+  module Ovirt
+    class Compute
       class V4
         class Real
           def api_version

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Ovirt
+  module Ovirt
+    class Compute
       class V4
         class Real
           def get_cluster(id)

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Ovirt
+  module Ovirt
+    class Compute
       class V4
         class Real
           def get_instance_type(id)

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Ovirt
+  module Ovirt
+    class Compute
       class V4
         class Real
           def get_quota(id)

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Ovirt
+  module Ovirt
+    class Compute
       class V4
         class Real
           def get_template(id)

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Ovirt
+  module Ovirt
+    class Compute
       class V4
         class Real
           def get_virtual_machine(id)

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Ovirt
+  module Ovirt
+    class Compute
       class V4
         class Real
           def list_clusters(opts = {})

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Ovirt
+  module Ovirt
+    class Compute
       class V4
         class Real
           def list_instance_types(filters = {})

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Ovirt
+  module Ovirt
+    class Compute
       class V4
         class Real
           def list_networks(cluster_id)

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Ovirt
+  module Ovirt
+    class Compute
       class V4
         class Real
           def list_operating_systems

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Ovirt
+  module Ovirt
+    class Compute
       class V4
         class Real
           def list_quotas(filters = {})

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Ovirt
+  module Ovirt
+    class Compute
       class V4
         class Real
           def list_template_interfaces(vm_id)

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Ovirt
+  module Ovirt
+    class Compute
       class V4
         class Real
           # rubocop:disable Metrics/AbcSize

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Ovirt
+  module Ovirt
+    class Compute
       class V4
         class Real
           def list_templates(filters = {})

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Ovirt
+  module Ovirt
+    class Compute
       class V4
         class Real
           def list_virtual_machines(filters = {})

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Ovirt
+  module Ovirt
+    class Compute
       class V4
         class Real
           def list_vm_interfaces(vm_id)

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Ovirt
+  module Ovirt
+    class Compute
       class V4
         class Real
           # rubocop:disable Metrics/AbcSize

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Ovirt
+  module Ovirt
+    class Compute
       class V4
         class Real
           def list_volumes

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Ovirt
+  module Ovirt
+    class Compute
       class V4
         class Real
           def storage_domains(filter = {})

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Ovirt
+  module Ovirt
+    class Compute
       class V4
         module Shared
           def check_arguments(id, options)
@@ -10,7 +10,7 @@ module Fog
         end
 
         class Real
-          extend ::Fog::Compute::Ovirt::V4::Shared
+          extend ::Fog::Ovirt::Compute::V4::Shared
 
           def update_interface(id, options)
             options = convert_string_to_bool(options)
@@ -23,7 +23,7 @@ module Fog
         end
 
         class Mock
-          extend ::Fog::Compute::Ovirt::V4::Shared
+          extend ::Fog::Ovirt::Compute::V4::Shared
 
           def update_interface(id, options)
             check_arguments(id, options)

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Ovirt
+  module Ovirt
+    class Compute
       class V4
         class Real
           # rubocop:disable Metrics/AbcSize

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Ovirt
+  module Ovirt
+    class Compute
       class V4
         module Shared
           def check_arguments(id, options)
@@ -10,7 +10,7 @@ module Fog
         end
 
         class Real
-          extend ::Fog::Compute::Ovirt::V4::Shared
+          extend ::Fog::Ovirt::Compute::V4::Shared
 
           def update_volume(id, options)
             check_arguments(id, options)
@@ -23,7 +23,7 @@ module Fog
         end
 
         class Mock
-          extend ::Fog::Compute::Ovirt::V4::Shared
+          extend ::Fog::Ovirt::Compute::V4::Shared
 
           def update_volume(id, options)
             check_arguments(id, options)

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Ovirt
+  module Ovirt
+    class Compute
       class V4
         class Real
           def vm_action(options = {})

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Ovirt
+  module Ovirt
+    class Compute
       class V4
         class Real
           def vm_start_with_cloudinit(options = {})

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Ovirt
+  module Ovirt
+    class Compute
       class V4
         class Real
           def vm_ticket(id, options = {})

data/lib/fog/ovirt/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Ovirt
-    VERSION = "1.1.6".freeze
+    VERSION = "1.2.0".freeze
   end
 end

data/tests/ovirt/compute_tests.rb

@@ -1,5 +1,5 @@
-Shindo.tests("Fog::Compute[:ovirt]", ["ovirt"]) do
-  compute = Fog::Compute[:ovirt]
+Shindo.tests("Fog::Ovirt::Compute.new", ["ovirt"]) do
+  compute = Fog::Ovirt::Compute.new
 
   tests("Compute attributes") do
     %w[ovirt_attrs].each do |attr|

data/tests/ovirt/models/compute/cluster_tests.rb

@@ -1,5 +1,5 @@
-Shindo.tests("Fog::Compute[:ovirt] | cluster model", ["ovirt"]) do
-  clusters = Fog::Compute[:ovirt].clusters
+Shindo.tests("Fog::Ovirt::Compute.new | cluster model", ["ovirt"]) do
+  clusters = Fog::Ovirt::Compute.new.clusters
   cluster = clusters.last
 
   tests("The cluster model should") do
@@ -23,6 +23,6 @@ Shindo.tests("Fog::Compute[:ovirt] | cluster model", ["ovirt"]) do
         end
       end
     end
-    test("be a kind of Fog::Compute::Ovirt::Cluster") { cluster.is_a? Fog::Compute::Ovirt::Cluster }
+    test("be a kind of Fog::Ovirt::Compute::Cluster") { cluster.is_a? Fog::Ovirt::Compute::Cluster }
   end
 end

data/tests/ovirt/models/compute/clusters_tests.rb

@@ -1,7 +1,7 @@
-Shindo.tests("Fog::Compute[:ovirt] | clusters collection", ["ovirt"]) do
-  clusters = Fog::Compute[:ovirt].clusters
+Shindo.tests("Fog::Ovirt::Compute.new | clusters collection", ["ovirt"]) do
+  clusters = Fog::Ovirt::Compute.new.clusters
 
   tests("The clusters collection") do
-    test("should be a kind of Fog::Compute::Ovirt::Clusters") { clusters.is_a? Fog::Compute::Ovirt::Clusters }
+    test("should be a kind of Fog::Ovirt::Compute::Clusters") { clusters.is_a? Fog::Ovirt::Compute::Clusters }
   end
 end