From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Thu, 30 Aug 2018 20:15:29 +0000 (-0400)
Subject: Clean up deprecated usage of router-id
X-Git-Tag: frr-7.1-dev~151^2~9
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=9ac2326ed0977c92fd77c9faced91e53a5f0aab9;p=mirror%2Ffrr.git

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 6d870f355f..941d3016c7 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 6a40f859db..58c9e292a9 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 7448b25327..a4ef1469a7 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 e853e0e2b2..4ff53011cb 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 dcc07a4fdc..32942ea189 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 c4b382171d..ab2c0c647e 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 bb9958d173..075e815ed8 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 d2dbc4a41c..e9a07a7e28 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 6f9c30d75a..fa66645f5a 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