Adding upstream version 8.4.4.upstream/8.4.4upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

8 files changed, 107 insertions, 0 deletions

diff --git a/tests/topotests/ospf_topo1/r4/ospf6d.conf b/tests/topotests/ospf_topo1/r4/ospf6d.conf
new file mode 100644
index 0000000..f9bde0e
--- /dev/null
+++ b/tests/topotests/ospf_topo1/r4/ospf6d.conf
@@ -0,0 +1,17 @@
+!
+router ospf6
+ ospf6 router-id 10.0.255.4
+ redistribute kernel
+ redistribute connected
+ redistribute static
+ interface r4-eth0 area 0.0.0.1
+ interface r4-eth1 area 0.0.0.1
+!
+int r4-eth0
+ ipv6 ospf6 hello-interval 2
+ ipv6 ospf6 dead-interval 10
+!
+int r4-eth1
+ ipv6 ospf6 hello-interval 2
+ ipv6 ospf6 dead-interval 10
+!
diff --git a/tests/topotests/ospf_topo1/r4/ospf6route.txt b/tests/topotests/ospf_topo1/r4/ospf6route.txt
new file mode 100644
index 0000000..3a4f5ef
--- /dev/null
+++ b/tests/topotests/ospf_topo1/r4/ospf6route.txt
@@ -0,0 +1,13 @@
+*N IE 2001:db8:1::/64                fe80::987b:baff:fe8a:c864 r4-eth0 00:04:25
+ N E2 2001:db8:1::/64                fe80::987b:baff:fe8a:c864 r4-eth0 00:04:25
+*N IE 2001:db8:2::/64                fe80::987b:baff:fe8a:c864 r4-eth0 00:04:25
+ N E2 2001:db8:2::/64                fe80::987b:baff:fe8a:c864 r4-eth0 00:04:25
+*N IE 2001:db8:3::/64                fe80::987b:baff:fe8a:c864 r4-eth0 00:04:25
+ N E2 2001:db8:3::/64                fe80::987b:baff:fe8a:c864 r4-eth0 00:04:25
+ N E2 2001:db8:3::/64                fe80::987b:baff:fe8a:c864 r4-eth0 00:04:25
+ N E2 2001:db8:3::/64                fe80::987b:baff:fe8a:c864 r4-eth0 00:04:25
+*N IE 2001:db8:100::/64              fe80::987b:baff:fe8a:c864 r4-eth0 00:04:25
+ N E2 2001:db8:100::/64              fe80::987b:baff:fe8a:c864 r4-eth0 00:04:25
+*N IA 2001:db8:200::/64              ::                        r4-eth0 00:04:30
+ N E2 2001:db8:200::/64              fe80::987b:baff:fe8a:c864 r4-eth0 00:04:25
+*N IA 2001:db8:300::/64              ::                        r4-eth1 00:04:30
diff --git a/tests/topotests/ospf_topo1/r4/ospf6route_down.txt b/tests/topotests/ospf_topo1/r4/ospf6route_down.txt
new file mode 100644
index 0000000..165f8db
--- /dev/null
+++ b/tests/topotests/ospf_topo1/r4/ospf6route_down.txt
@@ -0,0 +1,5 @@
+*N IE 2001:db8:100::/64              fe80::b44b:a1ff:fe48:3d69 r4-eth0 00:01:45
+ N E2 2001:db8:100::/64              fe80::b44b:a1ff:fe48:3d69 r4-eth0 00:01:45
+*N IA 2001:db8:200::/64              ::                        r4-eth0 00:01:50
+ N E2 2001:db8:200::/64              fe80::b44b:a1ff:fe48:3d69 r4-eth0 00:01:45
+*N IA 2001:db8:300::/64              ::                        r4-eth1 00:01:50
diff --git a/tests/topotests/ospf_topo1/r4/ospf6route_ecmp.txt b/tests/topotests/ospf_topo1/r4/ospf6route_ecmp.txt
new file mode 100644
index 0000000..d0d72a8
--- /dev/null
+++ b/tests/topotests/ospf_topo1/r4/ospf6route_ecmp.txt
@@ -0,0 +1,12 @@
+*N IE 2001:db8:1::/64                fe80::78fe:fcff:fe51:9afc r4-eth0 00:09:13
+ N E2 2001:db8:1::/64                fe80::78fe:fcff:fe51:9afc r4-eth0 00:09:13
+*N IE 2001:db8:2::/64                fe80::78fe:fcff:fe51:9afc r4-eth0 00:09:13
+ N E2 2001:db8:2::/64                fe80::78fe:fcff:fe51:9afc r4-eth0 00:09:13
+*N IE 2001:db8:3::/64                fe80::78fe:fcff:fe51:9afc r4-eth0 00:09:13
+ N E2 2001:db8:3::/64                fe80::78fe:fcff:fe51:9afc r4-eth0 00:09:13
+ N E2 2001:db8:3::/64                fe80::78fe:fcff:fe51:9afc r4-eth0 00:09:13
+*N IE 2001:db8:100::/64              fe80::78fe:fcff:fe51:9afc r4-eth0 00:09:13
+ N E2 2001:db8:100::/64              fe80::78fe:fcff:fe51:9afc r4-eth0 00:09:13
+*N IA 2001:db8:200::/64              ::                        r4-eth0 00:09:17
+ N E2 2001:db8:200::/64              fe80::78fe:fcff:fe51:9afc r4-eth0 00:09:13
+*N IA 2001:db8:300::/64              ::                        r4-eth1 00:09:18
diff --git a/tests/topotests/ospf_topo1/r4/ospfd.conf b/tests/topotests/ospf_topo1/r4/ospfd.conf
new file mode 100644
index 0000000..52d2932
--- /dev/null
+++ b/tests/topotests/ospf_topo1/r4/ospfd.conf
@@ -0,0 +1,13 @@
+!
+router ospf
+  ospf router-id 10.0.255.4
+  redistribute kernel
+  redistribute connected
+  redistribute static
+  network 172.16.0.0/24 area 1
+  network 172.16.1.0/24 area 1
+!
+int r4-eth0
+  ip ospf hello-interval 2
+  ip ospf dead-interval 10
+!
diff --git a/tests/topotests/ospf_topo1/r4/ospfroute.txt b/tests/topotests/ospf_topo1/r4/ospfroute.txt
new file mode 100644
index 0000000..b582ef0
--- /dev/null
+++ b/tests/topotests/ospf_topo1/r4/ospfroute.txt
@@ -0,0 +1,23 @@
+============ OSPF network routing table ============
+N IA 10.0.1.0/24           [30] area: 0.0.0.1
+                           via 172.16.0.2, r4-eth0
+N IA 10.0.2.0/24           [30] area: 0.0.0.1
+                           via 172.16.0.2, r4-eth0
+N IA 10.0.3.0/24           [20] area: 0.0.0.1
+                           via 172.16.0.2, r4-eth0
+N IA 10.0.10.0/24          [20] area: 0.0.0.1
+                           via 172.16.0.2, r4-eth0
+N    172.16.0.0/24         [10] area: 0.0.0.1
+                           directly attached to r4-eth0
+N    172.16.1.0/24         [10] area: 0.0.0.1
+                           directly attached to r4-eth1
+
+============ OSPF router routing table =============
+R    10.0.255.1         IA [20] area: 0.0.0.1, ASBR
+                           via 172.16.0.2, r4-eth0
+R    10.0.255.2         IA [20] area: 0.0.0.1, ASBR
+                           via 172.16.0.2, r4-eth0
+R    10.0.255.3            [10] area: 0.0.0.1, ABR, ASBR
+                           via 172.16.0.2, r4-eth0
+
+============ OSPF external routing table ===========
diff --git a/tests/topotests/ospf_topo1/r4/ospfroute_down.txt b/tests/topotests/ospf_topo1/r4/ospfroute_down.txt
new file mode 100644
index 0000000..b0bd0ee
--- /dev/null
+++ b/tests/topotests/ospf_topo1/r4/ospfroute_down.txt
@@ -0,0 +1,13 @@
+============ OSPF network routing table ============
+N IA 10.0.10.0/24          [20] area: 0.0.0.1
+                           via 172.16.0.2, r4-eth0
+N    172.16.0.0/24         [10] area: 0.0.0.1
+                           directly attached to r4-eth0
+N    172.16.1.0/24         [10] area: 0.0.0.1
+                           directly attached to r4-eth1
+
+============ OSPF router routing table =============
+R    10.0.255.3            [10] area: 0.0.0.1, ABR, ASBR
+                           via 172.16.0.2, r4-eth0
+
+============ OSPF external routing table ===========
diff --git a/tests/topotests/ospf_topo1/r4/zebra.conf b/tests/topotests/ospf_topo1/r4/zebra.conf
new file mode 100644
index 0000000..39ecbb2
--- /dev/null
+++ b/tests/topotests/ospf_topo1/r4/zebra.conf
@@ -0,0 +1,11 @@
+!
+interface r4-eth0
+ ip address 172.16.0.1/24
+ ipv6 address 2001:db8:200::1/64
+!
+interface r4-eth1
+ ip address 172.16.1.100/24
+ ipv6 address 2001:db8:300::100/64
+!
+ip forwarding
+!