Adding upstream version 8.4.4.upstream/8.4.4upstream

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

4 files changed, 105 insertions, 0 deletions

diff --git a/tests/topotests/ospf_unnumbered/r1/ospf-route.json b/tests/topotests/ospf_unnumbered/r1/ospf-route.json
new file mode 100644
index 0000000..6beb7e9
--- /dev/null
+++ b/tests/topotests/ospf_unnumbered/r1/ospf-route.json
@@ -0,0 +1 @@
+{ "10.0.1.1\/32": { "routeType": "N", "cost": 10, "area": "0.0.0.0", "nexthops": [ { "ip": " ", "directly attached to": "r1-eth0" } ] }, "10.0.20.1\/32": { "routeType": "N", "cost": 20, "area": "0.0.0.0", "nexthops": [ { "ip": "10.0.3.2", "via": "r1-eth1" } ] }, "10.0.255.2": { "routeType": "R ", "cost": 10, "area": "0.0.0.0", "routerType": "asbr", "nexthops": [ { "ip": "10.0.3.2", "via": "r1-eth1" } ] } }
diff --git a/tests/topotests/ospf_unnumbered/r1/ospfd.conf b/tests/topotests/ospf_unnumbered/r1/ospfd.conf
new file mode 100644
index 0000000..65843cb
--- /dev/null
+++ b/tests/topotests/ospf_unnumbered/r1/ospfd.conf
@@ -0,0 +1,13 @@
+!
+interface r1-eth1
+  ip ospf network point-to-point
+  ip ospf hello-interval 2
+  ip ospf dead-interval 10
+!
+router ospf
+  ospf router-id 10.0.255.1
+  redistribute kernel
+  redistribute connected
+  redistribute static
+  network 0.0.0.0/0 area 0
+!
diff --git a/tests/topotests/ospf_unnumbered/r1/v4_route.json b/tests/topotests/ospf_unnumbered/r1/v4_route.json
new file mode 100644
index 0000000..76c6396
--- /dev/null
+++ b/tests/topotests/ospf_unnumbered/r1/v4_route.json
@@ -0,0 +1,84 @@
+{
+  "10.0.1.1\/32":[
+    {
+      "prefix":"10.0.1.1\/32",
+      "protocol":"ospf",
+      "distance":110,
+      "metric":10,
+      "table":254,
+      "nexthops":[
+        {
+          "flags":9,
+          "ip":"0.0.0.0",
+          "afi":"ipv4",
+          "interfaceName":"r1-eth0",
+          "active":true,
+          "onLink":true
+        }
+      ]
+    },
+    {
+      "prefix":"10.0.1.1\/32",
+      "protocol":"connected",
+      "selected":true,
+      "destSelected":true,
+      "distance":0,
+      "metric":0,
+      "installed":true,
+      "table":254,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "directlyConnected":true,
+          "interfaceName":"r1-eth0",
+          "active":true
+        }
+      ]
+    }
+  ],
+  "10.0.3.4\/32":[
+    {
+      "prefix":"10.0.3.4\/32",
+      "protocol":"connected",
+      "selected":true,
+      "destSelected":true,
+      "distance":0,
+      "metric":0,
+      "installed":true,
+      "table":254,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "directlyConnected":true,
+          "interfaceName":"r1-eth1",
+          "active":true
+        }
+      ]
+    }
+  ],
+  "10.0.20.1\/32":[
+    {
+      "prefix":"10.0.20.1\/32",
+      "protocol":"ospf",
+      "selected":true,
+      "destSelected":true,
+      "distance":110,
+      "metric":20,
+      "installed":true,
+      "table":254,
+      "nexthops":[
+        {
+          "flags":11,
+          "fib":true,
+          "ip":"10.0.3.2",
+          "afi":"ipv4",
+          "interfaceName":"r1-eth1",
+          "active":true,
+          "onLink":true
+        }
+      ]
+    }
+  ]
+}
diff --git a/tests/topotests/ospf_unnumbered/r1/zebra.conf b/tests/topotests/ospf_unnumbered/r1/zebra.conf
new file mode 100644
index 0000000..d96d970
--- /dev/null
+++ b/tests/topotests/ospf_unnumbered/r1/zebra.conf
@@ -0,0 +1,7 @@
+!
+interface r1-eth0
+ ip address 10.0.1.1/32
+!
+interface r1-eth1
+ ip address 10.0.3.4/32
+!