Squashed commit of the following:
commit e9604083c5374bf5eac889e82cf54bb0b22ef763
Author: Naoki Shiota <n-shiota@onlab.us>
Date: Wed Oct 23 11:51:00 2013 -0700
Refactored NetworkGraphPublisher and related modules to be ready for implementing event notification.
diff --git a/src/test/java/net/onrc/onos/ofcontroller/core/internal/SwitchStorageImplTestBB.java b/src/test/java/net/onrc/onos/ofcontroller/core/internal/SwitchStorageImplTestBB.java
index 19ac709..585a8fd 100644
--- a/src/test/java/net/onrc/onos/ofcontroller/core/internal/SwitchStorageImplTestBB.java
+++ b/src/test/java/net/onrc/onos/ofcontroller/core/internal/SwitchStorageImplTestBB.java
@@ -106,7 +106,7 @@
public void testAddSwitchExisting() {
String dpid = "00:00:00:00:00:00:0a:06";
- swSt.update(dpid, SwitchState.INACTIVE, DM_OPERATION.UPDATE);
+ swSt.updateSwitch(dpid, SwitchState.INACTIVE, DM_OPERATION.UPDATE);
ISwitchObject sw = ope.searchSwitch(dpid);
assertTrue(sw != null);
assertEquals(sw.getState(), SwitchState.INACTIVE.toString());
@@ -136,7 +136,7 @@
ISwitchObject sw = ope.searchSwitch(dpid);
assertTrue(sw == null);
- swSt.update(dpid, state, dmope);
+ swSt.updateSwitch(dpid, state, dmope);
ISwitchObject sw2 = ope.searchSwitch(dpid);
assertTrue(sw2 != null);
assertEquals(sw2.getState(), state.toString());
@@ -161,7 +161,7 @@
ISwitchObject sw = ope.searchSwitch(dpid);
assertTrue(sw != null);
- swSt.update(dpid, state, dmope);
+ swSt.updateSwitch(dpid, state, dmope);
ISwitchObject sw2 = ope.searchSwitch(dpid);
assertTrue(sw2 == null);
}