Merge "[VOL-2586] Test with ONOS2.2 with latest apps"
diff --git a/deployment-configs/aether/apps/production-accelleran-cu-cbrs-common-intel.yaml b/deployment-configs/aether/apps/production-accelleran-cu-cbrs-common-intel.yaml
new file mode 100644
index 0000000..079740b
--- /dev/null
+++ b/deployment-configs/aether/apps/production-accelleran-cu-cbrs-common-intel.yaml
@@ -0,0 +1,14 @@
+images:
+ tags:
+ initCU: registry.aether.opennetworking.org/aether/pod-init:1.0.0
+ nats: registry.aether.opennetworking.org/aether/accelleran-cu-nats:v1.0.0
+ redis: registry.aether.opennetworking.org/aether/accelleran-cu-redis:v1.0.0
+ redisClient: registry.aether.opennetworking.org/aether/redis:5.0.6-alpine3.10
+ ric: registry.aether.opennetworking.org/aether/accelleran-cu-ric:v1.0.0
+ ricWeb: registry.aether.opennetworking.org/aether/accelleran-cu-ricweb:v1.0.0
+ depCheck: registry.aether.opennetworking.org/aether/kubernetes-entrypoint:v0.3.1
+ pullPolicy: IfNotPresent
+
+config:
+ nats:
+ ip: "10.212.74.65"
diff --git a/deployment-configs/aether/apps/production-accelleran-cu-cbrs-intel.yaml b/deployment-configs/aether/apps/production-accelleran-cu-cbrs-intel.yaml
new file mode 100644
index 0000000..87f2d45
--- /dev/null
+++ b/deployment-configs/aether/apps/production-accelleran-cu-cbrs-intel.yaml
@@ -0,0 +1,7 @@
+config:
+ mme:
+ ip: "10.168.0.204"
+ vranL3:
+ plmnId: "130501"
+ instanceId: "intelcell101"
+ tac: 101
diff --git a/deployment-configs/aether/apps/production-accelleran-cu-cbrs-onf-menlo-b42.yaml b/deployment-configs/aether/apps/production-accelleran-cu-cbrs-onf-menlo-b42.yaml
new file mode 100644
index 0000000..8946dca
--- /dev/null
+++ b/deployment-configs/aether/apps/production-accelleran-cu-cbrs-onf-menlo-b42.yaml
@@ -0,0 +1,11 @@
+config:
+ mwc: true
+ mme:
+ ip: "10.168.0.204"
+ vranL3:
+ plmnId: "130501"
+ instanceId: "onfcell221"
+ freqBand: 42
+ earfcnDl: 42590
+ earfcnUl: 42590
+ tac: 221
diff --git a/deployment-configs/aether/apps/production-omec-cp-azure.yaml b/deployment-configs/aether/apps/production-omec-cp-azure.yaml
index 2b7deaa..52505d5 100644
--- a/deployment-configs/aether/apps/production-omec-cp-azure.yaml
+++ b/deployment-configs/aether/apps/production-omec-cp-azure.yaml
@@ -2,8 +2,8 @@
tags:
hssdb: "registry.aether.opennetworking.org/c3po-hssdb:1.1.0"
hss: "registry.aether.opennetworking.org/c3po-hss:1.1.2"
- mme: "registry.aether.opennetworking.org/openmme:1.3.6"
- mmeExporter: "registry.aether.opennetworking.org/openmme:0.1.9"
+ mme: "registry.aether.opennetworking.org/openmme:1.4.3"
+ mmeExporter: "registry.aether.opennetworking.org/mme-exporter:0.1.9"
spgwc: "registry.aether.opennetworking.org/ngic-cp:1.1.1"
pullPolicy: "Always"
@@ -41,7 +41,6 @@
MCC = 315
MNC = 100
TAC = 18
-
mme:
cfgFiles:
config.json:
diff --git a/deployment-configs/aether/apps/production-omec-cp-gcp.yaml b/deployment-configs/aether/apps/production-omec-cp-gcp.yaml
index b7a7c40..b52f80f 100644
--- a/deployment-configs/aether/apps/production-omec-cp-gcp.yaml
+++ b/deployment-configs/aether/apps/production-omec-cp-gcp.yaml
@@ -2,8 +2,8 @@
tags:
hssdb: "registry.aether.opennetworking.org/c3po-hssdb:1.1.0"
hss: "registry.aether.opennetworking.org/c3po-hss:1.1.2"
- mme: "registry.aether.opennetworking.org/openmme:1.3.6"
- mmeExporter: "registry.aether.opennetworking.org/openmme:0.1.9"
+ mme: "registry.aether.opennetworking.org/openmme:1.4.3"
+ mmeExporter: "registry.aether.opennetworking.org/mme-exporter:0.1.9"
spgwc: "registry.aether.opennetworking.org/ngic-cp:1.1.1"
pullPolicy: "Always"
@@ -29,6 +29,28 @@
apn: internet
multiUpfs: true
s1uAddr: "192.168.251.7"
+ cfgFiles:
+ app_config.cfg: |
+ [GLOBAL]
+ NUM_DP_SELECTION_RULES = 3
+ [DP_SELECTION_RULE_1]
+ DPID = 1
+ DPNAME = dp1
+ MCC = 315
+ MNC = 010
+ TAC = 202
+ [DP_SELECTION_RULE_2]
+ DPID = 2
+ DPNAME = dp2
+ MCC = 315
+ MNC = 010
+ TAC = 203
+ [DP_SELECTION_RULE_3]
+ DPID = 3
+ DPNAME = dp-intel
+ MCC = 315
+ MNC = 010
+ TAC = 101
mme:
cfgFiles:
config.json:
@@ -83,12 +105,30 @@
key: "000102030405060708090a0b0c0d0e0f"
opc: "69d5c2eb2e2e624750541d3bbc692ba5"
sqn: 135
+ - imsi: "315010999912342"
+ msisdn: "1122334455"
+ apn: "apn1"
+ key: "000102030405060708090a0b0c0d0e0f"
+ opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+ sqn: 135
- imsi: "315010999912349"
msisdn: "1122334455"
apn: "apn1"
key: "000102030405060708090a0b0c0d0e0f"
opc: "69d5c2eb2e2e624750541d3bbc692ba5"
sqn: 135
+ - imsi: "315010888812341"
+ msisdn: "1122334455"
+ apn: "apn1"
+ key: "000102030405060708090a0b0c0d0e0f"
+ opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+ sqn: 135
+ - imsi: "315010888812342"
+ msisdn: "1122334455"
+ apn: "apn1"
+ key: "000102030405060708090a0b0c0d0e0f"
+ opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+ sqn: 135
mmes:
- id: 1
isdn: "19136246000"
diff --git a/deployment-configs/aether/apps/production-omec-dp-intel.yaml b/deployment-configs/aether/apps/production-omec-dp-intel.yaml
new file mode 100644
index 0000000..e9d5f92
--- /dev/null
+++ b/deployment-configs/aether/apps/production-omec-dp-intel.yaml
@@ -0,0 +1,29 @@
+images:
+ tags:
+ spgwu: "registry.aether.opennetworking.org/ngic-dp:1.1.1-intel"
+ pullPolicy: "Always"
+
+nodeSelectors:
+ enabled: true
+ spgwu:
+ label: omec-dp
+ value: enabled
+
+config:
+ spgwu:
+ multiUpfs: true
+ cpComm:
+ addr: "spgwc-headless.omec.svc.product.central"
+ s1u:
+ device: "s1u-net"
+ # NOTE: set different IP for each edge
+ ip: "10.212.74.67/27"
+ sgi:
+ device: "sgi-net"
+ # NOTE: set different IP for each edge
+ ip: "10.212.74.97/27"
+ dpName: "dp-intel"
+networks:
+ sgi:
+ # NOTE: set correct gateway for each edge
+ gateway: "10.212.74.126"
diff --git a/deployment-configs/flex-ocp-cord.yaml b/deployment-configs/flex-ocp-cord.yaml
index adf219a..dafa114 100644
--- a/deployment-configs/flex-ocp-cord.yaml
+++ b/deployment-configs/flex-ocp-cord.yaml
@@ -66,6 +66,7 @@
onu: 'ALPHe3d1cfa7'
c_tag: '901'
s_tag: '111'
+ power_switch_port: 4
-
ip: '10.192.20.61'
user: 'cord'
@@ -76,6 +77,7 @@
onu: 'ALPHe3d1cea3'
c_tag: '801'
s_tag: '111'
+ power_switch_port: 0
-
ip: '10.192.20.46'
user: 'cord'
@@ -86,6 +88,7 @@
onu: 'ALPHe3d1ceb7'
c_tag: '101'
s_tag: '222'
+ power_switch_port: 1
dst:
-
@@ -118,3 +121,8 @@
dp_iface_gateway: null
container_type: null
container_name: null
+
+web_power_switch:
+ ip: '10.192.20.56'
+ user: 'admin'
+ password: '1234'
diff --git a/deployment-configs/onf-demo-pod.yaml b/deployment-configs/onf-demo-pod.yaml
index 305d28e..8e83045 100644
--- a/deployment-configs/onf-demo-pod.yaml
+++ b/deployment-configs/onf-demo-pod.yaml
@@ -69,7 +69,6 @@
onu: 'BRCM22222222'
c_tag: '11'
s_tag: '99'
- power_switch_port: 7
-
ip: '10.128.100.71'
user: 'cord'
@@ -80,7 +79,6 @@
onu: 'ALPHe3d1cf9d'
c_tag: '22'
s_tag: '99'
- power_switch_port: 4
-
ip: '10.128.100.71'
user: 'cord'
@@ -91,7 +89,6 @@
onu: 'ALPHe3d1ced5'
c_tag: '33'
s_tag: '99'
- power_switch_port: 0
dst:
-
ip: null
@@ -123,8 +120,3 @@
dp_iface_gateway: null
container_type: null
container_name: null
-
-web_power_switch:
- ip: '10.128.100.100'
- user: 'admin'
- password: '1234'