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

Replace MiqUUID with inline clean_guid method #588

Merged
merged 3 commits into from
Jun 8, 2020
Merged

Replace MiqUUID with inline clean_guid method #588

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ddceb3
Replace MiqUUID with inline clean_guid method.
djberg96 Jun 5, 2020
181d82b
Reduce the comments a bit since it's a private method.
djberg96 Jun 6, 2020
7b47113
Remove redundant || logic.
djberg96 Jun 8, 2020
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
24 changes: 22 additions & 2 deletions app/models/manageiq/providers/vmware/infra_manager/inventory/parser/virtual_machine.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
class ManageIQ::Providers::Vmware::InfraManager::Inventory::Parser
UUID_REGEX_FORMAT = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/.freeze

module VirtualMachine
def parse_virtual_machine_config(vm_hash, props)
config = props[:config]
Expand Down Expand Up @@ -28,7 +30,7 @@ def parse_virtual_machine_summary(vm_hash, props)
if summary_config
uuid = summary_config[:uuid]
unless uuid.blank?
vm_hash[:uid_ems] = MiqUUID.clean_guid(uuid) || uuid
vm_hash[:uid_ems] = clean_guid(uuid) || uuid
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@djberg96 I think we can just do vm_hash[:uid_ems] = clean_guid(uuid) without the || uuid if the only two cases that method returns nil for is if the uuid is nil (in which case we'd get nil || nil) or if the string is empty which isn't a valid uid_ems anyway. WDYT?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@agrare I agree, will update.

end

name = summary_config[:name]
Expand Down Expand Up @@ -134,7 +136,7 @@ def parse_virtual_machine_hardware(vm, props)
hardware_hash[:guest_os_full_name] = guest_full_name.blank? ? "Other" : guest_full_name

uuid = summary_config[:uuid]
bios = MiqUUID.clean_guid(uuid) || uuid
bios = clean_guid(uuid) || uuid
hardware_hash[:bios] = bios unless bios.blank?

hardware_hash[:cpu_total_cores] = summary_config[:numCpu].to_i
Expand Down Expand Up @@ -389,5 +391,23 @@ def find_host_vswitch(host_ref, lan_name)
def find_host_opaque_switch(host_ref)
cache["HostSystem"][host_ref]&.dig(:config, :network, :opaqueSwitch)&.pluck(:key)&.sort&.first
end

private

# Takes a UUID string of varying formats and cleans it. It will strip invalid characters,
# such as leading and trailing brackets as well as whitespace, and handle byte strings.
# The result is a lowercased, canonical UUID string.
#
# If the +guid+ argument is nil, blank or too malformed, then nil is returned. If the +guid+
# is already clean, then no additional cleaning occurs, and it is returned as-is.
#
def clean_guid(guid)
return nil if guid.nil?
g = guid.to_s.downcase
return nil if g.strip.empty?
return g if g.length == 36 && g =~ UUID_REGEX_FORMAT
g.delete!('^0-9a-f')
g.sub!(/^([0-9a-f]{8})([0-9a-f]{4})([0-9a-f]{4})([0-9a-f]{4})([0-9a-f]{12})$/, '\1-\2-\3-\4-\5')
end
end
end