commit 1d49a407f108aa14b01c4ca062ab8af02ce5f4d4
author Carmelo Cascone <carmelo@opennetworking.org> Mon Aug 09 20:01:59 2021 -0700
committer Daniele Moro <dmoro@Danieles-MacBook-Pro.local> Mon Aug 16 16:22:00 2021 +0200
tree 8c4ad157e5e82c9f5a50a9daf9323484820ac2bb
parent 08c9e7f71c3c0e599c4739c9cbd4bd6257a4baef

Fix wrong arguments in load_pdr action

According to fabric.p4, needs_qfi_push can only be present
when using load_pdr_qos, but not load_pdr.

Change-Id: I63b74762f56acc7e8a703a32ea368eb423ece41a
(cherry picked from commit 94015dee30b6d98e2658e6ff1ba557f5ad5010b5)

pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/upf/FabricUpfTranslator.java

diff --git a/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/upf/FabricUpfTranslator.java b/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/upf/FabricUpfTranslator.java
index 179e793..f2e7584 100644
--- a/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/upf/FabricUpfTranslator.java
+++ b/pipelines/fabric/impl/src/main/java/org/onosproject/pipelines/fabric/impl/behaviour/upf/FabricUpfTranslator.java
@@ -368,11 +368,10 @@
             tableId = FABRIC_INGRESS_SPGW_DOWNLINK_PDRS;
             matchBuilder.matchExact(HDR_UE_ADDR, pdr.ueAddress().toInt());
             if (pdr.hasQfi()) {
-                actionBuilder.withParameter(new PiActionParam(QFI, pdr.qfi()));
+                actionBuilder.withParameter(new PiActionParam(QFI, pdr.qfi()))
+                        .withParameter(new PiActionParam(NEEDS_QFI_PUSH, pdr.pushQfi() ? TRUE : FALSE));
                 actionId = FABRIC_INGRESS_SPGW_LOAD_PDR_QOS;
             }
-            actionBuilder.withParameter(
-                    new PiActionParam(NEEDS_QFI_PUSH, pdr.pushQfi() ? TRUE : FALSE));
         } else {
             throw new UpfProgrammableException("Flexible PDRs not yet supported! Cannot translate " + pdr);
         }