proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-06-07 14:57:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tests: add wait to RequireVpnRoutes, RequireUnicastRoutes

Browse Source 
Signed-off-by: G. Paul Ziemba <paulz@labn.net>
This commit is contained in:
G. Paul Ziemba 2024-07-27 11:56:54 -07:00
parent 7f10381374
commit 460703f3e8
1 changed files with 90 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
tests/topotests/lib/bgprib.py
View File

@ -64,10 +64,9 @@ class BgpRib:
self.log("missing route: pfx=" + want["p"] + ", nh=" + want["n"]) self.log("missing route: pfx=" + want["p"] + ", nh=" + want["n"])
return 0 return 0
def RequireVpnRoutes(self, target, title, wantroutes, debug=0): def RequireVpnRoutesOne(self, target, title, wantroutes, debug=0):
import json import json
logstr = "RequireVpnRoutes " + str(wantroutes)
# non json form for humans # non json form for humans
luCommand( luCommand(
target, target,
@ -86,11 +85,18 @@ class BgpRib:
if re.search(r"^\s*$", ret): if re.search(r"^\s*$", ret):
# degenerate case: empty json means no routes # degenerate case: empty json means no routes
if len(wantroutes) > 0: if len(wantroutes) > 0:
luResult(target, False, title, logstr) return False
return return True
luResult(target, True, title, logstr)
rib = json.loads(ret) rib = json.loads(ret)
try:
rds = rib["routes"]["routeDistinguishers"] rds = rib["routes"]["routeDistinguishers"]
except KeyError as err:
# KeyError: 'routes' probably means missing/bad VRF
# This error also happens if we are too quick and the routing
# table has not been fully populated yet.
if debug:
self.log("KeyError, no routes")
return False
for want in wantroutes: for want in wantroutes:
found = 0 found = 0
if debug: if debug:
@ -105,11 +111,39 @@ class BgpRib:
found = 1 found = 1
break break
if not found: if not found:
luResult(target, False, title, logstr) return False
return return True
luResult(target, True, title, logstr)
def RequireUnicastRoutes(self, target, afi, vrf, title, wantroutes, debug=0): def RequireVpnRoutes(
self, target, title, wantroutes, debug=0, wait=10, wait_time=0.5
):
import time
import math
logstr = "RequireVpnRoutes " + str(wantroutes)
found = False
n = 0
startt = time.time()
# Calculate the amount of `sleep`s we are going to peform.
wait_count = int(math.ceil(wait / wait_time)) + 1
while wait_count > 0:
n += 1
found = self.RequireVpnRoutesOne(target, title, wantroutes, debug)
if found is not False:
break
wait_count -= 1
if wait_count > 0:
time.sleep(wait_time)
delta = time.time() - startt
self.log("Done after %d loops, time=%s, Found=%s" % (n, delta, found))
luResult(target, found, title, logstr)
return found
def RequireUnicastRoutesOne(self, target, afi, vrf, title, wantroutes, debug=0):
logstr = "RequireUnicastRoutes %s" % str(wantroutes) logstr = "RequireUnicastRoutes %s" % str(wantroutes)
vrfstr = "" vrfstr = ""
if vrf != "": if vrf != "":
@ -129,9 +163,8 @@ class BgpRib:
if re.search(r"^\s*$", ret): if re.search(r"^\s*$", ret):
# degenerate case: empty json means no routes # degenerate case: empty json means no routes
if len(wantroutes) > 0: if len(wantroutes) > 0:
luResult(target, False, title, logstr) return False, ""
return return True, ""
luResult(target, True, title, logstr)
rib = json.loads(ret) rib = json.loads(ret)
try: try:
table = rib["routes"] table = rib["routes"]
@ -141,25 +174,60 @@ class BgpRib:
errstr = "-script ERROR: check if wrong vrf (%s)" % (vrf) errstr = "-script ERROR: check if wrong vrf (%s)" % (vrf)
else: else:
errstr = "-script ERROR: check if vrf missing" errstr = "-script ERROR: check if vrf missing"
luResult(target, False, title + errstr, logstr) self.log(errstr)
return return False, errstr
# if debug: # if debug:
# self.log("table=%s" % table) # self.log("table=%s" % table)
for want in wantroutes: for want in wantroutes:
if debug: if debug:
self.log("want=%s" % want) self.log("want=%s" % want)
if not self.routes_include_wanted(table, want, debug): if not self.routes_include_wanted(table, want, debug):
luResult(target, False, title, logstr) return False, ""
return return True, ""
luResult(target, True, title, logstr)
def RequireUnicastRoutes(
self, target, afi, vrf, title, wantroutes, debug=0, wait=10, wait_time=0.5
):
import time
import math
logstr = "RequireUnicastRoutes %s" % str(wantroutes)
found = False
n = 0
startt = time.time()
errstr = ""
# Calculate the amount of `sleep`s we are going to peform.
wait_count = int(math.ceil(wait / wait_time)) + 1
while wait_count > 0:
n += 1
found, errstr = self.RequireUnicastRoutesOne(
target, afi, vrf, title, wantroutes, debug
)
if found is not False:
break
wait_count -= 1
if wait_count > 0:
time.sleep(wait_time)
delta = time.time() - startt
self.log("Done after %d loops, time=%s, Found=%s" % (n, delta, found))
luResult(target, found, title + errstr, logstr)
return found
BgpRib = BgpRib() BgpRib = BgpRib()
def bgpribRequireVpnRoutes(target, title, wantroutes, debug=0): def bgpribRequireVpnRoutes(target, title, wantroutes, debug=0, wait=10, wait_time=0.5):
BgpRib.RequireVpnRoutes(target, title, wantroutes, debug) BgpRib.RequireVpnRoutes(target, title, wantroutes, debug, wait, wait_time)
def bgpribRequireUnicastRoutes(target, afi, vrf, title, wantroutes, debug=0): def bgpribRequireUnicastRoutes(
BgpRib.RequireUnicastRoutes(target, afi, vrf, title, wantroutes, debug) target, afi, vrf, title, wantroutes, debug=0, wait=10, wait_time=0.5
):
BgpRib.RequireUnicastRoutes(
target, afi, vrf, title, wantroutes, debug, wait, wait_time
)