vm_shepherd 0.6.3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c32e4b781fbc1fd08d232424b3002b6579c827ef
-  data.tar.gz: 107604b57e2182962e74f5472703f51873fa97cd
+  metadata.gz: 44b185c8635a7ee3bffac7c3a36faa3ab6e0fe50
+  data.tar.gz: 9164bb10195596eabd453c1d136f11a56450ee1c
 SHA512:
-  metadata.gz: 8b160eb6932e0ca213df7c9ec318959c11c3cce437afdb1cc6e3788fd7ec3e06e4ec055c1957314b4a318c8ee2cd39693d28ca74a3792e10e66b3644edd95d4f
-  data.tar.gz: 093a1d5dc7d79669a434a9d023466903b1801d95f062ee0771e81fce9c4a6f1b4560c4d9611eb6b1545601dc1f9e594b9c8c222148dc1ce65b6551448399ea1a
+  metadata.gz: 107bf1e783e05dc640d0fce0469bd7df0b26fc9f40cb828f944be46aafd4e5e7d67d86391d40980e28ebea1a8866e9ce9237bc651778ec30ba6005124d6bf671
+  data.tar.gz: d1bd3e71af415e4262c817687f929bda22f38696d637bea25d513452f119cdef660542fecc29f4a4a95894c2187aa5b09ebfd70263e46b1dca77bf58232856ac

data/lib/vm_shepherd/shepherd.rb

@@ -73,7 +73,7 @@ module VmShepherd
             settings.vm_shepherd.vcenter_creds.username,
             settings.vm_shepherd.vcenter_creds.password,
             settings.vm_shepherd.vsphere.datacenter,
-          ).destroy(settings.vm_shepherd.vm.ip)
+          ).destroy(settings.vm_shepherd.vm.ip, settings.vm_shepherd.vsphere.resource_pool)
         when VmShepherd::AWS_IAAS_TYPE then
           ami_manager.destroy
         when VmShepherd::OPENSTACK_IAAS_TYPE then

data/lib/vm_shepherd/version.rb

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

data/lib/vm_shepherd/vsphere_manager.rb

@@ -56,11 +56,13 @@ module VmShepherd
       end
     end
 
-    def destroy(ip_address)
-      vm = datacenter.vmFolder.findByIp(ip_address)
-      return unless vm
-      power_off_vm(vm)
-      destroy_vm(vm)
+    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.each do |vm|
+        power_off_vm(vm)
+        destroy_vm(vm)
+      end
     end
 
     def destroy_vm(vm)

data/spec/vm_shepherd/shepherd_spec.rb

@@ -194,7 +194,7 @@ module VmShepherd
               settings.vm_shepherd.vcenter_creds.password,
               settings.vm_shepherd.vsphere.datacenter,
             ).and_return(ova_manager)
-          expect(ova_manager).to receive(:destroy).with(settings.vm_shepherd.vm.ip)
+          expect(ova_manager).to receive(:destroy).with(settings.vm_shepherd.vm.ip, settings.vm_shepherd.vsphere.resource_pool)
 
           manager.destroy
         end

data/spec/vm_shepherd/vsphere_manager_spec.rb

@@ -6,7 +6,10 @@ module VmShepherd
     let(:username) { 'FAKE_USERNAME' }
     let(:password) { 'FAKE_PASSWORD' }
     let(:datacenter_name) { 'FAKE_DATACENTER_NAME' }
-    let(:vm) { instance_double(RbVmomi::VIM::VirtualMachine, name: 'vm_name') }
+    let(:vm1) { instance_double(RbVmomi::VIM::VirtualMachine, name: 'vm_name1', resourcePool: instance_double(RbVmomi::VIM::ResourcePool, name: 'first_resource_pool')) }
+    let(:vm2) { instance_double(RbVmomi::VIM::VirtualMachine, name: 'vm_name2', resourcePool: instance_double(RbVmomi::VIM::ResourcePool, name: 'second_resource_pool')) }
+    let(:vm3) { instance_double(RbVmomi::VIM::VirtualMachine, name: 'vm_name3', resourcePool: instance_double(RbVmomi::VIM::ResourcePool, name: 'second_resource_pool')) }
+    let(:vms) { [vm1, vm2, vm3] }
 
     subject(:vsphere_manager) do
       manager = VsphereManager.new(host, username, password, datacenter_name)
@@ -19,32 +22,43 @@ module VmShepherd
     end
 
     describe 'destroy' do
-      let(:datacenter) { instance_double(RbVmomi::VIM::Datacenter, vmFolder: vm_folder) }
-      let(:vm_folder) { instance_double(RbVmomi::VIM::Folder) }
+      let(:search_index) { instance_double(RbVmomi::VIM::SearchIndex) }
+      let(:service_content) { instance_double(RbVmomi::VIM::ServiceContent, searchIndex: search_index)}
+      let(:connection) { instance_double(RbVmomi::VIM, serviceContent: service_content)}
       let(:ip_address) { '127.0.0.1' }
 
       before do
-        allow(vsphere_manager).to receive(:datacenter).and_return(datacenter)
-        allow(vm_folder).to receive(:findByIp).with(ip_address).and_return(vm)
+        allow(vsphere_manager).to receive(:connection).and_return(connection)
+        allow(search_index).to receive(:FindAllByIp).with(ip: ip_address, vmSearch: true).and_return(vms)
       end
 
-      it 'destroys the VM that matches the given ip address' do
-        expect(vsphere_manager).to receive(:power_off_vm).with(vm)
-        expect(vsphere_manager).to receive(:destroy_vm).with(vm)
+      it 'destroys the VM that matches the given ip address and resource pool' do
+        expect(vsphere_manager).to receive(:power_off_vm).with(vm2)
+        expect(vsphere_manager).to receive(:destroy_vm).with(vm2)
 
-        vsphere_manager.destroy(ip_address)
+        expect(vsphere_manager).to receive(:power_off_vm).with(vm3)
+        expect(vsphere_manager).to receive(:destroy_vm).with(vm3)
+
+        vsphere_manager.destroy(ip_address, 'second_resource_pool')
       end
 
-      context 'when the vm does not exist' do
-        before do
-          allow(vm_folder).to receive(:findByIp).and_return(nil)
+      context 'when there are no vms with that IP address' do
+        let(:vms) { [] }
+
+        it 'does not explode' do
+          expect(vsphere_manager).not_to receive(:power_off_vm)
+          expect(vsphere_manager).not_to receive(:destroy_vm)
+
+          vsphere_manager.destroy(ip_address, 'second_resource_pool')
         end
+      end
 
+      context 'when there are no vms in that resource pool' do
         it 'does not explode' do
           expect(vsphere_manager).not_to receive(:power_off_vm)
           expect(vsphere_manager).not_to receive(:destroy_vm)
 
-          vsphere_manager.destroy(ip_address)
+          vsphere_manager.destroy(ip_address, 'other_resource_pool')
         end
       end
     end
@@ -53,13 +67,13 @@ module VmShepherd
       let(:destroy_task) { instance_double(RbVmomi::VIM::Task) }
 
       before do
-        allow(vm).to receive(:Destroy_Task).and_return(destroy_task)
+        allow(vm1).to receive(:Destroy_Task).and_return(destroy_task)
       end
 
       it 'runs the Destroy_Task and waits for completion' do
         expect(destroy_task).to receive(:wait_for_completion)
 
-        vsphere_manager.destroy_vm(vm)
+        vsphere_manager.destroy_vm(vm1)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vm_shepherd
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
 platform: ruby
 authors:
 - Ops Manager Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1