fog-vsphere 2.5.0 → 3.0.0

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

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

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

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

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         # Relocates a VM to different host or datastore.
         #

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def vm_remove_snapshot(vm_id, snapshot_id, remove_children = false)
           vm = servers.get(vm_id)

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

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

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

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Vsphere
+  module Vsphere
+    class Compute
       class Real
         def vm_revert_snapshot(vm_id, snapshot_id)
           vm = servers.get(vm_id)

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

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

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

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

data/lib/fog/vsphere/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Vsphere
-    VERSION = '2.5.0'.freeze
+    VERSION = '3.0.0'.freeze
   end
 end

data/tests/helper.rb

@@ -1,6 +1,9 @@
 require 'simplecov'
 SimpleCov.start
 
+require 'mocha/api'
+Shindo::Tests.send(:include, Mocha::API)
+
 require 'minitest/autorun'
 
 require File.expand_path('../../lib/fog/vsphere', __FILE__)

data/tests/models/compute/cluster_tests.rb

@@ -5,14 +5,14 @@ Shindo.tests('Fog::Compute[:vsphere] | cluster collection', ['vsphere']) do
     clusters = compute.datacenters.first.clusters
 
     test('should not be empty') { !clusters.empty? }
-    test('should be a kind of Fog::Compute::Vsphere::Clusters') { clusters.is_a? Fog::Compute::Vsphere::Clusters }
+    test('should be a kind of Fog::Vsphere::Compute::Clusters') { clusters.is_a? Fog::Vsphere::Compute::Clusters }
     test('should get a cluster') { clusters.get('Solutionscluster').id == '1d4d9a3f-e4e8-4c40-b7fc-263850068fa4' }
   end
 
   tests('A cluster should') do
     cluster = compute.datacenters.first.clusters.get('Solutionscluster')
 
-    test('have datastores') { cluster.datastores.first.is_a? Fog::Compute::Vsphere::Datastore }
-    test('have networks') { cluster.networks.first.is_a? Fog::Compute::Vsphere::Network }
+    test('have datastores') { cluster.datastores.first.is_a? Fog::Vsphere::Compute::Datastore }
+    test('have networks') { cluster.networks.first.is_a? Fog::Vsphere::Compute::Network }
   end
 end

data/tests/models/compute/hosts_tests.rb

@@ -5,7 +5,7 @@ Shindo.tests('Fog::Compute[:vsphere] | hosts collection', ['vsphere']) do
 
   tests('The hosts collection') do
     test('should not be empty') { !hosts.empty? }
-    test('should be a kind of Fog::Compute::Vsphere::Hosts') { hosts.is_a? Fog::Compute::Vsphere::Hosts }
+    test('should be a kind of Fog::Vsphere::Compute::Hosts') { hosts.is_a? Fog::Vsphere::Compute::Hosts }
     test('should get hosts') { hosts.get('host1.example.com').name == 'host1.example.com' }
   end
 end

data/tests/models/compute/rules_tests.rb

@@ -6,7 +6,7 @@ Shindo.tests('Fog::Compute[:vsphere] | rules collection', ['vsphere']) do
 
   tests('The rules collection') do
     test('should not be empty') { !rules.empty? }
-    test('should be a kind of Fog::Compute::Vsphere::Rules') { rules.is_a? Fog::Compute::Vsphere::Rules }
+    test('should be a kind of Fog::Vsphere::Compute::Rules') { rules.is_a? Fog::Vsphere::Compute::Rules }
     test('should get rules') { rules.get('anti-affinity-foo').key == 4242 }
     test('should destroy rules') { rules.first.destroy; rules.reload; rules.empty? }
     test('should create rules') do

data/tests/models/compute/server_tests.rb

@@ -18,12 +18,12 @@ Shindo.tests('Fog::Compute[:vsphere] | server model', ['vsphere']) do
       end
       test('snapshots') do
         test('responds') { server.respond_to? 'snapshots' }
-        test('returns successfully') { server.snapshots.is_a? Fog::Compute::Vsphere::Snapshots }
+        test('returns successfully') { server.snapshots.is_a? Fog::Vsphere::Compute::Snapshots }
       end
       test('find_snapshot') do
         test('responds') { server.respond_to? 'find_snapshot' }
         test('returns successfully') do
-          server.find_snapshot('snapshot-0101').is_a? Fog::Compute::Vsphere::Snapshot
+          server.find_snapshot('snapshot-0101').is_a? Fog::Vsphere::Compute::Snapshot
         end
         test('returns correct snapshot') do
           server.find_snapshot('snapshot-0101').ref == 'snapshot-0101'
@@ -39,7 +39,7 @@ Shindo.tests('Fog::Compute[:vsphere] | server model', ['vsphere']) do
         end
       end
       test('tickets') do
-        test('acquire ticket successfully') { server.acquire_ticket.is_a? Fog::Compute::Vsphere::Ticket }
+        test('acquire ticket successfully') { server.acquire_ticket.is_a? Fog::Vsphere::Compute::Ticket }
       end
     end
     tests('have attributes') do
@@ -69,6 +69,6 @@ Shindo.tests('Fog::Compute[:vsphere] | server model', ['vsphere']) do
         end
       end
     end
-    test('be a kind of Fog::Compute::Vsphere::Server') { server.is_a? Fog::Compute::Vsphere::Server }
+    test('be a kind of Fog::Vsphere::Compute::Server') { server.is_a? Fog::Vsphere::Compute::Server }
   end
 end

data/tests/models/compute/server_unit_tests.rb

@@ -4,7 +4,7 @@ require 'fog/vsphere/models/compute/server'
 
 class TestServer < Minitest::Test
   def test_tools_installed
-    server = Fog::Compute::Vsphere::Server.new
+    server = Fog::Vsphere::Compute::Server.new
     server.tools_state = 'toolsNotRunning'
     server.tools_version = 'guestToolsNotInstalled'
 

data/tests/models/compute/servers_tests.rb

@@ -3,7 +3,7 @@ Shindo.tests('Fog::Compute[:vsphere] | servers collection', ['vsphere']) do
 
   tests('The servers collection') do
     test('should not be empty') { !servers.empty? }
-    test('should be a kind of Fog::Compute::Vsphere::Servers') { servers.is_a? Fog::Compute::Vsphere::Servers }
+    test('should be a kind of Fog::Vsphere::Compute::Servers') { servers.is_a? Fog::Vsphere::Compute::Servers }
     tests('should be able to reload itself').succeeds { servers.reload }
     tests('should be able to get a model') do
       tests('by managed object reference').succeeds { servers.get 'jefftest' }

data/tests/models/compute/tickets_tests.rb

@@ -3,6 +3,6 @@ Shindo.tests('Fog::Compute[:vsphere] | hosts collection', ['vsphere']) do
   server = service.servers.last
 
   tests('The tickets collection') do
-    test('should create a ticket for a server') { service.tickets(server: server).create.is_a? Fog::Compute::Vsphere::Ticket }
+    test('should create a ticket for a server') { service.tickets(server: server).create.is_a? Fog::Vsphere::Compute::Ticket }
   end
 end

data/tests/requests/compute/get_network_tests.rb

@@ -3,24 +3,32 @@ require 'ostruct'
 Shindo.tests('Fog::Compute[:vsphere] | get_network request', ['vsphere']) do
   compute = Fog::Compute[:vsphere]
 
-  class DistributedVirtualPortgroup
-    attr_accessor :name, :dvs_name, :key
-
-    def initialize(attrs)
-      @name = attrs.fetch(:name)
-      @dvs_name = attrs.fetch(:dvs_name)
-      @key = attrs.fetch(:key)
-    end
+  before do
+    mocha_setup
+  end
+  after do
+    mocha_teardown
+  end
 
-    def config
-      OpenStruct.new(distributedVirtualSwitch: OpenStruct.new(name: dvs_name))
-    end
+  def make_fake_dvs(args = {})
+    config = OpenStruct.new(
+      distributedVirtualSwitch: OpenStruct.new(name: args[:dvs_name])
+    )
+    network = stub(args.merge(config: config))
+    network.expects('is_a?')
+           .with(RbVmomi::VIM::DistributedVirtualPortgroup)
+           .returns(true)
+    network
   end
 
-  fake_networks = [OpenStruct.new(name: 'non-dvs'),
-                   DistributedVirtualPortgroup.new(name: 'web1', dvs_name: 'dvs5', key: '4001'),
-                   DistributedVirtualPortgroup.new(name: 'web1', dvs_name: 'dvs11', key: '4001'),
-                   DistributedVirtualPortgroup.new(name: 'other', dvs_name: 'other', key: '4001')]
+  def fake_networks
+    [
+      OpenStruct.new(name: 'non-dvs'),
+      make_fake_dvs(name: 'web1', dvs_name: 'dvs5', key: '4001'),
+      make_fake_dvs(name: 'web1', dvs_name: 'dvs11', key: '4001'),
+      make_fake_dvs(name: 'other', dvs_name: 'other', key: '4001')
+    ]
+  end
 
   tests('#choose_finder should') do
     test('choose the network based on network name and dvs name') do

data/tests/requests/compute/revert_to_snapshot_tests.rb

@@ -2,7 +2,7 @@ Shindo.tests('Fog::Compute[:vsphere] | revert_to_snapshot request', ['vsphere'])
   compute = Fog::Compute[:vsphere]
 
   tests('The response should') do
-    response = compute.revert_to_snapshot(Fog::Compute::Vsphere::Snapshot.new(service: 1))
+    response = compute.revert_to_snapshot(Fog::Vsphere::Compute::Snapshot.new(service: 1))
     test('be a kind of Hash') { response.is_a? Hash }
     test('should have a task_state key') { response.key? 'state' }
   end

data/tests/requests/compute/update_vm_tests.rb

@@ -2,7 +2,7 @@ require 'ostruct'
 
 Shindo.tests('Fog::Compute[:vsphere] | update_vm request', 'vsphere') do
   compute = Fog::Compute[:vsphere]
-  server = Fog::Compute::Vsphere::Server.new
+  server = Fog::Vsphere::Compute::Server.new
 
   tests('UPDATE vm | The return value should') do
     response = compute.update_vm(server)

data/tests/requests/compute/vm_clone_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests('Fog::Compute[:vsphere] | vm_clone request', 'vsphere') do
+Shindo.tests('Fog::Compute[:vsphere] | vm_clone request', ['vsphere']) do
   # require 'guid'
   compute = Fog::Compute[:vsphere]
   response = nil
@@ -6,10 +6,15 @@ Shindo.tests('Fog::Compute[:vsphere] | vm_clone request', 'vsphere') do
 
   template = 'rhel64'
   datacenter = 'Solutions'
+  default_params = {
+    'datacenter' => datacenter,
+    'template_path' => template,
+    'resource_pool' => ['Solutionscluster', 'Resources']
+  }
 
   tests('Standard Clone | The return value should') do
     servers_size = compute.servers.size
-    response = compute.vm_clone('datacenter' => datacenter, 'template_path' => template, 'name' => 'cloning_vm', 'wait' => true)
+    response = compute.vm_clone(default_params.merge('name' => 'cloning_vm', 'wait' => true))
     test('be a kind of Hash') { response.is_a? Hash }
     %w[vm_ref new_vm task_ref].each do |key|
       test("have a #{key} key") { response.key? key }
@@ -20,7 +25,7 @@ Shindo.tests('Fog::Compute[:vsphere] | vm_clone request', 'vsphere') do
 
   tests('Standard Clone setting ram and cpu | The return value should') do
     servers_size = compute.servers.size
-    response = compute.vm_clone('datacenter' => datacenter, 'template_path' => template, 'name' => 'cloning_vm', 'memoryMB' => '8192', 'numCPUs' => '8', 'wait' => true)
+    response = compute.vm_clone(default_params.merge('name' => 'cloning_vm', 'memoryMB' => '8192', 'numCPUs' => '8', 'wait' => true))
     test('be a kind of Hash') { response.is_a? Hash }
     %w[vm_ref new_vm task_ref].each do |key|
       test("have a #{key} key") { response.key? key }
@@ -31,7 +36,7 @@ Shindo.tests('Fog::Compute[:vsphere] | vm_clone request', 'vsphere') do
 
   tests('Linked Clone | The return value should') do
     servers_size = compute.servers.size
-    response = compute.vm_clone('datacenter' => datacenter, 'template_path' => template, 'name' => 'cloning_vm_linked', 'wait' => 1, 'linked_clone' => true)
+    response = compute.vm_clone(default_params.merge('name' => 'cloning_vm_linked', 'wait' => 1, 'linked_clone' => true))
     test('be a kind of Hash') { response.is_a? Hash }
     %w[vm_ref new_vm task_ref].each do |key|
       test("have a #{key} key") { response.key? key }
@@ -42,7 +47,7 @@ Shindo.tests('Fog::Compute[:vsphere] | vm_clone request', 'vsphere') do
 
   tests('When invalid input is presented') do
     raises(ArgumentError, 'it should raise ArgumentError') { compute.vm_clone(foo: 1) }
-    raises(Fog::Compute::Vsphere::NotFound, 'it should raise Fog::Compute::Vsphere::NotFound when the UUID is not a string') do
+    raises(Fog::Vsphere::Compute::NotFound, 'it should raise Fog::Vsphere::Compute::NotFound when the UUID is not a string') do
       pending # require 'guid'
       compute.vm_clone('instance_uuid' => Guid.from_s(template), 'name' => 'jefftestfoo')
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-vsphere
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 3.0.0
 platform: ruby
 authors:
 - J.R. Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-16 00:00:00.000000000 Z
+date: 2019-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -28,16 +28,22 @@ dependencies:
   name: rbvmomi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.9'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.9'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +114,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.50.0
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: shindo
   requirement: !ruby/object:Gem::Requirement
@@ -142,6 +162,7 @@ files:
 - README.md
 - Rakefile
 - fog-vsphere.gemspec
+- lib/fog-vsphere.rb
 - lib/fog/bin/vsphere.rb
 - lib/fog/vsphere.rb
 - lib/fog/vsphere/compute.rb
@@ -328,7 +349,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Module for the 'fog' gem to support VMware vSphere.