Merge pull request #683 from agrare/vm_or_template_destroy_overrides_…

…core_active_record_method

VM#destroyed? is overriding a core active_record method

(cherry picked from commit 48b4acb)

app/models/manageiq/providers/vmware/infra_manager/vm_or_template_shared/disconnect.rb

@@ -4,14 +4,14 @@ module ManageIQ::Providers::Vmware::InfraManager::VmOrTemplateShared::Disconnect
   def disconnect_storage
     # If the VM was unregistered don't clear the storage because the disks
     # are still on the underlying datastore
-    super unless unregistered?
+    super unless vm_unregistered?
   end
 
-  def destroyed?
+  def vm_destroyed?
     disconnect_events.last&.event_type == "DestroyVM_Task_Complete"
   end
 
-  def unregistered?
+  def vm_unregistered?
     disconnect_events.last&.event_type == "UnregisterVM_Complete"
   end
 

spec/models/manageiq/providers/vmware/infra_manager/inventory/collector_spec.rb

@@ -117,6 +117,7 @@
 
       it "deleting a virtual machine" do
         vm = ems.vms.find_by(:ems_ref => 'vm-107')
+        vm.ems_events.create!(:event_type => "DestroyVM_Task_Complete")
 
         expect(vm.archived?).to be_falsy
         run_targeted_refresh(targeted_update_set(vm_delete_object_updates))