홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
c0bbbd4f 1 parent f5d90939

Allowing link stores to create links injected by ancillary providers. 

Fixed oe-linc config
Inline Side-by-side
Showing 3 changed files with 5 additions and 27 deletions
...@@ -345,14 +345,6 @@ public class GossipLinkStore ...@@ -345,14 +345,6 @@ public class GossipLinkStore
345 // Creates and stores the link and returns the appropriate event. 345 // Creates and stores the link and returns the appropriate event.
346 // Guarded by linkDescs value (=locking each Link) 346 // Guarded by linkDescs value (=locking each Link)
347 private LinkEvent createLink(LinkKey key, Link newLink) { 347 private LinkEvent createLink(LinkKey key, Link newLink) {
348 -
349 - if (newLink.providerId().isAncillary()) {
350 - // TODO: revisit ancillary only Link handling
351 -
352 - // currently treating ancillary only as down (not visible outside)
353 - return null;
354 - }
355 -
356 links.put(key, newLink); 348 links.put(key, newLink);
357 srcLinks.put(newLink.src().deviceId(), key); 349 srcLinks.put(newLink.src().deviceId(), key);
358 dstLinks.put(newLink.dst().deviceId(), key); 350 dstLinks.put(newLink.dst().deviceId(), key);
...@@ -362,14 +354,6 @@ public class GossipLinkStore ...@@ -362,14 +354,6 @@ public class GossipLinkStore
362 // Updates, if necessary the specified link and returns the appropriate event. 354 // Updates, if necessary the specified link and returns the appropriate event.
363 // Guarded by linkDescs value (=locking each Link) 355 // Guarded by linkDescs value (=locking each Link)
364 private LinkEvent updateLink(LinkKey key, Link oldLink, Link newLink) { 356 private LinkEvent updateLink(LinkKey key, Link oldLink, Link newLink) {
365 -
366 - if (newLink.providerId().isAncillary()) {
367 - // TODO: revisit ancillary only Link handling
368 -
369 - // currently treating ancillary only as down (not visible outside)
370 - return null;
371 - }
372 -
373 // Note: INDIRECT -> DIRECT transition only 357 // Note: INDIRECT -> DIRECT transition only
374 // so that BDDP discovered Link will not overwrite LDDP Link 358 // so that BDDP discovered Link will not overwrite LDDP Link
375 if ((oldLink.type() == INDIRECT && newLink.type() == DIRECT) || 359 if ((oldLink.type() == INDIRECT && newLink.type() == DIRECT) ||
......
...@@ -216,12 +216,6 @@ public class SimpleLinkStore ...@@ -216,12 +216,6 @@ public class SimpleLinkStore
216 // Updates, if necessary the specified link and returns the appropriate event. 216 // Updates, if necessary the specified link and returns the appropriate event.
217 // Guarded by linkDescs value (=locking each Link) 217 // Guarded by linkDescs value (=locking each Link)
218 private LinkEvent updateLink(LinkKey key, Link oldLink, Link newLink) { 218 private LinkEvent updateLink(LinkKey key, Link oldLink, Link newLink) {
219 - if (newLink.providerId().isAncillary()) {
220 - // TODO: revisit ancillary only Link handling
221 - // currently treating ancillary only as down (not visible outside)
222 - return null;
223 - }
224 -
225 if ((oldLink.type() == INDIRECT && newLink.type() == DIRECT) || 219 if ((oldLink.type() == INDIRECT && newLink.type() == DIRECT) ||
226 !AnnotationsUtil.isEqual(oldLink.annotations(), newLink.annotations())) { 220 !AnnotationsUtil.isEqual(oldLink.annotations(), newLink.annotations())) {
227 221
......
...@@ -29,14 +29,14 @@ ...@@ -29,14 +29,14 @@
29 ], 29 ],
30 30
31 "links" : [ 31 "links" : [
32 - { "src": "of:0000ffffffffff01/10", "dst": "of:0000ffffffffff03/30", "type": "OPTICAL", "annotations": { "optical.waves": 80, "optical.type": "WDM" } }, 32 + { "src": "of:0000ffffffffff01/20", "dst": "of:0000ffffffffff03/30", "type": "OPTICAL", "annotations": { "optical.waves": 80, "optical.type": "WDM" } },
33 - { "src": "of:0000ffffffffff02/20", "dst": "of:0000ffffffffff03/31", "type": "OPTICAL", "annotations": { "optical.waves": 80, "optical.type": "WDM" } }, 33 + { "src": "of:0000ffffffffff02/21", "dst": "of:0000ffffffffff03/31", "type": "OPTICAL", "annotations": { "optical.waves": 80, "optical.type": "WDM" } },
34 34
35 - { "src": "of:0000ffffffff0001/10", "dst": "of:0000ffffffffff01/11", "type": "OPTICAL", "annotations": { "bandwidth": 100000, "optical.type": "cross-connect" } }, 35 + { "src": "of:0000ffffffff0001/2", "dst": "of:0000ffffffffff01/10", "type": "OPTICAL", "annotations": { "bandwidth": 100000, "optical.type": "cross-connect" } },
36 - { "src": "of:0000ffffffff0002/10", "dst": "of:0000ffffffffff02/21", "type": "OPTICAL", "annotations": { "bandwidth": 100000, "optical.type": "cross-connect" } } 36 + { "src": "of:0000ffffffff0002/2", "dst": "of:0000ffffffffff02/11", "type": "OPTICAL", "annotations": { "bandwidth": 100000, "optical.type": "cross-connect" } }
37 ], 37 ],
38 38
39 - "hosts" : [ 39 + "Xhosts" : [
40 { "mac": "a0:00:00:00:00:11", "vlan": -1, "location": "of:0000ffffffff0001/11", "ip": "1.2.3.4" }, 40 { "mac": "a0:00:00:00:00:11", "vlan": -1, "location": "of:0000ffffffff0001/11", "ip": "1.2.3.4" },
41 { "mac": "a0:00:00:00:00:12", "vlan": -1, "location": "of:0000ffffffff0001/12", "ip": "1.2.3.5" }, 41 { "mac": "a0:00:00:00:00:12", "vlan": -1, "location": "of:0000ffffffff0001/12", "ip": "1.2.3.5" },
42 { "mac": "a0:00:00:00:00:21", "vlan": -1, "location": "of:0000ffffffff0002/11", "ip": "2.2.3.4" }, 42 { "mac": "a0:00:00:00:00:21", "vlan": -1, "location": "of:0000ffffffff0002/11", "ip": "2.2.3.4" },
......