Adding upstream version 9.1.upstream/9.1

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

6 files changed, 663 insertions, 0 deletions

diff --git a/tests/topotests/ospf_gr_topo1/rt2/ospfd.conf b/tests/topotests/ospf_gr_topo1/rt2/ospfd.conf
new file mode 100644
index 0000000..591b242
--- /dev/null
+++ b/tests/topotests/ospf_gr_topo1/rt2/ospfd.conf
@@ -0,0 +1,37 @@
+password 1
+hostname rt2
+log file ospfd.log
+log commands
+!
+! debug ospf zebra
+! debug ospf event
+! debug ospf lsa
+! debug ospf te
+! debug ospf packet all
+! debug ospf packet ls-update detail
+! debug ospf ism
+! debug ospf nsm
+! debug ospf nssa
+! debug ospf graceful-restart
+!
+interface lo
+ ip ospf area 0
+!
+interface eth-rt1
+ ip ospf network point-to-point
+ ip ospf area 1
+ ip ospf hello-interval 3
+ ip ospf dead-interval 9
+!
+interface eth-rt3
+ ip ospf network point-to-point
+ ip ospf area 0
+ ip ospf hello-interval 3
+ ip ospf dead-interval 9
+!
+router ospf
+ router-id 2.2.2.2
+ capability opaque
+ graceful-restart grace-period 120
+ graceful-restart helper enable
+!
diff --git a/tests/topotests/ospf_gr_topo1/rt2/show_ip_ospf_database.json b/tests/topotests/ospf_gr_topo1/rt2/show_ip_ospf_database.json
new file mode 100644
index 0000000..40c3e82
--- /dev/null
+++ b/tests/topotests/ospf_gr_topo1/rt2/show_ip_ospf_database.json
@@ -0,0 +1,160 @@
+{
+  "routerId":"2.2.2.2",
+  "areas":{
+    "0.0.0.0":{
+      "routerLinkStates":[
+        {
+          "lsId":"2.2.2.2",
+          "advertisedRouter":"2.2.2.2",
+          "numOfRouterLinks":3
+        },
+        {
+          "lsId":"3.3.3.3",
+          "advertisedRouter":"3.3.3.3",
+          "numOfRouterLinks":7
+        },
+        {
+          "lsId":"4.4.4.4",
+          "advertisedRouter":"4.4.4.4",
+          "numOfRouterLinks":3
+        },
+        {
+          "lsId":"6.6.6.6",
+          "advertisedRouter":"6.6.6.6",
+          "numOfRouterLinks":3
+        }
+      ],
+      "summaryLinkStates":[
+        {
+          "lsId":"1.1.1.1",
+          "advertisedRouter":"2.2.2.2",
+          "summaryAddress":"1.1.1.1\/32"
+        },
+        {
+          "lsId":"5.5.5.5",
+          "advertisedRouter":"4.4.4.4",
+          "summaryAddress":"5.5.5.5\/32"
+        },
+        {
+          "lsId":"7.7.7.7",
+          "advertisedRouter":"6.6.6.6",
+          "summaryAddress":"7.7.7.7\/32"
+        },
+        {
+          "lsId":"10.0.1.0",
+          "advertisedRouter":"2.2.2.2",
+          "summaryAddress":"10.0.1.0\/24"
+        },
+        {
+          "lsId":"10.0.5.0",
+          "advertisedRouter":"4.4.4.4",
+          "summaryAddress":"10.0.5.0\/24"
+        },
+        {
+          "lsId":"10.0.6.0",
+          "advertisedRouter":"6.6.6.6",
+          "summaryAddress":"10.0.6.0\/24"
+        }
+      ],
+      "asbrSummaryLinkStates":[
+        {
+          "lsId":"1.1.1.1",
+          "advertisedRouter":"2.2.2.2"
+        }
+      ]
+    },
+    "0.0.0.1":{
+      "routerLinkStates":[
+        {
+          "lsId":"1.1.1.1",
+          "advertisedRouter":"1.1.1.1",
+          "numOfRouterLinks":3
+        },
+        {
+          "lsId":"2.2.2.2",
+          "advertisedRouter":"2.2.2.2",
+          "numOfRouterLinks":2
+        }
+      ],
+      "summaryLinkStates":[
+        {
+          "lsId":"2.2.2.2",
+          "advertisedRouter":"2.2.2.2",
+          "summaryAddress":"2.2.2.2\/32"
+        },
+        {
+          "lsId":"3.3.3.3",
+          "advertisedRouter":"2.2.2.2",
+          "summaryAddress":"3.3.3.3\/32"
+        },
+        {
+          "lsId":"4.4.4.4",
+          "advertisedRouter":"2.2.2.2",
+          "summaryAddress":"4.4.4.4\/32"
+        },
+        {
+          "lsId":"5.5.5.5",
+          "advertisedRouter":"2.2.2.2",
+          "summaryAddress":"5.5.5.5\/32"
+        },
+        {
+          "lsId":"6.6.6.6",
+          "advertisedRouter":"2.2.2.2",
+          "summaryAddress":"6.6.6.6\/32"
+        },
+        {
+          "lsId":"7.7.7.7",
+          "advertisedRouter":"2.2.2.2",
+          "summaryAddress":"7.7.7.7\/32"
+        },
+        {
+          "lsId":"10.0.2.0",
+          "advertisedRouter":"2.2.2.2",
+          "summaryAddress":"10.0.2.0\/24"
+        },
+        {
+          "lsId":"10.0.3.0",
+          "advertisedRouter":"2.2.2.2",
+          "summaryAddress":"10.0.3.0\/24"
+        },
+        {
+          "lsId":"10.0.4.0",
+          "advertisedRouter":"2.2.2.2",
+          "summaryAddress":"10.0.4.0\/24"
+        },
+        {
+          "lsId":"10.0.5.0",
+          "advertisedRouter":"2.2.2.2",
+          "summaryAddress":"10.0.5.0\/24"
+        },
+        {
+          "lsId":"10.0.6.0",
+          "advertisedRouter":"2.2.2.2",
+          "summaryAddress":"10.0.6.0\/24"
+        }
+      ],
+      "asbrSummaryLinkStates":[
+        {
+          "lsId":"6.6.6.6",
+          "advertisedRouter":"2.2.2.2"
+        }
+      ]
+    }
+  },
+  "asExternalLinkStates":[
+    {
+      "lsId":"172.16.1.0",
+      "advertisedRouter":"1.1.1.1",
+      "metricType":"E2",
+      "route":"172.16.1.0\/24",
+      "tag":0
+    },
+    {
+      "lsId":"192.168.1.0",
+      "advertisedRouter":"6.6.6.6",
+      "metricType":"E2",
+      "route":"192.168.1.0\/24",
+      "tag":0
+    }
+  ]
+}
diff --git a/tests/topotests/ospf_gr_topo1/rt2/show_ip_ospf_neighbor.json b/tests/topotests/ospf_gr_topo1/rt2/show_ip_ospf_neighbor.json
new file mode 100644
index 0000000..3114660
--- /dev/null
+++ b/tests/topotests/ospf_gr_topo1/rt2/show_ip_ospf_neighbor.json
@@ -0,0 +1,18 @@
+{
+  "neighbors":{
+    "1.1.1.1":[
+      {
+        "converged":"Full",
+        "ifaceAddress":"10.0.1.1",
+        "ifaceName":"eth-rt1:10.0.1.2"
+      }
+    ],
+    "3.3.3.3":[
+      {
+        "converged":"Full",
+        "ifaceAddress":"10.0.2.3",
+        "ifaceName":"eth-rt3:10.0.2.2"
+      }
+    ]
+  }
+}
diff --git a/tests/topotests/ospf_gr_topo1/rt2/show_ip_ospf_route.json b/tests/topotests/ospf_gr_topo1/rt2/show_ip_ospf_route.json
new file mode 100644
index 0000000..3e2aba8
--- /dev/null
+++ b/tests/topotests/ospf_gr_topo1/rt2/show_ip_ospf_route.json
@@ -0,0 +1,201 @@
+{
+  "1.1.1.1\/32":{
+    "routeType":"N",
+    "cost":10,
+    "area":"0.0.0.1",
+    "nexthops":[
+      {
+        "ip":"10.0.1.1",
+        "via":"eth-rt1"
+      }
+    ]
+  },
+  "2.2.2.2\/32":{
+    "routeType":"N",
+    "cost":0,
+    "area":"0.0.0.0",
+    "nexthops":[
+      {
+        "ip":" ",
+        "directlyAttachedTo":"lo"
+      }
+    ]
+  },
+  "3.3.3.3\/32":{
+    "routeType":"N",
+    "cost":10,
+    "area":"0.0.0.0",
+    "nexthops":[
+      {
+        "ip":"10.0.2.3",
+        "via":"eth-rt3"
+      }
+    ]
+  },
+  "4.4.4.4\/32":{
+    "routeType":"N",
+    "cost":20,
+    "area":"0.0.0.0",
+    "nexthops":[
+      {
+        "ip":"10.0.2.3",
+        "via":"eth-rt3"
+      }
+    ]
+  },
+  "5.5.5.5\/32":{
+    "routeType":"N IA",
+    "cost":30,
+    "area":"0.0.0.0",
+    "nexthops":[
+      {
+        "ip":"10.0.2.3",
+        "via":"eth-rt3"
+      }
+    ]
+  },
+  "6.6.6.6\/32":{
+    "routeType":"N",
+    "cost":20,
+    "area":"0.0.0.0",
+    "nexthops":[
+      {
+        "ip":"10.0.2.3",
+        "via":"eth-rt3"
+      }
+    ]
+  },
+  "7.7.7.7\/32":{
+    "routeType":"N IA",
+    "cost":30,
+    "area":"0.0.0.0",
+    "nexthops":[
+      {
+        "ip":"10.0.2.3",
+        "via":"eth-rt3"
+      }
+    ]
+  },
+  "10.0.1.0\/24":{
+    "routeType":"N",
+    "cost":10,
+    "area":"0.0.0.1",
+    "nexthops":[
+      {
+        "ip":" ",
+        "directlyAttachedTo":"eth-rt1"
+      }
+    ]
+  },
+  "10.0.2.0\/24":{
+    "routeType":"N",
+    "cost":10,
+    "area":"0.0.0.0",
+    "nexthops":[
+      {
+        "ip":" ",
+        "directlyAttachedTo":"eth-rt3"
+      }
+    ]
+  },
+  "10.0.3.0\/24":{
+    "routeType":"N",
+    "cost":20,
+    "area":"0.0.0.0",
+    "nexthops":[
+      {
+        "ip":"10.0.2.3",
+        "via":"eth-rt3"
+      }
+    ]
+  },
+  "10.0.4.0\/24":{
+    "routeType":"N",
+    "cost":20,
+    "area":"0.0.0.0",
+    "nexthops":[
+      {
+        "ip":"10.0.2.3",
+        "via":"eth-rt3"
+      }
+    ]
+  },
+  "10.0.5.0\/24":{
+    "routeType":"N IA",
+    "cost":30,
+    "area":"0.0.0.0",
+    "nexthops":[
+      {
+        "ip":"10.0.2.3",
+        "via":"eth-rt3"
+      }
+    ]
+  },
+  "10.0.6.0\/24":{
+    "routeType":"N IA",
+    "cost":30,
+    "area":"0.0.0.0",
+    "nexthops":[
+      {
+        "ip":"10.0.2.3",
+        "via":"eth-rt3"
+      }
+    ]
+  },
+  "1.1.1.1":{
+    "routeType":"R ",
+    "cost":10,
+    "area":"0.0.0.1",
+    "routerType":"asbr",
+    "nexthops":[
+      {
+        "ip":"10.0.1.1",
+        "via":"eth-rt1"
+      }
+    ]
+  },
+  "4.4.4.4":{
+    "routeType":"R ",
+    "cost":20,
+    "area":"0.0.0.0",
+    "routerType":"abr",
+    "nexthops":[
+      {
+        "ip":"10.0.2.3",
+        "via":"eth-rt3"
+      }
+    ]
+  },
+  "6.6.6.6":{
+    "routeType":"R ",
+    "cost":20,
+    "area":"0.0.0.0",
+    "routerType":"abr",
+    "nexthops":[
+      {
+        "ip":"10.0.2.3",
+        "via":"eth-rt3"
+      }
+    ]
+  },
+  "172.16.1.0\/24":{
+    "routeType":"N E2",
+    "cost":10,
+    "nexthops":[
+      {
+        "ip":"10.0.1.1",
+        "via":"eth-rt1"
+      }
+    ]
+  },
+  "192.168.1.0\/24":{
+    "routeType":"N E2",
+    "cost":30,
+    "nexthops":[
+      {
+        "ip":"10.0.2.3",
+        "via":"eth-rt3"
+      }
+    ]
+  }
+}
diff --git a/tests/topotests/ospf_gr_topo1/rt2/show_ip_route.json b/tests/topotests/ospf_gr_topo1/rt2/show_ip_route.json
new file mode 100644
index 0000000..8989a45
--- /dev/null
+++ b/tests/topotests/ospf_gr_topo1/rt2/show_ip_route.json
@@ -0,0 +1,224 @@
+{
+  "1.1.1.1\/32":[
+    {
+      "prefix":"1.1.1.1\/32",
+      "protocol":"ospf",
+      "distance":110,
+      "metric":10,
+      "nexthops":[
+        {
+          "ip":"10.0.1.1",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt1"
+        }
+      ]
+    }
+  ],
+  "2.2.2.2\/32":[
+    {
+      "prefix":"2.2.2.2\/32",
+      "protocol":"ospf",
+      "distance":110,
+      "metric":0,
+      "nexthops":[
+        {
+          "directlyConnected":true,
+          "interfaceName":"lo"
+        }
+      ]
+    }
+  ],
+  "3.3.3.3\/32":[
+    {
+      "prefix":"3.3.3.3\/32",
+      "protocol":"ospf",
+      "distance":110,
+      "metric":10,
+      "nexthops":[
+        {
+          "ip":"10.0.2.3",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt3"
+        }
+      ]
+    }
+  ],
+  "4.4.4.4\/32":[
+    {
+      "prefix":"4.4.4.4\/32",
+      "protocol":"ospf",
+      "distance":110,
+      "metric":20,
+      "nexthops":[
+        {
+          "ip":"10.0.2.3",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt3"
+        }
+      ]
+    }
+  ],
+  "5.5.5.5\/32":[
+    {
+      "prefix":"5.5.5.5\/32",
+      "protocol":"ospf",
+      "distance":110,
+      "metric":30,
+      "nexthops":[
+        {
+          "ip":"10.0.2.3",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt3"
+        }
+      ]
+    }
+  ],
+  "6.6.6.6\/32":[
+    {
+      "prefix":"6.6.6.6\/32",
+      "protocol":"ospf",
+      "distance":110,
+      "metric":20,
+      "nexthops":[
+        {
+          "ip":"10.0.2.3",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt3"
+        }
+      ]
+    }
+  ],
+  "7.7.7.7\/32":[
+    {
+      "prefix":"7.7.7.7\/32",
+      "protocol":"ospf",
+      "distance":110,
+      "metric":30,
+      "nexthops":[
+        {
+          "ip":"10.0.2.3",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt3"
+        }
+      ]
+    }
+  ],
+  "10.0.1.0\/24":[
+    {
+      "prefix":"10.0.1.0\/24",
+      "protocol":"ospf",
+      "distance":110,
+      "metric":10,
+      "nexthops":[
+        {
+          "directlyConnected":true,
+          "interfaceName":"eth-rt1"
+        }
+      ]
+    }
+  ],
+  "10.0.2.0\/24":[
+    {
+      "prefix":"10.0.2.0\/24",
+      "protocol":"ospf",
+      "distance":110,
+      "metric":10,
+      "nexthops":[
+        {
+          "directlyConnected":true,
+          "interfaceName":"eth-rt3"
+        }
+      ]
+    }
+  ],
+  "10.0.3.0\/24":[
+    {
+      "prefix":"10.0.3.0\/24",
+      "protocol":"ospf",
+      "distance":110,
+      "metric":20,
+      "nexthops":[
+        {
+          "ip":"10.0.2.3",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt3"
+        }
+      ]
+    }
+  ],
+  "10.0.4.0\/24":[
+    {
+      "prefix":"10.0.4.0\/24",
+      "protocol":"ospf",
+      "distance":110,
+      "metric":20,
+      "nexthops":[
+        {
+          "ip":"10.0.2.3",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt3"
+        }
+      ]
+    }
+  ],
+  "10.0.5.0\/24":[
+    {
+      "prefix":"10.0.5.0\/24",
+      "protocol":"ospf",
+      "distance":110,
+      "metric":30,
+      "nexthops":[
+        {
+          "ip":"10.0.2.3",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt3"
+        }
+      ]
+    }
+  ],
+  "10.0.6.0\/24":[
+    {
+      "prefix":"10.0.6.0\/24",
+      "protocol":"ospf",
+      "distance":110,
+      "metric":30,
+      "nexthops":[
+        {
+          "ip":"10.0.2.3",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt3"
+        }
+      ]
+    }
+  ],
+  "172.16.1.0\/24":[
+    {
+      "prefix":"172.16.1.0\/24",
+      "protocol":"ospf",
+      "distance":110,
+      "metric":20,
+      "nexthops":[
+        {
+          "ip":"10.0.1.1",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt1"
+        }
+      ]
+    }
+  ],
+  "192.168.1.0\/24":[
+    {
+      "prefix":"192.168.1.0\/24",
+      "protocol":"ospf",
+      "distance":110,
+      "metric":20,
+      "nexthops":[
+        {
+          "ip":"10.0.2.3",
+          "afi":"ipv4",
+          "interfaceName":"eth-rt3"
+        }
+      ]
+    }
+  ]
+}
diff --git a/tests/topotests/ospf_gr_topo1/rt2/zebra.conf b/tests/topotests/ospf_gr_topo1/rt2/zebra.conf
new file mode 100644
index 0000000..73571aa
--- /dev/null
+++ b/tests/topotests/ospf_gr_topo1/rt2/zebra.conf
@@ -0,0 +1,23 @@
+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
+!
+interface eth-rt1
+ ip address 10.0.1.2/24
+!
+interface eth-rt3
+ ip address 10.0.2.2/24
+!
+ip forwarding
+!
+line vty
+!