proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 22:13:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4758 from donaldsharp/test_epoch

Browse Source 
tests: Do not use peerUptime as a measure of if a clear worked
This commit is contained in:
David Lamparter 2019-08-01 17:07:43 +02:00 committed by GitHub
commit b21ea71ea9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/topotests/lib/bgp.py
View File

@ -932,7 +932,7 @@ def clear_bgp_and_verify(tgen, topo, router):
# Peer up time dictionary # Peer up time dictionary
peer_uptime_before_clear_bgp[bgp_neighbor] = \ peer_uptime_before_clear_bgp[bgp_neighbor] = \
ipv4_data[neighbor_ip]["peerUptime"] ipv4_data[neighbor_ip]["peerUptimeEstablishedEpoch"]
else: else:
ipv6_data = show_bgp_json["ipv6Unicast"][ ipv6_data = show_bgp_json["ipv6Unicast"][
"peers"] "peers"]
@ -940,7 +940,7 @@ def clear_bgp_and_verify(tgen, topo, router):
# Peer up time dictionary # Peer up time dictionary
peer_uptime_before_clear_bgp[bgp_neighbor] = \ peer_uptime_before_clear_bgp[bgp_neighbor] = \
ipv6_data[neighbor_ip]["peerUptime"] ipv6_data[neighbor_ip]["peerUptimeEstablishedEpoch"]
if nh_state == "Established": if nh_state == "Established":
no_of_peer += 1 no_of_peer += 1
@ -953,6 +953,7 @@ def clear_bgp_and_verify(tgen, topo, router):
logger.warning("BGP is not yet Converged for router %s " logger.warning("BGP is not yet Converged for router %s "
"before bgp clear", router) "before bgp clear", router)
logger.info(peer_uptime_before_clear_bgp)
# Clearing BGP # Clearing BGP
logger.info("Clearing BGP neighborship for router %s..", router) logger.info("Clearing BGP neighborship for router %s..", router)
for addr_type in bgp_addr_type.keys(): for addr_type in bgp_addr_type.keys():
@ -1010,14 +1011,14 @@ def clear_bgp_and_verify(tgen, topo, router):
"peers"] "peers"]
nh_state = ipv4_data[neighbor_ip]["state"] nh_state = ipv4_data[neighbor_ip]["state"]
peer_uptime_after_clear_bgp[bgp_neighbor] = \ peer_uptime_after_clear_bgp[bgp_neighbor] = \
ipv4_data[neighbor_ip]["peerUptime"] ipv4_data[neighbor_ip]["peerUptimeEstablishedEpoch"]
else: else:
ipv6_data = show_bgp_json["ipv6Unicast"][ ipv6_data = show_bgp_json["ipv6Unicast"][
"peers"] "peers"]
nh_state = ipv6_data[neighbor_ip]["state"] nh_state = ipv6_data[neighbor_ip]["state"]
# Peer up time dictionary # Peer up time dictionary
peer_uptime_after_clear_bgp[bgp_neighbor] = \ peer_uptime_after_clear_bgp[bgp_neighbor] = \
ipv6_data[neighbor_ip]["peerUptime"] ipv6_data[neighbor_ip]["peerUptimeEstablishedEpoch"]
if nh_state == "Established": if nh_state == "Established":
no_of_peer += 1 no_of_peer += 1
@ -1030,7 +1031,8 @@ def clear_bgp_and_verify(tgen, topo, router):
logger.warning("BGP is not yet Converged for router %s after" logger.warning("BGP is not yet Converged for router %s after"
" bgp clear", router) " bgp clear", router)
# Compariung peerUptime dictionaries logger.info(peer_uptime_after_clear_bgp)
# Comparing peerUptimeEstablishedEpoch dictionaries
if peer_uptime_before_clear_bgp != peer_uptime_after_clear_bgp: if peer_uptime_before_clear_bgp != peer_uptime_after_clear_bgp:
logger.info("BGP neighborship is reset after clear BGP on router %s", logger.info("BGP neighborship is reset after clear BGP on router %s",
router) router)