rubyipmi 0.6.0 → 0.7.0

data/lib/rubyipmi/freeipmi/commands/basecommand.rb

@@ -1,3 +1,5 @@
+require 'rubyipmi/freeipmi/errorcodes'
+
 module Rubyipmi::Freeipmi
 
   class BaseCommand < Rubyipmi::BaseCommand
@@ -5,27 +7,29 @@ module Rubyipmi::Freeipmi
     def setpass
       super
       @options["config-file"] = @passfile.path
-      @passfile.puts "password #{@options["password"]}\n"
-      @passfile.puts "username #{@options["username"]}"
-
+      @passfile.write "username #{@options["username"]}\n"
+      @passfile.write "password #{@options["password"]}\n"
       @passfile.close
+
+    end
+
+    def max_retry_count
+      @max_retry_count ||= Rubyipmi::Freeipmi::ErrorCodes.length
     end
 
     def makecommand
       # need to format the options to freeipmi format
       args = @options.collect { |k, v|
+        # must remove from command line as its handled via conf file
+        next if k == 'password'
+        next if k == 'username'
         if not v
           "--#{k}"
         else
           "--#{k}=#{v}"
         end
       }.join(" ")
-      # must remove from command line as its handled via conf file
-      args.delete("--password")
-      args.delete("--username")
-
-
-      return "#{cmd} #{args}"
+      return "#{cmd} #{args.rstrip}"
     end
 
     # This method will check if the results are really valid as the exit code can be misleading and incorrect
@@ -35,39 +39,39 @@ module Rubyipmi::Freeipmi
           # until ipmipower returns the correct exit status this is a hack
           # essentially any result greater than 23 characters is an error
           if @result.length > 23
-            return false
+            raise "Error occurred"
           end
         when "bmc-config"
           if @result.length > 100
             return true
+          else
+            raise "Error occurred"
+          end
+        else
+          if exitstatus.success?
+            return true
+          else
+            raise "Error occurred"
           end
-      end
-      return exitstatus.success?
 
+      end
     end
 
     # The findfix method acts like a recursive method and applies fixes defined in the errorcodes
     # If a fix is found it is applied to the options hash, and then the last run command is retried
     # until all the fixes are exhausted or a error not defined in the errorcodes is found
-    def findfix(result, args, debug, runmethod)
+    def find_fix(result)
       if result
         # The errorcode code hash contains the fix
-        fix = Rubyipmi::Freeipmi::ErrorCodes.code[result]
-        if not fix
-          raise "#{result}"
-        else
+        begin
+          fix = ErrorCodes.search(result)
           @options.merge_notify!(fix)
-          # retry the last called method
-          # its quicker to explicitly call these commands than calling a command block
-          if runmethod == "runcmd"
-            runcmd(debug)
-          else
-            runcmd_without_opts(args, debug)
-          end
 
+        rescue
+          raise "Could not find fix for error code: \n#{result}"
         end
-
       end
     end
+
   end
 end

data/lib/rubyipmi/freeipmi/commands/bmc.rb

@@ -1,12 +1,12 @@
 module Rubyipmi::Freeipmi
 
-  class Bmc
+  class Bmc < Rubyipmi::Freeipmi::BaseCommand
 
-    attr_accessor :options
+    #attr_accessor :options
     attr_accessor :config
 
     def initialize(opts = ObservableHash.new)
-      @options = opts
+      super("bmc-device", opts)
       @bmcinfo = {}
     end
 

data/lib/rubyipmi/freeipmi/commands/bmcconfig.rb

@@ -9,12 +9,12 @@ module Rubyipmi::Freeipmi
     end
 
     def section(section)
-       @options["checkout"] = false
-       @options["section"] = section
-       value = runcmd
-       @options.delete_notify("checkout")
-       @options.delete_notify("section")
-       @result
+      @options["checkout"] = false
+      @options["section"] = section
+      value = runcmd
+      @options.delete_notify("checkout")
+      @options.delete_notify("section")
+      return @result
     end
 
     def setsection(section, key, value)

data/lib/rubyipmi/freeipmi/commands/bmcinfo.rb

@@ -9,9 +9,9 @@ module Rubyipmi::Freeipmi
 
 
     def guid
-      @options["guid"] = false
+      options["get-device-guid"] = false
       status = runcmd
-      @options.delete_notify["guid"]
+      options.delete_notify("get-device-guid")
       if not status
         raise @result
       else
@@ -19,27 +19,7 @@ module Rubyipmi::Freeipmi
       end
 
     end
-    # freeipmi
-    # Device ID:         17
-    # Device Revision:   1
-    #                    [SDR Support]
-    # Firmware Revision: 2.09
-    #                    [Device Available (normal operation)]
-    # IPMI Version:      2.0
-    # Additional Device Support:
-    #                    [Sensor Device]
-    #                    [SDR Repository Device]
-    #                    [SEL Device]
-    #                    [FRU Inventory Device]
-    # Manufacturer ID:   11
-    # Product ID:        8192
-    # Channel Information:
-    #        Channel No: 2
-    #       Medium Type: 802.3 LAN
-    #     Protocol Type: IPMB-1.0
-    #        Channel No: 7
-    #       Medium Type: OEM
-    #     Protocol Type: KCS
+
     def retrieve
       bmcinfo = {}
       status = runcmd

data/lib/rubyipmi/freeipmi/commands/fru.rb

@@ -2,48 +2,105 @@ module Rubyipmi::Freeipmi
 
   class Fru < Rubyipmi::Freeipmi::BaseCommand
 
+    attr_accessor :list
+
+    DEFAULT_FRU = 'default_fru_device'
+
     def initialize(opts = ObservableHash.new)
-          super("ipmi-fru", opts)
+        super("ipmi-fru", opts)
+        @list = {}
     end
 
-    # return the list of fru information in a hash
-    def list
-      @list ||= parse(command)
+    def get_from_list(key)
+      if list.has_key?(DEFAULT_FRU)
+        if list[DEFAULT_FRU].has_key?(key)
+           list[DEFAULT_FRU][key]
+         else
+           nil
+         end
+      end
+    end
+
+
+    def manufacturer
+      get_from_list('board_manufacturer')
+    end
+
+    def board_serial
+      get_from_list('board_serial_number')
     end
 
     def serial
-      list["chassis_serial_number"]
+      get_from_list('board_serial_number')
     end
 
-    def manufacturer
-      list["board_manufacturer"]
+    def model
+      get_from_list('board_product_name')
+    end
+
+    # method to retrieve the raw fru data
+    def getfrus
+      command
+      return @result
     end
 
-    def product
-      list["board_product_name"]
+    def names
+      list.keys
+    end
+
+    # return the list of fru information in a hash
+    def list
+      if @list.count < 1
+        parse(getfrus)
+      end
+      @list
     end
 
     private
 
     def method_missing(method, *args, &block)
-          if not list.has_key?(method.to_s)
-            raise NoMethodError
-          else
-            list[method.to_s]
-          end
-     end
+      name = method.to_s
+      fru = list.fetch(name, nil)
+      # if the user wanted some data from the default fru, lets show the data for the fru.  Otherwise
+      # we return the Fru with the given name
+      if fru.nil?
+        if list[DEFAULT_FRU].keys.include?(name)
+          return list[DEFAULT_FRU][name]
+        else
+          # maybe we should return nil instead? hmm...
+          raise NoMethodError
+        end
+      else
+        return fru
+      end
+    end
 
     # parse the fru information
     def parse(data)
-      datalist = {}
-      data.lines.each do |line|
-        key, value = line.split(':')
-        next if key =~ /\n/
-        value = value.strip
-        key = key.gsub(/FRU/, '').strip.gsub(/\ /, '_').downcase
-        datalist[key] = value.strip
+      if ! data.nil? and ! data.empty?
+        parsed_data = []
+        data.lines.each do |line|
+          if line =~ /^FRU.*/
+            # this is the either the first line of of the fru or another fru
+            if parsed_data.count != 0
+              # we have reached a new fru device so lets record the previous fru
+              new_fru = FruData.new(parsed_data)
+              parsed_data = []
+              @list[new_fru[:name]] = new_fru
+            end
+
+          end
+          parsed_data << line
+        end
+        # process the last fru
+        if parsed_data.count != 0
+          # we have reached a new fru device so lets record the previous fru
+          new_fru = FruData.new(parsed_data)
+          parsed_data = []
+          @list[new_fru[:name]] = new_fru
+        end
       end
-      return datalist
+      return @list
     end
 
     # run the command and return result
@@ -56,4 +113,41 @@ module Rubyipmi::Freeipmi
 
   end
 
+  class FruData < Hash
+
+    def name
+      self[:name]
+    end
+
+    def initialize(data)
+      parse(data)
+    end
+
+    # parse the fru information that should be an array of lines
+    def parse(data)
+      if ! data.nil?
+        data.each do |line|
+          key, value = line.split(':', 2)
+          if key =~ /^FRU.*/
+            if value =~ /([\w\s]*)\(.*\)/
+              self[:name] = $~[1].strip.gsub(/\ /, '_').downcase
+            end
+          else
+            key = key.strip.gsub(/\ /, '_').downcase.gsub(/fru_/, '')
+            if ! value.nil?
+              self[key] = value.strip
+
+            end
+          end
+        end
+      end
+    end
+
+    private
+
+    def method_missing(method, *args, &block)
+      self.fetch(method.to_s, nil)
+    end
+
+  end
 end

data/lib/rubyipmi/freeipmi/commands/lan.rb

@@ -13,6 +13,7 @@ module Rubyipmi::Freeipmi
       @channel = 2
     end
 
+
     def info
       if @info.length < 1
         parse(@config.section("Lan_Conf"))
@@ -22,45 +23,27 @@ module Rubyipmi::Freeipmi
     end
 
     def dhcp?
-      if @info.length < 1
-        parse(@config.section("Lan_Conf"))
-      end
-      @info["ip_address_source"].match(/dhcp/i) != nil
+      info.fetch("ip_address_source",nil).match(/dhcp/i) != nil
     end
 
     def static?
-      if @info.length < 1
-        parse(@config.section("Lan_Conf"))
-      end
-      @info["ip_address_source"].match(/static/i) != nil
+      info.fetch("ip_address_source",nil).match(/static/i) != nil
     end
 
     def ip
-      if @info.length < 1
-        parse(@config.section("Lan_Conf"))
-      end
-      @info["ip_address"]
+      info.fetch("ip_address", nil)
     end
 
     def mac
-      if @info.length < 1
-        parse(@config.section("Lan_Conf"))
-      end
-      @info["mac_address"]
+      info.fetch("mac_address", nil)
     end
 
     def netmask
-      if @info.length < 1
-        parse(@config.section("Lan_Conf"))
-      end
-      @info["subnet_mask"]
+      info.fetch("subnet_mask", nil)
     end
 
     def gateway
-      if @info.length < 1
-        parse(@config.section("Lan_Conf"))
-      end
-      @info["default_gateway_ip_address"]
+      info.fetch("default_gateway_ip_address", nil)
     end
 
   #  def snmp
@@ -75,16 +58,26 @@ module Rubyipmi::Freeipmi
   #
   #  end
 
+    # validates that the address, returns true/false
+    def validaddr?(source)
+      valid = /^([1-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(\.([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])){3}$/.match("#{source}")
+      if valid.nil?
+        raise "#{source} is not a valid address"
+      else
+        return true
+      end
+    end
+
     def ip=(address)
-      @config.setsection("Lan_Conf", "IP_Address", address)
+        @config.setsection("Lan_Conf", "IP_Address", address) if validaddr?(address)
     end
 
     def netmask=(netmask)
-      @config.setsection("Lan_Conf", "Subnet_Mask", netmask)
+        @config.setsection("Lan_Conf", "Subnet_Mask", netmask) if validaddr?(netmask)
     end
 
     def gateway=(address)
-      @config.setsection("Lan_Conf", "Default_Gateway_IP_Address", address)
+      @config.setsection("Lan_Conf", "Default_Gateway_IP_Address", address) if validaddr?(address)
     end
 
   #  def vlanid=(vlan)
@@ -92,16 +85,18 @@ module Rubyipmi::Freeipmi
   #  end
 
     def parse(landata)
-      landata.lines.each do |line|
-        # clean up the data from spaces
-        next if line.match(/#+/)
-        next if line.match(/Section/i)
-        line.gsub!(/\t/, '')
-        item = line.split(/\s+/)
-        key = item.first.strip.downcase
-        value = item.last.strip
-        @info[key] = value
-
+      if ! landata.nil? and ! landata.empty?
+        landata.lines.each do |line|
+          # clean up the data from spaces
+          next if line.match(/#+/)
+          next if line.match(/Section/i)
+          line.gsub!(/\t/, '')
+          item = line.split(/\s+/)
+          key = item.first.strip.downcase
+          value = item.last.strip
+          @info[key] = value
+
+        end
       end
       return @info
     end