experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup for snmp tests

Browse source
This commit is contained in:
Philip Prindeville 2023-09-20 11:23:30 -06:00 • committed by Olof Hagsand
parent c634ad886e
commit 220ad29269
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -37,6 +37,7 @@ apps/cli/test.c
apps/netconf/clixon_netconf apps/netconf/clixon_netconf
apps/restconf/clixon_restconf apps/restconf/clixon_restconf
apps/restconf/clixon_restconf_libhttp apps/restconf/clixon_restconf_libhttp
apps/snmp/clixon_snmp
etc/clixonrc etc/clixonrc

2
test/config.sh.in
View file

@ -100,4 +100,6 @@ YANG_INSTALLDIR=@YANG_INSTALLDIR@
MIB_GENERATED_YANG_DIR=@MIB_GENERATED_YANG_DIR@ MIB_GENERATED_YANG_DIR=@MIB_GENERATED_YANG_DIR@
MIBDIRS=/usr/share/snmp/mibs:mibs:@MIB_GENERATED_YANG_DIR@
SSH_BIN=@SSH_BIN@ SSH_BIN=@SSH_BIN@

5
test/lib.sh
View file

@ -204,7 +204,7 @@ if [ -n "$CLICON_GROUP" ] && [ $_ALREADY_HERE -eq 0 ]; then
clixon_cli="sudo -g ${CLICON_GROUP} $clixon_cli" clixon_cli="sudo -g ${CLICON_GROUP} $clixon_cli"
clixon_netconf="sudo -g ${CLICON_GROUP} $clixon_netconf" clixon_netconf="sudo -g ${CLICON_GROUP} $clixon_netconf"
clixon_restconf="sudo -g ${CLICON_GROUP} $clixon_restconf" clixon_restconf="sudo -g ${CLICON_GROUP} $clixon_restconf"
clixon_snmp="sudo -g ${CLICON_GROUP} $clixon_snmp" clixon_snmp="sudo -g ${CLICON_GROUP} --preserve-env=MIBDIRS $clixon_snmp"
clixon_util_socket="sudo -g ${CLICON_GROUP} $clixon_util_socket" clixon_util_socket="sudo -g ${CLICON_GROUP} $clixon_util_socket"
fi fi
_ALREADY_HERE=1 _ALREADY_HERE=1
@ -262,7 +262,7 @@ if $SNMPCHECK; then
echo "added to /etc/snmp/snmpd.conf:" echo "added to /etc/snmp/snmpd.conf:"
echo "" echo ""
echo " rwcommunity public localhost" echo " rwcommunity public localhost"
echo " agentXSocket unix:/var/run/snmp.sock" echo " agentxsocket unix:/var/run/snmp.sock"
echo " agentxperms 777 777" echo " agentxperms 777 777"
echo "" echo ""
echo "If you don't rely on systemd you can configure the lines above" echo "If you don't rely on systemd you can configure the lines above"
@ -526,6 +526,7 @@ function start_snmp(){
rm -f ${clixon_snmp_pidfile} rm -f ${clixon_snmp_pidfile}
export MIBDIRS
$clixon_snmp -f $cfg -D $DBG & $clixon_snmp -f $cfg -D $DBG &
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then