Adding upstream version 9.1.upstream/9.1

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

19 files changed, 1447 insertions, 0 deletions

diff --git a/tests/topotests/bgp_srv6l3vpn_sid/r1/bgpd.conf b/tests/topotests/bgp_srv6l3vpn_sid/r1/bgpd.conf
new file mode 100644
index 0000000..bfc9db9
--- /dev/null
+++ b/tests/topotests/bgp_srv6l3vpn_sid/r1/bgpd.conf
@@ -0,0 +1,79 @@
+frr defaults traditional
+!
+hostname r1
+password zebra
+!
+log stdout notifications
+log monitor notifications
+log commands
+!
+!debug bgp neighbor-events
+!debug bgp zebra
+!debug bgp vnc verbose
+!debug bgp update-groups
+!debug bgp updates in
+!debug bgp updates out
+!debug bgp vpn label
+!debug bgp vpn leak-from-vrf
+!debug bgp vpn leak-to-vrf
+!debug bgp vpn rmap-event
+!
+router bgp 1 
+ bgp router-id 192.0.2.1
+ no bgp ebgp-requires-policy
+ no bgp default ipv4-unicast
+ neighbor 2001::2 remote-as 2
+ neighbor 2001::2 timers 3 10
+ neighbor 2001::2 timers connect 1
+ neighbor 2001::2 update-source 2001::1
+ neighbor 2001::2 capability extended-nexthop
+ !
+ address-family ipv4 vpn
+  neighbor 2001::2 activate
+ exit-address-family
+ !
+ address-family ipv6 vpn
+  neighbor 2001::2 activate
+ exit-address-family
+ !
+ segment-routing srv6
+  locator loc1
+ !
+!
+router bgp 1 vrf vrf10
+ bgp router-id 192.0.2.1 
+ no bgp ebgp-requires-policy
+ !
+ address-family ipv6 unicast
+  sid vpn export auto
+  rd vpn export 1:10
+  rt vpn both 99:99
+  import vpn
+  export vpn
+  redistribute connected
+ exit-address-family
+!
+ address-family ipv4 unicast
+  network 192.168.1.0/24
+  sid vpn export auto
+  rd vpn export 11:10
+  rt vpn both 77:77
+  import vpn
+  export vpn
+  redistribute connected
+ exit-address-family
+!
+router bgp 1 vrf vrf20
+ bgp router-id 192.0.2.1
+ no bgp ebgp-requires-policy
+ no bgp default ipv4-unicast
+ !
+ address-family ipv6 unicast
+  sid vpn export auto
+  rd vpn export 1:20
+  rt vpn both 88:88
+  import vpn
+  export vpn
+  redistribute connected
+ exit-address-family
+!
diff --git a/tests/topotests/bgp_srv6l3vpn_sid/r1/vpnv6_rib.json b/tests/topotests/bgp_srv6l3vpn_sid/r1/vpnv6_rib.json
new file mode 100644
index 0000000..6fc43e1
--- /dev/null
+++ b/tests/topotests/bgp_srv6l3vpn_sid/r1/vpnv6_rib.json
@@ -0,0 +1,169 @@
+{
+  "vrfName": "default",
+  "tableVersion": 2,
+  "routerId": "192.0.2.1",
+  "defaultLocPrf": 100,
+  "localAS": 1,
+  "routes": {
+    "routeDistinguishers": {
+      "1:10": {
+        "2001:1::/64": [
+          {
+            "valid": true,
+            "bestpath": true,
+            "selectionReason": "First path received",
+            "pathFrom": "external",
+            "prefix": "2001:1::",
+            "prefixLen": 64,
+            "network": "2001:1::/64",
+            "metric": 0,
+            "weight": 32768,
+            "peerId": "(unspec)",
+            "path": "",
+            "origin": "incomplete",
+            "announceNexthopSelf": true,
+            "nhVrfName": "vrf10",
+            "nexthops": [
+              {
+                "ip": "::",
+                "hostname": "r1",
+                "afi": "ipv6",
+                "used": true
+              }
+            ]
+          }
+        ],
+        "2001:3::/64": [
+          {
+            "valid": true,
+            "bestpath": true,
+            "selectionReason": "First path received",
+            "pathFrom": "external",
+            "prefix": "2001:3::",
+            "prefixLen": 64,
+            "network": "2001:3::/64",
+            "metric": 0,
+            "weight": 32768,
+            "peerId": "(unspec)",
+            "path": "",
+            "origin": "incomplete",
+            "announceNexthopSelf": true,
+            "nhVrfName": "vrf10",
+            "nexthops": [
+              {
+                "ip": "::",
+                "hostname": "r1",
+                "afi": "ipv6",
+                "used": true
+              }
+            ]
+          }
+        ]
+      },
+      "1:20": {
+        "2001:5::/64": [
+          {
+            "valid": true,
+            "bestpath": true,
+            "selectionReason": "First path received",
+            "pathFrom": "external",
+            "prefix": "2001:5::",
+            "prefixLen": 64,
+            "network": "2001:5::/64",
+            "metric": 0,
+            "weight": 32768,
+            "peerId": "(unspec)",
+            "path": "",
+            "origin": "incomplete",
+            "announceNexthopSelf": true,
+            "nhVrfName": "vrf20",
+            "nexthops": [
+              {
+                "ip": "::",
+                "hostname": "r1",
+                "afi": "ipv6",
+                "used": true
+              }
+            ]
+          }
+        ]
+      },
+      "2:10": {
+        "2001:2::/64": [
+          {
+            "valid": true,
+            "bestpath": true,
+            "selectionReason": "First path received",
+            "pathFrom": "external",
+            "prefix": "2001:2::",
+            "prefixLen": 64,
+            "network": "2001:2::/64",
+            "metric": 0,
+            "weight": 0,
+            "peerId": "2001::2",
+            "path": "2",
+            "origin": "incomplete",
+            "nexthops": [
+              {
+                "ip": "2001::2",
+                "hostname": "r2",
+                "afi": "ipv6",
+                "used": true
+              }
+            ]
+          }
+        ]
+      },
+      "2:20": {
+        "2001:4::/64": [
+          {
+            "valid": true,
+            "bestpath": true,
+            "selectionReason": "First path received",
+            "pathFrom": "external",
+            "prefix": "2001:4::",
+            "prefixLen": 64,
+            "network": "2001:4::/64",
+            "metric": 0,
+            "weight": 0,
+            "peerId": "2001::2",
+            "path": "2",
+            "origin": "incomplete",
+            "nexthops": [
+              {
+                "ip": "2001::2",
+                "hostname": "r2",
+                "afi": "ipv6",
+                "used": true
+              }
+            ]
+          }
+        ],
+        "2001:6::/64": [
+          {
+            "valid": true,
+            "bestpath": true,
+            "selectionReason": "First path received",
+            "pathFrom": "external",
+            "prefix": "2001:6::",
+            "prefixLen": 64,
+            "network": "2001:6::/64",
+            "metric": 0,
+            "weight": 0,
+            "peerId": "2001::2",
+            "path": "2",
+            "origin": "incomplete",
+            "nexthops": [
+              {
+                "ip": "2001::2",
+                "hostname": "r2",
+                "afi": "ipv6",
+                "used": true
+              }
+            ]
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_afv4_auto_no_sid_rib.json b/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_afv4_auto_no_sid_rib.json
new file mode 100644
index 0000000..9783c7e
--- /dev/null
+++ b/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_afv4_auto_no_sid_rib.json
@@ -0,0 +1,23 @@
+{
+  "192.168.1.0\/24":[
+    {
+      "prefix":"192.168.1.0\/24",
+      "protocol":"connected",
+      "vrfName":"vrf10",
+      "selected":true,
+      "destSelected":true,
+      "distance":0,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "directlyConnected":true
+	}
+      ]
+    }
+  ]
+}
+
diff --git a/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_afv4_auto_sid_rib.json b/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_afv4_auto_sid_rib.json
new file mode 100644
index 0000000..80c1acf
--- /dev/null
+++ b/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_afv4_auto_sid_rib.json
@@ -0,0 +1,53 @@
+{
+  "192.168.1.0\/24":[
+    {
+      "prefix":"192.168.1.0\/24",
+      "protocol":"connected",
+      "vrfName":"vrf10",
+      "selected":true,
+      "destSelected":true,
+      "distance":0,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "directlyConnected":true
+	}
+      ]
+    }
+  ],
+  "192.168.2.0\/24":[
+    {
+      "prefix":"192.168.2.0\/24",
+      "protocol":"bgp",
+      "vrfName":"vrf10",
+      "selected":true,
+      "destSelected":true,
+      "distance":20,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "afi":"ipv6",
+          "labels":[
+            16
+          ],
+          "weight":1,
+          "seg6local":{
+            "action":"unspec"
+          },
+          "seg6":{
+            "segs":"2001:db8:2:2:1::"
+          }
+        }
+      ]
+    }
+  ]
+}
+
diff --git a/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_afv4_manual_no_sid_rib.json b/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_afv4_manual_no_sid_rib.json
new file mode 100644
index 0000000..9783c7e
--- /dev/null
+++ b/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_afv4_manual_no_sid_rib.json
@@ -0,0 +1,23 @@
+{
+  "192.168.1.0\/24":[
+    {
+      "prefix":"192.168.1.0\/24",
+      "protocol":"connected",
+      "vrfName":"vrf10",
+      "selected":true,
+      "destSelected":true,
+      "distance":0,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "directlyConnected":true
+	}
+      ]
+    }
+  ]
+}
+
diff --git a/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_afv4_manual_sid_rib.json b/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_afv4_manual_sid_rib.json
new file mode 100644
index 0000000..07ca64b
--- /dev/null
+++ b/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_afv4_manual_sid_rib.json
@@ -0,0 +1,54 @@
+{
+  "192.168.1.0\/24":[
+    {
+      "prefix":"192.168.1.0\/24",
+      "protocol":"connected",
+      "vrfName":"vrf10",
+      "selected":true,
+      "destSelected":true,
+      "distance":0,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "directlyConnected":true
+	}
+      ]
+    }
+  ],
+  "192.168.2.0\/24":[
+    {
+      "prefix":"192.168.2.0\/24",
+      "protocol":"bgp",
+      "vrfName":"vrf10",
+      "selected":true,
+      "destSelected":true,
+      "distance":20,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "ip":"2001::2",
+          "afi":"ipv6",
+          "labels":[
+            128
+          ],
+          "weight":1,
+          "seg6local":{
+            "action":"unspec"
+          },
+          "seg6":{
+            "segs":"2001:db8:2:2:8::"
+          }
+        }
+      ]
+    }
+  ]
+}
+
diff --git a/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_afv6_auto_no_sid_rib.json b/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_afv6_auto_no_sid_rib.json
new file mode 100644
index 0000000..6ac8dac
--- /dev/null
+++ b/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_afv6_auto_no_sid_rib.json
@@ -0,0 +1,77 @@
+{
+  "2001:1::\/64":[
+    {
+      "prefix":"2001:1::\/64",
+      "protocol":"connected",
+      "vrfName":"vrf10",
+      "selected":true,
+      "destSelected":true,
+      "distance":0,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "directlyConnected":true
+	}
+      ]
+    }
+  ],
+  "2001:3::\/64":[
+    {
+      "prefix":"2001:3::\/64",
+      "protocol":"connected",
+      "vrfName":"vrf10",
+      "selected":true,
+      "destSelected":true,
+      "distance":0,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "directlyConnected":true
+	}
+      ]
+    }
+  ],
+  "fe80::\/64":[
+    {
+      "prefix":"fe80::\/64",
+      "protocol":"connected",
+      "vrfName":"vrf10",
+      "distance":0,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "directlyConnected":true
+	}
+      ]
+    },
+    {
+      "prefix":"fe80::\/64",
+      "protocol":"connected",
+      "vrfName":"vrf10",
+      "distance":0,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "directlyConnected":true
+	}
+      ]
+    }
+  ]
+}
+
diff --git a/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_afv6_auto_sid_rib.json b/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_afv6_auto_sid_rib.json
new file mode 100644
index 0000000..fac3d1d
--- /dev/null
+++ b/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_afv6_auto_sid_rib.json
@@ -0,0 +1,107 @@
+{
+  "2001:1::\/64":[
+    {
+      "prefix":"2001:1::\/64",
+      "protocol":"connected",
+      "vrfName":"vrf10",
+      "selected":true,
+      "destSelected":true,
+      "distance":0,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "directlyConnected":true
+	}
+      ]
+    }
+  ],
+  "2001:2::\/64":[
+    {
+      "prefix":"2001:2::\/64",
+      "protocol":"bgp",
+      "vrfName":"vrf10",
+      "selected":true,
+      "destSelected":true,
+      "distance":20,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "afi":"ipv6",
+          "labels":[
+            32
+          ],
+          "weight":1,
+          "seg6local":{
+            "action":"unspec"
+          },
+          "seg6":{
+            "segs":"2001:db8:2:2:2::"
+          }
+        }
+      ]
+    }
+  ],
+  "2001:3::\/64":[
+    {
+      "prefix":"2001:3::\/64",
+      "protocol":"connected",
+      "vrfName":"vrf10",
+      "selected":true,
+      "destSelected":true,
+      "distance":0,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "directlyConnected":true
+	}
+      ]
+    }
+  ],
+  "fe80::\/64":[
+    {
+      "prefix":"fe80::\/64",
+      "protocol":"connected",
+      "vrfName":"vrf10",
+      "distance":0,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "directlyConnected":true
+	} 
+      ]
+    },
+    {
+      "prefix":"fe80::\/64",
+      "protocol":"connected",
+      "vrfName":"vrf10",
+      "distance":0,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "directlyConnected":true
+	}
+      ]
+    }
+  ]
+}
+
diff --git a/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_afv6_manual_no_sid_rib.json b/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_afv6_manual_no_sid_rib.json
new file mode 100644
index 0000000..69ce312
--- /dev/null
+++ b/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_afv6_manual_no_sid_rib.json
@@ -0,0 +1,77 @@
+{
+  "2001:1::\/64":[
+    {
+      "prefix":"2001:1::\/64",
+      "protocol":"connected",
+      "vrfName":"vrf10",
+      "selected":true,
+      "destSelected":true,
+      "distance":0,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "directlyConnected":true
+	}
+      ]
+    }
+  ],
+  "2001:3::\/64":[
+    {
+      "prefix":"2001:3::\/64",
+      "protocol":"connected",
+      "vrfName":"vrf10",
+      "selected":true,
+      "destSelected":true,
+      "distance":0,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "directlyConnected":true
+	}
+      ]
+    }
+  ],
+  "fe80::\/64":[
+    {
+      "prefix":"fe80::\/64",
+      "protocol":"connected",
+      "vrfName":"vrf10",
+      "distance":0,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "directlyConnected":true
+      	}
+      ]
+    },
+    {
+      "prefix":"fe80::\/64",
+      "protocol":"connected",
+      "vrfName":"vrf10",
+      "distance":0,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "directlyConnected":true
+	}
+      ]
+    }
+  ]
+}
+
diff --git a/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_afv6_manual_sid_rib.json b/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_afv6_manual_sid_rib.json
new file mode 100644
index 0000000..04e2305
--- /dev/null
+++ b/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_afv6_manual_sid_rib.json
@@ -0,0 +1,106 @@
+{
+  "2001:1::\/64":[
+    {
+      "prefix":"2001:1::\/64",
+      "protocol":"connected",
+      "vrfName":"vrf10",
+      "selected":true,
+      "destSelected":true,
+      "distance":0,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "directlyConnected":true
+	}
+      ]
+    }
+  ],
+  "2001:2::\/64":[
+    {
+      "prefix":"2001:2::\/64",
+      "protocol":"bgp",
+      "vrfName":"vrf10",
+      "selected":true,
+      "destSelected":true,
+      "distance":20,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "afi":"ipv6",
+          "labels":[
+            128
+          ],
+          "weight":1,
+          "seg6local":{
+            "action":"unspec"
+          },
+          "seg6":{
+            "segs":"2001:db8:2:2:8::"
+          }
+        }
+      ]
+    }
+  ],
+  "2001:3::\/64":[
+    {
+      "prefix":"2001:3::\/64",
+      "protocol":"connected",
+      "vrfName":"vrf10",
+      "selected":true,
+      "destSelected":true,
+      "distance":0,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "directlyConnected":true
+	}
+      ]
+    }
+  ],
+  "fe80::\/64":[
+    {
+      "prefix":"fe80::\/64",
+      "protocol":"connected",
+      "vrfName":"vrf10",
+      "distance":0,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "directlyConnected":true
+	}
+      ]
+    },
+    {
+      "prefix":"fe80::\/64",
+      "protocol":"connected",
+      "vrfName":"vrf10",
+      "distance":0,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "directlyConnected":true
+	}
+      ]
+    }
+  ]
+}
diff --git a/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_pervrf4_auto_sid_rib.json b/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_pervrf4_auto_sid_rib.json
new file mode 100644
index 0000000..3cac156
--- /dev/null
+++ b/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_pervrf4_auto_sid_rib.json
@@ -0,0 +1,54 @@
+{
+  "192.168.1.0\/24":[
+    {
+      "prefix":"192.168.1.0\/24",
+      "protocol":"connected",
+      "vrfName":"vrf10",
+      "selected":true,
+      "destSelected":true,
+      "distance":0,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "directlyConnected":true
+	}
+      ]
+    }
+  ],
+  "192.168.2.0\/24":[
+    {
+      "prefix":"192.168.2.0\/24",
+      "protocol":"bgp",
+      "vrfName":"vrf10",
+      "selected":true,
+      "destSelected":true,
+      "distance":20,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "ip":"2001::2",
+          "afi":"ipv6",
+          "labels":[
+            16
+          ],
+          "weight":1,
+          "seg6local":{
+            "action":"unspec"
+          },
+          "seg6":{
+            "segs":"2001:db8:2:2:1::"
+          }
+        }
+      ]
+    }
+  ]
+}
+
diff --git a/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_pervrf4_manual_sid_rib.json b/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_pervrf4_manual_sid_rib.json
new file mode 100644
index 0000000..163e9d6
--- /dev/null
+++ b/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_pervrf4_manual_sid_rib.json
@@ -0,0 +1,53 @@
+{
+  "192.168.1.0\/24":[
+    {
+      "prefix":"192.168.1.0\/24",
+      "protocol":"connected",
+      "vrfName":"vrf10",
+      "selected":true,
+      "destSelected":true,
+      "distance":0,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "directlyConnected":true
+	}
+      ]
+    }
+  ],
+  "192.168.2.0\/24":[
+    {
+      "prefix":"192.168.2.0\/24",
+      "protocol":"bgp",
+      "vrfName":"vrf10",
+      "selected":true,
+      "destSelected":true,
+      "distance":20,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "ip":"2001::2",
+          "afi":"ipv6",
+          "labels":[
+            128
+          ],
+          "weight":1,
+          "seg6local":{
+            "action":"unspec"
+          },
+          "seg6":{
+            "segs":"2001:db8:2:2:8::"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_pervrf6_auto_sid_rib.json b/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_pervrf6_auto_sid_rib.json
new file mode 100644
index 0000000..1313f20
--- /dev/null
+++ b/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_pervrf6_auto_sid_rib.json
@@ -0,0 +1,106 @@
+{
+  "2001:1::\/64":[
+    {
+      "prefix":"2001:1::\/64",
+      "protocol":"connected",
+      "vrfName":"vrf10",
+      "selected":true,
+      "destSelected":true,
+      "distance":0,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "directlyConnected":true
+	}
+      ]
+    }
+  ],
+  "2001:2::\/64":[
+    {
+      "prefix":"2001:2::\/64",
+      "protocol":"bgp",
+      "vrfName":"vrf10",
+      "selected":true,
+      "destSelected":true,
+      "distance":20,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "afi":"ipv6",
+          "labels":[
+            16
+          ],
+          "weight":1,
+          "seg6local":{
+            "action":"unspec"
+          },
+          "seg6":{
+            "segs":"2001:db8:2:2:1::"
+          }
+        }
+      ]
+    }
+  ],
+  "2001:3::\/64":[
+    {
+      "prefix":"2001:3::\/64",
+      "protocol":"connected",
+      "vrfName":"vrf10",
+      "selected":true,
+      "destSelected":true,
+      "distance":0,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "directlyConnected":true
+	}
+      ]
+    }
+  ],
+  "fe80::\/64":[
+    {
+      "prefix":"fe80::\/64",
+      "protocol":"connected",
+      "vrfName":"vrf10",
+      "distance":0,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "directlyConnected":true
+	}
+      ]
+    },
+    {
+      "prefix":"fe80::\/64",
+      "protocol":"connected",
+      "vrfName":"vrf10",
+      "distance":0,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "directlyConnected":true
+	}
+      ]
+    }
+  ]
+}
diff --git a/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_pervrf6_manual_sid_rib.json b/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_pervrf6_manual_sid_rib.json
new file mode 100644
index 0000000..51f249b
--- /dev/null
+++ b/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_pervrf6_manual_sid_rib.json
@@ -0,0 +1,106 @@
+{
+  "2001:1::\/64":[
+    {
+      "prefix":"2001:1::\/64",
+      "protocol":"connected",
+      "vrfName":"vrf10",
+      "selected":true,
+      "destSelected":true,
+      "distance":0,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "directlyConnected":true
+	}
+      ]
+    }
+  ],
+  "2001:2::\/64":[
+    {
+      "prefix":"2001:2::\/64",
+      "protocol":"bgp",
+      "vrfName":"vrf10",
+      "selected":true,
+      "destSelected":true,
+      "distance":20,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "afi":"ipv6",
+          "labels":[
+            128
+          ],
+          "weight":1,
+          "seg6local":{
+            "action":"unspec"
+          },
+          "seg6":{
+            "segs":"2001:db8:2:2:8::"
+          }
+        }
+      ]
+    }
+  ],
+  "2001:3::\/64":[
+    {
+      "prefix":"2001:3::\/64",
+      "protocol":"connected",
+      "vrfName":"vrf10",
+      "selected":true,
+      "destSelected":true,
+      "distance":0,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "directlyConnected":true
+	}
+      ]
+    }
+  ],
+  "fe80::\/64":[
+    {
+      "prefix":"fe80::\/64",
+      "protocol":"connected",
+      "vrfName":"vrf10",
+      "distance":0,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+	  "directlyConnected":true
+	}
+      ]
+    },
+    {
+      "prefix":"fe80::\/64",
+      "protocol":"connected",
+      "vrfName":"vrf10",
+      "distance":0,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "directlyConnected":true
+	}
+      ]
+    }
+  ]
+}
diff --git a/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_pervrf_auto_no_sid_rib.json b/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_pervrf_auto_no_sid_rib.json
new file mode 100644
index 0000000..6ac8dac
--- /dev/null
+++ b/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_pervrf_auto_no_sid_rib.json
@@ -0,0 +1,77 @@
+{
+  "2001:1::\/64":[
+    {
+      "prefix":"2001:1::\/64",
+      "protocol":"connected",
+      "vrfName":"vrf10",
+      "selected":true,
+      "destSelected":true,
+      "distance":0,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "directlyConnected":true
+	}
+      ]
+    }
+  ],
+  "2001:3::\/64":[
+    {
+      "prefix":"2001:3::\/64",
+      "protocol":"connected",
+      "vrfName":"vrf10",
+      "selected":true,
+      "destSelected":true,
+      "distance":0,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "directlyConnected":true
+	}
+      ]
+    }
+  ],
+  "fe80::\/64":[
+    {
+      "prefix":"fe80::\/64",
+      "protocol":"connected",
+      "vrfName":"vrf10",
+      "distance":0,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "directlyConnected":true
+	}
+      ]
+    },
+    {
+      "prefix":"fe80::\/64",
+      "protocol":"connected",
+      "vrfName":"vrf10",
+      "distance":0,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "directlyConnected":true
+	}
+      ]
+    }
+  ]
+}
+
diff --git a/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_pervrf_manual_no_sid_rib.json b/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_pervrf_manual_no_sid_rib.json
new file mode 100644
index 0000000..1c3dad0
--- /dev/null
+++ b/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_pervrf_manual_no_sid_rib.json
@@ -0,0 +1,22 @@
+{
+  "192.168.1.0\/24":[
+    {
+      "prefix":"192.168.1.0\/24",
+      "protocol":"connected",
+      "vrfName":"vrf10",
+      "selected":true,
+      "destSelected":true,
+      "distance":0,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "directlyConnected":true
+	}
+      ]
+    }
+  ]
+}
diff --git a/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_rib.json b/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_rib.json
new file mode 100644
index 0000000..9579bb1
--- /dev/null
+++ b/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf10_rib.json
@@ -0,0 +1,112 @@
+{
+  "2001:1::\/64":[
+    {
+      "prefix":"2001:1::\/64",
+      "protocol":"connected",
+      "vrfName":"vrf10",
+      "selected":true,
+      "destSelected":true,
+      "distance":0,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "directlyConnected":true,
+          "active":true
+        }
+      ]
+    }
+  ],
+  "2001:2::\/64":[
+    {
+      "prefix":"2001:2::\/64",
+      "protocol":"bgp",
+      "vrfName":"vrf10",
+      "selected":true,
+      "destSelected":true,
+      "distance":20,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "afi":"ipv6",
+          "vrf":"default",
+          "active":true,
+          "labels":[
+            32
+          ],
+          "weight":1,
+          "seg6local":{
+            "action":"unspec"
+          },
+          "seg6":{
+            "segs":"2001:db8:2:2:2::"
+          }
+        }
+      ]
+    }
+  ],
+  "2001:3::\/64":[
+    {
+      "prefix":"2001:3::\/64",
+      "protocol":"connected",
+      "vrfName":"vrf10",
+      "selected":true,
+      "destSelected":true,
+      "distance":0,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "directlyConnected":true,
+          "active":true
+        }
+      ]
+    }
+  ],
+  "fe80::\/64":[
+    {
+      "prefix":"fe80::\/64",
+      "protocol":"connected",
+      "vrfName":"vrf10",
+      "distance":0,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "directlyConnected":true,
+          "active":true
+        }
+      ]
+    },
+    {
+      "prefix":"fe80::\/64",
+      "protocol":"connected",
+      "vrfName":"vrf10",
+      "distance":0,
+      "metric":0,
+      "installed":true,
+      "table":10,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "directlyConnected":true,
+          "active":true
+        }
+      ]
+    }
+  ]
+}
diff --git a/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf20_rib.json b/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf20_rib.json
new file mode 100644
index 0000000..25f146f
--- /dev/null
+++ b/tests/topotests/bgp_srv6l3vpn_sid/r1/vrf20_rib.json
@@ -0,0 +1,106 @@
+{
+  "2001:4::\/64":[
+    {
+      "prefix":"2001:4::\/64",
+      "protocol":"bgp",
+      "vrfName":"vrf20",
+      "selected":true,
+      "destSelected":true,
+      "distance":20,
+      "metric":0,
+      "installed":true,
+      "table":20,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "afi":"ipv6",
+          "vrf":"default",
+          "active":true,
+          "labels":[
+            48
+          ],
+          "weight":1,
+          "seg6local":{
+            "action":"unspec"
+          },
+          "seg6":{
+            "segs":"2001:db8:2:2:3::"
+          }
+        }
+      ]
+    }
+  ],
+  "2001:5::\/64":[
+    {
+      "prefix":"2001:5::\/64",
+      "protocol":"connected",
+      "vrfName":"vrf20",
+      "selected":true,
+      "destSelected":true,
+      "distance":0,
+      "metric":0,
+      "installed":true,
+      "table":20,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "directlyConnected":true,
+          "active":true
+        }
+      ]
+    }
+  ],
+  "2001:6::\/64":[
+    {
+      "prefix":"2001:6::\/64",
+      "protocol":"bgp",
+      "vrfName":"vrf20",
+      "selected":true,
+      "destSelected":true,
+      "distance":20,
+      "metric":0,
+      "installed":true,
+      "table":20,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "afi":"ipv6",
+          "vrf":"default",
+          "active":true,
+          "labels":[
+            48
+          ],
+          "weight":1,
+          "seg6local":{
+            "action":"unspec"
+          },
+          "seg6":{
+            "segs":"2001:db8:2:2:3::"
+          }
+        }
+      ]
+    }
+  ],
+  "fe80::\/64":[
+    {
+      "prefix":"fe80::\/64",
+      "protocol":"connected",
+      "vrfName":"vrf20",
+      "distance":0,
+      "metric":0,
+      "installed":true,
+      "table":20,
+      "nexthops":[
+        {
+          "flags":3,
+          "fib":true,
+          "directlyConnected":true,
+          "active":true
+        }
+      ]
+    }
+  ]
+}
diff --git a/tests/topotests/bgp_srv6l3vpn_sid/r1/zebra.conf b/tests/topotests/bgp_srv6l3vpn_sid/r1/zebra.conf
new file mode 100644
index 0000000..cf31a5c
--- /dev/null
+++ b/tests/topotests/bgp_srv6l3vpn_sid/r1/zebra.conf
@@ -0,0 +1,43 @@
+log file zebra.log
+!
+hostname r1
+password zebra
+!
+log stdout notifications
+log monitor notifications
+log commands
+!
+!debug zebra packet
+!debug zebra dplane
+!debug zebra kernel
+!
+interface eth0
+ ipv6 address 2001::1/64
+!
+interface eth1 vrf vrf10
+ ipv6 address 2001:1::1/64
+ ip address 192.168.1.1/24
+!
+interface eth2 vrf vrf10
+ ipv6 address 2001:3::1/64
+!
+interface eth3 vrf vrf20
+ ipv6 address 2001:5::1/64
+!
+segment-routing
+ srv6
+  locators
+   locator loc1
+    prefix 2001:db8:1:1::/64 block-len 40 node-len 24 func-bits 16
+  !
+ !
+!
+ip forwarding
+ipv6 forwarding
+!
+ipv6 route 2001:db8:2:1::/64 2001::2
+ipv6 route 2001:db8:2:2::/64 2001::2
+ipv6 route 2001:db8:2:3::/64 2001::2
+!
+line vty
+!