1 files changed, 44 insertions, 32 deletions
diff --git a/examples/v3arch/asyncore/oneliner/agent/ntforg/trap-v1-with-default-values.py b/examples/v3arch/asyncore/oneliner/agent/ntforg/trap-v1-with-default-values.py
index a704146..5ad5ef7 100644
--- a/examples/v3arch/asyncore/oneliner/agent/ntforg/trap-v1-with-default-values.py
+++ b/examples/v3arch/asyncore/oneliner/agent/ntforg/trap-v1-with-default-values.py
@@ -1,34 +1,46 @@
-#
-# Notification Originator
-#
-# Send SNMP notification using the following options:
-#
-# * SNMPv1
-# * with community name 'public'
-# * over IPv4/UDP
-# * send TRAP notification
-# * with Generic Trap #1 (warmStart) and Specific Trap 0
-# * with default Uptime
-# * with default Agent Address
-# * with Enterprise OID 1.3.6.1.4.1.20408.4.1.1.2
-# * include managed object information '1.3.6.1.2.1.1.1.0' = 'my system'
-#
+"""
+SNMPv1 TRAP with defaults
++++++++++++++++++++++++++
+
+Send SNMPv1 TRAP through unified SNMPv3 message processing framework
+using the following options:
+
+* SNMPv1
+* with community name 'public'
+* over IPv4/UDP
+* send TRAP notification
+* with Generic Trap #1 (warmStart) and Specific Trap 0
+* with default Uptime
+* with default Agent Address
+* with Enterprise OID 1.3.6.1.4.1.20408.4.1.1.2
+* include managed object information '1.3.6.1.2.1.1.1.0' = 'my system'
+
+Functionally similar to:
+
+| $ snmptrap -v1 -c public demo.snmplabs.com \
+|   1.3.6.1.4.1.20408.4.1.1.2 \
+|   0.0.0.0 \
+|   1 \
+|   0 \
+|   0
+|   '1.3.6.1.2.1.1.1.0' s 'my system'
+
+"""#
 from pysnmp.entity.rfc3413.oneliner.ntforg import *
-from pysnmp.proto import rfc1902
 
-for errorIndication, \
-    errorStatus, errorIndex, \
-    varBinds in \
-        sendNotification(SnmpEngine(),
-                         CommunityData('public', mpModel=0),
-                         UdpTransportTarget(('localhost', 162)),
-                         ContextData(),
-                         'trap',
-                         NotificationType(
-                             ObjectIdentity('1.3.6.1.6.3.1.1.5.2')
-                         ).addVarBinds(
-                             ('1.3.6.1.6.3.1.1.4.3.0', '1.3.6.1.4.1.20408.4.1.1.2'),
-                             ('1.3.6.1.2.1.1.1.0', rfc1902.OctetString('my system'))
-                         )):
-    if errorIndication:
-        print(errorIndication)
+errorIndication, errorStatus, errorIndex, varBinds = next(
+    sendNotification(SnmpEngine(),
+                     CommunityData('public', mpModel=0),
+                     UdpTransportTarget(('localhost', 162)),
+                     ContextData(),
+                     'trap',
+                     NotificationType(
+                         ObjectIdentity('1.3.6.1.6.3.1.1.5.2')
+                     ).addVarBinds(
+                         ('1.3.6.1.6.3.1.1.4.3.0', '1.3.6.1.4.1.20408.4.1.1.2'),
+                         ('1.3.6.1.2.1.1.1.0', rfc1902.OctetString('my system'))
+                     )
+    )
+)
+if errorIndication:
+    print(errorIndication)