Port search improved
diff --git a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkStorageImpl.java b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkStorageImpl.java
index e67ecac..5c01af6 100644
--- a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkStorageImpl.java
+++ b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkStorageImpl.java
@@ -97,8 +97,10 @@
// check if the link exists
- List<Vertex> currLinks = new ArrayList<Vertex>();
- for (Vertex V : vportSrc.asVertex().query().direction(Direction.OUT).labels("link").vertices()) {
+ List<IPortObject> currLinks = new ArrayList<IPortObject>();
+ Iterable<IPortObject> currPorts = vportSrc.getLinkedPorts();
+
+ for (IPortObject V : currPorts) {
currLinks.add(V);
}
diff --git a/start-onos.sh b/start-onos.sh
index 0515bd5..7e23eaf 100755
--- a/start-onos.sh
+++ b/start-onos.sh
@@ -91,7 +91,7 @@
function stop {
# Kill the existing processes
- flpid=`jps -l |grep net.floodlightcontroller.core.Main | awk '{print $1}'`
+ flpid=`jps -l |grep ${MAIN_CLASS} | awk '{print $1}'`
tdpid=`ps -edalf |grep tcpdump |grep ${PCAP_LOG} | awk '{print $4}'`
pids="$flpid $tdpid"
for p in ${pids}; do