Network Graph Refactoring: Northbound API cleanup
* Renamed/shortened methods:
Link.getSourcePort() -> getSrcPort()
Link.getDestinationPort() -> getDstPort()
Link.getSourceSwitch() -> getSrcSwitch()
Link.getDestinationSwitch() -> getDstSwitch()
* Added Javadoc comments
* Removed deprecated and unused methods:
Link.getSourceSwitchDpid()
Link.getSorcePortNumber()
Link.getDestinationSwitchDpid()
Link.getDestinationPortNumber()
NetworkGraph.getOutgoingLinksFromSwitch()
NetworkGraph.getIncomingLinksFromSwitch()
* Moved method LinkEvent.getLink(NetworkGraph graph)
to NetworkGraph.getLink()
Change-Id: Ibedba53fc6cd04d77f508ee67d41b2cfa515d3fc
diff --git a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/LinkEvent.java b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/LinkEvent.java
index 83af786..d12e99c 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/LinkEvent.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/LinkEvent.java
@@ -29,10 +29,10 @@
}
public LinkEvent(Link link) {
- src = new SwitchPort(link.getSourceSwitch().getDpid(),
- link.getSourcePort().getNumber());
- dst = new SwitchPort(link.getDestinationSwitch().getDpid(),
- link.getDestinationPort().getNumber());
+ src = new SwitchPort(link.getSrcSwitch().getDpid(),
+ link.getSrcPort().getNumber());
+ dst = new SwitchPort(link.getDstSwitch().getDpid(),
+ link.getDstPort().getNumber());
}
public SwitchPort getSrc() {
@@ -62,16 +62,6 @@
dst.getDpid(), dst.getNumber());
}
- public Link getLink(NetworkGraph graph) {
- Port srcPort = graph.getPort(getSrc().getDpid(), getSrc().getNumber());
- if (srcPort == null) return null;
- Link link = srcPort.getOutgoingLink();
- if (link == null) return null;
- if (link.getDestinationSwitch().getDpid() != getDst().getDpid()) return null;
- if (link.getDestinationPort().getNumber() != getDst().getNumber()) return null;
- return link;
- }
-
@Override
public int hashCode() {
final int prime = 31;