rubyipmi 0.3.3 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.4.0

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

@@ -41,7 +41,7 @@ module Rubyipmi::Freeipmi
         # The errorcode code hash contains the fix
         fix = Rubyipmi::Freeipmi::ErrorCodes.code[result]
         if not fix
-          raise "Ipmi Fix not found, email author with error: #{result}"
+          raise "#{result}"
         else
           @options.merge_notify!(fix)
           # retry the last called method

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

@@ -38,8 +38,8 @@ module Rubyipmi::Freeipmi
       end
     end
 
-    def bootdevice(device, persistent=false)
-      setBootFlag("Boot_Device", device)
+    def bootdevice(device, persistent)
+      setBootFlag("Boot_Device", device,persistent)
     end
 
     def bootdevices
@@ -65,28 +65,28 @@ module Rubyipmi::Freeipmi
 
 
     # shortcut to set boot device to pxe
-    def bootpxe(persistent=false)
-      bootdevice("PXE")
+    def bootpxe(persistent=true)
+      bootdevice("PXE",persistent)
     end
 
     # shortcut to set boot device to disk
-    def bootdisk(persistent=false)
-      bootdevice("HARD-DRIVE")
+    def bootdisk(persistent=true)
+      bootdevice("HARD-DRIVE",persistent)
     end
 
     # shortcut to set boot device to cdrom
-    def bootcdrom(persistent=false)
-      bootdevice("CD-DVD")
+    def bootcdrom(persistent=true)
+      bootdevice("CD-DVD",persistent)
     end
 
     # shortcut to boot into bios setup
-    def bootbios(persistent=false)
-      bootdevice("BIOS-SETUP")
+    def bootbios(persistent=true)
+      bootdevice("BIOS-SETUP",persistent)
     end
 
     private
 
-    def setBootFlag(key,flag, persistent=false)
+    def setBootFlag(key,flag, persistent)
       @options["key-pair"] = "\"Chassis_Boot_Flags:#{key}=#{flag}\""
       value = commit
       @options.delete_notify("key-pair")

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

@@ -49,7 +49,7 @@ module Rubyipmi::Freeipmi
       @info["mac_address"]
     end
 
-    def subnet
+    def netmask
       if @info.length < 1
         parse(@config.section("Lan_Conf"))
       end
@@ -75,15 +75,15 @@ module Rubyipmi::Freeipmi
   #
   #  end
 
-    def set_ip(address, static=true)
+    def ip=(address)
       @config.setsection("Lan_Conf", "IP_Address", address)
     end
 
-    def set_subnet(subnet)
-      @config.setsection("Lan_Conf", "Subnet_Mask", subnet)
+    def netmask=(netmask)
+      @config.setsection("Lan_Conf", "Subnet_Mask", netmask)
     end
 
-    def set_gateway(address)
+    def gateway=(address)
       @config.setsection("Lan_Conf", "Default_Gateway_IP_Address", address)
     end
 

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

@@ -0,0 +1,108 @@
+module Rubyipmi::Freeipmi
+
+  class Sensors < Rubyipmi::Freeipmi::BaseCommand
+
+    def initialize(opts = ObservableHash.new)
+      super("ipmi-sensors", opts)
+      @options["no-header-output"] = false
+      @options["output-sensor-state"] = false
+    end
+
+    def refresh
+      @sensors = nil
+      sensors
+    end
+
+    def list
+      sensors
+    end
+
+    def count
+      sensors.count
+    end
+
+    def names
+      sensors.keys
+    end
+
+    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]
+        end
+      end
+      flist
+    end
+
+    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]
+        end
+      end
+      tlist
+    end
+
+
+
+    private
+
+    def sensors
+      @sensors ||= parse(getsensors)
+    end
+
+    def method_missing(method, *args, &block)
+      if not sensors.has_key?(method.to_s)
+        raise NoMethodError
+      else
+        sensors[method.to_s]
+      end
+    end
+
+
+    def getsensors
+      value = runcmd
+      @result
+    end
+
+    def parse(data)
+      sensorlist = {}
+      data.lines.each do | line|
+        # skip the header
+        data = line.split(/\|/)
+        # remove number column
+        data.shift
+        sensor = Sensor.new(data[0].strip)
+        sensor[:type] = data[1].strip
+        sensor[:state] = data[2].strip
+        sensor[:value] = data[3].strip
+        sensor[:unit] = data[4].strip
+        sensor[:status] = data[5].strip
+        sensorlist[sensor[:name]] = sensor
+
+      end
+      return sensorlist
+
+    end
+  end
+
+  class Sensor < Hash
+
+    def initialize(sname)
+      self[:fullname] = sname
+      self[:name] = sname.gsub(/\ /, '_').gsub(/\./, '').downcase
+    end
+
+  end
+end
+

data/lib/rubyipmi/freeipmi/connection.rb

@@ -38,6 +38,10 @@ module Rubyipmi
         @chassis ||= Rubyipmi::Freeipmi::Chassis.new(@options)
       end
 
+      def sensors
+        @sensors ||= Rubyipmi::Freeipmi::Sensors.new(@options)
+      end
+
     end
   end
 end

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

@@ -25,7 +25,7 @@ module Rubyipmi::Ipmitool
         fix = Rubyipmi::Ipmitool::ErrorCodes.code[result]
 
         if not fix
-          raise "Ipmi Fix not found, email author with error: #{result}"
+          raise "#{result}"
         else
           @options.merge_notify!(fix)
           # retry the last called method

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

@@ -15,7 +15,11 @@ module Rubyipmi::Ipmitool
 
     # Set the boot device
     def bootdevice(device, persistent=false)
-      @options["cmdargs"] = "chassis bootdev #{device}"
+      if persistent
+        @options["cmdargs"] = "chassis bootdev #{device}"
+      else
+        @options["cmdargs"] = "chassis bootparam set bootflag force_#{device}"
+      end
       value = runcmd
       @options.delete_notify("cmdargs")
       return value
@@ -29,23 +33,23 @@ module Rubyipmi::Ipmitool
     end
 
     # shortcut to set boot device to pxe
-    def bootpxe(persistent=false)
-      bootdevice("pxe")
+    def bootpxe(persistent=true)
+      bootdevice("pxe",persistent)
     end
 
     # shortcut to set boot device to disk
-    def bootdisk(persistent=false)
-      bootdevice("disk")
+    def bootdisk(persistent=true)
+      bootdevice("disk",persistent)
     end
 
     # shortcut to set boot device to cdrom
-    def bootcdrom(persistent=false)
-      bootdevice("cdrom")
+    def bootcdrom(persistent=true)
+      bootdevice("cdrom",persistent)
     end
 
     # shortcut to boot into bios setup
-    def bootbios(persistent=false)
-      bootdevice("bios")
+    def bootbios(persistent=true)
+      bootdevice("bios",persistent)
     end
 
   end

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

@@ -51,7 +51,7 @@ module Rubyipmi::Ipmitool
       @info["mac address"]
     end
 
-    def subnet
+    def netmask
       if @info.length < 1
         parse(print)
       end
@@ -79,21 +79,21 @@ module Rubyipmi::Ipmitool
   #    return value
   #  end
 
-    def set_ip(address, static=true)
+    def ip=(address)
       @options["cmdargs"] = "lan set #{channel} ipaddr #{address}"
       value = runcmd
       @options.delete_notify("cmdargs")
       return value
     end
 
-    def set_subnet(subnet)
-      @options["cmdargs"] = "lan set #{channel} netmask #{subnet}"
+    def netmask=(mask)
+      @options["cmdargs"] = "lan set #{channel} netmask #{mask}"
       value = runcmd
       @options.delete_notify("cmdargs")
       return value
     end
 
-    def set_gateway(address)
+    def gateway=(address)
       @options["cmdargs"] = "lan set #{channel} defgw #{address}"
       value = runcmd
       @options.delete_notify("cmdargs")

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

@@ -0,0 +1,136 @@
+module Rubyipmi::Ipmitool
+
+  class Sensors < Rubyipmi::Ipmitool::BaseCommand
+
+    def initialize(opts = ObservableHash.new)
+      super("ipmitool", opts)
+    end
+
+    def refresh
+      @sensors = nil
+      sensors
+    end
+
+    def list
+      sensors
+    end
+
+    def count
+      sensors.count
+    end
+
+    def names
+      sensors.keys
+    end
+
+    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]
+        end
+      end
+      flist
+    end
+
+    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]
+        end
+      end
+      tlist
+    end
+
+
+
+    private
+
+    def sensors
+      @sensors ||= parse(getsensors)
+    end
+
+    def method_missing(method, *args, &block)
+      if not sensors.has_key?(method.to_s)
+        raise NoMethodError
+      else
+        sensors[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
+
+      end
+      return sensorlist
+
+    end
+
+  end
+
+  class Sensor < Hash
+
+    def initialize(sname)
+      self[:fullname] = sname
+      self[:name] = sname.gsub(/\ /, '_').gsub(/\./, '').downcase
+    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
+
+  end
+
+end

data/lib/rubyipmi/ipmitool/connection.rb

@@ -37,6 +37,10 @@ module Rubyipmi
         @bmc ||= Rubyipmi::Ipmitool::Bmc.new(@options)
       end
 
+      def sensors
+        @sensors ||= Rubyipmi::Ipmitool::Sensors.new(@options)
+      end
+
       def chassis
         @chassis ||= Rubyipmi::Ipmitool::Chassis.new(@options)
       end

data/rubyipmi.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rubyipmi"
-  s.version = "0.3.3"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Corey Osman"]
-  s.date = "2012-08-15"
+  s.date = "2012-08-27"
   s.description = "A ruby wrapper for ipmi command line tools that supports ipmitool and freeipmi"
   s.email = "corey@logicminds.biz"
   s.extra_rdoc_files = [
@@ -37,6 +37,7 @@ Gem::Specification.new do |s|
     "lib/rubyipmi/freeipmi/commands/chassisconfig.rb",
     "lib/rubyipmi/freeipmi/commands/lan.rb",
     "lib/rubyipmi/freeipmi/commands/power.rb",
+    "lib/rubyipmi/freeipmi/commands/sensors.rb",
     "lib/rubyipmi/freeipmi/connection.rb",
     "lib/rubyipmi/freeipmi/errorcodes.rb",
     "lib/rubyipmi/ipmitool/commands/basecommand.rb",
@@ -45,6 +46,7 @@ Gem::Specification.new do |s|
     "lib/rubyipmi/ipmitool/commands/chassisconfig.rb",
     "lib/rubyipmi/ipmitool/commands/lan.rb",
     "lib/rubyipmi/ipmitool/commands/power.rb",
+    "lib/rubyipmi/ipmitool/commands/sensors.rb",
     "lib/rubyipmi/ipmitool/connection.rb",
     "lib/rubyipmi/ipmitool/errorcodes.rb",
     "lib/rubyipmi/observablehash.rb",
@@ -56,6 +58,7 @@ Gem::Specification.new do |s|
     "spec/lan_spec.rb",
     "spec/power_spec.rb",
     "spec/rubyipmi_spec.rb",
+    "spec/sensor_spec.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/logicminds/rubyipmi"

data/spec/chassis_config_spec.rb

@@ -1,3 +1,5 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
 describe "Chassis Config" do
 
   before :each do

data/spec/chassis_spec.rb

@@ -1,3 +1,5 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
 describe "Chassis" do
 
   before :each do

data/spec/lan_spec.rb

@@ -17,8 +17,8 @@ describe "Lan" do
       @conn.bmc.lan.ip.should_not be nil
   end
 
-  it "get subnet" do
-    @conn.bmc.lan.subnet.should_not be nil
+  it "get netmask" do
+    @conn.bmc.lan.netmask.should_not be nil
   end
 
   it "get gateway address" do
@@ -44,17 +44,17 @@ describe "Lan" do
 
   it "should set gateway address" do
     gw = @conn.bmc.lan.gateway
-        @conn.bmc.lan.set_gateway(gw).should_not be nil
+    (@conn.bmc.lan.gateway = gw).should_not be nil
   end
 
-  it "should set subnet" do
-    netmask = @conn.bmc.lan.subnet
-    @conn.bmc.lan.set_subnet(netmask).should_not be nil
+  it "should set netmask" do
+    netmask = @conn.bmc.lan.netmask
+    (@conn.bmc.lan.netmask = netmask).should_not be nil
   end
 
   it "should set ip address" do
     ip = @conn.bmc.lan.ip
-    @conn.bmc.lan.set_ip(ip).should_not be nil
+    (@conn.bmc.lan.ip = ip).should_not be nil
   end
 
 

data/spec/power_spec.rb

@@ -1,3 +1,5 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
 describe "Power" do
 
   before :each do

data/spec/sensor_spec.rb

@@ -0,0 +1,59 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "Sensors" do
+
+  attr_accessor :provider
+  before :each do
+    user = ENV["ipmiuser"]
+    pass = ENV["ipmipass"]
+    host = ENV["ipmihost"]
+    provider = ENV["ipmiprovider"]
+    @conn = Rubyipmi.connect(user, pass, host, provider)
+
+  end
+
+  it "test get all sensors" do
+    @conn.sensors.list.count.should be > 1
+  end
+
+  it "test should refresh data" do
+    old = @conn.sensors.list
+    @conn.sensors.refresh
+    new = @conn.sensors.list
+    old.should_not equal(new)
+  end
+
+  it "test should return count greater than 1" do
+    @conn.sensors.count.should be > 1
+  end
+
+  it "test should return names" do
+    @conn.sensors.names.count.should be > 1
+  end
+
+  it "test should return list of fans" do
+    @conn.sensors.fanlist.count.should be > 1
+  end
+
+  it "test should return list of temps" do
+    @conn.sensors.templist.count.should be > 1
+  end
+
+  it "test should create new Sensor" do
+    if provider == "ipmitool"
+      Rubyipmi::Ipmitool::Sensor.new("fakesensor").should_not be nil
+    else
+      Rubyipmi::Freeipmi::Sensor.new("fakesensor").should_not be nil
+    end
+  end
+
+  it "test missing method with known good method" do
+    @conn.sensors.fan_1.should_not be nil
+  end
+
+  it "test missing method with known bad method" do
+    expect {@conn.sensors.blah}.to raise_exception
+  end
+
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubyipmi
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
-  - 3
-  version: 0.3.3
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Corey Osman
@@ -15,10 +15,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-15 00:00:00 Z
+date: 2012-08-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -33,8 +32,8 @@ dependencies:
   version_requirements: *id001
   name: rspec
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -48,8 +47,8 @@ dependencies:
   version_requirements: *id002
   name: rdoc
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -64,8 +63,8 @@ dependencies:
   version_requirements: *id003
   name: bundler
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -80,8 +79,8 @@ dependencies:
   version_requirements: *id004
   name: jeweler
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -94,6 +93,7 @@ dependencies:
   version_requirements: *id005
   name: rcov
   prerelease: false
+  type: :development
 description: A ruby wrapper for ipmi command line tools that supports ipmitool and freeipmi
 email: corey@logicminds.biz
 executables: []
@@ -124,6 +124,7 @@ files:
 - lib/rubyipmi/freeipmi/commands/chassisconfig.rb
 - lib/rubyipmi/freeipmi/commands/lan.rb
 - lib/rubyipmi/freeipmi/commands/power.rb
+- lib/rubyipmi/freeipmi/commands/sensors.rb
 - lib/rubyipmi/freeipmi/connection.rb
 - lib/rubyipmi/freeipmi/errorcodes.rb
 - lib/rubyipmi/ipmitool/commands/basecommand.rb
@@ -132,6 +133,7 @@ files:
 - lib/rubyipmi/ipmitool/commands/chassisconfig.rb
 - lib/rubyipmi/ipmitool/commands/lan.rb
 - lib/rubyipmi/ipmitool/commands/power.rb
+- lib/rubyipmi/ipmitool/commands/sensors.rb
 - lib/rubyipmi/ipmitool/connection.rb
 - lib/rubyipmi/ipmitool/errorcodes.rb
 - lib/rubyipmi/observablehash.rb
@@ -143,6 +145,7 @@ files:
 - spec/lan_spec.rb
 - spec/power_spec.rb
 - spec/rubyipmi_spec.rb
+- spec/sensor_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/logicminds/rubyipmi
 licenses: