ipng/vpp-snmp-agent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Turn VPPApi into a threadsafe object

Browse Source 
It now is tolerant to VPP restarts. Upon initialization, we connect(),
blocking all but the first thread from trying. The rest will see
self.connected=True and move on.

Then, on each/any error, call vpp.disconect() and set connected=False
which will make any subsequent AgentX updater run force a reconnect.
This commit is contained in:
Pim van Pelt
2021-09-05 20:02:11 +00:00
parent e1cddc8c26
commit 7dec1329d2
2 changed files with 78 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
vpp-snmp-agent.py
View File

@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-
from vppstats import VPPStats
import vppapi
from vppapi import VPPApi
import time
import pyagentx
import logging
@ -52,8 +52,9 @@ class ifMtu(pyagentx.Updater):
def update(self):
global vppstat, vpp
vppstat.connect()
vpp.connect()
ifaces = vppapi.get_ifaces(vpp)
ifaces = vpp.get_ifaces()
for i in range(len(vppstat['/if/names'])):
ifname = vppstat['/if/names'][i]
@ -69,8 +70,9 @@ class ifSpeed(pyagentx.Updater):
def update(self):
global vppstat, vpp
vppstat.connect()
vpp.connect()
ifaces = vppapi.get_ifaces(vpp)
ifaces = vpp.get_ifaces()
for i in range(len(vppstat['/if/names'])):
ifname = vppstat['/if/names'][i]
@ -91,8 +93,9 @@ class ifAdminStatus(pyagentx.Updater):
def update(self):
global vppstat, vpp
vppstat.connect()
vpp.connect()
ifaces = vppapi.get_ifaces(vpp)
ifaces = vpp.get_ifaces()
for i in range(len(vppstat['/if/names'])):
ifname = vppstat['/if/names'][i]
@ -112,8 +115,9 @@ class ifOperStatus(pyagentx.Updater):
def update(self):
global vppstat, vpp
vppstat.connect()
vpp.connect()
ifaces = vppapi.get_ifaces(vpp)
ifaces = vpp.get_ifaces()
for i in range(len(vppstat['/if/names'])):
ifname = vppstat['/if/names'][i]
@ -133,8 +137,9 @@ class ifPhysAddress(pyagentx.Updater):
def update(self):
global vppstat, vpp
vppstat.connect()
vpp.connect()
ifaces = vppapi.get_ifaces(vpp)
ifaces = vpp.get_ifaces()
for i in range(len(vppstat['/if/names'])):
ifname = vppstat['/if/names'][i]
@ -280,8 +285,9 @@ class ifHighSpeed(pyagentx.Updater):
def update(self):
global vppstat, vpp
vppstat.connect()
vpp.connect()
ifaces = vppapi.get_ifaces(vpp)
ifaces = vpp.get_ifaces()
for i in range(len(vppstat['/if/names'])):
ifname = vppstat['/if/names'][i]
@ -480,8 +486,8 @@ def main():
vppstat = VPPStats(socketname='/run/vpp/stats.sock', timeout=2)
vppstat.connect()
vpp = vppapi.vpp_connect()
if not vpp:
vpp = VPPApi()
if not vpp.connect():
logger.error("Can't connect to VPP API, bailing")
return
@ -495,6 +501,7 @@ def main():
a.stop()
vppstat.disconnect()
vpp.disconnect()
if __name__ == "__main__":