supermicro 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 471ad0e0ecd001b34f54992ae215ef9473518591ddda5971439fd50142d7f147
-  data.tar.gz: 2cbb22954501401431bf37021c8ffd2275a806f1d9daaa189490dbdb7199e34b
+  metadata.gz: b7b045637afdfc22ca25c75e6acd7cf8880a8b8fcd55db67a3aebf5bc8e7875c
+  data.tar.gz: 90f5b3cae2874bb7511e087b03cd4940e1b2594ddafed3f864aa486fdd7abc2a
 SHA512:
-  metadata.gz: 27c30adcb6de01ce1b5de29ab05221477fdf04bd36e768a74e43b8a5e60fc2093174b2d70670afe21aa245768ef9592694ed48c458be0b5d5fa15b8dfb8eab51
-  data.tar.gz: 937d9d4acb761743b4c9db40cf9c282b823ca83e9ba83ae4ce5a1fbaf1df158cf6d6c98039f75b13d965fb8125cee04d54cf89c4ef89b148bade0f467427426d
+  metadata.gz: '0835ab4b24a469bc013afba3f514f66b86d15d1578785284d2007720aa4065b84db873a49d5c8de9447ce47329926fa9ec13794995916569d8258b495cc0bd0f'
+  data.tar.gz: 430d94eda6451653864324f62002cb42e9ce15e7b7bb27f27a222ce3e24f59b369b3870a253f08ef478a899dcbf13f16c444ece56e1cb0e2b17972ca7a5fe954

data/lib/supermicro/network.rb

@@ -27,7 +27,7 @@ module Supermicro
     
     def set_bmc_network(ip_address: nil, subnet_mask: nil, gateway: nil, 
                         dns_primary: nil, dns_secondary: nil, hostname: nil, 
-                        dhcp: false)
+                        dhcp: false, wait: true)
       
       if dhcp
         puts "Setting BMC to DHCP mode...".yellow
@@ -42,6 +42,8 @@ module Supermicro
         
         # Configure static IP if provided
         if ip_address && subnet_mask
+          # Must explicitly disable DHCP when setting static IP
+          body["DHCPv4"] = { "DHCPEnabled" => false }
           body["IPv4StaticAddresses"] = [{
             "Address" => ip_address,
             "SubnetMask" => subnet_mask,
@@ -75,9 +77,43 @@ module Supermicro
       )
       
       if response.status.between?(200, 299)
-        puts "BMC network configured successfully.".green
-        puts "WARNING: BMC may restart network services. Connection may be lost.".yellow if ip_address
-        true
+        puts "BMC network configuration submitted.".green
+        
+        # If we're changing IP and wait is enabled, handle the transition
+        if ip_address && wait
+          puts "Waiting for BMC to apply network changes...".yellow
+          
+          # Check if response contains a task/job ID
+          if response.status == 202 && response.headers['Location']
+            # Job was created, monitor it
+            job_uri = response.headers['Location']
+            puts "Monitoring job: #{job_uri}".cyan
+            
+            # Wait for current job to complete (on old IP)
+            wait_for_network_job(job_uri)
+          else
+            # No job, just wait a bit for the change to apply
+            sleep 5
+          end
+          
+          # Now verify the BMC is reachable on the new IP
+          puts "Verifying BMC is reachable on new IP: #{ip_address}...".yellow
+          if verify_bmc_on_new_ip(ip_address, @username, @password)
+            puts "BMC successfully configured and reachable on #{ip_address}".green
+            
+            # Update our client's host to the new IP
+            @host = ip_address
+            true
+          else
+            puts "WARNING: BMC configuration may have succeeded but cannot reach BMC on #{ip_address}".yellow
+            puts "The BMC may still be applying changes or may require manual verification.".yellow
+            false
+          end
+        else
+          puts "BMC network configured successfully.".green
+          puts "WARNING: BMC may restart network services. Connection may be lost.".yellow if ip_address && !wait
+          true
+        end
       else
         raise Error, "Failed to configure BMC network: #{response.status} - #{response.body}"
       end
@@ -87,5 +123,91 @@ module Supermicro
       # Convenience method
       set_bmc_network(dhcp: true)
     end
+    
+    private
+    
+    def wait_for_network_job(job_uri, timeout: 60)
+      start_time = Time.now
+      
+      while (Time.now - start_time) < timeout
+        begin
+          response = authenticated_request(:get, job_uri)
+          
+          if response.status == 200
+            data = JSON.parse(response.body)
+            state = data["TaskState"] || data["JobState"] || "Unknown"
+            
+            case state
+            when "Completed", "OK"
+              puts "Network configuration job completed successfully.".green
+              return true
+            when "Exception", "Critical", "Error", "Failed"
+              puts "Network configuration job failed: #{state}".red
+              return false
+            else
+              print "."
+              sleep 2
+            end
+          else
+            # Can't check status, assume it's applying
+            sleep 2
+          end
+        rescue => e
+          # Connection might be interrupted during network change
+          debug "Connection error during job monitoring (expected): #{e.message}", 2
+          sleep 2
+        end
+      end
+      
+      puts "\nJob monitoring timed out after #{timeout} seconds".yellow
+      false
+    end
+    
+    def verify_bmc_on_new_ip(new_ip, username, password, retries: 10, delay: 3)
+      retries.times do |i|
+        begin
+          # Create a new connection to test the new IP
+          test_conn = Faraday.new(
+            url: "https://#{new_ip}",
+            ssl: { verify: @verify_ssl }
+          ) do |f|
+            f.adapter Faraday.default_adapter
+            f.response :follow_redirects
+          end
+          
+          # Try to access the Redfish root
+          response = test_conn.get('/redfish/v1/')
+          
+          if response.status == 200 || response.status == 401
+            # BMC is responding, try to login
+            login_response = test_conn.post do |req|
+              req.url '/redfish/v1/SessionService/Sessions'
+              req.headers['Content-Type'] = 'application/json'
+              req.body = { 
+                "UserName" => username, 
+                "Password" => password 
+              }.to_json
+            end
+            
+            if login_response.status.between?(200, 204)
+              # Successfully reached and authenticated
+              # Clean up the test session
+              if login_response.headers['x-auth-token']
+                test_conn.delete('/redfish/v1/SessionService/Sessions') do |req|
+                  req.headers['X-Auth-Token'] = login_response.headers['x-auth-token']
+                end
+              end
+              return true
+            end
+          end
+        rescue => e
+          debug "Attempt #{i+1}/#{retries} failed: #{e.message}", 2
+        end
+        
+        sleep delay unless i == retries - 1
+      end
+      
+      false
+    end
   end
 end

data/lib/supermicro/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Supermicro
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: supermicro
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Jonathan Siegel
@@ -187,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: API Client for Supermicro BMC