| commit | da80957f62bd9feb1dc2224619afb51a32c7fe11 | [log] [tgz] |
|---|---|---|
| author | Pankaj Berde <pankaj@onlab.us> | Fri Feb 22 15:31:20 2013 -0800 |
| committer | Pankaj Berde <pankaj@onlab.us> | Fri Feb 22 15:31:20 2013 -0800 |
| tree | 3fa4929123bddfca03fbcceeb4faa4713e0bf441 | |
| parent | b1f94794a21f39e83cdb6d6b3b3f6a1065e1ca00 [diff] |
ONOS listens to device discovery messages
diff --git a/src/main/java/net/floodlightcontroller/core/INetMapTopologyObjects.java b/src/main/java/net/floodlightcontroller/core/INetMapTopologyObjects.java index a54136c..1cf6f7b 100644 --- a/src/main/java/net/floodlightcontroller/core/INetMapTopologyObjects.java +++ b/src/main/java/net/floodlightcontroller/core/INetMapTopologyObjects.java
@@ -47,6 +47,9 @@ public Iterable<IPortObject> getPorts(); @Adjacency(label="on") + public IPortObject getPort(final short port_num); + + @Adjacency(label="on") public void addPort(final IPortObject port); @Adjacency(label="on")
diff --git a/src/main/java/net/floodlightcontroller/core/ISwitchStorage.java b/src/main/java/net/floodlightcontroller/core/ISwitchStorage.java index 5a1e1a7..3646e15 100644 --- a/src/main/java/net/floodlightcontroller/core/ISwitchStorage.java +++ b/src/main/java/net/floodlightcontroller/core/ISwitchStorage.java
@@ -4,16 +4,8 @@ import net.floodlightcontroller.core.INetMapTopologyObjects.ISwitchObject; -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.annotate.JsonProperty; import org.openflow.protocol.OFPhysicalPort; -import com.tinkerpop.blueprints.Direction; -import com.tinkerpop.frames.Adjacency; -import com.tinkerpop.frames.Incidence; -import com.tinkerpop.frames.Property; -import com.tinkerpop.frames.VertexFrame; - public interface ISwitchStorage extends INetMapStorage { public enum SwitchState {
diff --git a/src/main/java/net/floodlightcontroller/core/internal/SwitchStorageImpl.java b/src/main/java/net/floodlightcontroller/core/internal/SwitchStorageImpl.java index 0e43ed2..3039679 100644 --- a/src/main/java/net/floodlightcontroller/core/internal/SwitchStorageImpl.java +++ b/src/main/java/net/floodlightcontroller/core/internal/SwitchStorageImpl.java
@@ -20,8 +20,6 @@ import com.tinkerpop.blueprints.Edge; import com.tinkerpop.blueprints.Vertex; import com.tinkerpop.frames.FramedGraph; -import com.tinkerpop.gremlin.java.GremlinPipeline; - import net.floodlightcontroller.core.INetMapTopologyObjects.ISwitchObject; import net.floodlightcontroller.core.ISwitchStorage;
diff --git a/src/main/java/net/floodlightcontroller/core/internal/TopoSwitchServiceImpl.java b/src/main/java/net/floodlightcontroller/core/internal/TopoSwitchServiceImpl.java index deae4bf..e8b1bf8 100644 --- a/src/main/java/net/floodlightcontroller/core/internal/TopoSwitchServiceImpl.java +++ b/src/main/java/net/floodlightcontroller/core/internal/TopoSwitchServiceImpl.java
@@ -1,7 +1,5 @@ package net.floodlightcontroller.core.internal; -import java.util.List; - import net.floodlightcontroller.core.INetMapTopologyObjects.IPortObject; import net.floodlightcontroller.core.INetMapTopologyObjects.ISwitchObject; import net.floodlightcontroller.core.INetMapTopologyService.ITopoSwitchService;