idrac 0.1.28 → 0.1.30

data/lib/idrac/firmware_catalog.rb

@@ -2,10 +2,13 @@ require 'net/http'
 require 'uri'
 require 'fileutils'
 require 'nokogiri'
+require 'open-uri'
+require 'colorize'
 
 module IDRAC
   class FirmwareCatalog
-    CATALOG_URL = "https://downloads.dell.com/catalog/Catalog.xml.gz"
+    DELL_CATALOG_BASE = 'https://downloads.dell.com'
+    DELL_CATALOG_URL = "#{DELL_CATALOG_BASE}/catalog/Catalog.xml.gz"
     
     attr_reader :catalog_path
     
@@ -14,40 +17,38 @@ module IDRAC
     end
     
     def download(output_dir = nil)
-      # Use ~/.idrac as the default directory
-      output_dir ||= File.expand_path("~/.idrac")
+      # Default to ~/.idrac directory
+      output_dir ||= File.expand_path('~/.idrac')
       FileUtils.mkdir_p(output_dir) unless Dir.exist?(output_dir)
       
-      catalog_gz_path = File.join(output_dir, "Catalog.xml.gz")
-      catalog_path = File.join(output_dir, "Catalog.xml")
-      
-      puts "Downloading Dell catalog from #{CATALOG_URL}..."
-      
-      uri = URI.parse(CATALOG_URL)
-      Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
-        request = Net::HTTP::Get.new(uri)
-        http.request(request) do |response|
-          if response.code == "200"
-            File.open(catalog_gz_path, 'wb') do |file|
-              response.read_body do |chunk|
-                file.write(chunk)
-              end
-            end
-          else
-            raise Error, "Failed to download catalog: #{response.code} #{response.message}"
-          end
-        end
-      end
+      catalog_gz = File.join(output_dir, 'Catalog.xml.gz')
+      catalog_xml = File.join(output_dir, 'Catalog.xml')
       
-      puts "Extracting catalog..."
-      system("gunzip -f #{catalog_gz_path}")
+      puts "Downloading Dell catalog from #{DELL_CATALOG_URL}...".light_cyan
       
-      if File.exist?(catalog_path)
-        puts "Catalog downloaded and extracted to #{catalog_path}"
-        @catalog_path = catalog_path
-        return catalog_path
-      else
-        raise Error, "Failed to extract catalog"
+      begin
+        # Download the catalog
+        URI.open(DELL_CATALOG_URL) do |remote_file|
+          File.open(catalog_gz, 'wb') do |local_file|
+            local_file.write(remote_file.read)
+          end
+        end
+        
+        puts "Extracting catalog...".light_cyan
+        
+        # Extract the catalog
+        system("gunzip -f #{catalog_gz}")
+        
+        if File.exist?(catalog_xml)
+          puts "Catalog downloaded and extracted to #{catalog_xml}".green
+          @catalog_path = catalog_xml
+          return catalog_xml
+        else
+          raise Error, "Failed to extract catalog"
+        end
+      rescue => e
+        puts "Error downloading catalog: #{e.message}".red.bold
+        raise Error, "Failed to download Dell catalog: #{e.message}"
       end
     end
     
@@ -62,59 +63,130 @@ module IDRAC
       doc = parse
       models = []
       
-      # Extract just the model number for PowerEdge servers (e.g., R640 from PowerEdge R640)
+      # Extract model code from full model name (e.g., "PowerEdge R640" -> "R640")
       model_code = nil
       if model_name.include?("PowerEdge")
         model_code = model_name.split.last
+      else
+        model_code = model_name
       end
       
+      puts "Searching for model: #{model_name} (code: #{model_code})"
+      
+      # Build a mapping of model names to system IDs
+      model_to_system_id = {}
+      
       doc.xpath('//SupportedSystems/Brand/Model').each do |model|
+        system_id = model['systemID'] || model['id']
         name = model.at_xpath('Display')&.text
         code = model.at_xpath('Code')&.text
         
-        # Try to match by full name
-        if name && name.downcase.include?(model_name.downcase)
-          models << {
-            name: name,
-            code: code,
-            id: model['id']
-          }
-        # Try to match by model code (e.g., R640)
-        elsif model_code && code && code.downcase == model_code.downcase
-          models << {
+        if name && system_id
+          model_to_system_id[name] = {
             name: name,
             code: code,
-            id: model['id']
+            id: system_id
           }
+          
+          # Also map just the model number (R640, etc.)
+          if name =~ /[RT]\d+/
+            model_short = name.match(/([RT]\d+\w*)/)[1]
+            model_to_system_id[model_short] = {
+              name: name,
+              code: code,
+              id: system_id
+            }
+          end
+        end
+      end
+      
+      # Try exact match first
+      if model_to_system_id[model_name]
+        models << model_to_system_id[model_name]
+      end
+      
+      # Try model code match
+      if model_to_system_id[model_code]
+        models << model_to_system_id[model_code]
+      end
+      
+      # If we still don't have a match, try a more flexible approach
+      if models.empty?
+        model_to_system_id.each do |name, model_info|
+          if name.include?(model_code) || model_code.include?(name)
+            models << model_info
+          end
+        end
+      end
+      
+      # If still no match, try matching by systemID directly
+      if models.empty?
+        doc.xpath('//SupportedSystems/Brand/Model').each do |model|
+          system_id = model['systemID'] || model['id']
+          name = model.at_xpath('Display')&.text
+          code = model.at_xpath('Code')&.text
+          
+          if code && code.downcase == model_code.downcase
+            models << {
+              name: name,
+              code: code,
+              id: system_id
+            }
+          end
         end
       end
       
-      models
+      models.uniq { |m| m[:id] }
     end
     
     def find_updates_for_system(system_id)
       doc = parse
       updates = []
       
-      doc.xpath("//SoftwareComponent[SupportedSystems/Brand/Model[@id='#{system_id}']]").each do |component|
-        name = component.at_xpath('Name')&.text
-        version = component.at_xpath('Version')&.text
-        path = component.at_xpath('Path')&.text
-        component_type = component.at_xpath('ComponentType')&.text
-        category = component.at_xpath('Category')&.text
+      # Find all SoftwareComponents
+      doc.xpath("//SoftwareComponent").each do |component|
+        # Check if this component supports our system ID
+        supported_system_ids = component.xpath(".//SupportedSystems/Brand/Model/@systemID | .//SupportedSystems/Brand/Model/@id").map(&:value)
+        
+        next unless supported_system_ids.include?(system_id)
+        
+        # Get component details
+        name_node = component.xpath("./Name/Display[@lang='en']").first
+        name = name_node ? name_node.text.strip : ""
+        
+        component_type_node = component.xpath("./ComponentType/Display[@lang='en']").first
+        component_type = component_type_node ? component_type_node.text.strip : ""
+        
+        path = component['path'] || ""
+        category_node = component.xpath("./Category/Display[@lang='en']").first
+        category = category_node ? category_node.text.strip : ""
         
-        next unless name && version && path
+        version = component['dellVersion'] || component['vendorVersion'] || ""
         
-        updates << {
-          name: name,
-          version: version,
-          path: path,
-          component_type: component_type,
-          category: category,
-          download_url: "https://downloads.dell.com/#{path}"
-        }
+        # Skip if missing essential information
+        next if name.empty? || path.empty? || version.empty?
+        
+        # Only include firmware updates
+        if component_type.include?("Firmware") ||
+           category.include?("BIOS") ||
+           category.include?("Firmware") ||
+           category.include?("iDRAC") ||
+           name.include?("BIOS") ||
+           name.include?("Firmware") ||
+           name.include?("iDRAC")
+          
+          updates << {
+            name: name,
+            version: version,
+            path: path,
+            component_type: component_type,
+            category: category,
+            download_url: "https://downloads.dell.com/#{path}"
+          }
+        end
       end
       
+      puts "Found #{updates.size} firmware updates for system ID #{system_id}"
       updates
     end
     

data/lib/idrac/version.rb

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

data/test_firmware_update.rb

@@ -0,0 +1,68 @@
+#!/usr/bin/env ruby
+
+require 'lib/idrac'
+require 'colorize'
+
+# Create a client
+client = IDRAC::Client.new(
+  host: '127.0.0.1',
+  username: 'root',
+  password: 'calvin',
+  verify_ssl: false
+)
+
+begin
+  # Login to iDRAC
+  puts "Logging in to iDRAC...".light_cyan
+  client.login
+  puts "Logged in successfully".green
+  
+  # Create a firmware instance
+  firmware = IDRAC::Firmware.new(client)
+  
+  # Get system inventory
+  puts "Getting system inventory...".light_cyan
+  inventory = firmware.get_system_inventory
+  
+  puts "System Information:".green.bold
+  puts "  Model: #{inventory[:system][:model]}".light_cyan
+  puts "  Manufacturer: #{inventory[:system][:manufacturer]}".light_cyan
+  puts "  Service Tag: #{inventory[:system][:service_tag]}".light_cyan
+  puts "  BIOS Version: #{inventory[:system][:bios_version]}".light_cyan
+  
+  puts "\nInstalled Firmware:".green.bold
+  inventory[:firmware].each do |fw|
+    puts "  #{fw[:name]}: #{fw[:version]} (#{fw[:updateable] ? 'Updateable'.light_green : 'Not Updateable'.light_red})".light_cyan
+  end
+  
+  # Check for updates
+  catalog_path = File.expand_path("~/.idrac/Catalog.xml")
+  if File.exist?(catalog_path)
+    puts "\nChecking for updates using catalog: #{catalog_path}".light_cyan
+    updates = firmware.check_updates(catalog_path)
+    
+    if updates.any?
+      puts "\nAvailable Updates:".green.bold
+      updates.each_with_index do |update, index|
+        puts "#{index + 1}. #{update[:name]}: #{update[:current_version]} -> #{update[:available_version]}".light_cyan
+      end
+      
+      # Interactive update for the first update
+      puts "\nSelected update: #{updates.first[:name]}".light_yellow
+      puts "Starting interactive update for selected component...".light_cyan.bold
+      
+      firmware.interactive_update(catalog_path, [updates.first])
+    else
+      puts "No updates available for your system.".yellow
+    end
+  else
+    puts "\nCatalog not found at #{catalog_path}. Run 'idrac firmware:catalog' to download it.".yellow
+  end
+  
+rescue IDRAC::Error => e
+  puts "Error: #{e.message}".red.bold
+ensure
+  # Logout
+  client.logout if client
+  puts "Logged out".light_cyan
+end