From 497d0a56fd71c1baa3a37c2c8fa22c367237e8fb Mon Sep 17 00:00:00 2001
From: Vijaya Rani <vijaya@opennetworking.org>
Date: Tue, 2 Nov 2021 00:01:49 +0530
Subject: [PATCH] Bitrate support in simapp

---
 config/simapp.yaml | 27 +++++++++++++++++----------
 simapp.go          |  8 ++++++--
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/config/simapp.yaml b/config/simapp.yaml
index 6674134..a324a18 100644
--- a/config/simapp.yaml
+++ b/config/simapp.yaml
@@ -43,8 +43,9 @@ configuration:
       mtu: 1460
       ue-ip-pool: 10.91.0.0/16
       ue-dnn-qos:
-        dnn-mbr-downlink: 20000000
-        dnn-mbr-uplink: 4000000
+        dnn-mbr-downlink: 20
+        dnn-mbr-uplink: 4
+        bitrate-unit: Mbps
         traffic-class:  #default bearer QCI/ARP
           name: "platinum"
           qci: 9
@@ -64,15 +65,17 @@ configuration:
       priority: 25
       action: "permit"
       endpoint: 0.0.0.0/0
-      app-mbr-uplink:   100000  #100kbps
-      app-mbr-downlink: 2000000 #2Mbps
+      app-mbr-uplink:   100 #100kbps
+      app-mbr-downlink: 2000 #2Mbps
+      bitrate-unit: Kbps
       traffic-class : "silver" #if same as APN-AMBR then its default bearer rule
     - rule-name: rule2
       priority: 15
       action: "permit"
       endpoint: 8.8.8.8/32
-      app-mbr-uplink: 1000000   #1Mbps
-      app-mbr-downlink: 4000000 #5Mbps
+      app-mbr-uplink: 1 #1Mbps
+      app-mbr-downlink: 5 #5Mbps
+      bitrate-unit: Mbps
       traffic-class : #if same as APN-AMBR then its default bearer rule
         name: "silver"
         qci: 9
@@ -83,8 +86,9 @@ configuration:
       priority: 25
       action: "permit"
       endpoint: 8.8.8.4/32
-      app-mbr-uplink: 120000
-      app-mbr-downlink: 520000
+      app-mbr-uplink: 120
+      app-mbr-downlink: 520
+      bitrate-unit: Kbps
       traffic-class : #this will create new bearer if QCI/ARP combination is different than default QCI/ARP
         name: "platinum"
         qci: 9
@@ -98,6 +102,7 @@ configuration:
       endpoint: 1.1.1.1/32
       app-mbr-uplink: 120000
       app-mbr-downlink: 520000
+      bitrate-unit: bps
       traffic-class : #this will create new bearer if QCI/ARP combination is different than default QCI/ARP
         name: "gold"
         qci: 9
@@ -111,6 +116,7 @@ configuration:
       endpoint: 1.1.1.2/32
       app-mbr-uplink: 120000
       app-mbr-downlink: 520000
+      bitrate-unit: bps
       traffic-class : #this will create new bearer if QCI/ARP combination is different than default QCI/ARP
         name: "diamond"
         qci: 9
@@ -119,8 +125,9 @@ configuration:
         pelr: 6
       rule-trigger: "timer,0"  #immeidate creation of this bearer immediately. Create after 10 sec time.
     qos:
-      uplink: 2000000   #2Mbps
-      downlink: 5000000 #5Mbps
+      uplink: 2   #2Mbps
+      downlink: 5 #5Mbps
+      bitrate-unit: Mbps
       traffic-class: "silver" #default bearer QCI/ARP
     site-info:
       gNodeBs:
diff --git a/simapp.go b/simapp.go
index c31c81c..86bbce4 100644
--- a/simapp.go
+++ b/simapp.go
@@ -95,12 +95,14 @@ type SliceId struct {
 type QosInfo struct {
 	Uplink       int    `yaml:"uplink,omitempty" json:"uplink,omitempty"`
 	Downlink     int    `yaml:"downlink,omitempty" json:"downlink,omitempty"`
+	BitRateUnit  string `yaml:"bitrate-unit,omitempty" json:"bitrate-unit,omitempty"`
 	TrafficClass string `yaml:"traffic-class,omitempty" json:"traffic-class,omitempty"`
 }
 
 type UeDnnQosInfo struct {
 	Uplink       int               `yaml:"dnn-mbr-uplink,omitempty" json:"dnn-mbr-uplink,omitempty"`
 	Downlink     int               `yaml:"dnn-mbr-downlink,omitempty" json:"dnn-mbr-downlink,omitempty"`
+	BitRateUnit  string            `yaml:"bitrate-unit,omitempty" json:"bitrate-unit,omitempty"`
 	TrafficClass *TrafficClassInfo `yaml:"traffic-class,omitempty" json:"traffic-class,omitempty"`
 }
 
@@ -158,9 +160,11 @@ type ApplicationFilteringRules struct {
 	// port range end
 	EndPort int32 `yaml:"end-port,omitempty" json:"end-port,omitempty"`
 
-	AppMbrUplink int32 `yaml:"app-mbr-uplink,omitempty" json:"app-mbr-uplink,omitempty"`
+	AppMbrUplink int64 `yaml:"app-mbr-uplink,omitempty" json:"app-mbr-uplink,omitempty"`
 
-	AppMbrDownlink int32 `yaml:"app-mbr-downlink,omitempty" json:"app-mbr-downlink,omitempty"`
+	AppMbrDownlink int64 `yaml:"app-mbr-downlink,omitempty" json:"app-mbr-downlink,omitempty"`
+
+	BitRateUnit string `yaml:"bitrate-unit,omitempty" json:"bitrate-unit,omitempty"`
 
 	TrafficClass *TrafficClassInfo `yaml:"traffic-class,omitempty" json:"traffic-class,omitempty"`