fog-vsphere 2.1.1 → 2.2.0

data/tests/models/compute/tickets_tests.rb

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

data/tests/requests/compute/current_time_tests.rb

@@ -1,12 +1,10 @@
 Shindo.tests('Fog::Compute[:vsphere] | current_time request', ['vsphere']) do
-
   compute = Fog::Compute[:vsphere]
 
   tests('The response should') do
     response = compute.current_time
-    test('be a kind of Hash') { response.kind_of? Hash }
+    test('be a kind of Hash') { response.is_a? Hash }
     test('have a current_time key') { response.key? 'current_time' }
-    test('have a current_time key with a Time value') { response['current_time'].kind_of? Time }
+    test('have a current_time key with a Time value') { response['current_time'].is_a? Time }
   end
-
 end

data/tests/requests/compute/folder_destroy_tests.rb

@@ -1,21 +1,19 @@
 Shindo.tests('Fog::Compute[:vsphere] | folder_destroy request', ['vsphere']) do
-
   compute = Fog::Compute[:vsphere]
 
-  empty_folder = "/Solutions/empty"
-  full_folder  = "/Solutions/wibble"
-  datacenter   = "Solutions"
+  empty_folder = '/Solutions/empty'
+  full_folder  = '/Solutions/wibble'
+  datacenter   = 'Solutions'
 
   tests('The response should') do
     response = compute.folder_destroy(empty_folder, datacenter)
-    test('be a kind of Hash') { response.kind_of? Hash }
+    test('be a kind of Hash') { response.is_a? Hash }
     test('should have a task_state key') { response.key? 'task_state' }
   end
-  
+
   tests('When folder is not empty') do
     raises(Fog::Vsphere::Errors::ServiceError, 'raises ServiceError') do
       compute.folder_destroy(full_folder, datacenter)
     end
   end
-
 end

data/tests/requests/compute/get_network_tests.rb

@@ -1,50 +1,47 @@
 require 'ostruct'
 
 Shindo.tests('Fog::Compute[:vsphere] | get_network request', ['vsphere']) do
-
   compute = Fog::Compute[:vsphere]
 
-
   class DistributedVirtualPortgroup
-    attr_accessor :name, :dvs_name
+    attr_accessor :name, :dvs_name, :key
 
-    def initialize attrs
+    def initialize(attrs)
       @name = attrs.fetch(:name)
       @dvs_name = attrs.fetch(:dvs_name)
+      @key = attrs.fetch(:key)
     end
 
     def config
-      OpenStruct.new( :distributedVirtualSwitch => OpenStruct.new(:name => dvs_name))
+      OpenStruct.new(distributedVirtualSwitch: OpenStruct.new(name: dvs_name))
     end
   end
 
-  fake_networks = [OpenStruct.new(:name => 'non-dvs'),
-                   DistributedVirtualPortgroup.new( :name => 'web1', :dvs_name => 'dvs5'),
-                   DistributedVirtualPortgroup.new( :name => 'web1', :dvs_name => 'dvs11'),
-                   DistributedVirtualPortgroup.new( :name => 'other', :dvs_name => 'other'),
-                  ]
-
+  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')]
 
   tests('#choose_finder should') do
-    test('choose the network based on network name and dvs name'){
+    test('choose the network based on network name and dvs name') do
       finder = compute.send(:choose_finder, 'web1', 'dvs11')
-      found_network = fake_networks.find{ |n| finder.call(n) }
+      found_network = fake_networks.find { |n| finder.call(n) }
       found_network.name == 'web1' && found_network.dvs_name == 'dvs11'
-    }
-    test('choose the network based on network name and any dvs'){
+    end
+    test('choose the network based on network name and any dvs') do
       finder = compute.send(:choose_finder, 'web1', :dvs)
-      found_network = fake_networks.find{ |n| finder.call(n) }
+      found_network = fake_networks.find { |n| finder.call(n) }
       found_network.name == 'web1' && found_network.dvs_name == 'dvs5'
-    }
-    test('choose the network based on network name only'){
+    end
+    test('choose the network based on network name only') do
       finder = compute.send(:choose_finder, 'other', nil)
-      found_network = fake_networks.find{ |n| finder.call(n) }
+      found_network = fake_networks.find { |n| finder.call(n) }
       found_network.name == 'other' && found_network.dvs_name == 'other'
-    }
-    test('choose the network based on network name only for non-dvs'){
+    end
+    test('choose the network based on network name only for non-dvs') do
       finder = compute.send(:choose_finder, 'non-dvs', nil)
-      found_network = fake_networks.find{ |n| finder.call(n) }
+      found_network = fake_networks.find { |n| finder.call(n) }
       found_network.name == 'non-dvs' && found_network.class.name.to_s == 'OpenStruct'
-    }
+    end
   end
 end

data/tests/requests/compute/list_child_snapshots_tests.rb

@@ -1,10 +1,9 @@
 Shindo.tests('Fog::Compute[:vsphere] | list_child_snapshots request', ['vsphere']) do
-
   compute = Fog::Compute[:vsphere]
 
   tests('The response should') do
     response = compute.list_child_snapshots('snapshot-0101')
-    test('be a kind of Array') { response.kind_of? Array }
+    test('be a kind of Array') { response.is_a? Array }
     test('it should contains Hashes') { response.all? { |i| Hash === i } }
   end
 end

data/tests/requests/compute/list_clusters_tests.rb

@@ -1,11 +1,10 @@
 Shindo.tests('Fog::Compute[:vsphere] | list_clusters request', ['vsphere']) do
-  tests("When listing all clusters") do
-
+  tests('When listing all clusters') do
     response = Fog::Compute[:vsphere].list_clusters
-    test("Clusters extracted from folders... ") {response.length == 4}
+    test('Clusters extracted from folders... ') { response.length == 4 }
 
-    tests("The response data format ...") do
-      test("be a kind of Hash") { response.kind_of? Array }
+    tests('The response data format ...') do
+      test('be a kind of Hash') { response.is_a? Array }
     end
   end
-end
+end

data/tests/requests/compute/list_datastores_tests.rb

@@ -1,18 +1,17 @@
 Shindo.tests('Fog::Compute[:vsphere] | list_datastores request', ['vsphere']) do
-
   compute = Fog::Compute[:vsphere]
 
   tests('The response with datastore filter should') do
-    response = compute.list_datastores(:datacenter => 'Solutions')
-    test('be a kind of Array') { response.kind_of? Array }
+    response = compute.list_datastores(datacenter: 'Solutions')
+    test('be a kind of Array') { response.is_a? Array }
     test('contain Hashes') { response.all? { |i| Hash === i } }
-    test("have 2 elements") {response.length == 2}
+    test('have 2 elements') { response.length == 2 }
   end
 
   tests('The response with cluster filter should') do
-    response = compute.list_datastores(:datacenter => 'Solutions', :cluster => 'Solutionscluster')
-    test('be a kind of Array') { response.kind_of? Array }
+    response = compute.list_datastores(datacenter: 'Solutions', cluster: 'Solutionscluster')
+    test('be a kind of Array') { response.is_a? Array }
     test('contain Hashes') { response.all? { |i| Hash === i } }
-    test("have a single element") {response.length == 1}
+    test('have a single element') { response.length == 1 }
   end
 end

data/tests/requests/compute/list_hosts_tests.rb

@@ -1,11 +1,10 @@
 Shindo.tests('Fog::Compute[:vsphere] | list_hosts request', ['vsphere']) do
-
   compute = Fog::Compute[:vsphere]
 
   tests('The response should') do
-    response = compute.list_hosts(:datacenter => 'Solutions', :cluster => 'Solutionscluster')
-    test('be a kind of Array') { response.kind_of? Array }
+    response = compute.list_hosts(datacenter: 'Solutions', cluster: 'Solutionscluster')
+    test('be a kind of Array') { response.is_a? Array }
     test('contain Hashes') { response.all? { |i| Hash === i } }
-    test("have 1 element") {response.length == 1}
+    test('have 1 element') { response.length == 1 }
   end
 end

data/tests/requests/compute/list_networks_tests.rb

@@ -1,18 +1,17 @@
 Shindo.tests('Fog::Compute[:vsphere] | list_networks request', ['vsphere']) do
-
   compute = Fog::Compute[:vsphere]
 
   tests('The response with datastore filter should') do
-    response = compute.list_networks(:datacenter => 'Solutions')
-    test('be a kind of Array') { response.kind_of? Array }
+    response = compute.list_networks(datacenter: 'Solutions')
+    test('be a kind of Array') { response.is_a? Array }
     test('contain Hashes') { response.all? { |i| Hash === i } }
-    test("have 2 elements") {response.length == 2}
+    test('have 2 elements') { response.length == 2 }
   end
 
   tests('The response with cluster filter should') do
-    response = compute.list_networks(:datacenter => 'Solutions', :cluster => 'Solutionscluster')
-    test('be a kind of Array') { response.kind_of? Array }
+    response = compute.list_networks(datacenter: 'Solutions', cluster: 'Solutionscluster')
+    test('be a kind of Array') { response.is_a? Array }
     test('contain Hashes') { response.all? { |i| Hash === i } }
-    test("have a single element") {response.length == 1}
+    test('have a single element') { response.length == 1 }
   end
 end

data/tests/requests/compute/list_storage_pods_test.rb

@@ -1,10 +1,9 @@
 Shindo.tests('Fog::Compute[:vsphere] | list_storage_pods request', ['vsphere']) do
-  tests("When listing all storage pods") do
-
+  tests('When listing all storage pods') do
     response = Fog::Compute[:vsphere].list_storage_pods
 
-    tests("The response data format ...") do
-      test("be a kind of Hash") { response.kind_of? Array }
+    tests('The response data format ...') do
+      test('be a kind of Hash') { response.is_a? Array }
     end
   end
 end

data/tests/requests/compute/list_virtual_machines_tests.rb

@@ -1,38 +1,34 @@
 Shindo.tests('Fog::Compute[:vsphere] | list_virtual_machines request', ['vsphere']) do
-
-  tests("When listing all machines") do
-
+  tests('When listing all machines') do
     response = Fog::Compute[:vsphere].list_virtual_machines
 
-    tests("The response data format ...") do
-      test("be a kind of Hash") { response.kind_of? Array }
+    tests('The response data format ...') do
+      test('be a kind of Hash') { response.is_a? Array }
     end
   end
 
-  tests("When providing an instance_uuid") do
-
+  tests('When providing an instance_uuid') do
     # pending unless Fog.mock?
 
-    tests("that does exist") do
-      uuid = "5029c440-85ee-c2a1-e9dd-b63e39364603"
-      response = Fog::Compute[:vsphere].list_virtual_machines({'instance_uuid' => uuid})
+    tests('that does exist') do
+      uuid = '5029c440-85ee-c2a1-e9dd-b63e39364603'
+      response = Fog::Compute[:vsphere].list_virtual_machines('instance_uuid' => uuid)
 
-      tests("The response should") do
-        test("contain one vm") { response.length == 1 }
-        test("contain that is an attribute hash") { response[0].kind_of? Hash }
-        test("find jefftest") { response.first['name'] == 'jefftest' }
+      tests('The response should') do
+        test('contain one vm') { response.length == 1 }
+        test('contain that is an attribute hash') { response[0].is_a? Hash }
+        test('find jefftest') { response.first['name'] == 'jefftest' }
       end
     end
 
-    tests("that does not exist or is a template") do
-      %w{ does-not-exist-and-is-not-a-uuid 50323f93-6835-1178-8b8f-9e2109890e1a }.each do |uuid|
-        response = Fog::Compute[:vsphere].list_virtual_machines({'instance_uuid' => uuid})
+    tests('that does not exist or is a template') do
+      %w[does-not-exist-and-is-not-a-uuid 50323f93-6835-1178-8b8f-9e2109890e1a].each do |uuid|
+        response = Fog::Compute[:vsphere].list_virtual_machines('instance_uuid' => uuid)
 
-        tests("The response should") do
-          test("be empty") { response.empty? }
+        tests('The response should') do
+          test('be empty') { response.empty? }
         end
       end
     end
   end
-
 end

data/tests/requests/compute/list_vm_cdroms_tests.rb

@@ -1,10 +1,9 @@
 Shindo.tests('Fog::Compute[:vsphere] | list_vm_cdroms request', ['vsphere']) do
-
   compute = Fog::Compute[:vsphere]
 
   tests('The response should') do
     response = compute.list_vm_cdroms('5032c8a5-9c5e-ba7a-3804-832a03e16381')
-    test('be a kind of Array') { response.kind_of? Array }
+    test('be a kind of Array') { response.is_a? Array }
     test('it should contains Hashes') { response.all? { |i| Hash === i } }
   end
 end

data/tests/requests/compute/list_vm_snapshots_tests.rb

@@ -1,10 +1,9 @@
 Shindo.tests('Fog::Compute[:vsphere] | list_vm_snapshots request', ['vsphere']) do
-
   compute = Fog::Compute[:vsphere]
 
   tests('The response should') do
     response = compute.list_vm_snapshots('5032c8a5-9c5e-ba7a-3804-832a03e16381')
-    test('be a kind of Array') { response.kind_of? Array }
+    test('be a kind of Array') { response.is_a? Array }
     test('it should contains Hashes') { response.all? { |i| Hash === i } }
   end
 end

data/tests/requests/compute/modify_vm_cdrom_tests.rb

@@ -1,21 +1,20 @@
 Shindo.tests('Fog::Compute[:vsphere] | modify_vm_cdrom request', ['vsphere']) do
-
   compute = Fog::Compute[:vsphere]
 
   modify_target = '5032c8a5-9c5e-ba7a-3804-832a03e16381'
   modify_cdrom = compute.cdroms.new(
-    instance_uuid: modify_target,
+    instance_uuid: modify_target
   )
 
   tests('When adding a cdrom the response should') do
     response = compute.add_vm_cdrom(modify_cdrom)
-    test('be a kind of Hash') { response.kind_of? Hash }
+    test('be a kind of Hash') { response.is_a? Hash }
     test('should have a task_state key') { response.key? 'task_state' }
   end
 
   tests('When destroying a cdrom the response should') do
     response = compute.destroy_vm_cdrom(modify_cdrom)
-    test('be a kind of Hash') { response.kind_of? Hash }
+    test('be a kind of Hash') { response.is_a? Hash }
     test('should have a task_state key') { response.key? 'task_state' }
   end
 end

data/tests/requests/compute/revert_to_snapshot_tests.rb

@@ -1,15 +1,13 @@
 Shindo.tests('Fog::Compute[:vsphere] | revert_to_snapshot request', ['vsphere']) do
-
   compute = Fog::Compute[:vsphere]
 
   tests('The response should') do
-    response = compute.revert_to_snapshot(Fog::Compute::Vsphere::Snapshot.new(:service => 1))
-    test('be a kind of Hash') { response.kind_of? Hash }
+    response = compute.revert_to_snapshot(Fog::Compute::Vsphere::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
 
   tests('The expected options') do
     raises(ArgumentError, 'raises ArgumentError when input param is missing') { compute.revert_to_snapshot(nil) }
   end
-
 end

data/tests/requests/compute/set_vm_customvalue_tests.rb

@@ -1,5 +1,4 @@
 Shindo.tests('Fog::Compute[:vsphere] | set_vm_customvalue request', ['vsphere']) do
-
   compute = Fog::Compute[:vsphere]
 
   instance_uuid = '50137835-88a1-436e-768e-9b2677076e67'
@@ -16,5 +15,4 @@ Shindo.tests('Fog::Compute[:vsphere] | set_vm_customvalue request', ['vsphere'])
     raises(ArgumentError, 'raises ArgumentError when custom_key option is missing') { compute.set_vm_customvalue(instance_uuid) }
     raises(ArgumentError, 'raises ArgumentError when custom_value option is missing') { compute.set_vm_customvalue(instance_uuid, custom_key) }
   end
-
 end

data/tests/requests/compute/update_vm_tests.rb

@@ -0,0 +1,13 @@
+require 'ostruct'
+
+Shindo.tests('Fog::Compute[:vsphere] | update_vm request', 'vsphere') do
+  compute = Fog::Compute[:vsphere]
+  server = Fog::Compute::Vsphere::Server.new
+
+  tests('UPDATE vm | The return value should') do
+    response = compute.update_vm(server)
+    test('be a kind of Hash') { response.is_a? Hash }
+    test('should have a task_state key') { response.key? 'task_state' }
+    test('be a kind of Hash') { response.is_a? Hash }
+  end
+end

data/tests/requests/compute/vm_clone_tests.rb

@@ -1,47 +1,47 @@
-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
   response_linked = nil
 
-  template = "rhel64"
-  datacenter = "Solutions"
+  template = 'rhel64'
+  datacenter = 'Solutions'
 
-  tests("Standard Clone | The return value should") do
+  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)
-    test("be a kind of Hash") { response.kind_of? Hash }
-    %w{ vm_ref new_vm task_ref }.each do |key|
+    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 }
     end
-    test("creates a new server") { compute.servers.size == servers_size+1 }
-    test("new server name is set") { compute.get_virtual_machine(response['new_vm']['id'])['name'] == 'cloning_vm' }
+    test('creates a new server') { compute.servers.size == servers_size + 1 }
+    test('new server name is set') { compute.get_virtual_machine(response['new_vm']['id'])['name'] == 'cloning_vm' }
   end
 
-  tests("Standard Clone setting ram and cpu | The return value should") 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)
-    test("be a kind of Hash") { response.kind_of? Hash }
-    %w{ vm_ref new_vm task_ref }.each do |key|
+    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 }
     end
-    test("creates a new server") { compute.servers.size == servers_size+1 }
-    test("new server name is set") { compute.get_virtual_machine(response['new_vm']['id'])['name'] == 'cloning_vm' }
+    test('creates a new server') { compute.servers.size == servers_size + 1 }
+    test('new server name is set') { compute.get_virtual_machine(response['new_vm']['id'])['name'] == 'cloning_vm' }
   end
 
-  tests("Linked Clone | The return value should") 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)
-    test("be a kind of Hash") { response.kind_of? Hash }
-    %w{ vm_ref new_vm task_ref }.each do |key|
+    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 }
     end
-    test("creates a new server") { compute.servers.size == servers_size+1 }
-    test("new server name is set") { compute.get_virtual_machine(response['new_vm']['id'])['name'] == 'cloning_vm_linked' }
+    test('creates a new server') { compute.servers.size == servers_size + 1 }
+    test('new server name is set') { compute.get_virtual_machine(response['new_vm']['id'])['name'] == 'cloning_vm_linked' }
   end
 
-  tests("When invalid input is presented") do
-    raises(ArgumentError, 'it should raise ArgumentError') { compute.vm_clone(:foo => 1) }
+  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
       pending # require 'guid'
       compute.vm_clone('instance_uuid' => Guid.from_s(template), 'name' => 'jefftestfoo')