adding defaultent back in to ROC
also fixing 4g model connectivity-service
Change-Id: I8f749c2883ed53df1add559fe6a09d2967bd7f2f
diff --git a/roc-4g-models.json b/roc-4g-models.json
index 6ce17f7..45f5f24 100644
--- a/roc-4g-models.json
+++ b/roc-4g-models.json
@@ -1,5 +1,5 @@
{
- "default-target": "aiab-enterprise",
+ "default-target": "defaultent",
"Updates": {
"site-2.1.0": [
{
@@ -13,7 +13,7 @@
"format": "CCCNNEESSSSSSSS"
},
"connectivity-service": {
- "core-5g": {
+ "core-4g": {
"endpoint": "http://config4g.omec.svc:5000/config"
}
},
@@ -104,7 +104,7 @@
],
"filter": [],
"slice-id": "aiab-vcs",
- "connectivity-service": "5g",
+ "connectivity-service": "4g",
"sd": 66051,
"sst": 1,
"upf": "aiab-upf",
@@ -118,6 +118,45 @@
"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": [
@@ -131,6 +170,18 @@
"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"
+ }
}
]
},
diff --git a/roc-5g-models.json b/roc-5g-models.json
index 6739267..00d1396 100644
--- a/roc-5g-models.json
+++ b/roc-5g-models.json
@@ -299,6 +299,45 @@
"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": [
@@ -313,6 +352,18 @@
"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"
+ }
}
]
},
diff --git a/roc-values.yaml b/roc-values.yaml
index ecbb300..ce724ff 100644
--- a/roc-values.yaml
+++ b/roc-values.yaml
@@ -92,3 +92,5 @@
name: AiaB Enterprise
lat: 52.5150
long: 13.3885
+ - id: defaultent
+ name: Default Enterprise