fog-vsphere 2.5.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45a6779fc97119bf814c810a3953731bb574e97dc2a806922cfe7291f34c5acb
-  data.tar.gz: 8606ad0e48b0715b2cfcbbc4e2d1e5976f93a6bce82942fb456d8c3acdd37b85
+  metadata.gz: 3104c3caaef8f008444f574b175899511cfb25ce937ab983ea7e2ca6c0973b97
+  data.tar.gz: 7272ca524f7453b3984522de5e493c7f394681f9a2a7624f88001085857240a0
 SHA512:
-  metadata.gz: 02a8cf0c88859c98f9afb68f69b78b634e7db977a37ee457923c7bcad9cfe75721663bd353a974f16c9dbd3a93b11b5341f89a0b5e23836cf25b110a66925702
-  data.tar.gz: e01bdf1f3c62f9be49e1a0d056823e411c49d5d95d736c3e668549442f9a36eafd9d6622b9f61126934f59eb96ce319abc94bf9aefa254265bf6cdc1d9927e49
+  metadata.gz: 00a479bae8d9529d030289f650ddb16785ff33742e50f8059897c3189a87b9fdba401dd41b77cf8b533778d2953f665d0c7386e3d6c26b02f1a8c3cf984dfe11
+  data.tar.gz: f1185b6844ae1b427b9f4064f04ce10ab3198bca8b822e3c6bddaaf8cc78494c8ab66acfe73a7bb705e5a92b7bf7f3f8cd9a02d7499ca0628f3cdbd1b4606b69

data/.rubocop_todo.yml

@@ -94,6 +94,10 @@ Metrics/ParameterLists:
 Metrics/PerceivedComplexity:
   Max: 159
 
+Naming/FileName:
+  Exclude:
+    - 'lib/fog-vsphere.rb'
+
 # Offense count: 10
 Style/CaseEquality:
   Exclude:

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 sudo: false
-before_install: gem install bundler
+before_install: gem install bundler -v 1.17.3
 matrix:
   allow_failures:
     - rvm: jruby-head

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## v3.0.0
+
+* Change module namespace to Fog::Vsphere::Compute (#192)
+* Update ruby string method to prevent traceback (#189)
+* Allow builds with rbvmomi 2.0.0+ (#187)
+* Raise error in case path and cluster do not exist (#183)
+* Update vm_clone template to not always be false (#180)
+* fetch datacenter by vm_mob_ref.path if user does not have permission to access hosts (#176)
+
 ## v2.5.0
 
 * Expose extraConfig from user_data for vm_clone #172

data/README.md

@@ -26,6 +26,12 @@ Or install it yourself as:
 gem install fog-vsphere
 ```
 
+## Upgrading
+
+In version 3.0.0 we have changed the namespacing of `Compute` service.
+`Fog::Compute::Vsphere` became `Fog::Vsphere::Compute` as recommended by fog-core.
+We hope we are not causing any issues as `Fog::Compute[:vsphere]` is only public API.
+
 ## Usage
 
 To connect to your vSphere instance with Fog vSphere:
@@ -67,7 +73,7 @@ compute.list_virtual_machines
 
 # List a VM's SCSI controllers
 compute.list_vm_scsi_controllers('ab589f9a-af35-428e-9690-9b96587d86f3')
-#=> [<Fog::Compute::Vsphere::SCSIController
+#=> [<Fog::Vsphere::Compute::SCSIController
 #=>   shared_bus='noSharing',
 #=>   type='VirtualLsiLogicController',
 #=>   unit_number=7,

data/fog-vsphere.gemspec

@@ -22,12 +22,13 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.0.0'
 
   spec.add_runtime_dependency 'fog-core'
-  spec.add_runtime_dependency 'rbvmomi', '~> 1.9'
+  spec.add_runtime_dependency 'rbvmomi', '>= 1.9', '< 3'
 
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'pry', '~> 0.10'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'minitest', '~> 5.8'
   spec.add_development_dependency 'rubocop', '~> 0.50.0'
+  spec.add_development_dependency 'mocha', '~> 1.8'
   spec.add_development_dependency 'shindo', '~> 0.3'
 end

data/lib/fog-vsphere.rb

@@ -0,0 +1 @@
+require 'fog/vsphere'

data/lib/fog/bin/vsphere.rb

@@ -3,7 +3,7 @@ class Vsphere < Fog::Bin
     def class_for(key)
       case key
       when :compute
-        Fog::Compute::Vsphere
+        Fog::Vsphere::Compute
       else
         raise ArgumentError, "Unrecognized service: #{key}"
       end

data/lib/fog/vsphere.rb

@@ -1,10 +1,6 @@
 require 'fog/core'
 
 module Fog
-  module Compute
-    autoload :Vsphere, File.expand_path('../vsphere/compute.rb', __FILE__)
-  end
-
   module Vsphere
     extend Fog::Provider
 
@@ -14,6 +10,8 @@ module Fog
       class NotFound < ServiceError; end
     end
 
+    autoload :Compute, File.expand_path('../vsphere/compute', __FILE__)
+
     service(:compute, 'Compute')
 
     # This helper was originally added as Fog.class_as_string and moved to core but only used here

data/lib/fog/vsphere/compute.rb

@@ -1,8 +1,9 @@
 require 'digest/sha2'
 # rubocop:disable Lint/RescueWithoutErrorClass
+# rubocop:disable Metrics/ModuleLength
 module Fog
-  module Compute
-    class Vsphere < Fog::Service
+  module Vsphere
+    class Compute < Fog::Service
       requires :vsphere_username, :vsphere_password, :vsphere_server
       recognizes :vsphere_port, :vsphere_path, :vsphere_ns
       recognizes :vsphere_rev, :vsphere_ssl, :vsphere_expected_pubkey_hash
@@ -199,12 +200,28 @@ module Fog
             # finished cloning.
             if attrs['hypervisor'].is_a?(RbVmomi::VIM::HostSystem)
               host = attrs['hypervisor']
+
+              # @note
+              #   - User might not have permission to access host
+              #   - i.e. host.name might raise NoPermission error
+              has_permission_to_access_host = true
+              begin
+                host.name
+              rescue RbVmomi::Fault => e
+                raise e unless e.message && e.message['NoPermission:']
+                has_permission_to_access_host = false
+              end
+
               attrs['datacenter'] = proc {
                 begin
-                           parent_attribute(host.path, :datacenter)[1]
-                         rescue
-                           nil
-                         end
+                  if has_permission_to_access_host
+                    parent_attribute(host.path, :datacenter)[1]
+                  else
+                    parent_attribute(vm_mob_ref.path, :datacenter)[1]
+                  end
+                rescue
+                  nil
+                end
               }
               attrs['cluster'] = proc {
                 begin

data/lib/fog/vsphere/models/compute/cdrom.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Cdrom < Fog::Model
         identity :key
 

data/lib/fog/vsphere/models/compute/cdroms.rb

@@ -1,9 +1,9 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Cdroms < Fog::Collection
         attribute :instance_uuid, alias: :server_id
-        model Fog::Compute::Vsphere::Cdrom
+        model Fog::Vsphere::Compute::Cdrom
 
         def all(_filters = {})
           load service.list_vm_cdroms(instance_uuid)

data/lib/fog/vsphere/models/compute/cluster.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Cluster < Fog::Model
         identity :id
 

data/lib/fog/vsphere/models/compute/clusters.rb

@@ -1,10 +1,10 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Clusters < Fog::Collection
         autoload :Cluster, File.expand_path('../cluster', __FILE__)
 
-        model Fog::Compute::Vsphere::Cluster
+        model Fog::Vsphere::Compute::Cluster
         attr_accessor :datacenter
 
         def all(filters = {})

data/lib/fog/vsphere/models/compute/customfield.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Customfield < Fog::Model
         identity :key
 

data/lib/fog/vsphere/models/compute/customfields.rb

@@ -1,10 +1,10 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Customfields < Fog::Collection
         autoload :Customfield, File.expand_path('../customfield', __FILE__)
 
-        model Fog::Compute::Vsphere::Customfield
+        model Fog::Vsphere::Compute::Customfield
 
         attr_accessor :vm
 

data/lib/fog/vsphere/models/compute/customvalue.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Customvalue < Fog::Model
         attribute :value
         attribute :key

data/lib/fog/vsphere/models/compute/customvalues.rb

@@ -1,17 +1,17 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Customvalues < Fog::Collection
         autoload :Customvalue, File.expand_path('../customvalue', __FILE__)
 
-        model Fog::Compute::Vsphere::Customvalue
+        model Fog::Vsphere::Compute::Customvalue
 
         attr_accessor :vm
 
         def all(_filters = {})
           requires :vm
           case vm
-          when Fog::Compute::Vsphere::Server
+          when Fog::Vsphere::Compute::Server
             load service.list_vm_customvalues(vm.id)
           else
             raise 'customvalues should have vm'
@@ -21,7 +21,7 @@ module Fog
         def get(key)
           requires :vm
           case vm
-          when Fog::Compute::Vsphere::Server
+          when Fog::Vsphere::Compute::Server
             load service.list_vm_customvalues(vm.id)
           else
             raise 'customvalues should have vm'

data/lib/fog/vsphere/models/compute/datacenter.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Datacenter < Fog::Model
         identity :id
         attribute :name

data/lib/fog/vsphere/models/compute/datacenters.rb

@@ -1,10 +1,10 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Datacenters < Fog::Collection
         autoload :Datacenter, File.expand_path('../datacenter', __FILE__)
 
-        model Fog::Compute::Vsphere::Datacenter
+        model Fog::Vsphere::Compute::Datacenter
 
         def all(filters = {})
           load service.list_datacenters(filters)

data/lib/fog/vsphere/models/compute/datastore.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Datastore < Fog::Model
         identity :id
 

data/lib/fog/vsphere/models/compute/datastores.rb

@@ -1,10 +1,10 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Datastores < Fog::Collection
         autoload :Datastore, File.expand_path('../datastore', __FILE__)
 
-        model Fog::Compute::Vsphere::Datastore
+        model Fog::Vsphere::Compute::Datastore
         attr_accessor :datacenter, :cluster
 
         def all(filters = {})

data/lib/fog/vsphere/models/compute/folder.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Folder < Fog::Model
         identity :id
 

data/lib/fog/vsphere/models/compute/folders.rb

@@ -1,10 +1,10 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Folders < Fog::Collection
         autoload :Folder, File.expand_path('../folder', __FILE__)
 
-        model Fog::Compute::Vsphere::Folder
+        model Fog::Vsphere::Compute::Folder
         attr_accessor :datacenter, :type, :path
 
         def all(filters = {})

data/lib/fog/vsphere/models/compute/host.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Host < Fog::Model
         identity :name
 

data/lib/fog/vsphere/models/compute/hosts.rb

@@ -1,11 +1,11 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Hosts < Fog::Collection
         attribute :datacenter
         attribute :cluster
 
-        model Fog::Compute::Vsphere::Host
+        model Fog::Vsphere::Compute::Host
 
         def all(_filters = {})
           requires :datacenter, :cluster
@@ -14,7 +14,7 @@ module Fog
 
         def get(name)
           all.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/models/compute/interface.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Interface < Fog::Model
         SAVE_MUTEX = Mutex.new
 

data/lib/fog/vsphere/models/compute/interfaces.rb

@@ -1,10 +1,10 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Interfaces < Fog::Collection
         autoload :Interface, File.expand_path('../interface', __FILE__)
 
-        model Fog::Compute::Vsphere::Interface
+        model Fog::Vsphere::Compute::Interface
 
         attribute :server_id
 
@@ -12,9 +12,9 @@ module Fog
           requires :server_id
 
           case server
-          when Fog::Compute::Vsphere::Server
+          when Fog::Vsphere::Compute::Server
             load service.list_vm_interfaces(server.id)
-          when Fog::Compute::Vsphere::Template
+          when Fog::Vsphere::Compute::Template
             load service.list_template_interfaces(server.id)
           else
             raise 'interfaces should have vm or template'
@@ -28,9 +28,9 @@ module Fog
           requires :server_id
 
           case server
-          when Fog::Compute::Vsphere::Server
+          when Fog::Vsphere::Compute::Server
             interface = service.get_vm_interface(server.id, key: id, mac: id, name: id, datacenter: server.datacenter)
-          when Fog::Compute::Vsphere::Template
+          when Fog::Vsphere::Compute::Template
             interface = service.get_template_interfaces(server.id, key: id, mac: id, name: id)
           else
 
@@ -38,7 +38,7 @@ module Fog
           end
 
           if interface
-            Fog::Compute::Vsphere::Interface.new(interface.merge(server_id: server.id, service: service))
+            Fog::Vsphere::Compute::Interface.new(interface.merge(server_id: server.id, service: service))
           end
         end
 

data/lib/fog/vsphere/models/compute/interfacetype.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Interfacetype < Fog::Model
         identity :id