AETHER-3154 Install AiaB using sd-core chart
Change-Id: I17e0da3d8137a5317a142ff5fb9f9de927532f38
diff --git a/4g-core-values.yaml b/4g-core-values.yaml
deleted file mode 100644
index 5ef3724..0000000
--- a/4g-core-values.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 2019-present Open Networking Foundation
-#
-# SPDX-License-Identifier: Apache-2.0
-
-# cassandra values
-cassandra:
- config:
- cluster_size: 1
- seed_size: 1
-resources:
- enabled: false
-
-config:
- managedByConfigPod:
- enabled: true
- # syncUrl: http://sdcore-adapter-v2.aether-roc.svc:8080/synchronize
- config4g:
- deploy: true
- hss:
- bootstrap:
- users: []
- staticusers: []
- spgwc:
- pfcp: true
- cfgFiles:
- cp.json:
- ip_pool_config:
- ueIpPool:
- ip: "172.250.0.0"
- mask: "255.255.0.0"
- staticUeIpPool:
- ip: "172.250.1.0"
- mask: "255.255.255.0"
- simapp:
- cfgFiles:
- simapp.yaml:
- configuration:
- provision-network-slice: true
- sub-provision-endpt:
- addr: config4g
- port: 5000
- subscribers:
- - ueId-start: 208010167891201
- ueId-end: 208010167891211
- plmnId: 20801
- opc: "d4416644f6154936193433dd20a0ace0"
- op: ""
- key: "465b5ce8b199b49faa5f0a2ee238a6bc"
- sequenceNumber: 96
- device-groups:
- - name: "4g-oaisim-user"
- imsis:
- - "208010167891201"
- - "208010167891202"
- ip-domain-name: "pool1"
- ip-domain-expanded:
- dnn: internet
- dns-primary: "8.8.8.8"
- mtu: 1460
- ue-ip-pool: "172.250.0.0/16"
- ue-dnn-qos:
- dnn-mbr-downlink: 20000000
- dnn-mbr-uplink: 4000000
- bitrate-unit: bps
- traffic-class: #default bearer QCI/ARP
- name: "platinum"
- qci: 9
- arp: 6
- pdb: 300
- pelr: 6
- site-info: "aiab"
- network-slices:
- - name: "default"
- slice-id:
- sd: "010203"
- sst: 1
- site-device-group:
- - "4g-oaisim-user"
- application-filtering-rules:
- - rule-name: "ALLOW-ALL"
- priority: 250
- action: "permit"
- endpoint: "0.0.0.0/0"
- site-info:
- gNodeBs:
- - name: "aiab-gnb1"
- tac: 1
- plmn:
- mcc: "208"
- mnc: "01"
- site-name: "aiab"
- upf:
- upf-name: "upf"
- upf-port: 8805
diff --git a/5g-core-values.yaml b/5g-core-values.yaml
deleted file mode 100644
index 2b54111..0000000
--- a/5g-core-values.yaml
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 2019-present Open Networking Foundation
-#
-# SPDX-License-Identifier: Apache-2.0
-mongodb:
- usePassword: false
- persistence:
- enabled: false
-resources:
- enabled: false
-
-config:
- managedByConfigPod:
- enabled: true
- # syncUrl: http://sdcore-adapter-v2.aether-roc.svc:8080/synchronize
- smf:
- cfgFiles:
- # https://github.com/free5gc/free5gc/blob/main/config/pcfcfg.yaml
- smfcfg.conf:
- configuration:
- mongodb: # the mongodb connected by this PCF
- name: smf # name of the mongodb
- url: mongodb://mongodb:27017
- pcf:
- cfgFiles:
- # https://github.com/free5gc/free5gc/blob/main/config/pcfcfg.yaml
- pcfcfg.conf:
- info:
- version: 1.0.0
- description: PCF initial local configuration
- configuration:
- mongodb: # the mongodb connected by this PCF
- name: free5gc # name of the mongodb
- url: mongodb://mongodb:27017
- nrf:
- cfgFiles:
- # https://github.com/free5gc/free5gc/blob/main/config/nrfcfg.yaml
- nrfcfg.conf:
- configuration:
- MongoDBName: free5gc # database name in MongoDB
- MongoDBUrl: mongodb://mongodb:27017
- #MongoDBUrl: mongodb://mongodb:27017 #works with db in omec name space
- simapp:
- cfgFiles:
- simapp.yaml:
- configuration:
- provision-network-slice: true
- sub-provision-endpt:
- addr: webui
- port: 5000
- subscribers:
- - ueId-start: 208930100007487
- ueId-end: 208930100007501
- plmnId: 20893
- opc: "981d464c7c52eb6e5036234984ad0bcf"
- op: ""
- key: "5122250214c33e723a5dd523fc145fc0"
- sequenceNumber: "16f3b3f70fc2"
- device-groups:
- - name: "5g-gnbsim-user"
- imsis:
- - "208930100007487"
- - "208930100007488"
- - "208930100007489"
- - "208930100007490"
- - "208930100007491"
- - "208930100007492"
- - "208930100007493"
- - "208930100007494"
- - "208930100007495"
- - "208930100007496"
- - "208930100007497"
- - "208930100007498"
- - "208930100007499"
- - "208930100007500"
- - "208930100007501"
- ip-domain-name: "pool1"
- ip-domain-expanded:
- dnn: internet
- dns-primary: "8.8.8.8"
- mtu: 1460
- ue-ip-pool: "172.250.0.0/16"
- ue-dnn-qos:
- dnn-mbr-downlink: 20000000
- dnn-mbr-uplink: 4000000
- bitrate-unit: bps
- traffic-class: #default bearer QCI/ARP
- name: "platinum"
- qci: 9
- arp: 6
- pdb: 300
- pelr: 6
- site-info: "aiab"
- network-slices:
- - name: "default"
- slice-id:
- sd: "010203"
- sst: 1
- site-device-group:
- - "5g-gnbsim-user"
- application-filtering-rules:
- - rule-name: "ALLOW-ALL"
- priority: 250
- action: "permit"
- endpoint: "0.0.0.0/0"
- site-info:
- gNodeBs:
- - name: "aiab-gnb1"
- tac: 1
- plmn:
- mcc: "208"
- mnc: "93"
- site-name: "aiab"
- upf:
- upf-name: "upf"
- upf-port: 8805
diff --git a/Makefile b/Makefile
index 73cdf4e..1d12c56 100644
--- a/Makefile
+++ b/Makefile
@@ -11,12 +11,10 @@
WORKSPACE ?= $(HOME)
VENV ?= $(BUILD)/venv/aiab
-4G_CORE_VALUES ?= $(MAKEDIR)/4g-core-values.yaml
-5G_CORE_VALUES ?= $(MAKEDIR)/5g-core-values.yaml
+4G_CORE_VALUES ?= $(MAKEDIR)/sd-core-4g-values.yaml
+5G_CORE_VALUES ?= $(MAKEDIR)/sd-core-5g-values.yaml
OAISIM_VALUES ?= $(MAKEDIR)/oaisim-values.yaml
ROC_VALUES ?= $(MAKEDIR)/roc-values.yaml
-UPF_VALUES ?= $(MAKEDIR)/upf-values.yaml
-RANSIM_VALUES ?= $(MAKEDIR)/ransim-values.yaml
ROC_4G_MODELS ?= $(MAKEDIR)/roc-4g-models.json
ROC_5G_MODELS ?= $(MAKEDIR)/roc-5g-models.json
TEST_APP_VALUES?= $(MAKEDIR)/5g-test-apps-values.yaml
@@ -171,49 +169,24 @@
kubectl get namespace omec 2> /dev/null || kubectl create namespace omec
kubectl -n omec get secret aether.registry || kubectl create -f $(RESOURCEDIR)/aether.registry.yaml
helm repo update
- if [[ "${CHARTS}" == "local" || "${CHARTS}" == "local-sdcore" ]]; then helm dep up $(OMEC_CONTROL_PLANE_CHART); fi
+ if [[ "${CHARTS}" == "local" || "${CHARTS}" == "local-sdcore" ]]; then helm dep up $(SD_CORE_CHART); fi
helm upgrade --install --wait $(HELM_GLOBAL_ARGS) \
--namespace omec \
--values $(4G_CORE_VALUES) \
- sim-app \
- $(OMEC_SUB_PROVISION_CHART) && \
- helm upgrade --install --wait $(HELM_GLOBAL_ARGS) \
- --namespace omec \
- --values $(4G_CORE_VALUES) \
- omec-control-plane \
- $(OMEC_CONTROL_PLANE_CHART) && \
- helm upgrade --install --wait $(HELM_GLOBAL_ARGS) \
- --namespace omec \
- --values $(UPF_VALUES) \
- omec-user-plane \
- $(OMEC_USER_PLANE_CHART)
+ sd-core \
+ $(SD_CORE_CHART)
touch $@
$(M)/5g-core: | $(M)/helm-ready /opt/cni/bin/simpleovs /opt/cni/bin/static $(M)/fabric $(RESOURCEDIR)/aether.registry.yaml
kubectl get namespace omec 2> /dev/null || kubectl create namespace omec
kubectl -n omec get secret aether.registry || kubectl create -f $(RESOURCEDIR)/aether.registry.yaml
helm repo update
- if [[ "${CHARTS}" == "local" || "${CHARTS}" == "local-sdcore" ]]; then helm dep up $(5GC_CONTROL_PLANE_CHART); fi
+ if [[ "${CHARTS}" == "local" || "${CHARTS}" == "local-sdcore" ]]; then helm dep up $(SD_CORE_CHART); fi
helm upgrade --install --wait $(HELM_GLOBAL_ARGS) \
--namespace omec \
--values $(5G_CORE_VALUES) \
- sim-app \
- $(OMEC_SUB_PROVISION_CHART) && \
- helm upgrade --install --wait $(HELM_GLOBAL_ARGS) \
- --namespace omec \
- --values $(UPF_VALUES) \
- 5g-core-up \
- $(OMEC_USER_PLANE_CHART) && \
- helm upgrade --install --wait $(HELM_GLOBAL_ARGS) \
- --namespace omec \
- --values $(5G_CORE_VALUES) \
- fgc-core \
- $(5GC_CONTROL_PLANE_CHART) && \
- helm upgrade --install --wait $(HELM_GLOBAL_ARGS) \
- --namespace omec \
- --values $(RANSIM_VALUES) \
- 5g-ransim-plane \
- $(5G_RAN_SIM_CHART)
+ sd-core \
+ $(SD_CORE_CHART)
touch $@
# UE images includes kernel module, ue_ip.ko
@@ -330,6 +303,7 @@
@echo "Finished to test"
5g-test: | $(M)/5g-core
+ @if [[ "${CHARTS}" == "release-1.6" ]]; then echo "[NOTE] 5G Test not supported for Aether 1.6, exiting..."; exit 1; fi
@echo "Test: Registration + UE initiated PDU Session Establishment + User Data packets"
@sleep 5
@rm -f /tmp/gnbsim.out
diff --git a/aether-1.5/4g-core-values.yaml b/aether-1.5/4g-core-values.yaml
deleted file mode 100644
index 583c5d6..0000000
--- a/aether-1.5/4g-core-values.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 2019-present Open Networking Foundation
-#
-# SPDX-License-Identifier: Apache-2.0
-
-# cassandra values
-cassandra:
- config:
- cluster_size: 1
- seed_size: 1
-resources:
- enabled: false
-
-config:
- managedByConfigPod:
- enabled: true
- # syncUrl: http://sdcore-adapter-v3.aether-roc.svc:8080/synchronize
- config4g:
- deploy: true
- hss:
- bootstrap:
- users: []
- staticusers: []
- spgwc:
- pfcp: true
- cfgFiles:
- cp.json:
- ip_pool_config:
- ueIpPool:
- ip: "172.250.0.0"
- mask: "255.255.0.0"
- staticUeIpPool:
- ip: "172.250.1.0"
- mask: "255.255.255.0"
- simapp:
- cfgFiles:
- simapp.yaml:
- configuration:
- provision-network-slice: true
- sub-provision-endpt:
- addr: config4g
- port: 5000
- subscribers:
- - ueId-start: 208010167891201
- ueId-end: 208010167891211
- plmnId: 20801
- opc: "d4416644f6154936193433dd20a0ace0"
- op: ""
- key: "465b5ce8b199b49faa5f0a2ee238a6bc"
- sequenceNumber: 96
- device-groups:
- - name: "4g-oaisim-user"
- imsis:
- - "208010167891201"
- - "208010167891202"
- ip-domain-name: "pool1"
- ip-domain-expanded:
- dnn: internet
- dns-primary: "8.8.8.8"
- mtu: 1460
- ue-ip-pool: "172.250.0.0/16"
- site-info: "aiab"
- network-slices:
- - name: "default"
- slice-id:
- sd: "010203"
- sst: 1
- site-device-group:
- - "4g-oaisim-user"
- applications-information:
- - app-name: "default-app"
- end-port: 40000
- endpoint: "1.1.1.1/32"
- protocol: 17
- start-port: 40000
- deny-applications:
- - "iot-app-deny"
- permit-applications:
- - "iot-app1-permit"
- - "iot-app2-permit"
- qos:
- downlink: 20
- traffic-class: "platinum"
- uplink: 40
- site-info:
- gNodeBs:
- - name: "aiab-gnb1"
- tac: 1
- plmn:
- mcc: "208"
- mnc: "01"
- site-name: "aiab"
- upf:
- upf-name: "upf"
- upf-port: 8805
diff --git a/aether-1.5/5g-core-values.yaml b/aether-1.5/5g-core-values.yaml
deleted file mode 100644
index 9d0db03..0000000
--- a/aether-1.5/5g-core-values.yaml
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 2019-present Open Networking Foundation
-#
-# SPDX-License-Identifier: Apache-2.0
-mongodb:
- usePassword: false
- persistence:
- enabled: false
-resources:
- enabled: false
-
-config:
- managedByConfigPod:
- enabled: true
- # syncUrl: http://sdcore-adapter-v3.aether-roc.svc:8080/synchronize
- smf:
- cfgFiles:
- # https://github.com/free5gc/free5gc/blob/main/config/pcfcfg.yaml
- smfcfg.conf:
- configuration:
- mongodb: # the mongodb connected by this PCF
- name: smf # name of the mongodb
- url: mongodb://mongodb:27017
- pcf:
- cfgFiles:
- # https://github.com/free5gc/free5gc/blob/main/config/pcfcfg.yaml
- pcfcfg.conf:
- info:
- version: 1.0.0
- description: PCF initial local configuration
- configuration:
- mongodb: # the mongodb connected by this PCF
- name: free5gc # name of the mongodb
- url: mongodb://mongodb:27017
- nrf:
- cfgFiles:
- # https://github.com/free5gc/free5gc/blob/main/config/nrfcfg.yaml
- nrfcfg.conf:
- configuration:
- MongoDBName: free5gc # database name in MongoDB
- MongoDBUrl: mongodb://mongodb:27017
- #MongoDBUrl: mongodb://mongodb:27017 #works with db in omec name space
- simapp:
- cfgFiles:
- simapp.yaml:
- configuration:
- provision-network-slice: true
- sub-provision-endpt:
- addr: webui
- port: 5000
- subscribers:
- - ueId-start: 208930100007487
- ueId-end: 208930100007501
- plmnId: 20893
- opc: "981d464c7c52eb6e5036234984ad0bcf"
- op: ""
- key: "5122250214c33e723a5dd523fc145fc0"
- sequenceNumber: "16f3b3f70fc2"
- device-groups:
- - name: "5g-gnbsim-user"
- imsis:
- - "208930100007487"
- - "208930100007488"
- - "208930100007489"
- - "208930100007490"
- - "208930100007491"
- - "208930100007492"
- - "208930100007493"
- - "208930100007494"
- - "208930100007495"
- - "208930100007496"
- - "208930100007497"
- - "208930100007498"
- - "208930100007499"
- - "208930100007500"
- - "208930100007501"
- ip-domain-name: "pool1"
- ip-domain-expanded:
- dnn: internet
- dns-primary: "8.8.8.8"
- mtu: 1460
- ue-ip-pool: "172.250.0.0/16"
- site-info: "aiab"
- network-slices:
- - name: "default"
- slice-id:
- sd: "010203"
- sst: 1
- site-device-group:
- - "5g-gnbsim-user"
- applications-information:
- - app-name: "default-app"
- end-port: 40000
- endpoint: "1.1.1.1/32"
- protocol: 17
- start-port: 40000
- deny-applications:
- - "iot-app-deny"
- permit-applications:
- - "iot-app1-permit"
- - "iot-app2-permit"
- qos:
- downlink: 20
- traffic-class: "platinum"
- uplink: 40
- site-info:
- gNodeBs:
- - name: "aiab-gnb1"
- tac: 1
- plmn:
- mcc: "208"
- mnc: "93"
- site-name: "aiab"
- upf:
- upf-name: "upf"
- upf-port: 8805
diff --git a/aether-1.5/roc-4g-models-v3.json b/aether-1.5/roc-4g-models-v3.json
deleted file mode 100644
index ab5bfb5..0000000
--- a/aether-1.5/roc-4g-models-v3.json
+++ /dev/null
@@ -1,185 +0,0 @@
-{
- "default-target": "connectivity-service-v3",
- "Updates": {
- "ap-list-3.0.0": {
- "ap-list": [
- {
- "access-points": [
- {
- "address": "aiab-gnb1",
- "enable": true,
- "tac": "0001"
- }
- ],
- "description": "AiaB Access Points",
- "display-name": "AiaB APs",
- "enterprise": "aiab-enterprise",
- "id": "aiab-qa-app"
- }
- ]
- },
- "application-3.0.0": {
- "application": [
- {
- "description": "AiaB - Test application",
- "display-name": "TestApp",
- "enterprise": "aiab-enterprise",
- "endpoint": [
- {
- "address": "1.1.1.1",
- "name": "aiab-testapp",
- "port-end": 40000,
- "port-start": 40000,
- "protocol": "UDP"
- }
- ],
- "id": "aiab-testapp"
- }
- ]
- },
- "connectivity-service-3.0.0": {
- "connectivity-service": [
- {
- "core-5g-endpoint": "http://config4g.omec.svc:5000/config",
- "description": "4G Integration Test",
- "display-name": "ROC 4G Test Connectivity Service",
- "id": "aiab-cs"
- }
- ]
- },
- "device-group-3.0.0": {
- "device-group": [
- {
- "display-name": "AiaB Users",
- "id": "aiab-device-group",
- "imsis": [
- {
- "imsi-range-from": 208010167891201,
- "imsi-range-to": 208010167891202,
- "name": "aiab-imsis"
- }
- ],
- "ip-domain": "aiab-ip-pool",
- "site": "aiab-site"
- }
- ]
- },
- "enterprise-3.0.0": {
- "enterprise": [
- {
- "connectivity-service": [
- {
- "connectivity-service": "aiab-cs",
- "enabled": true
- }
- ],
- "description": "AiaB Enterprise",
- "display-name": "AiaB Corp.",
- "id": "aiab-enterprise"
- }
- ]
- },
- "ip-domain-3.0.0": {
- "ip-domain": [
- {
- "admin-status": "ENABLE",
- "display-name": "IP pool",
- "dns-primary": "8.8.8.8",
- "id": "aiab-ip-pool",
- "mtu": 1460,
- "subnet": "172.250.0.0/16",
- "enterprise": "aiab-enterprise"
- }
- ]
- },
- "site-3.0.0": {
- "site": [
- {
- "description": "AiaB test site",
- "display-name": "AiaB site",
- "enterprise": "aiab-enterprise",
- "id": "aiab-site",
- "imsi-definition": {
- "mcc": "208",
- "mnc": "01",
- "enterprise": 0,
- "format": "SSSSSSSSSSSSSSS"
- }
- }
- ]
- },
- "template-3.0.0": {
- "template": [
- {
- "description": "Test Template",
- "display-name": "Test Template",
- "downlink": 200,
- "id": "aiab-template",
- "sd": 66051,
- "sst": 1,
- "traffic-class": "aiab-class-1",
- "uplink": 40
- }
- ]
- },
- "traffic-class-3.0.0": {
- "traffic-class": [
- {
- "description": "High Priority TC",
- "display-name": "Class 1",
- "id": "aiab-class-1",
- "pdb": 100,
- "pelr": 3,
- "qci": 1
- }
- ]
- },
- "upf-3.0.0": {
- "upf": [
- {
- "address": "upf",
- "description": "AiaB UPF",
- "display-name": "AiaB UPF",
- "id": "aiab-upf",
- "enterprise": "aiab-enterprise",
- "port": 8805
- }
- ]
- },
- "vcs-3.0.0": {
- "vcs": [
- {
- "id": "aiab-vcs",
- "template": "aiab-template",
- "enterprise": "aiab-enterprise",
- "uplink": 40,
- "downlink": 200,
- "traffic-class": "aiab-class-1",
- "description": "AiaB Virtual Connectivity Service",
- "display-name": "AiaB VCS",
- "device-group": [
- {
- "device-group": "aiab-device-group",
- "enable": true
- }
- ],
- "upf": "aiab-upf",
- "sd": 66051,
- "sst": 1,
- "ap": "aiab-qa-app",
- "application": [
- {
- "application": "aiab-testapp",
- "allow": true
- }
- ]
- }
- ]
- }
- },
- "Deletes": {},
- "Extensions": {
- "model-version-101": "3.0.0",
- "model-type-102": "Aether"
- }
-}
diff --git a/aether-1.5/roc-4g-models-v3.json.license b/aether-1.5/roc-4g-models-v3.json.license
deleted file mode 100644
index b1480fd..0000000
--- a/aether-1.5/roc-4g-models-v3.json.license
+++ /dev/null
@@ -1,3 +0,0 @@
-SPDX-FileCopyrightText: 2021 Open Networking Foundation
-
-SPDX-License-Identifier: Apache-2.0
\ No newline at end of file
diff --git a/aether-1.5/roc-5g-models-v3.json b/aether-1.5/roc-5g-models-v3.json
deleted file mode 100644
index 6181c7b..0000000
--- a/aether-1.5/roc-5g-models-v3.json
+++ /dev/null
@@ -1,185 +0,0 @@
-{
- "default-target": "connectivity-service-v3",
- "Updates": {
- "ap-list-3.0.0": {
- "ap-list": [
- {
- "access-points": [
- {
- "address": "aiab-gnb1",
- "enable": true,
- "tac": "0001"
- }
- ],
- "description": "AiaB Access Points",
- "display-name": "AiaB APs",
- "enterprise": "aiab-enterprise",
- "id": "aiab-qa-app"
- }
- ]
- },
- "application-3.0.0": {
- "application": [
- {
- "description": "AiaB - Test application",
- "display-name": "TestApp",
- "enterprise": "aiab-enterprise",
- "endpoint": [
- {
- "address": "1.1.1.1",
- "name": "aiab-testapp",
- "port-end": 40000,
- "port-start": 40000,
- "protocol": "UDP"
- }
- ],
- "id": "aiab-testapp"
- }
- ]
- },
- "connectivity-service-3.0.0": {
- "connectivity-service": [
- {
- "core-5g-endpoint": "http://webui.omec.svc:5000/config",
- "description": "5G Integration Test",
- "display-name": "ROC 5G Test Connectivity Service",
- "id": "aiab-cs"
- }
- ]
- },
- "device-group-3.0.0": {
- "device-group": [
- {
- "display-name": "AiaB Users",
- "id": "aiab-device-group",
- "imsis": [
- {
- "imsi-range-from": 208930100007487,
- "imsi-range-to": 208930100007488,
- "name": "aiab-imsis"
- }
- ],
- "ip-domain": "aiab-ip-pool",
- "site": "aiab-site"
- }
- ]
- },
- "enterprise-3.0.0": {
- "enterprise": [
- {
- "connectivity-service": [
- {
- "connectivity-service": "aiab-cs",
- "enabled": true
- }
- ],
- "description": "AiaB Enterprise",
- "display-name": "AiaB Corp.",
- "id": "aiab-enterprise"
- }
- ]
- },
- "ip-domain-3.0.0": {
- "ip-domain": [
- {
- "admin-status": "ENABLE",
- "display-name": "IP pool",
- "dns-primary": "8.8.8.8",
- "id": "aiab-ip-pool",
- "mtu": 1460,
- "subnet": "172.250.0.0/16",
- "enterprise": "aiab-enterprise"
- }
- ]
- },
- "site-3.0.0": {
- "site": [
- {
- "description": "AiaB test site",
- "display-name": "AiaB site",
- "enterprise": "aiab-enterprise",
- "id": "aiab-site",
- "imsi-definition": {
- "mcc": "208",
- "mnc": "93",
- "enterprise": 0,
- "format": "SSSSSSSSSSSSSSS"
- }
- }
- ]
- },
- "template-3.0.0": {
- "template": [
- {
- "description": "Test Template",
- "display-name": "Test Template",
- "downlink": 200,
- "id": "aiab-template",
- "sd": 66051,
- "sst": 1,
- "traffic-class": "aiab-class-1",
- "uplink": 40
- }
- ]
- },
- "traffic-class-3.0.0": {
- "traffic-class": [
- {
- "description": "High Priority TC",
- "display-name": "Class 1",
- "id": "aiab-class-1",
- "pdb": 100,
- "pelr": 3,
- "qci": 1
- }
- ]
- },
- "upf-3.0.0": {
- "upf": [
- {
- "address": "upf",
- "description": "AiaB UPF",
- "display-name": "AiaB UPF",
- "id": "aiab-upf",
- "enterprise": "aiab-enterprise",
- "port": 8805
- }
- ]
- },
- "vcs-3.0.0": {
- "vcs": [
- {
- "id": "aiab-vcs",
- "template": "aiab-template",
- "enterprise": "aiab-enterprise",
- "uplink": 40,
- "downlink": 200,
- "traffic-class": "aiab-class-1",
- "description": "AiaB Virtual Connectivity Service",
- "display-name": "AiaB VCS",
- "device-group": [
- {
- "device-group": "aiab-device-group",
- "enable": true
- }
- ],
- "upf": "aiab-upf",
- "sd": 66051,
- "sst": 1,
- "ap": "aiab-qa-app",
- "application": [
- {
- "application": "aiab-testapp",
- "allow": true
- }
- ]
- }
- ]
- }
- },
- "Deletes": {},
- "Extensions": {
- "model-version-101": "3.0.0",
- "model-type-102": "Aether"
- }
-}
diff --git a/aether-1.5/roc-5g-models-v3.json.license b/aether-1.5/roc-5g-models-v3.json.license
deleted file mode 100644
index b1480fd..0000000
--- a/aether-1.5/roc-5g-models-v3.json.license
+++ /dev/null
@@ -1,3 +0,0 @@
-SPDX-FileCopyrightText: 2021 Open Networking Foundation
-
-SPDX-License-Identifier: Apache-2.0
\ No newline at end of file
diff --git a/aether-1.5/roc-values.yaml b/aether-1.5/roc-values.yaml
deleted file mode 100644
index d233b87..0000000
--- a/aether-1.5/roc-values.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 2019-present Open Networking Foundation
-#
-# SPDX-License-Identifier: Apache-2.0
-
-global:
- storage:
- controller: "atomix-controller.kube-system:5679"
- store:
- consensus:
- enabled: true
- clusters: 1
- replicas: 1
- partitions: 1
-
-import:
- aether-roc-gui:
- v2_1:
- enabled: false
- v3:
- enabled: true
- sdcore-adapter:
- v2_1:
- enabled: false
- v3:
- enabled: true
- sdcore-test-dummy:
- enabled: false
-
-onos-gui:
- ingress:
- enabled: false
- service:
- type: NodePort
-
-aether-roc-gui:
- ingress:
- enabled: false
- service:
- type: NodePort
-
-aether-roc-gui-v3:
- ingress:
- enabled: false
- service:
- type: NodePort
-
-aether-roc-gui-v4:
- ingress:
- enabled: false
- service:
- type: NodePort
-
-prometheus:
- alertmanager:
- persistentVolume:
- enabled: false
- server:
- persistentVolume:
- enabled: false
-prometheus-amp:
- alertmanager:
- persistentVolume:
- enabled: false
- server:
- persistentVolume:
- enabled: false
-prometheus-acc:
- alertmanager:
- persistentVolume:
- enabled: false
- server:
- persistentVolume:
- enabled: false
-prometheus-ace:
- alertmanager:
- persistentVolume:
- enabled: false
- server:
- persistentVolume:
- enabled: false
diff --git a/aether-1.6/4g-core-values.yaml b/aether-1.6/4g-core-values.yaml
deleted file mode 100644
index 1f21c1b..0000000
--- a/aether-1.6/4g-core-values.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 2019-present Open Networking Foundation
-#
-# SPDX-License-Identifier: Apache-2.0
-
-# cassandra values
-cassandra:
- config:
- cluster_size: 1
- seed_size: 1
-resources:
- enabled: false
-
-config:
- managedByConfigPod:
- enabled: true
- # syncUrl: http://sdcore-adapter-v4.aether-roc.svc:8080/synchronize
- config4g:
- deploy: true
- hss:
- bootstrap:
- users: []
- staticusers: []
- spgwc:
- pfcp: true
- cfgFiles:
- cp.json:
- ip_pool_config:
- ueIpPool:
- ip: "172.250.0.0"
- mask: "255.255.0.0"
- staticUeIpPool:
- ip: "172.250.1.0"
- mask: "255.255.255.0"
- simapp:
- cfgFiles:
- simapp.yaml:
- configuration:
- provision-network-slice: true
- sub-provision-endpt:
- addr: config4g
- port: 5000
- subscribers:
- - ueId-start: 208010167891201
- ueId-end: 208010167891211
- plmnId: 20801
- opc: "d4416644f6154936193433dd20a0ace0"
- op: ""
- key: "465b5ce8b199b49faa5f0a2ee238a6bc"
- sequenceNumber: 96
- device-groups:
- - name: "4g-oaisim-user"
- imsis:
- - "208010167891201"
- - "208010167891202"
- ip-domain-name: "pool1"
- ip-domain-expanded:
- dnn: internet
- dns-primary: "8.8.8.8"
- mtu: 1460
- ue-ip-pool: "172.250.0.0/16"
- ue-dnn-qos:
- dnn-mbr-downlink: 20000000
- dnn-mbr-uplink: 4000000
- bitrate-unit: bps
- traffic-class: #default bearer QCI/ARP
- name: "platinum"
- qci: 9
- arp: 6
- pdb: 300
- pelr: 6
- site-info: "aiab"
- network-slices:
- - name: "default"
- slice-id:
- sd: "010203"
- sst: 1
- site-device-group:
- - "4g-oaisim-user"
- application-filtering-rules:
- - rule-name: "ALLOW-ALL"
- priority: 250
- action: "permit"
- endpoint: "0.0.0.0/0"
- site-info:
- gNodeBs:
- - name: "aiab-gnb1"
- tac: 1
- plmn:
- mcc: "208"
- mnc: "01"
- site-name: "aiab"
- upf:
- upf-name: "upf"
- upf-port: 8805
diff --git a/aether-1.6/5g-core-values.yaml b/aether-1.6/5g-core-values.yaml
deleted file mode 100644
index 69117a2..0000000
--- a/aether-1.6/5g-core-values.yaml
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 2019-present Open Networking Foundation
-#
-# SPDX-License-Identifier: Apache-2.0
-mongodb:
- usePassword: false
- persistence:
- enabled: false
-resources:
- enabled: false
-
-config:
- managedByConfigPod:
- enabled: true
- # syncUrl: http://sdcore-adapter-v4.aether-roc.svc:8080/synchronize
- smf:
- cfgFiles:
- # https://github.com/free5gc/free5gc/blob/main/config/pcfcfg.yaml
- smfcfg.conf:
- configuration:
- mongodb: # the mongodb connected by this PCF
- name: smf # name of the mongodb
- url: mongodb://mongodb:27017
- pcf:
- cfgFiles:
- # https://github.com/free5gc/free5gc/blob/main/config/pcfcfg.yaml
- pcfcfg.conf:
- info:
- version: 1.0.0
- description: PCF initial local configuration
- configuration:
- mongodb: # the mongodb connected by this PCF
- name: free5gc # name of the mongodb
- url: mongodb://mongodb:27017
- nrf:
- cfgFiles:
- # https://github.com/free5gc/free5gc/blob/main/config/nrfcfg.yaml
- nrfcfg.conf:
- configuration:
- MongoDBName: free5gc # database name in MongoDB
- MongoDBUrl: mongodb://mongodb:27017
- #MongoDBUrl: mongodb://mongodb:27017 #works with db in omec name space
- simapp:
- cfgFiles:
- simapp.yaml:
- configuration:
- provision-network-slice: true
- sub-provision-endpt:
- addr: webui
- port: 5000
- subscribers:
- - ueId-start: 208930100007487
- ueId-end: 208930100007501
- plmnId: 20893
- opc: "981d464c7c52eb6e5036234984ad0bcf"
- op: ""
- key: "5122250214c33e723a5dd523fc145fc0"
- sequenceNumber: "16f3b3f70fc2"
- device-groups:
- - name: "5g-gnbsim-user"
- imsis:
- - "208930100007487"
- - "208930100007488"
- - "208930100007489"
- - "208930100007490"
- - "208930100007491"
- - "208930100007492"
- - "208930100007493"
- - "208930100007494"
- - "208930100007495"
- - "208930100007496"
- - "208930100007497"
- - "208930100007498"
- - "208930100007499"
- - "208930100007500"
- - "208930100007501"
- ip-domain-name: "pool1"
- ip-domain-expanded:
- dnn: internet
- dns-primary: "8.8.8.8"
- mtu: 1460
- ue-ip-pool: "172.250.0.0/16"
- ue-dnn-qos:
- dnn-mbr-downlink: 20000000
- dnn-mbr-uplink: 4000000
- bitrate-unit: bps
- traffic-class: #default bearer QCI/ARP
- name: "platinum"
- qci: 9
- arp: 6
- pdb: 300
- pelr: 6
- site-info: "aiab"
- network-slices:
- - name: "default"
- slice-id:
- sd: "010203"
- sst: 1
- site-device-group:
- - "5g-gnbsim-user"
- application-filtering-rules:
- - rule-name: "ALLOW-ALL"
- priority: 250
- action: "permit"
- endpoint: "0.0.0.0/0"
- site-info:
- gNodeBs:
- - name: "aiab-gnb1"
- tac: 1
- plmn:
- mcc: "208"
- mnc: "93"
- site-name: "aiab"
- upf:
- upf-name: "upf"
- upf-port: 8805
diff --git a/aether-1.6/sd-core-4g-values.yaml b/aether-1.6/sd-core-4g-values.yaml
new file mode 100644
index 0000000..c06249f
--- /dev/null
+++ b/aether-1.6/sd-core-4g-values.yaml
@@ -0,0 +1,129 @@
+# Copyright 2019-present Open Networking Foundation
+#
+# SPDX-License-Identifier: Apache-2.0
+
+omec-control-plane:
+ enable4G: true
+ # cassandra values
+ cassandra:
+ config:
+ cluster_size: 1
+ seed_size: 1
+ resources:
+ enabled: false
+
+ config:
+ managedByConfigPod:
+ enabled: true
+ # syncUrl: http://sdcore-adapter-v4.aether-roc.svc:8080/synchronize
+ config4g:
+ deploy: true
+ hss:
+ bootstrap:
+ users: []
+ staticusers: []
+ spgwc:
+ pfcp: true
+ cfgFiles:
+ cp.json:
+ ip_pool_config:
+ ueIpPool:
+ ip: "172.250.0.0"
+ mask: "255.255.0.0"
+ staticUeIpPool:
+ ip: "172.250.1.0"
+ mask: "255.255.255.0"
+
+omec-sub-provision:
+ enable: true
+ config:
+ simapp:
+ cfgFiles:
+ simapp.yaml:
+ configuration:
+ provision-network-slice: true
+ sub-provision-endpt:
+ addr: config4g
+ port: 5000
+ subscribers:
+ - ueId-start: 208010167891201
+ ueId-end: 208010167891211
+ plmnId: 20801
+ opc: "d4416644f6154936193433dd20a0ace0"
+ op: ""
+ key: "465b5ce8b199b49faa5f0a2ee238a6bc"
+ sequenceNumber: 96
+ device-groups:
+ - name: "4g-oaisim-user"
+ imsis:
+ - "208010167891201"
+ - "208010167891202"
+ ip-domain-name: "pool1"
+ ip-domain-expanded:
+ dnn: internet
+ dns-primary: "8.8.8.8"
+ mtu: 1460
+ ue-ip-pool: "172.250.0.0/16"
+ ue-dnn-qos:
+ dnn-mbr-downlink: 20000000
+ dnn-mbr-uplink: 4000000
+ bitrate-unit: bps
+ traffic-class: #default bearer QCI/ARP
+ name: "platinum"
+ qci: 9
+ arp: 6
+ pdb: 300
+ pelr: 6
+ site-info: "aiab"
+ network-slices:
+ - name: "default"
+ slice-id:
+ sd: "010203"
+ sst: 1
+ site-device-group:
+ - "4g-oaisim-user"
+ application-filtering-rules:
+ - rule-name: "ALLOW-ALL"
+ priority: 250
+ action: "permit"
+ endpoint: "0.0.0.0/0"
+ site-info:
+ gNodeBs:
+ - name: "aiab-gnb1"
+ tac: 1
+ plmn:
+ mcc: "208"
+ mnc: "01"
+ site-name: "aiab"
+ upf:
+ upf-name: "upf"
+ upf-port: 8805
+
+omec-user-plane:
+ enable: true
+ resources:
+ enabled: false
+
+ config:
+ upf:
+ name: "oaisim"
+ sriov:
+ enabled: false
+ hugepage:
+ enabled: false
+ cniPlugin: simpleovs
+ ipam: static
+ cfgFiles:
+ upf.json:
+ mode: af_packet
+ cpiface:
+ dnn: "internet"
+ hostname: "upf"
+ enable_ue_ip_alloc: false
+ ue_ip_pool: 172.250.0.0/16
+
+5g-control-plane:
+ enable5G: false
+
+5g-ran-sim:
+ enable: false
diff --git a/aether-1.6/sd-core-5g-values.yaml b/aether-1.6/sd-core-5g-values.yaml
new file mode 100644
index 0000000..8a964ab
--- /dev/null
+++ b/aether-1.6/sd-core-5g-values.yaml
@@ -0,0 +1,230 @@
+# Copyright 2019-present Open Networking Foundation
+#
+# SPDX-License-Identifier: Apache-2.0
+
+5g-control-plane:
+ enable5G: true
+ mongodb:
+ usePassword: false
+ persistence:
+ enabled: false
+ resources:
+ enabled: false
+
+ config:
+ managedByConfigPod:
+ enabled: true
+ # syncUrl: http://sdcore-adapter-v4.aether-roc.svc:8080/synchronize
+ smf:
+ cfgFiles:
+ # https://github.com/free5gc/free5gc/blob/main/config/pcfcfg.yaml
+ smfcfg.conf:
+ configuration:
+ mongodb: # the mongodb connected by this PCF
+ name: smf # name of the mongodb
+ url: mongodb://mongodb:27017
+ pcf:
+ cfgFiles:
+ # https://github.com/free5gc/free5gc/blob/main/config/pcfcfg.yaml
+ pcfcfg.conf:
+ info:
+ version: 1.0.0
+ description: PCF initial local configuration
+ configuration:
+ mongodb: # the mongodb connected by this PCF
+ name: free5gc # name of the mongodb
+ url: mongodb://mongodb:27017
+ nrf:
+ cfgFiles:
+ # https://github.com/free5gc/free5gc/blob/main/config/nrfcfg.yaml
+ nrfcfg.conf:
+ configuration:
+ MongoDBName: free5gc # database name in MongoDB
+ MongoDBUrl: mongodb://mongodb:27017
+ #MongoDBUrl: mongodb://mongodb:27017 #works with db in omec name space
+
+omec-sub-provision:
+ enable: true
+ config:
+ simapp:
+ cfgFiles:
+ simapp.yaml:
+ configuration:
+ provision-network-slice: true
+ sub-provision-endpt:
+ addr: webui
+ port: 5000
+ subscribers:
+ - ueId-start: 208930100007487
+ ueId-end: 208930100007501
+ plmnId: 20893
+ opc: "981d464c7c52eb6e5036234984ad0bcf"
+ op: ""
+ key: "5122250214c33e723a5dd523fc145fc0"
+ sequenceNumber: "16f3b3f70fc2"
+ device-groups:
+ - name: "5g-gnbsim-user"
+ imsis:
+ - "208930100007487"
+ - "208930100007488"
+ - "208930100007489"
+ - "208930100007490"
+ - "208930100007491"
+ - "208930100007492"
+ - "208930100007493"
+ - "208930100007494"
+ - "208930100007495"
+ - "208930100007496"
+ - "208930100007497"
+ - "208930100007498"
+ - "208930100007499"
+ - "208930100007500"
+ - "208930100007501"
+ ip-domain-name: "pool1"
+ ip-domain-expanded:
+ dnn: internet
+ dns-primary: "8.8.8.8"
+ mtu: 1460
+ ue-ip-pool: "172.250.0.0/16"
+ ue-dnn-qos:
+ dnn-mbr-downlink: 20000000
+ dnn-mbr-uplink: 4000000
+ bitrate-unit: bps
+ traffic-class: #default bearer QCI/ARP
+ name: "platinum"
+ qci: 9
+ arp: 6
+ pdb: 300
+ pelr: 6
+ site-info: "aiab"
+ network-slices:
+ - name: "default"
+ slice-id:
+ sd: "010203"
+ sst: 1
+ site-device-group:
+ - "5g-gnbsim-user"
+ application-filtering-rules:
+ - rule-name: "ALLOW-ALL"
+ priority: 250
+ action: "permit"
+ endpoint: "0.0.0.0/0"
+ site-info:
+ gNodeBs:
+ - name: "aiab-gnb1"
+ tac: 1
+ plmn:
+ mcc: "208"
+ mnc: "93"
+ site-name: "aiab"
+ upf:
+ upf-name: "upf"
+ upf-port: 8805
+
+omec-user-plane:
+ enable: true
+ resources:
+ enabled: false
+
+ config:
+ upf:
+ name: "oaisim"
+ sriov:
+ enabled: false
+ hugepage:
+ enabled: false
+ cniPlugin: simpleovs
+ ipam: static
+ cfgFiles:
+ upf.json:
+ mode: af_packet
+ cpiface:
+ dnn: "internet"
+ hostname: "upf"
+ enable_ue_ip_alloc: false
+ ue_ip_pool: 172.250.0.0/16
+
+5g-ran-sim:
+ enable: true
+ resources:
+ enabled: false
+
+ config:
+ gnbsim:
+ yamlCfgFiles:
+ gnb.conf: |
+ info:
+ version: 1.0.0
+ description: gNodeB sim initial configuration
+ configuration:
+ gnbs: # pool of gNodeBs
+ gnb1:
+ n2IpAddr: # gNB N2 interface IP address used to connect to AMF
+ n2Port: 9487 # gNB N2 Port used to connect to AMF
+ n3IpAddr: 192.168.251.5 # gNB N3 interface IP address used to connect to UPF
+ n3Port: 2152 # gNB N3 Port used to connect to UPF
+ name: gnb1 # gNB name that uniquely identify a gNB within application
+ globalRanId:
+ plmnId:
+ mcc: 208 # Mobile Country Code (3 digits string, digit: 0~9)
+ mnc: 93 # Mobile Network Code (2 or 3 digits string, digit: 0~9)
+ gNbId:
+ bitLength: 24
+ gNBValue: 000102 # gNB identifier (3 bytes hex string, range: 000000~FFFFFF)
+ supportedTaList:
+ - tac: 000001 # Tracking Area Code (3 bytes hex string, range: 000000~FFFFFF)
+ broadcastPlmnList:
+ - plmnId:
+ mcc: 208
+ mnc: 93
+ taiSliceSupportList:
+ - sst: 1 # Slice/Service Type (uinteger, range: 0~255)
+ sd: 010203 # Slice Differentiator (3 bytes hex string, range: 000000~FFFFFF)
+ defaultAmf:
+ hostName: amf # Host name of AMF
+ ipAddr: # AMF IP address
+ port: 38412 # AMF port
+
+ profiles: # profile information
+ - profileType: register # profile type
+ profileName: profile1 # uniqely identifies a profile within application
+ enable: false # Set true to execute the profile, false otherwise.
+ gnbName: gnb1 # gNB to be used for this profile
+ startImsi: 208930100007487 #First IMSI. Subsequent values will be used if ueCount is mo re than 1
+ ueCount: 5 # Number of UEs for for which the profile will be executed
+ plmnId: # Public Land Mobile Network ID, <PLMN ID> = <MCC><MNC>
+ mcc: 208 # Mobile Country Code (3 digits string, digit: 0~9)
+ mnc: 93 # Mobile Network Code (2 or 3 digits string, digit: 0~9)
+ - profileType: pdusessest
+ profileName: profile2
+ enable: true
+ gnbName: gnb1
+ startImsi: 208930100007492
+ ueCount: 5
+ plmnId:
+ mcc: 208
+ mnc: 93
+ dataPktCount: 5 # Number of UL user data packets to be transmitted. Common for all UEs
+ - profileType: anrelease
+ profileName: profile3
+ enable: false
+ gnbName: gnb1
+ startImsi: 208930100007497
+ ueCount: 5
+ plmnId:
+ mcc: 208
+ mnc: 93
+ - profileType: deregister
+ profileName: profile4
+ enable: false
+ gnbName: gnb1
+ startImsi: 208930100007497
+ ueCount: 5
+ plmnId:
+ mcc: 208
+ mnc: 93
+ logger:
+ logLevel: info # how detailed the log will be, values: trace, debug, info, warn, error, fatal, panic
+
+omec-control-plane:
+ enable4G: false
diff --git a/configs/latest b/configs/latest
index aa06112..ecfe3c2 100644
--- a/configs/latest
+++ b/configs/latest
@@ -2,11 +2,7 @@
#
# SPDX-License-Identifier: Apache-2.0
-OMEC_CONTROL_PLANE_CHART := aether/omec-control-plane
-OMEC_USER_PLANE_CHART := aether/omec-user-plane
-OMEC_SUB_PROVISION_CHART := aether/omec-sub-provision
-5GC_CONTROL_PLANE_CHART := aether/5g-control-plane
-5G_RAN_SIM_CHART := aether/5g-ran-sim
+SD_CORE_CHART := aether/sd-core
# For installing the ROC
AETHER_ROC_UMBRELLA_CHART := aether/aether-roc-umbrella
diff --git a/configs/local b/configs/local
index 53c08dc..757ef02 100644
--- a/configs/local
+++ b/configs/local
@@ -2,11 +2,8 @@
#
# SPDX-License-Identifier: Apache-2.0
-# Support testing charts in the sdcore-helm-charts repo
-OMEC_CONTROL_PLANE_CHART := $(WORKSPACE)/cord/sdcore-helm-charts/omec-control-plane
-OMEC_USER_PLANE_CHART := $(WORKSPACE)/cord/aether-helm-charts/omec/omec-user-plane
-OMEC_SUB_PROVISION_CHART := $(WORKSPACE)/cord/sdcore-helm-charts/omec-sub-provision
-5GC_CONTROL_PLANE_CHART := $(WORKSPACE)/cord/sdcore-helm-charts/5g-control-plane
+# Support testing local Helm charts
+SD_CORE_CHART := $(WORKSPACE)/cord/sdcore-helm-charts/sdcore-helm-chart
5G_RAN_SIM_CHART := $(WORKSPACE)/cord/sdcore-helm-charts/5g-ran-sim
5G_TEST_APPS_CHART := $(WORKSPACE)/cord/sdcore-helm-charts/5g-test-apps
diff --git a/configs/local-sdcore b/configs/local-sdcore
index 8ed1cfc..5db7222 100644
--- a/configs/local-sdcore
+++ b/configs/local-sdcore
@@ -2,12 +2,8 @@
#
# SPDX-License-Identifier: Apache-2.0
-# Support testing charts in the sdcore-helm-charts repo
-OMEC_CONTROL_PLANE_CHART := $(WORKSPACE)/cord/sdcore-helm-charts/omec-control-plane
-OMEC_USER_PLANE_CHART := aether/omec-user-plane
-OMEC_SUB_PROVISION_CHART := $(WORKSPACE)/cord/sdcore-helm-charts/omec-sub-provision
-5GC_CONTROL_PLANE_CHART := $(WORKSPACE)/cord/sdcore-helm-charts/5g-control-plane
-5G_RAN_SIM_CHART := $(WORKSPACE)/cord/sdcore-helm-charts/5g-ran-sim
+# Support testing sd-core Helm chart
+SD_CORE_CHART := $(WORKSPACE)/cord/sdcore-helm-charts/sdcore-helm-chart
5G_TEST_APPS_CHART := $(WORKSPACE)/cord/sdcore-helm-charts/5g-test-apps
# Support testing aether-roc-umbrella chart
diff --git a/configs/local-up b/configs/local-up
deleted file mode 100644
index ad721f6..0000000
--- a/configs/local-up
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2021-present Open Networking Foundation
-#
-# SPDX-License-Identifier: Apache-2.0
-
-OMEC_CONTROL_PLANE_CHART := aether/omec-control-plane
-OMEC_USER_PLANE_CHART := $(WORKSPACE)/cord/aether-helm-charts/omec/omec-user-plane
-OMEC_SUB_PROVISION_CHART := aether/omec-sub-provision
-5GC_CONTROL_PLANE_CHART := aether/5g-control-plane
-5G_RAN_SIM_CHART := aether/5g-ran-sim
-
-# For installing the ROC
-AETHER_ROC_UMBRELLA_CHART := aether/aether-roc-umbrella
-ATOMIX_CONTROLLER_CHART := atomix/atomix-controller
-ATOMIX_RAFT_STORAGE_CHART := atomix/atomix-raft-storage
-ONOS_OPERATOR_CHART := onosproject/onos-operator
diff --git a/configs/release-1.5 b/configs/release-1.5
deleted file mode 100644
index 3fdb139..0000000
--- a/configs/release-1.5
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 2021-present Open Networking Foundation
-#
-# SPDX-License-Identifier: Apache-2.0
-
-OMEC_CONTROL_PLANE_CHART := aether/omec-control-plane --version 0.8.4
-OMEC_USER_PLANE_CHART := aether/omec-user-plane --version 0.4.8
-OMEC_SUB_PROVISION_CHART := aether/omec-sub-provision --version 0.2.0
-5GC_CONTROL_PLANE_CHART := aether/5g-control-plane --version 0.4.0
-5G_RAN_SIM_CHART := aether/5g-ran-sim --version 0.0.2
-
-# For installing the ROC
-AETHER_ROC_UMBRELLA_CHART := aether/aether-roc-umbrella --version 1.3.15
-ATOMIX_CONTROLLER_CHART := atomix/atomix-controller --version 0.6.8
-ATOMIX_RAFT_STORAGE_CHART := atomix/atomix-raft-storage --version 0.1.14
-ONOS_OPERATOR_CHART := onosproject/onos-operator --version 0.4.10
-
-# Config files to use
-ROC_VALUES := $(MAKEDIR)/aether-1.5/roc-values.yaml
-ROC_4G_MODELS := $(MAKEDIR)/aether-1.5/roc-4g-models-v3.json
-ROC_5G_MODELS := $(MAKEDIR)/aether-1.5/roc-5g-models-v3.json
-4G_CORE_VALUES := $(MAKEDIR)/aether-1.5/4g-core-values.yaml
-5G_CORE_VALUES := $(MAKEDIR)/aether-1.5/5g-core-values.yaml
diff --git a/configs/release-1.6 b/configs/release-1.6
index fac95fd..b5fdc79 100644
--- a/configs/release-1.6
+++ b/configs/release-1.6
@@ -2,11 +2,7 @@
#
# SPDX-License-Identifier: Apache-2.0
-OMEC_CONTROL_PLANE_CHART := aether/omec-control-plane --version 0.9.18
-OMEC_USER_PLANE_CHART := aether/omec-user-plane --version 0.5.4
-OMEC_SUB_PROVISION_CHART := aether/omec-sub-provision --version 0.3.2
-5GC_CONTROL_PLANE_CHART := aether/5g-control-plane --version 0.5.6
-5G_RAN_SIM_CHART := aether/5g-ran-sim --version 0.3.0
+SD_CORE_CHART := aether/sd-core --version 0.9.20
# For installing the ROC
AETHER_ROC_UMBRELLA_CHART := aether/aether-roc-umbrella --version 1.4.64
@@ -18,5 +14,5 @@
ROC_VALUES := $(MAKEDIR)/aether-1.6/roc-values.yaml
ROC_4G_MODELS := $(MAKEDIR)/aether-1.6/roc-4g-models-v4.json
ROC_5G_MODELS := $(MAKEDIR)/aether-1.6/roc-5g-models-v4.json
-4G_CORE_VALUES := $(MAKEDIR)/aether-1.6/4g-core-values.yaml
-5G_CORE_VALUES := $(MAKEDIR)/aether-1.6/5g-core-values.yaml
\ No newline at end of file
+4G_CORE_VALUES := $(MAKEDIR)/aether-1.6/sd-core-4g-values.yaml
+5G_CORE_VALUES := $(MAKEDIR)/aether-1.6/sd-core-5g-values.yaml
\ No newline at end of file
diff --git a/ransim-values.yaml b/ransim-values.yaml
deleted file mode 100644
index ff28bd2..0000000
--- a/ransim-values.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 2019-present Open Networking Foundation
-#
-# SPDX-License-Identifier: Apache-2.0
-
-resources:
- enabled: false
-
-config:
- gnbsim:
- yamlCfgFiles:
- gnb.conf: |
- info:
- version: 1.0.0
- description: gNodeB sim initial configuration
- configuration:
- gnbs: # pool of gNodeBs
- gnb1:
- n2IpAddr: # gNB N2 interface IP address used to connect to AMF
- n2Port: 9487 # gNB N2 Port used to connect to AMF
- n3IpAddr: 192.168.251.5 # gNB N3 interface IP address used to connect to UPF
- n3Port: 2152 # gNB N3 Port used to connect to UPF
- name: gnb1 # gNB name that uniquely identify a gNB within application
- globalRanId:
- plmnId:
- mcc: 208 # Mobile Country Code (3 digits string, digit: 0~9)
- mnc: 93 # Mobile Network Code (2 or 3 digits string, digit: 0~9)
- gNbId:
- bitLength: 24
- gNBValue: 000102 # gNB identifier (3 bytes hex string, range: 000000~FFFFFF)
- supportedTaList:
- - tac: 000001 # Tracking Area Code (3 bytes hex string, range: 000000~FFFFFF)
- broadcastPlmnList:
- - plmnId:
- mcc: 208
- mnc: 93
- taiSliceSupportList:
- - sst: 1 # Slice/Service Type (uinteger, range: 0~255)
- sd: 010203 # Slice Differentiator (3 bytes hex string, range: 000000~FFFFFF)
- defaultAmf:
- hostName: amf # Host name of AMF
- ipAddr: # AMF IP address
- port: 38412 # AMF port
-
- profiles: # profile information
- - profileType: register # profile type
- profileName: profile1 # uniqely identifies a profile within application
- enable: false # Set true to execute the profile, false otherwise.
- gnbName: gnb1 # gNB to be used for this profile
- startImsi: 208930100007487 #First IMSI. Subsequent values will be used if ueCount is mo re than 1
- ueCount: 5 # Number of UEs for for which the profile will be executed
- plmnId: # Public Land Mobile Network ID, <PLMN ID> = <MCC><MNC>
- mcc: 208 # Mobile Country Code (3 digits string, digit: 0~9)
- mnc: 93 # Mobile Network Code (2 or 3 digits string, digit: 0~9)
- - profileType: pdusessest
- profileName: profile2
- enable: true
- gnbName: gnb1
- startImsi: 208930100007492
- ueCount: 5
- plmnId:
- mcc: 208
- mnc: 93
- dataPktCount: 5 # Number of UL user data packets to be transmitted. Common for all UEs
- - profileType: anrelease
- profileName: profile3
- enable: false
- gnbName: gnb1
- startImsi: 208930100007497
- ueCount: 5
- plmnId:
- mcc: 208
- mnc: 93
- - profileType: deregister
- profileName: profile4
- enable: false
- gnbName: gnb1
- startImsi: 208930100007497
- ueCount: 5
- plmnId:
- mcc: 208
- mnc: 93
- logger:
- logLevel: info # how detailed the log will be, values: trace, debug, info, warn, error, fatal, panic
diff --git a/sd-core-4g-values.yaml b/sd-core-4g-values.yaml
new file mode 100644
index 0000000..9f62fe4
--- /dev/null
+++ b/sd-core-4g-values.yaml
@@ -0,0 +1,129 @@
+# Copyright 2019-present Open Networking Foundation
+#
+# SPDX-License-Identifier: Apache-2.0
+
+omec-control-plane:
+ enable4G: true
+ # cassandra values
+ cassandra:
+ config:
+ cluster_size: 1
+ seed_size: 1
+ resources:
+ enabled: false
+
+ config:
+ managedByConfigPod:
+ enabled: true
+ # syncUrl: http://sdcore-adapter-v2.aether-roc.svc:8080/synchronize
+ config4g:
+ deploy: true
+ hss:
+ bootstrap:
+ users: []
+ staticusers: []
+ spgwc:
+ pfcp: true
+ cfgFiles:
+ cp.json:
+ ip_pool_config:
+ ueIpPool:
+ ip: "172.250.0.0"
+ mask: "255.255.0.0"
+ staticUeIpPool:
+ ip: "172.250.1.0"
+ mask: "255.255.255.0"
+
+omec-sub-provision:
+ enable: true
+ config:
+ simapp:
+ cfgFiles:
+ simapp.yaml:
+ configuration:
+ provision-network-slice: true
+ sub-provision-endpt:
+ addr: config4g
+ port: 5000
+ subscribers:
+ - ueId-start: 208010167891201
+ ueId-end: 208010167891211
+ plmnId: 20801
+ opc: "d4416644f6154936193433dd20a0ace0"
+ op: ""
+ key: "465b5ce8b199b49faa5f0a2ee238a6bc"
+ sequenceNumber: 96
+ device-groups:
+ - name: "4g-oaisim-user"
+ imsis:
+ - "208010167891201"
+ - "208010167891202"
+ ip-domain-name: "pool1"
+ ip-domain-expanded:
+ dnn: internet
+ dns-primary: "8.8.8.8"
+ mtu: 1460
+ ue-ip-pool: "172.250.0.0/16"
+ ue-dnn-qos:
+ dnn-mbr-downlink: 20000000
+ dnn-mbr-uplink: 4000000
+ bitrate-unit: bps
+ traffic-class: #default bearer QCI/ARP
+ name: "platinum"
+ qci: 9
+ arp: 6
+ pdb: 300
+ pelr: 6
+ site-info: "aiab"
+ network-slices:
+ - name: "default"
+ slice-id:
+ sd: "010203"
+ sst: 1
+ site-device-group:
+ - "4g-oaisim-user"
+ application-filtering-rules:
+ - rule-name: "ALLOW-ALL"
+ priority: 250
+ action: "permit"
+ endpoint: "0.0.0.0/0"
+ site-info:
+ gNodeBs:
+ - name: "aiab-gnb1"
+ tac: 1
+ plmn:
+ mcc: "208"
+ mnc: "01"
+ site-name: "aiab"
+ upf:
+ upf-name: "upf"
+ upf-port: 8805
+
+omec-user-plane:
+ enable: true
+ resources:
+ enabled: false
+
+ config:
+ upf:
+ name: "oaisim"
+ sriov:
+ enabled: false
+ hugepage:
+ enabled: false
+ cniPlugin: simpleovs
+ ipam: static
+ cfgFiles:
+ upf.json:
+ mode: af_packet
+ cpiface:
+ dnn: "internet"
+ hostname: "upf"
+ enable_ue_ip_alloc: false
+ ue_ip_pool: 172.250.0.0/16
+
+5g-control-plane:
+ enable5G: false
+
+5g-ran-sim:
+ enable: false
diff --git a/sd-core-5g-values.yaml b/sd-core-5g-values.yaml
new file mode 100644
index 0000000..a263ae0
--- /dev/null
+++ b/sd-core-5g-values.yaml
@@ -0,0 +1,230 @@
+# Copyright 2019-present Open Networking Foundation
+#
+# SPDX-License-Identifier: Apache-2.0
+
+5g-control-plane:
+ enable5G: true
+ mongodb:
+ usePassword: false
+ persistence:
+ enabled: false
+ resources:
+ enabled: false
+
+ config:
+ managedByConfigPod:
+ enabled: true
+ # syncUrl: http://sdcore-adapter-v2.aether-roc.svc:8080/synchronize
+ smf:
+ cfgFiles:
+ # https://github.com/free5gc/free5gc/blob/main/config/pcfcfg.yaml
+ smfcfg.conf:
+ configuration:
+ mongodb: # the mongodb connected by this PCF
+ name: smf # name of the mongodb
+ url: mongodb://mongodb:27017
+ pcf:
+ cfgFiles:
+ # https://github.com/free5gc/free5gc/blob/main/config/pcfcfg.yaml
+ pcfcfg.conf:
+ info:
+ version: 1.0.0
+ description: PCF initial local configuration
+ configuration:
+ mongodb: # the mongodb connected by this PCF
+ name: free5gc # name of the mongodb
+ url: mongodb://mongodb:27017
+ nrf:
+ cfgFiles:
+ # https://github.com/free5gc/free5gc/blob/main/config/nrfcfg.yaml
+ nrfcfg.conf:
+ configuration:
+ MongoDBName: free5gc # database name in MongoDB
+ MongoDBUrl: mongodb://mongodb:27017
+ #MongoDBUrl: mongodb://mongodb:27017 #works with db in omec name space
+
+omec-sub-provision:
+ enable: true
+ config:
+ simapp:
+ cfgFiles:
+ simapp.yaml:
+ configuration:
+ provision-network-slice: true
+ sub-provision-endpt:
+ addr: webui
+ port: 5000
+ subscribers:
+ - ueId-start: 208930100007487
+ ueId-end: 208930100007501
+ plmnId: 20893
+ opc: "981d464c7c52eb6e5036234984ad0bcf"
+ op: ""
+ key: "5122250214c33e723a5dd523fc145fc0"
+ sequenceNumber: "16f3b3f70fc2"
+ device-groups:
+ - name: "5g-gnbsim-user"
+ imsis:
+ - "208930100007487"
+ - "208930100007488"
+ - "208930100007489"
+ - "208930100007490"
+ - "208930100007491"
+ - "208930100007492"
+ - "208930100007493"
+ - "208930100007494"
+ - "208930100007495"
+ - "208930100007496"
+ - "208930100007497"
+ - "208930100007498"
+ - "208930100007499"
+ - "208930100007500"
+ - "208930100007501"
+ ip-domain-name: "pool1"
+ ip-domain-expanded:
+ dnn: internet
+ dns-primary: "8.8.8.8"
+ mtu: 1460
+ ue-ip-pool: "172.250.0.0/16"
+ ue-dnn-qos:
+ dnn-mbr-downlink: 20000000
+ dnn-mbr-uplink: 4000000
+ bitrate-unit: bps
+ traffic-class: #default bearer QCI/ARP
+ name: "platinum"
+ qci: 9
+ arp: 6
+ pdb: 300
+ pelr: 6
+ site-info: "aiab"
+ network-slices:
+ - name: "default"
+ slice-id:
+ sd: "010203"
+ sst: 1
+ site-device-group:
+ - "5g-gnbsim-user"
+ application-filtering-rules:
+ - rule-name: "ALLOW-ALL"
+ priority: 250
+ action: "permit"
+ endpoint: "0.0.0.0/0"
+ site-info:
+ gNodeBs:
+ - name: "aiab-gnb1"
+ tac: 1
+ plmn:
+ mcc: "208"
+ mnc: "93"
+ site-name: "aiab"
+ upf:
+ upf-name: "upf"
+ upf-port: 8805
+
+omec-user-plane:
+ enable: true
+ resources:
+ enabled: false
+
+ config:
+ upf:
+ name: "oaisim"
+ sriov:
+ enabled: false
+ hugepage:
+ enabled: false
+ cniPlugin: simpleovs
+ ipam: static
+ cfgFiles:
+ upf.json:
+ mode: af_packet
+ cpiface:
+ dnn: "internet"
+ hostname: "upf"
+ enable_ue_ip_alloc: false
+ ue_ip_pool: 172.250.0.0/16
+
+5g-ran-sim:
+ enable: true
+ resources:
+ enabled: false
+
+ config:
+ gnbsim:
+ yamlCfgFiles:
+ gnb.conf: |
+ info:
+ version: 1.0.0
+ description: gNodeB sim initial configuration
+ configuration:
+ gnbs: # pool of gNodeBs
+ gnb1:
+ n2IpAddr: # gNB N2 interface IP address used to connect to AMF
+ n2Port: 9487 # gNB N2 Port used to connect to AMF
+ n3IpAddr: 192.168.251.5 # gNB N3 interface IP address used to connect to UPF
+ n3Port: 2152 # gNB N3 Port used to connect to UPF
+ name: gnb1 # gNB name that uniquely identify a gNB within application
+ globalRanId:
+ plmnId:
+ mcc: 208 # Mobile Country Code (3 digits string, digit: 0~9)
+ mnc: 93 # Mobile Network Code (2 or 3 digits string, digit: 0~9)
+ gNbId:
+ bitLength: 24
+ gNBValue: 000102 # gNB identifier (3 bytes hex string, range: 000000~FFFFFF)
+ supportedTaList:
+ - tac: 000001 # Tracking Area Code (3 bytes hex string, range: 000000~FFFFFF)
+ broadcastPlmnList:
+ - plmnId:
+ mcc: 208
+ mnc: 93
+ taiSliceSupportList:
+ - sst: 1 # Slice/Service Type (uinteger, range: 0~255)
+ sd: 010203 # Slice Differentiator (3 bytes hex string, range: 000000~FFFFFF)
+ defaultAmf:
+ hostName: amf # Host name of AMF
+ ipAddr: # AMF IP address
+ port: 38412 # AMF port
+
+ profiles: # profile information
+ - profileType: register # profile type
+ profileName: profile1 # uniqely identifies a profile within application
+ enable: false # Set true to execute the profile, false otherwise.
+ gnbName: gnb1 # gNB to be used for this profile
+ startImsi: 208930100007487 #First IMSI. Subsequent values will be used if ueCount is mo re than 1
+ ueCount: 5 # Number of UEs for for which the profile will be executed
+ plmnId: # Public Land Mobile Network ID, <PLMN ID> = <MCC><MNC>
+ mcc: 208 # Mobile Country Code (3 digits string, digit: 0~9)
+ mnc: 93 # Mobile Network Code (2 or 3 digits string, digit: 0~9)
+ - profileType: pdusessest
+ profileName: profile2
+ enable: true
+ gnbName: gnb1
+ startImsi: 208930100007492
+ ueCount: 5
+ plmnId:
+ mcc: 208
+ mnc: 93
+ dataPktCount: 5 # Number of UL user data packets to be transmitted. Common for all UEs
+ - profileType: anrelease
+ profileName: profile3
+ enable: false
+ gnbName: gnb1
+ startImsi: 208930100007497
+ ueCount: 5
+ plmnId:
+ mcc: 208
+ mnc: 93
+ - profileType: deregister
+ profileName: profile4
+ enable: false
+ gnbName: gnb1
+ startImsi: 208930100007497
+ ueCount: 5
+ plmnId:
+ mcc: 208
+ mnc: 93
+ logger:
+ logLevel: info # how detailed the log will be, values: trace, debug, info, warn, error, fatal, panic
+
+omec-control-plane:
+ enable4G: false
diff --git a/upf-values.yaml b/upf-values.yaml
deleted file mode 100644
index dda0217..0000000
--- a/upf-values.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2019-present Open Networking Foundation
-#
-# SPDX-License-Identifier: Apache-2.0
-
-resources:
- enabled: false
-
-config:
- upf:
- name: "oaisim"
- sriov:
- enabled: false
- hugepage:
- enabled: false
- cniPlugin: simpleovs
- ipam: static
- cfgFiles:
- upf.json:
- mode: af_packet
- cpiface:
- dnn: "internet"
- hostname: "upf"
- enable_ue_ip_alloc: false
- ue_ip_pool: 172.250.0.0/16