| commit | 4cb398813861165a7609f55379f7edf80b9bd5b3 | [log] [tgz] |
|---|---|---|
| author | Jonathan Hart <jono@onlab.us> | Wed Aug 12 23:50:55 2015 -0400 |
| committer | Gerrit Code Review <gerrit@onlab.us> | Fri Aug 28 21:23:22 2015 +0000 |
| tree | 30c61411dbd6adac3616a3cce3b6f12402d67caa | |
| parent | 8553b3f42ed3c101cf64b664ca9e03d4ea4806f2 [diff] [blame] |
Moved ProxyArp, SDN-IP and BgpRouter to use new config format. The new config format is based on the new network configuration subsystem. Includes a few config fixes to NetworkConfigLoader and InterfaceManager. Change-Id: Id7f766736decb7afb6b63c2731d3baba9fc7c764
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/MultiPointToSinglePointIntentCompiler.java b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/MultiPointToSinglePointIntentCompiler.java index 8fad769..06d0e9a 100644 --- a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/MultiPointToSinglePointIntentCompiler.java +++ b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/MultiPointToSinglePointIntentCompiler.java
@@ -98,7 +98,7 @@ partialTree = true; for (Link link : path.links()) { - if (links.containsKey(link.src().deviceId())) { + if (links.containsKey(link.dst().deviceId())) { // We've already reached the existing tree with the first // part of this path. Add the merging point with different // incoming port, but don't add the remainder of the path