net-snmp2 0.3.0 → 0.3.1

data/spec/test_mib.rb

@@ -0,0 +1,6 @@
+$test_mib = {
+  'sysDescr.0' => 'net-snmp2 unit testing agent',
+  'sysName.0' => 'net-snmp2-agent',
+  'sysContact.0' => 'jared.breeden@gmail.com',
+  'sysObjectID.0' => Net::SNMP::OID.new('1.3.6.1.4.1.8072.3.2.10')
+}

data/spec/thread_spec.rb

@@ -4,15 +4,15 @@ describe "in a thread" do
   it "should get an oid asynchronously in a thread" do
     did_callback = false
     dispatch_thread = Net::SNMP::Dispatcher.thread_loop
-    Net::SNMP::Session.open(:peername => 'test.net-snmp.org', :community => 'demopublic') do |s|
+    Net::SNMP::Session.open(:peername => 'localhost', :community => 'public') do |s|
       s.get(["sysDescr.0", "sysContact.0"]) do |op, result|
         did_callback = true
-        result.varbinds[0].value.should eql("test.net-snmp.org")
-        result.varbinds[1].value.should match(/Coders/)
+        expect(result.varbinds[0].value).to eq $test_mib['sysDescr.0']
+        expect(result.varbinds[1].value).to eq $test_mib['sysContact.0']
       end
     end
     sleep 3
-    did_callback.should be(true)
+    expect(did_callback).to be(true)
 
     Thread.kill(dispatch_thread)
   end

data/spec/trap_spec.rb

@@ -15,14 +15,14 @@ describe Net::SNMP::TrapSession do
         uptime: 1000,
         agent_addr: '127.0.0.1'
       )
-      res.should eq(:success)
+      expect(res).to eq(:success)
     end
   end
 
   it "should send v2 trap" do
     Net::SNMP::TrapSession.open(:peername => 'localhost:163', :version => '2c') do |sess|
       res = sess.trap_v2(:oid => 'sysContact.0', :uptime => 1000)
-      res.should eq(:success)
+      expect(res).to eq(:success)
     end
   end
 
@@ -30,16 +30,7 @@ describe Net::SNMP::TrapSession do
     did_callback = false
     Net::SNMP::TrapSession.open(:peername => 'localhost:163', :version => '2c') do |sess|
       resp = sess.inform(:oid => 'coldStart.0')
-      has_cold_start_oid = false
-      # Got some weird segfaults when using rspec's ".should include {...}"
-      # matcher, so I did this manually.
-      resp.varbinds.each do |vb|
-        if (vb.oid.to_s == Net::SNMP::MIB.translate('snmpTrapOID.0')) &&
-            (vb.value.to_s == Net::SNMP::MIB.translate('coldStart.0'))
-          has_cold_start_oid = true
-        end
-      end
-      has_cold_start_oid.should eq(true)
+      expect(resp).to eq(:success)
     end
   end
 end

data/spec/utility_spec.rb

@@ -2,9 +2,9 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe Net::SNMP::Utility do
   it "should compare oids" do
-    Net::SNMP::Utility.oid_lex_cmp('1.3.5', '1.3.7').should eql(-1)
-    Net::SNMP::Utility.oid_lex_cmp('1.3.7', '1.3.5').should eql(1)
-    Net::SNMP::Utility.oid_lex_cmp('1.3.7', '1.3.7.1').should eql(-1)
-    Net::SNMP::Utility.oid_lex_cmp('1.3.5', '1.3.5').should eql(0)
+    expect(Net::SNMP::Utility.oid_lex_cmp('1.3.5', '1.3.7')).to eql(-1)
+    expect(Net::SNMP::Utility.oid_lex_cmp('1.3.7', '1.3.5')).to eql(1)
+    expect(Net::SNMP::Utility.oid_lex_cmp('1.3.7', '1.3.7.1')).to eql(-1)
+    expect(Net::SNMP::Utility.oid_lex_cmp('1.3.5', '1.3.5')).to eql(0)
   end
 end

data/spec/wrapper_spec.rb

@@ -2,8 +2,8 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Net::SNMP::Wrapper" do
   def init_session
-    community = "demopublic"
-    peername = "test.net-snmp.org"
+    community = "public"
+    peername = "localhost"
 
     @session = Net::SNMP::Wrapper::SnmpSession.new(nil)
     Net::SNMP::Wrapper.snmp_sess_init(@session.pointer)
@@ -33,11 +33,11 @@ describe "Net::SNMP::Wrapper" do
 
     response_ptr = FFI::MemoryPointer.new(:pointer)
     status = Net::SNMP::Wrapper.snmp_sess_synch_response(@handle, @pdu.pointer, response_ptr)
-    status.should eql(0)
+    expect(status).to eql(0)
 
     response = Net::SNMP::Wrapper::SnmpPdu.new(response_ptr.read_pointer)
     value = response.variables.val[:string].read_string(response.variables.val_len)
-    value.should eql('test.net-snmp.org')
+    expect(value).to eq $test_mib['sysDescr.0']
   end
 
   it "wrapper should snmpget asynchronously" do
@@ -63,7 +63,7 @@ describe "Net::SNMP::Wrapper" do
       Net::SNMP::Wrapper.snmp_select_info(fds, fdset, tval.pointer, block )
       FFI::LibC.select(fds.read_int, fdset, nil, nil, nil)
       Net::SNMP::Wrapper.snmp_read(fdset)
-      did_callback.should be(1)
-      result.should eql('test.net-snmp.org')
+      expect(did_callback).to be(1)
+      expect(result).to eq $test_mib['sysDescr.0']
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-snmp2
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Ron McClain
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-10 00:00:00.000000000 Z
+date: 2014-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nice-ffi
@@ -88,16 +88,17 @@ files:
 - bin/mib2rb
 - bin/net-snmp2
 - examples/agent.rb
+- examples/inform.rb
 - examples/manager.rb
 - examples/trap_handler.rb
-- examples/v1_trap_session.rb
-- examples/v2_trap_session.rb
+- examples/v1_trap.rb
+- examples/v2_trap.rb
+- history.md
 - lib/net-snmp2.rb
 - lib/net/snmp.rb
 - lib/net/snmp/agent/agent.rb
 - lib/net/snmp/agent/provider.rb
 - lib/net/snmp/agent/provider_dsl.rb
-- lib/net/snmp/agent/request_dispatcher.rb
 - lib/net/snmp/constants.rb
 - lib/net/snmp/debug.rb
 - lib/net/snmp/dispatcher.rb
@@ -114,6 +115,7 @@ files:
 - lib/net/snmp/session.rb
 - lib/net/snmp/trap_handler/trap_handler.rb
 - lib/net/snmp/trap_handler/v1_trap_dsl.rb
+- lib/net/snmp/trap_handler/v2_inform_dsl.rb
 - lib/net/snmp/trap_handler/v2_trap_dsl.rb
 - lib/net/snmp/trap_session.rb
 - lib/net/snmp/utility.rb
@@ -131,6 +133,8 @@ files:
 - spec/oid_spec.rb
 - spec/spec_helper.rb
 - spec/sync_spec.rb
+- spec/test_agent.rb
+- spec/test_mib.rb
 - spec/thread_spec.rb
 - spec/trap_spec.rb
 - spec/utility_spec.rb
@@ -141,9 +145,10 @@ metadata: {}
 post_install_message: 
 rdoc_options:
 - --main=README.md
+- --markup=markdown
 - --line-numbers
 - --inline-source
-- --title=net-snmp2-0.3.0 Documentation
+- --title=net-snmp2-0.3.1 Documentation
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement

data/lib/net/snmp/agent/request_dispatcher.rb

@@ -1,38 +0,0 @@
-module Net::SNMP
-
-# RequestDispatcher module handles calling all required providers for a request
-# in the context of a ProviderDsl object (which itself provides the agent DSL)
-
-  module RequestDispatcher
-
-    def self.dispatch(message, providers)
-      response_pdu = Message::response_pdu_for(message)
-      context = ProviderDsl.new
-      context.message = message
-      context.response_pdu = response_pdu
-      message.pdu.varbinds.each_with_index do |vb, index|
-        context.varbind = vb
-        provider = providers.find { |p| p.oid == :all || vb.oid.to_s.start_with?(p.oid.to_s) }
-        if provider
-          if message.pdu.command == Constants::SNMP_MSG_GETBULK && index < message.pdu.non_repeaters
-            handler = provider.handler_for(Constants::SNMP_MSG_GETNEXT)
-          else
-            handler = provider.handler_for(message)
-          end
-          if handler
-            context.instance_exec(&handler)
-          else
-            Debug.warn "No handler for command: #{message.pdu.command} @ #{vb.oid}"
-            context.no_such_object
-          end
-        else
-          Debug.warn "No provider for oid: #{vb.oid}"
-          context.no_such_object
-        end
-      end
-
-      response_pdu
-    end
-
-  end
-end