Changeset 2305

Timestamp:

06/10/05 10:30:43 (19 years ago)

Author:

jerome

Message:

Fixed internal SNMP accounter according to Jamuel's findings.

Location:

pykota/trunk

Files:

• NEWS (modified) (1 diff)
• pykota/accounters/snmp.py (modified) (4 diffs)
• pykota/version.py (modified) (1 diff)

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
        
+    - 1.23alpha9 :   
+    
+        - Fixed internal SNMP accounter for printers which only have a life time
+          page counter, and not a volatile page counter.
+          
     - 1.23alpha8 :
     

pykota/trunk/pykota/accounters/snmp.py

@@ -42 +42 @@
 else :    
     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
-    pageCounterOID2 = ".1.3.6.1.2.1.43.10.2.1.5.1.1" # SNMPv2-SMI::mib-2.43.10.2.1.5.1.1
     hrPrinterStatusOID = ".1.3.6.1.2.1.25.3.5.1.1.1" # SNMPv2-SMI::mib-2.25.3.5.1.1.1
     printerStatusValues = { 1 : 'other',
@@ -69 +68 @@
             self.printerHostname = printerhostname
             self.printerInternalPageCounter = None
-            self.printerInternalPageCounter2 = None
             self.printerStatus = None
             self.deviceStatus = None
@@ -80 +78 @@
             req.apiAlphaSetPdu(ver.GetRequestPdu())
             req.apiAlphaGetPdu().apiAlphaSetVarBindList((pageCounterOID, ver.Null()), \
-                                                        (pageCounterOID2, ver.Null()), \
                                                         (hrPrinterStatusOID, ver.Null()), \
                                                         (hrDeviceStatusOID, ver.Null()))
@@ -111 +108 @@
                             # keep maximum value seen for printer's internal page counter
                             self.printerInternalPageCounter = max(self.printerInternalPageCounter, self.values[0])
-                            self.printerInternalPageCounter2 = max(self.printerInternalPageCounter2, self.values[1])
-                            self.printerStatus = self.values[2]
-                            self.deviceStatus = self.values[3]
-                            self.parent.filter.logdebug("SNMP answer is decoded : PageCounters : (%s, %s)  PrinterStatus : %s  DeviceStatus : %s" % tuple(self.values))
+                            self.printerStatus = self.values[1]
+                            self.deviceStatus = self.values[2]
+                            self.parent.filter.logdebug("SNMP answer is decoded : PageCounter : %s  PrinterStatus : %s  DeviceStatus : %s" % tuple(self.values))
                         except IndexError :    
                             self.parent.filter.logdebug("SNMP answer is incomplete : %s" % str(self.values))

pykota/trunk/pykota/version.py

@@ -22 +22 @@
 #
 
-__version__ = "1.23alpha8_unofficial"
+__version__ = "1.23alpha9_unofficial"
 
 __doc__ = "PyKota : a complete Printing Quota Solution for CUPS and LPRng."