Clean up deprecated usage of router-id

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

diff --git a/tests/topotests/all-protocol-startup/r1/ospf6d.conf b/tests/topotests/all-protocol-startup/r1/ospf6d.conf
index 6d870f355f927be3a5db22938dadf39f6c2a23e1..941d3016c77aecac800e9356c3a7b7f320971299 100644 (file)
--- 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 6a40f859dbada4265d2d5bc16eee9f8b4ccef479..58c9e292a93ce31aee3553adc8e4cb21755cbc1e 100644 (file)
--- 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 7448b25327f38a3ae00546e395242c2edfe85872..a4ef1469a7f1bff0e731c3c2a8fcfaddeb468bdf 100644 (file)
--- 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 e853e0e2b2d12066049d8a9f448ef39041bf5b0e..4ff53011cb2988d0274b17db4a7953ac299c088f 100644 (file)
--- 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 dcc07a4fdcd96732b948ade81c63b7b40b06bd7d..32942ea18948cacbbb2d7a916acfca79bd9359f7 100644 (file)
--- 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 c4b382171d61c02836571843a6af266a91d64cc4..ab2c0c647e83ba09ba2b68efeead81d8caecb918 100644 (file)
--- 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 bb9958d17387ac588c9193a8ff9e90800bef609a..075e815ed88f0b4f0478676fcd24965fbcbcfad8 100644 (file)
--- 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 d2dbc4a41c433cb1a91dc86b69e63d41a1d8c856..e9a07a7e283427eddd4362fab1128b997e6e5e45 100644 (file)
--- 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 6f9c30d75a73adde0700ed10ec9a804fb1cf2ff2..fa66645f5a432e93829c39b810cc6231b91663f5 100644 (file)
--- 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