Make multiUpfs enabled by default
Change-Id: Ic5d480ad73bda764a6b87bffea209e1104acd5b3
diff --git a/omec/omec-control-plane/Chart.yaml b/omec/omec-control-plane/Chart.yaml
index ea97091..49e9cd5 100644
--- a/omec/omec-control-plane/Chart.yaml
+++ b/omec/omec-control-plane/Chart.yaml
@@ -19,4 +19,4 @@
name: omec-control-plane
icon: https://guide.opencord.org/logos/cord.svg
-version: 0.1.28
+version: 0.1.29
diff --git a/omec/omec-control-plane/values.yaml b/omec/omec-control-plane/values.yaml
index 6f20063..5b96a6d 100644
--- a/omec/omec-control-plane/values.yaml
+++ b/omec/omec-control-plane/values.yaml
@@ -16,11 +16,11 @@
images:
tags:
init: docker.io/omecproject/pod-init:1.0.0
- hssdb: docker.io/omecproject/c3po-hssdb:1.0.0
- hss: docker.io/omecproject/c3po-hss:1.0.0
- mme: docker.io/omecproject/openmme:1.0.0
- mmeExporter: docker.io/omecproject/mme-exporter:0.3.1
- spgwc: docker.io/omecproject/ngic-cp:1.1.0
+ hssdb: docker.io/omecproject/c3po-hssdb:latest
+ hss: docker.io/omecproject/c3po-hss:latest
+ mme: docker.io/omecproject/openmme:paging-latest
+ mmeExporter: docker.io/omecproject/mme-exporter:paging-latest
+ spgwc: docker.io/omecproject/ngic-cp:central-cp-multi-upfs-latest
depCheck: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
pullPolicy: IfNotPresent
@@ -228,15 +228,12 @@
#realm:
mme_exporter.json:
edges:
- - id: onf-menlo-b48-1
+ - id: onf-menlo
tac: 202
edgeName: edge-onf-menlo
- - id: intel-hillsboro-b48-1
- tac: 101
- edgeName: edge-intel-hillsboro
- - id: onf-menlo-b7-1
- tac: 17
- edgeName: edge-onf-menlo
+ - id: oaisim
+ tac: 1
+ edgeName: edge-oaisim
phoneTypes:
- imsi: 208014567891200
phoneType: "Pixel-4"
@@ -244,7 +241,8 @@
phoneType: "iPhone11-Pro"
spgwc:
apn: internet
- #This ue Static pool is used only multi upf is not enabled. In case of multi-upf use app_config.cfg to provide static pool per DP
+ # ueStaticPool is used only when multiUpfs is not enabled.
+ # In case of multiUpfs, use app_config.cfg to provide static pool per DP.
#ueStaticPool: 10.250.255.0/24
ueStaticPool: None
ueIpPool:
@@ -260,7 +258,7 @@
# ZMQ mode is used for cp-dp communication when multiple UPFs is set
# Otherwise, direct UDP mode is used
# Note that enabling NodePort is valid only in direct UDP mode
- multiUpfs: false
+ multiUpfs: true
cpComm:
nodePort:
enabled: false
@@ -281,16 +279,16 @@
NUM_DP_SELECTION_RULES = 2
[DP_SELECTION_RULE_1]
DPID = 1
- DPNAME = dp1
+ DPNAME = onf-menlo
MCC = 315
MNC = 010
TAC = 202
[DP_SELECTION_RULE_2]
DPID = 2
- DPNAME = dp2
- MCC = 315
- MNC = 010
- TAC = 203
+ DPNAME = oaisim
+ MCC = 208
+ MNC = 01
+ TAC = 1
adc_rules.cfg: |
[GLOBAL]
NUM_ADC_RULES = 0
diff --git a/omec/omec-data-plane/Chart.yaml b/omec/omec-data-plane/Chart.yaml
index 8476ef9..a21386f 100644
--- a/omec/omec-data-plane/Chart.yaml
+++ b/omec/omec-data-plane/Chart.yaml
@@ -19,4 +19,4 @@
name: omec-data-plane
icon: https://guide.opencord.org/logos/cord.svg
-version: 0.1.12
+version: 0.1.13
diff --git a/omec/omec-data-plane/values.yaml b/omec/omec-data-plane/values.yaml
index fe2cf44..dd3ee9a 100644
--- a/omec/omec-data-plane/values.yaml
+++ b/omec/omec-data-plane/values.yaml
@@ -17,7 +17,7 @@
tags:
init: docker.io/omecproject/pod-init:1.0.0
omecCni: docker.io/omecproject/omec-cni:1.0.0
- spgwu: docker.io/omecproject/ngic-dp:1.0.0
+ spgwu: docker.io/omecproject/ngic-dp:central-cp-multi-upfs-latest-debug
depCheck: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
pullPolicy: IfNotPresent
@@ -54,13 +54,13 @@
# Note that zmq is used for cp-dp commmunication when multiple UPFs is set
# Otherwise, direct UDP communication is used
# TODO: unify cp-dp comm to ZMQ for both multi and single UPF scenario
- multiUpfs: false
+ multiUpfs: true
cpComm:
# IMPORTANT: when you deploy CP and DP to separate clusters, enable nodePort
# from both cpComm(omec-control-plane) and dpComm(omec-data-plane) and
# set "addr" to remote cluster's entry node IP and
# "port" to cpComm.nodePort.port value configured in omec-control-plane.
- addr: spgwc
+ addr: spgwc-headless
port: 21
dpComm:
nodePort:
@@ -70,7 +70,7 @@
# Set "--no-pci --vdev eth_af_packet0,iface=s1u-net --vdev eth_af_packet1,iface=sgi-net"
# when sriov is disabled
devices: ""
- dpName: "dp1"
+ dpName: "onf-menlo"
networks:
cniPlugin: vfioveth