commit 381c7ca5e35786ae9e5a802137d8094ba65727d9
author Saurav Das <saurav.das@opennetworking.org> Mon Sep 21 15:26:50 2020 -0700
committer Andrea Campanella <andrea@opennetworking.org> Wed Sep 23 07:24:22 2020 +0000
tree bfc748cccac3fcec69d27433e0ca48220f794019
parent da70796c9bf8cfcef165c824a49f8f0ece6c4cd4

Avoid sending meter-modify for a pending add to openflow southbound

Change-Id: Ia84c8bdce944344ceee7090bd34ab464e1fe23c7
(cherry picked from commit 568568224f7d47c670aadbe472232dbd8be7e026)

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 49a889d..d157260 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
@@ -394,7 +394,7 @@
                 // FIXME: Installing a meter is meaningful for OpenFlow, but not for P4Runtime.
                 // It looks like this flow is used only for p4runtime to emulate the installation
                 // since meters are already instantiated - we need just modify the params.
-                if (m.state() == MeterState.PENDING_ADD) {
+                if (m.state() == MeterState.PENDING_ADD && m.meterCellId().type() != MeterCellType.INDEX) {
                     // offload the task to avoid the overloading of the sb threads
                     meterInstallers.execute(new MeterInstaller(m.deviceId(), m, MeterOperation.Type.MODIFY));
                 // Remove workflow. Regarding OpenFlow, meters have been removed from