commit 87cd2da9e0f48b14ed225d22b9d7f0c95612538a
author Teru <mininet@mininet-vm.(none)> Sat Jun 15 20:33:08 2013 -0700
committer Teru <mininet@mininet-vm.(none)> Sat Jun 15 20:33:08 2013 -0700
tree 5bb87155f2294e6ff7944732815b1a86167ec209
parent b29b9b3e84a43e15a643a14a502a636c3a346273

2nd iteration of the unit test.

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 1a01155..77c42b1 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/core/INetMapTopologyObjects.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/core/INetMapTopologyObjects.java
@@ -94,6 +94,10 @@
 		@JsonIgnore
 		@Incidence(label="on",direction = Direction.IN)
 		public ISwitchObject getSwitch();
+		
+		@JsonIgnore
+		@Adjacency(label="on",direction = Direction.IN)
+		public ISwitchObject getVertexSwitch();
 				
 		@JsonProperty("devices")
 		@Adjacency(label="host")
@@ -139,11 +143,11 @@
 		@JsonProperty("ipv4")
 		@Property("nw_addr")
 		public String getIPAddress();
-		@Property("dl_addr")
+		@Property("nw_addr")
 		public void setIPAddress(String ipaddr);
 		
 		@JsonIgnore
-		@Incidence(label="host",direction = Direction.IN)
+		@Adjacency(label="host",direction = Direction.IN)
 		public Iterable<IPortObject> getAttachedPorts();
 			
 		@JsonIgnore