idrac 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e29d49fd29e12b9b169c281408e19002beb792c6ad957595190547b8d40ea04
-  data.tar.gz: 0b52402b5396fd59801c2be34ce764d2e27e90049d6f14dbf501bbb02308339a
+  metadata.gz: a6eb419ab79c9a759eccad22d236e0c4889ea3498aa83860d7691dbd334601bd
+  data.tar.gz: 344f17aa9bee4aa1bd3899ced2f8af98c04ce7c27d885af6efa6f0a7a4f7a165
 SHA512:
-  metadata.gz: 1aba6ce8154a8a3d91eebf28a65ce2c7522207e37fd3777ad5b34dd7e8f61d198d9fa726cdd6f4f1b5d7176c4d2b9a6a274451df01c09a177e7024c7c6102f7f
-  data.tar.gz: 502b02ee0ab18757af3dfe345011ef0311b2432c8d1c7895a6a774fdf8dd099ae2cadbde4c89f7b5939f36505ce9a6fcab7540586472d03e719224be97cffce9
+  metadata.gz: 16695a7a4df759074c7c8e15c3493668b25067377f5b11e82cd2474f4151d290f26e998172180ddc92aad58cc579d9d68042f0d324c6ab7e42814fab18836220
+  data.tar.gz: b164817a15ae532794b9ea27c8a03a033be63dfc73e751261f7409d8b9927281e56df1c7f6adcbb1d1c5243cd0b8bf3f4c787e55835a504588a2d8c5540fd1b8

data/bin/idrac

@@ -918,6 +918,27 @@ module IDRAC
       end
     end
 
+    desc "system_pci_devices", "Get PCI device information"
+    map "system:pci-devices" => :system_pci_devices
+    map "system:pci:devices" => :system_pci_devices
+    def system_pci_devices
+      with_idrac_client do |client|
+        pci_devices = client.pci_devices
+        
+        puts "\nPCI Devices (#{pci_devices.size}):".green.bold
+        pci_devices.each do |device|
+          puts "#{device["name"]}:".bold
+          puts "  Manufacturer: #{device["manufacturer"]}".cyan if device["manufacturer"]
+          puts "  Device Class: #{device["device_class"]}".cyan if device["device_class"]
+          puts "  Description: #{device["description"]}".cyan if device["description"]
+          puts "  ID: #{device["id"]}".cyan if device["id"]
+          puts "  Slot Type: #{device["slot_type"]}".cyan if device["slot_type"]
+          puts "  Bus Width: #{device["bus_width"]}".cyan if device["bus_width"]
+          puts ""
+        end
+      end
+    end
+
     desc "system_idrac_network", "Get iDRAC network configuration"
     map "system:idrac_network" => :system_idrac_network
     def system_idrac_network
@@ -1085,16 +1106,16 @@ module IDRAC
       with_idrac_client do |client|
         info = client.system_info
         
-        if info.is_dell
+        if info["is_dell"]
           puts "Dell iDRAC System:".green.bold
-          puts "  Service Tag: #{info.service_tag}".cyan
-          puts "  Model: #{info.model}".cyan
-          puts "  iDRAC Version: #{info.idrac_version}".cyan
-          puts "  Firmware Version: #{info.firmware_version}".cyan
+          puts "  Service Tag: #{info["service_tag"]}".cyan
+          puts "  Model: #{info["model"]}".cyan
+          puts "  iDRAC Version: #{info["idrac_version"]}".cyan
+          puts "  Firmware Version: #{info["firmware_version"]}".cyan
         else
           puts "Not a Dell iDRAC system".yellow
-          puts "  Product: #{info.product}".cyan
-          if info.is_ancient_dell
+          puts "  Product: #{info["product"]}".cyan
+          if info["is_ancient_dell"]
             puts "  Ancient Dell System detected. Update firmware.".yellow
           end
         end

data/lib/idrac/system.rb

@@ -235,6 +235,7 @@ module IDRAC
 
     # Get PCI device information
     def pci_devices
+      # First try the standard PCIeDevices endpoint
       response = authenticated_request(:get, "/redfish/v1/Chassis/System.Embedded.1/PCIeDevices?$expand=*($levels=1)")
       
       if response.status == 200
@@ -257,17 +258,17 @@ module IDRAC
             
             # Create device info with available data
             device_info = {
-              device_class: pcie_function ? pcie_function["DeviceClass"] : nil,
-              manufacturer: manufacturer,
-              name: stub["Name"],
-              description: stub["Description"],
-              id: pcie_function ? pcie_function["Id"] : stub["Id"],
-              slot_type: pcie_function ? pcie_function.dig("Oem", "Dell", "DellPCIeFunction", "SlotType") : nil,
-              bus_width: pcie_function ? pcie_function.dig("Oem", "Dell", "DellPCIeFunction", "DataBusWidth") : nil,
-              nic: pcie_function ? pcie_function.dig("Links", "EthernetInterfaces", 0, "@odata.id") : nil
+              "device_class" => pcie_function ? pcie_function["DeviceClass"] : nil,
+              "manufacturer" => manufacturer,
+              "name" => stub["Name"],
+              "description" => stub["Description"],
+              "id" => pcie_function ? pcie_function["Id"] : stub["Id"],
+              "slot_type" => pcie_function ? pcie_function.dig("Oem", "Dell", "DellPCIeFunction", "SlotType") : nil,
+              "bus_width" => pcie_function ? pcie_function.dig("Oem", "Dell", "DellPCIeFunction", "DataBusWidth") : nil,
+              "nic" => pcie_function ? pcie_function.dig("Links", "EthernetInterfaces", 0, "@odata.id") : nil
             }
             
-            puts "PCI Device: #{device_info[:name]} > #{device_info[:manufacturer]} > #{device_info[:device_class]} > #{device_info[:description]} > #{device_info[:id]}"
+            puts "PCI Device: #{device_info["name"]} > #{device_info["manufacturer"]} > #{device_info["device_class"]} > #{device_info["description"]} > #{device_info["id"]}"
             
             device_info
           end
@@ -277,7 +278,117 @@ module IDRAC
           raise Error, "Failed to parse PCI devices response: #{response.body}"
         end
       else
-        raise Error, "Failed to get PCI devices. Status code: #{response.status}"
+        # For iDRAC 8, try Dell's recommended approach using System endpoint with PCIeDevices select option
+        system_pcie_response = authenticated_request(:get, "/redfish/v1/Systems/System.Embedded.1?$select=PCIeDevices")
+        
+        if system_pcie_response.status == 200
+          begin 
+            system_data = JSON.parse(system_pcie_response.body)
+            
+            if system_data.key?("PCIeDevices") && !system_data["PCIeDevices"].empty?
+              pci_devices = []
+              
+              # Process each PCIe device
+              system_data["PCIeDevices"].each do |device_link|
+                if device_link.is_a?(Hash) && device_link["@odata.id"]
+                  device_path = device_link["@odata.id"]
+                  device_response = authenticated_request(:get, device_path)
+                  
+                  if device_response.status == 200
+                    device_data = JSON.parse(device_response.body)
+                    
+                    pci_devices << {
+                      "device_class" => device_data["DeviceType"] || "Unknown",
+                      "manufacturer" => device_data["Manufacturer"],
+                      "name" => device_data["Name"] || device_data["Id"],
+                      "description" => device_data["Description"],
+                      "id" => device_data["Id"],
+                      "slot_type" => device_data.dig("Oem", "Dell", "SlotType"),
+                      "bus_width" => device_data.dig("Oem", "Dell", "BusWidth"),
+                      "nic" => nil
+                    }
+                  end
+                end
+              end
+              
+              return pci_devices unless pci_devices.empty?
+            end
+          rescue JSON::ParserError
+            # Continue to next approach
+          end
+        end
+        
+        # Try NetworkAdapters as an alternative for finding PCIe devices (especially NICs and FC adapters)
+        nic_response = authenticated_request(:get, "/redfish/v1/Systems/System.Embedded.1/NetworkAdapters?$expand=*($levels=1)")
+        
+        if nic_response.status == 200
+          begin
+            nic_data = JSON.parse(nic_response.body)
+            
+            pci_devices = []
+            
+            # Extract PCI info from network adapters
+            if nic_data["Members"] && !nic_data["Members"].empty?
+              nic_data["Members"].each do |adapter|
+                next unless adapter["Model"] || adapter["Manufacturer"]
+                
+                # Check if this is a Fiber Channel adapter by name or model
+                is_fc = (adapter["Name"] =~ /FC/i || adapter["Model"] =~ /FC/i || 
+                         adapter["Id"] =~ /FC/i || adapter["Description"] =~ /Fibre/i) ? true : false
+                
+                device_class = is_fc ? "FibreChannelController" : "NetworkController"
+                
+                pci_devices << {
+                  "device_class" => device_class,
+                  "manufacturer" => adapter["Manufacturer"],
+                  "name" => adapter["Name"] || adapter["Id"],
+                  "description" => adapter["Description"],
+                  "id" => adapter["Id"],
+                  "slot_type" => adapter.dig("Oem", "Dell", "SlotType") || 
+                                 (adapter["Id"] =~ /Slot\.(\d+)/ ? "Slot #{$1}" : nil),
+                  "bus_width" => nil,
+                  "nic" => adapter["@odata.id"]
+                }
+              end
+              
+              return pci_devices unless pci_devices.empty?
+            end
+          rescue JSON::ParserError
+            # Continue to fallback
+          end
+        end
+        
+        # Last resort: check if PCIeFunctions are directly available
+        pcie_functions_response = authenticated_request(:get, "/redfish/v1/Systems/System.Embedded.1/PCIeFunctions?$expand=*($levels=1)")
+        
+        if pcie_functions_response.status == 200
+          begin
+            functions_data = JSON.parse(pcie_functions_response.body)
+            
+            if functions_data["Members"] && !functions_data["Members"].empty?
+              pci_devices = functions_data["Members"].map do |function|
+                {
+                  "device_class" => function["DeviceClass"] || "Unknown",
+                  "manufacturer" => function["Manufacturer"] || "Unknown",
+                  "name" => function["Name"] || function["Id"],
+                  "description" => function["Description"],
+                  "id" => function["Id"],
+                  "slot_type" => function.dig("Oem", "Dell", "SlotType"),
+                  "bus_width" => function.dig("Oem", "Dell", "DataBusWidth"),
+                  "nic" => nil
+                }
+              end
+              
+              return pci_devices
+            end
+          rescue JSON::ParserError
+            # Continue to fallback
+          end
+        end
+        
+        # Fallback for any version when all endpoints unavailable
+        puts "PCI device information not available through standard or alternative endpoints" if @verbose
+        return []
       end
     end
 

data/lib/idrac/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module IDRAC
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: idrac
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Jonathan Siegel