snmp 0.4.0 → 0.4.1

data/Rakefile

@@ -9,7 +9,7 @@ Rake::TestTask.new do |test|
 end
 
 # package target
-PKG_VERSION = '0.4.0'
+PKG_VERSION = '0.4.1'
 PKG_FILES = FileList[
     'Rakefile',
     'README',

data/examples/walk.rb

@@ -2,8 +2,13 @@ require 'snmp'
 
 host = ARGV[0] || 'localhost'
 
+SNMP::Manager.open(:Host => "localhost") do |manager|
+    manager.walk("ifTable") { |vb| puts vb }
+end
+
+
 SNMP::Manager.open(:Host => host) do |manager|
-    manager.walk(["ifIndex", "ifDescr"]) do |index, descr| 
-        puts "#{index.value} #{descr.value}"
+    manager.walk(["ifIndex", "ifDescr"]) do |ifIndex, ifDescr| 
+        puts "#{ifIndex} #{ifDescr}"
     end
 end

data/lib/snmp/manager.rb

@@ -101,7 +101,7 @@ end
 # current implementation of the importing code requires that the
 # external 'smidump' tool is available in your PATH. This tool can be 
 # obtained from the libsmi website at
-# http://http://www.ibr.cs.tu-bs.de/projects/libsmi/ .
+# http://www.ibr.cs.tu-bs.de/projects/libsmi/ .
 #
 # = Example
 #
@@ -246,8 +246,9 @@ class Manager
     # the response to the first OID in the list reaches the end of its
     # MIB subtree.
     #
-    # The results of each get_next are yielded to the given block as
-    # they are retrieved.
+    # The varbinds from each get_next are yielded to the given block as
+    # they are retrieved.  The result is yielded as a VarBind when walking
+    # a single object or as a VarBindList when walking a list of objects.
     #
     # Normally this method is used for walking tables by providing an
     # ObjectId for each column of the table.
@@ -255,6 +256,10 @@ class Manager
     # For example:
     #
     #   SNMP::Manager.open(:Host => "localhost") do |manager|
+    #     manager.walk("ifTable") { |vb| puts vb }
+    #   end
+    #
+    #   SNMP::Manager.open(:Host => "localhost") do |manager|
     #     manager.walk(["ifIndex", "ifDescr"]) do |index, descr| 
     #       puts "#{index.value} #{descr.value}"
     #     end
@@ -264,12 +269,23 @@ class Manager
         raise ArgumentError, "expected a block to be given" unless block_given?
         varbind_list = @mib.varbind_list(object_list, :NullValue)
         start_oid = varbind_list.first.name
+        last_oid = start_oid
         loop do
             varbind_list = get_next(varbind_list).varbind_list
             first_vb = varbind_list.first
-            break unless first_vb.name.subtree_of?(start_oid)
-            break if first_vb.value == EndOfMibView
-            yield varbind_list
+            stop_oid = first_vb.name
+            if stop_oid <= last_oid
+                warn "OIDs are not increasing, #{last_oid} followed by #{stop_oid}"
+                break
+            end
+            break unless stop_oid.subtree_of?(start_oid)
+            break if stop_oid == EndOfMibView
+            last_oid = stop_oid
+            if varbind_list.length == 1
+                yield first_vb
+            else 
+                yield varbind_list
+            end
         end
     end
     

data/lib/snmp/varbind.rb

@@ -132,7 +132,7 @@ class ObjectId < Array
     # 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=[])
         if id.respond_to? :to_str
             super(make_integers(id.to_str.split(".")))
         else

data/test/test_manager.rb

@@ -13,7 +13,7 @@ class EchoTransport
     end
     
     def recv(max_bytes)
-        @data[0,max_bytes]
+        Message.decode(@data).response.encode[0,max_bytes]
     end
 end
 
@@ -81,14 +81,22 @@ class TestManager < Test::Unit::TestCase
     end
 
     def test_get_bulk
-        response = @manager.get_bulk(1, 2, ["1.3.6.1.3.1.1.1.0", "1.3.6.1.3.1.1.2.0"])
-        assert(1, response.error_status)
-        assert(2, response.error_index)
-        assert(2, response.varbind_list.length)
+        response = @manager.get_bulk(1, 3, ["1.3.6.1.3.1.1.1.0", "1.3.6.1.3.1.1.2.0"])
+        assert_equal(:tooBig, response.error_status)
+        assert_equal(3, 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)
     end
 
+    def test_walk
+        old_verbose = $VERBOSE
+        $VERBOSE = nil
+        @manager.walk("ifTable") { fail "Expected break from OID not increasing" }
+    ensure
+        $VERBOSE = old_verbose
+    end
+    
     def test_request_id
         srand(100)
         id = RequestId.new

data/test/test_varbind.rb

@@ -109,6 +109,8 @@ class TestVarBind < Test::Unit::TestCase
         assert_raise(ArgumentError) {
             ObjectId.new("xyzzy")
         }
+        
+        assert_equal("", ObjectId.new.to_s)
     end
     
     def test_object_id_create

data/test/test_walk.rb

@@ -0,0 +1,84 @@
+require 'snmp'
+require 'test/unit'
+
+include SNMP 
+
+class GetNextTransport
+    
+    attr_accessor :count
+    
+    def initialize(host, port)
+    end
+    
+    def close
+    end
+    
+    def send(data)
+        @data = data
+    end
+    
+    def recv(max_bytes)
+        response = Message.decode(@data).response
+        if $transport_pdu_count > 0
+            response.pdu.each_varbind do |vb|
+                vb.name << 1    
+            end
+            $transport_pdu_count -= 1
+        else
+            response.pdu.each_varbind do |vb|
+                vb.name = ObjectId.new("1.3.6.9999")    
+            end
+        end     
+        response.encode[0,max_bytes]
+    end
+end
+
+
+class TestWalk < Test::Unit::TestCase
+
+    def test_single_object
+        $transport_pdu_count = 3
+        list = []
+        manager.walk("ifTable") do |vb|
+            list << vb
+        end
+        assert_equal(3, list.length)    
+    end
+    
+    def test_object_list
+        $transport_pdu_count = 3
+        list1 = []
+        list2 = []
+        manager.walk(["ifIndex", "ifDescr"]) do |vb1, vb2|
+            list1 << vb1
+            list2 << vb2
+        end
+        assert_equal(3, list1.length)    
+        assert_equal(3, list2.length)    
+    end
+    
+    def test_empty
+        $transport_pdu_count = 0
+        manager.walk("1.2.3.4") do |vb|
+            fail { "Expected block to not be executed"}
+        end
+    end
+    
+    def test_one
+        $transport_pdu_count = 1
+        list = []
+        manager.walk(["1.3.6.1", "1.3.6.2"]) do |vb|
+            assert_equal("1.3.6.1.1", vb[0].name.to_s)
+            assert_equal("1.3.6.2.1", vb[1].name.to_s)
+            list << vb
+        end
+        assert_equal(1, list.length)    
+    end
+    
+    private
+    
+    def manager
+        Manager.new(:Transport => GetNextTransport)
+    end
+    
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.3
 specification_version: 1
 name: snmp
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
-date: 2004-12-19
+  version: 0.4.1
+date: 2004-12-20
 summary: A Ruby implementation of SNMP (the Simple Network Management Protocol).
 require_paths: 
   - lib
@@ -42,6 +42,7 @@ files:
   - test/test_mib.rb
   - test/test_pdu.rb
   - test/test_varbind.rb
+  - test/test_walk.rb
   - examples/dump.rb
   - examples/get.rb
   - examples/iftable.rb