rubyipmi 0.6.0 → 0.7.0

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

@@ -4,6 +4,7 @@ module Rubyipmi::Ipmitool
 
     attr_accessor :info
     attr_accessor :channel
+    MAX_RETRY = 1
 
     def initialize(opts = ObservableHash.new)
       super("ipmitool", opts)
@@ -12,65 +13,58 @@ module Rubyipmi::Ipmitool
 
     end
 
+    # sets the info var to be empty causing the variable to repopulate upon the next call to info
+    def refresh
+      @info = {}
+    end
+
+    def channel=(num)
+      refresh
+      @channel = num
+    end
+
     def info
+      retrycount = 0
       if @info.length < 1
-        parse(print)
+        begin
+          parse(print)
+        rescue
+          # sometimes we need to get the info from channel 1,
+          # wait for error to occur then retry using channel 1
+          if retrycount < MAX_RETRY
+            @channel = 1
+            retry
+          end
+        end
       else
+        # return the cached info
         @info
       end
     end
 
-    def print
-      @options["cmdargs"] = "lan print"
-      value = runcmd
-      @options.delete_notify("cmdargs")
-      if value
-        @result
-      end
+    def snmp
+      info.fetch("snmp_community_string",nil)
     end
 
-  #  def snmp
-  #    if @info.length < 1
-  #      parse(print)
-  #    end
-  #    # Some systems do not report the snmp string
-  #    @info["snmp community string"]
-  #  end
-
     def ip
-      if @info.length < 1
-        parse(print)
-      end
-      @info["ip address"]
+      info.fetch("ip_address",nil)
     end
 
     def mac
-      if @info.length < 1
-        parse(print)
-      end
-      @info["mac address"]
+      info.fetch("mac_address",nil)
     end
 
     def netmask
-      if @info.length < 1
-        parse(print)
-      end
-      @info["subnet mask"]
+      info.fetch("subnet_mask",nil)
     end
 
     def gateway
-      if @info.length < 1
-        parse(print)
-      end
-      @info["default gateway ip"]
+      info.fetch("default_gateway_ip",nil)
     end
 
-  #  def vlanid
-  #    if @info.length < 1
-  #      parse(print)
-  #    end
-  #    @info["802.1q vlan id"]
-  #  end
+    def vlanid
+      info.fetch("802.1q_vlan_id",nil)
+    end
 
   #  def snmp=(community)
   #    @options["cmdargs"] = "lan set #{channel} snmp #{community}"
@@ -94,42 +88,43 @@ module Rubyipmi::Ipmitool
     end
 
     def gateway=(address)
-      @options["cmdargs"] = "lan set #{channel} defgw #{address}"
+      @options["cmdargs"] = "lan set #{channel} defgw ipaddr #{address}"
       value = runcmd
       @options.delete_notify("cmdargs")
       return value
     end
 
     def dhcp?
-      if @info.length < 1
-        parse(print)
-      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(print)
-      end
-      @info["ip address source"].match(/static/i) != nil
+      info.fetch("ip_address_source",nil).match(/static/i) != nil
     end
 
-  #  def vlanid=(vlan)
-  #    @options["cmdargs"] = "lan set #{channel} vlan id #{vlan}"
-  #    value = runcmd
-  #    @options.delete_notify("cmdargs")
-  #    return value
-  #  end
+    def vlanid=(vlan)
+      @options["cmdargs"] = "lan set #{channel} vlan id #{vlan}"
+      value = runcmd
+      @options.delete_notify("cmdargs")
+      return value
+    end
 
+   private
 
-    def parse(landata)
-      multikey = ""
-      multivalue = {}
+    def print
+      @options["cmdargs"] = "lan print"
+      value = runcmd
+      @options.delete_notify("cmdargs")
+      if value
+        @result
+      end
+    end
 
+    def parse(landata)
       landata.lines.each do |line|
         # clean up the data from spaces
         item = line.split(':', 2)
-        key = item.first.strip.downcase
+        key = normalize(item.first.strip)
         value = item.last.strip
         @info[key] = value
 
@@ -137,26 +132,9 @@ module Rubyipmi::Ipmitool
       return @info
     end
 
-
-
+    def normalize(text)
+      text.gsub(/\ /, '_').gsub(/\./, '').downcase
+    end
 
   end
 end
-
-#Set in Progress         : Set Complete
-#Auth Type Support       :
-#Auth Type Enable        : Callback :
-#                        : User     : NONE MD2 MD5 PASSWORD OEM
-#                        : Operator : NONE MD2 MD5
-#                        : Admin    : MD2 MD5
-#                        : OEM      :
-#IP Address Source       : DHCP Address
-#IP Address              : 192.168.1.41
-#Subnet Mask             : 255.255.255.0
-#MAC Address             : 00:17:a4:49:ab:70
-#BMC ARP Control         : ARP Responses Enabled, Gratuitous ARP Disabled
-#Gratituous ARP Intrvl   : 0.0 seconds
-#Default Gateway IP      : 192.168.1.1
-#802.1q VLAN ID          : Disabled
-#802.1q VLAN Priority    : 0
-#Cipher Suite Priv Max   : Not Available

data/lib/rubyipmi/ipmitool/commands/power.rb

@@ -16,12 +16,20 @@ module Rubyipmi::Ipmitool
 
     # Turn on the system
     def on
-      command("on")
+      if off?
+        command("on")
+      else
+         return true
+      end
     end
 
     # Turn off the system
     def off
-      command("off")
+      if off?
+        return true
+      else
+        command("off")
+      end
     end
 
     # Power cycle the system
@@ -68,7 +76,5 @@ module Rubyipmi::Ipmitool
       status == "off"
     end
 
-
-
   end
 end

data/lib/rubyipmi/ipmitool/commands/sensors.rb

@@ -8,129 +8,102 @@ module Rubyipmi::Ipmitool
 
     def refresh
       @sensors = nil
-      sensors
+      list
     end
 
     def list
-      sensors
+      @sensors ||= parse(getsensors)
     end
 
     def count
-      sensors.count
+      list.count
     end
 
     def names
-      sensors.keys
+      list.keys
     end
 
+    # returns a hash of fan sensors where the key is fan name and value is the sensor
     def fanlist(refreshdata=false)
       refresh if refreshdata
-      flist = []
-      values = sensors.each do |sensor|
-        match = sensor.first.match(/(fan)_(\d+)/)
-        next if match.nil?
-        if match[1] == "fan"
-          num = (match[2].to_i) -1
-          flist[num] = sensor.last[:value]
+      flist = {}
+      list.each do | name,sensor |
+        if name =~ /.*fan.*/
+            flist[name] = sensor
         end
       end
-      flist
+      return flist
     end
 
+    # returns a hash of sensors where each key is the name of the sensor and the value is the sensor
     def templist(refreshdata=false)
       refresh if refreshdata
-      tlist = []
-      values = sensors.each do |sensor|
-        match = sensor.first.match(/(temp)_(\d+)/)
-        next if match.nil?
-        if match[1] == "temp"
-          num = (match[2].to_i) -1
-          tlist[num] = sensor.last[:value]
+      tlist = {}
+      list.each do | name , sensor |
+        if sensor[:unit] =~ /.*degree.*/ || name =~ /.*temp.*/
+          tlist[name] = sensor
         end
       end
-      tlist
+      return tlist
     end
 
-
+    def getsensors
+      options["cmdargs"] = "sensor"
+      value = runcmd
+      options.delete_notify("cmdargs")
+      @result
+    end
 
     private
 
-    def sensors
-      @sensors ||= parse(getsensors)
-    end
-
     def method_missing(method, *args, &block)
-      if not sensors.has_key?(method.to_s)
+      if not list.has_key?(method.to_s)
         raise NoMethodError
       else
-        sensors[method.to_s]
+        list[method.to_s]
       end
     end
 
-    def getsensors
-      options["cmdargs"] = "sensor"
-      value = runcmd
-      options.delete_notify("cmdargs")
-      @result
-    end
-
     def parse(data)
       sensorlist = {}
-      data.lines.each do | line|
-        # skip the header
-        data = line.split(/\|/)
-        sensor = Sensor.new(data.first.strip)
-        sensor[:value] = data[1].strip
-        sensor[:unit] = data[2].strip
-        sensor[:status] = data[3].strip
-        sensor[:type] = nil
-        sensor[:state] = nil
-        #sensor[:lower_nonrec] = data[4].strip
-        #sensor[:lower_crit] = data[5].strip
-        #sensor[:lower_noncrit] = data[6].strip
-        #sensor[:upper_noncrit] = data[7].strip
-        #sensor[:upper_crit] = data[8].strip
-        #sensor[:upper_nonrec] = data[9].strip
-        sensorlist[sensor[:name]] = sensor
-
+      if ! data.nil?
+        data.lines.each do | line|
+          # skip the header
+          sensor = Sensor.new(line)
+          sensorlist[sensor[:name]] = sensor
+        end
       end
       return sensorlist
-
     end
-
   end
 
-  class Sensor < Hash
 
-    def initialize(sname)
-      self[:fullname] = sname
-      self[:name] = sname.gsub(/\ /, '_').gsub(/\./, '').downcase
+  class Sensor < Hash
+    def initialize(line)
+      parse(line)
+      self[:name] = normalize(self[:name])
     end
 
-    #def refresh
-    #  data = "sensor get \"#{self[:fullname]}\" "
-    #  parse(data)
-    #end
-
-    #def parse(data)
-    #  values = data.lines.collect do |line|
-    #    line.split(':').last.strip
-    #  end
-    #  # first 4 entries are lines we don't care about
-    #  value = values[4].split(/\([\w\W]+\)/)
-    #  self[:value] = value.first.strip
-    #  self[:unit] = value.last.strip
-    #  self[:status] = values[5].strip.chomp
-    #  self[:lower_nonrec] = values[6].strip.chomp
-    #  self[:lower_crit] = values[7].strip.chomp
-    #  self[:lower_noncrit] = values[8].strip.chomp
-    #  self[:upper_noncrit] = values[9].strip.chomp
-    #  self[:upper_crit] = values[10].strip.chomp
-    #  self[:upper_nonrec] = values[11].strip.chomp
-
-
-    #end
+    private
+    def normalize(text)
+      text.gsub(/\ /, '_').gsub(/\./, '').downcase
+    end
 
+    # Parse the individual sensor
+    # Note: not all fields will exist on every server
+    def parse(line)
+      fields = [:name, :value, :unit, :status, :type, :state, :lower_nonrec,
+                :lower_crit,:lower_noncrit, :upper_crit, :upper_nonrec, :asserts_enabled, :deasserts_enabled  ]
+      # skip the header
+      data = line.split(/\|/)
+      # should we ever encounter a field not in the fields list, just use a counter based fieldname
+      i = 0
+      data.each do | value |
+        field ||= fields.shift || "field#{i}"
+        self[field] = value.strip
+        i = i.next
+      end
+    end
   end
 
 end

data/lib/rubyipmi/ipmitool/connection.rb

@@ -12,10 +12,12 @@ module Rubyipmi
 
     class Connection
 
-      attr_accessor :options
+      attr_accessor :options, :debug
+      attr_reader :debug
 
 
-      def initialize(user, pass, host)
+      def initialize(user, pass, host,debug_value=false)
+        @debug = debug_value
         @options = Rubyipmi::ObservableHash.new
         raise("Must provide a host to connect to") unless host
         @options["H"] = host
@@ -25,7 +27,7 @@ module Rubyipmi
         @options["P"] = pass if pass
         # default to IPMI 2.0 communication, this means that older devices will not work
         # Those old servers should be recycled by now, as the 1.0, 1.5 spec came out in 2005ish and is 2013.
-        @options["I"] = "lanplus"
+        #@options["I"] = "lanplus"
 
         #getWorkArounds
       end
@@ -50,6 +52,20 @@ module Rubyipmi
         @chassis ||= Rubyipmi::Ipmitool::Chassis.new(@options)
       end
 
+      def get_diag
+        data = {}
+        data['provider'] = provider
+        if @fru
+          data['frus'] = @fru.getfrus
+        end
+        if @sensors
+          data['sensors'] = @sensors.getsensors
+        end
+        if @bmc
+          data['bmc_info'] = @bmc.info
+        end
+      end
+
     end
   end
 end