idrac 0.5.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75d31422362fd2d548fff6e03265162bdf4cfb34237085a7e9e14170bcd8d5eb
-  data.tar.gz: 219ca3faaaf4e3b8d85ceb0db0baebe5ffa81c2e5afc61ba13851c76fd1f6b41
+  metadata.gz: '08c0c927c8906901064229e84e01071445c5cb43d8e27146f53d9adc2084f2c3'
+  data.tar.gz: a81b63a1c90c5a545abd1d2ea0f45dc50be607f023fb3c881b4611af6f670ebf
 SHA512:
-  metadata.gz: b37b6e6094ee872b2989dcd4d66a8a965502ed7193a66813d5ed3ff60592cfae47c26f9caf9b2f0c34580d366845b49414f55bd909519618d8439cdb71fe8473
-  data.tar.gz: 30ffb9cbd571489a12f71c553777089541c3550287aca5a267bc4b964da41ff268219ca9e4306097c0aced7ae29a1bd7d17f6ccccfefd45f77778a29891801e1
+  metadata.gz: 12073234311cbf0078aaa386d4c27214b3e467ca46065d2bfbb0f9a23e0a26bb587145738bccbcce006d51aef14de4910ae0201d38cc846a21804a8a52278bde
+  data.tar.gz: 17612a2c01808f249bdcbe1e587804a299df1d16512965d032f2b574a88071937c2ac9ccf9e36b71ca11545cb7736b72e9bb4723154351f8812be937889455a9

data/bin/idrac

@@ -312,103 +312,24 @@ module IDRAC
       with_idrac_client do |client|
         verbose = options[:verbose] || options[:very_verbose] || options[:debug]
         
-        # Get system information using authenticated_request
-        puts "Retrieving system information...".light_yellow if verbose
-        system_response = client.authenticated_request(:get, "/redfish/v1/Systems/System.Embedded.1")
-        system_info = JSON.parse(system_response.body)
-        puts JSON.pretty_generate(system_info).light_yellow if verbose
-        
-        # Get iDRAC information using authenticated_request
-        puts "Retrieving iDRAC information...".light_yellow if verbose
-        idrac_response = client.authenticated_request(:get, "/redfish/v1/Managers/iDRAC.Embedded.1")
-        idrac_info = JSON.parse(idrac_response.body)
-        puts JSON.pretty_generate(idrac_info).light_yellow if verbose
-        
-        # Get network information using authenticated_request
-        puts "Retrieving network information...".light_yellow if verbose
-        network_response = client.authenticated_request(:get, "/redfish/v1/Managers/iDRAC.Embedded.1/EthernetInterfaces/NIC.1")
-        network_info = JSON.parse(network_response.body)
-        puts JSON.pretty_generate(network_info).light_yellow if verbose
-        
-        # Initialize license_type to Unknown
-        license_type = "Unknown"
-        license_description = nil
-        
-        # Try to get license information using DMTF standard method
-        begin
-          puts "Retrieving license information (DMTF method)...".light_yellow if verbose
-          license_response = client.authenticated_request(:get, "/redfish/v1/LicenseService/Licenses")
-          license_info = JSON.parse(license_response.body)
-          puts JSON.pretty_generate(license_info).light_yellow if verbose
-          
-          # Extract license type if licenses are found
-          if license_info["Members"] && !license_info["Members"].empty?
-            license_entry_response = client.authenticated_request(:get, license_info["Members"][0]["@odata.id"])
-            license_entry = JSON.parse(license_entry_response.body)
-            puts JSON.pretty_generate(license_entry).light_yellow if verbose
-            
-            # Get license type from EntitlementId or LicenseType
-            if license_entry["EntitlementId"] && license_entry["EntitlementId"].include?("Enterprise")
-              license_type = "Enterprise"
-            elsif license_entry["LicenseType"]
-              license_type = license_entry["LicenseType"]
-            end
-            
-            # Get license description if available
-            license_description = license_entry["Description"] if license_entry["Description"]
-          end
-        rescue => e
-          puts "Error retrieving license information using DMTF method: #{e.message}".light_red if verbose
-          
-          # If DMTF method fails, try Dell OEM method
-          begin
-            puts "Retrieving license information (Dell OEM method)...".light_yellow if verbose
-            dell_license_response = client.authenticated_request(:get, "/redfish/v1/Managers/iDRAC.Embedded.1/Oem/Dell/DellLicenses")
-            dell_license_info = JSON.parse(dell_license_response.body)
-            puts JSON.pretty_generate(dell_license_info).light_yellow if verbose
-            
-            # Extract license type if licenses are found
-            if dell_license_info["Members"] && !dell_license_info["Members"].empty?
-              dell_license_entry_response = client.authenticated_request(:get, dell_license_info["Members"][0]["@odata.id"])
-              dell_license_entry = JSON.parse(dell_license_entry_response.body)
-              puts JSON.pretty_generate(dell_license_entry).light_yellow if verbose
-              
-              # Get license type from LicenseType or Description
-              if dell_license_entry["LicenseType"]
-                license_type = dell_license_entry["LicenseType"]
-              elsif dell_license_entry["Description"] && dell_license_entry["Description"].include?("Enterprise")
-                license_type = "Enterprise"
-              end
-              
-              # Get license description if available
-              license_description = dell_license_entry["Description"] if dell_license_entry["Description"]
-            end
-          rescue => e2
-            puts "Error retrieving Dell license information: #{e2.message}".light_red if verbose
-          end
-        end
-        
-        # Format the license display string
-        license_display = license_type
-        if license_description
-          license_display = "#{license_type} (#{license_description})"
-        end
+        # Get summary from client
+        system_summary = client.get_system_summary
         
         # Format and display the information
         puts "System Summary:".green.bold
         puts "=" * 50
         
-        puts "Power State:".ljust(25) + (system_info["PowerState"] || "Unknown").light_cyan
-        puts "Model:".ljust(25) + (system_info["Model"] || "Unknown").light_cyan
-        puts "Host Name:".ljust(25) + (system_info["HostName"] || "Unknown").light_cyan
-        puts "Operating System:".ljust(25) + (system_info.dig("Oem", "Dell", "OperatingSystem") || "Unknown").light_cyan
-        puts "Operating System Version:".ljust(25) + (system_info.dig("Oem", "Dell", "OperatingSystemVersion") || "Unknown").light_cyan
-        puts "Service Tag:".ljust(25) + (system_info["SKU"] || "Unknown").light_cyan
-        puts "BIOS Version:".ljust(25) + (system_info.dig("BiosVersion") || "Unknown").light_cyan
-        puts "iDRAC Firmware Version:".ljust(25) + (idrac_info.dig("FirmwareVersion") || "Unknown").light_cyan
-        puts "IP Address:".ljust(25) + (network_info.dig("IPv4Addresses", 0, "Address") || "Unknown").light_cyan
-        puts "iDRAC MAC Address:".ljust(25) + (network_info.dig("MACAddress") || "Unknown").light_cyan
-        puts "License:".ljust(25) + license_display.light_cyan
+        puts "Power State:".ljust(25) + (system_summary[:power_state] || "Unknown").light_cyan
+        puts "Model:".ljust(25) + (system_summary[:model] || "Unknown").light_cyan
+        puts "Host Name:".ljust(25) + (system_summary[:host_name] || "Unknown").light_cyan
+        puts "Operating System:".ljust(25) + (system_summary[:operating_system] || "Unknown").light_cyan
+        puts "Operating System Version:".ljust(25) + (system_summary[:os_version] || "Unknown").light_cyan
+        puts "Service Tag:".ljust(25) + (system_summary[:service_tag] || "Unknown").light_cyan
+        puts "BIOS Version:".ljust(25) + (system_summary[:bios_version] || "Unknown").light_cyan
+        puts "iDRAC Firmware Version:".ljust(25) + (system_summary[:idrac_firmware] || "Unknown").light_cyan
+        puts "IP Address:".ljust(25) + (system_summary[:ip_address] || "Unknown").light_cyan
+        puts "iDRAC MAC Address:".ljust(25) + (system_summary[:mac_address] || "Unknown").light_cyan
+        puts "License:".ljust(25) + system_summary[:license].light_cyan
         
         puts "=" * 50
       end
@@ -463,11 +384,11 @@ module IDRAC
         license = client.license_info
         if license
           puts "\nLicense Information:".green.bold
-          puts "Description: #{license['Description']}".cyan
-          puts "License Type: #{license['LicenseType']}".cyan
+          puts "Description: #{license.Description}".cyan
+          puts "License Type: #{license.LicenseType}".cyan
           puts "License Version: #{client.license_version || 'Unknown'}".cyan
-          puts "Removable: #{license['Removable']}".cyan
-          puts "Status: #{license.dig('Status', 'Health') || 'Unknown'}".cyan
+          puts "Removable: #{license.Removable}".cyan
+          puts "Status: #{license&.Status&.Health || 'Unknown'}".cyan
         else
           puts "No license information available".yellow
         end
@@ -1184,13 +1105,8 @@ module IDRAC
     map "system:config" => :system_config
     def system_config
       with_idrac_client do |client|
-        response = client.authenticated_request(:get, "/redfish/v1/Systems/System.Embedded.1?$expand=*($levels=1)")
-        if response.status == 200
-          config = JSON.parse(response.body)
-          puts JSON.pretty_generate(config)
-        else
-          puts "Failed to retrieve system configuration: #{response.status}".red
-        end
+        config = client.get_system_config
+        puts JSON.pretty_generate(config)
       end
     end
 
@@ -1318,9 +1234,8 @@ module IDRAC
           # System info test
           puts "\n[TEST] System information".cyan.bold
           begin
-            response = client.authenticated_request(:get, "/redfish/v1/Systems/System.Embedded.1")
-            system_info = JSON.parse(response.body)
-            puts "✓ System info: #{system_info['Model']} (#{system_info['SKU']})".green
+            system_info = client.get_basic_system_info
+            puts "✓ System info: #{system_info[:model]} (#{system_info[:sku]})".green
             test_results["system_info"] = { status: "PASS", message: "Retrieved system information successfully" }
           rescue => e
             puts "✗ System info failed: #{e.message}".red

data/lib/idrac/license.rb

@@ -1,7 +1,7 @@
 module IDRAC
   module License
     # Gets the license information from the iDRAC
-    # @return [Hash] License details
+    # @return [RecursiveOpenStruct] License details
     def license_info
       response = authenticated_request(:get, "/redfish/v1/LicenseService/Licenses")
       if response.status != 200
@@ -32,7 +32,7 @@ module IDRAC
       license_details = JSON.parse(license_response.body)
       debug "License details: #{license_details}", 2
 
-      return license_details
+      return RecursiveOpenStruct.new(license_details, recurse_over_arrays: true)
     end
 
     # Extracts the iDRAC version from the license description
@@ -43,15 +43,15 @@ module IDRAC
 
       # Check the Description field, which often contains the version
       # Example: "iDRAC9 Enterprise License"
-      if license["Description"] && license["Description"].match(/iDRAC(\d+)/i)
-        version = license["Description"].match(/iDRAC(\d+)/i)[1].to_i
+      if license.Description && license.Description.match(/iDRAC(\d+)/i)
+        version = license.Description.match(/iDRAC(\d+)/i)[1].to_i
         debug "Found license version from Description: #{version}", 1
         return version
       end
 
       # Try alternative fields if Description didn't work
-      if license["Name"] && license["Name"].match(/iDRAC(\d+)/i)
-        version = license["Name"].match(/iDRAC(\d+)/i)[1].to_i
+      if license.Name && license.Name.match(/iDRAC(\d+)/i)
+        version = license.Name.match(/iDRAC(\d+)/i)[1].to_i
         debug "Found license version from Name: #{version}", 1
         return version
       end

data/lib/idrac/system.rb

@@ -490,5 +490,117 @@ module IDRAC
       total_memory = memory_data.sum { |m| m.capacity_bytes }
       "%0.2f GB" % (total_memory.to_f / 1.gigabyte)
     end
+
+    # Get complete system configuration
+    def get_system_config
+      response = authenticated_request(:get, "/redfish/v1/Systems/System.Embedded.1?$expand=*($levels=1)")
+      
+      if response.status == 200
+        return JSON.parse(response.body)
+      else
+        raise Error, "Failed to retrieve system configuration: #{response.status}"
+      end
+    end
+    
+    # Get system summary information (used by CLI summary command)
+    def get_system_summary
+      # Get system information
+      system_response = authenticated_request(:get, "/redfish/v1/Systems/System.Embedded.1")
+      system_info = JSON.parse(system_response.body)
+      
+      # Get iDRAC information
+      idrac_response = authenticated_request(:get, "/redfish/v1/Managers/iDRAC.Embedded.1")
+      idrac_info = JSON.parse(idrac_response.body)
+      
+      # Get network information
+      network_response = authenticated_request(:get, "/redfish/v1/Managers/iDRAC.Embedded.1/EthernetInterfaces/NIC.1")
+      network_info = JSON.parse(network_response.body)
+      
+      # Initialize license_type to Unknown
+      license_type = "Unknown"
+      license_description = nil
+      
+      # Try to get license information using DMTF standard method
+      begin
+        license_response = authenticated_request(:get, "/redfish/v1/LicenseService/Licenses")
+        license_info = JSON.parse(license_response.body)
+        
+        # Extract license type if licenses are found
+        if license_info["Members"] && !license_info["Members"].empty?
+          license_entry_response = authenticated_request(:get, license_info["Members"][0]["@odata.id"])
+          license_entry = JSON.parse(license_entry_response.body)
+          
+          # Get license type from EntitlementId or LicenseType
+          if license_entry["EntitlementId"] && license_entry["EntitlementId"].include?("Enterprise")
+            license_type = "Enterprise"
+          elsif license_entry["LicenseType"]
+            license_type = license_entry["LicenseType"]
+          end
+          
+          # Get license description if available
+          license_description = license_entry["Description"] if license_entry["Description"]
+        end
+      rescue => e
+        # If DMTF method fails, try Dell OEM method
+        begin
+          dell_license_response = authenticated_request(:get, "/redfish/v1/Managers/iDRAC.Embedded.1/Oem/Dell/DellLicenses")
+          dell_license_info = JSON.parse(dell_license_response.body)
+          
+          # Extract license type if licenses are found
+          if dell_license_info["Members"] && !dell_license_info["Members"].empty?
+            dell_license_entry_response = authenticated_request(:get, dell_license_info["Members"][0]["@odata.id"])
+            dell_license_entry = JSON.parse(dell_license_entry_response.body)
+            
+            # Get license type from LicenseType or Description
+            if dell_license_entry["LicenseType"]
+              license_type = dell_license_entry["LicenseType"]
+            elsif dell_license_entry["Description"] && dell_license_entry["Description"].include?("Enterprise")
+              license_type = "Enterprise"
+            end
+            
+            # Get license description if available
+            license_description = dell_license_entry["Description"] if dell_license_entry["Description"]
+          end
+        rescue => e2
+          # License information not available
+        end
+      end
+      
+      # Format the license display string
+      license_display = license_type
+      if license_description
+        license_display = "#{license_type} (#{license_description})"
+      end
+
+      # Return the system summary
+      {
+        power_state: system_info["PowerState"],
+        model: system_info["Model"],
+        host_name: system_info["HostName"],
+        operating_system: system_info.dig("Oem", "Dell", "OperatingSystem"),
+        os_version: system_info.dig("Oem", "Dell", "OperatingSystemVersion"),
+        service_tag: system_info["SKU"],
+        bios_version: system_info.dig("BiosVersion"),
+        idrac_firmware: idrac_info.dig("FirmwareVersion"),
+        ip_address: network_info.dig("IPv4Addresses", 0, "Address"),
+        mac_address: network_info.dig("MACAddress"),
+        license: license_display
+      }
+    end
+    
+    # Get basic system information (used for test_live function)
+    def get_basic_system_info
+      response = authenticated_request(:get, "/redfish/v1/Systems/System.Embedded.1")
+      
+      if response.status == 200
+        data = JSON.parse(response.body)
+        return {
+          model: data["Model"],
+          sku: data["SKU"]
+        }
+      else
+        raise Error, "Failed to get basic system information: #{response.status}"
+      end
+    end
   end
 end 

data/lib/idrac/version.rb

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

metadata

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