Adding upstream version 9.1.upstream/9.1

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

5 files changed, 122 insertions, 0 deletions

diff --git a/tests/topotests/nhrp_topo/r1/nhrp4_cache.json b/tests/topotests/nhrp_topo/r1/nhrp4_cache.json
new file mode 100644
index 0000000..6426a93
--- /dev/null
+++ b/tests/topotests/nhrp_topo/r1/nhrp4_cache.json
@@ -0,0 +1,29 @@
+{
+  "attr":{
+    "entriesCount":2
+  },
+  "table":[
+    {
+      "interface":"r1-gre0",
+      "type":"nhs",
+      "protocol":"10.255.255.2",
+      "nbma":"10.2.1.2",
+      "claimed_nbma":"10.2.1.2",
+      "used":false,
+      "timeout":true,
+      "auth":false,
+      "identity":""
+    },
+    {
+      "interface":"r1-gre0",
+      "type":"local",
+      "protocol":"10.255.255.1",
+      "nbma":"10.1.1.1",
+      "claimed_nbma":"10.1.1.1",
+      "used":false,
+      "timeout":false,
+      "auth":false,
+      "identity":"-"
+    }
+  ]
+}
diff --git a/tests/topotests/nhrp_topo/r1/nhrp_route4.json b/tests/topotests/nhrp_topo/r1/nhrp_route4.json
new file mode 100644
index 0000000..68b5a6e
--- /dev/null
+++ b/tests/topotests/nhrp_topo/r1/nhrp_route4.json
@@ -0,0 +1,25 @@
+{
+  "10.255.255.2\/32":[
+    {
+      "prefix":"10.255.255.2\/32",
+      "protocol":"nhrp",
+      "vrfId":0,
+      "vrfName":"default",
+      "selected":true,
+      "destSelected":true,
+      "distance":10,
+      "metric":0,
+      "installed":true,
+      "internalNextHopNum":1,
+      "internalNextHopActiveNum":1,
+      "nexthops":[
+        {
+          "fib":true,
+          "directlyConnected":true,
+          "interfaceName":"r1-gre0",
+          "active":true
+        }
+      ]
+    }
+  ]
+}
diff --git a/tests/topotests/nhrp_topo/r1/nhrpd.conf b/tests/topotests/nhrp_topo/r1/nhrpd.conf
new file mode 100644
index 0000000..e5224e4
--- /dev/null
+++ b/tests/topotests/nhrp_topo/r1/nhrpd.conf
@@ -0,0 +1,10 @@
+log stdout debugging
+! debug nhrp all
+interface r1-gre0
+ ip nhrp holdtime 500
+ ip nhrp shortcut
+ ip nhrp network-id 42
+ ip nhrp nhs dynamic nbma 10.2.1.2
+ ip nhrp registration no-unique
+ tunnel source r1-eth0
+exit
diff --git a/tests/topotests/nhrp_topo/r1/sharp_route4.json b/tests/topotests/nhrp_topo/r1/sharp_route4.json
new file mode 100644
index 0000000..4c4b8ea
--- /dev/null
+++ b/tests/topotests/nhrp_topo/r1/sharp_route4.json
@@ -0,0 +1,46 @@
+{
+  "4.4.4.1\/32":[
+    {
+      "prefix":"4.4.4.1\/32",
+      "prefixLen":32,
+      "protocol":"sharp",
+      "vrfId":0,
+      "vrfName":"default",
+      "selected":true,
+      "destSelected":true,
+      "installed":true,
+      "internalNextHopNum":1,
+      "internalNextHopActiveNum":1,
+      "nexthops":[
+        {
+          "fib":true,
+          "ip":"10.255.255.2",
+          "interfaceName":"r1-gre0",
+          "active":true
+        }
+      ]
+    }
+  ],
+  "5.5.5.1\/32":[
+    {
+      "prefix":"5.5.5.1\/32",
+      "prefixLen":32,
+      "protocol":"sharp",
+      "vrfId":0,
+      "vrfName":"default",
+      "selected":true,
+      "destSelected":true,
+      "installed":true,
+      "internalNextHopNum":1,
+      "internalNextHopActiveNum":1,
+      "nexthops":[
+        {
+          "fib":true,
+          "ip":"10.255.255.2",
+          "interfaceName":"r1-gre0",
+          "active":true
+        }
+      ]
+    }
+  ]
+}
diff --git a/tests/topotests/nhrp_topo/r1/zebra.conf b/tests/topotests/nhrp_topo/r1/zebra.conf
new file mode 100644
index 0000000..b45670f
--- /dev/null
+++ b/tests/topotests/nhrp_topo/r1/zebra.conf
@@ -0,0 +1,12 @@
+interface r1-eth0
+ ip address 10.1.1.1/24
+!
+ip route 10.2.1.0/24 10.1.1.3
+interface r1-gre0
+ ip address 10.255.255.1/32
+ no link-detect
+ ipv6 nd suppress-ra
+exit
+interface r1-eth1
+ ip address 192.168.1.1/24
+!