Fix host hardware and miq_scsi_lun inconsistencies

Fix issues with host hardware parsing in graph refresh.
agrare · Jan 31, 2019 · 7cc53a0 · 7cc53a0
1 parent d104f70
commit 7cc53a0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/app/models/manageiq/providers/vmware/infra_manager/inventory/parser/host_system.rb b/app/models/manageiq/providers/vmware/infra_manager/inventory/parser/host_system.rb
@@ -137,7 +137,7 @@ def parse_host_system_hardware(host, props)
  if hardware
  hardware_hash[:cpu_speed] = hardware[:cpuMhz]
  hardware_hash[:cpu_type] = hardware[:cpuModel]
- hardware_hash[:manufacturer] = hardware[:manufacturer]
+ hardware_hash[:manufacturer] = hardware[:vendor]
  hardware_hash[:model] = hardware[:model]
  hardware_hash[:number_of_nics] = hardware[:numNics]
 
@@ -202,7 +202,8 @@ def parse_host_system_scsi_luns(scsi_luns)
 
  lun_hash = {
  :uid_ems => lun.uuid,
- :canonical_name => lun.lunType,
+ :lun_type => lun.lunType,
+ :canonical_name => lun.canonicalName,
  :device_name => lun.deviceName,
  :device_type => lun.deviceType,
  :block => n_blocks,

diff --git a/spec/models/manageiq/providers/vmware/infra_manager/inventory/collector_spec.rb b/spec/models/manageiq/providers/vmware/infra_manager/inventory/collector_spec.rb
@@ -701,8 +701,8 @@ def assert_specific_host
  scsi_lun = scsi_target.miq_scsi_luns.first
  expect(scsi_lun).to have_attributes(
  :lun => 0,
- :canonical_name => "disk",
- :lun_type => nil,
+ :canonical_name => "mpx.vmhba1:C0:T0:L0",
+ :lun_type => "disk",
  :device_name => "/vmfs/devices/disks/mpx.vmhba1:C0:T0:L0",
  :device_type => "disk",
  :block => 1_146_734_896,