Adding a topology with both ovs and bmv2

Change-Id: I6d560e06dbef75c8e0863a45d7ac90a7d1a66444
diff --git a/trellis/trellis_hybrid.json b/trellis/trellis_hybrid.json
new file mode 100644
index 0000000..b95e7b3
--- /dev/null
+++ b/trellis/trellis_hybrid.json
@@ -0,0 +1,421 @@
+{
+    "ports" : {
+        "of:0000000000000203/5" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "10.1.2.254/24", "2001::2ff/120" ],
+                    "vlan-tagged": [21]
+                }
+            ]
+        },
+        "of:0000000000000203/6" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "10.0.4.254/24" ],
+                    "vlan-untagged": 22
+                }
+            ]
+        },
+        "of:0000000000000203/7" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "2000::4ff/120" ],
+                    "vlan-untagged": 23
+                }
+            ]
+        },
+        "of:0000000000000203/8" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "10.1.2.254/24", "2001::2ff/120" ],
+                    "vlan-untagged": 21
+                }
+            ]
+        },
+        "device:bmv2:s204/5" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "10.1.2.254/24", "2001::2ff/120" ],
+                    "vlan-tagged": [21]
+                }
+            ]
+        },
+        "device:bmv2:s204/6" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "10.0.2.254/24" ],
+                    "vlan-untagged": 20
+                }
+            ]
+        },
+        "device:bmv2:s204/7" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "10.0.2.254/24" ],
+                    "vlan-untagged": 20
+                }
+            ]
+        },
+        "device:bmv2:s204/8" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "2000::2ff/120" ],
+                    "vlan-untagged": 40
+                }
+            ]
+        },
+        "device:bmv2:s204/9" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "2000::2ff/120" ],
+                    "vlan-untagged": 40
+                }
+            ]
+        },
+        "device:bmv2:s204/10" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "10.1.2.254/24", "2001::2ff/120" ],
+                    "vlan-untagged": 21
+                }
+            ]
+        },
+        "of:0000000000000205/6" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "10.0.3.254/24" ],
+                    "vlan-untagged": 30
+                }
+            ]
+        },
+        "of:0000000000000205/7" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "10.0.3.254/24" ],
+                    "vlan-untagged": 30
+                }
+            ]
+        },
+        "of:0000000000000205/8" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "2000::3ff/120" ],
+                    "vlan-untagged": 50
+                }
+            ]
+        },
+        "of:0000000000000205/9" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "2000::3ff/120" ],
+                    "vlan-untagged": 50
+                }
+            ]
+        },
+        "of:0000000000000205/10" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "10.0.3.254/24", "2000::3ff/120" ],
+                    "vlan-untagged": 30
+                }
+            ]
+        },
+        "of:0000000000000205/11" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "10.0.1.254/24", "2000::1ff/120" ],
+                    "vlan-tagged": [110]
+                }
+            ]
+        },
+        "of:0000000000000205/12" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "10.0.1.254/24", "2000::1ff/120" ],
+                    "vlan-untagged": 110
+                }
+            ]
+        },
+        "of:0000000000000205/13" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "10.5.6.254/24" ],
+                    "vlan-untagged": 56
+                }
+            ]
+        },
+        "of:0000000000000205/5" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "10.5.6.254/24" ],
+                    "vlan-tagged": [56]
+                }
+            ]
+        },
+        "of:0000000000000206/5" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "10.5.6.254/24" ],
+                    "vlan-tagged": [56]
+                }
+            ]
+        },
+        "of:0000000000000206/6" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "10.0.6.254/24", "2000::6ff/120" ],
+                    "vlan-tagged": [160]
+                }
+            ]
+        },
+        "of:0000000000000206/8" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "10.5.6.254/24"],
+                    "vlan-untagged": 56
+                }
+            ]
+        },
+        "of:0000000000000206/7" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "10.0.6.254/24", "2000::6ff/120" ],
+                    "vlan-untagged": 160
+                }
+            ]
+        },
+
+        "of:0000000000000207/3" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "10.11.1.254/24" ],
+                    "vlan-untagged": 1000
+                }
+            ]
+        },
+        "of:0000000000000207/4" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "2000::aff/120" ],
+                    "vlan-untagged": 1001
+                }
+            ]
+        },
+        "device:bmv2:s208/3" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "10.11.2.254/24" ],
+                    "vlan-untagged": 1002
+                }
+            ]
+        },
+        "device:bmv2:s208/4" : {
+            "interfaces" : [
+                {
+                    "ips" : [ "2000::bff/120" ],
+                    "vlan-untagged": 1003
+                }
+            ]
+        }
+    },
+    "devices" : {
+        "of:0000000000000203" : {
+            "segmentrouting" : {
+                "name" : "s203",
+                "ipv4NodeSid" : 203,
+                "ipv4Loopback" : "192.168.0.203",
+                "ipv6NodeSid" : 213,
+                "ipv6Loopback" : "2000::c0a8:0203",
+                "routerMac" : "00:00:00:00:02:03",
+                "isEdgeRouter" : true,
+                "pairDeviceId" : "of:0000000000000204",
+                "pairLocalPort" : 5,
+                "adjacencySids" : []
+            },
+            "basic" : {
+                "name": "s203",
+                "driver" : "ofdpa-ovs",
+                "latitude" : "36.766",
+                "longitude" : "-111.359"
+            }
+        },
+        "device:bmv2:s204" : {
+            "segmentrouting" : {
+                "name" : "s204",
+                "ipv4NodeSid" : 204,
+                "ipv4Loopback" : "192.168.0.204",
+                "ipv6NodeSid" : 214,
+                "ipv6Loopback" : "2000::c0a8:0204",
+                "routerMac" : "00:00:00:00:02:03",
+                "isEdgeRouter" : true,
+                "pairDeviceId" : "of:0000000000000203",
+                "pairLocalPort" : 5,
+                "adjacencySids" : []
+            },
+            "basic" : {
+                "name": "s204",
+                "latitude" : "36.766",
+                "longitude" : "-106.359"
+            }
+        },
+        "of:0000000000000205" : {
+            "segmentrouting" : {
+                "name" : "s205",
+                "ipv4NodeSid" : 205,
+                "ipv4Loopback" : "192.168.0.205",
+                "ipv6NodeSid" : 215,
+                "ipv6Loopback" : "2000::c0a8:0205",
+                "routerMac" : "00:00:00:00:02:05",
+                "isEdgeRouter" : true,
+                "adjacencySids" : [],
+                "pairDeviceId": "of:0000000000000206",
+                "pairLocalPort": 5
+            },
+            "basic" : {
+                "name": "s205",
+                "driver" : "ofdpa-ovs",
+                "latitude" : "36.766",
+                "longitude" : "-96.89"
+
+            }
+        },
+        "of:0000000000000206" : {
+            "segmentrouting" : {
+                "name" : "s206",
+                "ipv4NodeSid" : 206,
+                "ipv4Loopback" : "192.168.0.206",
+                "ipv6NodeSid" : 216,
+                "ipv6Loopback" : "2000::c0a8:0206",
+                "routerMac" : "00:00:00:00:02:05",
+                "isEdgeRouter" : true,
+                "adjacencySids" : [],
+                "pairDeviceId": "of:0000000000000205",
+                "pairLocalPort": 5
+            },
+            "basic" : {
+                "name": "s206",
+                "driver" : "ofdpa-ovs",
+                "latitude" : "36.766",
+                "longitude" : "-92.029"
+            }
+        },
+        "device:bmv2:s226" : {
+            "segmentrouting" : {
+                "name" : "s226",
+                "ipv4NodeSid" : 226,
+                "ipv4Loopback" : "192.168.0.226",
+                "ipv6NodeSid" : 236,
+                "ipv6Loopback" : "2000::c0a8:0226",
+                "routerMac" : "00:00:00:00:02:26",
+                "isEdgeRouter" : false,
+                "adjacencySids" : []
+            },
+            "basic" : {
+                "name": "s226",
+                "latitude" : "44.15",
+                "longitude" : "-107.679"
+            }
+        },
+        "of:0000000000000227" : {
+            "segmentrouting" : {
+                "name" : "s227",
+                "ipv4NodeSid" : 227,
+                "ipv4Loopback" : "192.168.0.227",
+                "ipv6NodeSid" : 237,
+                "ipv6Loopback" : "2000::c0a8:0227",
+                "routerMac" : "00:00:00:00:02:27",
+                "isEdgeRouter" : false,
+                "adjacencySids" : []
+            },
+            "basic" : {
+                "name": "s227",
+                "driver" : "ofdpa-ovs",
+                "latitude" : "44.205",
+                "longitude" : "-96.359"
+
+            }
+        },
+
+        "of:0000000000000207" : {
+            "segmentrouting" : {
+                "name" : "s207",
+                "ipv4NodeSid" : 207,
+                "ipv4Loopback" : "192.168.0.207",
+                "ipv6NodeSid" : 217,
+                "ipv6Loopback" : "2000::c0a8:0207",
+                "routerMac" : "00:00:00:00:02:07",
+                "isEdgeRouter" : true,
+                "adjacencySids" : []
+            },
+            "basic" : {
+                "name": "s207",
+                "driver" : "ofdpa-ovs",
+                "latitude" : "36.766",
+                "longitude" : "-122.359"
+            }
+        },
+        "device:bmv2:s208" : {
+            "segmentrouting" : {
+                "name" : "s208",
+                "ipv4NodeSid" : 208,
+                "ipv4Loopback" : "192.168.0.208",
+                "ipv6NodeSid" : 218,
+                "ipv6Loopback" : "2000::c0a8:0208",
+                "routerMac" : "00:00:00:00:02:08",
+                "isEdgeRouter" : true,
+                "adjacencySids" : []
+            },
+            "basic" : {
+                "name": "s208",
+                "latitude" : "36.766",
+                "longitude" : "-116.029"
+            }
+        },
+        "device:bmv2:s246" : {
+            "segmentrouting" : {
+                "name" : "s246",
+                "ipv4NodeSid" : 246,
+                "ipv4Loopback" : "192.168.0.246",
+                "ipv6NodeSid" : 256,
+                "ipv6Loopback" : "2000::c0a8:0246",
+                "routerMac" : "00:00:00:00:02:46",
+                "isEdgeRouter" : false,
+                "adjacencySids" : []
+            },
+            "basic" : {
+                "name": "s246",
+                "latitude" : "40.15",
+                "longitude" : "-121.679"
+            }
+        },
+        "device:bmv2:s247" : {
+            "segmentrouting" : {
+                "name" : "s247",
+                "ipv4NodeSid" : 247,
+                "ipv4Loopback" : "192.168.0.247",
+                "ipv6NodeSid" : 257,
+                "ipv6Loopback" : "2000::c0a8:0247",
+                "routerMac" : "00:00:00:00:02:47",
+                "isEdgeRouter" : false,
+                "adjacencySids" : []
+            },
+            "basic" : {
+                "name": "s247",
+                "latitude" : "40.205",
+                "longitude" : "-117.359"
+
+            }
+        }
+
+    },
+    "apps" : {
+        "org.onosproject.dhcprelay" : {
+            "default": [
+                {
+                    "dhcpServerConnectPoint": "of:0000000000000205/10",
+                    "serverIps": ["10.0.3.253", "2000::3fd"]
+                }
+            ]
+        }
+    }
+}