Finished cleaning up tests that broke when the DeviceStorageImpl interface changed
diff --git a/src/test/java/net/onrc/onos/ofcontroller/core/internal/TestableGraphDBOperation.java b/src/test/java/net/onrc/onos/ofcontroller/core/internal/TestableGraphDBOperation.java
index dfe6ccf..be9bca4 100644
--- a/src/test/java/net/onrc/onos/ofcontroller/core/internal/TestableGraphDBOperation.java
+++ b/src/test/java/net/onrc/onos/ofcontroller/core/internal/TestableGraphDBOperation.java
@@ -19,6 +19,7 @@
import net.onrc.onos.ofcontroller.core.INetMapTopologyObjects.IDeviceObject;
import net.onrc.onos.ofcontroller.core.INetMapTopologyObjects.IFlowEntry;
import net.onrc.onos.ofcontroller.core.INetMapTopologyObjects.IFlowPath;
+import net.onrc.onos.ofcontroller.core.INetMapTopologyObjects.IIpv4Address;
import net.onrc.onos.ofcontroller.core.INetMapTopologyObjects.IPortObject;
import net.onrc.onos.ofcontroller.core.INetMapTopologyObjects.ISwitchObject;
import net.onrc.onos.ofcontroller.util.FlowEntryId;
@@ -311,6 +312,14 @@
}
}
+ /*
+ * Note by Jono, 11/4/2013
+ * I changed the interface of IDeviceObject but I didn't spend the
+ * time to update this class, because I can't see where this is used.
+ * I think this whole file is a candidate for deletion if it is not
+ * used anywhere - the graphDB objects are tested elsewhere by the
+ * tests in net.onrc.onos.ofcontroller.core.*
+ */
public static class TestDeviceObject implements IDeviceObject {
private String state,type,mac,ipaddr;
private List<IPortObject> ports;
@@ -393,11 +402,11 @@
@Override
public void setMACAddress(String macaddr) { macToUpdate = macaddr; }
- @Override
- public String getIPAddress() { return ipaddr; }
+ //@Override
+ //public String getIPAddress() { return ipaddr; }
- @Override
- public void setIPAddress(String ipaddr) { ipaddrToUpdate = ipaddr; }
+ //@Override
+ //public void setIPAddress(String ipaddr) { ipaddrToUpdate = ipaddr; }
@Override
public Iterable<IPortObject> getAttachedPorts() {
@@ -411,6 +420,30 @@
@Override
public Iterable<ISwitchObject> getSwitch() { return switches; }
+
+ @Override
+ public Iterable<IIpv4Address> getIpv4Addresses() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public IIpv4Address getIpv4Address(int ipv4Address) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public void addIpv4Address(IIpv4Address ipv4Address) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void removeIpv4Address(IIpv4Address ipv4Address) {
+ // TODO Auto-generated method stub
+
+ }
}
public static class TestFlowPath implements IFlowPath {