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

FIX: Onos is reinstalling the meter to the switch when in PENDING_REMOVE state

Browse Source 
Change-Id: I35454d519cc66abfe8ca2ae6b07a91899ff34a64
This commit is contained in:
Jordi Ortiz 2017-06-15 12:40:11 +02:00 committed by Andrea Campanella
parent c99b15ae4f
commit 58d5ec0e81
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
incubator/net/src/main/java/org/onosproject/incubator/net/meter/impl/MeterManager.java
View File

@ -260,7 +260,9 @@ public class MeterManager
storedMeterMap.keySet().stream()
.filter(m -> m.getLeft().equals(deviceId)).forEach(m -> {
if (!meterEntriesMap.containsKey(m.getRight())) {
if ((storedMeterMap.get(m).state().equals(MeterState.PENDING_ADD) ||
storedMeterMap.get(m).state().equals(MeterState.ADDED)) &&
!meterEntriesMap.containsKey(m.getRight())) {
// The meter is missing in the device. Reinstall!
Meter meter = storedMeterMap.get(Pair.of(deviceId, m.getRight()));
provider().performMeterOperation(deviceId,