Handle changes btw. QoS parms in 1.5 and 1.6
Change-Id: Ife6c68f9ab1d93eb7028c0482cb761350b894ce5
diff --git a/4g-core-values-1.5.yaml b/4g-core-values-1.5.yaml
new file mode 100644
index 0000000..1619826
--- /dev/null
+++ b/4g-core-values-1.5.yaml
@@ -0,0 +1,94 @@
+# Copyright 2019-present Open Networking Foundation
+#
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+
+# cassandra values
+cassandra:
+ config:
+ cluster_size: 1
+ seed_size: 1
+resources:
+ enabled: false
+
+config:
+ managedByConfigPod:
+ enabled: true
+ # syncUrl: http://sdcore-adapter-v4.aether-roc.svc:8080/synchronize
+ config4g:
+ deploy: true
+ hss:
+ bootstrap:
+ users: []
+ staticusers: []
+ spgwc:
+ pfcp: true
+ cfgFiles:
+ cp.json:
+ ip_pool_config:
+ ueIpPool:
+ ip: "172.250.0.0"
+ mask: "255.255.0.0"
+ staticUeIpPool:
+ ip: "172.250.1.0"
+ mask: "255.255.255.0"
+ simapp:
+ cfgFiles:
+ simapp.yaml:
+ configuration:
+ provision-network-slice: true
+ sub-provision-endpt:
+ addr: config4g
+ port: 5000
+ subscribers:
+ - ueId-start: 208014567891201
+ ueId-end: 208014567891211
+ plmnId: 20801
+ opc: "d4416644f6154936193433dd20a0ace0"
+ op: ""
+ key: "465b5ce8b199b49faa5f0a2ee238a6bc"
+ sequenceNumber: 96
+ device-groups:
+ - name: "4g-oaisim-user"
+ imsis:
+ - "208014567891201"
+ - "208014567891202"
+ ip-domain-name: "pool1"
+ ip-domain-expanded:
+ dnn: internet
+ dns-primary: "8.8.8.8"
+ mtu: 1460
+ ue-ip-pool: "172.250.0.0/16"
+ site-info: "aiab"
+ network-slices:
+ - name: "default"
+ slice-id:
+ sd: "010203"
+ sst: 1
+ site-device-group:
+ - "4g-oaisim-user"
+ applications-information:
+ - app-name: "default-app"
+ end-port: 40000
+ endpoint: "1.1.1.1/32"
+ protocol: 17
+ start-port: 40000
+ deny-applications:
+ - "iot-app-deny"
+ permit-applications:
+ - "iot-app1-permit"
+ - "iot-app2-permit"
+ qos:
+ downlink: 20
+ traffic-class: "platinum"
+ uplink: 40
+ site-info:
+ gNodeBs:
+ - name: "aiab-gnb1"
+ tac: 1
+ plmn:
+ mcc: "208"
+ mnc: "01"
+ site-name: "aiab"
+ upf:
+ upf-name: "upf"
+ upf-port: 8805
diff --git a/4g-core-values.yaml b/4g-core-values.yaml
index 0d84851..acf50a0 100644
--- a/4g-core-values.yaml
+++ b/4g-core-values.yaml
@@ -16,6 +16,10 @@
# syncUrl: http://sdcore-adapter-v4.aether-roc.svc:8080/synchronize
config4g:
deploy: true
+ hss:
+ bootstrap:
+ users: []
+ staticusers: []
spgwc:
pfcp: true
cfgFiles:
@@ -54,6 +58,16 @@
dns-primary: "8.8.8.8"
mtu: 1460
ue-ip-pool: "172.250.0.0/16"
+ ue-dnn-qos:
+ dnn-mbr-downlink: 20000000
+ dnn-mbr-uplink: 4000000
+ bitrate-unit: bps
+ traffic-class: #default bearer QCI/ARP
+ name: "platinum"
+ qci: 9
+ arp: 6
+ pdb: 300
+ pelr: 6
site-info: "aiab"
network-slices:
- name: "default"
@@ -62,21 +76,11 @@
sst: 1
site-device-group:
- "4g-oaisim-user"
- applications-information:
- - app-name: "default-app"
- end-port: 40000
- endpoint: "1.1.1.1/32"
- protocol: 17
- start-port: 40000
- deny-applications:
- - "iot-app-deny"
- permit-applications:
- - "iot-app1-permit"
- - "iot-app2-permit"
- qos:
- downlink: 20
- traffic-class: "platinum"
- uplink: 40
+ application-filtering-rules:
+ - rule-name: "ALLOW-ALL"
+ priority: 250
+ action: "permit"
+ endpoint: "0.0.0.0/0"
site-info:
gNodeBs:
- name: "aiab-gnb1"
diff --git a/5g-core-values-1.5.yaml b/5g-core-values-1.5.yaml
new file mode 100644
index 0000000..4b93b99
--- /dev/null
+++ b/5g-core-values-1.5.yaml
@@ -0,0 +1,115 @@
+# Copyright 2019-present Open Networking Foundation
+#
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+mongodb:
+ usePassword: false
+ persistence:
+ enabled: false
+resources:
+ enabled: false
+
+config:
+ managedByConfigPod:
+ enabled: true
+ # syncUrl: http://sdcore-adapter-v3.aether-roc.svc:8080/synchronize
+ smf:
+ cfgFiles:
+ # https://github.com/free5gc/free5gc/blob/main/config/pcfcfg.yaml
+ smfcfg.conf:
+ configuration:
+ mongodb: # the mongodb connected by this PCF
+ name: smf # name of the mongodb
+ url: mongodb://mongodb:27017
+ pcf:
+ cfgFiles:
+ # https://github.com/free5gc/free5gc/blob/main/config/pcfcfg.yaml
+ pcfcfg.conf:
+ info:
+ version: 1.0.0
+ description: PCF initial local configuration
+ configuration:
+ mongodb: # the mongodb connected by this PCF
+ name: free5gc # name of the mongodb
+ url: mongodb://mongodb:27017
+ nrf:
+ cfgFiles:
+ # https://github.com/free5gc/free5gc/blob/main/config/nrfcfg.yaml
+ nrfcfg.conf:
+ configuration:
+ MongoDBName: free5gc # database name in MongoDB
+ MongoDBUrl: mongodb://mongodb:27017
+ #MongoDBUrl: mongodb://mongodb:27017 #works with db in omec name space
+ simapp:
+ cfgFiles:
+ simapp.yaml:
+ configuration:
+ provision-network-slice: true
+ sub-provision-endpt:
+ addr: webui
+ port: 5000
+ subscribers:
+ - ueId-start: 2089300007487
+ ueId-end: 2089300007501
+ plmnId: 20893
+ opc: "981d464c7c52eb6e5036234984ad0bcf"
+ op: ""
+ key: "5122250214c33e723a5dd523fc145fc0"
+ sequenceNumber: "16f3b3f70fc2"
+ device-groups:
+ - name: "5g-gnbsim-user"
+ imsis:
+ - "2089300007487"
+ - "2089300007488"
+ - "2089300007489"
+ - "2089300007490"
+ - "2089300007491"
+ - "2089300007492"
+ - "2089300007493"
+ - "2089300007494"
+ - "2089300007495"
+ - "2089300007496"
+ - "2089300007497"
+ - "2089300007498"
+ - "2089300007499"
+ - "2089300007500"
+ - "2089300007501"
+ ip-domain-name: "pool1"
+ ip-domain-expanded:
+ dnn: internet
+ dns-primary: "8.8.8.8"
+ mtu: 1460
+ ue-ip-pool: "172.250.0.0/16"
+ site-info: "aiab"
+ network-slices:
+ - name: "default"
+ slice-id:
+ sd: "010203"
+ sst: 1
+ site-device-group:
+ - "5g-gnbsim-user"
+ applications-information:
+ - app-name: "default-app"
+ end-port: 40000
+ endpoint: "1.1.1.1/32"
+ protocol: 17
+ start-port: 40000
+ deny-applications:
+ - "iot-app-deny"
+ permit-applications:
+ - "iot-app1-permit"
+ - "iot-app2-permit"
+ qos:
+ downlink: 20
+ traffic-class: "platinum"
+ uplink: 40
+ site-info:
+ gNodeBs:
+ - name: "aiab-gnb1"
+ tac: 1
+ plmn:
+ mcc: "208"
+ mnc: "93"
+ site-name: "aiab"
+ upf:
+ upf-name: "upf"
+ upf-port: 8805
diff --git a/5g-core-values.yaml b/5g-core-values.yaml
index 4b93b99..dbecb46 100644
--- a/5g-core-values.yaml
+++ b/5g-core-values.yaml
@@ -79,6 +79,16 @@
dns-primary: "8.8.8.8"
mtu: 1460
ue-ip-pool: "172.250.0.0/16"
+ ue-dnn-qos:
+ dnn-mbr-downlink: 20000000
+ dnn-mbr-uplink: 4000000
+ bitrate-unit: bps
+ traffic-class: #default bearer QCI/ARP
+ name: "platinum"
+ qci: 9
+ arp: 6
+ pdb: 300
+ pelr: 6
site-info: "aiab"
network-slices:
- name: "default"
@@ -87,21 +97,11 @@
sst: 1
site-device-group:
- "5g-gnbsim-user"
- applications-information:
- - app-name: "default-app"
- end-port: 40000
- endpoint: "1.1.1.1/32"
- protocol: 17
- start-port: 40000
- deny-applications:
- - "iot-app-deny"
- permit-applications:
- - "iot-app1-permit"
- - "iot-app2-permit"
- qos:
- downlink: 20
- traffic-class: "platinum"
- uplink: 40
+ application-filtering-rules:
+ - rule-name: "ALLOW-ALL"
+ priority: 250
+ action: "permit"
+ endpoint: "0.0.0.0/0"
site-info:
gNodeBs:
- name: "aiab-gnb1"
diff --git a/configs/release-1.5 b/configs/release-1.5
index af56cb6..d0fbcca 100644
--- a/configs/release-1.5
+++ b/configs/release-1.5
@@ -18,3 +18,5 @@
ROC_VALUES := $(MAKEDIR)/roc-values-v3.yaml
ROC_4G_MODELS := $(MAKEDIR)/roc-4g-models-v3.json
ROC_5G_MODELS := $(MAKEDIR)/roc-5g-models-v3.json
+4G_CORE_VALUES := $(MAKEDIR)/4g-core-values-1.5.yaml
+5G_CORE_VALUES := $(MAKEDIR)/5g-core-values-1.5.yaml