commit c3122db47c356fa952420ecaa5a206474dae4de9
author Charles Chan <rascov@gmail.com> Fri Sep 01 10:58:24 2017 -0700
committer Charles Chan <rascov@gmail.com> Wed Sep 06 14:59:01 2017 -0700
tree c84cd57a2822642df846da20fb2925b1d6a0afb3
parent 2c58b506b73a1c7c855c1273c61c803ea183bc4d

Add dual upstream routers

Change-Id: I6f98e8788551082efa60c1ad7a4307f22b459b12

trellis/trellis_dualhome.json

diff --git a/trellis/trellis_dualhome.json b/trellis/trellis_dualhome.json
index 5f4cdef..e9f1dfd 100644
--- a/trellis/trellis_dualhome.json
+++ b/trellis/trellis_dualhome.json
@@ -3,24 +3,24 @@
         "of:0000000000000203/5" : {
             "interfaces" : [
                 {
-                    "ips" : [ "10.0.2.254/24", "2000::2ff/120" ],
-                    "vlan-tagged": [20]
+                    "ips" : [ "10.1.2.254/24", "2001::2ff/120" ],
+                    "vlan-tagged": [20, 21]
                 }
             ]
         },
         "of:0000000000000203/6" : {
             "interfaces" : [
                 {
-                    "ips" : [ "10.0.2.254/24", "2000::2ff/120" ],
-                    "vlan-untagged": 20
+                    "ips" : [ "10.1.2.254/24", "2001::2ff/120" ],
+                    "vlan-untagged": 21
                 }
             ]
         },
         "of:0000000000000204/5" : {
             "interfaces" : [
                 {
-                    "ips" : [ "10.0.2.254/24", "2000::2ff/120" ],
-                    "vlan-tagged": [20]
+                    "ips" : [ "10.1.2.254/24", "2001::2ff/120" ],
+                    "vlan-tagged": [20, 21]
                 }
             ]
         },
@@ -59,8 +59,8 @@
         "of:0000000000000204/10" : {
             "interfaces" : [
                 {
-                    "ips" : [ "10.0.2.254/24", "2000::2ff/120" ],
-                    "vlan-untagged": 20
+                    "ips" : [ "10.1.2.254/24", "2001::2ff/120" ],
+                    "vlan-untagged": 21
                 }
             ]
         },
@@ -107,8 +107,8 @@
         "of:0000000000000205/11" : {
             "interfaces" : [
                 {
-                    "ips" : [ "10.0.1.254/24", "2000::1ff/120" ],
-                    "vlan-untagged": 10
+                    "ips" : [ "10.0.1.254/24", "10.0.7.254/24", "2000::1ff/120", "2000::7ff/120" ],
+                    "vlan-tagged": [110, 170]
                 }
             ]
         },
@@ -116,7 +116,39 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.0.1.254/24", "2000::1ff/120" ],
-                    "vlan-untagged": 10
+                    "vlan-untagged": 110
+                }
+            ]
+        },
+        "of:0000000000000205/13" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "10.0.7.254/24", "2000::7ff/120" ],
+                    "vlan-untagged": 170
+                }
+            ]
+        },
+        "of:0000000000000206/6" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "10.0.5.254/24", "10.0.6.254/24", "2000::5ff/120", "2000::6ff/120" ],
+                    "vlan-tagged": [150, 160]
+                }
+            ]
+        },
+        "of:0000000000000206/7" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "10.0.5.254/24", "2000::5ff/120" ],
+                    "vlan-untagged": 150
+                }
+            ]
+        },
+        "of:0000000000000206/8" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "10.0.6.254/24", "2000::6ff/120" ],
+                    "vlan-untagged": 160
                 }
             ]
         }
@@ -167,7 +199,9 @@
                 "ipv6Loopback" : "2000::c0a8:0205",
                 "routerMac" : "00:00:00:00:02:05",
                 "isEdgeRouter" : true,
-                "adjacencySids" : []
+                "adjacencySids" : [],
+                "pairDeviceId": "of:0000000000000206",
+                "pairLocalPort": 5
             },
             "basic" : {
                 "name": "s205",
@@ -183,7 +217,9 @@
                 "ipv6Loopback" : "2000::c0a8:0206",
                 "routerMac" : "00:00:00:00:02:05",
                 "isEdgeRouter" : true,
-                "adjacencySids" : []
+                "adjacencySids" : [],
+                "pairDeviceId": "of:0000000000000205",
+                "pairLocalPort": 5
             },
             "basic" : {
                 "name": "s206",