Changeset 2877 for pykota/trunk/bin/pkturnkey

Timestamp:

05/03/06 19:19:53 (18 years ago)

Author:

jerome

Message:

Added support for pysnmp v4.x in addition to v3.4.x

Files:

• pykota/trunk/bin/pkturnkey (modified) (1 diff)

pykota/trunk/bin/pkturnkey

@@ -221 +221 @@
     def supportsSNMP(self, hostname, community) :
         """Returns 1 if the printer accepts SNMP queries, else 0."""
+        pageCounterOID = "1.3.6.1.2.1.43.10.2.1.4.1.1"  # SNMPv2-SMI::mib-2.43.10.2.1.4.1.1
         try :
-            from pysnmp.asn1.encoding.ber.error import TypeMismatchError
-            from pysnmp.mapping.udp.role import Manager
-            from pysnmp.proto.api import alpha
+            from pysnmp.entity.rfc3413.oneliner import cmdgen
         except ImportError :    
-            sys.stderr.write("pysnmp doesn't seem to be installed. SNMP checks will be ignored !\n")
-            return 0
-            
-        pageCounterOID = ".1.3.6.1.2.1.43.10.2.1.4.1.1"  # SNMPv2-SMI::mib-2.43.10.2.1.4.1.1
-        def retrieveSNMPValues(hostname, community) :    
-            """Retrieves a printer's internal page counter and status via SNMP."""
-            ver = alpha.protoVersions[alpha.protoVersionId1]
-            req = ver.Message()
-            req.apiAlphaSetCommunity(community)
-            req.apiAlphaSetPdu(ver.GetRequestPdu())
-            req.apiAlphaGetPdu().apiAlphaSetVarBindList((pageCounterOID, ver.Null()))
-            tsp = Manager()
+            hasV4 = False
             try :
-                tsp.sendAndReceive(req.berEncode(), \
-                                   (hostname, 161), \
-                                   (handleAnswer, req))
-            except :    
-                raise "No SNMP !"
-            tsp.close()
-        
-        def handleAnswer(wholemsg, notusedhere, req):
-            """Decodes and handles the SNMP answer."""
-            ver = alpha.protoVersions[alpha.protoVersionId1]
-            rsp = ver.Message()
-            try :
-                rsp.berDecode(wholemsg)
-            except TypeMismatchError, msg :    
-                raise "No SNMP !"
-            else :
-                if req.apiAlphaMatch(rsp):
-                    errorStatus = rsp.apiAlphaGetPdu().apiAlphaGetErrorStatus()
-                    if errorStatus:
-                        raise "No SNMP !"
-                    else:
-                        self.values = []
-                        for varBind in rsp.apiAlphaGetPdu().apiAlphaGetVarBindList():
-                            self.values.append(varBind.apiAlphaGetOidVal()[1].rawAsn1Value)
-                        try :    
-                            pagecounter = self.values[0]
-                        except :
+                from pysnmp.asn1.encoding.ber.error import TypeMismatchError
+                from pysnmp.mapping.udp.role import Manager
+                from pysnmp.proto.api import alpha
+            except ImportError :    
+                sys.stderr.write("pysnmp doesn't seem to be installed. SNMP checks will be ignored !\n")
+                return 0
+        else :        
+            hasV4 = True
+            
+        if hasV4 :    
+            def retrieveSNMPValues(hostname, community) :
+                """Retrieves a printer's internal page counter and status via SNMP."""
+                errorIndication, errorStatus, errorIndex, varBinds = \
+                     cmdgen.CommandGenerator().getCmd(cmdgen.CommunityData("pykota", community, 0), \
+                                                      cmdgen.UdpTransportTarget((hostname, 161)), \
+                                                      tuple([int(i) for i in pageCounterOID.split('.')]))
+                if errorIndication :                                                  
+                    raise "No SNMP !"
+                elif errorStatus :    
+                    raise "No SNMP !"
+                else :                                 
+                    self.SNMPOK = True
+        else :
+            def retrieveSNMPValues(hostname, community) :    
+                """Retrieves a printer's internal page counter and status via SNMP."""
+                ver = alpha.protoVersions[alpha.protoVersionId1]
+                req = ver.Message()
+                req.apiAlphaSetCommunity(community)
+                req.apiAlphaSetPdu(ver.GetRequestPdu())
+                req.apiAlphaGetPdu().apiAlphaSetVarBindList((pageCounterOID, ver.Null()))
+                tsp = Manager()
+                try :
+                    tsp.sendAndReceive(req.berEncode(), \
+                                       (hostname, 161), \
+                                       (handleAnswer, req))
+                except :    
+                    raise "No SNMP !"
+                tsp.close()
+            
+            def handleAnswer(wholemsg, notusedhere, req):
+                """Decodes and handles the SNMP answer."""
+                ver = alpha.protoVersions[alpha.protoVersionId1]
+                rsp = ver.Message()
+                try :
+                    rsp.berDecode(wholemsg)
+                except TypeMismatchError, msg :    
+                    raise "No SNMP !"
+                else :
+                    if req.apiAlphaMatch(rsp):
+                        errorStatus = rsp.apiAlphaGetPdu().apiAlphaGetErrorStatus()
+                        if errorStatus:
                             raise "No SNMP !"
-                        else :    
-                            self.SNMPOK = 1
-                            return 1
+                        else:
+                            self.values = []
+                            for varBind in rsp.apiAlphaGetPdu().apiAlphaGetVarBindList():
+                                self.values.append(varBind.apiAlphaGetOidVal()[1].rawAsn1Value)
+                            try :    
+                                pagecounter = self.values[0]
+                            except :
+                                raise "No SNMP !"
+                            else :    
+                                self.SNMPOK = 1
+                                return 1
             
         self.SNMPOK = 0