commit 2bab79fc3ff262389d7f00952ac210d98a42385f
author Toshio Koide <t-koide@onlab.us> Mon Jun 17 14:29:15 2013 -0700
committer Toshio Koide <t-koide@onlab.us> Mon Jun 17 14:29:15 2013 -0700
tree 60129e070cb2261d1e27056e917b5b9bd116ad0c
parent 46dec82663d187fd4d61b1b891f7f6c7f1240ebb
parent bd619f95cec3710d4be4b4fc00f4b214af449376

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

src/main/java/net/onrc/onos/ofcontroller/core/INetMapTopologyObjects.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