AETHER-2426:Integrate subscriber proxy with AiaB
Change-Id: I8a9e2b5b5bb4df711b7232b65a8a815d27a8208d
diff --git a/Makefile b/Makefile
index 238d80b..4a2f024 100644
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,7 @@
DOCKER_VERSION ?= '20.10'
K8S_VERSION ?= v1.20.11
HELM_VERSION ?= v3.6.3
+ENABLE_SUBSCRIBER_PROXY ?= false
HELM_GLOBAL_ARGS ?=
@@ -275,6 +276,9 @@
roc-4g-models: $(M)/roc
sed -i 's/provision-network-slice: true/provision-network-slice: false/' $(4G_CORE_VALUES)
sed -i 's/# syncUrl/syncUrl/' $(4G_CORE_VALUES)
+ if [ "${ENABLE_SUBSCRIBER_PROXY}" == "true" ] ; then \
+ sed -i 's/config4g/subscriber-proxy.aether-roc.svc.cluster.local/' $(4G_CORE_VALUES) ; \
+ fi
$(eval ONOS_CLI_POD := $(shell kubectl -n aether-roc get pods -l name=onos-cli -o name))
echo "ONOS CLI pod: ${ONOS_CLI_POD}"
until kubectl -n aether-roc exec ${ONOS_CLI_POD} -- \
@@ -286,6 +290,9 @@
roc-5g-models: $(M)/roc
sed -i 's/provision-network-slice: true/provision-network-slice: false/' $(5G_CORE_VALUES)
sed -i 's/# syncUrl/syncUrl/' $(5G_CORE_VALUES)
+ if [ "${ENABLE_SUBSCRIBER_PROXY}" == "true" ] ; then \
+ sed -i 's/webui/subscriber-proxy.aether-roc.svc.cluster.local/' $(5G_CORE_VALUES) ;\
+ fi
$(eval ONOS_CLI_POD := $(shell kubectl -n aether-roc get pods -l name=onos-cli -o name))
echo "ONOS CLI pod: ${ONOS_CLI_POD}"
until kubectl -n aether-roc exec ${ONOS_CLI_POD} -- \
@@ -297,8 +304,10 @@
@echo "This could take 2-3 minutes..."
sed -i 's/provision-network-slice: false/provision-network-slice: true/' $(4G_CORE_VALUES)
sed -i 's/ syncUrl/ # syncUrl/' $(4G_CORE_VALUES)
+ sed -i 's/subscriber-proxy.aether-roc.svc.cluster.local/config4g/' $(4G_CORE_VALUES)
sed -i 's/provision-network-slice: false/provision-network-slice: true/' $(5G_CORE_VALUES)
sed -i 's/ syncUrl/ # syncUrl/' $(5G_CORE_VALUES)
+ sed -i 's/subscriber-proxy.aether-roc.svc.cluster.local/webui/' $(5G_CORE_VALUES)
kubectl delete namespace aether-roc || true
rm -rf $(M)/roc
diff --git a/roc-5g-models-v4.json b/roc-5g-models-v4.json
index 147b74a..1ca3e3f 100644
--- a/roc-5g-models-v4.json
+++ b/roc-5g-models-v4.json
@@ -38,6 +38,32 @@
"device-group-4.0.0": {
"device-group": [
{
+ "display-name": "Unkown-Inventory",
+ "id": "defaultent-defaultsite-default",
+ "ip-domain": "defaultent-defaultip",
+ "site": "defaultent-defaultsite",
+ "device": {
+ "mbr": {
+ "uplink": 1000000,
+ "downlink": 1000000
+ },
+ "traffic-class": "aiab-class-1"
+ }
+ },
+ {
+ "display-name": "AiaB-Inventory",
+ "id": "aiab-site-default",
+ "ip-domain": "aiab-ip-pool",
+ "site": "aiab-site",
+ "device": {
+ "mbr": {
+ "uplink": 1000000,
+ "downlink": 1000000
+ },
+ "traffic-class": "aiab-class-1"
+ }
+ },
+ {
"display-name": "AiaB Users",
"id": "aiab-device-group",
"imsis": [
@@ -62,6 +88,11 @@
"enterprise-4.0.0": {
"enterprise": [
{
+ "description": "This Enterprise holds discovered IMSIs that cannot be associated elsewhere.",
+ "display-name": "Default Enterprise",
+ "id": "defaultent"
+ },
+ {
"connectivity-service": [
{
"connectivity-service": "aiab-cs",
@@ -76,6 +107,18 @@
},
"ip-domain-4.0.0": {
"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",
+ "id": "defaultent-defaultip",
+ "mtu": 57600,
+ "subnet": "192.168.0.0/24",
+ "enterprise": "defaultent"
+ },
{
"admin-status": "ENABLE",
"display-name": "IP pool",
@@ -91,6 +134,18 @@
"site-4.0.0": {
"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": "AiaB test site",
"display-name": "AiaB site",
"enterprise": "aiab-enterprise",
@@ -98,7 +153,7 @@
"imsi-definition": {
"mcc": "208",
"mnc": "93",
- "enterprise": 0,
+ "enterprise": 1,
"format": "SSSSSSSSSSSSSSS"
},
"small-cell": [
@@ -176,3 +231,4 @@
"model-type-102": "Aether"
}
}
+