Adding upstream version 8.4.4.upstream/8.4.4upstream

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

8 files changed, 250 insertions, 0 deletions

diff --git a/tests/topotests/bfd_topo2/r2/bfdd.conf b/tests/topotests/bfd_topo2/r2/bfdd.conf
new file mode 100644
index 0000000..ee7144d
--- /dev/null
+++ b/tests/topotests/bfd_topo2/r2/bfdd.conf
@@ -0,0 +1,5 @@
+!
+! debug bfd network
+! debug bfd peer
+! debug bfd zebra
+!
diff --git a/tests/topotests/bfd_topo2/r2/bgpd.conf b/tests/topotests/bfd_topo2/r2/bgpd.conf
new file mode 100644
index 0000000..55d4856
--- /dev/null
+++ b/tests/topotests/bfd_topo2/r2/bgpd.conf
@@ -0,0 +1,18 @@
+router bgp 102
+ bgp router-id 10.254.254.2
+ no bgp ebgp-requires-policy
+ neighbor r2g peer-group
+ neighbor r2g remote-as external
+ neighbor r2g bfd
+ neighbor r2-eth0 interface peer-group r2g
+ neighbor r2-eth0 timers 3 10
+ !
+ address-family ipv4 unicast
+  redistribute connected
+ exit-address-family
+ !
+ address-family ipv6 unicast
+  redistribute connected
+  neighbor r2g activate
+ exit-address-family
+!
diff --git a/tests/topotests/bfd_topo2/r2/ipv4_routes.json b/tests/topotests/bfd_topo2/r2/ipv4_routes.json
new file mode 100644
index 0000000..3d49b17
--- /dev/null
+++ b/tests/topotests/bfd_topo2/r2/ipv4_routes.json
@@ -0,0 +1,92 @@
+{
+  "10.0.3.0/24": [
+    {
+      "distance": 110,
+      "protocol": "ospf",
+      "metric": 10,
+      "prefix": "10.0.3.0/24",
+      "nexthops": [
+        {
+          "active": true,
+          "directlyConnected": true,
+          "interfaceName": "r2-eth1"
+        }
+      ]
+    },
+    {
+      "distance": 0,
+      "protocol": "connected",
+      "metric": 0,
+      "selected": true,
+      "installed": true,
+      "prefix": "10.0.3.0/24",
+      "nexthops": [
+        {
+          "directlyConnected": true,
+          "interfaceName": "r2-eth1",
+          "fib": true,
+          "flags": 3,
+          "active": true
+        }
+      ]
+    }
+  ],
+  "10.254.254.3/32": [
+    {
+      "distance": 110,
+      "protocol": "ospf",
+      "metric": 20,
+      "selected": true,
+      "installed": true,
+      "prefix": "10.254.254.3/32",
+      "nexthops": [
+        {
+          "interfaceName": "r2-eth1",
+          "ip": "10.0.3.1",
+          "fib": true,
+          "flags": 3,
+          "active": true,
+          "afi": "ipv4"
+        }
+      ]
+    }
+  ],
+  "10.254.254.2/32": [
+    {
+      "distance": 0,
+      "protocol": "connected",
+      "metric": 0,
+      "selected": true,
+      "installed": true,
+      "prefix": "10.254.254.2/32",
+      "nexthops": [
+        {
+          "directlyConnected": true,
+          "interfaceName": "lo",
+          "fib": true,
+          "flags": 3,
+          "active": true
+        }
+      ]
+    }
+  ],
+  "10.254.254.1/32": [
+    {
+      "distance": 20,
+      "protocol": "bgp",
+      "metric": 0,
+      "selected": true,
+      "installed": true,
+      "prefix": "10.254.254.1/32",
+      "nexthops": [
+        {
+          "interfaceName": "r2-eth0",
+          "fib": true,
+          "flags": 3,
+          "active": true,
+          "afi": "ipv6"
+        }
+      ]
+    }
+  ]
+}
diff --git a/tests/topotests/bfd_topo2/r2/ipv6_routes.json b/tests/topotests/bfd_topo2/r2/ipv6_routes.json
new file mode 100644
index 0000000..4f3c74c
--- /dev/null
+++ b/tests/topotests/bfd_topo2/r2/ipv6_routes.json
@@ -0,0 +1,53 @@
+{
+  "2001:db8:4::/64": [
+    {
+      "distance": 110,
+      "protocol": "ospf6",
+      "metric": 10,
+      "prefix": "2001:db8:4::/64",
+      "nexthops": [
+        {
+          "active": true,
+          "directlyConnected": true,
+          "interfaceName": "r2-eth2"
+        }
+      ]
+    },
+    {
+      "distance": 0,
+      "protocol": "connected",
+      "metric": 0,
+      "selected": true,
+      "installed": true,
+      "prefix": "2001:db8:4::/64",
+      "nexthops": [
+        {
+          "directlyConnected": true,
+          "interfaceName": "r2-eth2",
+          "fib": true,
+          "flags": 3,
+          "active": true
+        }
+      ]
+    }
+  ],
+  "2001:db8:1::/64": [
+    {
+      "distance": 0,
+      "protocol": "connected",
+      "metric": 0,
+      "selected": true,
+      "installed": true,
+      "prefix": "2001:db8:1::/64",
+      "nexthops": [
+        {
+          "directlyConnected": true,
+          "interfaceName": "r2-eth0",
+          "fib": true,
+          "flags": 3,
+          "active": true
+        }
+      ]
+    }
+  ]
+}
diff --git a/tests/topotests/bfd_topo2/r2/ospf6d.conf b/tests/topotests/bfd_topo2/r2/ospf6d.conf
new file mode 100644
index 0000000..524e2c9
--- /dev/null
+++ b/tests/topotests/bfd_topo2/r2/ospf6d.conf
@@ -0,0 +1,11 @@
+interface r2-eth2
+ ipv6 ospf6 area 0.0.0.1
+ ipv6 ospf6 bfd
+ ipv6 ospf6 hello-interval 2
+ ipv6 ospf6 dead-interval 10
+!
+router ospf6
+ ospf6 router-id 10.254.254.2
+ redistribute connected
+ redistribute bgp
+!
diff --git a/tests/topotests/bfd_topo2/r2/ospfd.conf b/tests/topotests/bfd_topo2/r2/ospfd.conf
new file mode 100644
index 0000000..c786f1f
--- /dev/null
+++ b/tests/topotests/bfd_topo2/r2/ospfd.conf
@@ -0,0 +1,11 @@
+interface r2-eth1
+ ip ospf area 0.0.0.1
+ ip ospf hello-interval 2
+ ip ospf dead-interval 10
+ ip ospf bfd
+!
+router ospf
+ ospf router-id 10.254.254.2
+ redistribute connected
+ redistribute bgp
+!
diff --git a/tests/topotests/bfd_topo2/r2/peers.json b/tests/topotests/bfd_topo2/r2/peers.json
new file mode 100644
index 0000000..ec2135c
--- /dev/null
+++ b/tests/topotests/bfd_topo2/r2/peers.json
@@ -0,0 +1,45 @@
+[
+  {
+    "status": "up",
+    "transmit-interval": 300,
+    "remote-receive-interval": 300,
+    "echo-receive-interval": 50,
+    "echo-transmit-interval": 0,
+    "diagnostic": "ok",
+    "multihop": false,
+    "interface": "r2-eth0",
+    "remote-transmit-interval": 300,
+    "receive-interval": 300,
+    "remote-echo-receive-interval": 50,
+    "remote-diagnostic": "ok"
+  },
+  {
+    "status": "up",
+    "transmit-interval": 300,
+    "remote-receive-interval": 300,
+    "echo-receive-interval": 50,
+    "echo-transmit-interval": 0,
+    "diagnostic": "ok",
+    "multihop": false,
+    "interface": "r2-eth2",
+    "remote-transmit-interval": 300,
+    "receive-interval": 300,
+    "remote-echo-receive-interval": 50,
+    "remote-diagnostic": "ok"
+  },
+  {
+    "status": "up",
+    "transmit-interval": 300,
+    "remote-receive-interval": 300,
+    "echo-receive-interval": 50,
+    "echo-transmit-interval": 0,
+    "diagnostic": "ok",
+    "multihop": false,
+    "interface": "r2-eth1",
+    "remote-transmit-interval": 300,
+    "receive-interval": 300,
+    "remote-echo-receive-interval": 50,
+    "remote-diagnostic": "ok",
+    "peer": "10.0.3.1"
+  }
+]
diff --git a/tests/topotests/bfd_topo2/r2/zebra.conf b/tests/topotests/bfd_topo2/r2/zebra.conf
new file mode 100644
index 0000000..cccbf65
--- /dev/null
+++ b/tests/topotests/bfd_topo2/r2/zebra.conf
@@ -0,0 +1,15 @@
+ip forwarding
+ipv6 forwarding
+!
+interface lo
+ ip address 10.254.254.2/32
+!
+interface r2-eth0
+ ipv6 address 2001:db8:1::2/64
+!
+interface r2-eth1
+ ip address 10.0.3.2/24
+!
+interface r2-eth2
+ ipv6 address 2001:db8:4::2/64
+!