Adding upstream version 9.1.upstream/9.1

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

7 files changed, 930 insertions, 0 deletions

diff --git a/tests/topotests/ospf_tilfa_topo1/rt1/ospfd.conf b/tests/topotests/ospf_tilfa_topo1/rt1/ospfd.conf
new file mode 100644
index 0000000..04b2c38
--- /dev/null
+++ b/tests/topotests/ospf_tilfa_topo1/rt1/ospfd.conf
@@ -0,0 +1,27 @@
+! debug ospf sr
+! debug ospf ti-lfa
+!
+interface lo
+!
+interface eth-rt2
+ ip ospf network point-to-point
+!
+interface eth-rt3
+ ip ospf network point-to-point
+!
+router ospf
+ ospf router-id 1.1.1.1
+ network 1.1.1.0/24 area 0.0.0.0
+ network 10.0.0.0/16 area 0.0.0.0
+ area 0.0.0.0 range 10.0.0.0/16
+ area 0.0.0.0 range 1.1.1.0/24
+ capability opaque
+ mpls-te on
+ mpls-te router-address 1.1.1.1
+ router-info area 0.0.0.0
+ passive-interface lo
+ segment-routing on
+ segment-routing global-block 16000 23999
+ segment-routing node-msd 8
+ segment-routing prefix 1.1.1.1/32 index 10
+!
diff --git a/tests/topotests/ospf_tilfa_topo1/rt1/step1/show_ip_route_initial.ref b/tests/topotests/ospf_tilfa_topo1/rt1/step1/show_ip_route_initial.ref
new file mode 100644
index 0000000..0ad2aae
--- /dev/null
+++ b/tests/topotests/ospf_tilfa_topo1/rt1/step1/show_ip_route_initial.ref
@@ -0,0 +1,156 @@
+{
+  "1.1.1.1\/32":[
+    {
+      "prefix":"1.1.1.1\/32",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "directlyConnected":true,
+          "interfaceName":"lo"
+        }
+      ]
+    },
+    {
+      "prefix":"1.1.1.1\/32",
+      "protocol":"connected",
+      "nexthops":[
+        {
+          "directlyConnected":true,
+          "interfaceName":"lo"
+        }
+      ]
+    }
+  ],
+  "1.1.1.2\/32":[
+    {
+      "prefix":"1.1.1.2\/32",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "ip":"10.0.1.2",
+          "interfaceName":"eth-rt2"
+        }
+      ]
+    }
+  ],
+  "1.1.1.3\/32":[
+    {
+      "prefix":"1.1.1.3\/32",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "ip":"10.0.2.2",
+          "interfaceName":"eth-rt3"
+        }
+      ]
+    }
+  ],
+  "1.1.1.4\/32":[
+    {
+      "prefix":"1.1.1.4\/32",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "ip":"10.0.1.2",
+          "interfaceName":"eth-rt2"
+        }
+      ]
+    }
+  ],
+  "1.1.1.5\/32":[
+    {
+      "prefix":"1.1.1.5\/32",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "ip":"10.0.2.2",
+          "interfaceName":"eth-rt3"
+        }
+      ]
+    }
+  ],
+  "10.0.1.0\/24":[
+    {
+      "prefix":"10.0.1.0\/24",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "directlyConnected":true,
+          "interfaceName":"eth-rt2"
+        }
+      ]
+    },
+    {
+      "prefix":"10.0.1.0\/24",
+      "protocol":"connected",
+      "nexthops":[
+        {
+          "directlyConnected":true,
+          "interfaceName":"eth-rt2"
+        }
+      ]
+    }
+  ],
+  "10.0.2.0\/24":[
+    {
+      "prefix":"10.0.2.0\/24",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "directlyConnected":true,
+          "interfaceName":"eth-rt3"
+        }
+      ]
+    },
+    {
+      "prefix":"10.0.2.0\/24",
+      "protocol":"connected",
+      "nexthops":[
+        {
+          "directlyConnected":true,
+          "interfaceName":"eth-rt3"
+        }
+      ]
+    }
+  ],
+  "10.0.3.0\/24":[
+    {
+      "prefix":"10.0.3.0\/24",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "ip":"10.0.1.2",
+          "interfaceName":"eth-rt2"
+        }
+      ]
+    }
+  ],
+  "10.0.4.0\/24":[
+    {
+      "prefix":"10.0.4.0\/24",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "ip":"10.0.2.2",
+          "interfaceName":"eth-rt3"
+        }
+      ]
+    }
+  ],
+  "10.0.5.0\/24":[
+    {
+      "prefix":"10.0.5.0\/24",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "ip":"10.0.1.2",
+          "interfaceName":"eth-rt2"
+        },
+        {
+          "ip":"10.0.2.2",
+          "interfaceName":"eth-rt3"
+        }
+      ]
+    }
+  ]
+}
diff --git a/tests/topotests/ospf_tilfa_topo1/rt1/step2/show_ip_route_initial.ref b/tests/topotests/ospf_tilfa_topo1/rt1/step2/show_ip_route_initial.ref
new file mode 100644
index 0000000..0ad2aae
--- /dev/null
+++ b/tests/topotests/ospf_tilfa_topo1/rt1/step2/show_ip_route_initial.ref
@@ -0,0 +1,156 @@
+{
+  "1.1.1.1\/32":[
+    {
+      "prefix":"1.1.1.1\/32",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "directlyConnected":true,
+          "interfaceName":"lo"
+        }
+      ]
+    },
+    {
+      "prefix":"1.1.1.1\/32",
+      "protocol":"connected",
+      "nexthops":[
+        {
+          "directlyConnected":true,
+          "interfaceName":"lo"
+        }
+      ]
+    }
+  ],
+  "1.1.1.2\/32":[
+    {
+      "prefix":"1.1.1.2\/32",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "ip":"10.0.1.2",
+          "interfaceName":"eth-rt2"
+        }
+      ]
+    }
+  ],
+  "1.1.1.3\/32":[
+    {
+      "prefix":"1.1.1.3\/32",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "ip":"10.0.2.2",
+          "interfaceName":"eth-rt3"
+        }
+      ]
+    }
+  ],
+  "1.1.1.4\/32":[
+    {
+      "prefix":"1.1.1.4\/32",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "ip":"10.0.1.2",
+          "interfaceName":"eth-rt2"
+        }
+      ]
+    }
+  ],
+  "1.1.1.5\/32":[
+    {
+      "prefix":"1.1.1.5\/32",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "ip":"10.0.2.2",
+          "interfaceName":"eth-rt3"
+        }
+      ]
+    }
+  ],
+  "10.0.1.0\/24":[
+    {
+      "prefix":"10.0.1.0\/24",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "directlyConnected":true,
+          "interfaceName":"eth-rt2"
+        }
+      ]
+    },
+    {
+      "prefix":"10.0.1.0\/24",
+      "protocol":"connected",
+      "nexthops":[
+        {
+          "directlyConnected":true,
+          "interfaceName":"eth-rt2"
+        }
+      ]
+    }
+  ],
+  "10.0.2.0\/24":[
+    {
+      "prefix":"10.0.2.0\/24",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "directlyConnected":true,
+          "interfaceName":"eth-rt3"
+        }
+      ]
+    },
+    {
+      "prefix":"10.0.2.0\/24",
+      "protocol":"connected",
+      "nexthops":[
+        {
+          "directlyConnected":true,
+          "interfaceName":"eth-rt3"
+        }
+      ]
+    }
+  ],
+  "10.0.3.0\/24":[
+    {
+      "prefix":"10.0.3.0\/24",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "ip":"10.0.1.2",
+          "interfaceName":"eth-rt2"
+        }
+      ]
+    }
+  ],
+  "10.0.4.0\/24":[
+    {
+      "prefix":"10.0.4.0\/24",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "ip":"10.0.2.2",
+          "interfaceName":"eth-rt3"
+        }
+      ]
+    }
+  ],
+  "10.0.5.0\/24":[
+    {
+      "prefix":"10.0.5.0\/24",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "ip":"10.0.1.2",
+          "interfaceName":"eth-rt2"
+        },
+        {
+          "ip":"10.0.2.2",
+          "interfaceName":"eth-rt3"
+        }
+      ]
+    }
+  ]
+}
diff --git a/tests/topotests/ospf_tilfa_topo1/rt1/step2/show_ip_route_link_protection.ref b/tests/topotests/ospf_tilfa_topo1/rt1/step2/show_ip_route_link_protection.ref
new file mode 100644
index 0000000..968570e
--- /dev/null
+++ b/tests/topotests/ospf_tilfa_topo1/rt1/step2/show_ip_route_link_protection.ref
@@ -0,0 +1,226 @@
+{
+  "1.1.1.1\/32":[
+    {
+      "prefix":"1.1.1.1\/32",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "directlyConnected":true,
+          "interfaceName":"lo"
+        }
+      ]
+    },
+    {
+      "prefix":"1.1.1.1\/32",
+      "protocol":"connected",
+      "nexthops":[
+        {
+          "directlyConnected":true,
+          "interfaceName":"lo"
+        }
+      ]
+    }
+  ],
+  "1.1.1.2\/32":[
+    {
+      "prefix":"1.1.1.2\/32",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "ip":"10.0.1.2",
+          "interfaceName":"eth-rt2"
+        }
+      ],
+      "backupNexthops":[
+        {
+          "ip":"10.0.2.2",
+          "labels":[
+            16050
+          ]
+        }
+      ]
+    }
+  ],
+  "1.1.1.3\/32":[
+    {
+      "prefix":"1.1.1.3\/32",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "ip":"10.0.2.2",
+          "interfaceName":"eth-rt3"
+        }
+      ],
+      "backupNexthops":[
+        {
+          "ip":"10.0.1.2",
+          "labels":[
+            16040
+          ]
+        }
+      ]
+    }
+  ],
+  "1.1.1.4\/32":[
+    {
+      "prefix":"1.1.1.4\/32",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "ip":"10.0.1.2",
+          "interfaceName":"eth-rt2",
+          "labels":[
+            16040
+          ]
+        }
+      ],
+      "backupNexthops":[
+        {
+          "ip":"10.0.2.2",
+          "labels":[
+            16050,
+            16040
+          ]
+        }
+      ]
+    }
+  ],
+  "1.1.1.5\/32":[
+    {
+      "prefix":"1.1.1.5\/32",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "ip":"10.0.2.2",
+          "interfaceName":"eth-rt3",
+          "labels":[
+            16050
+          ]
+        }
+      ],
+      "backupNexthops":[
+        {
+          "ip":"10.0.1.2",
+          "labels":[
+            16040,
+            16050
+          ]
+        }
+      ]
+    }
+  ],
+  "10.0.1.0\/24":[
+    {
+      "prefix":"10.0.1.0\/24",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "directlyConnected":true,
+          "interfaceName":"eth-rt2"
+        }
+      ]
+    },
+    {
+      "prefix":"10.0.1.0\/24",
+      "protocol":"connected",
+      "nexthops":[
+        {
+          "directlyConnected":true,
+          "interfaceName":"eth-rt2"
+        }
+      ]
+    }
+  ],
+  "10.0.2.0\/24":[
+    {
+      "prefix":"10.0.2.0\/24",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "directlyConnected":true,
+          "interfaceName":"eth-rt3"
+        }
+      ]
+    },
+    {
+      "prefix":"10.0.2.0\/24",
+      "protocol":"connected",
+      "nexthops":[
+        {
+          "directlyConnected":true,
+          "interfaceName":"eth-rt3"
+        }
+      ]
+    }
+  ],
+  "10.0.3.0\/24":[
+    {
+      "prefix":"10.0.3.0\/24",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "ip":"10.0.1.2",
+          "interfaceName":"eth-rt2"
+        }
+      ],
+      "backupNexthops":[
+        {
+          "ip":"10.0.2.2",
+          "labels":[
+            16050
+          ]
+        }
+      ]
+    }
+  ],
+  "10.0.4.0\/24":[
+    {
+      "prefix":"10.0.4.0\/24",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "ip":"10.0.2.2",
+          "interfaceName":"eth-rt3"
+        }
+      ],
+      "backupNexthops":[
+        {
+          "ip":"10.0.1.2",
+          "labels":[
+            16040
+          ]
+        }
+      ]
+    }
+  ],
+  "10.0.5.0\/24":[
+    {
+      "prefix":"10.0.5.0\/24",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "ip":"10.0.1.2",
+          "interfaceName":"eth-rt2"
+        },
+        {
+          "ip":"10.0.2.2",
+          "interfaceName":"eth-rt3"
+        }
+      ],
+      "backupNexthops":[
+        {
+          "ip":"10.0.1.2",
+          "labels":[
+            16040
+          ]
+        },
+        {
+          "ip":"10.0.2.2",
+          "labels":[
+            16050
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/tests/topotests/ospf_tilfa_topo1/rt1/step3/show_ip_route_initial.ref b/tests/topotests/ospf_tilfa_topo1/rt1/step3/show_ip_route_initial.ref
new file mode 100644
index 0000000..0ad2aae
--- /dev/null
+++ b/tests/topotests/ospf_tilfa_topo1/rt1/step3/show_ip_route_initial.ref
@@ -0,0 +1,156 @@
+{
+  "1.1.1.1\/32":[
+    {
+      "prefix":"1.1.1.1\/32",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "directlyConnected":true,
+          "interfaceName":"lo"
+        }
+      ]
+    },
+    {
+      "prefix":"1.1.1.1\/32",
+      "protocol":"connected",
+      "nexthops":[
+        {
+          "directlyConnected":true,
+          "interfaceName":"lo"
+        }
+      ]
+    }
+  ],
+  "1.1.1.2\/32":[
+    {
+      "prefix":"1.1.1.2\/32",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "ip":"10.0.1.2",
+          "interfaceName":"eth-rt2"
+        }
+      ]
+    }
+  ],
+  "1.1.1.3\/32":[
+    {
+      "prefix":"1.1.1.3\/32",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "ip":"10.0.2.2",
+          "interfaceName":"eth-rt3"
+        }
+      ]
+    }
+  ],
+  "1.1.1.4\/32":[
+    {
+      "prefix":"1.1.1.4\/32",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "ip":"10.0.1.2",
+          "interfaceName":"eth-rt2"
+        }
+      ]
+    }
+  ],
+  "1.1.1.5\/32":[
+    {
+      "prefix":"1.1.1.5\/32",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "ip":"10.0.2.2",
+          "interfaceName":"eth-rt3"
+        }
+      ]
+    }
+  ],
+  "10.0.1.0\/24":[
+    {
+      "prefix":"10.0.1.0\/24",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "directlyConnected":true,
+          "interfaceName":"eth-rt2"
+        }
+      ]
+    },
+    {
+      "prefix":"10.0.1.0\/24",
+      "protocol":"connected",
+      "nexthops":[
+        {
+          "directlyConnected":true,
+          "interfaceName":"eth-rt2"
+        }
+      ]
+    }
+  ],
+  "10.0.2.0\/24":[
+    {
+      "prefix":"10.0.2.0\/24",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "directlyConnected":true,
+          "interfaceName":"eth-rt3"
+        }
+      ]
+    },
+    {
+      "prefix":"10.0.2.0\/24",
+      "protocol":"connected",
+      "nexthops":[
+        {
+          "directlyConnected":true,
+          "interfaceName":"eth-rt3"
+        }
+      ]
+    }
+  ],
+  "10.0.3.0\/24":[
+    {
+      "prefix":"10.0.3.0\/24",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "ip":"10.0.1.2",
+          "interfaceName":"eth-rt2"
+        }
+      ]
+    }
+  ],
+  "10.0.4.0\/24":[
+    {
+      "prefix":"10.0.4.0\/24",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "ip":"10.0.2.2",
+          "interfaceName":"eth-rt3"
+        }
+      ]
+    }
+  ],
+  "10.0.5.0\/24":[
+    {
+      "prefix":"10.0.5.0\/24",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "ip":"10.0.1.2",
+          "interfaceName":"eth-rt2"
+        },
+        {
+          "ip":"10.0.2.2",
+          "interfaceName":"eth-rt3"
+        }
+      ]
+    }
+  ]
+}
diff --git a/tests/topotests/ospf_tilfa_topo1/rt1/step3/show_ip_route_node_protection.ref b/tests/topotests/ospf_tilfa_topo1/rt1/step3/show_ip_route_node_protection.ref
new file mode 100644
index 0000000..46a80d2
--- /dev/null
+++ b/tests/topotests/ospf_tilfa_topo1/rt1/step3/show_ip_route_node_protection.ref
@@ -0,0 +1,192 @@
+{
+  "1.1.1.1\/32":[
+    {
+      "prefix":"1.1.1.1\/32",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "directlyConnected":true,
+          "interfaceName":"lo"
+        }
+      ]
+    },
+    {
+      "prefix":"1.1.1.1\/32",
+      "protocol":"connected",
+      "nexthops":[
+        {
+          "directlyConnected":true,
+          "interfaceName":"lo"
+        }
+      ]
+    }
+  ],
+  "1.1.1.2\/32":[
+    {
+      "prefix":"1.1.1.2\/32",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "ip":"10.0.1.2",
+          "interfaceName":"eth-rt2"
+        }
+      ]
+    }
+  ],
+  "1.1.1.3\/32":[
+    {
+      "prefix":"1.1.1.3\/32",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "ip":"10.0.2.2",
+          "interfaceName":"eth-rt3"
+        }
+      ]
+    }
+  ],
+  "1.1.1.4\/32":[
+    {
+      "prefix":"1.1.1.4\/32",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "ip":"10.0.1.2",
+          "interfaceName":"eth-rt2",
+          "labels":[
+            16040
+          ]
+        }
+      ],
+      "backupNexthops":[
+        {
+          "ip":"10.0.2.2",
+          "labels":[
+            16050
+          ]
+        }
+      ]
+    }
+  ],
+  "1.1.1.5\/32":[
+    {
+      "prefix":"1.1.1.5\/32",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "ip":"10.0.2.2",
+          "interfaceName":"eth-rt3",
+          "labels":[
+            16050
+          ]
+        }
+      ],
+      "backupNexthops":[
+        {
+          "ip":"10.0.1.2",
+          "labels":[
+            16040
+          ]
+        }
+      ]
+    }
+  ],
+  "10.0.1.0\/24":[
+    {
+      "prefix":"10.0.1.0\/24",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "directlyConnected":true,
+          "interfaceName":"eth-rt2"
+        }
+      ]
+    },
+    {
+      "prefix":"10.0.1.0\/24",
+      "protocol":"connected",
+      "nexthops":[
+        {
+          "directlyConnected":true,
+          "interfaceName":"eth-rt2"
+        }
+      ]
+    }
+  ],
+  "10.0.2.0\/24":[
+    {
+      "prefix":"10.0.2.0\/24",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "directlyConnected":true,
+          "interfaceName":"eth-rt3"
+        }
+      ]
+    },
+    {
+      "prefix":"10.0.2.0\/24",
+      "protocol":"connected",
+      "nexthops":[
+        {
+          "directlyConnected":true,
+          "interfaceName":"eth-rt3"
+        }
+      ]
+    }
+  ],
+  "10.0.3.0\/24":[
+    {
+      "prefix":"10.0.3.0\/24",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "ip":"10.0.1.2",
+          "interfaceName":"eth-rt2"
+        }
+      ]
+    }
+  ],
+  "10.0.4.0\/24":[
+    {
+      "prefix":"10.0.4.0\/24",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "ip":"10.0.2.2",
+          "interfaceName":"eth-rt3"
+        }
+      ]
+    }
+  ],
+  "10.0.5.0\/24":[
+    {
+      "prefix":"10.0.5.0\/24",
+      "protocol":"ospf",
+      "nexthops":[
+        {
+          "ip":"10.0.1.2",
+          "interfaceName":"eth-rt2"
+        },
+        {
+          "ip":"10.0.2.2",
+          "interfaceName":"eth-rt3"
+        }
+      ],
+      "backupNexthops":[
+        {
+          "ip":"10.0.2.2",
+          "labels":[
+            16050
+          ]
+        },
+        {
+          "ip":"10.0.1.2",
+          "labels":[
+            16040
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/tests/topotests/ospf_tilfa_topo1/rt1/zebra.conf b/tests/topotests/ospf_tilfa_topo1/rt1/zebra.conf
new file mode 100644
index 0000000..bf0e77a
--- /dev/null
+++ b/tests/topotests/ospf_tilfa_topo1/rt1/zebra.conf
@@ -0,0 +1,17 @@
+log file zebra.log
+!
+hostname rt1
+!
+interface lo
+ ip address 1.1.1.1/32
+!
+interface eth-rt2
+ ip address 10.0.1.1/24
+!
+interface eth-rt3
+ ip address 10.0.2.1/24
+!
+ip forwarding
+!
+line vty
+!