addPort fails occassionally...do better exception handling
diff --git a/src/main/java/net/floodlightcontroller/core/INetMapTopologyObjects.java b/src/main/java/net/floodlightcontroller/core/INetMapTopologyObjects.java
index 4f11c6c..e29e8e1 100644
--- a/src/main/java/net/floodlightcontroller/core/INetMapTopologyObjects.java
+++ b/src/main/java/net/floodlightcontroller/core/INetMapTopologyObjects.java
@@ -46,7 +46,7 @@
public Iterable<IPortObject> getPorts();
@JsonIgnore
- @GremlinGroovy("_().out('on').has('number',portnum)")
+ @GremlinGroovy("_().out('on').has('number',port_num)")
public IPortObject getPort(final short port_num);
@Adjacency(label="on")
@@ -109,9 +109,16 @@
@Incidence(label="outport",direction = Direction.IN)
public Iterable<IFlowEntry> getOutFlowEntries();
+ @JsonIgnore
+ @Adjacency(label="link")
+ public Iterable<IPortObject> getLinkedPorts();
+
@Adjacency(label="link")
public void removeLink(final IPortObject dest_port);
+ @Adjacency(label="link")
+ public void setLinkPort(final IPortObject dest_port);
+
// @JsonIgnore
// @Adjacency(label="link")
// public Iterable<ILinkObject> getLinks();
diff --git a/src/main/java/net/floodlightcontroller/core/internal/SwitchStorageImpl.java b/src/main/java/net/floodlightcontroller/core/internal/SwitchStorageImpl.java
index 17ab274..f040881 100644
--- a/src/main/java/net/floodlightcontroller/core/internal/SwitchStorageImpl.java
+++ b/src/main/java/net/floodlightcontroller/core/internal/SwitchStorageImpl.java
@@ -178,7 +178,7 @@
log.info("SwitchStorage:deletePort dpid:{} port:{} found and deleted", dpid, port);
sw.removePort(p);
conn.utils().removePort(conn, p);
- conn.endTx(Transaction.COMMIT,GenerateEvent.TRUE);
+ conn.endTx(Transaction.COMMIT);
}
}
} catch (Exception e) {