moving cp.cfg to cp.json
Change-Id: Ie342fea6a33ed4def0901cead484d4593871c224
diff --git a/omec/omec-control-plane/Chart.yaml b/omec/omec-control-plane/Chart.yaml
index d1880c1..4a1a50a 100644
--- a/omec/omec-control-plane/Chart.yaml
+++ b/omec/omec-control-plane/Chart.yaml
@@ -10,4 +10,4 @@
name: omec-control-plane
icon: https://guide.opencord.org/logos/cord.svg
-version: 0.6.5
+version: 0.6.6
diff --git a/omec/omec-control-plane/templates/bin/_hss-bootstrap.sh.tpl b/omec/omec-control-plane/templates/bin/_hss-bootstrap.sh.tpl
index 12409af..b6d8fda 100644
--- a/omec/omec-control-plane/templates/bin/_hss-bootstrap.sh.tpl
+++ b/omec/omec-control-plane/templates/bin/_hss-bootstrap.sh.tpl
@@ -101,8 +101,8 @@
{{ .opc }} \
{{ .sqn }} \
{{ $.Values.config.hss.hssdb }} \
- $mme_identity \
- $mme_realm
+ {{ .mme_identity }} \
+ {{ .mme_realm }}
{{- end }}
{{- range .Values.config.hss.bootstrap.staticusers }}
@@ -114,8 +114,8 @@
{{ .opc }} \
{{ .sqn }} \
{{ $.Values.config.hss.hssdb }} \
- $mme_identity \
- $mme_realm \
+ {{ .mme_identity }} \
+ {{ .mme_realm }} \
{{ .staticAddr }}
{{- end }}
diff --git a/omec/omec-control-plane/templates/configmap-spgwc.yaml b/omec/omec-control-plane/templates/configmap-spgwc.yaml
index 11d0c80..372ba4c 100644
--- a/omec/omec-control-plane/templates/configmap-spgwc.yaml
+++ b/omec/omec-control-plane/templates/configmap-spgwc.yaml
@@ -60,6 +60,10 @@
[IP_POOL_CONFIG]
IP_POOL_IP= {{.Values.config.spgwc.ueIpPool.ip }}
IP_POOL_MASK= {{ .Values.config.spgwc.ueIpPool.mask }}
+ [STATIC_IP_POOL_CONFIG]
+ IP_POOL_IP= {{.Values.config.spgwc.staticUeIpPool.ip }}
+ IP_POOL_MASK= {{ .Values.config.spgwc.staticUeIpPool.mask }}
+
gx.conf: |
Identity = {{ tuple "spgwc" "identity" . | include "omec-control-plane.diameter_endpoint" | quote }};
Realm = {{ tuple "spgwc" "realm" . | include "omec-control-plane.diameter_endpoint" | quote }};
diff --git a/omec/omec-control-plane/values.yaml b/omec/omec-control-plane/values.yaml
index 34148e5..1e7396f 100644
--- a/omec/omec-control-plane/values.yaml
+++ b/omec/omec-control-plane/values.yaml
@@ -220,6 +220,8 @@
sqn: 96
imsiStart: "208014567891200"
msisdnStart: "1122334455"
+ mme_identity: mme.omec.svc.cluster.local
+ mme_realm: omec.svc.cluster.local
count: 10
staticusers:
- apn: internet
@@ -229,6 +231,8 @@
imsi: "208014567891200"
msisdn: "1122334455"
staticAddr: 0.0.0.0
+ mme_identity: mme.omec.svc.cluster.local
+ mme_realm: omec.svc.cluster.local
mmes:
- id: 1
mme_identity: mme.omec.svc.cluster.local
@@ -391,6 +395,9 @@
ueIpPool:
ip: "10.250.0.0"
mask: "255.255.0.0"
+ staticUeIpPool:
+ ip: "10.249.1.0"
+ mask: "255.255.255.0"
s11:
port: 2123
nodePort:
@@ -412,6 +419,39 @@
enabled: false
port: 30080
jsonCfgFiles:
+ cp.json:
+ global:
+ transmitTimerSec: 2
+ periodicTimerSec: 10
+ transmitCount: 5
+ requestTimeoutMilliSec: 5000
+ requestTries: 3
+ gxConfig: 0
+ urrConfig: 0
+ loggingLevel: "LOG_DEBUG"
+ #DNS Server - 3gpp compliant DNS server
+ dns:
+ cache:
+ concurrent: 25
+ percentage: 80
+ intervalSec: 60
+ queryTimeoutMilliSec: 1000
+ queryTries: 1
+ app:
+ frequencySec: 3
+ filename: "appqueries.json"
+ nameserver: "127.0.0.1"
+ ops:
+ frequencySec: 3
+ filename: "opsqueries.json"
+ nameserver: "127.0.0.1"
+ ip_pool_config:
+ ueIpPool:
+ ip: "10.250.0.0"
+ mask: "255.255.0.0"
+ staticUeIpPool:
+ ip: "10.249.1.0"
+ mask: "255.255.255.0"
config.json:
gx:
host_type: freediameter
@@ -454,6 +494,7 @@
user-plane-profiles:
user-plane1:
user-plane: upf
+ global-address: true
qos-tags:
tag1: BW
access-tags: