Clean up deprecated usage of router-id

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>

9 files changed, 9 insertions, 9 deletions

diff --git a/tests/topotests/all-protocol-startup/r1/ospf6d.conf b/tests/topotests/all-protocol-startup/r1/ospf6d.conf
index 6d870f355..941d3016c 100644
--- a/tests/topotests/all-protocol-startup/r1/ospf6d.conf
+++ b/tests/topotests/all-protocol-startup/r1/ospf6d.conf
@@ -8,7 +8,7 @@ debug ospf6 neighbor
 interface r1-eth4
 !
 router ospf6
- router-id 192.168.0.1
+ ospf6 router-id 192.168.0.1
  log-adjacency-changes
  interface r1-eth4 area 0.0.0.0
 !
diff --git a/tests/topotests/ospf-topo1/r1/ospf6d.conf b/tests/topotests/ospf-topo1/r1/ospf6d.conf
index 6a40f859d..58c9e292a 100644
--- a/tests/topotests/ospf-topo1/r1/ospf6d.conf
+++ b/tests/topotests/ospf-topo1/r1/ospf6d.conf
@@ -1,6 +1,6 @@
 !
 router ospf6
- router-id 10.0.255.1
+ ospf6 router-id 10.0.255.1
  redistribute kernel
  redistribute connected
  redistribute static
diff --git a/tests/topotests/ospf-topo1/r2/ospf6d.conf b/tests/topotests/ospf-topo1/r2/ospf6d.conf
index 7448b2532..a4ef1469a 100644
--- a/tests/topotests/ospf-topo1/r2/ospf6d.conf
+++ b/tests/topotests/ospf-topo1/r2/ospf6d.conf
@@ -1,6 +1,6 @@
 !
 router ospf6
- router-id 10.0.255.2
+ ospf6 router-id 10.0.255.2
  redistribute kernel
  redistribute connected
  redistribute static
diff --git a/tests/topotests/ospf-topo1/r3/ospf6d.conf b/tests/topotests/ospf-topo1/r3/ospf6d.conf
index e853e0e2b..4ff53011c 100644
--- a/tests/topotests/ospf-topo1/r3/ospf6d.conf
+++ b/tests/topotests/ospf-topo1/r3/ospf6d.conf
@@ -1,6 +1,6 @@
 !
 router ospf6
- router-id 10.0.255.3
+ ospf6 router-id 10.0.255.3
  redistribute kernel
  redistribute connected
  redistribute static
diff --git a/tests/topotests/ospf-topo1/r4/ospf6d.conf b/tests/topotests/ospf-topo1/r4/ospf6d.conf
index dcc07a4fd..32942ea18 100644
--- a/tests/topotests/ospf-topo1/r4/ospf6d.conf
+++ b/tests/topotests/ospf-topo1/r4/ospf6d.conf
@@ -1,6 +1,6 @@
 !
 router ospf6
- router-id 10.0.255.4
+ ospf6 router-id 10.0.255.4
  redistribute kernel
  redistribute connected
  redistribute static
diff --git a/tests/topotests/ospf6-topo1/r1/ospf6d.conf b/tests/topotests/ospf6-topo1/r1/ospf6d.conf
index c4b382171..ab2c0c647 100644
--- a/tests/topotests/ospf6-topo1/r1/ospf6d.conf
+++ b/tests/topotests/ospf6-topo1/r1/ospf6d.conf
@@ -16,7 +16,7 @@ interface r1-sw5
  ipv6 ospf6 network broadcast
 !
 router ospf6
- router-id 10.0.0.1
+ ospf6 router-id 10.0.0.1
  log-adjacency-changes detail
  redistribute static
  interface r1-stubnet area 0.0.0.0
diff --git a/tests/topotests/ospf6-topo1/r2/ospf6d.conf b/tests/topotests/ospf6-topo1/r2/ospf6d.conf
index bb9958d17..075e815ed 100644
--- a/tests/topotests/ospf6-topo1/r2/ospf6d.conf
+++ b/tests/topotests/ospf6-topo1/r2/ospf6d.conf
@@ -16,7 +16,7 @@ interface r2-sw5
  ipv6 ospf6 network broadcast
 !
 router ospf6
- router-id 10.0.0.2
+ ospf6 router-id 10.0.0.2
  log-adjacency-changes detail
  redistribute static
  interface r2-stubnet area 0.0.0.0
diff --git a/tests/topotests/ospf6-topo1/r3/ospf6d.conf b/tests/topotests/ospf6-topo1/r3/ospf6d.conf
index d2dbc4a41..e9a07a7e2 100644
--- a/tests/topotests/ospf6-topo1/r3/ospf6d.conf
+++ b/tests/topotests/ospf6-topo1/r3/ospf6d.conf
@@ -19,7 +19,7 @@ interface r3-sw6
  ipv6 ospf6 network broadcast
 !
 router ospf6
- router-id 10.0.0.3
+ ospf6 router-id 10.0.0.3
  log-adjacency-changes detail
  redistribute static
  interface r3-stubnet area 0.0.0.0
diff --git a/tests/topotests/ospf6-topo1/r4/ospf6d.conf b/tests/topotests/ospf6-topo1/r4/ospf6d.conf
index 6f9c30d75..fa66645f5 100644
--- a/tests/topotests/ospf6-topo1/r4/ospf6d.conf
+++ b/tests/topotests/ospf6-topo1/r4/ospf6d.conf
@@ -16,7 +16,7 @@ interface r4-sw6
  ipv6 ospf6 network broadcast
 !
 router ospf6
- router-id 10.0.0.4
+ ospf6 router-id 10.0.0.4
  log-adjacency-changes detail
  redistribute static
  interface r4-stubnet area 0.0.0.1