summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonald Sharp <donaldsharp72@gmail.com>2023-11-09 07:37:26 -0500
committerGitHub <noreply@github.com>2023-11-09 07:37:26 -0500
commit314a98d2b4cdfb75b900a004dc102e42c75af6c5 (patch)
tree52b7064c95387c1879a91c354ced20056afe635b
parent06c1e5303685ee296553a6bd0a9b82debdb73fb0 (diff)
parentc12b976c0afa85babc5d8ab3af6310e58214d22a (diff)
Merge pull request #14756 from opensourcerouting/fix/bgpd_dynamic_cap_addpath_topotest
tests: Check received prefixes before immediately sending dynamic capabilities
-rw-r--r--tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_addpath.py10
-rw-r--r--tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_graceful_restart.py10
-rw-r--r--tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_orf.py6
-rw-r--r--tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_role.py10
-rw-r--r--tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_software_version.py10
5 files changed, 46 insertions, 0 deletions
diff --git a/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_addpath.py b/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_addpath.py
index 6bf0078daa..f83ee2971c 100644
--- a/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_addpath.py
+++ b/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_addpath.py
@@ -70,6 +70,11 @@ def test_bgp_dynamic_capability_addpath():
}
},
},
+ "addressFamilyInfo": {
+ "ipv4Unicast": {
+ "acceptedPrefixCounter": 3,
+ }
+ },
}
}
return topotest.json_cmp(output, expected)
@@ -108,6 +113,11 @@ def test_bgp_dynamic_capability_addpath():
}
},
},
+ "addressFamilyInfo": {
+ "ipv4Unicast": {
+ "acceptedPrefixCounter": 3,
+ }
+ },
"messageStats": {
"notificationsRecv": 0,
"capabilityRecv": 1,
diff --git a/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_graceful_restart.py b/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_graceful_restart.py
index db1eb2723b..b7e2090eee 100644
--- a/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_graceful_restart.py
+++ b/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_graceful_restart.py
@@ -68,6 +68,11 @@ def test_bgp_dynamic_capability_graceful_restart():
"gracefulRestart": "advertisedAndReceived",
"longLivedGracefulRestart": "advertisedAndReceived",
},
+ "addressFamilyInfo": {
+ "ipv4Unicast": {
+ "acceptedPrefixCounter": 3,
+ }
+ },
"gracefulRestartInfo": {
"nBit": True,
"timers": {
@@ -116,6 +121,11 @@ def test_bgp_dynamic_capability_graceful_restart():
"gracefulRestart": "advertisedAndReceived",
"longLivedGracefulRestart": "advertisedAndReceived",
},
+ "addressFamilyInfo": {
+ "ipv4Unicast": {
+ "acceptedPrefixCounter": 3,
+ }
+ },
"gracefulRestartInfo": {
"nBit": True,
"timers": {
diff --git a/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_orf.py b/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_orf.py
index 49c7e554eb..f1ad74c05c 100644
--- a/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_orf.py
+++ b/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_orf.py
@@ -64,6 +64,11 @@ def test_bgp_dynamic_capability_orf():
"neighborCapabilities": {
"dynamic": "advertisedAndReceived",
},
+ "addressFamilyInfo": {
+ "ipv4Unicast": {
+ "acceptedPrefixCounter": 3,
+ }
+ },
}
}
return topotest.json_cmp(output, expected)
@@ -116,6 +121,7 @@ def test_bgp_dynamic_capability_orf():
},
"addressFamilyInfo": {
"ipv4Unicast": {
+ "acceptedPrefixCounter": 1,
"afDependentCap": {
"orfPrefixList": {
"sendMode": "advertisedAndReceived",
diff --git a/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_role.py b/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_role.py
index da45110e39..700d4c130d 100644
--- a/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_role.py
+++ b/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_role.py
@@ -66,6 +66,11 @@ def test_bgp_dynamic_capability_role():
"neighborCapabilities": {
"dynamic": "advertisedAndReceived",
},
+ "addressFamilyInfo": {
+ "ipv4Unicast": {
+ "acceptedPrefixCounter": 3,
+ }
+ },
}
}
return topotest.json_cmp(output, expected)
@@ -108,6 +113,11 @@ def test_bgp_dynamic_capability_role():
"dynamic": "advertisedAndReceived",
"role": "advertisedAndReceived",
},
+ "addressFamilyInfo": {
+ "ipv4Unicast": {
+ "acceptedPrefixCounter": 3,
+ }
+ },
"messageStats": {
"notificationsRecv": 0,
"capabilityRecv": 1,
diff --git a/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_software_version.py b/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_software_version.py
index a653da4655..11840b4c61 100644
--- a/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_software_version.py
+++ b/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_software_version.py
@@ -68,6 +68,11 @@ def test_bgp_dynamic_capability_software_version():
"receivedSoftwareVersion": None,
},
},
+ "addressFamilyInfo": {
+ "ipv4Unicast": {
+ "acceptedPrefixCounter": 3,
+ }
+ },
}
}
return topotest.json_cmp(output, expected)
@@ -129,6 +134,11 @@ def test_bgp_dynamic_capability_software_version():
"receivedSoftwareVersion": rcv,
},
},
+ "addressFamilyInfo": {
+ "ipv4Unicast": {
+ "acceptedPrefixCounter": 3,
+ }
+ },
"messageStats": {
"notificationsRecv": 0,
"capabilityRecv": 1,