홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Charles Chan
Committed by Gerrit Code Review
22be273f 1 parent 03e81e77

Update sample config for cross-connect 

Change-Id: Iee4becd8d622a948701e609a4e28485c63372005
Inline Side-by-side
Showing 2 changed files with 55 additions and 73 deletions
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
5 <meta http-equiv="Content-Style-Type" content="text/css"> 5 <meta http-equiv="Content-Style-Type" content="text/css">
6 <title></title> 6 <title></title>
7 <meta name="Generator" content="Cocoa HTML Writer"> 7 <meta name="Generator" content="Cocoa HTML Writer">
8 - <meta name="CocoaVersion" content="1404.46"> 8 + <meta name="CocoaVersion" content="1404.47">
9 <style type="text/css"> 9 <style type="text/css">
10 p.p1 {margin: 0.0px 0.0px 0.0px 0.0px; line-height: 14.0px; font: 12.0px Menlo; color: #0433ff; -webkit-text-stroke: #0433ff} 10 p.p1 {margin: 0.0px 0.0px 0.0px 0.0px; line-height: 14.0px; font: 12.0px Menlo; color: #0433ff; -webkit-text-stroke: #0433ff}
11 p.p2 {margin: 0.0px 0.0px 0.0px 0.0px; line-height: 14.0px; font: 12.0px Menlo; color: #ff9300; -webkit-text-stroke: #ff9300} 11 p.p2 {margin: 0.0px 0.0px 0.0px 0.0px; line-height: 14.0px; font: 12.0px Menlo; color: #ff9300; -webkit-text-stroke: #ff9300}
...@@ -15,16 +15,19 @@ ...@@ -15,16 +15,19 @@
15 p.p6 {margin: 0.0px 0.0px 0.0px 0.0px; line-height: 14.0px; font: 12.0px Menlo; color: #ff2600; -webkit-text-stroke: #ff2600} 15 p.p6 {margin: 0.0px 0.0px 0.0px 0.0px; line-height: 14.0px; font: 12.0px Menlo; color: #ff2600; -webkit-text-stroke: #ff2600}
16 p.p7 {margin: 0.0px 0.0px 0.0px 0.0px; line-height: 14.0px; font: 12.0px Menlo; color: #000000; -webkit-text-stroke: #000000} 16 p.p7 {margin: 0.0px 0.0px 0.0px 0.0px; line-height: 14.0px; font: 12.0px Menlo; color: #000000; -webkit-text-stroke: #000000}
17 p.p8 {margin: 0.0px 0.0px 0.0px 0.0px; line-height: 14.0px; font: 12.0px Menlo; color: #00c7fc; -webkit-text-stroke: #000000} 17 p.p8 {margin: 0.0px 0.0px 0.0px 0.0px; line-height: 14.0px; font: 12.0px Menlo; color: #00c7fc; -webkit-text-stroke: #000000}
18 + p.p9 {margin: 0.0px 0.0px 0.0px 0.0px; line-height: 14.0px; font: 12.0px Menlo; color: #ff9300; -webkit-text-stroke: #000000}
19 + p.p10 {margin: 0.0px 0.0px 0.0px 0.0px; line-height: 14.0px; font: 12.0px Menlo; color: #000000; -webkit-text-stroke: #000000; min-height: 14.0px}
18 span.s1 {font-kerning: none} 20 span.s1 {font-kerning: none}
19 span.s2 {font-kerning: none; color: #0433ff; -webkit-text-stroke: 0px #0433ff} 21 span.s2 {font-kerning: none; color: #0433ff; -webkit-text-stroke: 0px #0433ff}
20 - span.s3 {font-kerning: none; color: #000000; -webkit-text-stroke: 0px #000000} 22 + span.s3 {font: 12.0px 'PingFang TC'; font-kerning: none}
21 - span.s4 {font-kerning: none; color: #ff9300; -webkit-text-stroke: 0px #ff9300} 23 + span.s4 {font-kerning: none; color: #77bb41; -webkit-text-stroke: 0px #77bb41}
22 - span.s5 {font-kerning: none; color: #77bb41; -webkit-text-stroke: 0px #77bb41} 24 + span.s5 {font-kerning: none; color: #00c7fc; -webkit-text-stroke: 0px #00c7fc}
23 - span.s6 {font-kerning: none; color: #00c7fc; -webkit-text-stroke: 0px #00c7fc} 25 + span.s6 {font-kerning: none; color: #000000; -webkit-text-stroke: 0px #000000}
24 span.s7 {font-kerning: none; color: #ff40ff; -webkit-text-stroke: 0px #ff40ff} 26 span.s7 {font-kerning: none; color: #ff40ff; -webkit-text-stroke: 0px #ff40ff}
25 span.s8 {font-kerning: none; color: #ff2600; -webkit-text-stroke: 0px #ff2600} 27 span.s8 {font-kerning: none; color: #ff2600; -webkit-text-stroke: 0px #ff2600}
26 span.s9 {font-kerning: none; color: #000000} 28 span.s9 {font-kerning: none; color: #000000}
27 - span.s10 {font-kerning: none; color: #669c35; -webkit-text-stroke: 0px #669c35} 29 + span.s10 {font-kerning: none; color: #ff9300}
30 + span.s11 {font-kerning: none; color: #669c35; -webkit-text-stroke: 0px #669c35}
28 span.Apple-tab-span {white-space:pre} 31 span.Apple-tab-span {white-space:pre}
29 </style> 32 </style>
30 </head> 33 </head>
...@@ -43,12 +46,6 @@ ...@@ -43,12 +46,6 @@
43 <p class="p7"><span class="s1"><span class="Apple-converted-space">        </span>"interfaces" : [</span></p> 46 <p class="p7"><span class="s1"><span class="Apple-converted-space">        </span>"interfaces" : [</span></p>
44 <p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>{<span class="Apple-tab-span"> </span></span></p> 47 <p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>{<span class="Apple-tab-span"> </span></span></p>
45 <p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>"ips" : [ "10.0.1.254/24" ] </span><span class="s2">// subnet of node 1</span></p> 48 <p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>"ips" : [ "10.0.1.254/24" ] </span><span class="s2">// subnet of node 1</span></p>
46 -<p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>},</span></p>
47 -<p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>{</span></p>
48 -<p class="p2"><span class="s3"><span class="Apple-converted-space">                </span>"vlan" : "69" </span><span class="s1">// cross-connect s-tag 69 to Fujitsu OLT</span></p>
49 -<p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>},</span></p>
50 -<p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>{</span></p>
51 -<p class="p2"><span class="s3"><span class="Apple-converted-space">                </span>"vlan" : "222" </span><span class="s1">// cross-connect s-tag 222 to PMC OLT</span></p>
52 <p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>}</span></p> 49 <p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>}</span></p>
53 <p class="p7"><span class="s1"><span class="Apple-converted-space">        </span>]</span></p> 50 <p class="p7"><span class="s1"><span class="Apple-converted-space">        </span>]</span></p>
54 <p class="p7"><span class="s1"><span class="Apple-converted-space">    </span>},</span></p> 51 <p class="p7"><span class="s1"><span class="Apple-converted-space">    </span>},</span></p>
...@@ -58,23 +55,7 @@ ...@@ -58,23 +55,7 @@
58 <p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>"ips" : [ "10.0.1.254/24" ] </span><span class="s2">// subnet of node 3</span></p> 55 <p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>"ips" : [ "10.0.1.254/24" ] </span><span class="s2">// subnet of node 3</span></p>
59 <p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>}</span></p> 56 <p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>}</span></p>
60 <p class="p7"><span class="s1"><span class="Apple-converted-space">        </span>]</span></p> 57 <p class="p7"><span class="s1"><span class="Apple-converted-space">        </span>]</span></p>
61 -<p class="p7"><span class="s1"><span class="Apple-converted-space">    </span>},</span></p> 58 +<p class="p7"><span class="s1"><span class="Apple-converted-space">    </span>}</span><span class="s3">,</span></p>
62 -<p class="p7"><span class="s1"><span class="Apple-converted-space">    </span>"of:0000000000000001/65" : { </span><span class="s4">// connect to Fujitsu OLT</span></p>
63 -<p class="p7"><span class="s1"><span class="Apple-converted-space">        </span>"interfaces" : [</span></p>
64 -<p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>{</span></p>
65 -<p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>"name" : "fujitsu-olt", </span><span class="s4">// unused</span></p>
66 -<p class="p2"><span class="s3"><span class="Apple-converted-space">                </span>"vlan" : "69" </span><span class="s1">// cross-connect s-tag 69<span class="Apple-converted-space">  </span>to vSG</span></p>
67 -<p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>}</span></p>
68 -<p class="p7"><span class="s1"><span class="Apple-converted-space">        </span>]</span></p>
69 -<p class="p7"><span class="s1"><span class="Apple-converted-space">    </span>},</span></p>
70 -<p class="p7"><span class="s1"><span class="Apple-converted-space">    </span>"of:0000000000000001/73" : { </span><span class="s4">// connect to PMC OLT</span></p>
71 -<p class="p7"><span class="s1"><span class="Apple-converted-space">        </span>"interfaces" : [</span></p>
72 -<p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>{</span></p>
73 -<p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>"name" : "pmc-olt", </span><span class="s4">// unused</span></p>
74 -<p class="p2"><span class="s3"><span class="Apple-converted-space">                </span>"vlan" : "222" </span><span class="s1">// cross-connect s-tag 222 to vSG</span></p>
75 -<p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>}</span></p>
76 -<p class="p7"><span class="s1"><span class="Apple-converted-space">        </span>]</span></p>
77 -<p class="p7"><span class="s1"><span class="Apple-converted-space">    </span>},</span></p>
78 <p class="p7"><span class="s1"><span class="Apple-converted-space">    </span>"of:0000000000000002/5" : { </span><span class="s2">// connect to node 2</span></p> 59 <p class="p7"><span class="s1"><span class="Apple-converted-space">    </span>"of:0000000000000002/5" : { </span><span class="s2">// connect to node 2</span></p>
79 <p class="p7"><span class="s1"><span class="Apple-converted-space">        </span>"interfaces" : [</span></p> 60 <p class="p7"><span class="s1"><span class="Apple-converted-space">        </span>"interfaces" : [</span></p>
80 <p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>{</span></p> 61 <p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>{</span></p>
...@@ -82,16 +63,16 @@ ...@@ -82,16 +63,16 @@
82 <p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>}</span></p> 63 <p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>}</span></p>
83 <p class="p7"><span class="s1"><span class="Apple-converted-space">        </span>]</span></p> 64 <p class="p7"><span class="s1"><span class="Apple-converted-space">        </span>]</span></p>
84 <p class="p7"><span class="s1"><span class="Apple-converted-space">    </span>},</span></p> 65 <p class="p7"><span class="s1"><span class="Apple-converted-space">    </span>},</span></p>
85 -<p class="p7"><span class="s1"><span class="Apple-converted-space">    </span>"of:0000000000000002/32" : { </span><span class="s5">// connect to Internet router</span></p> 66 +<p class="p7"><span class="s1"><span class="Apple-converted-space">    </span>"of:0000000000000002/32" : { </span><span class="s4">// connect to Internet router</span></p>
86 <p class="p7"><span class="s1"><span class="Apple-converted-space">        </span>"interfaces" : [</span></p> 67 <p class="p7"><span class="s1"><span class="Apple-converted-space">        </span>"interfaces" : [</span></p>
87 <p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>{</span></p> 68 <p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>{</span></p>
88 -<p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>"name" : "external-quagga", </span><span class="s5">// Internet router interface name</span></p> 69 +<p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>"name" : "external-quagga", </span><span class="s4">// Internet router interface name</span></p>
89 -<p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>"ips" : [ "10.231.254.202/30", "10.231.254.223/32" ], </span><span class="s5">// Quagga IP addresses</span></p> 70 +<p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>"ips" : [ "10.231.254.202/30", "10.231.254.223/32" ], </span><span class="s4">// Quagga IP addresses</span></p>
90 -<p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>"mac" : "00:16:3e:56:2b:48" </span><span class="s5">// Quagga WAN MAC</span></p> 71 +<p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>"mac" : "00:16:3e:56:2b:48" </span><span class="s4">// Quagga WAN MAC</span></p>
91 <p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>}</span></p> 72 <p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>}</span></p>
92 <p class="p7"><span class="s1"><span class="Apple-converted-space">        </span>],</span></p> 73 <p class="p7"><span class="s1"><span class="Apple-converted-space">        </span>],</span></p>
93 -<p class="p7"><span class="s1"><span class="Apple-converted-space">        </span>"pimInterface" : { </span><span class="s6">// PIM configuration</span></p> 74 +<p class="p7"><span class="s1"><span class="Apple-converted-space">        </span>"pimInterface" : { </span><span class="s5">// PIM configuration</span></p>
94 -<p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>"interfaceName" : "external-quagga", </span><span class="s6">// port that faces the Internet router</span></p> 75 +<p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>"interfaceName" : "external-quagga", </span><span class="s5">// port that faces the Internet router</span></p>
95 <p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>"enabled" : true,</span></p> 76 <p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>"enabled" : true,</span></p>
96 <p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>"helloInterval" : 1,</span></p> 77 <p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>"helloInterval" : 1,</span></p>
97 <p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>"holdTime" : 3,</span></p> 78 <p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>"holdTime" : 3,</span></p>
...@@ -105,7 +86,7 @@ ...@@ -105,7 +86,7 @@
105 <p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>"segmentrouting" : {</span></p> 86 <p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>"segmentrouting" : {</span></p>
106 <p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>"name" : "Leaf-R1",</span></p> 87 <p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>"name" : "Leaf-R1",</span></p>
107 <p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>"nodeSid" : 101, </span><span class="s2">// segment router SID</span></p> 88 <p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>"nodeSid" : 101, </span><span class="s2">// segment router SID</span></p>
108 -<p class="p1"><span class="s3"><span class="Apple-converted-space">                </span>"routerIp" : "10.0.1.254", </span><span class="s1">// segment router IP (default gateway of compute nodes)</span></p> 89 +<p class="p1"><span class="s6"><span class="Apple-converted-space">                </span>"routerIp" : "10.0.1.254", </span><span class="s1">// segment router IP (default gateway of compute nodes)</span></p>
109 <p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>"routerMac" : "00:00:00:00:01:80", </span><span class="s2">// segment router MAC</span></p> 90 <p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>"routerMac" : "00:00:00:00:01:80", </span><span class="s2">// segment router MAC</span></p>
110 <p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>"isEdgeRouter" : true, </span><span class="s2">// true if this is a leaf router</span></p> 91 <p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>"isEdgeRouter" : true, </span><span class="s2">// true if this is a leaf router</span></p>
111 <p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>"adjacencySids" : [] </span><span class="s2">// unused<span class="Apple-converted-space"> </span></span></p> 92 <p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>"adjacencySids" : [] </span><span class="s2">// unused<span class="Apple-converted-space"> </span></span></p>
...@@ -180,7 +161,7 @@ ...@@ -180,7 +161,7 @@
180 <p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>}</span></p> 161 <p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>}</span></p>
181 <p class="p7"><span class="s1"><span class="Apple-converted-space">        </span>}</span></p> 162 <p class="p7"><span class="s1"><span class="Apple-converted-space">        </span>}</span></p>
182 <p class="p7"><span class="s1"><span class="Apple-converted-space">    </span>},</span></p> 163 <p class="p7"><span class="s1"><span class="Apple-converted-space">    </span>},</span></p>
183 -<p class="p6"><span class="s3"><span class="Apple-converted-space">    </span>"links" : { </span><span class="s1">// list of expected links</span></p> 164 +<p class="p6"><span class="s6"><span class="Apple-converted-space">    </span>"links" : { </span><span class="s1">// list of expected links</span></p>
184 <p class="p7"><span class="s1"><span class="Apple-converted-space">        </span>"of:0000000000000001/1-of:0000000000000191/1" : {</span></p> 165 <p class="p7"><span class="s1"><span class="Apple-converted-space">        </span>"of:0000000000000001/1-of:0000000000000191/1" : {</span></p>
185 <p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>"basic" : {}</span></p> 166 <p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>"basic" : {}</span></p>
186 <p class="p7"><span class="s1"><span class="Apple-converted-space">        </span>},</span></p> 167 <p class="p7"><span class="s1"><span class="Apple-converted-space">        </span>},</span></p>
...@@ -219,26 +200,41 @@ ...@@ -219,26 +200,41 @@
219 <p class="p7"><span class="s1"><span class="Apple-converted-space">        </span>"org.onosproject.segmentrouting" : {</span></p> 200 <p class="p7"><span class="s1"><span class="Apple-converted-space">        </span>"org.onosproject.segmentrouting" : {</span></p>
220 <p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>"segmentrouting" : {</span></p> 201 <p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>"segmentrouting" : {</span></p>
221 <p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>"vRouterMacs" : [</span></p> 202 <p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>"vRouterMacs" : [</span></p>
222 -<p class="p3"><span class="s3"><span class="Apple-converted-space">                    </span>"a4:23:05:34:56:78" </span><span class="s1">// vRouter LAN MAC (vSG’s default gateway)</span></p> 203 +<p class="p3"><span class="s6"><span class="Apple-converted-space">                    </span>"a4:23:05:34:56:78" </span><span class="s1">// vRouter LAN MAC (vSG’s default gateway)</span></p>
223 <p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>],</span></p> 204 <p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>],</span></p>
224 <p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>"vRouterId" : "of:0000000000000002", </span><span class="s7">// vRouter DPID (0/0 is replaced by this)</span></p> 205 <p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>"vRouterId" : "of:0000000000000002", </span><span class="s7">// vRouter DPID (0/0 is replaced by this)</span></p>
225 -<p class="p4"><span class="s3"><span class="Apple-converted-space">                 </span>"suppressSubnet" : [ </span><span class="s1">// Do not push subnet rules for these ports</span></p> 206 +<p class="p4"><span class="s6"><span class="Apple-converted-space">                 </span>"suppressSubnet" : [ </span><span class="s1">// Do not push subnet rules for these ports</span></p>
226 <p class="p7"><span class="s1"><span class="Apple-converted-space">                    </span>"of:0000000000000002/31", "of:0000000000000002/32"</span></p> 207 <p class="p7"><span class="s1"><span class="Apple-converted-space">                    </span>"of:0000000000000002/31", "of:0000000000000002/32"</span></p>
227 <p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>],</span></p> 208 <p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>],</span></p>
228 -<p class="p4"><span class="s3"><span class="Apple-converted-space">                </span>"suppressHostByProvider" : [ </span><span class="s1">// Hosts come from these providers will be ignored.</span></p> 209 +<p class="p4"><span class="s6"><span class="Apple-converted-space">                </span>"suppressHostByProvider" : [ </span><span class="s1">// Hosts come from these providers will be ignored.</span></p>
229 <p class="p7"><span class="s1"><span class="Apple-converted-space">                    </span>"org.onosproject.provider.host"</span></p> 210 <p class="p7"><span class="s1"><span class="Apple-converted-space">                    </span>"org.onosproject.provider.host"</span></p>
230 <p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>],</span></p> 211 <p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>],</span></p>
231 -<p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>"suppressHostByPort" : [ </span><span class="s5">// Hosts on these ports will be ignored.</span></p> 212 +<p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>"suppressHostByPort" : [ </span><span class="s4">// Hosts on these ports will be ignored.</span></p>
232 <p class="p7"><span class="s1"><span class="Apple-converted-space">                    </span>"of:0000000000000002/31", "of:0000000000000002/32"</span></p> 213 <p class="p7"><span class="s1"><span class="Apple-converted-space">                    </span>"of:0000000000000002/31", "of:0000000000000002/32"</span></p>
233 <p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>]</span></p> 214 <p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>]</span></p>
215 +<p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>},</span></p>
216 +<p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>"xconnect": {</span></p>
217 +<p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>"of:0000000000000001": [</span></p>
218 +<p class="p7"><span class="s1"><span class="Apple-converted-space">                    </span>{</span></p>
219 +<p class="p9"><span class="s9"><span class="Apple-converted-space">                        </span>"vlan": 10, </span><span class="s1">// VLAN ID used for this cross-connect</span></p>
220 +<p class="p9"><span class="s9"><span class="Apple-converted-space">                        </span>"ports": [5, 73], </span><span class="s1">// Two ports that need to be cross-connected</span></p>
221 +<p class="p7"><span class="s1"><span class="Apple-converted-space">                        </span>"name": "OLT1" </span><span class="s10">// Optional name</span></p>
222 +<p class="p7"><span class="s1"><span class="Apple-converted-space">                    </span>},</span></p>
223 +<p class="p7"><span class="s1"><span class="Apple-converted-space">                    </span>{</span></p>
224 +<p class="p7"><span class="s1"><span class="Apple-converted-space">                        </span>"vlan": 20,</span></p>
225 +<p class="p7"><span class="s1"><span class="Apple-converted-space">                        </span>"ports": [5, 89],</span></p>
226 +<p class="p7"><span class="s1"><span class="Apple-converted-space">                        </span>"name": "OLT2"</span></p>
227 +<p class="p7"><span class="s1"><span class="Apple-converted-space">                    </span>}</span></p>
228 +<p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>]</span></p>
234 <p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>}</span></p> 229 <p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>}</span></p>
230 +<p class="p10"><span class="s1"></span><br></p>
235 <p class="p7"><span class="s1"><span class="Apple-converted-space">        </span>},</span></p> 231 <p class="p7"><span class="s1"><span class="Apple-converted-space">        </span>},</span></p>
236 <p class="p7"><span class="s1"><span class="Apple-converted-space">        </span>"org.onosproject.router" : {</span></p> 232 <p class="p7"><span class="s1"><span class="Apple-converted-space">        </span>"org.onosproject.router" : {</span></p>
237 <p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>"router" : {</span></p> 233 <p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>"router" : {</span></p>
238 -<p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>"controlPlaneConnectPoint" : "of:0000000000000002/31", </span><span class="s5">// location of Quagga</span></p> 234 +<p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>"controlPlaneConnectPoint" : "of:0000000000000002/31", </span><span class="s4">// location of Quagga</span></p>
239 -<p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>"ospfEnabled" : "true", </span><span class="s5">// enable OSPF</span></p> 235 +<p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>"ospfEnabled" : "true", </span><span class="s4">// enable OSPF</span></p>
240 -<p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>"pimEnabled" : "true", </span><span class="s6">// enable PIM</span></p> 236 +<p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>"pimEnabled" : "true", </span><span class="s5">// enable PIM</span></p>
241 -<p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>"interfaces" : [ "external-quagga" ] </span><span class="s10">// </span><span class="s5">VR only handles peers on these ports</span></p> 237 +<p class="p7"><span class="s1"><span class="Apple-converted-space">                </span>"interfaces" : [ "external-quagga" ] </span><span class="s11">// </span><span class="s4">VR only handles peers on these ports</span></p>
242 <p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>}</span></p> 238 <p class="p7"><span class="s1"><span class="Apple-converted-space">            </span>}</span></p>
243 <p class="p7"><span class="s1"><span class="Apple-converted-space">        </span>}</span></p> 239 <p class="p7"><span class="s1"><span class="Apple-converted-space">        </span>}</span></p>
244 <p class="p7"><span class="s1"><span class="Apple-converted-space">    </span>}</span></p> 240 <p class="p7"><span class="s1"><span class="Apple-converted-space">    </span>}</span></p>
......
...@@ -4,15 +4,6 @@ ...@@ -4,15 +4,6 @@
4 "interfaces" : [ 4 "interfaces" : [
5 { 5 {
6 "ips" : [ "10.0.1.254/24" ] 6 "ips" : [ "10.0.1.254/24" ]
7 - },
8 - {
9 - "vlan" : "20"
10 - },
11 - {
12 - "vlan" : "10"
13 - },
14 - {
15 - "vlan" : "222"
16 } 7 }
17 ] 8 ]
18 }, 9 },
...@@ -23,25 +14,6 @@ ...@@ -23,25 +14,6 @@
23 } 14 }
24 ] 15 ]
25 }, 16 },
26 - "of:0000000000000001/65" : {
27 - "interfaces" : [
28 - {
29 - "name" : "fujitsu-olt",
30 - "vlan" : "20"
31 - }
32 - ]
33 - },
34 - "of:0000000000000001/73" : {
35 - "interfaces" : [
36 - {
37 - "name" : "pmc-olt",
38 - "vlan" : "10"
39 - },
40 - {
41 - "vlan" : "222"
42 - }
43 - ]
44 - },
45 "of:0000000000000002/5" : { 17 "of:0000000000000002/5" : {
46 "interfaces" : [ 18 "interfaces" : [
47 { 19 {
...@@ -240,6 +212,20 @@ ...@@ -240,6 +212,20 @@
240 "suppressHostByPort" : [ 212 "suppressHostByPort" : [
241 "of:0000000000000002/31", "of:0000000000000002/32" 213 "of:0000000000000002/31", "of:0000000000000002/32"
242 ] 214 ]
215 + },
216 + "xconnect": {
217 + "of:0000000000000001": [
218 + {
219 + "vlan": 10,
220 + "ports": [5, 73],
221 + "name": "OLT1"
222 + },
223 + {
224 + "vlan": 20,
225 + "ports": [5, 89],
226 + "name": "OLT2"
227 + }
228 + ]
243 } 229 }
244 }, 230 },
245 "org.onosproject.router" : { 231 "org.onosproject.router" : {
......