Add dual upstream routers

Change-Id: I6f98e8788551082efa60c1ad7a4307f22b459b12
diff --git a/trellis/bgpdbgp1.conf b/trellis/bgpdbgp1.conf
index 5400dfd..8870fb4 100644
--- a/trellis/bgpdbgp1.conf
+++ b/trellis/bgpdbgp1.conf
@@ -5,27 +5,39 @@
 ! Different next hop for IPv4
 !
 ip prefix-list 1 seq 10 permit 10.0.2.0/24
-ip prefix-list 1 seq 20 permit 10.0.3.0/24
-ip prefix-list 1 seq 30 permit 10.0.4.0/24
+ip prefix-list 1 seq 20 permit 10.1.2.0/24
+ip prefix-list 1 seq 30 permit 10.0.3.0/24
+ip prefix-list 1 seq 40 permit 10.0.4.0/24
 !
-route-map NEXTHOP4 permit 10
+route-map NEXTHOP41 permit 10
 match ip address prefix-list 1
 set ip next-hop 10.0.1.254
 !
+!
+route-map NEXTHOP47 permit 10
+match ip address prefix-list 1
+set ip next-hop 10.0.7.254
+!
 ! Different next hop for IPv6
 !
 ipv6 prefix-list 2 seq 10 permit 2000::200/120
 ipv6 prefix-list 2 seq 20 permit 2000::300/120
 !
-route-map NEXTHOP6 permit 10
+route-map NEXTHOP61 permit 10
 match ipv6 address prefix-list 2
 set ipv6 next-hop global 2000::1ff
 set ipv6 next-hop local 2000::1ff
 !
+!
+route-map NEXTHOP67 permit 10
+match ipv6 address prefix-list 2
+set ipv6 next-hop global 2000::7ff
+set ipv6 next-hop local 2000::7ff
+!
 ! Basic router config
 !
-router bgp 65002
-bgp router-id 10.0.1.2
+router bgp 65003
+bgp router-id 172.16.0.3
 timers bgp 3 9
 !
 ! IPv4
@@ -34,14 +46,26 @@
 neighbor 10.0.1.1 ebgp-multihop
 neighbor 10.0.1.1 timers connect 5
 neighbor 10.0.1.1 advertisement-interval 5
-neighbor 10.0.1.1 route-map NEXTHOP4 out
+neighbor 10.0.1.1 route-map NEXTHOP41 out
 !
 neighbor 2000::101 remote-as 65001
 neighbor 2000::101 timers connect 5
 neighbor 2000::101 advertisement-interval 1
 no neighbor 2000::101 activate
 !
+neighbor 10.0.7.1 remote-as 65002
+neighbor 10.0.7.1 ebgp-multihop
+neighbor 10.0.7.1 timers connect 5
+neighbor 10.0.7.1 advertisement-interval 5
+neighbor 10.0.7.1 route-map NEXTHOP47 out
+!
+neighbor 2000::701 remote-as 65002
+neighbor 2000::701 timers connect 5
+neighbor 2000::701 advertisement-interval 1
+no neighbor 2000::701 activate
+!
 network 10.0.2.0/24
+network 10.1.2.0/24
 network 10.0.3.0/24
 network 10.0.4.0/24
 !
@@ -51,5 +75,7 @@
 network 2000::200/120
 network 2000::300/120
 neighbor 2000::101 activate
-neighbor 2000::101 route-map NEXTHOP6 out
+neighbor 2000::101 route-map NEXTHOP61 out
+neighbor 2000::701 activate
+neighbor 2000::701 route-map NEXTHOP67 out
 exit-address-family