Adding upstream version 8.4.4.upstream/8.4.4upstream

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

7 files changed, 491 insertions, 0 deletions

diff --git a/tests/topotests/isis_topo1/r4/isisd.conf b/tests/topotests/isis_topo1/r4/isisd.conf
new file mode 100644
index 0000000..50c876d
--- /dev/null
+++ b/tests/topotests/isis_topo1/r4/isisd.conf
@@ -0,0 +1,24 @@
+hostname r4
+! debug isis adj-packets
+! debug isis events
+! debug isis update-packets
+interface r4-eth0
+ ip router isis 1
+ isis hello-interval 2
+ ipv6 router isis 1
+ isis circuit-type level-2-only
+!
+interface r4-eth1
+ ip router isis 1
+ ipv6 router isis 1
+ isis circuit-type level-1
+!
+router isis 1
+ lsp-gen-interval 2
+ net 10.0000.0000.0000.0000.0000.0000.0000.0000.0004.00
+ metric-style wide
+ redistribute ipv4 connected level-1
+ redistribute ipv4 connected level-2
+ redistribute ipv6 connected level-1
+ redistribute ipv6 connected level-2
+!
diff --git a/tests/topotests/isis_topo1/r4/r4_route.json b/tests/topotests/isis_topo1/r4/r4_route.json
new file mode 100644
index 0000000..79361af
--- /dev/null
+++ b/tests/topotests/isis_topo1/r4/r4_route.json
@@ -0,0 +1,65 @@
+{
+  "10.0.11.0/24": [
+    {
+      "nexthops": [
+        {
+          "active": true,
+          "directlyConnected": true,
+          "fib": true,
+          "interfaceName": "r4-eth1"
+        }
+      ],
+      "prefix": "10.0.11.0/24",
+      "protocol": "connected",
+      "selected": true
+    }
+  ],
+  "10.0.21.0/24": [
+    {
+      "nexthops": [
+        {
+          "active": true,
+          "directlyConnected": true,
+          "fib": true,
+          "interfaceName": "r4-eth0"
+        }
+      ],
+      "prefix": "10.0.21.0/24",
+      "protocol": "connected",
+      "selected": true
+    }
+  ],
+  "10.254.0.2/32": [
+    {
+      "distance": 115,
+      "metric": 10,
+      "nexthops": [
+        {
+          "active": true,
+          "afi": "ipv4",
+          "fib": true,
+          "interfaceName": "r4-eth0",
+          "ip": "10.0.21.2"
+        }
+      ],
+      "prefix": "10.254.0.2/32",
+      "protocol": "isis",
+      "selected": true
+    }
+  ],
+  "10.254.0.4/32": [
+    {
+      "nexthops": [
+        {
+          "active": true,
+          "directlyConnected": true,
+          "fib": true,
+          "interfaceName": "lo"
+        }
+      ],
+      "prefix": "10.254.0.4/32",
+      "protocol": "connected",
+      "selected": true
+    }
+  ]
+}
diff --git a/tests/topotests/isis_topo1/r4/r4_route6.json b/tests/topotests/isis_topo1/r4/r4_route6.json
new file mode 100644
index 0000000..c0ace9a
--- /dev/null
+++ b/tests/topotests/isis_topo1/r4/r4_route6.json
@@ -0,0 +1,131 @@
+{
+  "2001:db8:1:1::/64": [
+    {
+      "distance": 115,
+      "metric": 20,
+      "nexthops": [
+        {
+          "active": true,
+          "afi": "ipv6",
+          "fib": true,
+          "interfaceName": "r4-eth1"
+        }
+      ],
+      "prefix": "2001:db8:1:1::/64",
+      "protocol": "isis",
+      "selected": true
+    }
+  ],
+  "2001:db8:1:2::/64": [
+    {
+      "nexthops": [
+        {
+          "active": true,
+          "directlyConnected": true,
+          "fib": true,
+          "interfaceName": "r4-eth0"
+        }
+      ],
+      "prefix": "2001:db8:1:2::/64",
+      "protocol": "connected",
+      "selected": true
+    }
+  ],
+  "2001:db8:2:1::/64": [
+    {
+      "distance": 115,
+      "metric": 10,
+      "nexthops": [
+        {
+          "active": true,
+          "afi": "ipv6",
+          "fib": true,
+          "interfaceName": "r4-eth1"
+        }
+      ],
+      "prefix": "2001:db8:2:1::/64",
+      "protocol": "isis",
+      "selected": true
+    }
+  ],
+  "2001:db8:2:2::/64": [
+    {
+      "nexthops": [
+        {
+          "active": true,
+          "directlyConnected": true,
+          "fib": true,
+          "interfaceName": "r4-eth1"
+        }
+      ],
+      "prefix": "2001:db8:2:2::/64",
+      "protocol": "connected",
+      "selected": true
+    }
+  ],
+  "2001:db8:f::2/128": [
+    {
+      "distance": 115,
+      "metric": 10,
+      "nexthops": [
+        {
+          "active": true,
+          "afi": "ipv6",
+          "fib": true,
+          "interfaceName": "r4-eth0"
+        }
+      ],
+      "prefix": "2001:db8:f::2/128",
+      "protocol": "isis",
+      "selected": true
+    }
+  ],
+  "2001:db8:f::3/128": [
+    {
+      "distance": 115,
+      "metric": 20,
+      "nexthops": [
+        {
+          "active": true,
+          "afi": "ipv6",
+          "fib": true,
+          "interfaceName": "r4-eth1"
+        }
+      ],
+      "prefix": "2001:db8:f::3/128",
+      "protocol": "isis",
+      "selected": true
+    }
+  ],
+  "2001:db8:f::4/128": [
+    {
+      "nexthops": [
+        {
+          "active": true,
+          "directlyConnected": true,
+          "fib": true,
+          "interfaceName": "lo"
+        }
+      ],
+      "prefix": "2001:db8:f::4/128",
+      "protocol": "connected",
+      "selected": true
+    }
+  ],
+  "2001:db8:f::5/128": [
+    {
+      "distance": 115,
+      "metric": 10,
+      "nexthops": [
+        {
+          "active": true,
+          "afi": "ipv6",
+          "fib": true,
+          "interfaceName": "r4-eth1"
+        }
+      ],
+      "prefix": "2001:db8:f::5/128",
+      "protocol": "isis",
+      "selected": true
+    }
+  ]}
diff --git a/tests/topotests/isis_topo1/r4/r4_route6_linux.json b/tests/topotests/isis_topo1/r4/r4_route6_linux.json
new file mode 100644
index 0000000..32ea366
--- /dev/null
+++ b/tests/topotests/isis_topo1/r4/r4_route6_linux.json
@@ -0,0 +1,32 @@
+{
+  "2001:db8:1:1::/64": {
+    "dev": "r4-eth1",
+    "metric": "20",
+    "pref": "medium",
+    "proto": "187"
+  },
+  "2001:db8:2:1::/64": {
+    "dev": "r4-eth1",
+    "metric": "20",
+    "pref": "medium",
+    "proto": "187"
+  },
+  "2001:db8:f::2": {
+    "dev": "r4-eth0",
+    "metric": "20",
+    "pref": "medium",
+    "proto": "187"
+  },
+  "2001:db8:f::3": {
+    "dev": "r4-eth1",
+    "metric": "20",
+    "pref": "medium",
+    "proto": "187"
+  },
+  "2001:db8:f::5": {
+    "dev": "r4-eth1",
+    "metric": "20",
+    "pref": "medium",
+    "proto": "187"
+  }
+}
diff --git a/tests/topotests/isis_topo1/r4/r4_route_linux.json b/tests/topotests/isis_topo1/r4/r4_route_linux.json
new file mode 100644
index 0000000..5d6553f
--- /dev/null
+++ b/tests/topotests/isis_topo1/r4/r4_route_linux.json
@@ -0,0 +1,32 @@
+{
+  "10.0.10.0/24": {
+    "dev": "r4-eth1",
+    "metric": "20",
+    "proto": "187",
+    "via": "10.0.11.1"
+  },
+  "10.0.20.0/24": {
+    "dev": "r4-eth1",
+    "metric": "20",
+    "proto": "187",
+    "via": "10.0.11.1"
+  },
+  "10.254.0.2": {
+    "dev": "r4-eth0",
+    "metric": "20",
+    "proto": "187",
+    "via": "10.0.21.2"
+  },
+  "10.254.0.3": {
+    "dev": "r4-eth1",
+    "metric": "20",
+    "proto": "187",
+    "via": "10.0.11.1"
+  },
+  "10.254.0.5": {
+    "dev": "r4-eth1",
+    "metric": "20",
+    "proto": "187",
+    "via": "10.0.11.1"
+  }
+}
diff --git a/tests/topotests/isis_topo1/r4/r4_topology.json b/tests/topotests/isis_topo1/r4/r4_topology.json
new file mode 100644
index 0000000..e7d7841
--- /dev/null
+++ b/tests/topotests/isis_topo1/r4/r4_topology.json
@@ -0,0 +1,194 @@
+{
+  "1": {
+    "level-1": {
+      "ipv4": [
+        {
+          "vertex": "r4"
+        },
+        {
+          "metric": "0",
+          "parent": "r4(4)",
+          "type": "IP internal",
+          "vertex": "10.0.11.0/24"
+        },
+        {
+          "interface": "r4-eth1",
+          "metric": "10",
+          "next-hop": "r5",
+          "parent": "r4(4)",
+          "type": "TE-IS",
+          "vertex": "r5"
+        },
+        {
+          "interface": "r4-eth1",
+          "metric": "10",
+          "next-hop": "r5",
+          "parent": "r5(4)",
+          "type": "IP TE",
+          "vertex": "10.0.10.0/24"
+        },
+        {
+          "interface": "r4-eth1",
+          "metric": "10",
+          "next-hop": "r5",
+          "parent": "r5(4)",
+          "type": "IP TE",
+          "vertex": "10.0.11.0/24"
+        },
+        {
+          "interface": "r4-eth1",
+          "metric": "10",
+          "next-hop": "r5",
+          "parent": "r5(4)",
+          "type": "IP TE",
+          "vertex": "10.254.0.5/32"
+        },
+        {
+          "interface": "r4-eth1",
+          "metric": "20",
+          "next-hop": "r5",
+          "type": "TE-IS",
+          "vertex": "r3"
+        },
+        {
+          "interface": "r4-eth1",
+          "metric": "20",
+          "next-hop": "r5",
+          "parent": "r3(4)",
+          "type": "IP TE",
+          "vertex": "10.0.20.0/24"
+        },
+        {
+          "interface": "r4-eth1",
+          "metric": "20",
+          "next-hop": "r5",
+          "parent": "r3(4)",
+          "type": "IP TE",
+          "vertex": "10.254.0.3/32"
+        }
+      ],
+      "ipv6": [
+        {
+          "vertex": "r4"
+        },
+        {
+          "metric": "0",
+          "parent": "r4(4)",
+          "type": "IP6 internal",
+          "vertex": "2001:db8:2:2::/64"
+        },
+        {
+          "interface": "r4-eth1",
+          "metric": "10",
+          "next-hop": "r5",
+          "parent": "r4(4)",
+          "type": "TE-IS",
+          "vertex": "r5"
+        },
+        {
+          "metric": "10",
+          "interface": "r4-eth1",
+          "next-hop": "r5",
+          "parent": "r5(4)",
+          "type": "IP6 internal",
+          "vertex": "2001:db8:2:1::/64"
+        },
+        {
+          "metric": "10",
+          "interface": "r4-eth1",
+          "next-hop": "r5",
+          "parent": "r5(4)",
+          "type": "IP6 internal",
+          "vertex": "2001:db8:f::5/128"
+        },
+        {
+          "interface": "r4-eth1",
+          "metric": "20",
+          "next-hop": "r5",
+          "type": "TE-IS",
+          "vertex": "r3"
+        },
+        {
+          "metric": "20",
+          "interface": "r4-eth1",
+          "next-hop": "r5",
+          "parent": "r3(4)",
+          "type": "IP6 internal",
+          "vertex": "2001:db8:1:1::/64"
+        },
+        {
+          "metric": "20",
+          "interface": "r4-eth1",
+          "next-hop": "r5",
+          "parent": "r3(4)",
+          "type": "IP6 internal",
+          "vertex": "2001:db8:f::3/128"
+        }
+      ]
+    },
+    "level-2": {
+      "ipv4": [
+        {
+          "vertex": "r4"
+        },
+        {
+          "metric": "0",
+          "parent": "r4(4)",
+          "type": "IP internal",
+          "vertex": "10.0.21.0/24"
+        },
+        {
+          "interface": "r4-eth0",
+          "metric": "10",
+          "next-hop": "r2",
+          "parent": "r4(4)",
+          "type": "TE-IS",
+          "vertex": "r2"
+        },
+        {
+          "interface": "r4-eth0",
+          "metric": "10",
+          "next-hop": "r2",
+          "parent": "r2(4)",
+          "type": "IP TE",
+          "vertex": "10.0.21.0/24"
+        },
+        {
+          "interface": "r4-eth0",
+          "metric": "10",
+          "next-hop": "r2",
+          "parent": "r2(4)",
+          "type": "IP TE",
+          "vertex": "10.254.0.2/32"
+        }
+      ],
+      "ipv6": [
+        {
+          "vertex": "r4"
+        },
+        {
+          "metric": "0",
+          "parent": "r4(4)",
+          "type": "IP6 internal",
+          "vertex": "2001:db8:1:2::/64"
+        },
+        {
+          "interface": "r4-eth0",
+          "metric": "10",
+          "next-hop": "r2",
+          "parent": "r4(4)",
+          "type": "TE-IS",
+          "vertex": "r2"
+        },
+        {
+          "metric": "10",
+          "interface": "r4-eth0",
+          "next-hop": "r2",
+          "parent": "r2(4)",
+          "type": "IP6 internal",
+          "vertex": "2001:db8:f::2/128"
+        }
+      ]
+    }
+  }
+}
diff --git a/tests/topotests/isis_topo1/r4/zebra.conf b/tests/topotests/isis_topo1/r4/zebra.conf
new file mode 100644
index 0000000..5ca9a3d
--- /dev/null
+++ b/tests/topotests/isis_topo1/r4/zebra.conf
@@ -0,0 +1,13 @@
+hostname r4
+interface r4-eth0
+ ip address 10.0.21.1/24
+ ipv6 address 2001:db8:1:2::1/64
+!
+interface r4-eth1
+ ip address 10.0.11.2/24
+ ipv6 address 2001:db8:2:2::2/64
+!
+interface lo
+ ip address 10.254.0.4/32
+ ipv6 address 2001:db8:F::4/128
+!