Merge pull request #126 from dberg1/vfc

collect fc ports and vfc client adapters

Author: agrare

app/models/manageiq/providers/ibm_power_hmc/inventory/collector/infra_manager.rb

@@ -219,6 +219,18 @@ def vnics
       end.compact.to_h
   end
 
+  def vfc_client_adapters
+    @vfc_client_adapters ||=
+      lpars.map do |lpar|
+        [lpar.uuid, connection.vfc_client_adapter(lpar.uuid)] unless lpar.vfc_client_uuids.empty?
+      rescue IbmPowerHmc::Connection::HttpNotFound
+        nil
+      rescue => e
+        $ibm_power_hmc_log.error("vfc client adapters query failed for #{lpar.uuid}: #{e}")
+        raise
+      end.compact.to_h
+  end
+
   def vscsi_client_adapters
     @vscsi_client_adapters ||=
       lpars.map do |lpar|

app/models/manageiq/providers/ibm_power_hmc/inventory/parser/infra_manager.rb

@@ -169,8 +169,23 @@ def parse_host_hardware(host, sys)
   end
 
   def parse_host_guest_devices(hardware, sys)
-    sys.io_adapters.each do |io|
-      next if io.udid.to_i == 65_535 # Skip empty slots
+    sys.io_slots.each do |slot|
+      io = slot.io_adapter
+      next if io.nil? || io.udid.to_i == 65_535 # Skip empty slots
+
+      child_devices = slot.ior_devices.map do |port|
+        persister.host_guest_devices.build(
+          :hardware        => hardware,
+          :uid_ems         => port.location,
+          :device_type     => "physical_port",
+          :controller_type => "IO",
+          :device_name     => "Port",
+          :location        => port.location,
+          :model           => port.description,
+          :address         => port.macaddr.nil? ? port.wwpn : self.class.parse_macaddr(port.macaddr),
+          :auto_detect     => true
+        )
+      end
 
       persister.host_guest_devices.build(
         :hardware        => hardware,
@@ -180,7 +195,8 @@ def parse_host_guest_devices(hardware, sys)
         :device_name     => "Adapter",
         :location        => io.dr_name,
         :model           => io.description,
-        :auto_detect     => true
+        :auto_detect     => true,
+        :child_devices   => child_devices
       )
     end
   end
@@ -385,18 +401,9 @@ def parse_vm_guest_devices(lpar, hardware)
       build_ethernet_dev(lpar, ent, hardware, "host ethernet adapter")
     end
 
-    # Physical adapters can be assigned to VIOSes and LPARs using IOMMU.
-    lpar.io_adapters.each do |io|
-      persister.guest_devices.build(
-        :hardware        => hardware,
-        :uid_ems         => io.dr_name,
-        :device_type     => "physical_port",
-        :controller_type => "IO",
-        :device_name     => "Adapter",
-        :location        => io.dr_name,
-        :model           => io.description,
-        :auto_detect     => true
-      )
+    # Physical adapters can be assigned to VIOSes and LPARs.
+    lpar.io_slots.each do |slot|
+      build_io_adapter(slot.io_adapter, hardware) unless slot.io_adapter.nil?
     end
   end
 
@@ -406,6 +413,21 @@ def parse_lpar_guest_devices(lpar, hardware)
         build_ethernet_dev(lpar, ent, hardware, "vnic")
       end
     end
+
+    if collector.vfc_client_adapters.key?(lpar.uuid)
+      collector.vfc_client_adapters[lpar.uuid].each do |vfc|
+        persister.guest_devices.build(
+          :hardware        => hardware,
+          :uid_ems         => vfc.uuid,
+          :device_name     => vfc.dr_name,
+          :device_type     => "physical_port",
+          :controller_type => "client VFC adapter",
+          :auto_detect     => true,
+          :address         => vfc.wwpns.join(","),
+          :location        => vfc.location
+        )
+      end
+    end
   end
 
   def parse_vios_guest_devices(vios, hardware)
@@ -546,6 +568,39 @@ def build_ethernet_dev(lpar, ent, hardware, controller_type)
     )
   end
 
+  def build_io_adapter(adapter, hardware)
+    # Parse physical adapter ports, if any.
+    child_devices =
+      case adapter
+      when IbmPowerHmc::PhysicalFibreChannelAdapter
+        adapter.ports.map do |fcs|
+          persister.guest_devices.build(
+            :hardware        => hardware,
+            :uid_ems         => fcs.location,
+            :location        => fcs.location,
+            :device_name     => fcs.name.nil? ? fcs.location : fcs.name,
+            :device_type     => "physical_port",
+            :controller_type => "Fibre channel port",
+            :address         => fcs.wwpn,
+            :model           => adapter.description,
+            :auto_detect     => true
+          )
+        end
+      end || []
+
+    persister.guest_devices.build(
+      :hardware        => hardware,
+      :uid_ems         => adapter.dr_name,
+      :location        => adapter.dr_name,
+      :device_name     => "Adapter",
+      :device_type     => "physical_port",
+      :controller_type => "IO",
+      :model           => adapter.description,
+      :auto_detect     => true,
+      :child_devices   => child_devices
+    )
+  end
+
   def self.parse_macaddr(macaddr)
     macaddr.downcase.scan(/\w{2}/).join(':') unless macaddr.nil?
   end

manageiq-providers-ibm_power_hmc.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "ibm_power_hmc", "~> 0.22.0"
+  spec.add_dependency "ibm_power_hmc", "~> 0.24.0"
 
   spec.add_development_dependency "manageiq-style"
   spec.add_development_dependency "simplecov", ">= 0.21.2"