Network Graph Refactoring: WIP
- Move method getPort() from TopologyManager to NetworkGraph
- Renamed NetworkGraph.getDeviceByIp() to getDevicesByIp() to reflect
the fact that it might return multiple devices.
- Added Javadoc comments to interface NetworkGraph
Change-Id: Ibc15497c287847716d92a5ee27a79deb9a635dd2
diff --git a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/NetworkGraphImpl.java b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/NetworkGraphImpl.java
index 4425a7d..628ad7c 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/NetworkGraphImpl.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/NetworkGraphImpl.java
@@ -53,6 +53,15 @@
}
@Override
+ public Port getPort(Long dpid, Long number) {
+ Switch sw = getSwitch(dpid);
+ if (sw != null) {
+ return sw.getPort(number);
+ }
+ return null;
+ }
+
+ @Override
public Iterable<Link> getLinks() {
List<Link> linklist = new LinkedList<>();
@@ -103,7 +112,7 @@
@Override
- public Iterable<Device> getDeviceByIp(InetAddress ipAddress) {
+ public Iterable<Device> getDevicesByIp(InetAddress ipAddress) {
Set<Device> devices = addr2Device.get(ipAddress);
if (devices == null) {
return Collections.emptySet();