idrac 0.5.2 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1bffe050d6256766e75d7a51d80133d14c3b86abcfc53b1de4e172be80f4747
-  data.tar.gz: c74c883203a6b14e2f18041c7df0e4dacae125cbf6f6cc6a3da2a0dd1bc56ef6
+  metadata.gz: 11b28d37156ee3d58ef6a804a016cc6ca35f6a4e7c4e158c93fe86c0053398f0
+  data.tar.gz: c69c297450fb2715873e3dbd66f2779d3487ce1fecfca9a4032a7d917d87f8c6
 SHA512:
-  metadata.gz: db7644ef1fd92b3af97d0c202d5e3b6d80963bb5ecbe24b4a339249184c29667e7e0dea3f7e99074afaa52af127ef249c9768cf322156a12769a230d7cee7b76
-  data.tar.gz: 63e817a2e85d68f3c848658adefe7567ebd629546b15362d7ac32c9cb19aea4edd54f5091bf893f38a8f52c84eaa9c6ffda07b71fb4abc8872fde4bf74959961
+  metadata.gz: f0beadf7041ca23371999f125d536c25972a615092baf045fdb2694d3c15e2ea28c9f063943e1f8df67065855f26cca23e138622b2f80fba0c8bc8b575c8215c
+  data.tar.gz: c88e403f07b030a238f999498c3da04fa5b3908713d469c4e52ed28ea8ac310ec018c9a6be519695d054358a1603045d4a8785d94d029e07b90cdcbf6445a1c5

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
@@ -636,10 +557,10 @@ module IDRAC
       with_idrac_client do |client|
         controller = client.controller
         puts "\nStorage Controller Summary:".green.bold
-        puts "Name: #{controller['Name']}".cyan
-        puts "Model: #{controller['Model']}".cyan
-        puts "Health: #{controller['Status']['Health']}".cyan
-        puts "Manufacturer: #{controller['Manufacturer']}".cyan
+        puts "Name: #{controller.name}".cyan
+        puts "Model: #{controller.model}".cyan
+        puts "Health: #{controller.status&.health || 'Unknown'}".cyan
+        puts "Manufacturer: #{controller.manufacturer}".cyan
         
         if client.controller_encryption_capable?(controller)
           puts "Encryption Capable: Yes".green
@@ -689,17 +610,17 @@ module IDRAC
         
         puts "\nPhysical Drives (#{drives.size}):".green.bold
         drives.each do |drive|
-          capacity_gb = drive[:capacity_bytes].to_f / (1024**3)
-          health_color = drive[:health] == "OK" ? :green : :red
+          capacity_gb = drive.capacity_bytes.to_f / (1024**3)
+          health_color = drive.health == "OK" ? :green : :red
           
-          puts "#{drive[:name]}:".bold
-          puts "  Model: #{drive[:model]}".cyan
-          puts "  Health: #{drive[:health].send(health_color)}"
+          puts "#{drive.name}:".bold
+          puts "  Model: #{drive.model}".cyan
+          puts "  Health: #{drive.health.send(health_color)}"
           puts "  Capacity: #{capacity_gb.round(2)} GB".cyan
-          puts "  Media Type: #{drive[:media_type]}".cyan
-          puts "  Serial: #{drive[:serial]}".cyan
-          if drive[:encryption_ability]
-            puts "  Encryption: #{drive[:encryption_ability]}".cyan
+          puts "  Media Type: #{drive.media_type}".cyan
+          puts "  Serial: #{drive.serial}".cyan
+          if drive.encryption_ability
+            puts "  Encryption: #{drive.encryption_ability}".cyan
           end
           puts ""
         end
@@ -754,7 +675,7 @@ module IDRAC
         confirmation = $stdin.gets.chomp.downcase
         
         if confirmation == 'y'
-          client.create_virtual_disk(controller['Id'], drives, name: options[:name], raid_type: options[:raid])
+          client.create_virtual_disk(controller.odata_Id, drives, name: options[:name], raid_type: options[:raid])
           puts "Volume created successfully".green
         else
           puts "Operation cancelled".yellow
@@ -842,7 +763,7 @@ module IDRAC
         # Get keyid if not provided
         keyid = options[:keyid] || "RAID-Key-#{Time.now.strftime('%Y%m%d')}"
         
-        client.enable_local_key_management(controller['Id'], passphrase: passphrase, keyid: keyid)
+        client.enable_local_key_management(controller.odata_id, passphrase: passphrase, keyid: keyid)
         puts "Encryption enabled successfully".green
       end
     end
@@ -863,7 +784,7 @@ module IDRAC
         confirmation = $stdin.gets.chomp
         
         if confirmation == 'DISABLE'
-          client.disable_local_key_management(controller['Id'])
+          client.disable_local_key_management(controller.odata_id)
           puts "Encryption disabled successfully".green
         else
           puts "Operation cancelled".yellow
@@ -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
@@ -1347,7 +1262,7 @@ module IDRAC
           puts "\n[TEST] Storage management".cyan.bold
           begin
             controller = client.controller
-            puts "✓ Storage controller: #{controller['Name']} (#{controller['Model']})".green
+            puts "✓ Storage controller: #{controller.name} (#{controller.model})".green
             
             drives = client.drives(controller)
             puts "✓ Found #{drives.size} physical drives".green

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.2"
+  VERSION = "0.5.4"
 end

metadata

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