AETHER-2864 AIAB : Subscriber proxy Integration issues

Change-Id: I672f021eea8e9896272925eea410473bb41511c8
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": [
                         {