Adding upstream version 8.4.4.upstream/8.4.4upstream

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

12 files changed, 380 insertions, 0 deletions

diff --git a/tests/topotests/bgp_peer_type_multipath_relax/r1/bgpd.conf b/tests/topotests/bgp_peer_type_multipath_relax/r1/bgpd.conf
new file mode 100644
index 0000000..038f108
--- /dev/null
+++ b/tests/topotests/bgp_peer_type_multipath_relax/r1/bgpd.conf
@@ -0,0 +1,16 @@
+!
+router bgp 64510
+ bgp router-id 10.0.1.1
+ no bgp ebgp-requires-policy
+ bgp confederation identifier 64501
+ bgp confederation peers 64511
+ bgp bestpath as-path multipath-relax
+ bgp bestpath compare-routerid
+ bgp bestpath peer-type multipath-relax
+ neighbor 10.0.1.2 remote-as 64510
+ neighbor 10.0.3.2 remote-as 64502
+ neighbor 10.0.4.2 remote-as 64503
+ neighbor 10.0.5.2 remote-as 64511
+!
+line vty
+!
diff --git a/tests/topotests/bgp_peer_type_multipath_relax/r1/multipath.json b/tests/topotests/bgp_peer_type_multipath_relax/r1/multipath.json
new file mode 100644
index 0000000..11dad78
--- /dev/null
+++ b/tests/topotests/bgp_peer_type_multipath_relax/r1/multipath.json
@@ -0,0 +1,50 @@
+{
+ "routes": { "203.0.113.0/30": [
+  {
+    "valid":true,
+    "multipath":true,
+    "pathFrom":"external",
+    "peerId":"10.0.5.2"
+  },
+  {
+    "valid":true,
+    "bestpath":true,
+    "selectionReason":"Peer Type",
+    "pathFrom":"external",
+    "peerId":"10.0.4.2"
+  },
+  {
+    "valid":true,
+    "multipath":true,
+    "pathFrom":"internal",
+    "peerId":"10.0.1.2"
+  } 
+],"203.0.113.4/30": [
+  {
+    "valid":true,
+    "bestpath":true,
+    "selectionReason":"Confed Peer Type",
+    "pathFrom":"external",
+    "peerId":"10.0.5.2"
+  },
+  {
+    "valid":true,
+    "multipath":true,
+    "pathFrom":"internal",
+    "peerId":"10.0.1.2"
+  }
+],"203.0.113.8/30": [
+  {
+    "valid":true,
+    "multipath":true,
+    "pathFrom":"external",
+    "peerId":"10.0.4.2"
+  },
+  {
+    "valid":true,
+    "bestpath":true,
+    "selectionReason":"Router ID",
+    "pathFrom":"external",
+    "peerId":"10.0.3.2"
+  }
+] }  }
diff --git a/tests/topotests/bgp_peer_type_multipath_relax/r1/not-multipath.json b/tests/topotests/bgp_peer_type_multipath_relax/r1/not-multipath.json
new file mode 100644
index 0000000..c621832
--- /dev/null
+++ b/tests/topotests/bgp_peer_type_multipath_relax/r1/not-multipath.json
@@ -0,0 +1,50 @@
+{
+ "routes": { "203.0.113.0/30": [
+  {
+    "valid":true,
+    "multipath":null,
+    "pathFrom":"external",
+    "peerId":"10.0.5.2"
+  },
+  {
+    "valid":true,
+    "bestpath":true,
+    "selectionReason":"Peer Type",
+    "pathFrom":"external",
+    "peerId":"10.0.4.2"
+  },
+  {
+    "valid":true,
+    "multipath":null,
+    "pathFrom":"internal",
+    "peerId":"10.0.1.2"
+  } 
+],"203.0.113.4/30": [
+  {
+    "valid":true,
+    "bestpath":true,
+    "selectionReason":"Confed Peer Type",
+    "pathFrom":"external",
+    "peerId":"10.0.5.2"
+  },
+  {
+    "valid":true,
+    "multipath":null,
+    "pathFrom":"internal",
+    "peerId":"10.0.1.2"
+  }
+],"203.0.113.8/30": [
+  {
+    "valid":true,
+    "multipath":true,
+    "pathFrom":"external",
+    "peerId":"10.0.4.2"
+  },
+  {
+    "valid":true,
+    "bestpath":true,
+    "selectionReason":"Router ID",
+    "pathFrom":"external",
+    "peerId":"10.0.3.2"
+  }
+] }  }
diff --git a/tests/topotests/bgp_peer_type_multipath_relax/r1/prefix1-eBGP-confed.json b/tests/topotests/bgp_peer_type_multipath_relax/r1/prefix1-eBGP-confed.json
new file mode 100644
index 0000000..22ec2c2
--- /dev/null
+++ b/tests/topotests/bgp_peer_type_multipath_relax/r1/prefix1-eBGP-confed.json
@@ -0,0 +1,33 @@
+{
+  "203.0.113.0\/30":[
+    {
+      "prefix":"203.0.113.0\/30",
+      "protocol":"bgp",
+      "installed":true,
+      "internalNextHopNum":4,
+      "internalNextHopActiveNum":4,
+      "nexthops":[
+        {
+          "ip":"198.51.100.2",
+          "active":true,
+          "recursive":true
+        },
+        {
+          "fib":true,
+          "ip":"10.0.3.2",
+          "active":true
+        },
+        {
+          "ip":"198.51.100.10",
+          "active":true,
+          "recursive":true
+        },
+        {
+          "fib":true,
+          "ip":"10.0.3.2",
+          "active":true
+        }
+      ]
+    }
+  ]
+}
diff --git a/tests/topotests/bgp_peer_type_multipath_relax/r1/prefix1-eBGP-iBGP.json b/tests/topotests/bgp_peer_type_multipath_relax/r1/prefix1-eBGP-iBGP.json
new file mode 100644
index 0000000..facddcd
--- /dev/null
+++ b/tests/topotests/bgp_peer_type_multipath_relax/r1/prefix1-eBGP-iBGP.json
@@ -0,0 +1,33 @@
+{
+  "203.0.113.0\/30":[
+    {
+      "prefix":"203.0.113.0\/30",
+      "protocol":"bgp",
+      "installed":true,
+      "internalNextHopNum":4,
+      "internalNextHopActiveNum":4,
+      "nexthops":[
+        {
+          "ip":"198.51.100.1",
+          "active":true,
+          "recursive":true
+        },
+        {
+          "fib":true,
+          "ip":"10.0.3.2",
+          "active":true
+        },
+        {
+          "ip":"198.51.100.10",
+          "active":true,
+          "recursive":true
+        },
+        {
+          "fib":true,
+          "ip":"10.0.3.2",
+          "active":true
+        }
+      ]
+    }
+  ]
+}
diff --git a/tests/topotests/bgp_peer_type_multipath_relax/r1/prefix1-no-recursive.json b/tests/topotests/bgp_peer_type_multipath_relax/r1/prefix1-no-recursive.json
new file mode 100644
index 0000000..5399cee
--- /dev/null
+++ b/tests/topotests/bgp_peer_type_multipath_relax/r1/prefix1-no-recursive.json
@@ -0,0 +1,35 @@
+{
+  "prefix":"203.0.113.0\/30",
+  "paths":[
+    {
+      "valid":false,
+      "peer":{
+        "peerId":"10.0.4.2",
+        "routerId":"10.0.4.2",
+        "type":"external"
+      }
+    },
+    { 
+      "valid":true,
+      "multipath":true,
+      "bestpath":{
+        "overall":true,
+        "selectionReason":"Confed Peer Type"
+      },
+      "peer":{
+        "peerId":"10.0.5.2",
+        "routerId":"10.0.5.2",
+        "type":"confed-external"
+      }
+    },
+    { 
+      "valid":true,
+      "multipath":true,
+      "peer":{
+        "peerId":"10.0.1.2",
+        "routerId":"10.0.1.2",
+        "type":"confed-internal"
+      }
+    }
+  ]
+}
diff --git a/tests/topotests/bgp_peer_type_multipath_relax/r1/prefix1-recursive.json b/tests/topotests/bgp_peer_type_multipath_relax/r1/prefix1-recursive.json
new file mode 100644
index 0000000..7da95ae
--- /dev/null
+++ b/tests/topotests/bgp_peer_type_multipath_relax/r1/prefix1-recursive.json
@@ -0,0 +1,36 @@
+{   
+  "prefix":"203.0.113.0\/30",
+  "paths":[
+    {
+      "valid":true,
+      "multipath":true,
+      "bestpath":{
+        "overall":true,
+        "selectionReason":"Peer Type"
+      },
+      "peer":{
+        "peerId":"10.0.4.2",
+        "routerId":"10.0.4.2",
+        "type":"external"
+      } 
+    },
+    { 
+      "valid":true,
+      "multipath":true,
+      "peer":{
+        "peerId":"10.0.5.2",
+        "routerId":"10.0.5.2",
+        "type":"confed-external"
+      }
+    },
+    { 
+      "valid":true,
+      "multipath":true,
+      "peer":{
+        "peerId":"10.0.1.2",
+        "routerId":"10.0.1.2",
+        "type":"confed-internal"
+      }
+    }
+  ]
+}
diff --git a/tests/topotests/bgp_peer_type_multipath_relax/r1/prefix1.json b/tests/topotests/bgp_peer_type_multipath_relax/r1/prefix1.json
new file mode 100644
index 0000000..a90669a
--- /dev/null
+++ b/tests/topotests/bgp_peer_type_multipath_relax/r1/prefix1.json
@@ -0,0 +1,33 @@
+{
+  "prefix":"203.0.113.0\/30",
+  "paths":[
+    {
+      "multipath":true,
+      "peer":{
+        "peerId":"10.0.5.2",
+        "routerId":"10.0.5.2",
+        "type":"confed-external"
+      }
+    },
+    {
+      "multipath":true,
+      "bestpath":{
+        "overall":true,
+        "selectionReason":"Peer Type"
+      },
+      "peer":{
+        "peerId":"10.0.4.2",
+        "routerId":"10.0.4.2",
+        "type":"external"
+      }
+    },
+    {
+      "multipath":true,
+      "peer":{
+        "peerId":"10.0.1.2",
+        "routerId":"10.0.1.2",
+        "type":"confed-internal"
+      }
+    }
+  ]
+}
diff --git a/tests/topotests/bgp_peer_type_multipath_relax/r1/prefix3-ip-route.json b/tests/topotests/bgp_peer_type_multipath_relax/r1/prefix3-ip-route.json
new file mode 100644
index 0000000..1bf38ef
--- /dev/null
+++ b/tests/topotests/bgp_peer_type_multipath_relax/r1/prefix3-ip-route.json
@@ -0,0 +1,23 @@
+{
+  "203.0.113.8\/30":[
+    {
+      "prefix":"203.0.113.8\/30",
+      "protocol":"bgp",
+      "installed":true,
+      "internalNextHopNum":2,
+      "internalNextHopActiveNum":1,
+      "nexthops":[
+        {
+          "fib":true,
+          "ip":"10.0.3.2",
+          "active":true
+        },
+        {
+          "fib":null,
+          "ip":"198.51.100.10",
+          "active":null
+        }
+      ]
+    }
+  ]
+}
diff --git a/tests/topotests/bgp_peer_type_multipath_relax/r1/prefix3-no-recursive.json b/tests/topotests/bgp_peer_type_multipath_relax/r1/prefix3-no-recursive.json
new file mode 100644
index 0000000..33d0f2d
--- /dev/null
+++ b/tests/topotests/bgp_peer_type_multipath_relax/r1/prefix3-no-recursive.json
@@ -0,0 +1,21 @@
+{       
+  "prefix":"203.0.113.8\/30",
+  "paths":[
+    { 
+      "valid":false,      
+      "peer":{
+        "peerId":"10.0.4.2",
+        "routerId":"10.0.4.2",
+        "type":"external"
+      }
+    },
+    { 
+      "valid":true,
+      "peer":{
+        "peerId":"10.0.3.2",
+        "routerId":"10.0.3.2",
+        "type":"external"
+      }
+    }
+  ] 
+}   
diff --git a/tests/topotests/bgp_peer_type_multipath_relax/r1/prefix3-recursive.json b/tests/topotests/bgp_peer_type_multipath_relax/r1/prefix3-recursive.json
new file mode 100644
index 0000000..6ac2512
--- /dev/null
+++ b/tests/topotests/bgp_peer_type_multipath_relax/r1/prefix3-recursive.json
@@ -0,0 +1,23 @@
+{       
+  "prefix":"203.0.113.8\/30",
+  "paths":[
+    { 
+      "valid":true, 
+      "multipath":true,
+      "peer":{
+        "peerId":"10.0.4.2",
+        "routerId":"10.0.4.2",
+        "type":"external"
+      } 
+    },
+    { 
+      "valid":true,
+      "multipath":true,
+      "peer":{
+        "peerId":"10.0.3.2",
+        "routerId":"10.0.3.2",
+        "type":"external"
+      }
+    }
+  ] 
+}
diff --git a/tests/topotests/bgp_peer_type_multipath_relax/r1/zebra.conf b/tests/topotests/bgp_peer_type_multipath_relax/r1/zebra.conf
new file mode 100644
index 0000000..911aa1c
--- /dev/null
+++ b/tests/topotests/bgp_peer_type_multipath_relax/r1/zebra.conf
@@ -0,0 +1,27 @@
+!
+hostname r1
+!
+interface r1-eth0
+ description ExaBGP iBGP peer1
+ ip address 10.0.1.1/24
+ no link-detect
+!
+interface r1-eth1
+ description ExaBGP peer3
+ ip address 10.0.3.1/24
+ no link-detect
+!
+interface r1-eth2
+ description ExaBGP peer4
+ ip address 10.0.4.1/24
+ no link-detect
+!
+interface r1-eth3
+ description r2 confed peer
+ ip address 10.0.5.1/24
+ no link-detect
+!
+ip forwarding
+!
+line vty
+!