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

SNMP mem tests: increase timeout for walk and table, use single snmp tools macro

Browse source
This commit is contained in:
Olof hagsand 2023-02-06 12:46:55 +01:00
parent ba861bc619
commit 56f15aeefd
4 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

7
test/lib.sh
View file

@ -224,8 +224,15 @@ if $SNMPCHECK; then
snmpgetstr="$(type -p snmpget) -c public -v2c localhost " snmpgetstr="$(type -p snmpget) -c public -v2c localhost "
snmpgetnext="$(type -p snmpgetnext) -On -c public -v2c localhost " snmpgetnext="$(type -p snmpgetnext) -On -c public -v2c localhost "
snmpgetnextstr="$(type -p snmpgetnext) -c public -v2c localhost " snmpgetnextstr="$(type -p snmpgetnext) -c public -v2c localhost "
if [ $valgrindtest -ne 0 ]; then
# To avoid "Timeout: No Response from localhost" from netsnmp/snmpd set timeout to 10s
snmptable="$(type -p snmptable) -c public -v2c localhost -t 10 "
snmpwalk="$(type -p snmpwalk) -c public -v2c localhost -t 10 "
else
snmptable="$(type -p snmptable) -c public -v2c localhost " snmptable="$(type -p snmptable) -c public -v2c localhost "
snmpwalk="$(type -p snmpwalk) -c public -v2c localhost " snmpwalk="$(type -p snmpwalk) -c public -v2c localhost "
fi
snmpwalkstr="$(type -p snmpwalk) -c public -v2c localhost "
snmptranslate="$(type -p snmptranslate) " snmptranslate="$(type -p snmptranslate) "
if [ "${ENABLE_NETSNMP}" == "yes" ]; then if [ "${ENABLE_NETSNMP}" == "yes" ]; then

2
test/test_snmp_entity.sh
View file

@ -519,7 +519,7 @@ expectpart "$($snmpwalk $ENTITY_OID)" 0 "SNMPv2-SMI::mib-2.47.1.1.1.1.1.1 = INTE
"SNMPv2-SMI::mib-2.47.1.1.1.1.15.1 = STRING: \"Asset 123\"" \ "SNMPv2-SMI::mib-2.47.1.1.1.1.15.1 = STRING: \"Asset 123\"" \
"SNMPv2-SMI::mib-2.47.1.1.1.1.15.2 = STRING: \"Asset 456\"" \ "SNMPv2-SMI::mib-2.47.1.1.1.1.15.2 = STRING: \"Asset 456\"" \
"SNMPv2-SMI::mib-2.47.1.1.1.1.16.1 = INTEGER: 1" \ "SNMPv2-SMI::mib-2.47.1.1.1.1.16.1 = INTEGER: 1" \
"SNMPv2-SMI::mib-2.47.1.1.1.1.16.2 = INTEGER: 2" \ "SNMPv2-SMI::mib-2.47.1.1.1.1.16.2 = INTEGER: 2"
new "Cleaning up" new "Cleaning up"
testexit testexit

10
test/test_snmp_ifmib.sh
View file

@ -13,12 +13,6 @@ if [ ${ENABLE_NETSNMP} != "yes" ]; then
if [ "$s" = $0 ]; then exit 0; else return 0; fi if [ "$s" = $0 ]; then exit 0; else return 0; fi
fi fi
snmpd=$(type -p snmpd)
snmpget="$(type -p snmpget) -On -c public -v2c localhost "
snmpgetnext="$(type -p snmpgetnext) -On -c public -v2c localhost "
snmptable="$(type -p snmptable) -c public -v2c localhost "
snmpwalk="$(type -p snmpwalk) -c public -v2c localhost "
cfg=$dir/conf_startup.xml cfg=$dir/conf_startup.xml
fyang=$dir/clixon-example.yang fyang=$dir/clixon-example.yang
fstate=$dir/state.xml fstate=$dir/state.xml
@ -487,6 +481,10 @@ expectpart "$($snmpwalk IF-MIB::ifRcvAddressTable)" 0 "IF-MIB::ifRcvAddressAddre
"IF-MIB::ifRcvAddressType.1.\"11:bb:cc:dd:ee:ff\" = INTEGER: other(1)" \ "IF-MIB::ifRcvAddressType.1.\"11:bb:cc:dd:ee:ff\" = INTEGER: other(1)" \
"IF-MIB::ifRcvAddressType.2.\"aa:22:33:44:55:66\" = INTEGER: volatile(2)" "IF-MIB::ifRcvAddressType.2.\"aa:22:33:44:55:66\" = INTEGER: volatile(2)"
# XXX with valgrind on backend this fails with:
# Error in packet.
# Reason: (genError) A general failure occured
# Failed object: IF-MIB::ifName.2
new "Walk ifXTable" new "Walk ifXTable"
expectpart "$($snmpwalk IF-MIB::ifXTable)" 0 "IF-MIB::ifName.1 = STRING: ifname1" \ expectpart "$($snmpwalk IF-MIB::ifXTable)" 0 "IF-MIB::ifName.1 = STRING: ifname1" \
"IF-MIB::ifName.2 = STRING: ifname2" "IF-MIB::ifName.2 = STRING: ifname2"

7
test/test_snmp_system.sh Normal file → Executable file
View file

@ -13,13 +13,6 @@ if [ ${ENABLE_NETSNMP} != "yes" ]; then
if [ "$s" = $0 ]; then exit 0; else return 0; fi if [ "$s" = $0 ]; then exit 0; else return 0; fi
fi fi
snmpd=$(type -p snmpd)
snmpget="$(type -p snmpget) -On -c public -v2c localhost "
snmpwalk="$(type -p snmpwalk) -On -c public -v2c localhost "
snmpwalkstr="$(type -p snmpwalk) -c public -v2c localhost "
snmpgetnext="$(type -p snmpgetnext) -On -c public -v2c localhost "
snmptable="$(type -p snmptable) -c public -v2c localhost "
cfg=$dir/conf_startup.xml cfg=$dir/conf_startup.xml
fyang=$dir/clixon-example.yang fyang=$dir/clixon-example.yang
fstate=$dir/state.xml fstate=$dir/state.xml