Merge "Add pod configs for NTT edge"
diff --git a/deployment-configs/aether/apps/gcp-prd/omec-cp.yaml b/deployment-configs/aether/apps/gcp-prd/omec-cp.yaml
index dc550f7..111af4f 100644
--- a/deployment-configs/aether/apps/gcp-prd/omec-cp.yaml
+++ b/deployment-configs/aether/apps/gcp-prd/omec-cp.yaml
@@ -2,9 +2,9 @@
tags:
hssdb: "registry.central.aetherproject.net/c3po-hssdb:1.1.0"
hss: "registry.central.aetherproject.net/c3po-hss:1.1.4"
- mme: "registry.central.aetherproject.net/openmme:1.7.1"
+ mme: "registry.central.aetherproject.net/openmme:1.7.3"
mmeExporter: "registry.central.aetherproject.net/mme-exporter:0.3.1"
- spgwc: "registry.central.aetherproject.net/ngic-cp:1.1.5"
+ spgwc: "registry.central.aetherproject.net/ngic-cp:1.1.6"
pullPolicy: "IfNotPresent"
cassandra:
@@ -35,6 +35,7 @@
DNS_PRIMARY = 8.8.8.8
DNS_SECONDARY = 8.8.4.4
NUM_DP_SELECTION_RULES = 5
+ IPV4_MTU = 1450
[DP_SELECTION_RULE_1]
DPID = 1
DPNAME = dp-staging
@@ -56,18 +57,10 @@
DPNAME = dp-demo
MCC = 315
MNC = 010
- TAC = 18
- DNS_PRIMARY = 1.1.1.1
- DNS_SECONDARY = 8.8.8.8
- [DP_SELECTION_RULE_4]
- DPID = 3
- DPNAME = dp-demo
- MCC = 315
- MNC = 010
TAC = 203
DNS_PRIMARY = 1.1.1.1
DNS_SECONDARY = 8.8.8.8
- [DP_SELECTION_RULE_5]
+ [DP_SELECTION_RULE_4]
DPID = 4
DPNAME = dp-tucson
MCC = 315
@@ -75,6 +68,14 @@
TAC = 222
DNS_PRIMARY = 1.1.1.1
DNS_SECONDARY = 8.8.8.8
+ [DP_SELECTION_RULE_5]
+ DPID = 5
+ DPNAME = dp-ntt
+ MCC = 999
+ MNC = 002
+ TAC = 1
+ DNS_PRIMARY = 1.1.1.1
+ DNS_SECONDARY = 8.8.8.8
mme:
cfgFiles:
config.json:
@@ -87,6 +88,9 @@
dig1: 0
dig2: 1
dig3: 0
+ plmnlist:
+ plmn1: "mcc=315,mnc=010"
+ plmn2: "mcc=999,mnc=002"
mme_exporter.json:
edges:
- id: onf-menlo-b48-1
diff --git a/deployment-configs/aether/apps/global/global-nem-monitoring.yaml b/deployment-configs/aether/apps/global/global-nem-monitoring.yaml
index 2bf5ef2..d91181b 100644
--- a/deployment-configs/aether/apps/global/global-nem-monitoring.yaml
+++ b/deployment-configs/aether/apps/global/global-nem-monitoring.yaml
@@ -31,6 +31,7 @@
- nem-monitoring-prometheus-server.nem-monitoring-p-jpq59.svc.mwc.edge:80
- nem-monitoring-prometheus-server.nem-monitoring-p-ccrkh.svc.intel.edge:80
- nem-monitoring-prometheus-server.nem-monitoring-p-dn5h5.svc.tucson.edge:80
+ - nem-monitoring-prometheus-server.nem-monitoring-p-bcrtc.svc.ntt.edge:80
- job_name: 'mme-exporter-production'
metrics_path: /metrics
scrape_interval: 15s
diff --git a/deployment-configs/aether/apps/menlo-demo/accelleran-cbrs-cu.yaml b/deployment-configs/aether/apps/menlo-demo/accelleran-cbrs-cu.yaml
index b0dbf8a..0c96ecc 100644
--- a/deployment-configs/aether/apps/menlo-demo/accelleran-cbrs-cu.yaml
+++ b/deployment-configs/aether/apps/menlo-demo/accelleran-cbrs-cu.yaml
@@ -13,7 +13,7 @@
config:
mme:
- ip: "10.168.0.192"
+ ip: "10.168.0.204"
vranL3:
plmnId: "130501"
instanceId: "onfcell203"
diff --git a/deployment-configs/aether/apps/ntt/omec-dp-cni.yaml b/deployment-configs/aether/apps/ntt/omec-dp-cni.yaml
new file mode 100644
index 0000000..6f4a8ac
--- /dev/null
+++ b/deployment-configs/aether/apps/ntt/omec-dp-cni.yaml
@@ -0,0 +1,8 @@
+config:
+ sriov:
+ resourceList:
+ vfio:
+ s1uPfNames:
+ - ens5f0#0-3
+ sgiPfNames:
+ - ens5f0#4-7
diff --git a/deployment-configs/aether/apps/ntt/omec-dp.yaml b/deployment-configs/aether/apps/ntt/omec-dp.yaml
new file mode 100644
index 0000000..f02935f
--- /dev/null
+++ b/deployment-configs/aether/apps/ntt/omec-dp.yaml
@@ -0,0 +1,23 @@
+images:
+ tags:
+ spgwu: "registry.central.aetherproject.net/ngic-dp:ntt-native-debug"
+ pullPolicy: "IfNotPresent"
+
+nodeSelectors:
+ enabled: false
+
+config:
+ spgwu:
+ multiUpfs: true
+ cpComm:
+ addr: "spgwc-headless.omec.svc.product.central"
+ s1u:
+ device: "s1u-net"
+ ip: "10.155.10.254/24"
+ sgi:
+ device: "sgi-net"
+ ip: "10.155.0.254/24"
+ dpName: "dp-ntt"
+networks:
+ sgi:
+ gateway: "10.155.0.1"
diff --git a/deployment-configs/aether/apps/ntt/omec-upf.yaml b/deployment-configs/aether/apps/ntt/omec-upf.yaml
new file mode 100644
index 0000000..18460b4
--- /dev/null
+++ b/deployment-configs/aether/apps/ntt/omec-upf.yaml
@@ -0,0 +1,33 @@
+images:
+ tags:
+ bess: "registry.central.aetherproject.net/upf-epc-bess:ntt-native"
+ cpiface: "registry.central.aetherproject.net/upf-epc-cpiface:ntt-native"
+ pullPolicy: "IfNotPresent"
+
+nodeSelectors:
+ enabled: false
+
+config:
+ spgwu:
+ name: "dp-ntt"
+ s1u:
+ device: "s1u"
+ ip: "10.155.10.254/24"
+ sgi:
+ device: "sgi"
+ ip: "10.155.0.254/24"
+ zmq:
+ spgwc:
+ addr: "spgwc-headless.omec.svc.product.central"
+
+networks:
+ enb:
+ subnet: "10.0.0.0/24"
+ ue:
+ subnet: "10.250.0.0/16"
+ sgi:
+ subnet: "10.155.0.0/24"
+ gateway: "10.155.0.1"
+ s1u:
+ subnet: "10.155.10.0/24"
+ gateway: "10.155.10.1"