Merge "Update Aether production deployment configs"
diff --git a/deployment-configs/aether/apps/common-multicluster-cord-platform.yaml b/deployment-configs/aether/apps/common-multicluster-cord-platform.yaml
index 38b0daf..79c9412 100644
--- a/deployment-configs/aether/apps/common-multicluster-cord-platform.yaml
+++ b/deployment-configs/aether/apps/common-multicluster-cord-platform.yaml
@@ -5,6 +5,8 @@
central: false
edge: true
+onos:
+ fullnameOverride: "cord-platform-onos"
kafka:
fullnameOverride: "cord-platform-kafka"
diff --git a/deployment-configs/aether/apps/production-multicluster-accelleran-cbrs-cu.yaml b/deployment-configs/aether/apps/production-multicluster-accelleran-cbrs-cu.yaml
index 8cae075..11b6e93 100644
--- a/deployment-configs/aether/apps/production-multicluster-accelleran-cbrs-cu.yaml
+++ b/deployment-configs/aether/apps/production-multicluster-accelleran-cbrs-cu.yaml
@@ -1,3 +1,7 @@
config:
mme:
ip: "10.168.0.204"
+ vranL3:
+ plmnId: "130501"
+ instanceId: "onfcell202"
+ tac: 202
diff --git a/deployment-configs/aether/apps/production-multicluster-omec-dp.yaml b/deployment-configs/aether/apps/production-multicluster-omec-dp.yaml
index 6f2ba16..ba72dfe 100644
--- a/deployment-configs/aether/apps/production-multicluster-omec-dp.yaml
+++ b/deployment-configs/aether/apps/production-multicluster-omec-dp.yaml
@@ -1,10 +1,11 @@
images:
tags:
- spgwu: "registry.aether.opennetworking.org/ngic-dp:1.1.0-debug"
+ spgwu: "registry.aether.opennetworking.org/ngic-dp:1.1.0"
pullPolicy: "Always"
config:
spgwu:
+ multiUpfs: true
cpComm:
addr: "spgwc-headless.omec.svc.product.central"
s1u:
@@ -15,6 +16,7 @@
device: "sgi-net"
# NOTE: set different IP for each edge
ip: "13.1.1.7/24"
+ dpName: "dp1"
networks:
sgi:
# NOTE: set correct gateway for each edge
diff --git a/deployment-configs/aether/apps/production-omec-cp.yaml b/deployment-configs/aether/apps/production-omec-cp.yaml
index 6e5f4a9..7262df9 100644
--- a/deployment-configs/aether/apps/production-omec-cp.yaml
+++ b/deployment-configs/aether/apps/production-omec-cp.yaml
@@ -15,32 +15,52 @@
config:
clusterDomain: "product.central"
spgwc:
+ apn: internet
+ multiUpfs: true
s1uAddr: "119.0.0.7"
mme:
cfgFiles:
config.json:
mme:
mcc:
- dig1: 7
- dig2: 3
- dig3: 2
+ dig1: 3
+ dig2: 1
+ dig3: 5
mnc:
dig1: 1
- dig2: 1
- dig3: 1
+ dig2: 0
+ dig3: 0
hss:
acl:
oldTls: "*.product.central"
bootstrap:
enabled: true
users:
- - imsi: "732111000000420"
+ - imsi: "315010999912345"
msisdn: "1122334455"
apn: "apn1"
key: "000102030405060708090a0b0c0d0e0f"
opc: "69d5c2eb2e2e624750541d3bbc692ba5"
sqn: 135
- - imsi: "732111000000421"
+ - imsi: "315010999912346"
+ msisdn: "1122334455"
+ apn: "apn1"
+ key: "000102030405060708090a0b0c0d0e0f"
+ opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+ sqn: 135
+ - imsi: "315010999912347"
+ msisdn: "1122334455"
+ apn: "apn1"
+ key: "000102030405060708090a0b0c0d0e0f"
+ opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+ sqn: 135
+ - imsi: "315010999912348"
+ msisdn: "1122334455"
+ apn: "apn1"
+ key: "000102030405060708090a0b0c0d0e0f"
+ opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+ sqn: 135
+ - imsi: "315010999912349"
msisdn: "1122334455"
apn: "apn1"
key: "000102030405060708090a0b0c0d0e0f"
diff --git a/deployment-configs/aether/apps/production-omec-dp-menlo.yaml b/deployment-configs/aether/apps/production-omec-dp-menlo.yaml
new file mode 100644
index 0000000..ba72dfe
--- /dev/null
+++ b/deployment-configs/aether/apps/production-omec-dp-menlo.yaml
@@ -0,0 +1,23 @@
+images:
+ tags:
+ spgwu: "registry.aether.opennetworking.org/ngic-dp:1.1.0"
+ pullPolicy: "Always"
+
+config:
+ spgwu:
+ multiUpfs: true
+ cpComm:
+ addr: "spgwc-headless.omec.svc.product.central"
+ s1u:
+ device: "s1u-net"
+ # NOTE: set different IP for each edge
+ ip: "119.0.0.7/24"
+ sgi:
+ device: "sgi-net"
+ # NOTE: set different IP for each edge
+ ip: "13.1.1.7/24"
+ dpName: "dp1"
+networks:
+ sgi:
+ # NOTE: set correct gateway for each edge
+ gateway: "13.1.1.250" # Vyatta router IP
diff --git a/deployment-configs/aether/apps/production-omec-dp-staging-b.yaml b/deployment-configs/aether/apps/production-omec-dp-staging-b.yaml
new file mode 100644
index 0000000..f0d06aa
--- /dev/null
+++ b/deployment-configs/aether/apps/production-omec-dp-staging-b.yaml
@@ -0,0 +1,23 @@
+images:
+ tags:
+ spgwu: "registry.aether.opennetworking.org/ngic-dp:1.1.0"
+ pullPolicy: "Always"
+
+config:
+ spgwu:
+ multiUpfs: true
+ cpComm:
+ addr: "spgwc-headless.omec.svc.product.central"
+ s1u:
+ device: "s1u-net"
+ # NOTE: set different IP for each edge
+ ip: "119.0.0.8/24"
+ sgi:
+ device: "sgi-net"
+ # NOTE: set different IP for each edge
+ ip: "13.1.1.8/24"
+ dpName: "dp2"
+networks:
+ sgi:
+ # NOTE: set correct gateway for each edge
+ gateway: "13.1.1.250" # Vyatta router IP
diff --git a/deployment-configs/aether/apps/staging-multicluster-omec-dp.yaml b/deployment-configs/aether/apps/staging-multicluster-omec-dp.yaml
index 29410c4..471b578 100644
--- a/deployment-configs/aether/apps/staging-multicluster-omec-dp.yaml
+++ b/deployment-configs/aether/apps/staging-multicluster-omec-dp.yaml
@@ -5,6 +5,7 @@
config:
spgwu:
+ multiUpfs: true
cpComm:
addr: "spgwc-headless.omec.svc.staging.central"
s1u:
@@ -13,6 +14,7 @@
sgi:
device: "sgi-net"
ip: "13.1.1.3/24"
+ dpName: "dp1"
networks:
sgi:
gateway: "13.1.1.250" # Vyatta router IP
diff --git a/deployment-configs/aether/apps/staging-omec-cp.yaml b/deployment-configs/aether/apps/staging-omec-cp.yaml
index 210c393..4a9aac7 100644
--- a/deployment-configs/aether/apps/staging-omec-cp.yaml
+++ b/deployment-configs/aether/apps/staging-omec-cp.yaml
@@ -17,6 +17,7 @@
hss:
hssdb: cassandra
spgwc:
+ multiUpfs: true
s1uAddr: "119.0.0.3"
mme:
cfgFiles: