fog-vsphere 2.5.0 → 3.0.0

data/lib/fog/vsphere/requests/compute/list_interface_types.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def list_interface_types(filters = {})
           datacenter_name = filters[:datacenter]

data/lib/fog/vsphere/requests/compute/list_networks.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def list_networks(filters = {})
           datacenter_name = filters[:datacenter]
@@ -107,10 +107,10 @@ module Fog
           cluster_name = filters.fetch(:cluster, nil)
           if cluster_name.nil?
             data[:networks].values.select { |d| d['datacenter'] == datacenter_name } ||
-              raise(Fog::Compute::Vsphere::NotFound)
+              raise(Fog::Vsphere::Compute::NotFound)
           else
             data[:networks].values.select { |d| d['datacenter'] == datacenter_name && d['cluster'].include?(cluster_name) } ||
-              raise(Fog::Compute::Vsphere::NotFound)
+              raise(Fog::Vsphere::Compute::NotFound)
           end
         end
       end

data/lib/fog/vsphere/requests/compute/list_processes.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def list_processes(vm_id, opts)
           vm = get_vm_ref(vm_id)

data/lib/fog/vsphere/requests/compute/list_resource_pools.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def list_resource_pools(filters = {})
           datacenter_name = filters[:datacenter]

data/lib/fog/vsphere/requests/compute/list_rules.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def list_rules(filters = {})
           cluster = get_raw_cluster(filters[:cluster], filters[:datacenter])

data/lib/fog/vsphere/requests/compute/list_server_types.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def list_server_types(filters = {})
           datacenter_name = filters[:datacenter]

data/lib/fog/vsphere/requests/compute/list_storage_pods.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def list_storage_pods(filters = {})
           datacenter_name = filters[:datacenter]

data/lib/fog/vsphere/requests/compute/list_templates.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def list_templates(options = {})
           options[:folder] ||= options['folder']

data/lib/fog/vsphere/requests/compute/list_virtual_machines.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def list_virtual_machines(options = {})
           # Listing all VM's can be quite slow and expensive.  Try and optimize

data/lib/fog/vsphere/requests/compute/list_vm_cdroms.rb

@@ -1,7 +1,7 @@
 # rubocop:disable Lint/RescueWithoutErrorClass
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def list_vm_cdroms(vm_id)
           get_vm_ref(vm_id).config.hardware.device.select { |hw| hw.class == RbVmomi::VIM::VirtualCdrom }.map do |cdrom|
@@ -25,7 +25,7 @@ module Fog
       end
       class Mock
         def list_vm_cdroms(vm_id)
-          raise Fog::Compute::Vsphere::NotFound, 'VM not Found' unless data[:servers].key?(vm_id)
+          raise Fog::Vsphere::Compute::NotFound, 'VM not Found' unless data[:servers].key?(vm_id)
           return [] unless data[:servers][vm_id].key?('cdroms')
           data[:servers][vm_id]['cdroms'].map { |h| h.merge(instance_uuid: vm_id) }
         end

data/lib/fog/vsphere/requests/compute/list_vm_customvalues.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def list_vm_customvalues(vm_id)
           get_vm_ref(vm_id).summary.customValue.map do |customvalue|

data/lib/fog/vsphere/requests/compute/list_vm_interfaces.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         # => VirtualE1000(
         # addressType: "assigned",
@@ -44,7 +44,7 @@ module Fog
         def get_raw_interface(vm_id, options = {})
           raise ArgumentError, 'instance id is a required parameter' unless vm_id
 
-          if options.is_a? Fog::Compute::Vsphere::Interface
+          if options.is_a? Fog::Vsphere::Compute::Interface
             options
 
           else

data/lib/fog/vsphere/requests/compute/list_vm_scsi_controllers.rb

@@ -1,10 +1,10 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def list_vm_scsi_controllers(vm_id)
           list_vm_scsi_controllers_raw(vm_id).map do |raw_controller|
-            Fog::Compute::Vsphere::SCSIController.new(raw_controller)
+            Fog::Vsphere::Compute::SCSIController.new(raw_controller)
           end
         end
 
@@ -21,7 +21,7 @@ module Fog
       end
       class Mock
         def list_vm_scsi_controllers(vm_id)
-          raise Fog::Compute::Vsphere::NotFound, 'VM not Found' unless data[:servers].key?(vm_id)
+          raise Fog::Vsphere::Compute::NotFound, 'VM not Found' unless data[:servers].key?(vm_id)
           return [] unless data[:servers][vm_id].key?('scsi_controllers')
           data[:servers][vm_id]['scsi_controllers'].map { |h| h.merge(server_id: vm_id) }
         end

data/lib/fog/vsphere/requests/compute/list_vm_snapshots.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def list_vm_snapshots(vm_id, opts = {})
           vm_snapshot_info = get_vm_ref(vm_id).snapshot

data/lib/fog/vsphere/requests/compute/list_vm_volumes.rb

@@ -1,7 +1,7 @@
 # rubocop:disable Lint/RescueWithoutErrorClass
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         # [VirtualDisk(
         #  backing: VirtualDiskFlatVer2BackingInfo(

data/lib/fog/vsphere/requests/compute/modify_vm_cdrom.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def add_vm_cdrom(cdrom)
           vm_reconfig_hardware('instance_uuid' => cdrom.server.instance_uuid, 'hardware_spec' => { 'deviceChange' => [create_cdrom(cdrom, cdrom.unit_number, :add)] })

data/lib/fog/vsphere/requests/compute/modify_vm_controller.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def add_vm_controller(controller)
           vm_reconfig_hardware('instance_uuid' => controller.server_id, 'hardware_spec' => { 'deviceChange' => [create_controller(controller)] })

data/lib/fog/vsphere/requests/compute/modify_vm_interface.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def add_vm_interface(vmid, options = {})
           raise ArgumentError, 'instance id is a required parameter' unless vmid
@@ -49,10 +49,10 @@ module Fog
 
           elsif options[:key] && (options[:key] > 0)
             oldattributes = get_vm_interface(vmid, options)
-            Fog::Compute::Vsphere::Interface.new(oldattributes.merge(options))
+            Fog::Vsphere::Compute::Interface.new(oldattributes.merge(options))
 
           elsif options[:type] && options[:network]
-            Fog::Compute::Vsphere::Interface.new options
+            Fog::Vsphere::Compute::Interface.new options
 
           else
             raise ArgumentError, 'interface is a required parameter or pass options with type and network'

data/lib/fog/vsphere/requests/compute/modify_vm_volume.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def add_vm_volume(volume)
           vm_reconfig_hardware('instance_uuid' => volume.server_id, 'hardware_spec' => { 'deviceChange' => [create_disk(volume, :add)] })

data/lib/fog/vsphere/requests/compute/revert_to_snapshot.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def revert_to_snapshot(snapshot)
           unless Snapshot === snapshot

data/lib/fog/vsphere/requests/compute/set_vm_customvalue.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def set_vm_customvalue(vm_id, key, value)
           vm_ref = get_vm_ref(vm_id)

data/lib/fog/vsphere/requests/compute/update_vm.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def update_vm(server)
           attributes = server.attributes

data/lib/fog/vsphere/requests/compute/upload_iso.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def upload_iso_check_options(options)
           default_options = {
@@ -11,8 +11,8 @@ module Fog
           required_options.each do |param|
             raise ArgumentError, "#{required_options.join(', ')} are required" unless options.key? param
           end
-          raise Fog::Compute::Vsphere::NotFound, "Datacenter #{options['datacenter']} Doesn't Exist!" unless get_datacenter(options['datacenter'])
-          raise Fog::Compute::Vsphere::NotFound, "Datastore #{options['datastore']} Doesn't Exist!" unless get_raw_datastore(options['datastore'], options['datacenter'])
+          raise Fog::Vsphere::Compute::NotFound, "Datacenter #{options['datacenter']} Doesn't Exist!" unless get_datacenter(options['datacenter'])
+          raise Fog::Vsphere::Compute::NotFound, "Datastore #{options['datastore']} Doesn't Exist!" unless get_raw_datastore(options['datastore'], options['datacenter'])
           options
         end
 

data/lib/fog/vsphere/requests/compute/vm_acquire_ticket.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def vm_acquire_ticket(options = {})
           raise ArgumentError, 'instance_uuid is a required parameter' unless options.key?('instance_uuid')

data/lib/fog/vsphere/requests/compute/vm_clone.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       module Shared
         private
 
@@ -19,10 +19,13 @@ module Fog
           required_options.each do |param|
             raise ArgumentError, "#{required_options.join(', ')} are required" unless options.key? param
           end
-          raise Fog::Compute::Vsphere::NotFound, "Datacenter #{options['datacenter']} Doesn't Exist!" unless get_datacenter(options['datacenter'])
-          raise Fog::Compute::Vsphere::NotFound, "Template #{options['template_path']} Doesn't Exist!" unless get_virtual_machine(options['template_path'], options['datacenter'])
+          raise ArgumentError, 'cluster option is required' unless options['resource_pool'][0]
+          raise Fog::Vsphere::Compute::NotFound, "Datacenter #{options['datacenter']} Doesn't Exist!" unless get_datacenter(options['datacenter'])
+          raise Fog::Vsphere::Compute::NotFound, "Template #{options['template_path']} Doesn't Exist!" unless get_virtual_machine(options['template_path'], options['datacenter'])
+          raise Fog::Vsphere::Compute::NotFound, "Cluster #{options['resource_pool'][0]} Doesn't Exist in the DC!" unless get_raw_cluster(options["resource_pool"][0], options['datacenter'])
+          raise ArgumentError, 'path option is required' unless options.fetch('dest_folder', '/')
           if options.key?('storage_pod') && !options['storage_pod'].nil? && !get_raw_storage_pod(options['storage_pod'], options['datacenter'])
-            raise Fog::Compute::Vsphere::NotFound, "Storage Pod #{options['storage_pod']} Doesn't Exist!"
+            raise Fog::Vsphere::Compute::NotFound, "Storage Pod #{options['storage_pod']} Doesn't Exist!"
           end
           options
         end
@@ -641,7 +644,7 @@ module Fog
                                                             config: virtual_machine_config_spec,
                                                             customization: customization_spec,
                                                             powerOn: options.key?('power_on') ? options['power_on'] : true,
-                                                            template: false)
+                                                            template: options.key?('template') ? options['template'] : false)
 
           # Perform the actual Clone Task
           # Clone VM on a storage pod
@@ -774,7 +777,7 @@ module Fog
                 device: template_nic
               }
             else
-              interface = Fog::Compute::Vsphere::Interface.new(raw_to_hash(template_nic))
+              interface = Fog::Vsphere::Compute::Interface.new(raw_to_hash(template_nic))
               specs << create_interface(interface, interface.key, :remove, datacenter: datacenter)
             end
           end
@@ -833,7 +836,7 @@ module Fog
         def vm_clone(options = {})
           # Option handling TODO Needs better method of checking
           options = vm_clone_check_options(options)
-          notfound = -> { raise Fog::Compute::Vsphere::NotFound, 'Could not find VM template' }
+          notfound = -> { raise Fog::Vsphere::Compute::NotFound, 'Could not find VM template' }
           template = list_virtual_machines.find(notfound) do |vm|
             vm['name'] == options['template_path'].split('/')[-1]
           end

data/lib/fog/vsphere/requests/compute/vm_config_vnc.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def vm_config_vnc(options = {})
           raise ArgumentError, 'instance_uuid is a required parameter' unless options.key? 'instance_uuid'

data/lib/fog/vsphere/requests/compute/vm_destroy.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def vm_destroy(options = {})
           raise ArgumentError, 'instance_uuid is a required parameter' unless options.key? 'instance_uuid'

data/lib/fog/vsphere/requests/compute/vm_execute.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         # NOTE: you must be using vsphere_rev 5.0 or greater to use this functionality
         # e.g. Fog::Compute.new(provider: "vsphere", vsphere_rev: "5.5", etc)

data/lib/fog/vsphere/requests/compute/vm_migrate.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def vm_migrate(options = {})
           # priority is the only required option, and it has a sane default option.

data/lib/fog/vsphere/requests/compute/vm_power_off.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def vm_power_off(options = {})
           options = { 'force' => false }.merge(options)

data/lib/fog/vsphere/requests/compute/vm_power_on.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def vm_power_on(options = {})
           raise ArgumentError, 'instance_uuid is a required parameter' unless options.key? 'instance_uuid'

data/lib/fog/vsphere/requests/compute/vm_reboot.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def vm_reboot(options = {})
           options = { 'force' => false }.merge(options)

data/lib/fog/vsphere/requests/compute/vm_reconfig_cdrom.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def vm_reconfig_cdrom(options = {})
           raise ArgumentError, 'instance_uuid is a required parameter' unless options.key? 'instance_uuid'

data/lib/fog/vsphere/requests/compute/vm_reconfig_cpus.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def vm_reconfig_cpus(options = {})
           raise ArgumentError, 'cpus is a required parameter' unless options.key? 'cpus'

data/lib/fog/vsphere/requests/compute/vm_reconfig_hardware.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def vm_reconfig_hardware(options = {})
           raise ArgumentError, 'hardware_spec is a required parameter' unless options.key? 'hardware_spec'