commit f013a7852bd14dcd9e436484ce0a9e88c497f1b9
author Wailok Shum <wailok@opennetworking.org> Mon Jul 26 16:51:01 2021 +0800
committer Wailok Shum <wailok@opennetworking.org> Thu Aug 05 00:32:55 2021 +0800
tree 75e4da04c8209feb833fcf98b67a9182b9f0513e
parent 121ea29ece6bfa638d34f3f1d4b7d14f6af0c756

[SDFAB-352][SDFAB-353] Retrieve MeterFeatures from the P4RT southbound, Extend MeterProviderService and revisit MeterStore

Change-Id: If0dae53643988cb551ff5020abd792cb6d33ff6b

core/net/src/main/java/org/onosproject/net/meter/impl/MeterManager.java

diff --git a/core/net/src/main/java/org/onosproject/net/meter/impl/MeterManager.java b/core/net/src/main/java/org/onosproject/net/meter/impl/MeterManager.java
index 363876c..03bb5ca 100644
--- a/core/net/src/main/java/org/onosproject/net/meter/impl/MeterManager.java
+++ b/core/net/src/main/java/org/onosproject/net/meter/impl/MeterManager.java
@@ -417,7 +417,7 @@
                 // and we purge the meter from the store
                 } else if (m.state() == MeterState.PENDING_REMOVE) {
                     log.debug("Delete meter {} now in store", m.id());
-                    store.deleteMeterNow(m);
+                    store.purgeMeter(m);
                 }
             });
         }
@@ -428,6 +428,11 @@
         }
 
         @Override
+        public void pushMeterFeatures(DeviceId deviceId, Collection<MeterFeatures> meterfeatures) {
+            meterfeatures.forEach(mf -> store.storeMeterFeatures(mf));
+        }
+
+        @Override
         public void deleteMeterFeatures(DeviceId deviceId) {
             store.deleteMeterFeatures(deviceId);
         }