AETHER-2864 AIAB : Subscriber proxy Integration issues
Change-Id: I672f021eea8e9896272925eea410473bb41511c8
diff --git a/4g-core-values.yaml b/4g-core-values.yaml
index acf50a0..b1394b4 100644
--- a/4g-core-values.yaml
+++ b/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/Makefile b/Makefile
index 3e78773..35b4949 100644
--- a/Makefile
+++ b/Makefile
@@ -279,7 +279,7 @@
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) ; \
+ sed -i 's/addr: config4g/addr: 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}"
@@ -293,7 +293,7 @@
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) ;\
+ sed -i 's/addr: webui/addr: 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}"
diff --git a/oaisim-values.yaml b/oaisim-values.yaml
index 708e258..acc3a34 100644
--- a/oaisim-values.yaml
+++ b/oaisim-values.yaml
@@ -15,7 +15,7 @@
mnc_length: 2
ue:
sim:
- msin: "4567891201"
+ msin: "0167891201"
api_key: "465b5ce8b199b49faa5f0a2ee238a6bc"
opc: "d4416644f6154936193433dd20a0ace0"
msisdn: "1122334456"
diff --git a/roc-4g-models-v4.json b/roc-4g-models-v4.json
index 7a80422..cce1e71 100644
--- a/roc-4g-models-v4.json
+++ b/roc-4g-models-v4.json
@@ -38,12 +38,38 @@
"device-group-4.0.0": {
"device-group": [
{
+ "display-name": "Unknown-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": [
{
- "imsi-range-from": 208014567891201,
- "imsi-range-to": 208014567891202,
+ "imsi-range-from": 67891201,
+ "imsi-range-to": 67891202,
"imsi-id": "aiab-imsis",
"display-name": "Valid 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",
@@ -78,6 +109,18 @@
"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",
"dnn": "internet",
"dns-primary": "8.8.8.8",
@@ -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,8 +153,8 @@
"imsi-definition": {
"mcc": "208",
"mnc": "01",
- "enterprise": 0,
- "format": "SSSSSSSSSSSSSSS"
+ "enterprise": 1,
+ "format": "CCCNNEESSSSSSSS"
},
"small-cell": [
{
diff --git a/roc-5g-models-v4.json b/roc-5g-models-v4.json
index 4363931..bf98cc2 100644
--- a/roc-5g-models-v4.json
+++ b/roc-5g-models-v4.json
@@ -38,7 +38,7 @@
"device-group-4.0.0": {
"device-group": [
{
- "display-name": "Unkown-Inventory",
+ "display-name": "Unknown-Inventory",
"id": "defaultent-defaultsite-default",
"ip-domain": "defaultent-defaultip",
"site": "defaultent-defaultsite",
@@ -68,8 +68,8 @@
"id": "aiab-device-group",
"imsis": [
{
- "imsi-range-from": 208930100007487,
- "imsi-range-to": 208930100007501,
+ "imsi-range-from": 7487,
+ "imsi-range-to": 7501,
"imsi-id": "aiab-imsis",
"display-name": "Valid IMSIs" }
],
@@ -154,7 +154,7 @@
"mcc": "208",
"mnc": "93",
"enterprise": 1,
- "format": "SSSSSSSSSSSSSSS"
+ "format": "CCCNNEESSSSSSSS"
},
"small-cell": [
{