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

[openflowplugin.git] / applications / forwardingrules-manager / src / main / java / org / opendaylight / openflowplugin / applications / frm / impl / FlowNodeReconciliationImpl.java

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 6a891fd64abce824025a04622db3a206d62ef05d..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
@@ -222,18 +222,13 @@ public class FlowNodeReconciliationImpl implements FlowNodeReconciliation {
         if (flowNode.isPresent()) {
             /* Tables - have to be pushed before groups */
             // CHECK if while pusing the update, updateTableInput can be null to emulate a table add
-            List<Table> tableList = flowNode.get().getTable() != null
-                    ? flowNode.get().getTable() : Collections.<Table> emptyList() ;
-            for (Table table : tableList) {
-                TableKey tableKey = table.getKey();
+            List<TableFeatures> tableList = flowNode.get().getTableFeatures() != null
+                    ? flowNode.get().getTableFeatures() : Collections.<TableFeatures> emptyList() ;
+            for (TableFeatures tableFeaturesItem : tableList) {
+                TableFeaturesKey tableKey = tableFeaturesItem.getKey();
                 KeyedInstanceIdentifier<TableFeatures, TableFeaturesKey> tableFeaturesII
-                    = nodeIdent.child(Table.class, tableKey).child(TableFeatures.class, new TableFeaturesKey(tableKey.getId()));
-                List<TableFeatures> tableFeatures = table.getTableFeatures();
-                if (tableFeatures != null) {
-                    for (TableFeatures tableFeaturesItem : tableFeatures) {
+                    = nodeIdent.child(TableFeatures.class, new TableFeaturesKey(tableKey.getTableId()));
                         provider.getTableFeaturesCommiter().update(tableFeaturesII, tableFeaturesItem, null, nodeIdent);
-                    }
-                }
             }
 
             /* Groups - have to be first */