| commit | 73ea7e5a1dae2ea81e4f9d06cb25b9612e72543c | [log] [tgz] |
|---|---|---|
| author | Pankaj Berde <pankaj@onlab.us> | Thu Apr 04 14:52:50 2013 -0700 |
| committer | Pankaj Berde <pankaj@onlab.us> | Thu Apr 04 14:52:50 2013 -0700 |
| tree | 6d26badbebdfd652d7ce24a237086afc155b944f | |
| parent | 2239f0dabe88a733af62c34e638f3a6f601342ad [diff] [blame] | |
| parent | 4b6db87914fbe2918b01bd55d65e8235db66e863 [diff] [blame] |
Merge branch 'master' of https://github.com/OPENNETWORKINGLAB/ONOS Conflicts: start-onos.sh
diff --git a/src/main/java/net/floodlightcontroller/core/INetMapTopologyObjects.java b/src/main/java/net/floodlightcontroller/core/INetMapTopologyObjects.java index e72baf7..5264648 100644 --- a/src/main/java/net/floodlightcontroller/core/INetMapTopologyObjects.java +++ b/src/main/java/net/floodlightcontroller/core/INetMapTopologyObjects.java
@@ -42,7 +42,8 @@ @Adjacency(label="on") public Iterable<IPortObject> getPorts(); - @Adjacency(label="on") + @JsonIgnore + @GremlinGroovy("_().out('on').has('number',portnum)") public IPortObject getPort(final short port_num); @Adjacency(label="on")