Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove the VMware specific assign_ems_created_on method #20709

Merged
merged 1 commit into from
Oct 20, 2020
Merged

Remove the VMware specific assign_ems_created_on method #20709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 0 additions & 42 deletions app/models/vm_or_template.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1127,8 +1127,6 @@ def self.post_refresh_ems(ems_id, update_start_time)
v.post_create_actions_queue
added_vm_ids << v.id
end

assign_ems_created_on_queue(added_vm_ids) if ::Settings.ems_refresh.capture_vm_created_on_date
end

post_refresh_ems_folder_updates(ems, update_start_time, added_vms)
Expand Down Expand Up @@ -1164,46 +1162,6 @@ def self.post_refresh_ems_folder_updates(ems, update_start_time, added_vms)
end
private_class_method :post_refresh_ems_folder_updates

def self.assign_ems_created_on_queue(vm_ids)
MiqQueue.submit_job(
:class_name => name,
:method_name => 'assign_ems_created_on',
:role => 'ems_operations',
:args => [vm_ids],
:priority => MiqQueue::MIN_PRIORITY
)
end

def self.assign_ems_created_on(vm_ids)
vms_to_update = VmOrTemplate.where(:id => vm_ids, :ems_created_on => nil)
return if vms_to_update.empty?

# Of the VMs without a VM create time, filter out the ones for which we
# already have a VM create event
vms_to_update = vms_to_update.reject do |v|
# TODO: Vmware specific (fix with event rework?)
event = v.ems_events.find_by(:event_type => ["VmCreatedEvent", "VmDeployedEvent"])
v.update_attribute(:ems_created_on, event.timestamp) if event && v.ems_created_on != event.timestamp
event
end
return if vms_to_update.empty?

# Of the VMs still without an VM create time, use historical events, if
# available, to determine the VM create time
ems = vms_to_update.first.ext_management_system
# TODO: Vmware specific
return unless ems && ems.kind_of?(ManageIQ::Providers::Vmware::InfraManager)

vms_list = vms_to_update.collect { |v| {:id => v.id, :name => v.name, :uid_ems => v.uid_ems} }
found = ems.find_vm_create_events(vms_list)

# Loop through the found VMs and set their create times
found.each do |vmh|
v = vms_to_update.detect { |vm| vm.id == vmh[:id] }
v.update_attribute(:ems_created_on, vmh[:created_time])
end
end

def post_create_actions_queue
MiqQueue.submit_job(
:class_name => self.class.name,
Expand Down
22 changes: 0 additions & 22 deletions spec/models/vm_or_template_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -760,28 +760,6 @@
end
end

describe "#assign_ems_created_on_queue" do
it "queuing task to execute 'assign_ems_created_on' on server with 'ems_operations' role" do
expect(MiqQueue).to receive(:submit_job).with(
:class_name => described_class.name,
:method_name => 'assign_ems_created_on',
:role => 'ems_operations',
:args => [vm.id],
:priority => MiqQueue::MIN_PRIORITY
)
described_class.assign_ems_created_on_queue(vm.id)
end
end

describe "assign_ems_created_on" do
it "assigns timestamp on `VmDeployedEvent` event to `vm#ems_created_on field " do
timestamp = Time.now.utc.change(:usec => 0)
FactoryBot.create(:ems_event, :event_type => "VmDeployedEvent", :dest_vm_or_template => vm, :timestamp => timestamp)
described_class.assign_ems_created_on(vm.id)
expect(vm.reload.ems_created_on.utc).to eq(timestamp)
end
end

it "with ems_events" do
ems = FactoryBot.create(:ems_vmware_with_authentication)
vm = FactoryBot.create(:vm_vmware, :ext_management_system => ems)
Expand Down