fog-vsphere 2.5.0 → 3.0.0

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

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

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

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

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def folder_destroy(path, datacenter_name)
           folder = get_raw_vmfolder(path, datacenter_name)

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

@@ -1,10 +1,10 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def get_cluster(name, datacenter_name)
           cluster = get_raw_cluster(name, datacenter_name)
-          raise(Fog::Compute::Vsphere::NotFound) unless cluster
+          raise(Fog::Vsphere::Compute::NotFound) unless cluster
           cluster_attributes(cluster, datacenter_name)
         end
 
@@ -23,8 +23,9 @@ module Fog
       class Mock
         def get_cluster(name, datacenter_name)
           data[:clusters].find { |c| c[:name] == name && c[:datacenter] == datacenter_name } ||
-            raise(Fog::Compute::Vsphere::NotFound)
+            raise(Fog::Vsphere::Compute::NotFound)
         end
+        alias get_raw_cluster get_cluster
       end
     end
   end

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

@@ -1,10 +1,10 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def get_compute_resource(name, datacenter_name)
           compute_resource = get_raw_compute_resource(name, datacenter_name)
-          raise(Fog::Compute::Vsphere::NotFound) unless compute_resource
+          raise(Fog::Vsphere::Compute::NotFound) unless compute_resource
           compute_resource_attributes(compute_resource, datacenter_name)
         end
 

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

@@ -1,10 +1,10 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def get_datacenter(name)
           dc = find_raw_datacenter(name)
-          raise(Fog::Compute::Vsphere::NotFound) unless dc
+          raise(Fog::Vsphere::Compute::NotFound) unless dc
           { name: dc.name, status: dc.overallStatus, path: raw_getpathmo(dc) }
         end
 
@@ -23,7 +23,7 @@ module Fog
       class Mock
         def get_datacenter(name)
           dc = data[:datacenters][name]
-          raise(Fog::Compute::Vsphere::NotFound) unless dc
+          raise(Fog::Vsphere::Compute::NotFound) unless dc
           dc
         end
       end

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

@@ -1,10 +1,10 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def get_datastore(name, datacenter_name)
           datastore = list_datastores(datacenter: datacenter_name).detect { |ds| ds[:name] == name }
-          raise(Fog::Compute::Vsphere::NotFound) unless datastore
+          raise(Fog::Vsphere::Compute::NotFound) unless datastore
           datastore
         end
 

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

@@ -1,12 +1,12 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def get_folder(path, datacenter_name, type = nil)
           type ||= 'vm'
           # Cycle through all types of folders.
           folder = get_raw_folder(path, datacenter_name, type)
-          raise(Fog::Compute::Vsphere::NotFound) unless folder
+          raise(Fog::Vsphere::Compute::NotFound) unless folder
           folder_attributes(folder, datacenter_name)
         end
 
@@ -23,7 +23,7 @@ module Fog
                end
 
           valid_types = %w[vm network datastore host]
-          raise ArgumentError, "#{type} is unknown" if type.blank?
+          raise ArgumentError, "#{type} is unknown" if type.nil? || type.empty?
           raise "Invalid type (#{type}). Must be one of #{valid_types.join(', ')} " unless valid_types.include?(type.to_s)
           meth = "#{type}Folder"
           dc_root_folder = dc.send(meth)
@@ -40,7 +40,7 @@ module Fog
             # VIM::Folder#inventory since that returns _all_ managed objects of
             # a certain type _and_ their properties.
             sub = last_returned_folder.find(sub_folder, RbVmomi::VIM::Folder)
-            raise Fog::Compute::Vsphere::NotFound, "Could not descend into #{sub_folder}.  Please check your path. #{path}" unless sub
+            raise Fog::Vsphere::Compute::NotFound, "Could not descend into #{sub_folder}.  Please check your path. #{path}" unless sub
             sub
           end
         end
@@ -75,7 +75,7 @@ module Fog
       class Mock
         def get_folder(path, datacenter_name, _type = nil)
           data[:folders].values.find { |f| (f['datacenter'] == datacenter_name) && f['path'].end_with?(path) } ||
-            raise(Fog::Compute::Vsphere::NotFound)
+            raise(Fog::Vsphere::Compute::NotFound)
         end
       end
     end

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def get_host(name, cluster_name, datacenter_name)
           get_raw_host(name, cluster_name, datacenter_name)
@@ -11,7 +11,7 @@ module Fog
         def get_raw_host(name, cluster_name, datacenter_name)
           cluster = get_raw_cluster(cluster_name, datacenter_name)
           cluster.host.find { |host| host.name == name } ||
-            raise(Fog::Compute::Vsphere::NotFound, "no such host #{name}")
+            raise(Fog::Vsphere::Compute::NotFound, "no such host #{name}")
         end
       end
     end

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

@@ -1,12 +1,12 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def get_interface_type(id, servertype, datacenter, _filter = {})
           interfacetype = list_interface_types(filters = { id: id,
                                                            datacenter: datacenter,
                                                            servertype: servertype.id }).first
-          raise(Fog::Compute::Vsphere::NotFound) unless interfacetype
+          raise(Fog::Vsphere::Compute::NotFound) unless interfacetype
           interfacetype
         end
       end

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

@@ -1,10 +1,10 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def get_network(name, datacenter_name)
           network = get_raw_network(name, datacenter_name)
-          raise(Fog::Compute::Vsphere::NotFound) unless network
+          raise(Fog::Vsphere::Compute::NotFound) unless network
           network_attributes(network, datacenter_name)
         end
 
@@ -33,7 +33,7 @@ module Fog
             end
           when :dvs
             # the first distributed virtual switch will do - selected by network - gives control to vsphere
-            proc { |n| (n.name == name || n.key == name) && (n.class.to_s == 'DistributedVirtualPortgroup') }
+            proc { |n| n.is_a?(RbVmomi::VIM::DistributedVirtualPortgroup) && (n.name == name || n.key == name) }
           else
             # the first matching network will do, seems like the non-distributed networks come first
             proc { |n| (n.name == name || (n.is_a?(RbVmomi::VIM::DistributedVirtualPortgroup) && n.key == name)) }

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

@@ -1,10 +1,10 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def get_resource_pool(name, cluster_name, datacenter_name)
           resource_pool = get_raw_resource_pool(name, cluster_name, datacenter_name)
-          raise(Fog::Compute::Vsphere::NotFound) unless resource_pool
+          raise(Fog::Vsphere::Compute::NotFound) unless resource_pool
           resource_pool_attributes(resource_pool, cluster_name, datacenter_name)
         end
 

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

@@ -1,10 +1,10 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def get_server_type(id, datacenter, _filter = {})
           server_type = get_raw_server_type(id, datacenter)
-          raise(Fog::Compute::Vsphere::NotFound) unless server_type
+          raise(Fog::Vsphere::Compute::NotFound) unless server_type
           server_type_attributes(server_type, datacenter)
         end
 
@@ -12,9 +12,9 @@ module Fog
 
         def get_raw_server_type(id, datacenter, _filter = {})
           types = raw_server_types(datacenter)
-          raise(Fog::Compute::Vsphere::NotFound) unless types
+          raise(Fog::Vsphere::Compute::NotFound) unless types
           types = types.select { |servertype| servertype.id == id }.first
-          raise(Fog::Compute::Vsphere::NotFound) unless types
+          raise(Fog::Vsphere::Compute::NotFound) unless types
           types
         end
       end

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

@@ -1,10 +1,10 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def get_storage_pod(name, datacenter_name)
           storage_pod = list_storage_pods(datacenter: datacenter_name).detect { |pod| pod[:name] == name }
-          raise(Fog::Compute::Vsphere::NotFound) unless storage_pod
+          raise(Fog::Vsphere::Compute::NotFound) unless storage_pod
           storage_pod
         end
 

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def get_template(id, datacenter_name = nil)
           convert_vm_mob_ref_to_attr_hash(get_vm_ref(id, datacenter_name))

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def get_virtual_machine(id, datacenter_name = nil, folder = nil, recursive = false)
           # The larger the VM list the longer it will take if not searching based on UUID.
@@ -25,7 +25,7 @@ module Fog
                    raw_datacenters.map { |d| get_vm_by_name(id, d['name'], folder, recursive) }.compact.first
                  end
                end
-          vm ? vm : raise(Fog::Compute::Vsphere::NotFound, "#{id} was not found")
+          vm ? vm : raise(Fog::Vsphere::Compute::NotFound, "#{id} was not found")
         end
 
         def get_vm_by_name(name, dc, folder, recursive)
@@ -67,7 +67,7 @@ module Fog
                  # try to find based on VM name. May need to handle the path of the VM
                  list_virtual_machines('name' => id, 'datacenter' => datacenter_name).first
                end
-          vm ? vm : raise(Fog::Compute::Vsphere::NotFound, "#{id} was not found")
+          vm ? vm : raise(Fog::Vsphere::Compute::NotFound, "#{id} was not found")
         end
       end
     end

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

@@ -1,10 +1,10 @@
 
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def get_vm_first_scsi_controller(vm_id)
-          Fog::Compute::Vsphere::SCSIController.new(get_vm_first_scsi_controller_raw(vm_id))
+          Fog::Vsphere::Compute::SCSIController.new(get_vm_first_scsi_controller_raw(vm_id))
         end
 
         def get_vm_first_scsi_controller_raw(vm_id)

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def host_finish_maintenance(name, cluster_name, datacenter_name, timeout = 0)
           host_ref = get_host(name, cluster_name, datacenter_name)

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def host_shutdown(name, cluster_name, datacenter_name, force = false)
           host_ref = get_host(name, cluster_name, datacenter_name)

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def host_start_maintenance(name, cluster_name, datacenter_name, timeout = 0, evacuate_powered_off_vms = false)
           host_ref = get_host(name, cluster_name, datacenter_name)

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def list_child_snapshots(snapshot, opts = {})
           normalized_snapshot = Hash === snapshot ?

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

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

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

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

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def list_customfields
           connection.serviceContent.customFieldsManager.field.map do |customfield|

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def list_datacenters(_filters = {})
           raw_datacenters.map do |dc|

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def list_datastores(filters = {})
           datacenter_name = filters[:datacenter]
@@ -86,10 +86,10 @@ module Fog
           cluster_name = filters.fetch(:cluster, nil)
           if cluster_name.nil?
             data[:datastores].values.select { |d| d['datacenter'] == datacenter_name } ||
-              raise(Fog::Compute::Vsphere::NotFound)
+              raise(Fog::Vsphere::Compute::NotFound)
           else
             data[:datastores].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_folders.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         # Grabs all sub folders within a given path folder.
         #

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

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

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

@@ -1,7 +1,7 @@
 # rubocop:disable Lint/RescueWithoutErrorClass
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def list_hosts(filters = {})
           cluster = get_raw_cluster(filters[:cluster], filters[:datacenter])