Break the references between Port and Link.
This is in preparation for implementing topology versioning. Ports may have
different Links in different versions of the topology, so we don't want the
reference inside the Port object. References are now held in indexes in the
NetworkGraphImpl.
As a result of this, there was a small API change:
NetworkGraph.getLink -> NetworkGraph.getOutgoingLink
NetworkGraph.getIncomingLink was added.
Change-Id: I086d198c8040607253c8729b9d5f94ab6bc738db
diff --git a/src/main/java/net/onrc/onos/core/devicemanager/OnosDeviceManager.java b/src/main/java/net/onrc/onos/core/devicemanager/OnosDeviceManager.java
index dde6f55..3177f61 100644
--- a/src/main/java/net/onrc/onos/core/devicemanager/OnosDeviceManager.java
+++ b/src/main/java/net/onrc/onos/core/devicemanager/OnosDeviceManager.java
@@ -166,7 +166,7 @@
}
//If the switch port we try to attach a new device already has a link, then stop adding device
- if (networkGraph.getLink(dpid, (long) portId) != null) {
+ if (networkGraph.getOutgoingLink(dpid, (long) portId) != null) {
if (log.isTraceEnabled()) {
log.trace("Stop adding OnosDevice {} due to there is a link to: dpid {} port {}",
srcDevice.getMacAddress(), dpid, portId);