roc-umbrella: releasing 2.1.15 for updated onos-config 0.10.33 get targets rbac
Change-Id: Iffd44a6bfe60a67ad0ac95aeb7d0dfefd7951904
diff --git a/Makefile b/Makefile
index 1261c5b..5703560 100644
--- a/Makefile
+++ b/Makefile
@@ -14,14 +14,12 @@
@cd aether-roc-umbrella/files/opa-rbac && for test_file in test/*; do \
trimmed=`basename $$test_file .json`;\
case "$$trimmed" in \
- *2.0.0*) docker run -v $$(pwd):/opa-rbac openpolicyagent/opa:0.29.4 eval -f pretty -b /opa-rbac \
+ *2.0.0*) docker run --platform linux/amd64 -v $$(pwd):/opa-rbac openpolicyagent/opa:0.40.0 eval -f pretty -b /opa-rbac \
--input opa-rbac/test/$$trimmed.json data.aether_2_0_x.allowed > /tmp/$$trimmed.out;;\
- *3.0.0*) docker run -v $$(pwd):/opa-rbac openpolicyagent/opa:0.29.4 eval -f pretty -b /opa-rbac \
- --input opa-rbac/test/$$trimmed.json data.aether_3_0_0.allowed > /tmp/$$trimmed.out;;\
- *4.0.0*) docker run -v $$(pwd):/opa-rbac openpolicyagent/opa:0.29.4 eval -f pretty -b /opa-rbac \
- --input opa-rbac/test/$$trimmed.json data.aether_4_0_18.allowed > /tmp/$$trimmed.out;;\
+ *2.1.0*) docker run --platform linux/amd64 -v $$(pwd):/opa-rbac openpolicyagent/opa:0.40.0 eval -f pretty -b /opa-rbac \
+ --input opa-rbac/test/$$trimmed.json data.aether_2_1_x.allowed > /tmp/$$trimmed.out;;\
*) continue;;esac;\
- cmp -s /tmp/$$trimmed.out test/out/$$trimmed.out \
+ cmp -b /tmp/$$trimmed.out test/out/$$trimmed.out \
&& echo "[TEST] $$trimmed.json : PASS"|| echo "[TEST] $$trimmed.json : FAIL";\
done;
diff --git a/aether-roc-umbrella/Chart.yaml b/aether-roc-umbrella/Chart.yaml
index 8349ca4..60ddb52 100644
--- a/aether-roc-umbrella/Chart.yaml
+++ b/aether-roc-umbrella/Chart.yaml
@@ -7,7 +7,7 @@
description: Aether ROC Umbrella chart to deploy all Aether ROC
kubeVersion: ">=1.18.0"
type: application
-version: 2.1.14
+version: 2.1.15
appVersion: v0.0.0
keywords:
- aether
@@ -24,7 +24,7 @@
- name: onos-config
condition: import.onos-config.enabled
repository: https://charts.onosproject.org
- version: 1.7.6
+ version: 1.7.7
- name: onos-cli
condition: import.onos-cli.enabled
repository: https://charts.onosproject.org
diff --git a/aether-roc-umbrella/files/opa-rbac/test/aether-3.0.0-example-basic.json b/aether-roc-umbrella/files/opa-rbac/test/aether-3.0.0-example-basic.json
deleted file mode 100644
index 7acd0cf..0000000
--- a/aether-roc-umbrella/files/opa-rbac/test/aether-3.0.0-example-basic.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
- "groups": [
- "mixedGroup",
- "AetherROCAdmin"
- ],
- "template": {
- "template": [
- {
- "description": "do",
- "display-name": "laborum fugiat",
- "downlink": 322694552,
- "id": "aliquip",
- "sd": 14628949,
- "sst": 1,
- "uplink": 1607714163
- },
- {
- "description": "do",
- "display-name": "quattro fugiat",
- "downlink": 322694552,
- "id": "quattro",
- "sd": 14628949,
- "sst": 1,
- "uplink": 1607714163
- }
- ]
- }
-}
diff --git a/aether-roc-umbrella/files/opa-rbac/test/aether-3.0.0-example-get.json b/aether-roc-umbrella/files/opa-rbac/test/aether-3.0.0-example-get.json
deleted file mode 100644
index 5341f75..0000000
--- a/aether-roc-umbrella/files/opa-rbac/test/aether-3.0.0-example-get.json
+++ /dev/null
@@ -1,494 +0,0 @@
-{
- "groups": [
- "mixedGroup",
- "acme"
- ],
- "ap_list": {
- "ap_list": [
- {
- "access_points": [
- {
- "address": "ap1^seattle^starbucks^com",
- "enable": true,
- "tac": 654
- },
- {
- "address": "ap2^seattle^starbucks^com",
- "enable": true,
- "tac": 87475
- }
- ],
- "description": "Seattle APs",
- "display_name": "Seattle",
- "enterprise": "starbucks",
- "id": "starbucks_seattle_aps"
- },
- {
- "access_points": [
- {
- "address": "ap2^newyork^starbucks^com",
- "enable": true,
- "tac": 8002
- }
- ],
- "description": "New York APs",
- "display_name": "New York",
- "enterprise": "starbucks",
- "id": "starbucks_newyork_aps"
- },
- {
- "access_points": [
- {
- "address": "ap2^chicago^acme^com",
- "enable": true,
- "tac": 8002
- }
- ],
- "description": "Chicago APs",
- "display_name": "Chicago",
- "enterprise": "acme",
- "id": "acme_chicago_aps"
- }
- ]
- },
- "application": {
- "application": [
- {
- "description": "Network Video Recorder",
- "display_name": "NVR",
- "enterprise": "starbucks",
- "endpoint": [
- {
- "address": "nvr.starbucks.com",
- "name": "rtsp",
- "port_end": 3316,
- "port_start": 3330,
- "protocol": "UDP"
- }
- ],
- "id": "starbucks_nvr"
- },
- {
- "description": "Fidelio POS",
- "display_name": "Fidelio",
- "enterprise": "starbucks",
- "endpoint": [
- {
- "address": "fidelio.starbucks.com",
- "name": "fidelio",
- "port_end": 7585,
- "port_start": 7588,
- "protocol": "TCP"
- }
- ],
- "id": "starbucks_fidelio"
- },
- {
- "description": "Data Acquisition",
- "display_name": "DA",
- "enterprise": "acme",
- "endpoint": [
- {
- "address": "da.acme.com",
- "name": "da",
- "port_end": 7585,
- "port_start": 7588,
- "protocol": "TCP"
- }
- ],
- "id": "acme_dataacquisition"
- }
- ]
- },
- "connectivity_service": {
- "connectivity_service": [
- {
- "core_5g_endpoint": "http://aether_roc_umbrella_sdcore_test_dummy/v1/config/5g",
- "description": "5G Test",
- "display_name": "ROC 5G Test Connectivity Service",
- "id": "cs5gtest"
- },
- {
- "description": "ROC 4G Test Connectivity Service",
- "display_name": "4G Test",
- "hss_endpoint": "http://aether_roc_umbrella_sdcore_test_dummy/v1/config/imsis",
- "id": "cs4gtest",
- "pcrf_endpoint": "http://aether_roc_umbrella_sdcore_test_dummy/v1/config/policies",
- "spgwc_endpoint": "http://aether_roc_umbrella_sdcore_test_dummy/v1/config"
- }
- ]
- },
- "device_group": {
- "device_group": [
- {
- "display_name": "Seattle Cameras",
- "id": "starbucks_seattle_cameras",
- "imsis": [
- {
- "imsi_range_from": 170029313275000,
- "imsi_range_to": 170029313275003,
- "name": "counters"
- },
- {
- "imsi_range_from": 170029313275010,
- "imsi_range_to": 170029313275014,
- "name": "store"
- }
- ],
- "ip_domain": "starbucks_seattle",
- "site": "starbucks_seattle"
- },
- {
- "display_name": "Seattle POS",
- "id": "starbucks_seattle_pos",
- "imsis": [
- {
- "imsi_range_from": 170029313275020,
- "imsi_range_to": 170029313275022,
- "name": "tills"
- },
- {
- "imsi_range_from": 170029313275030,
- "imsi_range_to": 170029313275034,
- "name": "store"
- }
- ],
- "ip_domain": "starbucks_seattle",
- "site": "starbucks_seattle"
- },
- {
- "display_name": "New York Cameras",
- "id": "starbucks_newyork_cameras",
- "imsis": [
- {
- "imsi_range_from": 170029313275040,
- "imsi_range_to": 170029313275041,
- "name": "front"
- },
- {
- "imsi_range_from": 170029313275050,
- "imsi_range_to": 170029313275055,
- "name": "store"
- }
- ],
- "ip_domain": "starbucks_newyork",
- "site": "starbucks_newyork"
- },
- {
- "display_name": "New York POS",
- "id": "starbucks_newyork_pos",
- "imsis": [
- {
- "imsi_range_from": 170029313275060,
- "imsi_range_to": 170029313275061,
- "name": "tills"
- },
- {
- "imsi_range_from": 170029313275070,
- "imsi_range_to": 170029313275073,
- "name": "store"
- }
- ],
- "ip_domain": "starbucks_newyork",
- "site": "starbucks_newyork"
- },
- {
- "display_name": "ACME Robots",
- "id": "acme_chicago_robots",
- "imsis": [
- {
- "imsi_range_from": 13698808332993000,
- "imsi_range_to": 13698808332993003,
- "name": "production"
- },
- {
- "imsi_range_from": 13698808332993010,
- "imsi_range_to": 13698808332993012,
- "name": "warehouse"
- }
- ],
- "ip_domain": "acme_chicago",
- "site": "acme_chicago"
- }
- ]
- },
- "enterprise": {
- "enterprise": [
- {
- "connectivity_service": [
- {
- "connectivity_service": "cs5gtest",
- "enabled": true
- }
- ],
- "description": "ACME Corporation",
- "display_name": "ACME Corp",
- "id": "acme"
- },
- {
- "connectivity_service": [
- {
- "connectivity_service": "cs5gtest",
- "enabled": true
- },
- {
- "connectivity_service": "cs4gtest",
- "enabled": false
- }
- ],
- "description": "Starbucks Corporation",
- "display_name": "Starbucks Inc.",
- "id": "starbucks"
- }
- ]
- },
- "ip_domain": {
- "ip_domain": [
- {
- "admin_status": "ENABLE",
- "description": "New York IP Domain",
- "display_name": "New York",
- "dns_primary": "8.8.8.1",
- "dns_secondary": "8.8.8.2",
- "id": "starbucks_newyork",
- "mtu": 57600,
- "subnet": "254.186.117.251/31"
- },
- {
- "admin_status": "ENABLE",
- "description": "Seattle IP Domain",
- "display_name": "Seattle",
- "dns_primary": "8.8.8.3",
- "dns_secondary": "8.8.8.3",
- "id": "starbucks_seattle",
- "mtu": 12690,
- "subnet": "196.5.91.0/31"
- },
- {
- "admin_status": "DISABLE",
- "description": "Chicago IP Domain",
- "display_name": "Chicago",
- "dns_primary": "8.8.8.4",
- "dns_secondary": "8.8.8.4",
- "id": "acme_chicago",
- "mtu": 12690,
- "subnet": "163.25.44.0/31"
- }
- ]
- },
- "network": {
- "network": [
- {
- "description": "New York 21_32",
- "display_name": "New York",
- "id": "starbucks_newyork",
- "enterprise": "starbucks",
- "mcc": 21,
- "mnc": 32
- },
- {
- "description": "Seattle 265_122",
- "display_name": "Seattle",
- "id": "starbucks_seattle",
- "enterprise": "starbucks",
- "mcc": 265,
- "mnc": 122
- },
- {
- "description": "Chicago 123_456",
- "display_name": "Chicago",
- "id": "acme_chicago",
- "enterprise": "acme",
- "mcc": 123,
- "mnc": 456
- }
- ]
- },
- "site": {
- "site": [
- {
- "description": "ACME HQ",
- "display_name": "Chicago",
- "enterprise": "acme",
- "id": "acme_chicago",
- "network": "acme_chicago"
- },
- {
- "description": "Starbucks Corp HQ",
- "display_name": "Seattle",
- "enterprise": "starbucks",
- "id": "starbucks_seattle",
- "network": "starbucks_seattle"
- },
- {
- "description": "Starbucks New York",
- "display_name": "New York",
- "enterprise": "starbucks",
- "id": "starbucks_newyork",
- "network": "starbucks_newyork"
- }
- ]
- },
- "template": {
- "template": [
- {
- "description": "VCS Template 1",
- "display_name": "Template 1",
- "downlink": 24669539,
- "id": "template_1",
- "sd": 10886763,
- "sst": 158,
- "traffic_class": "class_1",
- "uplink": 23770218
- },
- {
- "description": "VCS Template 2",
- "display_name": "Template 2",
- "downlink": 2791589,
- "id": "template_2",
- "sd": 16619900,
- "sst": 157,
- "traffic_class": "class_2",
- "uplink": 24721051
- }
- ]
- },
- "traffic_class": {
- "traffic_class": [
- {
- "description": "High Priority TC",
- "display_name": "Class 1",
- "id": "class_1",
- "pdb": 577,
- "pelr": 3,
- "qci": 10
- },
- {
- "description": "Medium Priority TC",
- "display_name": "Class 2",
- "id": "class_2",
- "pdb": 831,
- "pelr": 4,
- "qci": 20
- },
- {
- "description": "Low Priority TC",
- "display_name": "Class 3",
- "id": "class_3",
- "pdb": 833,
- "pelr": 4,
- "qci": 30
- }
- ]
- },
- "upf": {
- "upf": [
- {
- "address": "seattle.cameras_upf.starbucks.com",
- "description": "Seattle Cameras UPF",
- "display_name": "Seattle Cameras",
- "id": "starbucks_seattle_cameras",
- "enterprise": "starbucks",
- "port": 9229
- },
- {
- "address": "newyork.cameras_upf.starbucks.com",
- "description": "New York Cameras UPF",
- "display_name": "New York Cameras",
- "id": "starbucks_newyork_cameras",
- "enterprise": "starbucks",
- "port": 6161
- },
- {
- "address": "chicago.robots_upf.acme.com",
- "description": "Chicago Robots UPF",
- "display_name": "Chicago Robots",
- "id": "acme_chicago_robots",
- "enterprise": "acme",
- "port": 6161
- }
- ]
- },
- "vcs": {
- "vcs": [
- {
- "ap": "starbucks_newyork_aps",
- "application": [
- {
- "allow": true,
- "application": "starbucks_nvr"
- }
- ],
- "description": "New York Cameras",
- "device_group": [
- {
- "enable": true,
- "device_group": "starbucks_newyork_cameras"
- }
- ],
- "display_name": "NY Cams",
- "downlink": 948091966,
- "enterprise": "starbucks",
- "id": "starbucks_newyork_cameras",
- "sd": 8284729,
- "sst": 127,
- "template": "template_1",
- "traffic_class": "class_1",
- "upf": "starbucks_newyork_cameras",
- "uplink": 38997335
- },
- {
- "ap": "starbucks_seattle_aps",
- "application": [
- {
- "allow": false,
- "application": "starbucks_nvr"
- }
- ],
- "description": "Seattle Cameras",
- "device_group": [
- {
- "enable": true,
- "device_group": "starbucks_seattle_cameras"
- }
- ],
- "display_name": "Seattle Cams",
- "downlink": 28492626,
- "enterprise": "starbucks",
- "id": "starbucks_seattle_cameras",
- "sd": 2973238,
- "sst": 79,
- "template": "template_2",
- "traffic_class": "class_2",
- "upf": "starbucks_seattle_cameras",
- "uplink": 13227287
- },
- {
- "ap": "acme_chicago_aps",
- "application": [
- {
- "allow": false,
- "application": "acme_dataacquisition"
- }
- ],
- "description": "Chicago Robots",
- "device_group": [
- {
- "enable": true,
- "device_group": "acme_chicago_robots"
- }
- ],
- "display_name": "Chicago Robots VCS",
- "downlink": 28492626,
- "enterprise": "acme",
- "id": "acme_chicago_robots",
- "sd": 2973238,
- "sst": 79,
- "template": "template_2",
- "traffic_class": "class_2",
- "upf": "acme_chicago_robots",
- "uplink": 13227287
- }
- ]
- }
-}
diff --git a/aether-roc-umbrella/files/opa-rbac/test/aether-3.0.0-example-set.json b/aether-roc-umbrella/files/opa-rbac/test/aether-3.0.0-example-set.json
deleted file mode 100644
index 07f5914..0000000
--- a/aether-roc-umbrella/files/opa-rbac/test/aether-3.0.0-example-set.json
+++ /dev/null
@@ -1,362 +0,0 @@
-{
- "groups": [
- "admin",
- "dolor"
- ],
- "updates": {
- "site": {
- "site": [
- {
- "description": "pariatur culpa",
- "display-name": "occaecat nostrud",
- "enterprise": "dolor",
- "id": "newsite",
- "network": "irur"
- }
- ]
- }
- },
- "deletes": {
- "site": {
- "site": [
- {
- "id": "officia"
- }
- ]
- }
- },
- "ap-list": {
- "ap-list": [
- {
- "access-points": [
- {
- "address": "laborum.commodo.incididunt",
- "enable": false,
- "tac": 69373985
- },
- {
- "address": "id.ipsum",
- "enable": false,
- "tac": 87809475
- }
- ],
- "description": "incididunt aliqua ex nulla",
- "display-name": "cupidatat aliquip",
- "id": "deserunt"
- },
- {
- "access-points": [
- {
- "address": "labore.aliqua.dolor.consequat",
- "enable": false,
- "tac": 80083302
- },
- {
- "address": "qui.sed",
- "enable": false,
- "tac": 13929603
- }
- ],
- "description": "cupidatat tempor magna",
- "display-name": "occaecat et deserunt consequat",
- "id": "tempor"
- }
- ]
- },
- "application": {
- "application": [
- {
- "description": "Ut velit est",
- "display-name": "do",
- "endpoint": [
- {
- "address": "mollit.ipsum",
- "name": "esse",
- "port-end": 33167231,
- "port-start": 27761544,
- "protocol": "UDP"
- },
- {
- "address": "cupidatat.reprehend",
- "name": "ullamco",
- "port-end": 19527413,
- "port-start": 28793871,
- "protocol": "UDP"
- }
- ],
- "id": "occaecat"
- },
- {
- "description": "amet ad quis",
- "display-name": "sit ex Ut aliqua",
- "endpoint": [
- {
- "address": "ut.veniam.id.non",
- "name": "consectetur",
- "port-end": 31037585,
- "port-start": 8018682,
- "protocol": "TCP"
- },
- {
- "address": "nulla.consectet",
- "name": "sint",
- "port-end": 25299216,
- "port-start": 6645928,
- "protocol": "TCP"
- }
- ],
- "id": "incididunt"
- }
- ]
- },
- "connectivity-service": {
- "connectivity-service": [
- {
- "core-5g-endpoint": "ut culpa velit",
- "description": "magna in",
- "display-name": "cillum occaecat amet ad adipisicing",
- "hss-endpoint": "eu sed est nisi",
- "id": "repre",
- "pcrf-endpoint": "nostrud eiusmod Ut Lorem",
- "spgwc-endpoint": "eiusmod aute quis"
- },
- {
- "core-5g-endpoint": "voluptate consectetur ut",
- "description": "Ut incididunt ex id labore",
- "display-name": "qui Lorem elit",
- "hss-endpoint": "adipisicing incididunt consequat mollit",
- "id": "irure",
- "pcrf-endpoint": "sit incididunt sunt Duis",
- "spgwc-endpoint": "nisi magna do reprehenderit"
- }
- ]
- },
- "device_group": {
- "device_group": [
- {
- "display-name": "tempor ut",
- "id": "amet",
- "imsis": [
- {
- "imsi-range-from": 170029313275000,
- "imsi-range-to": 69764015096000,
- "name": "enim"
- },
- {
- "imsi-range-from": 116299798497000,
- "imsi-range-to": 22297092854800,
- "name": "ad"
- }
- ],
- "ip-domain": "qui",
- "site": "inc"
- },
- {
- "display-name": "nisi mollit dolore dolor",
- "id": "Lorem",
- "imsis": [
- {
- "imsi-range-from": 13698808332993000,
- "imsi-range-to": 7746018722749000,
- "name": "magna"
- },
- {
- "imsi-range-from": 4087876837971489000,
- "imsi-range-to": 10492416481328000,
- "name": "reprehenderit"
- }
- ],
- "ip-domain": "labore",
- "site": "officia"
- }
- ]
- },
- "enterprise": {
- "enterprise": [
- {
- "connectivity-service": [
- {
- "connectivity-service": "repre",
- "enabled": true
- },
- {
- "connectivity-service": "irure",
- "enabled": true
- }
- ],
- "description": "minim et",
- "display-name": "laborum in",
- "id": "dolor"
- },
- {
- "connectivity-service": [
- {
- "connectivity-service": "irure",
- "enabled": false
- },
- {
- "connectivity-service": "repre",
- "enabled": false
- }
- ],
- "description": "consequat minim magna",
- "display-name": "laboris incididunt dolore",
- "id": "labore"
- }
- ]
- },
- "ip-domain": {
- "ip-domain": [
- {
- "admin-status": "DISABLE",
- "description": "culpa enim exercitation sit consequat",
- "display-name": "dolo",
- "dns-primary": "8.8.8.1",
- "dns-secondary": "8.8.8.2",
- "id": "qui",
- "mtu": 57600,
- "subnet": "254.186.117.251/31"
- },
- {
- "admin-status": "DISABLE",
- "description": "nulla ut",
- "display-name": "adipisicing",
- "dns-primary": "8.8.8.3",
- "dns-secondary": "8.8.8.3",
- "id": "labore",
- "mtu": 12690,
- "subnet": "196.5.91.0/31"
- }
- ]
- },
- "network": {
- "network": [
- {
- "description": "aliquip Lorem dolor",
- "display-name": "minim labore ex",
- "id": "elit",
- "mcc": 21,
- "mnc": 32
- },
- {
- "description": "laborum occaecat ut",
- "display-name": "consequat ea",
- "id": "irur",
- "mcc": 265,
- "mnc": 122
- }
- ]
- },
- "site": {
- "site": [
- {
- "description": "pariatur culpa",
- "display-name": "occaecat nostrud",
- "enterprise": "dolor",
- "id": "inc",
- "network": "irur"
- },
- {
- "description": "in dolor",
- "display-name": "consequat est",
- "enterprise": "labore",
- "id": "officia",
- "network": "elit"
- }
- ]
- },
- "template": {
- "template": [
- {
- "description": "enim ",
- "display-name": "do labore laborum elit",
- "downlink": 24669539,
- "id": "magn",
- "sd": 10886763,
- "sst": 158,
- "traffic-class": "consectetur in cillum",
- "uplink": 23770218
- },
- {
- "description": "aute dolore dolo",
- "display-name": "quis pariatur dolore magna commodo",
- "downlink": 2791589,
- "id": "aliqua",
- "sd": 16619900,
- "sst": 157,
- "traffic-class": "dolor in in et",
- "uplink": 24721051
- }
- ]
- },
- "upf": {
- "upf": [
- {
- "address": "sed.officia.magna.ut",
- "description": "commodo ea ullamco Excepteur cillum",
- "display-name": "in aliqua deserunt Ut",
- "id": "dol",
- "port": 77359229
- },
- {
- "address": "incididunt",
- "description": "veniam",
- "display-name": "in laborum ut",
- "id": "magna",
- "port": 14326161
- }
- ]
- },
- "vcs": {
- "vcs": [
- {
- "ap": "deserunt",
- "application": [
- {
- "allow": true,
- "application": "occaecat"
- },
- {
- "allow": true,
- "application": "incididunt"
- }
- ],
- "description": "deserunt in magna Lorem",
- "device_group": "amet",
- "display-name": "quis e",
- "downlink": 948091966,
- "id": "quad",
- "sd": 8284729,
- "sst": 127,
- "template": "magn",
- "traffic-class": "non ut",
- "upf": "magna",
- "uplink": 38997335
- },
- {
- "ap": "tempor",
- "application": [
- {
- "allow": false,
- "application": "occaecat"
- },
- {
- "allow": false,
- "application": "incididunt"
- }
- ],
- "description": "elit Ut",
- "device-group": "Lorem",
- "display-name": "veniam exercitation ea",
- "downlink": 28492626,
- "id": "mollit",
- "sd": 2973238,
- "sst": 79,
- "template": "aliqua",
- "traffic-class": "eiusmod Ut ullamco laboris ea",
- "upf": "dol",
- "uplink": 13227287
- }
- ]
- }
-}
\ No newline at end of file
diff --git a/aether-roc-umbrella/files/opa-rbac/test/aether-4.0.0-example-get.json b/aether-roc-umbrella/files/opa-rbac/test/aether-4.0.0-example-get.json
deleted file mode 100644
index cc5e3e8..0000000
--- a/aether-roc-umbrella/files/opa-rbac/test/aether-4.0.0-example-get.json
+++ /dev/null
@@ -1,706 +0,0 @@
-{
- "groups": [
- "mixedGroup",
- "acme"
- ],
- "application": {
- "application": [
- {
- "description": "Network Video Recorder",
- "display_name": "NVR",
- "enterprise": "starbucks",
- "address": "nvr.starbucks.com",
- "endpoint": [
- {
- "endpoint_id": "rtsp",
- "display_name": "rtsp port",
- "port_end": 3330,
- "port_start": 3316,
- "protocol": "UDP",
- "mbr": {
- "uplink": 1000000,
- "downlink": 1000000
- },
- "traffic_class": "class_1"
- }
- ],
- "id": "starbucks_nvr"
- },
- {
- "description": "Fidelio POS",
- "display_name": "Fidelio",
- "enterprise": "starbucks",
- "address": "fidelio.starbucks.com",
- "endpoint": [
- {
- "endpoint_id": "fidelio",
- "display_name": "fidelio application",
- "port_end": 7588,
- "port_start": 7585,
- "protocol": "TCP",
- "mbr": {
- "uplink": 2000000,
- "downlink": 2000000
- },
- "traffic_class": "class_1"
- }
- ],
- "id": "starbucks_fidelio"
- },
- {
- "description": "Data Acquisition",
- "display_name": "DA",
- "enterprise": "acme",
- "address": "da.acme.com",
- "endpoint": [
- {
- "endpoint_id": "da",
- "display_name": "data acquisition endpoint",
- "port_end": 7588,
- "port_start": 7585,
- "protocol": "TCP",
- "mbr": {
- "uplink": 2000000,
- "downlink": 1000000
- },
- "traffic_class": "class_2"
- }
- ],
- "id": "acme_dataacquisition"
- }
- ]
- },
- "connectivity_service": {
- "connectivity_service": [
- {
- "core_5g_endpoint": "http://aether_roc_umbrella_sdcore_test_dummy/v1/config/5g",
- "description": "5G Test",
- "display_name": "ROC 5G Test Connectivity Service",
- "acc_prometheus_url": "./prometheus_acc",
- "id": "cs5gtest"
- },
- {
- "description": "ROC 4G Test Connectivity Service",
- "display_name": "4G Test",
- "hss_endpoint": "http://aether_roc_umbrella_sdcore_test_dummy/v1/config/imsis",
- "id": "cs4gtest",
- "pcrf_endpoint": "http://aether_roc_umbrella_sdcore_test_dummy/v1/config/policies",
- "spgwc_endpoint": "http://aether_roc_umbrella_sdcore_test_dummy/v1/config"
- }
- ]
- },
- "device_group": {
- "device_group": [
- {
- "display_name": "Global Default Device Group",
- "id": "defaultent_defaultsite_default",
- "ip_domain": "defaultent_defaultip",
- "site": "defaultent_defaultsite",
- "device": {
- "mbr": {
- "uplink": 1000000,
- "downlink": 1000000
- },
- "traffic_class": "class_1"
- }
- },
- {
- "display_name": "Seattle Default",
- "id": "starbucks_seattle_default",
- "ip_domain": "starbucks_seattle",
- "site": "starbucks_seattle",
- "device": {
- "mbr": {
- "uplink": 1000000,
- "downlink": 1000000
- },
- "traffic_class": "class_1"
- }
- },
- {
- "display_name": "Seattle Cameras",
- "id": "starbucks_seattle_cameras",
- "imsis": [
- {
- "imsi_range_from": 0,
- "imsi_range_to": 3,
- "imsi_id": "counters",
- "display_name": "counter devices"
- },
- {
- "imsi_range_from": 10,
- "imsi_range_to": 14,
- "imsi_id": "store",
- "display_name": "store devices"
- }
- ],
- "ip_domain": "starbucks_seattle",
- "device": {
- "mbr": {
- "uplink": 1000000,
- "downlink": 1000000
- },
- "traffic_class": "class_1"
- },
- "site": "starbucks_seattle"
- },
- {
- "display_name": "Seattle POS",
- "id": "starbucks_seattle_pos",
- "imsis": [
- {
- "imsi_range_from": 20,
- "imsi_range_to": 22,
- "imsi_id": "tills",
- "display_name": "tills"
- },
- {
- "imsi_range_from": 30,
- "imsi_range_to": 34,
- "imsi_id": "store",
- "display_name": "store devices"
- }
- ],
- "ip_domain": "starbucks_seattle",
- "device": {
- "mbr": {
- "uplink": 10000000,
- "downlink": 20000000
- },
- "traffic_class": "class_1"
- },
- "site": "starbucks_seattle"
- },
- {
- "display_name": "New York Default",
- "id": "starbucks_newyork_default",
- "ip_domain": "starbucks_newyork",
- "site": "starbucks_newyork",
- "device": {
- "mbr": {
- "uplink": 1000000,
- "downlink": 1000000
- },
- "traffic_class": "class_1"
- }
- },
- {
- "display_name": "New York Cameras",
- "id": "starbucks_newyork_cameras",
- "imsis": [
- {
- "imsi_range_from": 40,
- "imsi_range_to": 41,
- "imsi_id": "front",
- "display_name": "front cameras"
- },
- {
- "imsi_range_from": 50,
- "imsi_range_to": 55,
- "imsi_id": "store",
- "display_name": "store cameras"
- }
- ],
- "ip_domain": "starbucks_newyork",
- "site": "starbucks_newyork",
- "device": {
- "mbr": {
- "uplink": 1000000
- },
- "traffic_class": "class_1"
- }
- },
- {
- "display_name": "New York POS",
- "id": "starbucks_newyork_pos",
- "imsis": [
- {
- "imsi_range_from": 60,
- "imsi_range_to": 61,
- "imsi_id": "tills",
- "display_name": "tills"
- },
- {
- "imsi_range_from": 70,
- "imsi_range_to": 73,
- "imsi_id": "store",
- "display_name": "store"
- }
- ],
- "ip_domain": "starbucks_newyork",
- "site": "starbucks_newyork",
- "device": {
- "mbr": {
- "downlink": 1000000
- },
- "traffic_class": "class_1"
- }
- },
- {
- "display_name": "ACME Default",
- "id": "acme_chicago_default",
- "ip_domain": "acme_chicago",
- "site": "acme_chicago"
- },
- {
- "display_name": "ACME Robots",
- "id": "acme_chicago_robots",
- "imsis": [
- {
- "imsi_range_from": 0,
- "imsi_range_to": 3,
- "imsi_id": "production",
- "display_name": "production robots"
- },
- {
- "imsi_range_from": 10,
- "imsi_range_to": 12,
- "imsi_id": "warehouse",
- "display_name": "warehouse robots"
- }
- ],
- "ip_domain": "acme_chicago",
- "site": "acme_chicago",
- "device": {
- "mbr": {
- "uplink": 5000000,
- "downlink": 1000000
- },
- "traffic_class": "class_1"
- }
- }
- ]
- },
- "enterprise": {
- "enterprise": [
- {
- "description": "This Enterprise holds discovered IMSIs that cannot be associated elsewhere.",
- "display_name": "Default Enterprise",
- "id": "defaultent"
- },
- {
- "connectivity_service": [
- {
- "connectivity_service": "cs5gtest",
- "enabled": true
- }
- ],
- "description": "ACME Corporation",
- "display_name": "ACME Corp",
- "id": "acme"
- },
- {
- "connectivity_service": [
- {
- "connectivity_service": "cs5gtest",
- "enabled": true
- },
- {
- "connectivity_service": "cs4gtest",
- "enabled": false
- }
- ],
- "description": "Starbucks Corporation",
- "display_name": "Starbucks Inc.",
- "id": "starbucks"
- }
- ]
- },
- "ip_domain": {
- "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",
- "id": "defaultent_defaultip",
- "mtu": 57600,
- "subnet": "192.168.0.0/24",
- "enterprise": "defaultent"
- },
- {
- "admin_status": "ENABLE",
- "description": "New York IP Domain",
- "display_name": "New York",
- "dns_primary": "8.8.8.1",
- "dns_secondary": "8.8.8.2",
- "id": "starbucks_newyork",
- "mtu": 57600,
- "subnet": "254.186.117.251/31",
- "enterprise": "starbucks"
- },
- {
- "admin_status": "ENABLE",
- "description": "Seattle IP Domain",
- "display_name": "Seattle",
- "dns_primary": "8.8.8.3",
- "dns_secondary": "8.8.8.3",
- "id": "starbucks_seattle",
- "mtu": 12690,
- "subnet": "196.5.91.0/31",
- "enterprise": "starbucks"
- },
- {
- "admin_status": "DISABLE",
- "description": "Chicago IP Domain",
- "display_name": "Chicago",
- "dns_primary": "8.8.8.4",
- "dns_secondary": "8.8.8.4",
- "id": "acme_chicago",
- "mtu": 12690,
- "subnet": "163.25.44.0/31",
- "enterprise": "acme"
- }
- ]
- },
- "site": {
- "site": [
- {
- "description": "Global Default Site",
- "display_name": "Global Default Site",
- "enterprise": "defaultent",
- "id": "defaultent_defaultsite",
- "imsi_definition": {
- "mcc": "000",
- "mnc": "00",
- "enterprise": 0,
- "format": "SSSSSSSSSSSSSSS"
- }
- },
- {
- "description": "ACME HQ",
- "display_name": "Chicago",
- "enterprise": "acme",
- "id": "acme_chicago",
- "imsi_definition": {
- "mcc": "123",
- "mnc": "456",
- "enterprise": 1,
- "format": "CCCNNNEEESSSSSS"
- },
- "small_cell": [
- {
- "small_cell_id": "cell1",
- "display_name": "cell number one",
- "address": "ap2.chicago.acme.com",
- "enable": true,
- "tac": "8002"
- }
- ],
- "monitoring": {
- "edge_cluster_prometheus_url": "prometheus_ace1",
- "edge_monitoring_prometheus_url": "prometheus_amp",
- "edge_device": [
- {
- "edge_device_id": "acme_chicago_monitoring_pi_1",
- "display_name": "sprocket monitoring pi",
- "description": "monitoring device placed near the sprocket manufacturing machine"
- },
- {
- "edge_device_id": "acme_chicago_monitoring_pi_2",
- "display_name": "widget monitoring pi",
- "description": "monitoring device placed near the widget refinisher"
- }
- ]
- }
- },
- {
- "description": "Starbucks Corp HQ",
- "display_name": "Seattle",
- "enterprise": "starbucks",
- "id": "starbucks_seattle",
- "imsi_definition": {
- "mcc": "265",
- "mnc": "122",
- "enterprise": 2,
- "format": "CCCNNNEEESSSSSS"
- },
- "small_cell": [
- {
- "small_cell_id": "cell2",
- "display_name": "cell number 2",
- "address": "ap1.seattle.starbucks.com",
- "enable": true,
- "tac": "0654"
- },
- {
- "small_cell_id": "cell3",
- "display_name": "cell number 3",
- "address": "ap2.seattle.starbucks.com",
- "enable": true,
- "tac": "87475"
- }
- ],
- "monitoring": {
- "edge_cluster_prometheus_url": "prometheus_ace1",
- "edge_monitoring_prometheus_url": "prometheus_amp",
- "edge_device": [
- {
- "edge_device_id": "starbucks_seattle_monitoring_pi_1",
- "display_name": "lobby monitoring device",
- "description": "monitoring device placed in the lobby"
- }
- ]
- }
- },
- {
- "description": "Starbucks New York",
- "display_name": "New York",
- "enterprise": "starbucks",
- "id": "starbucks_newyork",
- "imsi_definition": {
- "mcc": "021",
- "mnc": "32",
- "enterprise": 2,
- "format": "CCCNNNEEESSSSSS"
- },
- "small_cell": [
- {
- "small_cell_id": "cell4",
- "display_name": "cell number four",
- "address": "ap2.newyork.starbucks.com",
- "enable": true,
- "tac": "8002"
- }
- ],
- "monitoring": {
- "edge_cluster_prometheus_url": "prometheus_ace1",
- "edge_monitoring_prometheus_url": "prometheus_amp",
- "edge_device": [
- {
- "edge_device_id": "starbucks_newyork_monitoring_pi_1",
- "display_name": "cash registers",
- "description": "monitoring device placed near the cash registers"
- }
- ]
- }
- }
- ]
- },
- "template": {
- "template": [
- {
- "default_behavior": "DENY_ALL",
- "description": "VCS Template 1",
- "display_name": "Template 1",
- "id": "template_1",
- "sd": 10886763,
- "sst": 158,
- "slice": {
- "mbr": {
- "uplink": 10000000,
- "downlink": 5000000,
- "uplink_burst_size": 600000,
- "downlink_burst_size": 600000
- }
- }
- },
- {
- "default_behavior": "DENY_ALL",
- "description": "VCS Template 2",
- "display_name": "Template 2",
- "id": "template_2",
- "sd": 16619900,
- "sst": 157,
- "slice": {
- "mbr": {
- "uplink": 10000000,
- "downlink": 5000000,
- "uplink_burst_size": 500000
- }
- }
- }
- ]
- },
- "traffic_class": {
- "traffic_class": [
- {
- "description": "High Priority TC",
- "display_name": "Class 1",
- "id": "class_1",
- "qci": 10,
- "arp": 1,
- "pelr": 10,
- "pdb": 100
- },
- {
- "description": "Medium Priority TC",
- "display_name": "Class 2",
- "id": "class_2",
- "qci": 20,
- "arp": 1,
- "pelr": 10,
- "pdb": 100
- },
- {
- "description": "Low Priority TC",
- "display_name": "Class 3",
- "id": "class_3",
- "qci": 30,
- "arp": 1,
- "pelr": 10,
- "pdb": 100
- }
- ]
- },
- "upf": {
- "upf": [
- {
- "address": "entry1.upfpool.seattle.starbucks.com",
- "description": "Seattle UPF Pool _ Entry 1",
- "display_name": "Seattle Pool 1",
- "id": "starbucks_seattle_pool_entry1",
- "enterprise": "starbucks",
- "site": "starbucks_seattle",
- "port": 9229,
- "config_endpoint": "http://entry1_seattle"
- },
- {
- "address": "entry2.upfpool.seattle.starbucks.com",
- "description": "Seattle UPF Pool _ Entry 2",
- "display_name": "Seattle Pool 2",
- "id": "starbucks_seattle_pool_entry2",
- "enterprise": "starbucks",
- "site": "starbucks_seattle",
- "port": 9229,
- "config_endpoint": "http://entry2_seattle"
- },
- {
- "address": "entry1.upfpool.newyork.starbucks.com",
- "description": "New York UPF Pool _ Entry 1",
- "display_name": "New York Pool 1",
- "id": "starbucks_newyork_pool_entry1",
- "enterprise": "starbucks",
- "site": "starbucks_newyork",
- "port": 6161
- },
- {
- "address": "entry2.upfpool.newyork.starbucks.com",
- "description": "New York UPF Pool _ Entry 2",
- "display_name": "New York Pool 2",
- "id": "starbucks_newyork_pool_entry2",
- "enterprise": "starbucks",
- "site": "starbucks_newyork",
- "port": 6161
- },
- {
- "address": "entry3.upfpool.newyork.starbucks.com",
- "description": "New York UPF Pool _ Entry 3",
- "display_name": "New York Pool 3",
- "id": "starbucks_newyork_pool_entry3",
- "enterprise": "starbucks",
- "site": "starbucks_newyork",
- "port": 6161
- },
- {
- "address": "entry1.upfpool.chicago.acme.com",
- "description": "Chicago UPF Pool _ Entry 1",
- "display_name": "Chicago Pool 1",
- "id": "acme_chicago_pool_entry1",
- "enterprise": "acme",
- "site": "acme_chicago",
- "port": 6161
- },
- {
- "address": "entry2.upfpool.chicago.acme.com",
- "description": "Chicago UPF Pool _ Entry 2",
- "display_name": "Chicago Pool 2",
- "id": "acme_chicago_pool_entry2",
- "enterprise": "acme",
- "site": "acme_chicago",
- "port": 6161
- }
- ]
- },
- "vcs": {
- "vcs": [
- {
- "filter": [
- {
- "allow": true,
- "application": "starbucks_nvr"
- }
- ],
- "default_behavior": "DENY_ALL",
- "description": "New York Cameras",
- "device_group": [
- { "enable": true,
- "device_group": "starbucks_newyork_cameras"
- }
- ],
- "display_name": "NY Cams",
- "enterprise": "starbucks",
- "id": "starbucks_newyork_cameras",
- "sd": 8284729,
- "sst": 127,
- "upf": "starbucks_newyork_pool_entry1",
- "site": "starbucks_newyork",
- "slice": {
- "mbr": {
- "uplink": 10000000,
- "downlink": 5000000,
- "uplink_burst_size": 600000,
- "downlink_burst_size": 600000
- }
- }
- },
- {
- "filter": [
- {
- "allow": false,
- "application": "starbucks_nvr"
- }
- ],
- "default_behavior": "DENY_ALL",
- "description": "Seattle Cameras",
- "device_group": [
- { "enable": true,
- "device_group": "starbucks_seattle_cameras"
- }
- ],
- "display_name": "Seattle Cams",
- "enterprise": "starbucks",
- "id": "starbucks_seattle_cameras",
- "sd": 2973238,
- "sst": 79,
- "upf": "starbucks_seattle_pool_entry1",
- "site": "starbucks_seattle",
- "slice": {
- "mbr": {
- "uplink": 10000000,
- "uplink_burst_size": 600000
- }
- }
- },
- {
- "filter": [
- {
- "allow": false,
- "application": "acme_dataacquisition"
- }
- ],
- "default_behavior": "DENY_ALL",
- "description": "Chicago Robots",
- "device_group": [
- { "enable": true,
- "device_group": "acme_chicago_robots"
- }
- ],
- "display_name": "Chicago Robots VCS",
- "enterprise": "acme",
- "id": "acme_chicago_robots",
- "sd": 2973238,
- "sst": 79,
- "upf": "acme_chicago_pool_entry1",
- "site": "acme_chicago",
- "slice": {
- "mbr": {
- "downlink": 5000000,
- "downlink_burst_size": 600000
- }
- }
- }
- ]
- }
-}
diff --git a/aether-roc-umbrella/files/opa-rbac/test/out/aether-2.0.0-test-group-ent.out b/aether-roc-umbrella/files/opa-rbac/test/out/aether-2.0.0-test-group-ent.out
index 2e38048..7d02b46 100644
--- a/aether-roc-umbrella/files/opa-rbac/test/out/aether-2.0.0-test-group-ent.out
+++ b/aether-roc-umbrella/files/opa-rbac/test/out/aether-2.0.0-test-group-ent.out
@@ -23,11 +23,6 @@
"enterprise": [
[
{
- "description": "This Enterprise holds discovered IMSIs that cannot be associated elsewhere.",
- "display_name": "Default Enterprise",
- "enterprise_id": "defaultent"
- },
- {
"connectivity_service": [
{
"connectivity_service": "cs5gtest",
@@ -52,6 +47,11 @@
"description": "Starbucks Corporation",
"display_name": "Starbucks Inc.",
"enterprise_id": "starbucks"
+ },
+ {
+ "description": "This Enterprise holds discovered IMSIs that cannot be associated elsewhere.",
+ "display_name": "Default Enterprise",
+ "enterprise_id": "defaultent"
}
]
]
diff --git a/aether-roc-umbrella/files/opa-rbac/test/out/aether-2.1.0-test-group-ent.out b/aether-roc-umbrella/files/opa-rbac/test/out/aether-2.1.0-test-group-ent.out
index 4a617e4..e8927a1 100644
--- a/aether-roc-umbrella/files/opa-rbac/test/out/aether-2.1.0-test-group-ent.out
+++ b/aether-roc-umbrella/files/opa-rbac/test/out/aether-2.1.0-test-group-ent.out
@@ -47,4 +47,4 @@
],
"traffic_class": []
}
-]
\ No newline at end of file
+]
diff --git a/aether-roc-umbrella/files/opa-rbac/test/out/aether-2.1.0-test-no-ent.out b/aether-roc-umbrella/files/opa-rbac/test/out/aether-2.1.0-test-no-ent.out
index 15e32dd..9a23376 100644
--- a/aether-roc-umbrella/files/opa-rbac/test/out/aether-2.1.0-test-no-ent.out
+++ b/aether-roc-umbrella/files/opa-rbac/test/out/aether-2.1.0-test-no-ent.out
@@ -5,4 +5,4 @@
"template": [],
"traffic_class": []
}
-]
\ No newline at end of file
+]
diff --git a/aether-roc-umbrella/files/opa-rbac/test/out/aether-2.1.0-test-single-ent.out b/aether-roc-umbrella/files/opa-rbac/test/out/aether-2.1.0-test-single-ent.out
index 4a617e4..e8927a1 100644
--- a/aether-roc-umbrella/files/opa-rbac/test/out/aether-2.1.0-test-single-ent.out
+++ b/aether-roc-umbrella/files/opa-rbac/test/out/aether-2.1.0-test-single-ent.out
@@ -47,4 +47,4 @@
],
"traffic_class": []
}
-]
\ No newline at end of file
+]
diff --git a/aether-roc-umbrella/files/opa-rbac/test/out/aether-3.0.0-example-basic.out b/aether-roc-umbrella/files/opa-rbac/test/out/aether-3.0.0-example-basic.out
deleted file mode 100644
index df89fab..0000000
--- a/aether-roc-umbrella/files/opa-rbac/test/out/aether-3.0.0-example-basic.out
+++ /dev/null
@@ -1,83 +0,0 @@
-[
- {
- "ap-list": {
- "ap-list": [
- []
- ]
- },
- "application": {
- "application": [
- []
- ]
- },
- "connectivity-service": {
- "connectivity-service": [
- []
- ]
- },
- "device-group": {
- "device-group": [
- []
- ]
- },
- "enterprise": {
- "enterprise": [
- []
- ]
- },
- "ip-domain": {
- "ip-domain": [
- []
- ]
- },
- "network": {
- "network": [
- []
- ]
- },
- "site": {
- "site": [
- []
- ]
- },
- "template": {
- "template": [
- [
- {
- "description": "do",
- "display-name": "laborum fugiat",
- "downlink": 322694552,
- "id": "aliquip",
- "sd": 14628949,
- "sst": 1,
- "uplink": 1607714163
- },
- {
- "description": "do",
- "display-name": "quattro fugiat",
- "downlink": 322694552,
- "id": "quattro",
- "sd": 14628949,
- "sst": 1,
- "uplink": 1607714163
- }
- ]
- ]
- },
- "traffic_class": {
- "traffic_class": [
- []
- ]
- },
- "upf": {
- "upf": [
- []
- ]
- },
- "vcs": {
- "vcs": [
- []
- ]
- }
- }
-]
diff --git a/aether-roc-umbrella/files/opa-rbac/test/out/aether-3.0.0-example-get.out b/aether-roc-umbrella/files/opa-rbac/test/out/aether-3.0.0-example-get.out
deleted file mode 100644
index 4b3d3c0..0000000
--- a/aether-roc-umbrella/files/opa-rbac/test/out/aether-3.0.0-example-get.out
+++ /dev/null
@@ -1,239 +0,0 @@
-[
- {
- "ap-list": {
- "ap-list": [
- [
- {
- "access_points": [
- {
- "address": "ap2^chicago^acme^com",
- "enable": true,
- "tac": 8002
- }
- ],
- "description": "Chicago APs",
- "display_name": "Chicago",
- "enterprise": "acme",
- "id": "acme_chicago_aps"
- }
- ]
- ]
- },
- "application": {
- "application": [
- [
- {
- "description": "Data Acquisition",
- "display_name": "DA",
- "endpoint": [
- {
- "address": "da.acme.com",
- "name": "da",
- "port_end": 7585,
- "port_start": 7588,
- "protocol": "TCP"
- }
- ],
- "enterprise": "acme",
- "id": "acme_dataacquisition"
- }
- ]
- ]
- },
- "connectivity-service": {
- "connectivity-service": [
- [
- {
- "core_5g_endpoint": "http://aether_roc_umbrella_sdcore_test_dummy/v1/config/5g",
- "description": "5G Test",
- "display_name": "ROC 5G Test Connectivity Service",
- "id": "cs5gtest"
- },
- {
- "description": "ROC 4G Test Connectivity Service",
- "display_name": "4G Test",
- "hss_endpoint": "http://aether_roc_umbrella_sdcore_test_dummy/v1/config/imsis",
- "id": "cs4gtest",
- "pcrf_endpoint": "http://aether_roc_umbrella_sdcore_test_dummy/v1/config/policies",
- "spgwc_endpoint": "http://aether_roc_umbrella_sdcore_test_dummy/v1/config"
- }
- ]
- ]
- },
- "device-group": {
- "device-group": [
- [
- {
- "display_name": "ACME Robots",
- "id": "acme_chicago_robots",
- "imsis": [
- {
- "imsi_range_from": 13698808332993000,
- "imsi_range_to": 13698808332993003,
- "name": "production"
- },
- {
- "imsi_range_from": 13698808332993010,
- "imsi_range_to": 13698808332993012,
- "name": "warehouse"
- }
- ],
- "ip_domain": "acme_chicago",
- "site": "acme_chicago"
- }
- ]
- ]
- },
- "enterprise": {
- "enterprise": [
- [
- {
- "connectivity_service": [
- {
- "connectivity_service": "cs5gtest",
- "enabled": true
- }
- ],
- "description": "ACME Corporation",
- "display_name": "ACME Corp",
- "id": "acme"
- }
- ]
- ]
- },
- "ip-domain": {
- "ip-domain": [
- []
- ]
- },
- "network": {
- "network": [
- [
- {
- "description": "Chicago 123_456",
- "display_name": "Chicago",
- "enterprise": "acme",
- "id": "acme_chicago",
- "mcc": 123,
- "mnc": 456
- }
- ]
- ]
- },
- "site": {
- "site": [
- [
- {
- "description": "ACME HQ",
- "display_name": "Chicago",
- "enterprise": "acme",
- "id": "acme_chicago",
- "network": "acme_chicago"
- }
- ]
- ]
- },
- "template": {
- "template": [
- [
- {
- "description": "VCS Template 1",
- "display_name": "Template 1",
- "downlink": 24669539,
- "id": "template_1",
- "sd": 10886763,
- "sst": 158,
- "traffic_class": "class_1",
- "uplink": 23770218
- },
- {
- "description": "VCS Template 2",
- "display_name": "Template 2",
- "downlink": 2791589,
- "id": "template_2",
- "sd": 16619900,
- "sst": 157,
- "traffic_class": "class_2",
- "uplink": 24721051
- }
- ]
- ]
- },
- "traffic_class": {
- "traffic_class": [
- [
- {
- "description": "High Priority TC",
- "display_name": "Class 1",
- "id": "class_1",
- "pdb": 577,
- "pelr": 3,
- "qci": 10
- },
- {
- "description": "Medium Priority TC",
- "display_name": "Class 2",
- "id": "class_2",
- "pdb": 831,
- "pelr": 4,
- "qci": 20
- },
- {
- "description": "Low Priority TC",
- "display_name": "Class 3",
- "id": "class_3",
- "pdb": 833,
- "pelr": 4,
- "qci": 30
- }
- ]
- ]
- },
- "upf": {
- "upf": [
- [
- {
- "address": "chicago.robots_upf.acme.com",
- "description": "Chicago Robots UPF",
- "display_name": "Chicago Robots",
- "enterprise": "acme",
- "id": "acme_chicago_robots",
- "port": 6161
- }
- ]
- ]
- },
- "vcs": {
- "vcs": [
- [
- {
- "ap": "acme_chicago_aps",
- "application": [
- {
- "allow": false,
- "application": "acme_dataacquisition"
- }
- ],
- "description": "Chicago Robots",
- "device_group": [
- {
- "device_group": "acme_chicago_robots",
- "enable": true
- }
- ],
- "display_name": "Chicago Robots VCS",
- "downlink": 28492626,
- "enterprise": "acme",
- "id": "acme_chicago_robots",
- "sd": 2973238,
- "sst": 79,
- "template": "template_2",
- "traffic_class": "class_2",
- "upf": "acme_chicago_robots",
- "uplink": 13227287
- }
- ]
- ]
- }
- }
-]
diff --git a/aether-roc-umbrella/files/opa-rbac/test/out/aether-3.0.0-example-set.out b/aether-roc-umbrella/files/opa-rbac/test/out/aether-3.0.0-example-set.out
deleted file mode 100644
index 6f88625..0000000
--- a/aether-roc-umbrella/files/opa-rbac/test/out/aether-3.0.0-example-set.out
+++ /dev/null
@@ -1,128 +0,0 @@
-[
- {
- "ap-list": {
- "ap-list": [
- []
- ]
- },
- "application": {
- "application": [
- []
- ]
- },
- "connectivity-service": {
- "connectivity-service": [
- []
- ]
- },
- "device-group": {
- "device-group": [
- [
- {
- "display-name": "tempor ut",
- "id": "amet",
- "imsis": [
- {
- "imsi-range-from": 170029313275000,
- "imsi-range-to": 69764015096000,
- "name": "enim"
- },
- {
- "imsi-range-from": 116299798497000,
- "imsi-range-to": 22297092854800,
- "name": "ad"
- }
- ],
- "ip-domain": "qui",
- "site": "inc"
- }
- ]
- ]
- },
- "enterprise": {
- "enterprise": [
- [
- {
- "connectivity-service": [
- {
- "connectivity-service": "repre",
- "enabled": true
- },
- {
- "connectivity-service": "irure",
- "enabled": true
- }
- ],
- "description": "minim et",
- "display-name": "laborum in",
- "id": "dolor"
- }
- ]
- ]
- },
- "ip-domain": {
- "ip-domain": [
- []
- ]
- },
- "network": {
- "network": [
- []
- ]
- },
- "site": {
- "site": [
- [
- {
- "description": "pariatur culpa",
- "display-name": "occaecat nostrud",
- "enterprise": "dolor",
- "id": "inc",
- "network": "irur"
- }
- ]
- ]
- },
- "template": {
- "template": [
- [
- {
- "description": "enim ",
- "display-name": "do labore laborum elit",
- "downlink": 24669539,
- "id": "magn",
- "sd": 10886763,
- "sst": 158,
- "traffic-class": "consectetur in cillum",
- "uplink": 23770218
- },
- {
- "description": "aute dolore dolo",
- "display-name": "quis pariatur dolore magna commodo",
- "downlink": 2791589,
- "id": "aliqua",
- "sd": 16619900,
- "sst": 157,
- "traffic-class": "dolor in in et",
- "uplink": 24721051
- }
- ]
- ]
- },
- "traffic_class": {
- "traffic_class": [
- []
- ]
- },
- "upf": {
- "upf": [
- []
- ]
- },
- "vcs": {
- "vcs": [
- []
- ]
- }
- }
-]
diff --git a/aether-roc-umbrella/files/opa-rbac/test/out/aether-4.0.0-example-get.out b/aether-roc-umbrella/files/opa-rbac/test/out/aether-4.0.0-example-get.out
deleted file mode 100644
index 30bca26..0000000
--- a/aether-roc-umbrella/files/opa-rbac/test/out/aether-4.0.0-example-get.out
+++ /dev/null
@@ -1,297 +0,0 @@
-[
- {
- "application": {
- "application": [
- [
- {
- "address": "da.acme.com",
- "description": "Data Acquisition",
- "display_name": "DA",
- "endpoint": [
- {
- "display_name": "data acquisition endpoint",
- "endpoint_id": "da",
- "mbr": {
- "downlink": 1000000,
- "uplink": 2000000
- },
- "port_end": 7588,
- "port_start": 7585,
- "protocol": "TCP",
- "traffic_class": "class_2"
- }
- ],
- "enterprise": "acme",
- "id": "acme_dataacquisition"
- }
- ]
- ]
- },
- "connectivity-service": {
- "connectivity-service": [
- [
- {
- "acc_prometheus_url": "./prometheus_acc",
- "core_5g_endpoint": "http://aether_roc_umbrella_sdcore_test_dummy/v1/config/5g",
- "description": "5G Test",
- "display_name": "ROC 5G Test Connectivity Service",
- "id": "cs5gtest"
- },
- {
- "description": "ROC 4G Test Connectivity Service",
- "display_name": "4G Test",
- "hss_endpoint": "http://aether_roc_umbrella_sdcore_test_dummy/v1/config/imsis",
- "id": "cs4gtest",
- "pcrf_endpoint": "http://aether_roc_umbrella_sdcore_test_dummy/v1/config/policies",
- "spgwc_endpoint": "http://aether_roc_umbrella_sdcore_test_dummy/v1/config"
- }
- ]
- ]
- },
- "device-group": {
- "device-group": [
- [
- {
- "display_name": "ACME Default",
- "id": "acme_chicago_default",
- "ip_domain": "acme_chicago",
- "site": "acme_chicago"
- },
- {
- "device": {
- "mbr": {
- "downlink": 1000000,
- "uplink": 5000000
- },
- "traffic_class": "class_1"
- },
- "display_name": "ACME Robots",
- "id": "acme_chicago_robots",
- "imsis": [
- {
- "display_name": "production robots",
- "imsi_id": "production",
- "imsi_range_from": 0,
- "imsi_range_to": 3
- },
- {
- "display_name": "warehouse robots",
- "imsi_id": "warehouse",
- "imsi_range_from": 10,
- "imsi_range_to": 12
- }
- ],
- "ip_domain": "acme_chicago",
- "site": "acme_chicago"
- }
- ]
- ]
- },
- "enterprise": {
- "enterprise": [
- [
- {
- "connectivity_service": [
- {
- "connectivity_service": "cs5gtest",
- "enabled": true
- }
- ],
- "description": "ACME Corporation",
- "display_name": "ACME Corp",
- "id": "acme"
- }
- ]
- ]
- },
- "ip-domain": {
- "ip-domain": [
- [
- {
- "admin_status": "DISABLE",
- "description": "Chicago IP Domain",
- "display_name": "Chicago",
- "dns_primary": "8.8.8.4",
- "dns_secondary": "8.8.8.4",
- "enterprise": "acme",
- "id": "acme_chicago",
- "mtu": 12690,
- "subnet": "163.25.44.0/31"
- }
- ]
- ]
- },
- "site": {
- "site": [
- [
- {
- "description": "ACME HQ",
- "display_name": "Chicago",
- "enterprise": "acme",
- "id": "acme_chicago",
- "imsi_definition": {
- "enterprise": 1,
- "format": "CCCNNNEEESSSSSS",
- "mcc": "123",
- "mnc": "456"
- },
- "monitoring": {
- "edge_cluster_prometheus_url": "prometheus_ace1",
- "edge_device": [
- {
- "description": "monitoring device placed near the sprocket manufacturing machine",
- "display_name": "sprocket monitoring pi",
- "edge_device_id": "acme_chicago_monitoring_pi_1"
- },
- {
- "description": "monitoring device placed near the widget refinisher",
- "display_name": "widget monitoring pi",
- "edge_device_id": "acme_chicago_monitoring_pi_2"
- }
- ],
- "edge_monitoring_prometheus_url": "prometheus_amp"
- },
- "small_cell": [
- {
- "address": "ap2.chicago.acme.com",
- "display_name": "cell number one",
- "enable": true,
- "small_cell_id": "cell1",
- "tac": "8002"
- }
- ]
- }
- ]
- ]
- },
- "template": {
- "template": [
- [
- {
- "default_behavior": "DENY_ALL",
- "description": "VCS Template 1",
- "display_name": "Template 1",
- "id": "template_1",
- "sd": 10886763,
- "slice": {
- "mbr": {
- "downlink": 5000000,
- "downlink_burst_size": 600000,
- "uplink": 10000000,
- "uplink_burst_size": 600000
- }
- },
- "sst": 158
- },
- {
- "default_behavior": "DENY_ALL",
- "description": "VCS Template 2",
- "display_name": "Template 2",
- "id": "template_2",
- "sd": 16619900,
- "slice": {
- "mbr": {
- "downlink": 5000000,
- "uplink": 10000000,
- "uplink_burst_size": 500000
- }
- },
- "sst": 157
- }
- ]
- ]
- },
- "traffic-class": {
- "traffic-class": [
- [
- {
- "arp": 1,
- "description": "High Priority TC",
- "display_name": "Class 1",
- "id": "class_1",
- "pdb": 100,
- "pelr": 10,
- "qci": 10
- },
- {
- "arp": 1,
- "description": "Medium Priority TC",
- "display_name": "Class 2",
- "id": "class_2",
- "pdb": 100,
- "pelr": 10,
- "qci": 20
- },
- {
- "arp": 1,
- "description": "Low Priority TC",
- "display_name": "Class 3",
- "id": "class_3",
- "pdb": 100,
- "pelr": 10,
- "qci": 30
- }
- ]
- ]
- },
- "upf": {
- "upf": [
- [
- {
- "address": "entry1.upfpool.chicago.acme.com",
- "description": "Chicago UPF Pool _ Entry 1",
- "display_name": "Chicago Pool 1",
- "enterprise": "acme",
- "id": "acme_chicago_pool_entry1",
- "port": 6161,
- "site": "acme_chicago"
- },
- {
- "address": "entry2.upfpool.chicago.acme.com",
- "description": "Chicago UPF Pool _ Entry 2",
- "display_name": "Chicago Pool 2",
- "enterprise": "acme",
- "id": "acme_chicago_pool_entry2",
- "port": 6161,
- "site": "acme_chicago"
- }
- ]
- ]
- },
- "vcs": {
- "vcs": [
- [
- {
- "default_behavior": "DENY_ALL",
- "description": "Chicago Robots",
- "device_group": [
- {
- "device_group": "acme_chicago_robots",
- "enable": true
- }
- ],
- "display_name": "Chicago Robots VCS",
- "enterprise": "acme",
- "filter": [
- {
- "allow": false,
- "application": "acme_dataacquisition"
- }
- ],
- "id": "acme_chicago_robots",
- "sd": 2973238,
- "site": "acme_chicago",
- "slice": {
- "mbr": {
- "downlink": 5000000,
- "downlink_burst_size": 600000
- }
- },
- "sst": 79,
- "upf": "acme_chicago_pool_entry1"
- }
- ]
- ]
- }
- }
-]