AETHER-3077 Add support for 2.0 ROC models, refactoring
Change-Id: I39807ca14c757cfcf8bef0a5d48d8451d8727f89
diff --git a/4g-core-values.yaml b/4g-core-values.yaml
index 1f21c1b..5ef3724 100644
--- a/4g-core-values.yaml
+++ b/4g-core-values.yaml
@@ -13,7 +13,7 @@
config:
managedByConfigPod:
enabled: true
- # syncUrl: http://sdcore-adapter-v4.aether-roc.svc:8080/synchronize
+ # syncUrl: http://sdcore-adapter-v2.aether-roc.svc:8080/synchronize
config4g:
deploy: true
hss:
diff --git a/5g-core-values.yaml b/5g-core-values.yaml
index 69117a2..2b54111 100644
--- a/5g-core-values.yaml
+++ b/5g-core-values.yaml
@@ -11,7 +11,7 @@
config:
managedByConfigPod:
enabled: true
- # syncUrl: http://sdcore-adapter-v4.aether-roc.svc:8080/synchronize
+ # syncUrl: http://sdcore-adapter-v2.aether-roc.svc:8080/synchronize
smf:
cfgFiles:
# https://github.com/free5gc/free5gc/blob/main/config/pcfcfg.yaml
diff --git a/Makefile b/Makefile
index 84f11fa..68b682e 100644
--- a/Makefile
+++ b/Makefile
@@ -14,11 +14,11 @@
4G_CORE_VALUES ?= $(MAKEDIR)/4g-core-values.yaml
5G_CORE_VALUES ?= $(MAKEDIR)/5g-core-values.yaml
OAISIM_VALUES ?= $(MAKEDIR)/oaisim-values.yaml
-ROC_VALUES ?= $(MAKEDIR)/roc-values-v4.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-v4.json
-ROC_5G_MODELS ?= $(MAKEDIR)/roc-5g-models-v4.json
+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
KUBESPRAY_VERSION ?= release-2.17
diff --git a/4g-core-values-1.5.yaml b/aether-1.5/4g-core-values.yaml
similarity index 93%
rename from 4g-core-values-1.5.yaml
rename to aether-1.5/4g-core-values.yaml
index 0d0113e..583c5d6 100644
--- a/4g-core-values-1.5.yaml
+++ b/aether-1.5/4g-core-values.yaml
@@ -40,8 +40,8 @@
addr: config4g
port: 5000
subscribers:
- - ueId-start: 208014567891201
- ueId-end: 208014567891211
+ - ueId-start: 208010167891201
+ ueId-end: 208010167891211
plmnId: 20801
opc: "d4416644f6154936193433dd20a0ace0"
op: ""
@@ -50,8 +50,8 @@
device-groups:
- name: "4g-oaisim-user"
imsis:
- - "208014567891201"
- - "208014567891202"
+ - "208010167891201"
+ - "208010167891202"
ip-domain-name: "pool1"
ip-domain-expanded:
dnn: internet
diff --git a/5g-core-values-1.5.yaml b/aether-1.5/5g-core-values.yaml
similarity index 82%
rename from 5g-core-values-1.5.yaml
rename to aether-1.5/5g-core-values.yaml
index 9c9dadf..9d0db03 100644
--- a/5g-core-values-1.5.yaml
+++ b/aether-1.5/5g-core-values.yaml
@@ -48,8 +48,8 @@
addr: webui
port: 5000
subscribers:
- - ueId-start: 2089300007487
- ueId-end: 2089300007501
+ - ueId-start: 208930100007487
+ ueId-end: 208930100007501
plmnId: 20893
opc: "981d464c7c52eb6e5036234984ad0bcf"
op: ""
@@ -58,21 +58,21 @@
device-groups:
- name: "5g-gnbsim-user"
imsis:
- - "2089300007487"
- - "2089300007488"
- - "2089300007489"
- - "2089300007490"
- - "2089300007491"
- - "2089300007492"
- - "2089300007493"
- - "2089300007494"
- - "2089300007495"
- - "2089300007496"
- - "2089300007497"
- - "2089300007498"
- - "2089300007499"
- - "2089300007500"
- - "2089300007501"
+ - "208930100007487"
+ - "208930100007488"
+ - "208930100007489"
+ - "208930100007490"
+ - "208930100007491"
+ - "208930100007492"
+ - "208930100007493"
+ - "208930100007494"
+ - "208930100007495"
+ - "208930100007496"
+ - "208930100007497"
+ - "208930100007498"
+ - "208930100007499"
+ - "208930100007500"
+ - "208930100007501"
ip-domain-name: "pool1"
ip-domain-expanded:
dnn: internet
diff --git a/roc-4g-models-v3.json b/aether-1.5/roc-4g-models-v3.json
similarity index 97%
rename from roc-4g-models-v3.json
rename to aether-1.5/roc-4g-models-v3.json
index 28cfca1..ab5bfb5 100644
--- a/roc-4g-models-v3.json
+++ b/aether-1.5/roc-4g-models-v3.json
@@ -54,8 +54,8 @@
"id": "aiab-device-group",
"imsis": [
{
- "imsi-range-from": 208014567891201,
- "imsi-range-to": 208014567891202,
+ "imsi-range-from": 208010167891201,
+ "imsi-range-to": 208010167891202,
"name": "aiab-imsis"
}
],
diff --git a/roc-4g-models-v3.json.license b/aether-1.5/roc-4g-models-v3.json.license
similarity index 100%
copy from roc-4g-models-v3.json.license
copy to aether-1.5/roc-4g-models-v3.json.license
diff --git a/roc-5g-models-v3.json b/aether-1.5/roc-5g-models-v3.json
similarity index 97%
rename from roc-5g-models-v3.json
rename to aether-1.5/roc-5g-models-v3.json
index b168ede..6181c7b 100644
--- a/roc-5g-models-v3.json
+++ b/aether-1.5/roc-5g-models-v3.json
@@ -54,8 +54,8 @@
"id": "aiab-device-group",
"imsis": [
{
- "imsi-range-from": 2089300007487,
- "imsi-range-to": 2089300007488,
+ "imsi-range-from": 208930100007487,
+ "imsi-range-to": 208930100007488,
"name": "aiab-imsis"
}
],
diff --git a/roc-5g-models-v3.json.license b/aether-1.5/roc-5g-models-v3.json.license
similarity index 100%
rename from roc-5g-models-v3.json.license
rename to aether-1.5/roc-5g-models-v3.json.license
diff --git a/roc-values-v3.yaml b/aether-1.5/roc-values.yaml
similarity index 100%
rename from roc-values-v3.yaml
rename to aether-1.5/roc-values.yaml
diff --git a/4g-core-values-1.5.yaml b/aether-1.6/4g-core-values.yaml
similarity index 70%
copy from 4g-core-values-1.5.yaml
copy to aether-1.6/4g-core-values.yaml
index 0d0113e..1f21c1b 100644
--- a/4g-core-values-1.5.yaml
+++ b/aether-1.6/4g-core-values.yaml
@@ -13,7 +13,7 @@
config:
managedByConfigPod:
enabled: true
- # syncUrl: http://sdcore-adapter-v3.aether-roc.svc:8080/synchronize
+ # syncUrl: http://sdcore-adapter-v4.aether-roc.svc:8080/synchronize
config4g:
deploy: true
hss:
@@ -40,8 +40,8 @@
addr: config4g
port: 5000
subscribers:
- - ueId-start: 208014567891201
- ueId-end: 208014567891211
+ - ueId-start: 208010167891201
+ ueId-end: 208010167891211
plmnId: 20801
opc: "d4416644f6154936193433dd20a0ace0"
op: ""
@@ -50,14 +50,24 @@
device-groups:
- name: "4g-oaisim-user"
imsis:
- - "208014567891201"
- - "208014567891202"
+ - "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"
@@ -66,21 +76,11 @@
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
+ application-filtering-rules:
+ - rule-name: "ALLOW-ALL"
+ priority: 250
+ action: "permit"
+ endpoint: "0.0.0.0/0"
site-info:
gNodeBs:
- name: "aiab-gnb1"
diff --git a/5g-core-values-1.5.yaml b/aether-1.6/5g-core-values.yaml
similarity index 67%
copy from 5g-core-values-1.5.yaml
copy to aether-1.6/5g-core-values.yaml
index 9c9dadf..69117a2 100644
--- a/5g-core-values-1.5.yaml
+++ b/aether-1.6/5g-core-values.yaml
@@ -11,7 +11,7 @@
config:
managedByConfigPod:
enabled: true
- # syncUrl: http://sdcore-adapter-v3.aether-roc.svc:8080/synchronize
+ # syncUrl: http://sdcore-adapter-v4.aether-roc.svc:8080/synchronize
smf:
cfgFiles:
# https://github.com/free5gc/free5gc/blob/main/config/pcfcfg.yaml
@@ -48,8 +48,8 @@
addr: webui
port: 5000
subscribers:
- - ueId-start: 2089300007487
- ueId-end: 2089300007501
+ - ueId-start: 208930100007487
+ ueId-end: 208930100007501
plmnId: 20893
opc: "981d464c7c52eb6e5036234984ad0bcf"
op: ""
@@ -58,27 +58,37 @@
device-groups:
- name: "5g-gnbsim-user"
imsis:
- - "2089300007487"
- - "2089300007488"
- - "2089300007489"
- - "2089300007490"
- - "2089300007491"
- - "2089300007492"
- - "2089300007493"
- - "2089300007494"
- - "2089300007495"
- - "2089300007496"
- - "2089300007497"
- - "2089300007498"
- - "2089300007499"
- - "2089300007500"
- - "2089300007501"
+ - "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"
@@ -87,21 +97,11 @@
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
+ application-filtering-rules:
+ - rule-name: "ALLOW-ALL"
+ priority: 250
+ action: "permit"
+ endpoint: "0.0.0.0/0"
site-info:
gNodeBs:
- name: "aiab-gnb1"
diff --git a/roc-4g-models-v4.json b/aether-1.6/roc-4g-models-v4.json
similarity index 100%
rename from roc-4g-models-v4.json
rename to aether-1.6/roc-4g-models-v4.json
diff --git a/roc-4g-models-v4.json.license b/aether-1.6/roc-4g-models-v4.json.license
similarity index 100%
rename from roc-4g-models-v4.json.license
rename to aether-1.6/roc-4g-models-v4.json.license
diff --git a/roc-5g-models-v4.json b/aether-1.6/roc-5g-models-v4.json
similarity index 100%
rename from roc-5g-models-v4.json
rename to aether-1.6/roc-5g-models-v4.json
diff --git a/roc-5g-models-v4.json.license b/aether-1.6/roc-5g-models-v4.json.license
similarity index 100%
rename from roc-5g-models-v4.json.license
rename to aether-1.6/roc-5g-models-v4.json.license
diff --git a/roc-values-v4.yaml b/aether-1.6/roc-values.yaml
similarity index 100%
copy from roc-values-v4.yaml
copy to aether-1.6/roc-values.yaml
diff --git a/configs/latest b/configs/latest
index 805b58c..aa06112 100644
--- a/configs/latest
+++ b/configs/latest
@@ -9,7 +9,7 @@
5G_RAN_SIM_CHART := aether/5g-ran-sim
# For installing the ROC
-AETHER_ROC_UMBRELLA_CHART := aether/aether-roc-umbrella --version 1.4.64 # last release compatible with v4 models
+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 --version 0.4.14 # 0.5.x uses different way of loading models
diff --git a/configs/release-1.5 b/configs/release-1.5
index cdf945e..3fdb139 100644
--- a/configs/release-1.5
+++ b/configs/release-1.5
@@ -15,8 +15,8 @@
ONOS_OPERATOR_CHART := onosproject/onos-operator --version 0.4.10
# Config files to use
-ROC_VALUES := $(MAKEDIR)/roc-values-v3.yaml
-ROC_4G_MODELS := $(MAKEDIR)/roc-4g-models-v3.json
-ROC_5G_MODELS := $(MAKEDIR)/roc-5g-models-v3.json
-4G_CORE_VALUES := $(MAKEDIR)/4g-core-values-1.5.yaml
-5G_CORE_VALUES := $(MAKEDIR)/5g-core-values-1.5.yaml
+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 025669d..fac95fd 100644
--- a/configs/release-1.6
+++ b/configs/release-1.6
@@ -13,3 +13,10 @@
ATOMIX_CONTROLLER_CHART := atomix/atomix-controller --version 0.6.8
ATOMIX_RAFT_STORAGE_CHART := atomix/atomix-raft-storage --version 0.1.15
ONOS_OPERATOR_CHART := onosproject/onos-operator --version 0.4.14
+
+# Config files to use
+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
diff --git a/roc-4g-models.json b/roc-4g-models.json
new file mode 100644
index 0000000..2e99551
--- /dev/null
+++ b/roc-4g-models.json
@@ -0,0 +1,211 @@
+{
+ "default-target": "connectivity-service-v2",
+ "Updates": {
+ "connectivity-services-2.0.0": {
+ "connectivity-service": [
+ {
+ "core-5g-endpoint": "http://config4g.omec.svc:5000/config",
+ "description": "4G Integration Test",
+ "display-name": "ROC 4G Test Connectivity Service",
+ "connectivity-service-id": "aiab-cs"
+ }
+ ]
+ },
+ "enterprises-2.0.0": {
+ "enterprise": [
+ {
+ "description": "This Enterprise holds discovered IMSIs that cannot be associated elsewhere.",
+ "display-name": "Default Enterprise",
+ "enterprise-id": "defaultent",
+ "site": [
+ {
+ "description": "Global Default Site",
+ "display-name": "Global Default Site",
+ "site-id": "defaultent-defaultsite",
+ "imsi-definition": {
+ "mcc": "000",
+ "mnc": "00",
+ "enterprise": 0,
+ "format": "SSSSSSSSSSSSSSS"
+ },
+ "device-group": [
+ {
+ "display-name": "Unknown Inventory",
+ "device-group-id": "defaultent-defaultsite-default",
+ "mbr": {
+ "uplink": 1000000,
+ "downlink": 1000000
+ },
+ "traffic-class": "class-1",
+ "ip-domain": "defaultent-defaultip"
+ }
+ ],
+ "ip-domain": [
+ {
+ "admin-status": "ENABLE",
+ "description": "Global Default IP Domain",
+ "display-name": "Global Default IP Domain",
+ "dns-primary": "8.8.8.1",
+ "dns-secondary": "8.8.8.2",
+ "dnn": "dnnglobal",
+ "ip-domain-id": "defaultent-defaultip",
+ "mtu": 57600,
+ "subnet": "192.168.0.0/24"
+ }
+ ]
+ }
+ ],
+ "traffic-class": [
+ {
+ "traffic-class-id": "class-1",
+ "description": "High Priority TC",
+ "display-name": "Class 1",
+ "qci": 10,
+ "arp": 1,
+ "pelr": 10,
+ "pdb": 100
+ }
+ ]
+ },
+ {
+ "connectivity-service": [
+ {
+ "connectivity-service": "aiab-cs",
+ "enabled": true
+ }
+ ],
+ "description": "AiaB Enterprise",
+ "display-name": "AiaB Corp.",
+ "enterprise-id": "aiab-enterprise",
+ "application": [],
+ "site": [
+ {
+ "description": "AiaB test site",
+ "display-name": "AiaB site",
+ "site-id": "aiab-site",
+ "imsi-definition": {
+ "mcc": "208",
+ "mnc": "01",
+ "enterprise": 1,
+ "format": "CCCNNEESSSSSSSS"
+ },
+ "device": [
+ {
+ "device-id": "aiab-ue-1",
+ "display-name": "UE 1",
+ "sim-card": "aiab-sim-1"
+ },
+ {
+ "device-id": "aiab-ue-2",
+ "display-name": "UE 2",
+ "sim-card": "aiab-sim-2"
+ }
+ ],
+ "sim-card": [
+ {
+ "sim-id": "aiab-sim-1",
+ "display-name": "UE 1 Sim",
+ "imsi": 67891201
+ },
+ {
+ "sim-id": "aiab-sim-2",
+ "display-name": "UE 2 Sim",
+ "imsi": 67891202
+ }
+ ],
+ "device-group": [
+ {
+ "display-name": "AiaB Users",
+ "device-group-id": "aiab-device-group",
+ "device": [
+ {
+ "device-id": "aiab-ue-1",
+ "enable": true
+ },
+ {
+ "device-id": "aiab-ue-2",
+ "enable": true
+ }
+ ],
+ "ip-domain": "aiab-ip-pool",
+ "mbr": {
+ "uplink": 1000000,
+ "downlink": 1000000
+ },
+ "traffic-class": "aiab-class-1"
+ }
+ ],
+ "ip-domain": [
+ {
+ "admin-status": "ENABLE",
+ "display-name": "IP pool",
+ "dnn": "internet",
+ "dns-primary": "8.8.8.8",
+ "ip-domain-id": "aiab-ip-pool",
+ "mtu": 1460,
+ "subnet": "172.250.0.0/16"
+ }
+ ],
+ "small-cell": [
+ {
+ "small-cell-id": "gnb1",
+ "display-name": "gNodeB 1",
+ "address": "aiab-gnb1",
+ "enable": true,
+ "tac": "0001"
+ }
+ ],
+ "upf": [
+ {
+ "address": "upf",
+ "display-name": "AiaB UPF",
+ "upf-id": "aiab-upf",
+ "port": 8805,
+ "config-endpoint": "http://upf-http.omec.svc:8080"
+ }
+ ],
+ "slice": [
+ {
+ "default-behavior": "ALLOW-ALL",
+ "display-name": "AiaB Slice",
+ "device-group": [
+ {
+ "device-group": "aiab-device-group",
+ "enable": true
+ }
+ ],
+ "filter": [],
+ "slice-id": "aiab-vcs",
+ "sd": 66051,
+ "sst": 1,
+ "upf": "aiab-upf",
+ "mbr": {
+ "uplink": 10000000,
+ "downlink": 5000000
+ },
+ "priority-traffic-rule": []
+ }
+ ]
+ }
+ ],
+ "traffic-class": [
+ {
+ "description": "High Priority TC",
+ "display-name": "Class 1",
+ "traffic-class-id": "aiab-class-1",
+ "pdb": 100,
+ "arp": 1,
+ "pelr": 3,
+ "qci": 1
+ }
+ ]
+ }
+ ]
+ }
+ },
+ "Deletes": {},
+ "Extensions": {
+ "model-version-101": "2.0.0",
+ "model-type-102": "Aether"
+ }
+}
diff --git a/roc-4g-models-v3.json.license b/roc-4g-models.json.license
similarity index 100%
rename from roc-4g-models-v3.json.license
rename to roc-4g-models.json.license
diff --git a/roc-5g-models.json b/roc-5g-models.json
new file mode 100644
index 0000000..a9c80b7
--- /dev/null
+++ b/roc-5g-models.json
@@ -0,0 +1,392 @@
+{
+ "default-target": "connectivity-service-v2",
+ "Updates": {
+ "connectivity-services-2.0.0": {
+ "connectivity-service": [
+ {
+ "core-5g-endpoint": "http://webui.omec.svc:5000/config",
+ "description": "5G Integration Test",
+ "display-name": "ROC 5G Test Connectivity Service",
+ "connectivity-service-id": "aiab-cs"
+ }
+ ]
+ },
+ "enterprises-2.0.0": {
+ "enterprise": [
+ {
+ "description": "This Enterprise holds discovered IMSIs that cannot be associated elsewhere.",
+ "display-name": "Default Enterprise",
+ "enterprise-id": "defaultent",
+ "site": [
+ {
+ "description": "Global Default Site",
+ "display-name": "Global Default Site",
+ "site-id": "defaultent-defaultsite",
+ "imsi-definition": {
+ "mcc": "000",
+ "mnc": "00",
+ "enterprise": 0,
+ "format": "SSSSSSSSSSSSSSS"
+ },
+ "device-group": [
+ {
+ "display-name": "Unknown Inventory",
+ "device-group-id": "defaultent-defaultsite-default",
+ "mbr": {
+ "uplink": 1000000,
+ "downlink": 1000000
+ },
+ "traffic-class": "class-1",
+ "ip-domain": "defaultent-defaultip"
+ }
+ ],
+ "ip-domain": [
+ {
+ "admin-status": "ENABLE",
+ "description": "Global Default IP Domain",
+ "display-name": "Global Default IP Domain",
+ "dns-primary": "8.8.8.1",
+ "dns-secondary": "8.8.8.2",
+ "dnn": "dnnglobal",
+ "ip-domain-id": "defaultent-defaultip",
+ "mtu": 57600,
+ "subnet": "192.168.0.0/24"
+ }
+ ]
+ }
+ ],
+ "traffic-class": [
+ {
+ "traffic-class-id": "class-1",
+ "description": "High Priority TC",
+ "display-name": "Class 1",
+ "qci": 10,
+ "arp": 1,
+ "pelr": 10,
+ "pdb": 100
+ }
+ ]
+ },
+ {
+ "connectivity-service": [
+ {
+ "connectivity-service": "aiab-cs",
+ "enabled": true
+ }
+ ],
+ "description": "AiaB Enterprise",
+ "display-name": "AiaB Corp.",
+ "enterprise-id": "aiab-enterprise",
+ "application": [],
+ "site": [
+ {
+ "description": "AiaB test site",
+ "display-name": "AiaB site",
+ "site-id": "aiab-site",
+ "imsi-definition": {
+ "mcc": "208",
+ "mnc": "93",
+ "enterprise": 1,
+ "format": "CCCNNEESSSSSSSS"
+ },
+ "device": [
+ {
+ "device-id": "aiab-ue-1",
+ "display-name": "UE 1",
+ "sim-card": "aiab-sim-1"
+ },
+ {
+ "device-id": "aiab-ue-2",
+ "display-name": "UE 2",
+ "sim-card": "aiab-sim-2"
+ },
+ {
+ "device-id": "aiab-ue-3",
+ "display-name": "UE 3",
+ "sim-card": "aiab-sim-3"
+ },
+ {
+ "device-id": "aiab-ue-4",
+ "display-name": "UE 4",
+ "sim-card": "aiab-sim-4"
+ },
+ {
+ "device-id": "aiab-ue-5",
+ "display-name": "UE 5",
+ "sim-card": "aiab-sim-5"
+ },
+ {
+ "device-id": "aiab-ue-6",
+ "display-name": "UE 6",
+ "sim-card": "aiab-sim-6"
+ },
+ {
+ "device-id": "aiab-ue-7",
+ "display-name": "UE 7",
+ "sim-card": "aiab-sim-7"
+ },
+ {
+ "device-id": "aiab-ue-8",
+ "display-name": "UE 8",
+ "sim-card": "aiab-sim-8"
+ },
+ {
+ "device-id": "aiab-ue-9",
+ "display-name": "UE 9",
+ "sim-card": "aiab-sim-9"
+ },
+ {
+ "device-id": "aiab-ue-10",
+ "display-name": "UE 10",
+ "sim-card": "aiab-sim-10"
+ },
+ {
+ "device-id": "aiab-ue-11",
+ "display-name": "UE 11",
+ "sim-card": "aiab-sim-11"
+ },
+ {
+ "device-id": "aiab-ue-12",
+ "display-name": "UE 12",
+ "sim-card": "aiab-sim-12"
+ },
+ {
+ "device-id": "aiab-ue-13",
+ "display-name": "UE 13",
+ "sim-card": "aiab-sim-13"
+ },
+ {
+ "device-id": "aiab-ue-14",
+ "display-name": "UE 14",
+ "sim-card": "aiab-sim-14"
+ },
+ {
+ "device-id": "aiab-ue-15",
+ "display-name": "UE 15",
+ "sim-card": "aiab-sim-15"
+ }
+ ],
+ "sim-card": [
+ {
+ "sim-id": "aiab-sim-1",
+ "display-name": "UE 1 Sim",
+ "imsi": 7487
+ },
+ {
+ "sim-id": "aiab-sim-2",
+ "display-name": "UE 2 Sim",
+ "imsi": 7488
+ },
+ {
+ "sim-id": "aiab-sim-3",
+ "display-name": "UE 3 Sim",
+ "imsi": 7489
+ },
+ {
+ "sim-id": "aiab-sim-4",
+ "display-name": "UE 4 Sim",
+ "imsi": 7490
+ },
+ {
+ "sim-id": "aiab-sim-5",
+ "display-name": "UE 5 Sim",
+ "imsi": 7491
+ },
+ {
+ "sim-id": "aiab-sim-6",
+ "display-name": "UE 6 Sim",
+ "imsi": 7492
+ },
+ {
+ "sim-id": "aiab-sim-7",
+ "display-name": "UE 7 Sim",
+ "imsi": 7493
+ },
+ {
+ "sim-id": "aiab-sim-8",
+ "display-name": "UE 8 Sim",
+ "imsi": 7494
+ }, {
+ "sim-id": "aiab-sim-9",
+ "display-name": "UE 9 Sim",
+ "imsi": 7495
+ },
+ {
+ "sim-id": "aiab-sim-10",
+ "display-name": "UE 10 Sim",
+ "imsi": 7496
+ },
+ {
+ "sim-id": "aiab-sim-11",
+ "display-name": "UE 11 Sim",
+ "imsi": 7497
+ },
+ {
+ "sim-id": "aiab-sim-12",
+ "display-name": "UE 12 Sim",
+ "imsi": 7498
+ },
+ {
+ "sim-id": "aiab-sim-13",
+ "display-name": "UE 13 Sim",
+ "imsi": 7499
+ },
+ {
+ "sim-id": "aiab-sim-14",
+ "display-name": "UE 14 Sim",
+ "imsi": 7500
+ },
+ {
+ "sim-id": "aiab-sim-15",
+ "display-name": "UE 15 Sim",
+ "imsi": 7501
+ }
+ ],
+ "device-group": [
+ {
+ "display-name": "AiaB Users",
+ "device-group-id": "aiab-device-group",
+ "device": [
+ {
+ "device-id": "aiab-ue-1",
+ "enable": true
+ },
+ {
+ "device-id": "aiab-ue-2",
+ "enable": true
+ },
+ {
+ "device-id": "aiab-ue-3",
+ "enable": true
+ },
+ {
+ "device-id": "aiab-ue-4",
+ "enable": true
+ },
+ {
+ "device-id": "aiab-ue-5",
+ "enable": true
+ },
+ {
+ "device-id": "aiab-ue-6",
+ "enable": true
+ },
+ {
+ "device-id": "aiab-ue-7",
+ "enable": true
+ },
+ {
+ "device-id": "aiab-ue-8",
+ "enable": true
+ },
+ {
+ "device-id": "aiab-ue-9",
+ "enable": true
+ },
+ {
+ "device-id": "aiab-ue-10",
+ "enable": true
+ },
+ {
+ "device-id": "aiab-ue-11",
+ "enable": true
+ },
+ {
+ "device-id": "aiab-ue-12",
+ "enable": true
+ },
+ {
+ "device-id": "aiab-ue-13",
+ "enable": true
+ },
+ {
+ "device-id": "aiab-ue-14",
+ "enable": true
+ },
+ {
+ "device-id": "aiab-ue-15",
+ "enable": true
+ }
+ ],
+ "ip-domain": "aiab-ip-pool",
+ "mbr": {
+ "uplink": 1000000,
+ "downlink": 1000000
+ },
+ "traffic-class": "aiab-class-1"
+ }
+ ],
+ "ip-domain": [
+ {
+ "admin-status": "ENABLE",
+ "display-name": "IP pool",
+ "dnn": "internet",
+ "dns-primary": "8.8.8.8",
+ "ip-domain-id": "aiab-ip-pool",
+ "mtu": 1460,
+ "subnet": "172.250.0.0/16"
+ }
+ ],
+ "small-cell": [
+ {
+ "small-cell-id": "gnb1",
+ "display-name": "gNodeB 1",
+ "address": "aiab-gnb1",
+ "enable": true,
+ "tac": "0001"
+ }
+ ],
+ "upf": [
+ {
+ "address": "upf",
+ "display-name": "AiaB UPF",
+ "upf-id": "aiab-upf",
+ "port": 8805,
+ "config-endpoint": "http://upf-http.omec.svc:8080"
+ }
+ ],
+ "slice": [
+ {
+ "default-behavior": "ALLOW-ALL",
+ "display-name": "AiaB Slice",
+ "device-group": [
+ {
+ "device-group": "aiab-device-group",
+ "enable": true
+ }
+ ],
+ "filter": [],
+ "slice-id": "aiab-vcs",
+ "sd": 66051,
+ "sst": 1,
+ "upf": "aiab-upf",
+ "mbr": {
+ "uplink": 10000000,
+ "downlink": 5000000
+ },
+ "priority-traffic-rule": []
+ }
+ ]
+ }
+ ],
+ "traffic-class": [
+ {
+ "description": "High Priority TC",
+ "display-name": "Class 1",
+ "traffic-class-id": "aiab-class-1",
+ "pdb": 100,
+ "arp": 1,
+ "pelr": 3,
+ "qci": 1
+ }
+ ]
+ }
+ ]
+ }
+ },
+ "Deletes": {},
+ "Extensions": {
+ "model-version-101": "2.0.0",
+ "model-type-102": "Aether"
+ }
+}
diff --git a/roc-4g-models-v3.json.license b/roc-5g-models.json.license
similarity index 100%
copy from roc-4g-models-v3.json.license
copy to roc-5g-models.json.license
diff --git a/roc-values-v4.yaml b/roc-values.yaml
similarity index 100%
rename from roc-values-v4.yaml
rename to roc-values.yaml