matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

Merge pull request #14830 from fdumontet6WIND/snmpv2

Browse source 
tests: bgp_snmp_bgp4v2mib fix some random failure
This commit is contained in:
Donatas Abraitis 2023-11-22 14:45:15 +02:00 committed by GitHub
parent 79b7b8df1f a5bee822f4
commit af22ff0bd5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
tests/topotests/bgp_snmp_bgp4v2mib/test_bgp_snmp_bgp4v2mib.py
View file

@ -207,7 +207,6 @@ def test_bgp_snmp_bgp4v2():
# bgp4V2NlriOrigin # bgp4V2NlriOrigin
# tgen.mininet_cli() # tgen.mininet_cli()
output, _ = snmp.walk(".1.3.6.1.3.5.1.1.9.1.9") output, _ = snmp.walk(".1.3.6.1.3.5.1.1.9.1.9")
logger.info(output)
return output == expected return output == expected
_, result = topotest.run_and_expect(_snmpwalk_origin, True, count=10, wait=1) _, result = topotest.run_and_expect(_snmpwalk_origin, True, count=10, wait=1)
@ -284,13 +283,35 @@ def test_bgp_snmp_bgp4v2():
("1.3.6.1.3.5.1.1.2.1.6.1.2.32.1.13.184.0.0.0.0.0.0.0.0.0.18.0.1", "179"), ("1.3.6.1.3.5.1.1.2.1.6.1.2.32.1.13.184.0.0.0.0.0.0.0.0.0.18.0.1", "179"),
] ]
expected2 = [
("1.3.6.1.3.5.1.1.2.1.13.1.2.32.1.13.184.0.0.0.0.0.0.0.0.0.18.0.1", "7"),
("1.3.6.1.3.5.1.1.2.1.6.1.2.32.1.13.184.0.0.0.0.0.0.0.0.0.18.0.1", "179"),
("1.3.6.1.3.5.1.1.3.1.1.1.2.32.1.13.184.0.0.0.0.0.0.0.0.0.18.0.1", "6"),
("1.3.6.1.3.5.1.1.3.1.2.1.2.32.1.13.184.0.0.0.0.0.0.0.0.0.18.0.1", "4"),
(
"1.3.6.1.3.5.1.1.3.1.4.1.2.32.1.13.184.0.0.0.0.0.0.0.0.0.18.0.1",
'"00 "',
),
("1.3.6.1.3.5.1.1.2.1.13.1.1.192.168.12.1", "7"),
("1.3.6.1.3.5.1.1.2.1.6.1.1.192.168.12.1", "179"),
("1.3.6.1.3.5.1.1.3.1.1.1.1.192.168.12.1", "6"),
("1.3.6.1.3.5.1.1.3.1.2.1.1.192.168.12.1", "4"),
("1.3.6.1.3.5.1.1.3.1.4.1.1.192.168.12.1", '"00 "'),
("1.3.6.1.3.5.1.1.2.1.13.1.1.192.168.12.1", "6"),
("1.3.6.1.3.5.1.1.2.1.6.1.1.192.168.12.1", "179"),
("1.3.6.1.3.5.1.1.2.1.13.1.2.32.1.13.184.0.0.0.0.0.0.0.0.0.18.0.1", "6"),
("1.3.6.1.3.5.1.1.2.1.6.1.2.32.1.13.184.0.0.0.0.0.0.0.0.0.18.0.1", "179"),
]
# load trapd resulting file # load trapd resulting file
# tgen.mininet_cli() # tgen.mininet_cli()
snmptrapfile = "{}/{}/snmptrapd.log".format(r2.logdir, r2.name) snmptrapfile = "{}/{}/snmptrapd.log".format(r2.logdir, r2.name)
outputfile = open(snmptrapfile).read() outputfile = open(snmptrapfile).read()
output = snmp.trap(outputfile) output = snmp.trap(outputfile)
return output == expected logger.info(output)
output_cut = output[:14]
return output_cut == expected or output_cut == expected2
snmptrapfile = "{}/{}/snmptrapd.log".format(r2.logdir, r2.name) snmptrapfile = "{}/{}/snmptrapd.log".format(r2.logdir, r2.name)
trap_file = open(snmptrapfile, "w") trap_file = open(snmptrapfile, "w")