AETHER-3077 Add support for 2.0 ROC models, refactoring
Change-Id: I39807ca14c757cfcf8bef0a5d48d8451d8727f89
diff --git a/aether-1.5/roc-4g-models-v3.json b/aether-1.5/roc-4g-models-v3.json
new file mode 100644
index 0000000..ab5bfb5
--- /dev/null
+++ b/aether-1.5/roc-4g-models-v3.json
@@ -0,0 +1,185 @@
+{
+ "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"
+ }
+}