debug methods of setIPAddress(), getSwitch() and searchDevice().
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..558e0cd 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/core/INetMapTopologyObjects.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/core/INetMapTopologyObjects.java
@@ -1,6 +1,5 @@
package net.onrc.onos.ofcontroller.core;
-import net.onrc.onos.ofcontroller.core.INetMapTopologyObjects.IPortObject;
import net.onrc.onos.ofcontroller.flowcache.web.DatapathSummarySerializer;
import org.codehaus.jackson.annotate.JsonIgnore;
@@ -49,7 +48,7 @@
// Requires Frames 2.3.0
@JsonIgnore
- @GremlinGroovy("_().out('on').has('number',port_num)")
+ @GremlinGroovy("in.out('on').has('number',port_num)")
public IPortObject getPort(@GremlinParam("port_num") final short port_num);
@Adjacency(label="on")
@@ -59,7 +58,7 @@
public void removePort(final IPortObject port);
@JsonIgnore
- @GremlinGroovy("_().out('on').out('host')")
+ @GremlinGroovy("in.out('on').out('host')")
public Iterable<IDeviceObject> getDevices();
@JsonIgnore
@@ -92,7 +91,7 @@
public void setPortState(Integer s);
@JsonIgnore
- @Incidence(label="on",direction = Direction.IN)
+ @GremlinGroovy("it.in('on')")
public ISwitchObject getSwitch();
@JsonProperty("devices")
@@ -139,7 +138,7 @@
@JsonProperty("ipv4")
@Property("nw_addr")
public String getIPAddress();
- @Property("dl_addr")
+ @Property("nw_addr")
public void setIPAddress(String ipaddr);
@JsonIgnore
@@ -155,7 +154,7 @@
public void removeHostPort(final IPortObject port);
@JsonIgnore
- @GremlinGroovy("_().in('host').in('on')")
+ @GremlinGroovy("it.in('host').in('on')")
public Iterable<ISwitchObject> getSwitch();
/* @JsonProperty("dpid")
@@ -268,7 +267,7 @@
public void setMatchDstIPv4Net(String matchDstIPv4Net);
@JsonIgnore
- @GremlinGroovy("_().in('flow').out('switch')")
+ @GremlinGroovy("it.in('flow').out('switch')")
public Iterable<ISwitchObject> getSwitches();
@JsonIgnore
diff --git a/src/main/java/net/onrc/onos/util/GraphDBOperation.java b/src/main/java/net/onrc/onos/util/GraphDBOperation.java
index df68282..5a70dbc 100644
--- a/src/main/java/net/onrc/onos/util/GraphDBOperation.java
+++ b/src/main/java/net/onrc/onos/util/GraphDBOperation.java
@@ -174,9 +174,8 @@
public IDeviceObject searchDevice(String macAddr) {
// TODO Auto-generated method stub
FramedGraph<TitanGraph> fg = conn.getFramedGraph();
- return (fg != null && fg.getVertices("dl_address",macAddr).iterator().hasNext()) ? fg.getVertices("dl_address",macAddr,
- IDeviceObject.class).iterator().next() : null;
-
+ return (fg != null && fg.getVertices("dl_addr",macAddr).iterator().hasNext()) ?
+ fg.getVertices("dl_addr",macAddr, IDeviceObject.class).iterator().next() : null;
}
@Override