commit 909b958bffe90f4d28ef0446340b8e41c630d24a
author Daniele Moro <daniele@opennetworking.org> Wed Jan 26 15:47:29 2022 +0100
committer Daniele Moro <daniele@opennetworking.org> Thu Feb 10 09:19:52 2022 +0000
tree 7ea5b0c89191e69f72943c3e7cfbf96118eff2b0
parent e48c599b0b8aaa159fda2eff8a9a06ae10e8c134

[SDFAB-831] Add UPF meters to UpfProgrammable APIs

UPF meters can be of type session or application.
Also, add meter index to sessions and terminations UPF entities.

Change-Id: I8babfca35341a21b234d8eb6edaa2e1c02684210
(cherry picked from commit b25299afaf824a8d352297224e5b9a1285901d00)

core/api/src/main/java/org/onosproject/net/behaviour/upf/UpfTerminationUplink.java

diff --git a/core/api/src/main/java/org/onosproject/net/behaviour/upf/UpfTerminationUplink.java b/core/api/src/main/java/org/onosproject/net/behaviour/upf/UpfTerminationUplink.java
index 93ac0b7..ddec2e4 100644
--- a/core/api/src/main/java/org/onosproject/net/behaviour/upf/UpfTerminationUplink.java
+++ b/core/api/src/main/java/org/onosproject/net/behaviour/upf/UpfTerminationUplink.java
@@ -36,14 +36,17 @@
     // Action parameters
     private final Integer ctrId;  // Counter ID unique to this UPF Termination Rule
     private final Byte trafficClass;
+    private final int appMeterIdx;
     private final boolean dropping;
 
-    private UpfTerminationUplink(Ip4Address ueSessionId, byte applicationId, Integer ctrId, Byte trafficClass,
-                                 boolean dropping) {
+    private UpfTerminationUplink(Ip4Address ueSessionId, byte applicationId,
+                                 Integer ctrId, Byte trafficClass,
+                                 int appMeterIdx, boolean dropping) {
         this.ueSessionId = ueSessionId;
         this.applicationId = applicationId;
         this.ctrId = ctrId;
         this.trafficClass = trafficClass;
+        this.appMeterIdx = appMeterIdx;
         this.dropping = dropping;
     }
 
@@ -69,12 +72,13 @@
                 Objects.equals(this.ueSessionId, that.ueSessionId) &&
                 Objects.equals(this.applicationId, that.applicationId) &&
                 Objects.equals(this.ctrId, that.ctrId) &&
+                this.appMeterIdx == that.appMeterIdx &&
                 Objects.equals(this.trafficClass, that.trafficClass);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(ueSessionId, applicationId, ctrId, trafficClass, dropping);
+        return Objects.hash(ueSessionId, applicationId, ctrId, trafficClass, appMeterIdx, dropping);
     }
 
     /**
@@ -122,6 +126,15 @@
         return dropping;
     }
 
+    /**
+     * Get the app meter index set by this UPF Termination rule.
+     *
+     * @return App meter index
+     */
+    public int appMeterIdx() {
+        return appMeterIdx;
+    }
+
     @Override
     public UpfEntityType type() {
         return UpfEntityType.TERMINATION_UPLINK;
@@ -144,6 +157,7 @@
         return "Action(" + fwd +
                 ", ctr_id=" + this.counterId() +
                 ", tc=" + this.trafficClass() +
+                ", app_meter_idx=" + this.appMeterIdx() +
                 ")";
     }
 
@@ -152,6 +166,7 @@
         private Byte applicationId = null;
         private Integer ctrId = null;
         private Byte trafficClass = null;
+        private int appMeterIdx = DEFAULT_APP_INDEX;
         private boolean dropping = false;
 
         public Builder() {
@@ -171,6 +186,7 @@
 
         /**
          * Set the ID of the application.
+         * If not set, default to {@link UpfEntity#DEFAULT_APP_ID}.
          *
          * @param applicationId Application ID
          * @return This builder object
@@ -213,6 +229,18 @@
             return this;
         }
 
+        /**
+         * Sets the app meter index.
+         * If not set, default to {@link UpfEntity#DEFAULT_APP_INDEX}.
+         *
+         * @param appMeterIdx App meter index
+         * @return This builder object
+         */
+        public Builder withAppMeterIdx(int appMeterIdx) {
+            this.appMeterIdx = appMeterIdx;
+            return this;
+        }
+
         public UpfTerminationUplink build() {
             // Match fields must be provided
             checkNotNull(ueSessionId, "UE session ID must be provided");
@@ -223,7 +251,7 @@
             // TODO: should we verify that when dropping no other fields are provided
             return new UpfTerminationUplink(
                     this.ueSessionId, this.applicationId, this.ctrId,
-                    this.trafficClass, this.dropping
+                    this.trafficClass, this.appMeterIdx, this.dropping
             );
         }