mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-27 22:31:18 +01:00
Code Issues Projects Releases Wiki Activity

Make LinkManager aware of unidirectional links.

Browse Source 
Change-Id: I8a1a9b1909bf47dcca65fd2440dd54599916e193
This commit is contained in:
Marc De Leenheer 2017-03-15 11:40:34 -07:00 committed by Yuta HIGUCHI
parent a8998df5a0
commit 4effa06b8e
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
core/net/src/main/java/org/onosproject/net/link/impl/LinkManager.java
View File

@ -346,25 +346,28 @@ public class LinkManager
removeLink(lk.dst(), lk.src()); removeLink(lk.dst(), lk.src());
return; return;
} }
Link link = getLink(lk.src(), lk.dst());
LinkDescription fldesc; doUpdate(lk.src(), lk.dst(), cfg);
LinkDescription rldesc; if (cfg.isBidirectional()) {
doUpdate(lk.dst(), lk.src(), cfg);
}
}
private void doUpdate(ConnectPoint src, ConnectPoint dst, BasicLinkConfig cfg) {
Link link = getLink(src, dst);
LinkDescription desc;
if (link == null) { if (link == null) {
fldesc = BasicLinkOperator.descriptionOf(lk.src(), lk.dst(), cfg); desc = BasicLinkOperator.descriptionOf(src, dst, cfg);
rldesc = BasicLinkOperator.descriptionOf(lk.dst(), lk.src(), cfg);
} else { } else {
fldesc = BasicLinkOperator.combine(cfg, desc = BasicLinkOperator.combine(cfg,
BasicLinkOperator.descriptionOf(lk.src(), lk.dst(), link)); BasicLinkOperator.descriptionOf(src, dst, link));
rldesc = BasicLinkOperator.combine(cfg,
BasicLinkOperator.descriptionOf(lk.dst(), lk.src(), link));
} }
ProviderId pid = Optional.ofNullable(link) ProviderId pid = Optional.ofNullable(link)
.map(Link::providerId) .map(Link::providerId)
.orElse(ProviderId.NONE); .orElse(ProviderId.NONE);
store.createOrUpdateLink(pid, fldesc); store.createOrUpdateLink(pid, desc);
store.createOrUpdateLink(pid, rldesc);
} }
} }
} }