Skip to content

Commit 96c09db

Browse files
committed
Fix non-rails event_parser with RbVmomi::VIM::Event types
1 parent dbd10b5 commit 96c09db

File tree

1 file changed

+17
-21
lines changed

1 file changed

+17
-21
lines changed

workers/event_catcher/event_parser.rb

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -42,46 +42,42 @@ def self.parse_event(event)
4242
result[:username] = event.userName if event.userName.present?
4343

4444
# Get the vm information
45-
vm_key = "vm" if event.props.key?("vm")
46-
vm_key = "sourceVm" if event.props.key?("sourceVm")
47-
vm_key = "srcTemplate" if event.props.key?("srcTemplate")
45+
vm_key = :vm if event.props.key?(:vm)
46+
vm_key = :sourceVm if event.props.key?(:sourceVm)
47+
vm_key = :srcTemplate if event.props.key?(:srcTemplate)
4848
if vm_key
49-
vm_data = event.send(vm_key)
50-
51-
result[:vm_ems_ref] = vm_data&.vm if vm_data&.vm
52-
result[:vm_name] = CGI.unescape(vm_data&.name) if vm_data&.name
53-
result[:vm_location] = vm_data&.path if vm_data&.path
54-
result[:vm_uid_ems] = vm_data&.uuid if vm_data&.uuid
55-
56-
result
49+
vm = event.send(vm_key)
50+
if vm
51+
result[:vm_ems_ref] = vm.vm._ref if vm.vm
52+
result[:vm_name] = CGI.unescape(vm.name) if vm.name
53+
end
5754
end
5855

5956
# Get the dest vm information
6057
has_dest = false
6158
if %w[sourceVm srcTemplate].include?(vm_key)
62-
vm_data = event.vm
63-
if vm_data
64-
result[:dest_vm_ems_ref] = vm_data&.vm if vm_data&.vm
65-
result[:dest_vm_name] = CGI.unescape(vm_data&.name) if vm_data&.name
66-
result[:dest_vm_location] = vm_data&.path if vm_data&.path
59+
vm = event.vm
60+
if vm
61+
result[:dest_vm_ems_ref] = vm.vm._ref if vm.vm
62+
result[:dest_vm_name] = CGI.unescape(vm.name) if vm.name
6763
end
6864

6965
has_dest = true
70-
elsif event.props.key?("destName")
66+
elsif event.props.key?(:destName)
7167
result[:dest_vm_name] = event.destName
7268
has_dest = true
7369
end
7470

7571
if event.props.key?(:host)
7672
result[:host_name] = event.host.name
77-
result[:host_ems_ref] = event.host.host
73+
result[:host_ems_ref] = event.host.host._ref
7874
end
7975

8076
if has_dest
81-
host_data = event.props["destHost"] || event.props["host"]
77+
host_data = event.props[:destHost] || event.props[:host]
8278
if host_data
83-
result[:dest_host_ems_ref] = host_data["host"]
84-
result[:dest_host_name] = host_data["name"]
79+
result[:dest_host_ems_ref] = host_data[:host]
80+
result[:dest_host_name] = host_data[:name]
8581
end
8682
end
8783

0 commit comments

Comments
 (0)