Fix BULKWALK examples

Avoid sending out extra GETBULK on EOM condition
pull/166/head
Ilya Etingof 2018-07-08 09:49:44 +02:00
parent 212e1b54c3
commit 8dbc28d360
2 changed files with 6 additions and 0 deletions

View File

@ -48,6 +48,7 @@ def cbTimerFun(timeNow):
# noinspection PyUnusedLocal
def cbRecvFun(transportDispatcher, transportDomain, transportAddress,
wholeMsg, reqPDU=reqPDU, headVars=headVars):
while wholeMsg:
rspMsg, wholeMsg = decoder.decode(wholeMsg, asn1Spec=v2c.Message())
@ -81,6 +82,7 @@ def cbRecvFun(transportDispatcher, transportDomain, transportAddress,
break
else:
transportDispatcher.jobFinished(1)
continue
# Generate request for next row
v2c.apiBulkPDU.setVarBinds(
@ -94,6 +96,7 @@ def cbRecvFun(transportDispatcher, transportDomain, transportAddress,
if time() - startedAt > 3:
raise Exception('Request timed out')
startedAt = time()
return wholeMsg

View File

@ -49,6 +49,7 @@ def cbTimerFun(timeNow):
# noinspection PyUnusedLocal
def cbRecvFun(transportDispatcher, transportDomain, transportAddress,
wholeMsg, reqPDU=reqPDU, headVars=headVars):
while wholeMsg:
rspMsg, wholeMsg = decoder.decode(wholeMsg, asn1Spec=pMod.Message())
rspPDU = pMod.apiMessage.getPDU(rspMsg)
@ -73,6 +74,7 @@ def cbRecvFun(transportDispatcher, transportDomain, transportAddress,
break
else:
transportDispatcher.jobFinished(1)
continue
# Generate request for next row
pMod.apiPDU.setVarBinds(
@ -86,6 +88,7 @@ def cbRecvFun(transportDispatcher, transportDomain, transportAddress,
if time() - startedAt > 3:
raise Exception('Request timed out')
startedAt = time()
return wholeMsg