mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-07-17 10:20:27 +00:00
Merge pull request #14756 from opensourcerouting/fix/bgpd_dynamic_cap_addpath_topotest
tests: Check received prefixes before immediately sending dynamic capabilities
This commit is contained in:
commit
314a98d2b4
@ -70,6 +70,11 @@ def test_bgp_dynamic_capability_addpath():
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
"addressFamilyInfo": {
|
||||||
|
"ipv4Unicast": {
|
||||||
|
"acceptedPrefixCounter": 3,
|
||||||
|
}
|
||||||
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return topotest.json_cmp(output, expected)
|
return topotest.json_cmp(output, expected)
|
||||||
@ -108,6 +113,11 @@ def test_bgp_dynamic_capability_addpath():
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
"addressFamilyInfo": {
|
||||||
|
"ipv4Unicast": {
|
||||||
|
"acceptedPrefixCounter": 3,
|
||||||
|
}
|
||||||
|
},
|
||||||
"messageStats": {
|
"messageStats": {
|
||||||
"notificationsRecv": 0,
|
"notificationsRecv": 0,
|
||||||
"capabilityRecv": 1,
|
"capabilityRecv": 1,
|
||||||
|
@ -68,6 +68,11 @@ def test_bgp_dynamic_capability_graceful_restart():
|
|||||||
"gracefulRestart": "advertisedAndReceived",
|
"gracefulRestart": "advertisedAndReceived",
|
||||||
"longLivedGracefulRestart": "advertisedAndReceived",
|
"longLivedGracefulRestart": "advertisedAndReceived",
|
||||||
},
|
},
|
||||||
|
"addressFamilyInfo": {
|
||||||
|
"ipv4Unicast": {
|
||||||
|
"acceptedPrefixCounter": 3,
|
||||||
|
}
|
||||||
|
},
|
||||||
"gracefulRestartInfo": {
|
"gracefulRestartInfo": {
|
||||||
"nBit": True,
|
"nBit": True,
|
||||||
"timers": {
|
"timers": {
|
||||||
@ -116,6 +121,11 @@ def test_bgp_dynamic_capability_graceful_restart():
|
|||||||
"gracefulRestart": "advertisedAndReceived",
|
"gracefulRestart": "advertisedAndReceived",
|
||||||
"longLivedGracefulRestart": "advertisedAndReceived",
|
"longLivedGracefulRestart": "advertisedAndReceived",
|
||||||
},
|
},
|
||||||
|
"addressFamilyInfo": {
|
||||||
|
"ipv4Unicast": {
|
||||||
|
"acceptedPrefixCounter": 3,
|
||||||
|
}
|
||||||
|
},
|
||||||
"gracefulRestartInfo": {
|
"gracefulRestartInfo": {
|
||||||
"nBit": True,
|
"nBit": True,
|
||||||
"timers": {
|
"timers": {
|
||||||
|
@ -64,6 +64,11 @@ def test_bgp_dynamic_capability_orf():
|
|||||||
"neighborCapabilities": {
|
"neighborCapabilities": {
|
||||||
"dynamic": "advertisedAndReceived",
|
"dynamic": "advertisedAndReceived",
|
||||||
},
|
},
|
||||||
|
"addressFamilyInfo": {
|
||||||
|
"ipv4Unicast": {
|
||||||
|
"acceptedPrefixCounter": 3,
|
||||||
|
}
|
||||||
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return topotest.json_cmp(output, expected)
|
return topotest.json_cmp(output, expected)
|
||||||
@ -116,6 +121,7 @@ def test_bgp_dynamic_capability_orf():
|
|||||||
},
|
},
|
||||||
"addressFamilyInfo": {
|
"addressFamilyInfo": {
|
||||||
"ipv4Unicast": {
|
"ipv4Unicast": {
|
||||||
|
"acceptedPrefixCounter": 1,
|
||||||
"afDependentCap": {
|
"afDependentCap": {
|
||||||
"orfPrefixList": {
|
"orfPrefixList": {
|
||||||
"sendMode": "advertisedAndReceived",
|
"sendMode": "advertisedAndReceived",
|
||||||
|
@ -66,6 +66,11 @@ def test_bgp_dynamic_capability_role():
|
|||||||
"neighborCapabilities": {
|
"neighborCapabilities": {
|
||||||
"dynamic": "advertisedAndReceived",
|
"dynamic": "advertisedAndReceived",
|
||||||
},
|
},
|
||||||
|
"addressFamilyInfo": {
|
||||||
|
"ipv4Unicast": {
|
||||||
|
"acceptedPrefixCounter": 3,
|
||||||
|
}
|
||||||
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return topotest.json_cmp(output, expected)
|
return topotest.json_cmp(output, expected)
|
||||||
@ -108,6 +113,11 @@ def test_bgp_dynamic_capability_role():
|
|||||||
"dynamic": "advertisedAndReceived",
|
"dynamic": "advertisedAndReceived",
|
||||||
"role": "advertisedAndReceived",
|
"role": "advertisedAndReceived",
|
||||||
},
|
},
|
||||||
|
"addressFamilyInfo": {
|
||||||
|
"ipv4Unicast": {
|
||||||
|
"acceptedPrefixCounter": 3,
|
||||||
|
}
|
||||||
|
},
|
||||||
"messageStats": {
|
"messageStats": {
|
||||||
"notificationsRecv": 0,
|
"notificationsRecv": 0,
|
||||||
"capabilityRecv": 1,
|
"capabilityRecv": 1,
|
||||||
|
@ -68,6 +68,11 @@ def test_bgp_dynamic_capability_software_version():
|
|||||||
"receivedSoftwareVersion": None,
|
"receivedSoftwareVersion": None,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
"addressFamilyInfo": {
|
||||||
|
"ipv4Unicast": {
|
||||||
|
"acceptedPrefixCounter": 3,
|
||||||
|
}
|
||||||
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return topotest.json_cmp(output, expected)
|
return topotest.json_cmp(output, expected)
|
||||||
@ -129,6 +134,11 @@ def test_bgp_dynamic_capability_software_version():
|
|||||||
"receivedSoftwareVersion": rcv,
|
"receivedSoftwareVersion": rcv,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
"addressFamilyInfo": {
|
||||||
|
"ipv4Unicast": {
|
||||||
|
"acceptedPrefixCounter": 3,
|
||||||
|
}
|
||||||
|
},
|
||||||
"messageStats": {
|
"messageStats": {
|
||||||
"notificationsRecv": 0,
|
"notificationsRecv": 0,
|
||||||
"capabilityRecv": 1,
|
"capabilityRecv": 1,
|
||||||
|
Loading…
Reference in New Issue
Block a user