tests: improve test bgp_snmp_bgp4v2mib for snmp multi path support

multi path support by snmp implies change in configuration and expected
tests results.

ipv6 trap test output is now ordered to avoid radom result due to
timeline.

Signed-off-by: Francois Dumontet <[email protected]>
Signed-off-by: Philippe Guibert <[email protected]>

tests/topotests/bgp_snmp_bgp4v2mib/r1/bgpd.conf

@@ -1,24 +1,28 @@
 !
+!debug bgp updates
+!
 router bgp 65001
  no bgp ebgp-requires-policy
  no bgp network import-check
  no bgp default ipv4-unicast
- neighbor 192.168.12.2 remote-as external
- neighbor 192.168.12.2 timers 1 3
- neighbor 192.168.12.2 timers connect 1
- neighbor 2001:db8::12:2 remote-as external
- neighbor 2001:db8::12:2 timers 1 3
- neighbor 2001:db8::12:2 timers connect 1
+ neighbor 192.168.12.4 remote-as external
+ neighbor 192.168.12.4 timers 1 3
+ neighbor 192.168.12.4 timers connect 1
+ neighbor 2001:db8::12:4 remote-as external
+ neighbor 2001:db8::12:4 timers 1 3
+ neighbor 2001:db8::12:4 timers connect 1
  !
  address-family ipv4 unicast
   network 10.0.0.0/31 route-map p1
   network 10.0.0.2/32 route-map p2
-  neighbor 192.168.12.2 activate
+  neighbor 192.168.12.4 activate
+  neighbor 192.168.12.4 addpath-tx-all-paths
+  network 10.10.10.10/32
  exit-address-family
  address-family ipv6 unicast
   network 2001:db8::1/128 route-map p1
   network 2001:db8:1::/56 route-map p2
-  neighbor 2001:db8::12:2 activate
+  neighbor 2001:db8::12:4 activate
  exit-address-family
 !
 route-map p1 permit 10
@@ -28,4 +32,3 @@ route-map p2 permit 10
  set metric 2
  set origin incomplete
 exit
-!

tests/topotests/bgp_snmp_bgp4v2mib/r2/bgpd.conf

@@ -5,18 +5,20 @@ router bgp 65002
  no bgp ebgp-requires-policy
  no bgp network import-check
  no bgp default ipv4-unicast
- neighbor 192.168.12.1 remote-as external
- neighbor 192.168.12.1 timers 1 3
- neighbor 192.168.12.1 timers connect 1
- neighbor 2001:db8::12:1 remote-as external
- neighbor 2001:db8::12:1 timers 1 3
- neighbor 2001:db8::12:1 timers connect 1
+ neighbor 192.168.12.4 remote-as external
+ neighbor 192.168.12.4 timers 1 3
+ neighbor 192.168.12.4 timers connect 1
+ neighbor 2001:db8::12:4 remote-as external
+ neighbor 2001:db8::12:4 timers 1 3
+ neighbor 2001:db8::12:4 timers connect 1
  !
  address-family ipv4 unicast
-  neighbor 192.168.12.1 activate
+  neighbor 192.168.12.4 activate
+  neighbor 192.168.12.4 addpath-tx-all-paths
+
  exit-address-family
  address-family ipv6 unicast
-  neighbor 2001:db8::12:1 activate
+  neighbor 2001:db8::12:4 activate
  exit-address-family
 !
 agentx

tests/topotests/bgp_snmp_bgp4v2mib/r3/bgpd.conf

@@ -0,0 +1,25 @@
+!
+!debug bgp updates
+!
+router bgp 65003
+ no bgp ebgp-requires-policy
+ no bgp network import-check
+ no bgp default ipv4-unicast
+ neighbor 192.168.12.4 remote-as external
+ neighbor 192.168.12.4 timers 1 3
+ neighbor 192.168.12.4 timers connect 1
+ neighbor 2001:db8::12:4 remote-as external
+ neighbor 2001:db8::12:4 timers 1 3
+ neighbor 2001:db8::12:4 timers connect 1
+ !
+ address-family ipv4 unicast
+  neighbor 192.168.12.4 activate
+  neighbor 192.168.12.4 addpath-tx-all-paths
+  network 10.10.10.10/32
+ exit-address-family
+ address-family ipv6 unicast
+  neighbor 2001:db8::12:4 activate
+ exit-address-family
+!
+agentx
+!

tests/topotests/bgp_snmp_bgp4v2mib/r3/zebra.conf

@@ -0,0 +1,5 @@
+!
+interface r3-eth0
+ ip address 192.168.12.3/24
+ ipv6 address 2001:db8::12:3/64
+!

tests/topotests/bgp_snmp_bgp4v2mib/rr/bgpd.conf

@@ -0,0 +1,67 @@
+!
+! debug bgp updates
+!
+router bgp 65004
+ no bgp ebgp-requires-policy
+ no bgp network import-check
+ no bgp default ipv4-unicast
+ neighbor 192.168.12.1 remote-as external
+ neighbor 192.168.12.1 timers 1 3
+ neighbor 192.168.12.1 timers connect 1
+ neighbor 192.168.12.2 remote-as external
+ neighbor 192.168.12.2 timers 1 3
+ neighbor 192.168.12.2 timers connect 1
+ neighbor 192.168.12.3 remote-as external
+ neighbor 192.168.12.3 timers 1 3
+ neighbor 192.168.12.3 timers connect 1
+ neighbor 2001:db8::12:1 remote-as external
+ neighbor 2001:db8::12:1 timers 1 3
+ neighbor 2001:db8::12:1 timers connect 1
+ neighbor 2001:db8::12:2 remote-as external
+ neighbor 2001:db8::12:2 timers 1 3
+ neighbor 2001:db8::12:2 timers connect 1
+ neighbor 2001:db8::12:3 remote-as external
+ neighbor 2001:db8::12:3 timers 1 3
+ neighbor 2001:db8::12:3 timers connect 1
+ !
+ address-family ipv4 unicast
+  network 10.0.0.0/31 route-map p1
+  network 10.0.0.2/32 route-map p2
+  neighbor 192.168.12.1 activate
+  neighbor 192.168.12.2 activate
+  neighbor 192.168.12.2 addpath-tx-all-paths
+  neighbor 192.168.12.2 route-map r2-import in
+  neighbor 192.168.12.2 route-map r2-export out
+!  neighbor 192.168.12.2 soft-reconfiguration inbound
+  neighbor 192.168.12.3 activate
+ exit-address-family
+ address-family ipv6 unicast
+  network 2001:db8::1/128 route-map p1
+  network 2001:db8:1::/56 route-map p2
+  neighbor 2001:db8::12:1 activate
+  neighbor 2001:db8::12:2 activate
+  neighbor 2001:db8::12:2  addpath-tx-all-paths
+  neighbor 2001:db8::12:3 activate
+ exit-address-family
+
+
+ip prefix-list r2-toto permit any
+
+route-map r2-import permit 10
+ match ip address prefix-list r2-toto
+
+route-map r2-export permit 10
+ match ip address prefix-list r2-toto
+!
+route-map p1 permit 10
+ set metric 1
+exit
+route-map p2 permit 10
+ set metric 2
+ set origin incomplete
+exit
+
+
+
+agentx
+!

tests/topotests/bgp_snmp_bgp4v2mib/rr/zebra.conf

@@ -0,0 +1,5 @@
+!
+interface rr-eth0
+ ip address 192.168.12.4/24
+ ipv6 address 2001:db8::12:4/64
+!