Adding upstream version 9.1.upstream/9.1

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

7 files changed, 373 insertions, 0 deletions

diff --git a/tests/topotests/isis_topo1_vrf/r5/isisd.conf b/tests/topotests/isis_topo1_vrf/r5/isisd.conf
new file mode 100755
index 0000000..6777637
--- /dev/null
+++ b/tests/topotests/isis_topo1_vrf/r5/isisd.conf
@@ -0,0 +1,22 @@
+hostname r5
+! debug isis adj-packets
+! debug isis events
+! debug isis update-packets
+interface r5-eth0 vrf r5-cust1
+ ip router isis 1
+ ipv6 router isis 1
+ isis circuit-type level-1
+!
+interface r5-eth1 vrf r5-cust1
+ ip router isis 1
+ ipv6 router isis 1
+ isis circuit-type level-1
+!
+router isis 1 vrf r5-cust1
+ lsp-gen-interval 2
+ net 10.0000.0000.0000.0000.0000.0000.0000.0000.0005.00
+ metric-style wide
+ is-type level-1
+ redistribute ipv4 connected level-1
+ redistribute ipv6 connected level-1
+!
diff --git a/tests/topotests/isis_topo1_vrf/r5/r5_route.json b/tests/topotests/isis_topo1_vrf/r5/r5_route.json
new file mode 100644
index 0000000..a254b6f
--- /dev/null
+++ b/tests/topotests/isis_topo1_vrf/r5/r5_route.json
@@ -0,0 +1,94 @@
+{
+  "10.0.10.0/24": [
+    {
+      "distance": 115, 
+      "metric": 10, 
+      "nexthops": [
+        {
+          "afi": "ipv4", 
+          "interfaceName": "r5-eth0", 
+          "ip": "10.0.10.2" 
+        }
+      ], 
+      "prefix": "10.0.10.0/24", 
+      "protocol": "isis", 
+      "vrfName": "r5-cust1"
+    }, 
+    {
+      "nexthops": [
+        {
+          "active": true, 
+          "directlyConnected": true, 
+          "fib": true, 
+          "interfaceName": "r5-eth0"
+        }
+      ], 
+      "prefix": "10.0.10.0/24", 
+      "protocol": "connected", 
+      "selected": true, 
+      "vrfName": "r5-cust1"
+    }
+  ], 
+  "10.0.11.0/24": [
+    {
+      "nexthops": [
+        {
+          "afi": "ipv4", 
+          "interfaceName": "r5-eth1", 
+          "ip": "10.0.11.2" 
+        }
+      ], 
+      "prefix": "10.0.11.0/24", 
+      "protocol": "isis", 
+      "vrfName": "r5-cust1"
+    }, 
+    {
+      "nexthops": [
+        {
+          "active": true, 
+          "directlyConnected": true, 
+          "fib": true, 
+          "interfaceName": "r5-eth1"
+        }
+      ], 
+      "prefix": "10.0.11.0/24", 
+      "protocol": "connected", 
+      "selected": true, 
+      "vrfName": "r5-cust1"
+    }
+  ], 
+  "10.0.20.0/24": [
+    {
+      "nexthops": [
+        {
+          "active": true, 
+          "afi": "ipv4", 
+          "fib": true, 
+          "interfaceName": "r5-eth0", 
+          "ip": "10.0.10.2" 
+        }
+      ], 
+      "prefix": "10.0.20.0/24", 
+      "protocol": "isis", 
+      "selected": true, 
+      "vrfName": "r5-cust1"
+    }
+  ], 
+  "10.0.21.0/24": [
+    {
+      "nexthops": [
+        {
+          "active": true, 
+          "afi": "ipv4", 
+          "fib": true, 
+          "interfaceName": "r5-eth1", 
+          "ip": "10.0.11.2" 
+        }
+      ], 
+      "prefix": "10.0.21.0/24", 
+      "protocol": "isis", 
+      "selected": true, 
+      "vrfName": "r5-cust1"
+    }
+  ]
+}
diff --git a/tests/topotests/isis_topo1_vrf/r5/r5_route6.json b/tests/topotests/isis_topo1_vrf/r5/r5_route6.json
new file mode 100644
index 0000000..06fc78f
--- /dev/null
+++ b/tests/topotests/isis_topo1_vrf/r5/r5_route6.json
@@ -0,0 +1,70 @@
+{
+  "2001:db8:1:1::/64": [
+    {
+      "distance": 115, 
+      "metric": 10, 
+      "nexthops": [
+        {
+          "active": true, 
+          "afi": "ipv6", 
+          "fib": true, 
+          "interfaceName": "r5-eth0" 
+        }
+      ], 
+      "prefix": "2001:db8:1:1::/64", 
+      "protocol": "isis", 
+      "selected": true, 
+      "vrfName": "r5-cust1"
+    }
+  ], 
+  "2001:db8:1:2::/64": [
+    {
+      "distance": 115, 
+      "metric": 10, 
+      "nexthops": [
+        {
+          "active": true, 
+          "afi": "ipv6", 
+          "fib": true, 
+          "interfaceName": "r5-eth1" 
+        }
+      ], 
+      "prefix": "2001:db8:1:2::/64", 
+      "protocol": "isis", 
+      "selected": true, 
+      "vrfName": "r5-cust1"
+    }
+  ], 
+  "2001:db8:2:1::/64": [
+    {
+      "nexthops": [
+        {
+          "active": true, 
+          "directlyConnected": true, 
+          "fib": true, 
+          "interfaceName": "r5-eth0"
+        }
+      ], 
+      "prefix": "2001:db8:2:1::/64", 
+      "protocol": "connected", 
+      "selected": true, 
+      "vrfName": "r5-cust1"
+    }
+  ], 
+  "2001:db8:2:2::/64": [
+    {
+      "nexthops": [
+        {
+          "active": true, 
+          "directlyConnected": true, 
+          "fib": true, 
+          "interfaceName": "r5-eth1"
+        }
+      ], 
+      "prefix": "2001:db8:2:2::/64", 
+      "protocol": "connected", 
+      "selected": true, 
+      "vrfName": "r5-cust1"
+    }
+  ] 
+}
diff --git a/tests/topotests/isis_topo1_vrf/r5/r5_route6_linux.json b/tests/topotests/isis_topo1_vrf/r5/r5_route6_linux.json
new file mode 100755
index 0000000..3db3c93
--- /dev/null
+++ b/tests/topotests/isis_topo1_vrf/r5/r5_route6_linux.json
@@ -0,0 +1,26 @@
+{
+  "2001:db8:1:1::/64": {
+    "dev": "r5-eth0",
+    "metric": "20",
+    "pref": "medium",
+    "proto": "187"
+  },
+  "2001:db8:1:2::/64": {
+    "dev": "r5-eth1",
+    "metric": "20",
+    "pref": "medium",
+    "proto": "187"
+  },
+  "2001:db8:2:1::/64": {
+    "dev": "r5-eth0",
+    "metric": "256",
+    "pref": "medium",
+    "proto": "kernel"
+  },
+  "2001:db8:2:2::/64": {
+    "dev": "r5-eth1",
+    "metric": "256",
+    "pref": "medium",
+    "proto": "kernel"
+  }
+}
diff --git a/tests/topotests/isis_topo1_vrf/r5/r5_route_linux.json b/tests/topotests/isis_topo1_vrf/r5/r5_route_linux.json
new file mode 100755
index 0000000..6a38ba8
--- /dev/null
+++ b/tests/topotests/isis_topo1_vrf/r5/r5_route_linux.json
@@ -0,0 +1,24 @@
+{
+  "10.0.10.0/24": {
+    "dev": "r5-eth0",
+    "proto": "kernel",
+    "scope": "link"
+  },
+  "10.0.11.0/24": {
+    "dev": "r5-eth1",
+    "proto": "kernel",
+    "scope": "link"
+  },
+  "10.0.20.0/24": {
+    "dev": "r5-eth0",
+    "metric": "20",
+    "proto": "187",
+    "via": "10.0.10.2"
+  },
+  "10.0.21.0/24": {
+    "dev": "r5-eth1",
+    "metric": "20",
+    "proto": "187",
+    "via": "10.0.11.2"
+  }
+}
diff --git a/tests/topotests/isis_topo1_vrf/r5/r5_topology.json b/tests/topotests/isis_topo1_vrf/r5/r5_topology.json
new file mode 100644
index 0000000..2a088ca
--- /dev/null
+++ b/tests/topotests/isis_topo1_vrf/r5/r5_topology.json
@@ -0,0 +1,124 @@
+{
+  "1": {
+    "level-1": {
+      "ipv4": [
+        {
+          "vertex": "r5"
+        },
+        {
+          "metric": "0",
+          "parent": "r5(4)",
+          "type": "IP internal",
+          "vertex": "10.0.10.0/24"
+        },
+        {
+          "metric": "0",
+          "parent": "r5(4)",
+          "type": "IP internal",
+          "vertex": "10.0.11.0/24"
+        },
+        {
+          "interface": "r5-eth0",
+          "metric": "10",
+          "next-hop": "r3",
+          "parent": "r5(4)",
+          "type": "TE-IS",
+          "vertex": "r3"
+        },
+        {
+          "interface": "r5-eth1",
+          "metric": "10",
+          "next-hop": "r4",
+          "parent": "r5(4)",
+          "type": "TE-IS",
+          "vertex": "r4"
+        },
+        {
+          "interface": "r5-eth0",
+          "metric": "10",
+          "next-hop": "r3",
+          "parent": "r3(4)",
+          "type": "IP TE",
+          "vertex": "10.0.20.0/24"
+        },
+        {
+          "interface": "r5-eth0",
+          "metric": "10",
+          "next-hop": "r3",
+          "parent": "r3(4)",
+          "type": "IP TE",
+          "vertex": "10.0.10.0/24"
+        },
+        {
+          "interface": "r5-eth1",
+          "metric": "10",
+          "next-hop": "r4",
+          "parent": "r4(4)",
+          "type": "IP TE",
+          "vertex": "10.0.21.0/24"
+        },
+        {
+          "interface": "r5-eth1",
+          "metric": "10",
+          "next-hop": "r4",
+          "parent": "r4(4)",
+          "type": "IP TE",
+          "vertex": "10.0.11.0/24"
+        }
+      ],
+      "ipv6": [
+        {
+          "vertex": "r5"
+        },
+        {
+          "metric": "0",
+          "parent": "r5(4)",
+          "type": "IP6 internal",
+          "vertex": "2001:db8:2:1::/64"
+        },
+        {
+          "metric": "0",
+          "parent": "r5(4)",
+          "type": "IP6 internal",
+          "vertex": "2001:db8:2:2::/64"
+        },
+        {
+          "interface": "r5-eth0",
+          "metric": "10",
+          "next-hop": "r3",
+          "parent": "r5(4)",
+          "type": "TE-IS",
+          "vertex": "r3"
+        },
+        {
+          "interface": "r5-eth1",
+          "metric": "10",
+          "next-hop": "r4",
+          "parent": "r5(4)",
+          "type": "TE-IS",
+          "vertex": "r4"
+        },
+        {
+          "metric": "10",
+          "interface": "r5-eth0",
+          "next-hop": "r3",
+          "parent": "r3(4)",
+          "type": "IP6 internal",
+          "vertex": "2001:db8:1:1::/64"
+        },
+        {
+          "metric": "10",
+          "interface": "r5-eth1",
+          "next-hop": "r4",
+          "parent": "r4(4)",
+          "type": "IP6 internal",
+          "vertex": "2001:db8:1:2::/64"
+        }
+      ]
+    },
+    "level-2": {
+      "ipv4": [],
+      "ipv6": []
+    }
+  }
+}
diff --git a/tests/topotests/isis_topo1_vrf/r5/zebra.conf b/tests/topotests/isis_topo1_vrf/r5/zebra.conf
new file mode 100755
index 0000000..c6bc630
--- /dev/null
+++ b/tests/topotests/isis_topo1_vrf/r5/zebra.conf
@@ -0,0 +1,13 @@
+hostname r5
+interface r5-eth0 vrf r5-cust1
+ ip address 10.0.10.1/24
+ ipv6 address 2001:db8:2:1::1/64
+!
+interface r5-eth1 vrf r5-cust1
+ ip address 10.0.11.1/24
+ ipv6 address 2001:db8:2:2::1/64
+!
+interface lo
+ ip address 10.254.0.5/32
+ ipv6 address 2001:db8:F::5/128
+!