Change module namespace to Fog::Vsphere::Compute

* Transfer to preferred namespace Fog::Vsphere::Compute

* Add Upgrade notice

* bump version

.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:

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,

lib/fog-vsphere.rb

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

lib/fog/bin/vsphere.rb

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

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 @@ class SecurityError < ServiceError; end
       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

lib/fog/vsphere/compute.rb

@@ -2,8 +2,8 @@
 # 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

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
 

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)

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
 

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 = {})

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
 

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
 

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

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 @@ def all(_filters = {})
         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'

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

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)

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
 

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 = {})

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
 

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 = {})

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
 

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 @@ def all(_filters = {})
 
         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

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
 

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

@@ -1,20 +1,20 @@
 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
 
         def all(_filters = {})
           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,17 +28,17 @@ def get(id)
           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
 
             raise 'interfaces should have vm or template'
           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
 

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
 

lib/fog/vsphere/models/compute/interfacetypes.rb

@@ -1,17 +1,17 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Interfacetypes < Fog::Collection
         autoload :Interfacetype, File.expand_path('../interfacetype', __FILE__)
 
-        model Fog::Compute::Vsphere::Interfacetype
+        model Fog::Vsphere::Compute::Interfacetype
         attr_accessor :datacenter
         attr_accessor :servertype
 
         def all(filters = {})
           requires :servertype
           case servertype
-          when Fog::Compute::Vsphere::Servertype
+          when Fog::Vsphere::Compute::Servertype
             load service.list_interface_types(filters.merge(datacenter: datacenter,
                                                             servertype: servertype.id))
           else
@@ -23,7 +23,7 @@ def get(id)
           requires :servertype
           requires :datacenter
           new service.get_interface_type id, servertype, datacenter
-        rescue Fog::Compute::Vsphere::NotFound
+        rescue Fog::Vsphere::Compute::NotFound
           nil
         end
       end

lib/fog/vsphere/models/compute/network.rb

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