Merge branch 'master' of https://github.com/OPENNETWORKINGLAB/ONOS into dev2
Conflicts:
src/main/java/net/onrc/onos/ofcontroller/core/INetMapTopologyObjects.java
src/main/java/net/onrc/onos/util/GraphDBOperation.java
diff --git a/src/main/java/net/onrc/onos/ofcontroller/core/INetMapTopologyObjects.java b/src/main/java/net/onrc/onos/ofcontroller/core/INetMapTopologyObjects.java
index d1a44e7..94bf0e0 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/core/INetMapTopologyObjects.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/core/INetMapTopologyObjects.java
@@ -91,7 +91,8 @@
public void setPortState(Integer s);
@JsonIgnore
- @GremlinGroovy("it.in('on')")
+// @GremlinGroovy("it.in('on')")
+ @Adjacency(label="on",direction = Direction.IN)
public ISwitchObject getSwitch();
@JsonProperty("devices")
@@ -142,7 +143,7 @@
public void setIPAddress(String ipaddr);
@JsonIgnore
- @Incidence(label="host",direction = Direction.IN)
+ @Adjacency(label="host",direction = Direction.IN)
public Iterable<IPortObject> getAttachedPorts();
@JsonIgnore