Replaced send_trap code with Jan Breuer's pull-request (pief#45) version.

Author: john

Makefile

@@ -66,7 +66,7 @@ setup.py: setup.py.in
 	chmod u+x setup.py
 
 install: setup.py
-	python setup.py install
+	python3 setup.py install
 
 .PHONY: ChangeLog
 ChangeLog:
@@ -129,13 +129,13 @@ dist/python-netsnmpagent.spec: dist python-netsnmpagent.spec.changelog python-ne
 	@cat >>$@ python-netsnmpagent.spec.changelog
 
 srcdist: setup.py ChangeLog dist/python-netsnmpagent.spec
-	python setup.py sdist
+	python3 setup.py sdist
 	@echo Created source distribution archive as dist/netsnmpagent-$(VERSION).tar.gz
 	@echo A suitable RPM .spec file can be found at dist/python-netsnmpagent.spec
 
 upload: setup.py
 ifeq ($(TAGGED),1)
-	python setup.py sdist upload
+	python3 setup.py sdist upload
 else
 	@echo "Upload not available for untagged versions!"
 endif
@@ -154,7 +154,7 @@ rpms: dist srcdist
 
 clean:
 	@[ -e "*.pyc" ] && rm *.pyc || true
-	@[ -e setup.py ] && (python setup.py clean; rm setup.py) || true
+	@[ -e setup.py ] && (python3 setup.py clean; rm setup.py) || true
 	@[ -e ChangeLog ] && rm ChangeLog || true
 	@[ -e build ] && rm -rf build || true
 	@[ -e dist ] && rm -rf dist || true

examples/run_simple_agent_trap.sh

@@ -152,6 +152,7 @@ echo "    snmpwalk -v 2c -c public -M+. localhost:5555 SIMPLE-MIB::simpleMIB"
 echo "    snmptable -v 2c -c public -M+. -Ci localhost:5555 SIMPLE-MIB::firstTable"
 echo "    snmpget -v 2c -c public -M+. localhost:5555 SIMPLE-MIB::simpleInteger.0"
 echo "    snmpset -v 2c -c simple -M+. localhost:5555 SIMPLE-MIB::simpleInteger.0 i 123"
+echo "    snmptrapd -f -Lo localhost:5556"
 echo ""
 
 # Workaround to have CTRL-C not generate any visual feedback (we don't do any

examples/run_threading_agent_trap.sh

@@ -152,6 +152,7 @@ echo ""
 echo "    cd `pwd`"
 echo "    snmpwalk -v 2c -c public -M+. localhost:5555 THREADING-MIB::threadingMIB"
 echo "    snmpget -v 2c -c public -M+. localhost:5555 THREADING-MIB::threadingString.0"
+echo "    snmptrapd -f -Lo localhost:5556"
 echo ""
 
 # Workaround to have CTRL-C not generate any visual feedback (we don't do any

examples/simple_agent_trap.py

@@ -249,16 +249,28 @@ def HupHandler(signum, frame):
 	# there is flag set to skip sending trap on next check
 	if sendTrap:
 		print('Sending trap with simpleCounter32.value: {:}'.format(simpleCounter32.value()))
-		trapOid = 'SNMPv2-MIB::sysDescr'
-		trapData = [
-			{ 'oid':'SNMPv2-MIB::sysDescr.0', 'val':'test state' },
-			{ 'oid':'SIMPLE-MIB::simpleCounter32.0', 'val':simpleCounter32.value() },
-# 			{ 'oid':'SIMPLE-MIB::simpleCounter64.0', 'val':simpleCounter64.value() },
-		]
+		
+# 		trapOid = 'SNMPv2-MIB::sysDescr'
+# 		trapData = [
+# 			{ 'oid':'SNMPv2-MIB::sysDescr.0', 'val':'test state' },
+# 			{ 'oid':'SIMPLE-MIB::simpleCounter32.0', 'val':simpleCounter32.value() },
+# # 			{ 'oid':'SIMPLE-MIB::simpleCounter64.0', 'val':simpleCounter64.value() },
+# 		]
+# 		agent.send_trap(
+# 			oid = trapOid,
+# 			traps = trapData,
+# 		)
+
+		simpleUnsignedRO.update(simpleUnsignedRO.value() + 1)
+
 		agent.send_trap(
-			oid = trapOid,
-			traps = trapData,
-		)
+			trap='SIMPLE-MIB::simpleUnsignedROChange',
+			varlist={
+				'SNMPv2-MIB::sysDescr.0': agent.DisplayString('System'),
+				'SIMPLE-MIB::simpleUnsignedRO.0': simpleUnsignedRO,
+				'SIMPLE-MIB::simpleCounter64.0': simpleCounter64,
+				}
+			)
 		sendTrap = False
 	else:
 		sendTrap = True

examples/threading_agent_trap.py

@@ -128,6 +128,7 @@ def LogNetSnmpMsg(priority, msg):
 	initval = "<No data available yet>"
 )
 
+
 def UpdateSNMPObjs():
 	""" Function that does the actual data update. """
 
@@ -156,13 +157,20 @@ def UpdateSNMPObjs():
 
 	# send trap
 	global agent
+
 	trapOid = 'SNMPv2-MIB::sysDescr'
-	trapData = [
-		{ 'oid':'SNMPv2-MIB::sysDescr.0', 'val':'test threading agent trap' },
-	]
-	agent.send_trap(
-		oid = trapOid,
-		traps = trapData,
+	trapData={
+		'SNMPv2-MIB::sysDescr.0': agent.DisplayString('test threading agent trap'),
+	}
+	
+ # agent.send_trap(
+ # 	trap = trapOid,
+ # 	varlist = trapData,
+ # )
+	
+	agent.queue_trap(
+		trap = trapOid,
+		varlist = trapData,
 	)
 
 	LogMsg("Data update done, exiting thread.")
@@ -238,5 +246,9 @@ def AlarmHandler(signum, frame):
 	elif loop:
 		LogMsg("net-snmp's check_and_process() returned (res={0}), doing another loop.".format(res))
 
+	if agent.num_queued_traps():
+		LogMsg("Sending {} queued traps.".format(agent.num_queued_traps()))
+		agent.send_queued_traps()
+
 LogMsg("Terminating.")
 agent.shutdown()