| commit | 80ce506eb325a257e61cc4c9441144aa10515bc3 | [log] [tgz] |
|---|---|---|
| author | TeruU <t-uchida@onlab.us> | Mon Mar 03 17:16:13 2014 -0800 |
| committer | Gerrit Code Review <gerrit2@onos-services> | Thu Mar 13 20:01:50 2014 -0700 |
| tree | f761f312fceac8c95c2ab12ae84b234f35ce8b60 | |
| parent | d6ef3b3b8481cd1f161523e5242a551e8f0c613a [diff] [blame] |
Cherry-pick from https://gerrit.onos.onlab.us/#/c/342/ Cherry-pick from https://gerrit.onos.onlab.us/#/c/322/ Suppress device update for the same device. Add function to clean devices. Conflicts: src/main/java/net/onrc/onos/ofcontroller/devicemanager/OnosDeviceManager.java NOTE: The above conflict has been resolved by hand. The conflict was in the number of parameters when calling deviceStorage.init() inside file OnosDeviceManager.java: deviceStorage.init("") -> deviceStorage.init("","") Conflicts: src/main/java/net/onrc/onos/datagrid/HazelcastDatagrid.java src/main/java/net/onrc/onos/datagrid/IDatagridService.java NOTE: The above conflict has been resolved by hand. Change-Id: I831e391efce9a795370be99238834b6bc7db2bee
diff --git a/src/main/java/net/onrc/onos/ofcontroller/devicemanager/IOnosDeviceService.java b/src/main/java/net/onrc/onos/ofcontroller/devicemanager/IOnosDeviceService.java index 1e40aa5..9125985 100644 --- a/src/main/java/net/onrc/onos/ofcontroller/devicemanager/IOnosDeviceService.java +++ b/src/main/java/net/onrc/onos/ofcontroller/devicemanager/IOnosDeviceService.java
@@ -11,4 +11,8 @@ */ public interface IOnosDeviceService extends IFloodlightService { + public void deleteOnosDevice(OnosDevice dev); + + public void addOnosDevice(Long mac, OnosDevice dev); + }