snmp 1.0.4 → 1.1.0

data/README.rdoc

@@ -26,6 +26,12 @@ examples below for more details.
 
 == Changes
 
+Changes for version 1.1.0:
+
+* Added MIB support to ObjectId and Varbind, so that to_s can return symbolic information
+* Added to_str method to ObjectId to return a numeric OID string (old to_s behavior)
+* TrapListener can now support multiple community strings
+
 Changes for version 1.0.4:
 
 * New option handling and added lower-case versions of all options

data/lib/snmp.rb

@@ -8,3 +8,4 @@
 #
 
 require 'snmp/manager'
+require 'snmp/version'

data/lib/snmp/manager.rb

@@ -16,7 +16,8 @@ require 'thread'
 
 module SNMP
 
-  class RequestTimeout < RuntimeError; end
+  class RequestTimeout < RuntimeError;
+  end
 
   ##
   # Wrap socket so that it can be easily substituted for testing or for
@@ -55,7 +56,7 @@ module SNMP
       @lock.synchronize do
         @request_id += 1
         @request_id = 1 if @request_id == MAX_REQUEST_ID
-        return  @request_id
+        return @request_id
       end
     end
 
@@ -117,19 +118,19 @@ module SNMP
   class Manager
 
     class Config < Options
-      option :host,            :Host,            'localhost'
-      option :port,            :Port,            161
-      option :trap_port,       :TrapPort,        162
-      option :community,       :Community,       'public'
-      option :write_community, :WriteCommunity,  lambda { |c| c.community }
-      option :version,         :Version,         :SNMPv2c
-      option :timeout,         :Timeout,         1
-      option :retries,         :Retries,         5
-      option :transport,       :Transport,       UDPTransport
-      option :max_recv_bytes,  :MaxReceiveBytes, 8000
-      option :mib_dir,         :MibDir,          MIB::DEFAULT_MIB_PATH
-      option :mib_modules,     :MibModules,      default_modules
-      option :use_IPv6,        :use_IPv6,        lambda { |c| ipv6_address?(c) }
+      option :host, :Host, 'localhost'
+      option :port, :Port, 161
+      option :trap_port, :TrapPort, 162
+      option :community, :Community, 'public'
+      option :write_community, :WriteCommunity, lambda { |c| c.community }
+      option :version, :Version, :SNMPv2c
+      option :timeout, :Timeout, 1
+      option :retries, :Retries, 5
+      option :transport, :Transport, UDPTransport
+      option :max_recv_bytes, :MaxReceiveBytes, 8000
+      option :mib_dir, :MibDir, MIB::DEFAULT_MIB_PATH
+      option :mib_modules, :MibModules, default_modules
+      option :use_IPv6, :use_IPv6, lambda { |c| ipv6_address?(c) }
 
       def create_transport
         transport.respond_to?(:new) ? transport.new(socket_address_family) : transport
@@ -274,10 +275,10 @@ module SNMP
     def get_bulk(non_repeaters, max_repetitions, object_list)
       varbind_list = @mib.varbind_list(object_list, :NullValue)
       request = GetBulkRequest.new(
-        @@request_id.next,
-        varbind_list,
-        non_repeaters,
-      max_repetitions)
+          @@request_id.next,
+          varbind_list,
+          non_repeaters,
+          max_repetitions)
       try_request(request)
     end
 
@@ -417,7 +418,7 @@ module SNMP
       vb_list = @mib.varbind_list(object_list, :NullValue)
       raise ArgumentError, "index_column is past end of varbind list" if index_column >= vb_list.length
       is_single_vb = object_list.respond_to?(:to_str) ||
-        object_list.respond_to?(:to_varbind)
+          object_list.respond_to?(:to_varbind)
       start_list = vb_list
       start_oid = vb_list[index_column].name
       last_oid = start_oid
@@ -455,12 +456,13 @@ module SNMP
         if i != index_column
           expected_oid = start_list[i].name + row_index
           if vb_list[i].name != expected_oid
-            vb_list[i] = VarBind.new(expected_oid, NoSuchInstance)
+            vb_list[i] = VarBind.new(expected_oid, NoSuchInstance).with_mib(@mib)
           end
         end
       end
       vb_list
     end
+
     private :validate_row
 
     ##
@@ -473,50 +475,50 @@ module SNMP
 
     private
 
-      def warn(message)
-        trace = caller(2)
-        location = trace[0].sub(/:in.*/,'')
-        Kernel::warn "#{location}: warning: #{message}"
-      end
+    def warn(message)
+      trace = caller(2)
+      location = trace[0].sub(/:in.*/, '')
+      Kernel::warn "#{location}: warning: #{message}"
+    end
 
-      def load_modules(module_list, mib_dir)
-        module_list.each { |m| @mib.load_module(m, mib_dir) }
-      end
+    def load_modules(module_list, mib_dir)
+      module_list.each { |m| @mib.load_module(m, mib_dir) }
+    end
 
-      def try_request(request, community=@community, host=@host, port=@port)
-        (@retries + 1).times do |n|
-          send_request(request, community, host, port)
-          begin
-            Timeout.timeout(@timeout) do
-              return get_response(request)
-            end
-          rescue Timeout::Error
-            # no action - try again
-          rescue => e
-            warn e.to_s
+    def try_request(request, community=@community, host=@host, port=@port)
+      (@retries + 1).times do |n|
+        send_request(request, community, host, port)
+        begin
+          Timeout.timeout(@timeout) do
+            return get_response(request)
           end
+        rescue Timeout::Error
+          # no action - try again
+        rescue => e
+          warn e.to_s
         end
-        raise RequestTimeout, "host #{config[:host]} not responding", caller
       end
+      raise RequestTimeout, "host #{config[:host]} not responding", caller
+    end
 
-      def send_request(request, community, host, port)
-        message = Message.new(@snmp_version, community, request)
-        @transport.send(message.encode, host, port)
-      end
+    def send_request(request, community, host, port)
+      message = Message.new(@snmp_version, community, request)
+      @transport.send(message.encode, host, port)
+    end
 
-      ##
-      # Wait until response arrives.  Ignore responses with mismatched IDs;
-      # these responses are typically from previous requests that timed out
-      # or almost timed out.
-      #
-      def get_response(request)
-        begin
-          data = @transport.recv(@max_bytes)
-          message = Message.decode(data)
-          response = message.pdu
-        end until request.request_id == response.request_id
-        response
-      end
+    ##
+    # Wait until response arrives.  Ignore responses with mismatched IDs;
+    # these responses are typically from previous requests that timed out
+    # or almost timed out.
+    #
+    def get_response(request)
+      begin
+        data = @transport.recv(@max_bytes)
+        message = Message.decode(data, @mib)
+        response = message.pdu
+      end until request.request_id == response.request_id
+      response
+    end
   end
 
   class UDPServerTransport
@@ -559,14 +561,16 @@ module SNMP
     class Config < Options
       option :host, :Host, 'localhost'
       option :port, :Port, 162
-      option :community, :Community, 'public'
+      option :community, :Community, nil
       option :server_transport, :ServerTransport, UDPServerTransport
       option :max_recv_bytes, :MaxReceiveBytes, 8000
+      option :mib_dir, :MibDir, MIB::DEFAULT_MIB_PATH
+      option :mib_modules, :MibModules, default_modules
       option :use_IPv6, :use_IPv6, false
 
       def create_transport
         server_transport.respond_to?(:new) ?
-          server_transport.new(host, port, socket_address_family) : server_transport
+            server_transport.new(host, port, socket_address_family) : server_transport
       end
     end
 
@@ -591,11 +595,18 @@ module SNMP
     # 2. handler for a specific SNMP version
     # 3. default handler
     #
+    # The default for the :community option is 'nil' allows traps with any
+    # community to be accepted. To only accept traps from a specific community,
+    # the community may also be set to a string (e.g. 'public') or a list of
+    # strings (e.g. ['public', 'my_private_community'] ).
+    #
     def initialize(options={}, &block)
       config = Config.new(options)
       @transport = config.create_transport
       @community = config.community
       @max_bytes = config.max_recv_bytes
+      @mib = MIB.new
+      load_modules(config.mib_modules, config.mib_dir)
       @config = config.applied_config
 
       @handler_init = block
@@ -671,55 +682,63 @@ module SNMP
 
     private
 
-      def process_traps(trap_listener)
-        @handler_init.call(trap_listener) if @handler_init
-        loop do
-          data, source_ip, source_port = @transport.recvfrom(@max_bytes)
-          begin
-            message = Message.decode(data)
-            if @community == message.community
-              trap = message.pdu
-              if trap.kind_of?(InformRequest)
-                @transport.send(message.response.encode, source_ip, source_port)
-              end
-              trap.source_ip = source_ip
-              select_handler(trap).call(trap)
+    def load_modules(module_list, mib_dir)
+      module_list.each { |m| @mib.load_module(m, mib_dir) }
+    end
+
+    def process_traps(trap_listener)
+      @handler_init.call(trap_listener) if @handler_init
+      loop do
+        data, source_ip, source_port = @transport.recvfrom(@max_bytes)
+        begin
+          message = Message.decode(data, @mib)
+          if community_allowed? message.community
+            trap = message.pdu
+            if trap.kind_of?(InformRequest)
+              @transport.send(message.response.encode, source_ip, source_port)
             end
-          rescue => e
-            puts "Error handling trap: #{e}"
-            puts e.backtrace.join("\n")
-            puts "Received data:"
-            p data
+            trap.source_ip = source_ip
+            select_handler(trap).call(trap)
           end
+        rescue => e
+          puts "Error handling trap: #{e}"
+          puts e.backtrace.join("\n")
+          puts "Received data:"
+          p data
         end
       end
+    end
 
-      def select_handler(trap)
-        @lock.synchronize do
-          if trap.kind_of?(SNMPv2_Trap)
-            oid = trap.trap_oid
-            if @oid_handler[oid]
-              return @oid_handler[oid]
-            elsif @v2c_handler
-              return @v2c_handler
-            elsif @default_handler
-              return @default_handler
-            else
-              return NULL_HANDLER
-            end
-          elsif trap.kind_of?(SNMPv1_Trap)
-            if @v1_handler
-              return @v1_handler
-            elsif @default_handler
-              return @default_handler
-            else
-              return NULL_HANDLER
-            end
+    def community_allowed?(msg_community)
+      @community.nil? || @community == msg_community || !(Array(@community) & Array(msg_community)).empty?
+    end
+
+    def select_handler(trap)
+      @lock.synchronize do
+        if trap.kind_of?(SNMPv2_Trap)
+          oid = trap.trap_oid
+          if @oid_handler[oid]
+            return @oid_handler[oid]
+          elsif @v2c_handler
+            return @v2c_handler
+          elsif @default_handler
+            return @default_handler
           else
             return NULL_HANDLER
           end
+        elsif trap.kind_of?(SNMPv1_Trap)
+          if @v1_handler
+            return @v1_handler
+          elsif @default_handler
+            return @default_handler
+          else
+            return NULL_HANDLER
+          end
+        else
+          return NULL_HANDLER
         end
       end
+    end
   end
 
 end

data/lib/snmp/mib.rb

@@ -136,6 +136,7 @@ module SNMP
     def initialize
       @by_name = {}
       @by_module_by_name = {}
+      @by_oid = {}
     end
 
     ##
@@ -152,6 +153,9 @@ module SNMP
       end
       @by_module_by_name[module_name] = {}
       @by_module_by_name[module_name].merge!(oid_hash)
+
+      name_hash = Hash[ oid_hash.invert.to_a.collect { |oid, name| [oid, "#{module_name}::#{name}"] } ]
+      @by_oid.merge!(name_hash)
     end
 
     ##
@@ -234,6 +238,24 @@ module SNMP
       end
     end
 
+    ##
+    # Returns the symbolic name of the given OID.
+    #
+    # e.g. OID "1.3.6.1.2.1.1.0" returns symbol "SNMPv2-MIB::system.0"
+    #
+    def name(oid)
+      current_oid = ObjectId.new(oid)
+      index = []
+      while current_oid.size > 1
+        name = @by_oid[current_oid.to_s]
+        if name
+          return index.empty? ? name : "#{name}.#{index.join('.')}"
+        end
+        index.unshift current_oid.slice!(-1)
+      end
+      ObjectId.new(oid).to_s
+    end
+
     def parse_oid(node_hash, name)
       oid_parts = name.split(".")
       first_part = oid_parts.shift

data/lib/snmp/options.rb

@@ -18,7 +18,7 @@ module SNMP
       attr_reader :alternates
 
       def option(symbol, alternate, defaulter=nil)
-        @alternates = {} unless @alternates
+        @alternates ||= {}
         @alternates[symbol] = alternate
         define_method(symbol) do
           alternate_symbol = self.class.alternates[symbol]

data/lib/snmp/pdu.rb

@@ -32,12 +32,12 @@ module SNMP
     attr_reader :pdu
 
     class << self
-      def decode(data)
+      def decode(data, mib=nil)
         message_data, remainder = decode_sequence(data)
         assert_no_remainder(remainder)
         version, remainder = decode_version(message_data)
         community, remainder = decode_octet_string(remainder)
-        pdu, remainder = decode_pdu(version, remainder)
+        pdu, remainder = decode_pdu(version, remainder, mib)
         assert_no_remainder(remainder)
         Message.new(version, community, pdu)
       end
@@ -54,29 +54,29 @@ module SNMP
         return version, remainder
       end
 
-      def decode_pdu(version, data)
+      def decode_pdu(version, data, mib=nil)
         pdu_tag, pdu_data, remainder = decode_tlv(data)
         case pdu_tag
         when GetRequest_PDU_TAG
-          pdu = PDU.decode(GetRequest, pdu_data)
+          pdu = PDU.decode(GetRequest, pdu_data, mib)
         when GetNextRequest_PDU_TAG
-          pdu = PDU.decode(GetNextRequest, pdu_data)
+          pdu = PDU.decode(GetNextRequest, pdu_data, mib)
         when Response_PDU_TAG
-          pdu = PDU.decode(Response, pdu_data)
+          pdu = PDU.decode(Response, pdu_data, mib)
         when SetRequest_PDU_TAG
-          pdu = PDU.decode(SetRequest, pdu_data)
+          pdu = PDU.decode(SetRequest, pdu_data, mib)
         when SNMPv1_Trap_PDU_TAG
           raise InvalidPduTag, "SNMPv1-trap not valid for #{version.to_s}" if version != :SNMPv1
-          pdu = SNMPv1_Trap.decode(pdu_data)
+          pdu = SNMPv1_Trap.decode(pdu_data, mib)
         when GetBulkRequest_PDU_TAG
           raise InvalidPduTag, "get-bulk not valid for #{version.to_s}" if version != :SNMPv2c
-          pdu = PDU.decode(GetBulkRequest, pdu_data)
+          pdu = PDU.decode(GetBulkRequest, pdu_data, mib)
         when InformRequest_PDU_TAG
           raise InvalidPduTag, "inform not valid for #{version.to_s}" if version != :SNMPv2c
-          pdu = PDU.decode(InformRequest, pdu_data)
+          pdu = PDU.decode(InformRequest, pdu_data, mib)
         when SNMPv2_Trap_PDU_TAG
           raise InvalidPduTag, "SNMPv2c-trap not valid for #{version.to_s}" if version != :SNMPv2c
-          pdu = PDU.decode(SNMPv2_Trap, pdu_data)
+          pdu = PDU.decode(SNMPv2_Trap, pdu_data, mib)
         else
           raise UnsupportedPduTag, pdu_tag.to_s
         end
@@ -119,11 +119,11 @@ module SNMP
 
     alias vb_list varbind_list
 
-    def self.decode(pdu_class, pdu_data)
+    def self.decode(pdu_class, pdu_data, mib=nil)
       request_id, remainder = decode_integer(pdu_data)
       error_status, remainder = decode_integer(remainder)
       error_index, remainder = decode_integer(remainder)
-      varbind_list, remainder = VarBindList.decode(remainder)
+      varbind_list, remainder = VarBindList.decode(remainder, mib)
       assert_no_remainder(remainder)
       pdu_class.new(request_id, varbind_list, error_status, error_index)
     end
@@ -310,7 +310,7 @@ module SNMP
 
     alias :vb_list :varbind_list
 
-    def self.decode(pdu_data)
+    def self.decode(pdu_data, mib=nil)
       oid_data, remainder = decode_object_id(pdu_data)
       enterprise = ObjectId.new(oid_data)
       ip_data, remainder = decode_ip_address(remainder)
@@ -319,7 +319,7 @@ module SNMP
       specific_trap, remainder = decode_integer(remainder)
       time_data, remainder = decode_timeticks(remainder)
       timestamp = TimeTicks.new(time_data)
-      varbind_list, remainder = VarBindList.decode(remainder)
+      varbind_list, remainder = VarBindList.decode(remainder, mib)
       assert_no_remainder(remainder)
       SNMPv1_Trap.new(enterprise, agent_addr, generic_trap, specific_trap,
                       timestamp, varbind_list)

data/lib/snmp/varbind.rb

@@ -17,11 +17,11 @@ module SNMP
   class InvalidIpAddress < ArgumentError; end
 
   class VarBindList < Array
-    def self.decode(data)
+    def self.decode(data, mib=nil)
       list = VarBindList.new
       varbind_data, remainder = decode_sequence(data)
       while varbind_data != ""
-        varbind, varbind_data = VarBind.decode(varbind_data)
+        varbind, varbind_data = VarBind.decode(varbind_data, mib)
         list << varbind
       end
       return list, remainder
@@ -137,8 +137,8 @@ module SNMP
   class ObjectId < Array
     include Comparable
 
-    def self.decode(value_data)
-      ObjectId.new(decode_object_id_value(value_data))
+    def self.decode(value_data, mib=nil)
+      ObjectId.new(decode_object_id_value(value_data), mib)
     end
 
     def asn1_type
@@ -149,7 +149,7 @@ module SNMP
     # Create an object id.  The input is expected to be either a string
     # in the format "n.n.n.n.n.n" or an array of integers.
     #
-    def initialize(id=[])
+    def initialize(id=[], mib=nil)
       if id.nil?
         raise ArgumentError
       elsif id.respond_to? :to_str
@@ -157,10 +157,19 @@ module SNMP
       else
         super(make_integers(id.to_ary))
       end
+      @mib = mib
     rescue ArgumentError
       raise ArgumentError, "#{id.inspect}:#{id.class} not a valid object ID"
     end
 
+    ##
+    # Adds MIB information to this object_id for use with to_s.
+    #
+    def with_mib(mib)
+      @mib = mib
+      self
+    end
+
     def to_varbind
       VarBind.new(self, Null)
     end
@@ -170,11 +179,19 @@ module SNMP
     end
 
     def to_s
+      if @mib
+        @mib.name(self)
+      else
+        to_str
+      end
+    end
+
+    def to_str
       self.join('.')
     end
 
     def inspect
-      "[#{self.to_s}]"
+      "[#{to_str}]"
     end
 
     def encode
@@ -507,12 +524,12 @@ module SNMP
     alias :oid :name
 
     class << self
-      def decode(data)
+      def decode(data, mib=nil)
         varbind_data, remaining_varbind_data = decode_sequence(data)
         name, remainder = decode_object_id(varbind_data)
         value, remainder = decode_value(remainder)
         assert_no_remainder(remainder)
-        return VarBind.new(name, value), remaining_varbind_data
+        return VarBind.new(name, value).with_mib(mib), remaining_varbind_data
       end
 
       ValueDecoderMap = {
@@ -553,6 +570,15 @@ module SNMP
       @value = value
     end
 
+    ##
+    # Adds MIB information to this varbind for use with to_s.
+    #
+    def with_mib(mib)
+      @name.with_mib(mib) if @name
+      @value.with_mib(mib) if @value.respond_to? :with_mib
+      self
+    end
+
     def asn1_type
       "VarBind"
     end

data/lib/snmp/version.rb

@@ -1,3 +1,3 @@
 module SNMP
-  VERSION = "1.0.4"
+  VERSION = "1.1.0"
 end

data/test/test_manager.rb

@@ -143,8 +143,8 @@ class TestManager < Test::Unit::TestCase
     assert_equal(:noError, response.error_status)
     assert_equal(0, response.error_index)
     assert_equal(2, response.varbind_list.length)
-    assert_equal("1.3.6.1.3.1.1.1.0", response.varbind_list[0].name.to_s)
-    assert_equal("1.3.6.1.3.1.1.2.0", response.varbind_list[1].name.to_s)
+    assert_equal("SNMPv2-SMI::experimental.1.1.1.0", response.varbind_list[0].name.to_s)
+    assert_equal("SNMPv2-SMI::experimental.1.1.2.0", response.varbind_list[1].name.to_s)
   end
 
   def test_walk
@@ -206,12 +206,12 @@ class TestManager < Test::Unit::TestCase
   def test_inform
     response = @manager.inform(1234, "1.3.6.1.2.3.4")
     assert_equal(1234, response.vb_list[0].value)
-    assert_equal("1.3.6.1.2.3.4", response.vb_list[1].value.to_s)
+    assert_equal("SNMPv2-SMI::mgmt.3.4", response.vb_list[1].value.to_s)
     assert_equal(2, response.vb_list.length)
 
     response = @manager.inform(1234, "1.3.6.1.2.3.4", ["1.2.3", "1.4.5.6"])
     assert_equal(1234, response.vb_list[0].value)
-    assert_equal("1.3.6.1.2.3.4", response.vb_list[1].value.to_s)
+    assert_equal("SNMPv2-SMI::mgmt.3.4", response.vb_list[1].value.to_s)
     assert_equal(4, response.vb_list.length)
   end
 end
@@ -289,15 +289,33 @@ class TestTrapListener < Test::Unit::TestCase
     assert(oid_called)
   end
 
-  def test_reject_wrong_community
+  ##
+  # Should filter traps with a 'public' community if that community is not accepted
+  #
+  def test_reject_community
+    assert !public_trap_passes?("test")
+    assert !public_trap_passes?(["foo", "bar"])
+    assert !public_trap_passes?([])
+  end
+
+  ##
+  # Should accept traps with a 'public' community if that community is allowed.
+  #
+  def test_accept_community
+    assert public_trap_passes? "public"
+    assert public_trap_passes? ["test", "public"]
+    assert public_trap_passes? nil
+  end
+
+  def public_trap_passes?(community_filter)
     default_called = false
     m = TrapListener.new(
-      :Community => "test",
-    :ServerTransport => TrapTestTransport.new) do |manager|
+        :community => community_filter,
+        :server_transport => TrapTestTransport.new) do |manager|
       manager.on_trap_default { default_called = true }
     end
     m.join
-    assert(!default_called)
+    default_called
   end
 
 end

data/test/test_mib.rb

@@ -7,6 +7,7 @@ module SNMP
 
     def setup
       @mib = MIB.new
+      @mib.load_module("SNMPv2-SMI")
       @mib.load_module("SNMPv2-MIB")
       @mib.load_module("IF-MIB")
     end
@@ -71,6 +72,20 @@ module SNMP
       assert_equal(4, list.length)
     end
 
+    def test_name
+      cases = [["1.3.6.1.2.1.2.2.3.45", "IF-MIB::ifTable.3.45"],
+               ["1.3.6.1.2.1.1.0", "SNMPv2-MIB::system.0"],
+               ["1.2.3.4", "1.2.3.4"],
+               ["1.3", "SNMPv2-SMI::org"],
+               ["1.2", "1.2"],
+               ["1", "1"],
+               ["", ""]]
+      cases.each do |oid, expected_name|
+        name = @mib.name(oid)
+        assert_equal(expected_name, name)
+      end
+    end
+
     # def test_import
     #     module_name = MIB.import_module('SNMPv2-MIB')
     #     assert_equal('SNMPv2-MIB', module_name)

data/test/test_varbind.rb

@@ -22,6 +22,17 @@ class TestVarBind < Test::Unit::TestCase
     assert_equal("0\f\006\010+\006\001\002\001\001\002\000\005\000", remainder)
   end
 
+  def test_varbind_to_s
+    mib = MIB.new
+    mib.load_module("IF-MIB")
+
+    vb = VarBind.new("1.3.6.1.2.1.2.2.1.2.1.1", OctetString.new("description")).with_mib(mib)
+    assert_equal "[name=IF-MIB::ifDescr.1.1, value=description (OCTET STRING)]", vb.to_s
+
+    vb = VarBind.new("1.3.6.1.2.1.2.2.1.2.1.1", ObjectId.new("1.3.6.1.2.1.2.2.1.2.1.1")).with_mib(mib)
+    assert_equal "[name=IF-MIB::ifDescr.1.1, value=IF-MIB::ifDescr.1.1 (OBJECT IDENTIFIER)]", vb.to_s
+  end
+
   def test_varbind_name_alias_oid
     vb = VarBind.new("1.2.3.4", OctetString.new("blah"))
     assert_equal(ObjectId.new("1.2.3.4"), vb.name)
@@ -124,6 +135,15 @@ class TestVarBind < Test::Unit::TestCase
     assert_equal("", ObjectId.new.to_s)
   end
 
+  def test_object_id_to_s_with_mib
+    mib = MIB.new
+    mib.load_module("IF-MIB")
+    id = ObjectId.new("1.3.6.1.2.1.2.2.1.2.1.1", mib)
+    assert_equal("IF-MIB::ifDescr.1.1", id.to_s)
+    assert_equal("1.3.6.1.2.1.2.2.1.2.1.1", id.to_str)
+    assert_equal("[1.3.6.1.2.1.2.2.1.2.1.1]", id.inspect)
+  end
+
   def test_object_id_create
     assert_equal("1.3.6.1", ObjectId.new("1.3.6.1").to_s)
     assert_equal("1.3.6.1", ObjectId.new([1,3,6,1]).to_s)

data/test/test_walk.rb

@@ -116,7 +116,7 @@ class TestWalk < Test::Unit::TestCase
     ifTable6_manager.walk(["1.3.6.1.2.1.2.2.1.2"]) do |vb_list|
       executed_block = true
       assert_equal(1, vb_list.length)
-      assert_equal("1.3.6.1.2.1.2.2.1.2.1", vb_list.first.name.to_s)
+      assert_equal("IF-MIB::ifDescr.1", vb_list.first.name.to_s)
       break
     end
     assert(executed_block, "Did not execute block")
@@ -155,8 +155,8 @@ class TestWalk < Test::Unit::TestCase
   def test_one
     list = []
     ifTable1_manager.walk(["1.3.6.1.2.1.2.2.1.1", "1.3.6.1.2.1.2.2.1.2"]) do |vb|
-      assert_equal("1.3.6.1.2.1.2.2.1.1.1", vb[0].name.to_s)
-      assert_equal("1.3.6.1.2.1.2.2.1.2.1", vb[1].name.to_s)
+      assert_equal("IF-MIB::ifIndex.1", vb[0].name.to_s)
+      assert_equal("IF-MIB::ifDescr.1", vb[1].name.to_s)
       list << vb
     end
     assert_equal(1, list.length)
@@ -165,11 +165,11 @@ class TestWalk < Test::Unit::TestCase
   def test_hole_in_one
     list = []
     ifTable1_manager.walk(["ifIndex", "ifDescr", "ifType"]) do |vb|
-      assert_equal("1.3.6.1.2.1.2.2.1.1.1", vb[0].name.to_s)
+      assert_equal("IF-MIB::ifIndex.1", vb[0].name.to_s)
       assert_equal(1, vb[0].value)
-      assert_equal("1.3.6.1.2.1.2.2.1.2.1", vb[1].name.to_s)
+      assert_equal("IF-MIB::ifDescr.1", vb[1].name.to_s)
       assert_equal("lo0", vb[1].value)
-      assert_equal("1.3.6.1.2.1.2.2.1.3.1", vb[2].name.to_s)
+      assert_equal("IF-MIB::ifType.1", vb[2].name.to_s)
       assert_equal(NoSuchInstance, vb[2].value)
       list << vb
       break

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: snmp
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-21 00:00:00.000000000Z
+date: 2011-11-22 00:00:00.000000000Z
 dependencies: []
 description: A Ruby implementation of SNMP (the Simple Network Management Protocol).
 email: hallidave@gmail.com