getPort from frames is buggy...reverting to gremlin
diff --git a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkStorageImpl.java b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkStorageImpl.java
index 5c01af6..0ab52e2 100644
--- a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkStorageImpl.java
+++ b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/LinkStorageImpl.java
@@ -94,8 +94,7 @@
vportDst = conn.utils().searchPort(conn, dpid, port);
if (vportSrc != null && vportDst != null) {
-
-
+
// check if the link exists
List<IPortObject> currLinks = new ArrayList<IPortObject>();
Iterable<IPortObject> currPorts = vportSrc.getLinkedPorts();
@@ -111,13 +110,13 @@
new Object[]{op, lt, vportSrc, vportDst});
}
} else {
- graph.addEdge(null, vportSrc.asVertex(), vportDst.asVertex(), "link");
- graph.stopTransaction(Conclusion.SUCCESS);
+ conn.getFramedGraph().addEdge(null, vportSrc.asVertex(), vportDst.asVertex(), "link");
+ conn.endTx(Transaction.COMMIT);
log.debug("addOrUpdateLink(): link added {} {} src {} dst {}", new Object[]{op, lt, vportSrc, vportDst});
}
} else {
log.error("addOrUpdateLink(): failed invalid vertices {} {} src {} dst {}", new Object[]{op, lt, vportSrc, vportDst});
- graph.stopTransaction(Conclusion.FAILURE);
+ conn.endTx(Transaction.ROLLBACK);
}
} catch (TitanException e) {
/*