summaryrefslogtreecommitdiffstats
path: root/tests/topotests/ldp_oc_topo1
diff options
context:
space:
mode:
authorMark Stapp <mjs@labn.net>2023-03-29 22:00:20 +0200
committerMark Stapp <mjs@labn.net>2023-04-07 22:17:59 +0200
commitc42ac5f64b0e03099b147d5d129a65d067dd0164 (patch)
tree1f2d700711802b77231fabd4e141472006857d79 /tests/topotests/ldp_oc_topo1
parentospfd: remove deprecated json attrs for neighbor show (diff)
downloadfrr-c42ac5f64b0e03099b147d5d129a65d067dd0164.tar.xz
frr-c42ac5f64b0e03099b147d5d129a65d067dd0164.zip
tests: replace deprecated ospf json keys
Replace many deprecated json keys in topotests after removing those keys from ospfd. Signed-off-by: Mark Stapp <mjs@labn.net>
Diffstat (limited to 'tests/topotests/ldp_oc_topo1')
-rw-r--r--tests/topotests/ldp_oc_topo1/r1/show_ip_ospf_neighbor.json4
-rw-r--r--tests/topotests/ldp_oc_topo1/r2/show_ip_ospf_neighbor.json12
-rw-r--r--tests/topotests/ldp_oc_topo1/r3/show_ip_ospf_neighbor.json8
-rw-r--r--tests/topotests/ldp_oc_topo1/r4/show_ip_ospf_neighbor.json8
4 files changed, 16 insertions, 16 deletions
diff --git a/tests/topotests/ldp_oc_topo1/r1/show_ip_ospf_neighbor.json b/tests/topotests/ldp_oc_topo1/r1/show_ip_ospf_neighbor.json
index 63281e9be..c1c231de3 100644
--- a/tests/topotests/ldp_oc_topo1/r1/show_ip_ospf_neighbor.json
+++ b/tests/topotests/ldp_oc_topo1/r1/show_ip_ospf_neighbor.json
@@ -2,9 +2,9 @@
"neighbors":{
"2.2.2.2":[
{
- "priority":2,
+ "nbrPriority":2,
"converged":"Full",
- "address":"10.0.1.2",
+ "ifaceAddress":"10.0.1.2",
"ifaceName":"r1-eth0:10.0.1.1"
}
]
diff --git a/tests/topotests/ldp_oc_topo1/r2/show_ip_ospf_neighbor.json b/tests/topotests/ldp_oc_topo1/r2/show_ip_ospf_neighbor.json
index f361d605c..ee69af5e2 100644
--- a/tests/topotests/ldp_oc_topo1/r2/show_ip_ospf_neighbor.json
+++ b/tests/topotests/ldp_oc_topo1/r2/show_ip_ospf_neighbor.json
@@ -2,25 +2,25 @@
"neighbors":{
"1.1.1.1":[
{
- "priority":1,
+ "nbrPriority":1,
"converged":"Full",
- "address":"10.0.1.1",
+ "ifaceAddress":"10.0.1.1",
"ifaceName":"r2-eth0:10.0.1.2"
}
],
"3.3.3.3":[
{
- "priority":2,
+ "nbrPriority":2,
"converged":"Full",
- "address":"10.0.2.3",
+ "ifaceAddress":"10.0.2.3",
"ifaceName":"r2-eth1:10.0.2.2"
}
],
"4.4.4.4":[
{
- "priority":3,
+ "nbrPriority":3,
"converged":"Full",
- "address":"10.0.2.4",
+ "ifaceAddress":"10.0.2.4",
"ifaceName":"r2-eth1:10.0.2.2"
}
]
diff --git a/tests/topotests/ldp_oc_topo1/r3/show_ip_ospf_neighbor.json b/tests/topotests/ldp_oc_topo1/r3/show_ip_ospf_neighbor.json
index 38794357f..3f76542e9 100644
--- a/tests/topotests/ldp_oc_topo1/r3/show_ip_ospf_neighbor.json
+++ b/tests/topotests/ldp_oc_topo1/r3/show_ip_ospf_neighbor.json
@@ -2,17 +2,17 @@
"neighbors":{
"2.2.2.2":[
{
- "priority":1,
+ "nbrPriority":1,
"converged":"Full",
- "address":"10.0.2.2",
+ "ifaceAddress":"10.0.2.2",
"ifaceName":"r3-eth0:10.0.2.3"
}
],
"4.4.4.4":[
{
- "priority":3,
+ "nbrPriority":3,
"converged":"Full",
- "address":"10.0.2.4",
+ "ifaceAddress":"10.0.2.4",
"ifaceName":"r3-eth0:10.0.2.3"
}
]
diff --git a/tests/topotests/ldp_oc_topo1/r4/show_ip_ospf_neighbor.json b/tests/topotests/ldp_oc_topo1/r4/show_ip_ospf_neighbor.json
index fccca693b..5395cd25c 100644
--- a/tests/topotests/ldp_oc_topo1/r4/show_ip_ospf_neighbor.json
+++ b/tests/topotests/ldp_oc_topo1/r4/show_ip_ospf_neighbor.json
@@ -3,17 +3,17 @@
"neighbors":{
"2.2.2.2":[
{
- "priority":1,
+ "nbrPriority":1,
"converged":"Full",
- "address":"10.0.2.2",
+ "ifaceAddress":"10.0.2.2",
"ifaceName":"r4-eth0:10.0.2.4"
}
],
"3.3.3.3":[
{
- "priority":2,
+ "nbrPriority":2,
"converged":"Full",
- "address":"10.0.2.3",
+ "ifaceAddress":"10.0.2.3",
"ifaceName":"r4-eth0:10.0.2.4"
}
]