ipdevpoll TypeError: unsupported operand type(s) for +: 'NoneType' and 'float'

[Ingeborg Hellemo]

Nav 4.2

The device trigging the error is of type WS-C2960SellerX Catalyst 2960S eller 2960X type switch 1.3.6.1.4.1.9.1.1208

Plugin nav.ipdevpoll.plugins.lldp.LLDP(u'DEVICENAME') reported an unhandled failure
Traceback (most recent call last):
  File "/usr/local/lib/python2.7/site-packages/Twisted-12.3.0-py2.7-freebsd-10.0-RELEASE-p9-amd64.egg/twisted/internet/defer.py", line 381, in callback
    self._startRunCallbacks(result)
  File "/usr/local/lib/python2.7/site-packages/Twisted-12.3.0-py2.7-freebsd-10.0-RELEASE-p9-amd64.egg/twisted/internet/defer.py", line 489, in _startRunCallbacks
    self._runCallbacks()
  File "/usr/local/lib/python2.7/site-packages/Twisted-12.3.0-py2.7-freebsd-10.0-RELEASE-p9-amd64.egg/twisted/internet/defer.py", line 576, in _runCallbacks
    current.result = callback(current.result, *args, **kw)
  File "/usr/local/lib/python2.7/site-packages/Twisted-12.3.0-py2.7-freebsd-10.0-RELEASE-p9-amd64.egg/twisted/internet/defer.py", line 1127, in gotResult
    _inlineCallbacks(r, g, deferred)
--- <exception caught here> ---
  File "/usr/local/lib/python2.7/site-packages/Twisted-12.3.0-py2.7-freebsd-10.0-RELEASE-p9-amd64.egg/twisted/internet/defer.py", line 1071, in _inlineCallbacks
    result = g.send(result)
  File "/usr/local/nav/lib/python/nav/ipdevpoll/plugins/lldp.py", line 60, in handle
    need_to_collect = yield stampcheck.is_changed()
  File "/usr/local/nav/lib/python/nav/ipdevpoll/timestamps.py", line 143, in is_changed
    old_uptime, new_uptime)
  File "/usr/local/nav/lib/python/nav/mibs/snmpv2_mib.py", line 102, in get_uptime_deviation
    expected_uptime2 = (uptime1 + expected_delta) % 2**32
exceptions.TypeError: unsupported operand type(s) for +: 'NoneType' and 'float'

[Morten Brekkevold (mbrekkevold)]

fix here: https://nav.uninett.no/hg/stable/rev/0d2e70fb8a50

Full confirmation is not available, please test the patch if you can