Adding upstream version 8.4.4.upstream/8.4.4upstream

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

6 files changed, 473 insertions, 0 deletions

diff --git a/tests/topotests/ospf6_gr_topo1/rt2/ospf6d.conf b/tests/topotests/ospf6_gr_topo1/rt2/ospf6d.conf
new file mode 100644
index 0000000..bcce341
--- /dev/null
+++ b/tests/topotests/ospf6_gr_topo1/rt2/ospf6d.conf
@@ -0,0 +1,35 @@
+password 1
+hostname rt2
+log file ospf6d.log
+log commands
+!
+! debug ospf6 lsa router originate
+! debug ospf6 lsa router flooding
+! debug ospf6 zebra
+! debug ospf6 interface
+! debug ospf6 neighbor
+! debug ospf6 flooding
+! debug ospf6 graceful-restart
+! debug ospf6 spf process
+!
+interface lo
+ ipv6 ospf area 0
+ ipv6 ospf network point-to-point
+!
+interface eth-rt1
+ ipv6 ospf network point-to-point
+ ipv6 ospf area 1
+ ipv6 ospf hello-interval 3
+ ipv6 ospf dead-interval 9
+!
+interface eth-rt3
+ ipv6 ospf network point-to-point
+ ipv6 ospf area 0
+ ipv6 ospf hello-interval 3
+ ipv6 ospf dead-interval 9
+!
+router ospf6
+ ospf6 router-id 2.2.2.2
+ graceful-restart grace-period 120
+ graceful-restart helper enable
+!
diff --git a/tests/topotests/ospf6_gr_topo1/rt2/show_ipv6_ospf_database.json b/tests/topotests/ospf6_gr_topo1/rt2/show_ipv6_ospf_database.json
new file mode 100644
index 0000000..fb16326
--- /dev/null
+++ b/tests/topotests/ospf6_gr_topo1/rt2/show_ipv6_ospf_database.json
@@ -0,0 +1,183 @@
+{
+  "areaScopedLinkStateDb":[
+    {
+      "areaId":"0",
+      "lsa":[
+        {
+          "type":"Rtr",
+          "advRouter":"2.2.2.2"
+        },
+        {
+          "type":"Rtr",
+          "advRouter":"3.3.3.3"
+        },
+        {
+          "type":"Rtr",
+          "advRouter":"3.3.3.3"
+        },
+        {
+          "type":"Rtr",
+          "advRouter":"3.3.3.3"
+        },
+        {
+          "type":"Rtr",
+          "advRouter":"4.4.4.4"
+        },
+        {
+          "type":"Rtr",
+          "advRouter":"6.6.6.6"
+        },
+        {
+          "type":"IAP",
+          "advRouter":"2.2.2.2",
+          "payload":"2001:db8:1000::1\/128"
+        },
+        {
+          "type":"IAP",
+          "advRouter":"4.4.4.4",
+          "payload":"2001:db8:1000::5\/128"
+        },
+        {
+          "type":"IAP",
+          "advRouter":"6.6.6.6",
+          "payload":"2001:db8:1000::7\/128"
+        },
+        {
+          "type":"IAR",
+          "advRouter":"2.2.2.2",
+          "payload":"1.1.1.1"
+        },
+        {
+          "type":"IAR",
+          "advRouter":"6.6.6.6",
+          "payload":"7.7.7.7"
+        },
+        {
+          "type":"INP",
+          "advRouter":"2.2.2.2",
+          "payload":"2001:db8:1000::2\/128"
+        },
+        {
+          "type":"INP",
+          "advRouter":"3.3.3.3",
+          "payload":"2001:db8:1000::3\/128"
+        },
+        {
+          "type":"INP",
+          "advRouter":"4.4.4.4",
+          "payload":"2001:db8:1000::4\/128"
+        },
+        {
+          "type":"INP",
+          "advRouter":"6.6.6.6",
+          "payload":"2001:db8:1000::6\/128"
+        }
+      ]
+    },
+    {
+      "areaId":"1",
+      "lsa":[
+        {
+          "type":"Rtr",
+          "advRouter":"1.1.1.1"
+        },
+        {
+          "type":"Rtr",
+          "advRouter":"2.2.2.2"
+        },
+        {
+          "type":"IAP",
+          "advRouter":"2.2.2.2",
+          "payload":"2001:db8:1000::2\/128"
+        },
+        {
+          "type":"IAP",
+          "advRouter":"2.2.2.2",
+          "payload":"2001:db8:1000::3\/128"
+        },
+        {
+          "type":"IAP",
+          "advRouter":"2.2.2.2",
+          "payload":"2001:db8:1000::4\/128"
+        },
+        {
+          "type":"IAP",
+          "advRouter":"2.2.2.2",
+          "payload":"2001:db8:1000::6\/128"
+        },
+        {
+          "type":"IAP",
+          "advRouter":"2.2.2.2",
+          "payload":"2001:db8:1000::5\/128"
+        },
+        {
+          "type":"IAP",
+          "advRouter":"2.2.2.2",
+          "payload":"2001:db8:1000::7\/128"
+        },
+        {
+          "type":"IAR",
+          "advRouter":"2.2.2.2",
+          "payload":"7.7.7.7"
+        },
+        {
+          "type":"INP",
+          "advRouter":"1.1.1.1",
+          "payload":"2001:db8:1000::1\/128"
+        }
+      ]
+    }
+  ],
+  "interfaceScopedLinkStateDb":[
+    {
+      "areaId":"0",
+      "interface":"eth-rt3",
+      "lsa":[
+        {
+          "type":"Lnk",
+          "advRouter":"2.2.2.2"
+        },
+        {
+          "type":"Lnk",
+          "advRouter":"3.3.3.3"
+        }
+      ]
+    },
+    {
+      "areaId":"0",
+      "interface":"lo",
+      "lsa":[
+      ]
+    },
+    {
+      "areaId":"1",
+      "interface":"eth-rt1",
+      "lsa":[
+        {
+          "type":"Lnk",
+          "advRouter":"1.1.1.1"
+        },
+        {
+          "type":"Lnk",
+          "advRouter":"2.2.2.2"
+        }
+      ]
+    }
+  ],
+  "asScopedLinkStateDb":[
+    {
+      "lsa":[
+        {
+          "type":"ASE",
+          "advRouter":"1.1.1.1",
+          "payload":"2001:db8:1000::1\/128"
+        },
+        {
+          "type":"ASE",
+          "advRouter":"7.7.7.7",
+          "payload":"2001:db8:1000::7\/128"
+        }
+      ]
+    }
+  ]
+}
diff --git a/tests/topotests/ospf6_gr_topo1/rt2/show_ipv6_ospf_neighbor.json b/tests/topotests/ospf6_gr_topo1/rt2/show_ipv6_ospf_neighbor.json
new file mode 100644
index 0000000..e4f27bf
--- /dev/null
+++ b/tests/topotests/ospf6_gr_topo1/rt2/show_ipv6_ospf_neighbor.json
@@ -0,0 +1,20 @@
+{
+  "neighbors":[
+    {
+      "neighborId":"3.3.3.3",
+      "priority":1,
+      "state":"Full",
+      "ifState":"PointToPoint",
+      "interfaceName":"eth-rt3",
+      "interfaceState":"PointToPoint"
+    },
+    {
+      "neighborId":"1.1.1.1",
+      "priority":1,
+      "state":"Full",
+      "ifState":"PointToPoint",
+      "interfaceName":"eth-rt1",
+      "interfaceState":"PointToPoint"
+    }
+  ]
+}
diff --git a/tests/topotests/ospf6_gr_topo1/rt2/show_ipv6_ospf_route.json b/tests/topotests/ospf6_gr_topo1/rt2/show_ipv6_ospf_route.json
new file mode 100644
index 0000000..34013a1
--- /dev/null
+++ b/tests/topotests/ospf6_gr_topo1/rt2/show_ipv6_ospf_route.json
@@ -0,0 +1,74 @@
+{
+  "routes":{
+    "2001:db8:1000::1\/128":{
+      "isBestRoute":false,
+      "destinationType":"N",
+      "pathType":"E2",
+      "nextHops":[
+        {
+          "interfaceName":"eth-rt1"
+        }
+      ]
+    },
+    "2001:db8:1000::2\/128":{
+      "isBestRoute":true,
+      "destinationType":"N",
+      "pathType":"IA",
+      "nextHops":[
+        {
+          "interfaceName":"lo"
+        }
+      ]
+    },
+    "2001:db8:1000::3\/128":{
+      "isBestRoute":true,
+      "destinationType":"N",
+      "pathType":"IA",
+      "nextHops":[
+        {
+          "interfaceName":"eth-rt3"
+        }
+      ]
+    },
+    "2001:db8:1000::4\/128":{
+      "isBestRoute":true,
+      "destinationType":"N",
+      "pathType":"IA",
+      "nextHops":[
+        {
+          "interfaceName":"eth-rt3"
+        }
+      ]
+    },
+    "2001:db8:1000::5\/128":{
+      "isBestRoute":true,
+      "destinationType":"N",
+      "pathType":"IE",
+      "nextHops":[
+        {
+          "interfaceName":"eth-rt3"
+        }
+      ]
+    },
+    "2001:db8:1000::6\/128":{
+      "isBestRoute":true,
+      "destinationType":"N",
+      "pathType":"IA",
+      "nextHops":[
+        {
+          "interfaceName":"eth-rt3"
+        }
+      ]
+    },
+    "2001:db8:1000::7\/128":{
+      "isBestRoute":false,
+      "destinationType":"N",
+      "pathType":"E2",
+      "nextHops":[
+        {
+          "interfaceName":"eth-rt3"
+        }
+      ]
+    }
+  }
+}
diff --git a/tests/topotests/ospf6_gr_topo1/rt2/show_ipv6_route.json b/tests/topotests/ospf6_gr_topo1/rt2/show_ipv6_route.json
new file mode 100644
index 0000000..624ff70
--- /dev/null
+++ b/tests/topotests/ospf6_gr_topo1/rt2/show_ipv6_route.json
@@ -0,0 +1,139 @@
+{
+  "2001:db8:1000::1\/128":[
+    {
+      "prefix":"2001:db8:1000::1\/128",
+      "protocol":"ospf6",
+      "vrfId":0,
+      "vrfName":"default",
+      "selected":true,
+      "destSelected":true,
+      "distance":110,
+      "metric":20,
+      "installed":true,
+      "nexthops":[
+        {
+          "afi":"ipv6",
+          "interfaceName":"eth-rt1",
+          "active":true
+        }
+      ]
+    }
+  ],
+  "2001:db8:1000::2\/128":[
+    {
+      "prefix":"2001:db8:1000::2\/128",
+      "protocol":"ospf6",
+      "vrfId":0,
+      "vrfName":"default",
+      "distance":110,
+      "metric":10,
+      "nexthops":[
+        {
+          "directlyConnected":true,
+          "interfaceName":"lo",
+          "active":true
+        }
+      ]
+    }
+  ],
+  "2001:db8:1000::3\/128":[
+    {
+      "prefix":"2001:db8:1000::3\/128",
+      "protocol":"ospf6",
+      "vrfId":0,
+      "vrfName":"default",
+      "selected":true,
+      "destSelected":true,
+      "distance":110,
+      "metric":20,
+      "installed":true,
+      "nexthops":[
+        {
+          "afi":"ipv6",
+          "interfaceName":"eth-rt3",
+          "active":true
+        }
+      ]
+    }
+  ],
+  "2001:db8:1000::4\/128":[
+    {
+      "prefix":"2001:db8:1000::4\/128",
+      "protocol":"ospf6",
+      "vrfId":0,
+      "vrfName":"default",
+      "selected":true,
+      "destSelected":true,
+      "distance":110,
+      "metric":30,
+      "installed":true,
+      "nexthops":[
+        {
+          "afi":"ipv6",
+          "interfaceName":"eth-rt3",
+          "active":true
+        }
+      ]
+    }
+  ],
+  "2001:db8:1000::5\/128":[
+    {
+      "prefix":"2001:db8:1000::5\/128",
+      "protocol":"ospf6",
+      "vrfId":0,
+      "vrfName":"default",
+      "selected":true,
+      "destSelected":true,
+      "distance":110,
+      "metric":40,
+      "installed":true,
+      "nexthops":[
+        {
+          "afi":"ipv6",
+          "interfaceName":"eth-rt3",
+          "active":true
+        }
+      ]
+    }
+  ],
+  "2001:db8:1000::6\/128":[
+    {
+      "prefix":"2001:db8:1000::6\/128",
+      "protocol":"ospf6",
+      "vrfId":0,
+      "vrfName":"default",
+      "selected":true,
+      "destSelected":true,
+      "distance":110,
+      "metric":30,
+      "installed":true,
+      "nexthops":[
+        {
+          "afi":"ipv6",
+          "interfaceName":"eth-rt3",
+          "active":true
+        }
+      ]
+    }
+  ],
+  "2001:db8:1000::7\/128":[
+    {
+      "prefix":"2001:db8:1000::7\/128",
+      "protocol":"ospf6",
+      "vrfId":0,
+      "vrfName":"default",
+      "selected":true,
+      "destSelected":true,
+      "distance":110,
+      "metric":40,
+      "installed":true,
+      "nexthops":[
+        {
+          "afi":"ipv6",
+          "interfaceName":"eth-rt3",
+          "active":true
+        }
+      ]
+    }
+  ]
+}
diff --git a/tests/topotests/ospf6_gr_topo1/rt2/zebra.conf b/tests/topotests/ospf6_gr_topo1/rt2/zebra.conf
new file mode 100644
index 0000000..5e5731b
--- /dev/null
+++ b/tests/topotests/ospf6_gr_topo1/rt2/zebra.conf
@@ -0,0 +1,22 @@
+password 1
+hostname rt2
+log file zebra.log
+log commands
+!
+! debug zebra event
+! debug zebra packet
+! debug zebra rib
+! debug zebra kernel
+!
+interface lo
+ ip address 2.2.2.2/32
+ ipv6 address 2001:db8:1000::2/128
+!
+interface eth-rt1
+!
+interface eth-rt3
+!
+ip forwarding
+!
+line vty
+!