Merge "BUG-5839: Removing groups and meters on being stale-marked"

diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowNodeReconciliationImpl.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowNodeReconciliationImpl.java
index 6b5112a8db0a033c0dd802aa99f2695b5888b6ce..2b62037b373c20eade1284e0ff6d14fdcd43a556 100644 (file)
--- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowNodeReconciliationImpl.java
+++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/FlowNodeReconciliationImpl.java
@@ -415,7 +415,7 @@ public class FlowNodeReconciliationImpl implements FlowNodeReconciliation {
                 final KeyedInstanceIdentifier<Group, GroupKey> groupIdent =
                         nodeIdent.child(Group.class, toBeDeletedGroup.getKey());
 
-                this.provider.getGroupCommiter().add(groupIdent, toBeDeletedGroup, nodeIdent);
+                this.provider.getGroupCommiter().remove(groupIdent, toBeDeletedGroup, nodeIdent);
 
                 staleGroupsToBeBulkDeleted.add(getStaleGroupInstanceIdentifier(staleGroup, nodeIdent));
             }
@@ -435,7 +435,7 @@ public class FlowNodeReconciliationImpl implements FlowNodeReconciliation {
                         nodeIdent.child(Meter.class, toBeDeletedMeter.getKey());
 
 
-                this.provider.getMeterCommiter().add(meterIdent, toBeDeletedMeter, nodeIdent);
+                this.provider.getMeterCommiter().remove(meterIdent, toBeDeletedMeter, nodeIdent);
 
                 staleMetersToBeBulkDeleted.add(getStaleMeterInstanceIdentifier(staleMeter, nodeIdent));
             }