vm_shepherd 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44b185c8635a7ee3bffac7c3a36faa3ab6e0fe50
-  data.tar.gz: 9164bb10195596eabd453c1d136f11a56450ee1c
+  metadata.gz: e40010121984be566b3f88a3e7d12984223d10df
+  data.tar.gz: 85e3ec192349a2a70de3612dcde0ec982edec9f0
 SHA512:
-  metadata.gz: 107bf1e783e05dc640d0fce0469bd7df0b26fc9f40cb828f944be46aafd4e5e7d67d86391d40980e28ebea1a8866e9ce9237bc651778ec30ba6005124d6bf671
-  data.tar.gz: d1bd3e71af415e4262c817687f929bda22f38696d637bea25d513452f119cdef660542fecc29f4a4a95894c2187aa5b09ebfd70263e46b1dca77bf58232856ac
+  metadata.gz: a0afc08340253f1d54b01762c960f1e879ca367e6ecb6fa0d47bd19e9cef67566f820131af993db862c082b03fa51333369a65d5735cbecce62fddb106a2ad22
+  data.tar.gz: bea513f347e77b7fee6cf95404a9f4a17e7f20acf881bd40a785c4c3163f43a19a4e563e4b169b01cc6f8a5c166da882cd37594efdf303e66b0418871ae7aa33

data/lib/vm_shepherd/version.rb

@@ -1,3 +1,3 @@
 module VmShepherd
-  VERSION = '0.7.0'.freeze
+  VERSION = '0.7.1'.freeze
 end

data/lib/vm_shepherd/vsphere_manager.rb

@@ -57,8 +57,8 @@ module VmShepherd
     end
 
     def destroy(ip_address, resource_pool_name)
-      vms = connection.serviceContent.searchIndex.FindAllByIp(ip: ip_address, vmSearch: true).
-        select { |vm| vm.resourcePool.name == resource_pool_name }
+      vms = connection.serviceContent.searchIndex.FindAllByIp(ip: ip_address, vmSearch: true)
+      vms = vms.select { |vm| resource_pool_name == vm.resourcePool.name } if resource_pool_name
       vms.each do |vm|
         power_off_vm(vm)
         destroy_vm(vm)

data/spec/vm_shepherd/vsphere_manager_spec.rb

@@ -42,6 +42,19 @@ module VmShepherd
         vsphere_manager.destroy(ip_address, 'second_resource_pool')
       end
 
+      it 'destroys the VM that matches the given ip address only when resource pool nil' do
+        expect(vsphere_manager).to receive(:power_off_vm).with(vm1)
+        expect(vsphere_manager).to receive(:destroy_vm).with(vm1)
+
+        expect(vsphere_manager).to receive(:power_off_vm).with(vm2)
+        expect(vsphere_manager).to receive(:destroy_vm).with(vm2)
+
+        expect(vsphere_manager).to receive(:power_off_vm).with(vm3)
+        expect(vsphere_manager).to receive(:destroy_vm).with(vm3)
+
+        vsphere_manager.destroy(ip_address, nil)
+      end
+
       context 'when there are no vms with that IP address' do
         let(:vms) { [] }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vm_shepherd
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Ops Manager Team