load roc defaultent values separately
Change-Id: If424154df4208169d3ee2e0fe19797588f0fb7a8
diff --git a/Makefile b/Makefile
index e81db5b..93e471c 100644
--- a/Makefile
+++ b/Makefile
@@ -11,14 +11,15 @@
WORKSPACE ?= $(HOME)
VENV ?= $(BUILD)/venv/aiab
-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
-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
-GET_HELM = get_helm.sh
+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
+ROC_DEFAULTENT_MODEL ?= $(MAKEDIR)/roc-defaultent-model.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
+GET_HELM = get_helm.sh
KUBESPRAY_VERSION ?= release-2.17
DOCKER_VERSION ?= '20.10'
@@ -482,10 +483,16 @@
sed -i 's/# addr: sub/ addr: sub/' $(4G_CORE_VALUES) ; \
sed -i 's/# port: 5000/ port: 5000/' $(4G_CORE_VALUES) ; \
fi
- $(eval ONOS_CLI_POD := $(shell kubectl -n aether-roc get pods -l name=onos-cli -o name))
+ @$(eval ONOS_CLI_POD := $(shell kubectl -n aether-roc get pods -l name=onos-cli -o name))
echo "ONOS CLI pod: ${ONOS_CLI_POD}"
+ @$(eval API_SERVICE := $(shell kubectl -n aether-roc get --no-headers=true services -l app.kubernetes.io/name=aether-roc-api | awk '{print $$1}'))
+ echo "API SERVICE : ${API_SERVICE}"
until kubectl -n aether-roc exec ${ONOS_CLI_POD} -- \
- curl -s -f -L -X PATCH "http://aether-roc-api:8181/aether-roc-api" \
+ curl -s -f -L -X PATCH "http://${API_SERVICE}:8181/aether-roc-api" \
+ --header 'Content-Type: application/json' \
+ --data-raw "$$(cat ${ROC_DEFAULTENT_MODEL})"; do sleep 5; done
+ until kubectl -n aether-roc exec ${ONOS_CLI_POD} -- \
+ curl -s -f -L -X PATCH "http://${API_SERVICE}:8181/aether-roc-api" \
--header 'Content-Type: application/json' \
--data-raw "$$(cat ${ROC_4G_MODELS})"; do sleep 5; done
@@ -498,10 +505,16 @@
sed -i 's/# addr: sub/ addr: sub/' $(5G_CORE_VALUES) ; \
sed -i 's/# port: 5000/ port: 5000/' $(5G_CORE_VALUES) ; \
fi
- $(eval ONOS_CLI_POD := $(shell kubectl -n aether-roc get pods -l name=onos-cli -o name))
+ @$(eval ONOS_CLI_POD := $(shell kubectl -n aether-roc get pods -l name=onos-cli -o name))
echo "ONOS CLI pod: ${ONOS_CLI_POD}"
+ @$(eval API_SERVICE := $(shell kubectl -n aether-roc get --no-headers=true services -l app.kubernetes.io/name=aether-roc-api | awk '{print $$1}'))
+ echo "API SERVICE : ${API_SERVICE}"
until kubectl -n aether-roc exec ${ONOS_CLI_POD} -- \
- curl -s -f -L -X PATCH "http://aether-roc-api:8181/aether-roc-api" \
+ curl -s -f -L -X PATCH "http://${API_SERVICE}:8181/aether-roc-api" \
+ --header 'Content-Type: application/json' \
+ --data-raw "$$(cat ${ROC_DEFAULTENT_MODEL})"; do sleep 5; done
+ until kubectl -n aether-roc exec ${ONOS_CLI_POD} -- \
+ curl -s -f -L -X PATCH "http://${API_SERVICE}:8181/aether-roc-api" \
--header 'Content-Type: application/json' \
--data-raw "$$(cat ${ROC_5G_MODELS})"; do sleep 5; done
diff --git a/roc-4g-models.json b/roc-4g-models.json
index 45f5f24..cd81b1b 100644
--- a/roc-4g-models.json
+++ b/roc-4g-models.json
@@ -1,5 +1,5 @@
{
- "default-target": "defaultent",
+ "default-target": "aiab-enterprise",
"Updates": {
"site-2.1.0": [
{
@@ -33,12 +33,12 @@
{
"sim-id": "aiab-sim-1",
"display-name": "UE 1 Sim",
- "imsi": 208010167891201
+ "imsi": "208010167891201"
},
{
"sim-id": "aiab-sim-2",
"display-name": "UE 2 Sim",
- "imsi": 208010167891202
+ "imsi": "208010167891202"
}
],
"device-group": [
@@ -105,8 +105,8 @@
"filter": [],
"slice-id": "aiab-vcs",
"connectivity-service": "4g",
- "sd": 66051,
- "sst": 1,
+ "sd": "10203",
+ "sst": "1",
"upf": "aiab-upf",
"mbr": {
"uplink": 100000000,
@@ -114,49 +114,7 @@
},
"priority-traffic-rule": []
}
- ],
- "additionalProperties": {
- "enterprise-id": "aiab-enterprise"
- }
- },
- {
- "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"
- }
- ],
- "additionalProperties": {
- "enterprise-id": "defaultent"
- }
+ ]
}
],
"traffic-class-2.1.0": [
@@ -166,29 +124,12 @@
"pdb": 300,
"arp": 6,
"pelr": 6,
- "qci": 9,
- "additionalProperties": {
- "enterprise-id": "aiab-enterprise"
- }
- },
- {
- "traffic-class-id": "class-1",
- "description": "Default traffic-class for defaultent",
- "display-name": "Class 1",
- "qci": 10,
- "arp": 1,
- "pelr": 10,
- "pdb": 100,
- "additionalProperties": {
- "enterprise-id": "defaultent"
- }
+ "qci": 9
}
]
},
"Deletes": {},
"Extensions": {
- "transaction-strategy-111": 1,
- "model-version-101": "2.1.x",
- "model-type-102": "Aether"
+ "transaction-strategy-111": 1
}
}
diff --git a/roc-5g-models.json b/roc-5g-models.json
index 00d1396..3eea827 100644
--- a/roc-5g-models.json
+++ b/roc-5g-models.json
@@ -98,76 +98,76 @@
{
"sim-id": "aiab-sim-1",
"display-name": "UE 1 Sim",
- "imsi": 208930100007487
+ "imsi": "208930100007487"
},
{
"sim-id": "aiab-sim-2",
"display-name": "UE 2 Sim",
- "imsi": 208930100007488
+ "imsi": "208930100007488"
},
{
"sim-id": "aiab-sim-3",
"display-name": "UE 3 Sim",
- "imsi": 208930100007489
+ "imsi": "208930100007489"
},
{
"sim-id": "aiab-sim-4",
"display-name": "UE 4 Sim",
- "imsi": 208930100007490
+ "imsi": "208930100007490"
},
{
"sim-id": "aiab-sim-5",
"display-name": "UE 5 Sim",
- "imsi": 208930100007491
+ "imsi": "208930100007491"
},
{
"sim-id": "aiab-sim-6",
"display-name": "UE 6 Sim",
- "imsi": 208930100007492
+ "imsi": "208930100007492"
},
{
"sim-id": "aiab-sim-7",
"display-name": "UE 7 Sim",
- "imsi": 208930100007493
+ "imsi": "208930100007493"
},
{
"sim-id": "aiab-sim-8",
"display-name": "UE 8 Sim",
- "imsi": 208930100007494
+ "imsi": "208930100007494"
}, {
"sim-id": "aiab-sim-9",
"display-name": "UE 9 Sim",
- "imsi": 208930100007495
+ "imsi": "208930100007495"
},
{
"sim-id": "aiab-sim-10",
"display-name": "UE 10 Sim",
- "imsi": 208930100007496
+ "imsi": "208930100007496"
},
{
"sim-id": "aiab-sim-11",
"display-name": "UE 11 Sim",
- "imsi": 208930100007497
+ "imsi": "208930100007497"
},
{
"sim-id": "aiab-sim-12",
"display-name": "UE 12 Sim",
- "imsi": 208930100007498
+ "imsi": "208930100007498"
},
{
"sim-id": "aiab-sim-13",
"display-name": "UE 13 Sim",
- "imsi": 208930100007499
+ "imsi": "208930100007499"
},
{
"sim-id": "aiab-sim-14",
"display-name": "UE 14 Sim",
- "imsi": 208930100007500
+ "imsi": "208930100007500"
},
{
"sim-id": "aiab-sim-15",
"display-name": "UE 15 Sim",
- "imsi": 208930100007501
+ "imsi": "208930100007501"
}
],
"device-group": [
@@ -286,8 +286,8 @@
"filter": [],
"slice-id": "aiab-vcs",
"connectivity-service": "5g",
- "sd": 66051,
- "sst": 1,
+ "sd": "10203",
+ "sst": "1",
"upf": "aiab-upf",
"mbr": {
"uplink": 10000000,
@@ -295,49 +295,7 @@
},
"priority-traffic-rule": []
}
- ],
- "additionalProperties": {
- "enterprise-id": "aiab-enterprise"
- }
- },
- {
- "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"
- }
- ],
- "additionalProperties": {
- "enterprise-id": "defaultent"
- }
+ ]
}
],
"traffic-class-2.1.0": [
@@ -348,29 +306,12 @@
"pdb": 100,
"arp": 1,
"pelr": 3,
- "qci": 1,
- "additionalProperties": {
- "enterprise-id": "aiab-enterprise"
- }
- },
- {
- "traffic-class-id": "class-1",
- "description": "Default traffic-class for defaultent",
- "display-name": "Class 1",
- "qci": 10,
- "arp": 1,
- "pelr": 10,
- "pdb": 100,
- "additionalProperties": {
- "enterprise-id": "defaultent"
- }
+ "qci": 1
}
]
},
"Deletes": {},
"Extensions": {
- "transaction-strategy-111": 1,
- "model-version-101": "2.1.x",
- "model-type-102": "Aether"
+ "transaction-strategy-111": 1
}
}
diff --git a/roc-defaultent-model.json b/roc-defaultent-model.json
new file mode 100644
index 0000000..ff088d0
--- /dev/null
+++ b/roc-defaultent-model.json
@@ -0,0 +1,58 @@
+{
+ "default-target": "defaultent",
+ "Updates": {
+ "site-2.1.0": [
+ {
+ "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-2.1.0": [
+ {
+ "traffic-class-id": "class-1",
+ "description": "Default traffic-class for defaultent",
+ "display-name": "Class 1",
+ "qci": 10,
+ "arp": 1,
+ "pelr": 10,
+ "pdb": 100
+ }
+ ]
+ },
+ "Deletes": {},
+ "Extensions": {
+ "transaction-strategy-111": 1
+ }
+}
diff --git a/roc-defaultent-model.json.license b/roc-defaultent-model.json.license
new file mode 100644
index 0000000..ca3b916
--- /dev/null
+++ b/roc-defaultent-model.json.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2021 Open Networking Foundation
+
+SPDX-License-Identifier: Apache-2.0