mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-16 18:02:05 +02:00
Code Issues Projects Releases Wiki Activity

CORD-280 Fix the way to add and remove a node to consistent store

Browse Source 
Change-Id: Iff55398d0a78acf3cdce8a5b43146f95b562d5a5
This commit is contained in:
Hyunsun Moon 2015-10-20 13:58:02 -07:00 committed by Gerrit Code Review
parent a72d44dc9d
commit c10f7773e7
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/cordvtn/src/main/java/org/onosproject/cordvtn/CordVtn.java
View File

@ -146,9 +146,7 @@ public class CordVtn implements CordVtnService {
public void addNode(OvsdbNode ovsdb) {
checkNotNull(ovsdb);
if (!nodeStore.containsKey(ovsdb.deviceId())) {
nodeStore.put(ovsdb.deviceId(), ovsdb);
}
nodeStore.putIfAbsent(ovsdb.deviceId(), ovsdb);
if (isNodeConnected(ovsdb)) {
init(ovsdb);
@ -161,10 +159,6 @@ public class CordVtn implements CordVtnService {
public void deleteNode(OvsdbNode ovsdb) {
checkNotNull(ovsdb);
if (!nodeStore.containsKey(ovsdb.deviceId())) {
return;
}
if (deviceService.getDevice(ovsdb.deviceId()) != null) {
if (deviceService.isAvailable(ovsdb.deviceId())) {
log.warn("Cannot delete connected node {}", ovsdb.host());