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

Jump to bottom

Don't update ems attributes in refresh parser #62

Merged
merged 2 commits into from
Jul 27, 2017
Merged

Don't update ems attributes in refresh parser #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15e9e52
Parse ems attributes like normal inventory
agrare May 30, 2017
3a9a095
Add about yaml file to spec miq_vim_inventory
agrare May 30, 2017
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
8 changes: 8 additions & 0 deletions app/models/manageiq/providers/vmware/infra_manager/refresh_parser.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ def self.ems_inv_to_hashes(inv)
uids = {}
result = {:uid_lookup => uids}

result[:ems] = about_inv_to_hashes(inv[:about])
result[:storages], uids[:storages] = storage_inv_to_hashes(inv[:storage])
result[:clusters], uids[:clusters] = cluster_inv_to_hashes(inv[:cluster])
result[:storage_profiles], uids[:storage_profiles] = storage_profile_inv_to_hashes(inv[:storage_profile], uids[:storages], inv[:storage_profile_datastore])
Expand Down Expand Up @@ -40,6 +41,13 @@ def self.ems_inv_to_hashes(inv)
result
end

def self.about_inv_to_hashes(about)
{
:api_version => about['apiVersion'],
:uid_ems => about['instanceUuid']
}
end

def self.storage_inv_to_hashes(inv)
result = []
result_uids = {}
Expand Down
8 changes: 8 additions & 0 deletions app/models/manageiq/providers/vmware/infra_manager/refresh_parser/filter.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ def filter_vc_data(ems, target)

host_data = host_inv_by_host(target)
unless host_data.nil?
filtered_data[:about] = ems_inv_by_about_inv
filtered_data[:host] = host_data
filtered_data[:storage] = storage_inv_by_host_inv(host_data)
filtered_data[:vm] = vm_data = vm_inv_by_host_inv(host_data)
Expand All @@ -32,6 +33,7 @@ def filter_vc_data(ems, target)
filtered_data = Hash.new { |h, k| h[k] = {} }
vm_data = vm_inv_by_vm(target)
unless vm_data.nil?
filtered_data[:about] = ems_inv_by_about_inv
filtered_data[:vm] = vm_data
filtered_data[:host] = host_inv_by_vm_inv(vm_data)
filtered_data[:storage] = storage_inv_by_host_inv(filtered_data[:host])
Expand All @@ -50,6 +52,8 @@ def filter_vc_data(ems, target)
unless folder_data.nil?
_, target_data = folder_data.first
if folder_children(target_data).blank?
filtered_data[:about] = ems_inv_by_about_inv

inv_by_folder_inv(folder_data, filtered_data)
else
filtered_data = @vc_data
Expand Down Expand Up @@ -95,6 +99,10 @@ def folder_inv_by_folder(folder)
target.nil? ? nil : {mor => target}
end

def ems_inv_by_about_inv
@vc_data[:about]
end

### Collection methods by Host inv

def storage_inv_by_host_inv(host_inv)
Expand Down
24 changes: 7 additions & 17 deletions app/models/manageiq/providers/vmware/infra_manager/refresher.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ def provider.use_vim_broker?; @__use_vim_broker; end
end

def collect_inventory_for_targets(ems, targets)
Benchmark.realtime_block(:get_ems_data) { get_ems_data(ems) }
Benchmark.realtime_block(:get_vc_data) { get_vc_data(ems) }

Benchmark.realtime_block(:get_vc_data_ems_customization_specs) { get_vc_data_ems_customization_specs(ems) } if targets.include?(ems)
Expand Down Expand Up @@ -54,14 +53,6 @@ def parse_targeted_inventory(ems, _target, inventory)
hashes
end

def save_inventory(ems, target, hashes)
Benchmark.realtime_block(:db_save_inventory) do
# TODO: really wanna kill this @ems_data instance var
Copy link
Member Author

Choose a reason for hiding this comment

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

@blomquisg I think this was your comment :) Finally gone

Copy link
Member

Choose a reason for hiding this comment

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

Yay!

ems.update_attributes(@ems_data) unless @ems_data.nil?
EmsRefresh.save_ems_inventory(ems, hashes, target)
end
end

def post_refresh(ems, start_time)
log_header = format_ems_for_logging(ems)
[VmOrTemplate, Host].each do |klass|
Expand Down Expand Up @@ -100,6 +91,8 @@ def get_vc_data(ems, accessors = VC_ACCESSORS_HASH, mor_filters = {})
retrieve_from_vc(ems, cleanup_callback) do
@vc_data = Hash.new { |h, k| h[k] = {} }

@vc_data[:about] = get_ems_data(ems)

accessors.each do |type, accessor|
_log.info("#{log_header} Retrieving #{type.to_s.titleize} inventory...")
if mor_filters.any?
Expand Down Expand Up @@ -183,16 +176,13 @@ def get_vc_data_host_scsi(ems, host_mors)
def get_ems_data(ems)
log_header = format_ems_for_logging(ems)

cleanup_callback = proc { @ems_data = nil }
_log.info("#{log_header} Retrieving EMS information...")
about = @vi.about
_log.info("#{log_header} Retrieving EMS information...Complete")

retrieve_from_vc(ems, cleanup_callback) do
_log.info("#{log_header} Retrieving EMS information...")
about = @vi.about
@ems_data = {:api_version => about['apiVersion'], :uid_ems => about['instanceUuid']}
_log.info("#{log_header} Retrieving EMS information...Complete")
end
EmsRefresh.log_inv_debug_trace(about, "#{_log.prefix} #{log_header} ext_management_system_inv:")

EmsRefresh.log_inv_debug_trace(@ems_data, "#{_log.prefix} #{log_header} ext_management_system_inv:")
about
end

MAX_RETRIES = 5
Expand Down
61 changes: 61 additions & 0 deletions spec/tools/vim_data/miq_vim_inventory/about.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
--- !ruby/hash-with-ivars:VimHash
elements:
name: !ruby/string:VimString
str: VMware vCenter Server
xsiType: :SOAP::SOAPString
vimType:
fullName: !ruby/string:VimString
str: VMware vCenter Server 4.1.0 build-5318154
xsiType: :SOAP::SOAPString
vimType:
vendor: !ruby/string:VimString
str: VMware, Inc.
xsiType: :SOAP::SOAPString
vimType:
version: !ruby/string:VimString
str: 6.5.0
xsiType: :SOAP::SOAPString
vimType:
build: !ruby/string:VimString
str: '5318154'
xsiType: :SOAP::SOAPString
vimType:
localeVersion: !ruby/string:VimString
str: INTL
xsiType: :SOAP::SOAPString
vimType:
localeBuild: !ruby/string:VimString
str: '000'
xsiType: :SOAP::SOAPString
vimType:
osType: !ruby/string:VimString
str: linux-x64
xsiType: :SOAP::SOAPString
vimType:
productLineId: !ruby/string:VimString
str: vpx
xsiType: :SOAP::SOAPString
vimType:
apiType: !ruby/string:VimString
str: VirtualCenter
xsiType: :SOAP::SOAPString
vimType:
apiVersion: !ruby/string:VimString
str: '4.1'
xsiType: :SOAP::SOAPString
vimType:
instanceUuid: !ruby/string:VimString
str: EF53782F-6F1A-4471-B338-72B27774AFDD
xsiType: :SOAP::SOAPString
vimType:
licenseProductName: !ruby/string:VimString
str: VMware VirtualCenter Server
xsiType: :SOAP::SOAPString
vimType:
licenseProductVersion: !ruby/string:VimString
str: '4.1'
xsiType: :SOAP::SOAPString
vimType:
ivars:
:@xsiType: :AboutInfo
:@vimType:
7 changes: 0 additions & 7 deletions spec/tools/vim_data/vim_data_test_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,6 @@ def method_missing(m, *_args)
class FakeMiqVimHandle < FakeMiqVimHandleBase
DATA_DIR = "miq_vim_inventory"

def about
{
"apiVersion" => "4.1",
"instanceUuid" => "EF53782F-6F1A-4471-B338-72B27774AFDD"
}
end

def method_missing(m, *args)
m = m.to_s
byMor = (m[-5..-1] == "ByMor" && m[-6, 1] != "s")
Expand Down