Updates on deployment configs for Aether
Change-Id: If63e345bbd1e6789b8cce0ef94cbcabe79000351
diff --git a/deployment-configs/aether/apps/staging/cassandra-azure.yaml b/deployment-configs/aether/apps/azure/cassandra.yaml
similarity index 100%
rename from deployment-configs/aether/apps/staging/cassandra-azure.yaml
rename to deployment-configs/aether/apps/azure/cassandra.yaml
diff --git a/deployment-configs/aether/apps/staging/omec-cp-b7.yaml b/deployment-configs/aether/apps/azure/omec-cp-b7.yaml
similarity index 61%
rename from deployment-configs/aether/apps/staging/omec-cp-b7.yaml
rename to deployment-configs/aether/apps/azure/omec-cp-b7.yaml
index e6c95ac..79400de 100644
--- a/deployment-configs/aether/apps/staging/omec-cp-b7.yaml
+++ b/deployment-configs/aether/apps/azure/omec-cp-b7.yaml
@@ -2,10 +2,10 @@
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.5.5"
- mmeExporter: "registry.central.aetherproject.net/mme-exporter:0.2.2"
+ mme: "registry.central.aetherproject.net/openmme:1.7.1"
+ mmeExporter: "registry.central.aetherproject.net/mme-exporter:0.3.1"
spgwc: "registry.central.aetherproject.net/ngic-cp:1.1.3"
- pullPolicy: "IfNotPresent"
+ pullPolicy: "Always"
cassandra:
deploy: false
@@ -30,23 +30,15 @@
[GLOBAL]
DNS_PRIMARY = 8.8.8.8
DNS_SECONDARY = 8.8.4.4
- NUM_DP_SELECTION_RULES = 2
+ NUM_DP_SELECTION_RULES = 1
[DP_SELECTION_RULE_1]
DPID = 1
- DPNAME = dp1
+ DPNAME = dp-b7
MCC = 315
- MNC = 100
+ MNC = 010
TAC = 17
DNS_PRIMARY = 1.1.1.1
DNS_SECONDARY = 8.8.8.8
- [DP_SELECTION_RULE_2]
- DPID = 1
- DPNAME = dp1
- MCC = 315
- MNC = 100
- TAC = 18
- DNS_PRIMARY = 1.1.1.1
- DNS_SECONDARY = 8.8.8.8
mme:
cfgFiles:
config.json:
@@ -59,6 +51,48 @@
dig1: 0
dig2: 1
dig3: 0
+ mme_exporter.json:
+ edges:
+ - id: onf-menlo-b48-1
+ tac: 202
+ edgeName: edge-onf-menlo
+ - id: onf-menlo-b48-2
+ tac: 203
+ edgeName: edge-onf-menlo
+ - id: intel-hillsboro-b48-1
+ tac: 101
+ edgeName: edge-intel-hillsboro
+ - id: onf-menlo-b7-1
+ tac: 17
+ edgeName: edge-demo
+ - id: onf-menlo-sercomm
+ tac: 18
+ edgeName: edge-demo
+ phoneTypes:
+ - imsi: 315010999912342
+ phoneType: "Pixel-4"
+ - imsi: 315010999912343
+ phoneType: "iPhone11-Pro-Max"
+ - imsi: 315010999912345
+ phoneType: "iPhone11"
+ - imsi: 315010999912346
+ phoneType: "Sercomm-Dongle"
+ - imsi: 315010999912347
+ phoneType: "Sercomm-Camera"
+ - imsi: 315010999912348
+ phoneType: "Sercomm-Dongle"
+ - imsi: 315010999912349
+ phoneType: "iPhone11-Pro"
+ - imsi: 315010999912350
+ phoneType: "iPhone11-Pro"
+ - imsi: 315010999912352
+ phoneType: "iPhone11"
+ - imsi: 315010999912353
+ phoneType: "iPhone11-Pro-Max"
+ - imsi: 315010999912354
+ phoneType: "iPhone11"
+ - imsi: 315010999912355
+ phoneType: "Pixel-4"
hss:
acl:
oldTls: "*.azure.central"
@@ -67,55 +101,55 @@
users:
- imsi: "315010999912343"
msisdn: "1122334455"
- apn: "apn1"
+ apn: "internet"
key: "000102030405060708090a0b0c0d0e0f"
opc: "69d5c2eb2e2e624750541d3bbc692ba5"
sqn: 135
- imsi: "315010999912344"
msisdn: "1122334455"
- apn: "apn1"
+ apn: "internet"
key: "000102030405060708090a0b0c0d0e0f"
opc: "69d5c2eb2e2e624750541d3bbc692ba5"
sqn: 135
- imsi: "315010999912345"
msisdn: "1122334455"
- apn: "apn1"
+ apn: "internet"
key: "000102030405060708090a0b0c0d0e0f"
opc: "69d5c2eb2e2e624750541d3bbc692ba5"
sqn: 135
- imsi: "315010999912346"
msisdn: "1122334455"
- apn: "apn1"
+ apn: "internet"
key: "000102030405060708090a0b0c0d0e0f"
opc: "69d5c2eb2e2e624750541d3bbc692ba5"
sqn: 135
- imsi: "315010999912347"
msisdn: "1122334455"
- apn: "apn1"
+ apn: "internet"
key: "000102030405060708090a0b0c0d0e0f"
opc: "69d5c2eb2e2e624750541d3bbc692ba5"
sqn: 135
- imsi: "315010999912348"
msisdn: "1122334455"
- apn: "apn1"
+ apn: "internet"
key: "000102030405060708090a0b0c0d0e0f"
opc: "69d5c2eb2e2e624750541d3bbc692ba5"
sqn: 135
- imsi: "315010999912349"
msisdn: "1122334455"
- apn: "apn1"
+ apn: "internet"
key: "000102030405060708090a0b0c0d0e0f"
opc: "69d5c2eb2e2e624750541d3bbc692ba5"
sqn: 135
- imsi: "732111000000420"
msisdn: "1122334455"
- apn: apn1
+ apn: internet
key: "000102030405060708090a0b0c0d0e0f"
opc: "69d5c2eb2e2e624750541d3bbc692ba5"
sqn: 135
- imsi: "732111000000421"
msisdn: "1122334455"
- apn: apn1
+ apn: internet
key: "000102030405060708090a0b0c0d0e0f"
opc: "69d5c2eb2e2e624750541d3bbc692ba5"
sqn: 135
@@ -125,6 +159,12 @@
key: "000102030405060708090a0b0c0d0e0f"
opc: "69d5c2eb2e2e624750541d3bbc692ba5"
sqn: 135
+ - imsi: "315010999912351"
+ msisdn: "1122334455"
+ apn: "internet"
+ key: "000102030405060708090a0b0c0d0e0f"
+ opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+ sqn: 135
mmes:
- id: 1
isdn: "19136246000"
diff --git a/deployment-configs/aether/apps/production/cassandra.yaml b/deployment-configs/aether/apps/gcp-prd/cassandra.yaml
similarity index 100%
rename from deployment-configs/aether/apps/production/cassandra.yaml
rename to deployment-configs/aether/apps/gcp-prd/cassandra.yaml
diff --git a/deployment-configs/aether/apps/staging/mcord-services.yaml b/deployment-configs/aether/apps/gcp-prd/mcord-services.yaml
similarity index 100%
rename from deployment-configs/aether/apps/staging/mcord-services.yaml
rename to deployment-configs/aether/apps/gcp-prd/mcord-services.yaml
diff --git a/deployment-configs/aether/apps/production/omec-cp.yaml b/deployment-configs/aether/apps/gcp-prd/omec-cp.yaml
similarity index 61%
rename from deployment-configs/aether/apps/production/omec-cp.yaml
rename to deployment-configs/aether/apps/gcp-prd/omec-cp.yaml
index 7fc9246..9682813 100644
--- a/deployment-configs/aether/apps/production/omec-cp.yaml
+++ b/deployment-configs/aether/apps/gcp-prd/omec-cp.yaml
@@ -2,8 +2,8 @@
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.5.5"
- mmeExporter: "registry.central.aetherproject.net/mme-exporter:0.2.2"
+ mme: "registry.central.aetherproject.net/openmme:1.7.1"
+ mmeExporter: "registry.central.aetherproject.net/mme-exporter:0.3.1"
spgwc: "registry.central.aetherproject.net/ngic-cp:1.1.3"
pullPolicy: "IfNotPresent"
@@ -34,10 +34,10 @@
[GLOBAL]
DNS_PRIMARY = 8.8.8.8
DNS_SECONDARY = 8.8.4.4
- NUM_DP_SELECTION_RULES = 2
+ NUM_DP_SELECTION_RULES = 4
[DP_SELECTION_RULE_1]
DPID = 1
- DPNAME = dp-menlo
+ DPNAME = dp-staging
MCC = 315
MNC = 010
TAC = 202
@@ -51,6 +51,22 @@
TAC = 101
DNS_PRIMARY = 10.212.87.15
DNS_SECONDARY = 10.212.87.16
+ [DP_SELECTION_RULE_3]
+ DPID = 3
+ 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
mme:
cfgFiles:
config.json:
@@ -60,9 +76,51 @@
dig2: 1
dig3: 5
mnc:
- dig1: 0
+ dig1: 0
dig2: 1
dig3: 0
+ mme_exporter.json:
+ edges:
+ - id: onf-menlo-b48-1
+ tac: 202
+ edgeName: edge-onf-menlo
+ - id: onf-menlo-b48-2
+ tac: 203
+ edgeName: edge-demo
+ - id: intel-hillsboro-b48-1
+ tac: 101
+ edgeName: edge-intel-hillsboro
+ - id: onf-menlo-b7-1
+ tac: 17
+ edgeName: edge-onf-menlo
+ - id: onf-menlo-sercomm
+ tac: 18
+ edgeName: edge-demo
+ phoneTypes:
+ - imsi: 315010999912342
+ phoneType: "Pixel-4"
+ - imsi: 315010999912343
+ phoneType: "iPhone11-Pro-Max"
+ - imsi: 315010999912345
+ phoneType: "iPhone11"
+ - imsi: 315010999912346
+ phoneType: "Sercomm-Dongle"
+ - imsi: 315010999912347
+ phoneType: "Sercomm-Camera"
+ - imsi: 315010999912348
+ phoneType: "Sercomm-Dongle"
+ - imsi: 315010999912349
+ phoneType: "iPhone11-Pro"
+ - imsi: 315010999912350
+ phoneType: "iPhone11-Pro"
+ - imsi: 315010999912352
+ phoneType: "iPhone11"
+ - imsi: 315010999912353
+ phoneType: "iPhone11-Pro-Max"
+ - imsi: 315010999912354
+ phoneType: "iPhone11"
+ - imsi: 315010999912355
+ phoneType: "Pixel-4"
hss:
acl:
oldTls: "*.product.central"
@@ -123,12 +181,24 @@
key: "000102030405060708090a0b0c0d0e0f"
opc: "69d5c2eb2e2e624750541d3bbc692ba5"
sqn: 135
+ - imsi: "315010999912349"
+ msisdn: "1122334455"
+ apn: "internet"
+ key: "000102030405060708090a0b0c0d0e0f"
+ opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+ sqn: 135
- imsi: "315010999912350"
msisdn: "1122334455"
apn: "internet"
key: "000102030405060708090a0b0c0d0e0f"
opc: "69d5c2eb2e2e624750541d3bbc692ba5"
sqn: 135
+ - imsi: "315010999912351"
+ msisdn: "1122334455"
+ apn: "internet"
+ key: "000102030405060708090a0b0c0d0e0f"
+ opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+ sqn: 135
mmes:
- id: 1
isdn: "19136246000"
diff --git a/deployment-configs/aether/apps/staging/cassandra-gcp.yaml b/deployment-configs/aether/apps/gcp-stg/cassandra.yaml
similarity index 100%
rename from deployment-configs/aether/apps/staging/cassandra-gcp.yaml
rename to deployment-configs/aether/apps/gcp-stg/cassandra.yaml
diff --git a/deployment-configs/aether/apps/production/omec-cp.yaml b/deployment-configs/aether/apps/gcp-stg/omec-cp.yaml
similarity index 60%
copy from deployment-configs/aether/apps/production/omec-cp.yaml
copy to deployment-configs/aether/apps/gcp-stg/omec-cp.yaml
index 7fc9246..3102688 100644
--- a/deployment-configs/aether/apps/production/omec-cp.yaml
+++ b/deployment-configs/aether/apps/gcp-stg/omec-cp.yaml
@@ -2,8 +2,8 @@
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.5.5"
- mmeExporter: "registry.central.aetherproject.net/mme-exporter:0.2.2"
+ mme: "registry.central.aetherproject.net/openmme:1.7.1"
+ mmeExporter: "registry.central.aetherproject.net/mme-exporter:0.3.1"
spgwc: "registry.central.aetherproject.net/ngic-cp:1.1.3"
pullPolicy: "IfNotPresent"
@@ -24,7 +24,7 @@
coreDump:
enabled: true
path: /tmp/coredump
- clusterDomain: "product.central"
+ clusterDomain: "staging.central"
spgwc:
apn: internet
multiUpfs: true
@@ -34,10 +34,10 @@
[GLOBAL]
DNS_PRIMARY = 8.8.8.8
DNS_SECONDARY = 8.8.4.4
- NUM_DP_SELECTION_RULES = 2
+ NUM_DP_SELECTION_RULES = 4
[DP_SELECTION_RULE_1]
DPID = 1
- DPNAME = dp-menlo
+ DPNAME = dp-staging
MCC = 315
MNC = 010
TAC = 202
@@ -51,6 +51,22 @@
TAC = 101
DNS_PRIMARY = 10.212.87.15
DNS_SECONDARY = 10.212.87.16
+ [DP_SELECTION_RULE_3]
+ DPID = 3
+ 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
mme:
cfgFiles:
config.json:
@@ -60,12 +76,54 @@
dig2: 1
dig3: 5
mnc:
- dig1: 0
+ dig1: 0
dig2: 1
dig3: 0
+ mme_exporter.json:
+ edges:
+ - id: onf-menlo-b48-1
+ tac: 202
+ edgeName: edge-onf-menlo
+ - id: onf-menlo-b48-2
+ tac: 203
+ edgeName: edge-demo
+ - id: intel-hillsboro-b48-1
+ tac: 101
+ edgeName: edge-intel-hillsboro
+ - id: onf-menlo-b7-1
+ tac: 17
+ edgeName: edge-onf-menlo
+ - id: onf-menlo-sercomm
+ tac: 18
+ edgeName: edge-demo
+ phoneTypes:
+ - imsi: 315010999912342
+ phoneType: "Pixel-4"
+ - imsi: 315010999912343
+ phoneType: "iPhone11-Pro-Max"
+ - imsi: 315010999912345
+ phoneType: "iPhone11"
+ - imsi: 315010999912346
+ phoneType: "Sercomm-Dongle"
+ - imsi: 315010999912347
+ phoneType: "Sercomm-Camera"
+ - imsi: 315010999912348
+ phoneType: "Sercomm-Dongle"
+ - imsi: 315010999912349
+ phoneType: "iPhone11-Pro"
+ - imsi: 315010999912350
+ phoneType: "iPhone11-Pro"
+ - imsi: 315010999912352
+ phoneType: "iPhone11"
+ - imsi: 315010999912353
+ phoneType: "iPhone11-Pro-Max"
+ - imsi: 315010999912354
+ phoneType: "iPhone11"
+ - imsi: 315010999912355
+ phoneType: "Pixel-4"
hss:
acl:
- oldTls: "*.product.central"
+ oldTls: "*.staging.central"
bootstrap:
enabled: true
users:
@@ -123,12 +181,24 @@
key: "000102030405060708090a0b0c0d0e0f"
opc: "69d5c2eb2e2e624750541d3bbc692ba5"
sqn: 135
+ - imsi: "315010999912349"
+ msisdn: "1122334455"
+ apn: "internet"
+ key: "000102030405060708090a0b0c0d0e0f"
+ opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+ sqn: 135
- imsi: "315010999912350"
msisdn: "1122334455"
apn: "internet"
key: "000102030405060708090a0b0c0d0e0f"
opc: "69d5c2eb2e2e624750541d3bbc692ba5"
sqn: 135
+ - imsi: "315010999912351"
+ msisdn: "1122334455"
+ apn: "internet"
+ key: "000102030405060708090a0b0c0d0e0f"
+ opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+ sqn: 135
mmes:
- id: 1
isdn: "19136246000"
diff --git a/deployment-configs/aether/apps/production/cdn-remote.yaml b/deployment-configs/aether/apps/global/cdn-remote.yaml
similarity index 100%
rename from deployment-configs/aether/apps/production/cdn-remote.yaml
rename to deployment-configs/aether/apps/global/cdn-remote.yaml
diff --git a/deployment-configs/aether/apps/production/global-docker-registry.yaml b/deployment-configs/aether/apps/global/global-docker-registry.yaml
similarity index 100%
rename from deployment-configs/aether/apps/production/global-docker-registry.yaml
rename to deployment-configs/aether/apps/global/global-docker-registry.yaml
diff --git a/deployment-configs/aether/apps/production/global-nem-monitoring.yaml b/deployment-configs/aether/apps/global/global-nem-monitoring.yaml
similarity index 100%
rename from deployment-configs/aether/apps/production/global-nem-monitoring.yaml
rename to deployment-configs/aether/apps/global/global-nem-monitoring.yaml
diff --git a/deployment-configs/aether/apps/production/accelleran-cbrs-common-intel-hillsboro.yaml b/deployment-configs/aether/apps/intel/accelleran-cbrs-common.yaml
similarity index 100%
rename from deployment-configs/aether/apps/production/accelleran-cbrs-common-intel-hillsboro.yaml
rename to deployment-configs/aether/apps/intel/accelleran-cbrs-common.yaml
diff --git a/deployment-configs/aether/apps/production/accelleran-cbrs-cu-intel-hillsboro.yaml b/deployment-configs/aether/apps/intel/accelleran-cbrs-cu.yaml
similarity index 100%
rename from deployment-configs/aether/apps/production/accelleran-cbrs-cu-intel-hillsboro.yaml
rename to deployment-configs/aether/apps/intel/accelleran-cbrs-cu.yaml
diff --git a/deployment-configs/aether/apps/production/nem-monitoring.yaml b/deployment-configs/aether/apps/intel/nem-monitoring.yaml
similarity index 93%
copy from deployment-configs/aether/apps/production/nem-monitoring.yaml
copy to deployment-configs/aether/apps/intel/nem-monitoring.yaml
index 4b62784..46dc58a 100644
--- a/deployment-configs/aether/apps/production/nem-monitoring.yaml
+++ b/deployment-configs/aether/apps/intel/nem-monitoring.yaml
@@ -18,7 +18,7 @@
# NOTE: set unique datacenter name for each clusters
global:
external_labels:
- datacenter: "edge-onf-menlo"
+ datacenter: "edge-onf-menlo-staging"
grafana:
fullnameOverride: "nem-monitoring-grafana"
diff --git a/deployment-configs/aether/apps/intel/omec-dp-cni.yaml b/deployment-configs/aether/apps/intel/omec-dp-cni.yaml
new file mode 100644
index 0000000..9e0ca61
--- /dev/null
+++ b/deployment-configs/aether/apps/intel/omec-dp-cni.yaml
@@ -0,0 +1,8 @@
+config:
+ sriov:
+ resourceList:
+ vfio:
+ s1uPfNames:
+ - data#0-3
+ sgiPfNames:
+ - data#4-7
diff --git a/deployment-configs/aether/apps/production/omec-dp-intel-hillsboro.yaml b/deployment-configs/aether/apps/intel/omec-dp.yaml
similarity index 100%
rename from deployment-configs/aether/apps/production/omec-dp-intel-hillsboro.yaml
rename to deployment-configs/aether/apps/intel/omec-dp.yaml
diff --git a/deployment-configs/aether/apps/staging/accelleran-b7-cu.yaml b/deployment-configs/aether/apps/menlo-demo/accelleran-b7-cu.yaml
similarity index 100%
rename from deployment-configs/aether/apps/staging/accelleran-b7-cu.yaml
rename to deployment-configs/aether/apps/menlo-demo/accelleran-b7-cu.yaml
diff --git a/deployment-configs/aether/apps/staging/accelleran-cbrs-common.yaml b/deployment-configs/aether/apps/menlo-demo/accelleran-cbrs-common.yaml
similarity index 100%
rename from deployment-configs/aether/apps/staging/accelleran-cbrs-common.yaml
rename to deployment-configs/aether/apps/menlo-demo/accelleran-cbrs-common.yaml
diff --git a/deployment-configs/aether/apps/staging/accelleran-cbrs-cu.yaml b/deployment-configs/aether/apps/menlo-demo/accelleran-cbrs-cu.yaml
similarity index 100%
rename from deployment-configs/aether/apps/staging/accelleran-cbrs-cu.yaml
rename to deployment-configs/aether/apps/menlo-demo/accelleran-cbrs-cu.yaml
diff --git a/deployment-configs/aether/apps/staging/cdn-local.yaml b/deployment-configs/aether/apps/menlo-demo/cdn-local.yaml
similarity index 96%
rename from deployment-configs/aether/apps/staging/cdn-local.yaml
rename to deployment-configs/aether/apps/menlo-demo/cdn-local.yaml
index c22efe1..bc29386 100644
--- a/deployment-configs/aether/apps/staging/cdn-local.yaml
+++ b/deployment-configs/aether/apps/menlo-demo/cdn-local.yaml
@@ -15,7 +15,7 @@
nginx:
sgiInterface:
name: eth2
- mtu: 1200
+ mtu: 1450
cdnRemotes:
- name: remote-gcp
ip: 10.168.0.200
diff --git a/deployment-configs/aether/apps/production/nem-monitoring.yaml b/deployment-configs/aether/apps/menlo-demo/nem-monitoring.yaml
similarity index 93%
rename from deployment-configs/aether/apps/production/nem-monitoring.yaml
rename to deployment-configs/aether/apps/menlo-demo/nem-monitoring.yaml
index 4b62784..8e23ee9 100644
--- a/deployment-configs/aether/apps/production/nem-monitoring.yaml
+++ b/deployment-configs/aether/apps/menlo-demo/nem-monitoring.yaml
@@ -18,7 +18,7 @@
# NOTE: set unique datacenter name for each clusters
global:
external_labels:
- datacenter: "edge-onf-menlo"
+ datacenter: "edge-onf-menlo-demo"
grafana:
fullnameOverride: "nem-monitoring-grafana"
diff --git a/deployment-configs/aether/apps/staging/omec-dp-b7.yaml b/deployment-configs/aether/apps/menlo-demo/omec-dp-b7.yaml
similarity index 96%
rename from deployment-configs/aether/apps/staging/omec-dp-b7.yaml
rename to deployment-configs/aether/apps/menlo-demo/omec-dp-b7.yaml
index a02cbb1..88b0510 100644
--- a/deployment-configs/aether/apps/staging/omec-dp-b7.yaml
+++ b/deployment-configs/aether/apps/menlo-demo/omec-dp-b7.yaml
@@ -22,7 +22,7 @@
device: "sgi-net"
# NOTE: set different IP for each edge
ip: "192.168.250.4/24"
- dpName: "dp1"
+ dpName: "dp-b7"
networks:
sgi:
# NOTE: set correct gateway for each edge
diff --git a/deployment-configs/aether/apps/staging/omec-dp-cbrs.yaml b/deployment-configs/aether/apps/menlo-demo/omec-dp-cbrs.yaml
similarity index 87%
rename from deployment-configs/aether/apps/staging/omec-dp-cbrs.yaml
rename to deployment-configs/aether/apps/menlo-demo/omec-dp-cbrs.yaml
index 7c24694..06d04f8 100644
--- a/deployment-configs/aether/apps/staging/omec-dp-cbrs.yaml
+++ b/deployment-configs/aether/apps/menlo-demo/omec-dp-cbrs.yaml
@@ -13,7 +13,7 @@
spgwu:
multiUpfs: true
cpComm:
- addr: "spgwc-headless.omec.svc.staging.central"
+ addr: "spgwc-headless.omec.svc.product.central"
s1u:
device: "s1u-net"
# NOTE: set different IP for each edge
@@ -22,7 +22,7 @@
device: "sgi-net"
# NOTE: set different IP for each edge
ip: "192.168.250.3/24"
- dpName: "dp-staging"
+ dpName: "dp-demo"
networks:
sgi:
# NOTE: set correct gateway for each edge
diff --git a/deployment-configs/aether/apps/production/omec-dp-cni.yaml b/deployment-configs/aether/apps/menlo-demo/omec-dp-cni.yaml
similarity index 100%
rename from deployment-configs/aether/apps/production/omec-dp-cni.yaml
rename to deployment-configs/aether/apps/menlo-demo/omec-dp-cni.yaml
diff --git a/deployment-configs/aether/apps/production/accelleran-cbrs-common-onf-menlo.yaml b/deployment-configs/aether/apps/menlo-stg/accelleran-cbrs-common.yaml
similarity index 100%
rename from deployment-configs/aether/apps/production/accelleran-cbrs-common-onf-menlo.yaml
rename to deployment-configs/aether/apps/menlo-stg/accelleran-cbrs-common.yaml
diff --git a/deployment-configs/aether/apps/production/accelleran-cbrs-cu-onf-menlo-b42.yaml b/deployment-configs/aether/apps/menlo-stg/accelleran-cbrs-cu-b42.yaml
similarity index 100%
rename from deployment-configs/aether/apps/production/accelleran-cbrs-cu-onf-menlo-b42.yaml
rename to deployment-configs/aether/apps/menlo-stg/accelleran-cbrs-cu-b42.yaml
diff --git a/deployment-configs/aether/apps/production/accelleran-cbrs-cu-onf-menlo.yaml b/deployment-configs/aether/apps/menlo-stg/accelleran-cbrs-cu.yaml
similarity index 94%
rename from deployment-configs/aether/apps/production/accelleran-cbrs-cu-onf-menlo.yaml
rename to deployment-configs/aether/apps/menlo-stg/accelleran-cbrs-cu.yaml
index 85786ab..dc93f4a 100644
--- a/deployment-configs/aether/apps/production/accelleran-cbrs-cu-onf-menlo.yaml
+++ b/deployment-configs/aether/apps/menlo-stg/accelleran-cbrs-cu.yaml
@@ -13,7 +13,7 @@
config:
mme:
- ip: "10.168.0.204"
+ ip: "10.168.0.194"
vranL3:
plmnId: "130501"
instanceId: "onfcell202"
diff --git a/deployment-configs/aether/apps/staging/cdn-local.yaml b/deployment-configs/aether/apps/menlo-stg/cdn-local.yaml
similarity index 91%
copy from deployment-configs/aether/apps/staging/cdn-local.yaml
copy to deployment-configs/aether/apps/menlo-stg/cdn-local.yaml
index c22efe1..df762b3 100644
--- a/deployment-configs/aether/apps/staging/cdn-local.yaml
+++ b/deployment-configs/aether/apps/menlo-stg/cdn-local.yaml
@@ -15,7 +15,7 @@
nginx:
sgiInterface:
name: eth2
- mtu: 1200
+ mtu: 1450
cdnRemotes:
- name: remote-gcp
ip: 10.168.0.200
@@ -29,4 +29,4 @@
sgi:
subnet: 192.168.250.0/24
mask: 255.255.255.0
- gateway: 192.168.250.254
+ gateway: 192.168.250.1
diff --git a/deployment-configs/aether/apps/production/nem-monitoring.yaml b/deployment-configs/aether/apps/menlo-stg/nem-monitoring.yaml
similarity index 93%
copy from deployment-configs/aether/apps/production/nem-monitoring.yaml
copy to deployment-configs/aether/apps/menlo-stg/nem-monitoring.yaml
index 4b62784..46dc58a 100644
--- a/deployment-configs/aether/apps/production/nem-monitoring.yaml
+++ b/deployment-configs/aether/apps/menlo-stg/nem-monitoring.yaml
@@ -18,7 +18,7 @@
# NOTE: set unique datacenter name for each clusters
global:
external_labels:
- datacenter: "edge-onf-menlo"
+ datacenter: "edge-onf-menlo-staging"
grafana:
fullnameOverride: "nem-monitoring-grafana"
diff --git a/deployment-configs/aether/apps/staging/omec-dp-cni.yaml b/deployment-configs/aether/apps/menlo-stg/omec-dp-cni.yaml
similarity index 100%
rename from deployment-configs/aether/apps/staging/omec-dp-cni.yaml
rename to deployment-configs/aether/apps/menlo-stg/omec-dp-cni.yaml
diff --git a/deployment-configs/aether/apps/production/omec-dp-onf-menlo.yaml b/deployment-configs/aether/apps/menlo-stg/omec-dp.yaml
similarity index 86%
rename from deployment-configs/aether/apps/production/omec-dp-onf-menlo.yaml
rename to deployment-configs/aether/apps/menlo-stg/omec-dp.yaml
index d221605..f069c0a 100644
--- a/deployment-configs/aether/apps/production/omec-dp-onf-menlo.yaml
+++ b/deployment-configs/aether/apps/menlo-stg/omec-dp.yaml
@@ -13,7 +13,7 @@
spgwu:
multiUpfs: true
cpComm:
- addr: "spgwc-headless.omec.svc.product.central"
+ addr: "spgwc-headless.omec.svc.staging.central"
s1u:
device: "s1u-net"
# NOTE: set different IP for each edge
@@ -22,7 +22,7 @@
device: "sgi-net"
# NOTE: set different IP for each edge
ip: "192.168.250.7/24"
- dpName: "dp-menlo"
+ dpName: "dp-staging"
networks:
sgi:
# NOTE: set correct gateway for each edge
diff --git a/deployment-configs/aether/apps/production/cdn-local-onf-menlo.yaml b/deployment-configs/aether/apps/production/cdn-local-onf-menlo.yaml
deleted file mode 100644
index 722ebb9..0000000
--- a/deployment-configs/aether/apps/production/cdn-local-onf-menlo.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-images:
- tags:
- nginx: registry.central.aetherproject.net/cdn-nginx:1.0.0
- pullPolicy: IfNotPresent
-
-nodeSelectors:
- enabled: true
- nginx:
- label: aether-apps
- value: enabled
-
-config:
- sriov:
- enabled: false
- nginx:
- sgiInterface:
- name: eth2
- mtu: 1200
- cdnRemotes:
- - name: remote-gcp
- ip: 10.168.0.200
- port: 30935
- streams:
- - name: 480p
- value: 480
-
-networks:
- ipam: static
- sgi:
- subnet: 192.168.250.0/24
- mask: 255.255.255.0
- gateway: 192.168.250.31
diff --git a/deployment-configs/aether/apps/staging/omec-cp-cbrs.yaml b/deployment-configs/aether/apps/staging/omec-cp-cbrs.yaml
deleted file mode 100644
index 6314b66..0000000
--- a/deployment-configs/aether/apps/staging/omec-cp-cbrs.yaml
+++ /dev/null
@@ -1,125 +0,0 @@
-images:
- 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.5.5"
- mmeExporter: "registry.central.aetherproject.net/mme-exporter:0.2.2"
- spgwc: "registry.central.aetherproject.net/ngic-cp:1.1.3"
- pullPolicy: "IfNotPresent"
-
-cassandra:
- deploy: false
-
-resources:
- enabled: true
- mme:
- requests:
- cpu: 0.3
- memory: 1Gi
- limits:
- cpu: 0.3
- memory: 1Gi
-
-config:
- clusterDomain: "staging.central"
- spgwc:
- apn: internet
- multiUpfs: true
- # can be any IP address, not used but crash without it
- s1uAddr: "192.168.251.3"
- cfgFiles:
- app_config.cfg: |
- [GLOBAL]
- DNS_PRIMARY = 8.8.8.8
- DNS_SECONDARY = 8.8.4.4
- NUM_DP_SELECTION_RULES = 1
- [DP_SELECTION_RULE_1]
- DPID = 1
- DPNAME = dp-staging
- MCC = 315
- MNC = 010
- TAC = 203
- DNS_PRIMARY = 1.1.1.1
- DNS_SECONDARY = 8.8.8.8
- mme:
- cfgFiles:
- config.json:
- mme:
- mcc:
- dig1: 3
- dig2: 1
- dig3: 5
- mnc:
- dig1: 0
- dig2: 1
- dig3: 0
- hss:
- acl:
- oldTls: "*.staging.central"
- bootstrap:
- enabled: true
- users:
- - imsi: "315010999912342"
- msisdn: "1122334455"
- apn: "internet"
- key: "000102030405060708090a0b0c0d0e0f"
- opc: "69d5c2eb2e2e624750541d3bbc692ba5"
- sqn: 135
- - imsi: "315010999912343"
- msisdn: "1122334455"
- apn: "internet"
- key: "000102030405060708090a0b0c0d0e0f"
- opc: "69d5c2eb2e2e624750541d3bbc692ba5"
- sqn: 135
- - imsi: "315010999912344"
- msisdn: "1122334455"
- apn: "internet"
- key: "000102030405060708090a0b0c0d0e0f"
- opc: "69d5c2eb2e2e624750541d3bbc692ba5"
- sqn: 135
- - imsi: "315010999912345"
- msisdn: "1122334455"
- apn: "internet"
- key: "000102030405060708090a0b0c0d0e0f"
- opc: "69d5c2eb2e2e624750541d3bbc692ba5"
- sqn: 135
- - imsi: "315010999912346"
- msisdn: "1122334455"
- apn: "internet"
- key: "000102030405060708090a0b0c0d0e0f"
- opc: "69d5c2eb2e2e624750541d3bbc692ba5"
- sqn: 135
- - imsi: "315010999912347"
- msisdn: "1122334455"
- apn: "internet"
- key: "000102030405060708090a0b0c0d0e0f"
- opc: "69d5c2eb2e2e624750541d3bbc692ba5"
- sqn: 135
- - imsi: "315010999912348"
- msisdn: "1122334455"
- apn: "internet"
- key: "000102030405060708090a0b0c0d0e0f"
- opc: "69d5c2eb2e2e624750541d3bbc692ba5"
- sqn: 135
- - imsi: "315010888812341"
- msisdn: "1122334455"
- apn: "internet"
- key: "000102030405060708090a0b0c0d0e0f"
- opc: "69d5c2eb2e2e624750541d3bbc692ba5"
- sqn: 135
- - imsi: "315010888812342"
- msisdn: "1122334455"
- apn: "internet"
- key: "000102030405060708090a0b0c0d0e0f"
- opc: "69d5c2eb2e2e624750541d3bbc692ba5"
- sqn: 135
- - imsi: "315010999912350"
- msisdn: "1122334455"
- apn: "internet"
- key: "000102030405060708090a0b0c0d0e0f"
- opc: "69d5c2eb2e2e624750541d3bbc692ba5"
- sqn: 135
- mmes:
- - id: 1
- isdn: "19136246000"
- unreachability: 1