scottk/wlan-cloud-opensync-controller
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-opensync-controller.git synced 2025-11-04 04:27:59 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

WIFI-908: Provision Hotspot20_Config in opensync database via opensync gateway, using new Hotspot/passpoint profiles

Browse Source 
WIFI-910: Provision Hotspot20_OSU_Providers in opensync database via opensync gateway, using new Hotspot/passpoint profiles
This commit is contained in:
Mike Hansen
2020-10-07 19:48:48 -04:00
parent d34f4934bd
commit 2d579a7f19
33 changed files with 3049 additions and 2764 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
opensync-ext-static/src/main/resources/ProfileAPExample.json
View File

@@ -1,6 +1,6 @@
{ {
"model_type": "Profile", "model_type": "Profile",
"id": 15, "id": 16,
"customerId": 2, "customerId": 2,
"profileType": "equipment_ap", "profileType": "equipment_ap",
"name": "ApProfile-3-radios", "name": "ApProfile-3-radios",
@@ -39,11 +39,12 @@
}, },
"profileType": "equipment_ap" "profileType": "equipment_ap"
}, },
"createdTimestamp": 1601961452652, "createdTimestamp": 1602113059824,
"lastModifiedTimestamp": 1601961452652, "lastModifiedTimestamp": 1602113059824,
"childProfileIds": [ "childProfileIds": [
2, 2,
9, 5,
11 10,
12
] ]
} }

25
opensync-ext-static/src/main/resources/ProfileHotspot20.json
View File

@@ -1,7 +1,7 @@
[ [
{ {
"model_type": "Profile", "model_type": "Profile",
"id": 8, "id": 9,
"customerId": 2, "customerId": 2,
"profileType": "hotspot_2pt0", "profileType": "hotspot_2pt0",
"name": "TipWlan-Hotspot20-Config", "name": "TipWlan-Hotspot20-Config",
@@ -45,9 +45,10 @@
"disableDownstreamGroupAddressedForwarding": false, "disableDownstreamGroupAddressedForwarding": false,
"enable2pt4GHz": true, "enable2pt4GHz": true,
"enable5GHz": true, "enable5GHz": true,
"associatedSsids": [ "associatedAccessSsidNames": [
"TipWlan-cloud-3-radios" "TipWlan-cloud-hotspot-access"
], ],
"osuSsidName": "TipWlan-cloud-3-radios",
"mccMnc3gppCellularNetworkInfo": [ "mccMnc3gppCellularNetworkInfo": [
{ {
"model_type": "MccMnc", "model_type": "MccMnc",
@@ -60,15 +61,23 @@
"mccMncPairing": "302,720" "mccMncPairing": "302,720"
} }
], ],
"operatorProfileName": "TipWlan-Hotspot20-Operator",
"venueProfileName": "TipWlan-Hotspot20-Venue",
"idProviderProfileNames": [
"TipWlan-Hotspot20-OSU-Provider"
],
"profileType": "hotspot_2pt0", "profileType": "hotspot_2pt0",
"mccMncList": "302,720" "mccMncList": "302,720",
"associatedSsids": [
"TipWlan-cloud-hotspot-access"
]
}, },
"createdTimestamp": 1602015574677, "createdTimestamp": 1602113059532,
"lastModifiedTimestamp": 1602015574677, "lastModifiedTimestamp": 1602113059532,
"childProfileIds": [ "childProfileIds": [
5,
6, 6,
7 7,
8
] ]
} }
] ]

15
opensync-ext-static/src/main/resources/ProfileIdProvider.json
View File

@@ -1,7 +1,7 @@
[ [
{ {
"model_type": "Profile", "model_type": "Profile",
"id": 7, "id": 8,
"customerId": 2, "customerId": 2,
"profileType": "id_provider", "profileType": "id_provider",
"name": "TipWlan-Hotspot20-OSU-Provider", "name": "TipWlan-Hotspot20-OSU-Provider",
@@ -29,19 +29,16 @@
], ],
"encoding": 0, "encoding": 0,
"eapMethods": [ "eapMethods": [
"EAP-MSCHAP-V2 with username/password",
"EAP-TTLS with username/password", "EAP-TTLS with username/password",
"EAP-TLS with certificate" "EAP-TLS with certificate"
], ],
"eapMap": { "eapMap": {
"EAP-MSCHAP-V2 with username/password": [ "EAP-TTLS with username/password": [
"Credential Type:username/password",
"Non-EAP Inner Authentication Type:MSCHAPV2" "Non-EAP Inner Authentication Type:MSCHAPV2"
], ],
"EAP-TTLS with username/password": [
"Credential Type:username/password"
],
"EAP-TLS with certificate": [ "EAP-TLS with certificate": [
"Credential Type:username/password" "Credential Type:Certificate"
] ]
} }
} }
@@ -107,8 +104,8 @@
], ],
"profileType": "id_provider" "profileType": "id_provider"
}, },
"createdTimestamp": 1602015574295, "createdTimestamp": 1602113059086,
"lastModifiedTimestamp": 1602015574295, "lastModifiedTimestamp": 1602113059086,
"childProfileIds": [] "childProfileIds": []
} }
] ]

214
opensync-ext-static/src/main/resources/ProfileMetrics.json
View File

@@ -9,8 +9,8 @@
"model_type": "ServiceMetricsCollectionConfigProfile", "model_type": "ServiceMetricsCollectionConfigProfile",
"radioTypes": [ "radioTypes": [
"is5GHzU", "is5GHzU",
"is2dot4GHz", "is5GHzL",
"is5GHzL" "is2dot4GHz"
], ],
"serviceMetricDataTypes": [ "serviceMetricDataTypes": [
"ApNode", "ApNode",
@@ -24,8 +24,32 @@
{ {
"model_type": "ServiceMetricSurveyConfigParameters", "model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30, "samplingInterval": 30,
"reportingIntervalSeconds": 60, "reportingIntervalSeconds": 120,
"channelSurveyType": "ON_CHANNEL", "channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzU",
"serviceMetricDataType": "ApNode"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"serviceMetricDataType": "ApNode"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0, "scanIntervalMillis": 0,
"percentUtilizationThreshold": 10, "percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600, "delayMillisecondsThreshold": 600,
@@ -48,13 +72,13 @@
{ {
"model_type": "ServiceMetricSurveyConfigParameters", "model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30, "samplingInterval": 30,
"reportingIntervalSeconds": 120, "reportingIntervalSeconds": 60,
"channelSurveyType": "OFF_CHANNEL", "channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0, "scanIntervalMillis": 0,
"percentUtilizationThreshold": 10, "percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600, "delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW", "statsReportFormat": "RAW",
"radioType": "is5GHzU", "radioType": "is2dot4GHz",
"serviceMetricDataType": "ApNode" "serviceMetricDataType": "ApNode"
}, },
{ {
@@ -68,30 +92,6 @@
"statsReportFormat": "RAW", "statsReportFormat": "RAW",
"radioType": "is5GHzU", "radioType": "is5GHzU",
"serviceMetricDataType": "ApNode" "serviceMetricDataType": "ApNode"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "ApNode"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"serviceMetricDataType": "ApNode"
} }
], ],
"ApSsid": [ "ApSsid": [
@@ -99,14 +99,14 @@
"model_type": "ServiceMetricRadioConfigParameters", "model_type": "ServiceMetricRadioConfigParameters",
"samplingInterval": 30, "samplingInterval": 30,
"reportingIntervalSeconds": 60, "reportingIntervalSeconds": 60,
"radioType": "is5GHzL", "radioType": "is2dot4GHz",
"serviceMetricDataType": "ApSsid" "serviceMetricDataType": "ApSsid"
}, },
{ {
"model_type": "ServiceMetricRadioConfigParameters", "model_type": "ServiceMetricRadioConfigParameters",
"samplingInterval": 30, "samplingInterval": 30,
"reportingIntervalSeconds": 60, "reportingIntervalSeconds": 60,
"radioType": "is2dot4GHz", "radioType": "is5GHzL",
"serviceMetricDataType": "ApSsid" "serviceMetricDataType": "ApSsid"
}, },
{ {
@@ -118,6 +118,13 @@
} }
], ],
"Client": [ "Client": [
{
"model_type": "ServiceMetricRadioConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Client"
},
{ {
"model_type": "ServiceMetricRadioConfigParameters", "model_type": "ServiceMetricRadioConfigParameters",
"samplingInterval": 30, "samplingInterval": 30,
@@ -131,21 +138,38 @@
"reportingIntervalSeconds": 60, "reportingIntervalSeconds": 60,
"radioType": "is5GHzU", "radioType": "is5GHzU",
"serviceMetricDataType": "Client" "serviceMetricDataType": "Client"
},
{
"model_type": "ServiceMetricRadioConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Client"
} }
], ],
"Channel": [ "Channel": [
{ {
"model_type": "ServiceMetricSurveyConfigParameters", "model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30, "samplingInterval": 30,
"reportingIntervalSeconds": 120, "reportingIntervalSeconds": 60,
"channelSurveyType": "OFF_CHANNEL", "channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0, "scanIntervalMillis": 0,
"percentUtilizationThreshold": 10, "percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600, "delayMillisecondsThreshold": 600,
@@ -156,13 +180,13 @@
{ {
"model_type": "ServiceMetricSurveyConfigParameters", "model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30, "samplingInterval": 30,
"reportingIntervalSeconds": 60, "reportingIntervalSeconds": 120,
"channelSurveyType": "ON_CHANNEL", "channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0, "scanIntervalMillis": 0,
"percentUtilizationThreshold": 10, "percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600, "delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW", "statsReportFormat": "RAW",
"radioType": "is2dot4GHz", "radioType": "is5GHzL",
"serviceMetricDataType": "Channel" "serviceMetricDataType": "Channel"
}, },
{ {
@@ -186,71 +210,11 @@
"percentUtilizationThreshold": 10, "percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600, "delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW", "statsReportFormat": "RAW",
"radioType": "is5GHzL",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzU", "radioType": "is5GHzU",
"serviceMetricDataType": "Channel" "serviceMetricDataType": "Channel"
} }
], ],
"Neighbour": [ "Neighbour": [
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzU",
"serviceMetricDataType": "Neighbour"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Neighbour"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Neighbour"
},
{ {
"model_type": "ServiceMetricSurveyConfigParameters", "model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30, "samplingInterval": 30,
@@ -263,6 +227,18 @@
"radioType": "is5GHzL", "radioType": "is5GHzL",
"serviceMetricDataType": "Neighbour" "serviceMetricDataType": "Neighbour"
}, },
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Neighbour"
},
{ {
"model_type": "ServiceMetricSurveyConfigParameters", "model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30, "samplingInterval": 30,
@@ -275,6 +251,18 @@
"radioType": "is5GHzU", "radioType": "is5GHzU",
"serviceMetricDataType": "Neighbour" "serviceMetricDataType": "Neighbour"
}, },
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzU",
"serviceMetricDataType": "Neighbour"
},
{ {
"model_type": "ServiceMetricSurveyConfigParameters", "model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30, "samplingInterval": 30,
@@ -286,13 +274,25 @@
"statsReportFormat": "RAW", "statsReportFormat": "RAW",
"radioType": "is5GHzL", "radioType": "is5GHzL",
"serviceMetricDataType": "Neighbour" "serviceMetricDataType": "Neighbour"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Neighbour"
} }
] ]
}, },
"profileType": "metrics" "profileType": "metrics"
}, },
"createdTimestamp": 1601961451756, "createdTimestamp": 1602113058699,
"lastModifiedTimestamp": 1601961451756, "lastModifiedTimestamp": 1602113058699,
"childProfileIds": [] "childProfileIds": []
} }
] ]

6
opensync-ext-static/src/main/resources/ProfileOperator.json
View File

@@ -1,7 +1,7 @@
[ [
{ {
"model_type": "Profile", "model_type": "Profile",
"id": 5, "id": 6,
"customerId": 2, "customerId": 2,
"profileType": "operator", "profileType": "operator",
"name": "TipWlan-Hotspot20-Operator", "name": "TipWlan-Hotspot20-Operator",
@@ -30,8 +30,8 @@
], ],
"profileType": "operator" "profileType": "operator"
}, },
"createdTimestamp": 1602015573969, "createdTimestamp": 1602113058719,
"lastModifiedTimestamp": 1602015573969, "lastModifiedTimestamp": 1602113058719,
"childProfileIds": [] "childProfileIds": []
} }
] ]

6
opensync-ext-static/src/main/resources/ProfileRf.json
View File

@@ -1,6 +1,6 @@
{ {
"model_type": "Profile", "model_type": "Profile",
"id": 11, "id": 12,
"customerId": 2, "customerId": 2,
"profileType": "rf", "profileType": "rf",
"name": "TipWlan-rf", "name": "TipWlan-rf",
@@ -250,7 +250,7 @@
}, },
"profileType": "rf" "profileType": "rf"
}, },
"createdTimestamp": 1601961452390, "createdTimestamp": 1602113059555,
"lastModifiedTimestamp": 1601961452390, "lastModifiedTimestamp": 1602113059555,
"childProfileIds": [] "childProfileIds": []
} }

77
opensync-ext-static/src/main/resources/ProfileSsid.json
View File

@@ -1,7 +1,73 @@
[ [
{ {
"model_type": "Profile", "model_type": "Profile",
"id": 9, "id": 5,
"customerId": 2,
"profileType": "ssid",
"name": "TipWlan-cloud-hotspot-access",
"details": {
"model_type": "SsidConfiguration",
"ssid": "Default-SSID-1602113058718",
"appliedRadios": [
"is5GHzU",
"is5GHzL",
"is2dot4GHz"
],
"ssidAdminState": "enabled",
"secureMode": "wpa2PSK",
"vlanId": 1,
"keyStr": "testing123",
"broadcastSsid": "enabled",
"keyRefresh": 0,
"noLocalSubnets": false,
"radiusServiceName": null,
"captivePortalId": null,
"bandwidthLimitDown": 0,
"bandwidthLimitUp": 0,
"clientBandwidthLimitDown": 0,
"clientBandwidthLimitUp": 0,
"videoTrafficOnly": false,
"radioBasedConfigs": {
"is5GHz": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is2dot4GHz": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is5GHzU": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is5GHzL": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
}
},
"bonjourGatewayProfileId": null,
"enable80211w": null,
"wepConfig": null,
"forwardMode": null,
"profileType": "ssid"
},
"createdTimestamp": 1602113058718,
"lastModifiedTimestamp": 1602113059547,
"childProfileIds": [
9
]
},
{
"model_type": "Profile",
"id": 10,
"customerId": 2, "customerId": 2,
"profileType": "ssid", "profileType": "ssid",
"name": "TipWlan-cloud-3-radios", "name": "TipWlan-cloud-3-radios",
@@ -10,8 +76,8 @@
"ssid": "TipWlan-cloud-3-radios", "ssid": "TipWlan-cloud-3-radios",
"appliedRadios": [ "appliedRadios": [
"is5GHzU", "is5GHzU",
"is2dot4GHz", "is5GHzL",
"is5GHzL" "is2dot4GHz"
], ],
"ssidAdminState": "enabled", "ssidAdminState": "enabled",
"secureMode": "open", "secureMode": "open",
@@ -59,10 +125,9 @@
"forwardMode": null, "forwardMode": null,
"profileType": "ssid" "profileType": "ssid"
}, },
"createdTimestamp": 1601961452385, "createdTimestamp": 1602113059549,
"lastModifiedTimestamp": 1601961452385, "lastModifiedTimestamp": 1602113059549,
"childProfileIds": [ "childProfileIds": [
7,
8 8
] ]
} }

6
opensync-ext-static/src/main/resources/ProfileVenue.json
View File

@@ -1,7 +1,7 @@
[ [
{ {
"model_type": "Profile", "model_type": "Profile",
"id": 6, "id": 7,
"customerId": 2, "customerId": 2,
"profileType": "venue", "profileType": "venue",
"name": "TipWlan-Hotspot20-Venue", "name": "TipWlan-Hotspot20-Venue",
@@ -35,8 +35,8 @@
}, },
"profileType": "venue" "profileType": "venue"
}, },
"createdTimestamp": 1602015573975, "createdTimestamp": 1602113058725,
"lastModifiedTimestamp": 1602015573975, "lastModifiedTimestamp": 1602113058725,
"childProfileIds": [] "childProfileIds": []
} }
] ]

11
opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileAPExample.json
View File

@@ -1,6 +1,6 @@
{ {
"model_type": "Profile", "model_type": "Profile",
"id": 15, "id": 16,
"customerId": 2, "customerId": 2,
"profileType": "equipment_ap", "profileType": "equipment_ap",
"name": "ApProfile-3-radios", "name": "ApProfile-3-radios",
@@ -39,11 +39,12 @@
}, },
"profileType": "equipment_ap" "profileType": "equipment_ap"
}, },
"createdTimestamp": 1601961452652, "createdTimestamp": 1602113059824,
"lastModifiedTimestamp": 1601961452652, "lastModifiedTimestamp": 1602113059824,
"childProfileIds": [ "childProfileIds": [
2, 2,
9, 5,
11 10,
12
] ]
} }

25
opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileHotspot20.json
View File

@@ -1,7 +1,7 @@
[ [
{ {
"model_type": "Profile", "model_type": "Profile",
"id": 8, "id": 9,
"customerId": 2, "customerId": 2,
"profileType": "hotspot_2pt0", "profileType": "hotspot_2pt0",
"name": "TipWlan-Hotspot20-Config", "name": "TipWlan-Hotspot20-Config",
@@ -45,9 +45,10 @@
"disableDownstreamGroupAddressedForwarding": false, "disableDownstreamGroupAddressedForwarding": false,
"enable2pt4GHz": true, "enable2pt4GHz": true,
"enable5GHz": true, "enable5GHz": true,
"associatedSsids": [ "associatedAccessSsidNames": [
"TipWlan-cloud-3-radios" "TipWlan-cloud-hotspot-access"
], ],
"osuSsidName": "TipWlan-cloud-3-radios",
"mccMnc3gppCellularNetworkInfo": [ "mccMnc3gppCellularNetworkInfo": [
{ {
"model_type": "MccMnc", "model_type": "MccMnc",
@@ -60,15 +61,23 @@
"mccMncPairing": "302,720" "mccMncPairing": "302,720"
} }
], ],
"operatorProfileName": "TipWlan-Hotspot20-Operator",
"venueProfileName": "TipWlan-Hotspot20-Venue",
"idProviderProfileNames": [
"TipWlan-Hotspot20-OSU-Provider"
],
"profileType": "hotspot_2pt0", "profileType": "hotspot_2pt0",
"mccMncList": "302,720" "mccMncList": "302,720",
"associatedSsids": [
"TipWlan-cloud-hotspot-access"
]
}, },
"createdTimestamp": 1602015574677, "createdTimestamp": 1602113059532,
"lastModifiedTimestamp": 1602015574677, "lastModifiedTimestamp": 1602113059532,
"childProfileIds": [ "childProfileIds": [
5,
6, 6,
7 7,
8
] ]
} }
] ]

15
opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileIdProvider.json
View File

@@ -1,7 +1,7 @@
[ [
{ {
"model_type": "Profile", "model_type": "Profile",
"id": 7, "id": 8,
"customerId": 2, "customerId": 2,
"profileType": "id_provider", "profileType": "id_provider",
"name": "TipWlan-Hotspot20-OSU-Provider", "name": "TipWlan-Hotspot20-OSU-Provider",
@@ -29,19 +29,16 @@
], ],
"encoding": 0, "encoding": 0,
"eapMethods": [ "eapMethods": [
"EAP-MSCHAP-V2 with username/password",
"EAP-TTLS with username/password", "EAP-TTLS with username/password",
"EAP-TLS with certificate" "EAP-TLS with certificate"
], ],
"eapMap": { "eapMap": {
"EAP-MSCHAP-V2 with username/password": [ "EAP-TTLS with username/password": [
"Credential Type:username/password",
"Non-EAP Inner Authentication Type:MSCHAPV2" "Non-EAP Inner Authentication Type:MSCHAPV2"
], ],
"EAP-TTLS with username/password": [
"Credential Type:username/password"
],
"EAP-TLS with certificate": [ "EAP-TLS with certificate": [
"Credential Type:username/password" "Credential Type:Certificate"
] ]
} }
} }
@@ -107,8 +104,8 @@
], ],
"profileType": "id_provider" "profileType": "id_provider"
}, },
"createdTimestamp": 1602015574295, "createdTimestamp": 1602113059086,
"lastModifiedTimestamp": 1602015574295, "lastModifiedTimestamp": 1602113059086,
"childProfileIds": [] "childProfileIds": []
} }
] ]

214
opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileMetrics.json
View File

@@ -9,8 +9,8 @@
"model_type": "ServiceMetricsCollectionConfigProfile", "model_type": "ServiceMetricsCollectionConfigProfile",
"radioTypes": [ "radioTypes": [
"is5GHzU", "is5GHzU",
"is2dot4GHz", "is5GHzL",
"is5GHzL" "is2dot4GHz"
], ],
"serviceMetricDataTypes": [ "serviceMetricDataTypes": [
"ApNode", "ApNode",
@@ -24,8 +24,32 @@
{ {
"model_type": "ServiceMetricSurveyConfigParameters", "model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30, "samplingInterval": 30,
"reportingIntervalSeconds": 60, "reportingIntervalSeconds": 120,
"channelSurveyType": "ON_CHANNEL", "channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzU",
"serviceMetricDataType": "ApNode"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"serviceMetricDataType": "ApNode"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0, "scanIntervalMillis": 0,
"percentUtilizationThreshold": 10, "percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600, "delayMillisecondsThreshold": 600,
@@ -48,13 +72,13 @@
{ {
"model_type": "ServiceMetricSurveyConfigParameters", "model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30, "samplingInterval": 30,
"reportingIntervalSeconds": 120, "reportingIntervalSeconds": 60,
"channelSurveyType": "OFF_CHANNEL", "channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0, "scanIntervalMillis": 0,
"percentUtilizationThreshold": 10, "percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600, "delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW", "statsReportFormat": "RAW",
"radioType": "is5GHzU", "radioType": "is2dot4GHz",
"serviceMetricDataType": "ApNode" "serviceMetricDataType": "ApNode"
}, },
{ {
@@ -68,30 +92,6 @@
"statsReportFormat": "RAW", "statsReportFormat": "RAW",
"radioType": "is5GHzU", "radioType": "is5GHzU",
"serviceMetricDataType": "ApNode" "serviceMetricDataType": "ApNode"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "ApNode"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"serviceMetricDataType": "ApNode"
} }
], ],
"ApSsid": [ "ApSsid": [
@@ -99,14 +99,14 @@
"model_type": "ServiceMetricRadioConfigParameters", "model_type": "ServiceMetricRadioConfigParameters",
"samplingInterval": 30, "samplingInterval": 30,
"reportingIntervalSeconds": 60, "reportingIntervalSeconds": 60,
"radioType": "is5GHzL", "radioType": "is2dot4GHz",
"serviceMetricDataType": "ApSsid" "serviceMetricDataType": "ApSsid"
}, },
{ {
"model_type": "ServiceMetricRadioConfigParameters", "model_type": "ServiceMetricRadioConfigParameters",
"samplingInterval": 30, "samplingInterval": 30,
"reportingIntervalSeconds": 60, "reportingIntervalSeconds": 60,
"radioType": "is2dot4GHz", "radioType": "is5GHzL",
"serviceMetricDataType": "ApSsid" "serviceMetricDataType": "ApSsid"
}, },
{ {
@@ -118,6 +118,13 @@
} }
], ],
"Client": [ "Client": [
{
"model_type": "ServiceMetricRadioConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Client"
},
{ {
"model_type": "ServiceMetricRadioConfigParameters", "model_type": "ServiceMetricRadioConfigParameters",
"samplingInterval": 30, "samplingInterval": 30,
@@ -131,21 +138,38 @@
"reportingIntervalSeconds": 60, "reportingIntervalSeconds": 60,
"radioType": "is5GHzU", "radioType": "is5GHzU",
"serviceMetricDataType": "Client" "serviceMetricDataType": "Client"
},
{
"model_type": "ServiceMetricRadioConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Client"
} }
], ],
"Channel": [ "Channel": [
{ {
"model_type": "ServiceMetricSurveyConfigParameters", "model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30, "samplingInterval": 30,
"reportingIntervalSeconds": 120, "reportingIntervalSeconds": 60,
"channelSurveyType": "OFF_CHANNEL", "channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0, "scanIntervalMillis": 0,
"percentUtilizationThreshold": 10, "percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600, "delayMillisecondsThreshold": 600,
@@ -156,13 +180,13 @@
{ {
"model_type": "ServiceMetricSurveyConfigParameters", "model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30, "samplingInterval": 30,
"reportingIntervalSeconds": 60, "reportingIntervalSeconds": 120,
"channelSurveyType": "ON_CHANNEL", "channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0, "scanIntervalMillis": 0,
"percentUtilizationThreshold": 10, "percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600, "delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW", "statsReportFormat": "RAW",
"radioType": "is2dot4GHz", "radioType": "is5GHzL",
"serviceMetricDataType": "Channel" "serviceMetricDataType": "Channel"
}, },
{ {
@@ -186,71 +210,11 @@
"percentUtilizationThreshold": 10, "percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600, "delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW", "statsReportFormat": "RAW",
"radioType": "is5GHzL",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzU", "radioType": "is5GHzU",
"serviceMetricDataType": "Channel" "serviceMetricDataType": "Channel"
} }
], ],
"Neighbour": [ "Neighbour": [
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzU",
"serviceMetricDataType": "Neighbour"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Neighbour"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Neighbour"
},
{ {
"model_type": "ServiceMetricSurveyConfigParameters", "model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30, "samplingInterval": 30,
@@ -263,6 +227,18 @@
"radioType": "is5GHzL", "radioType": "is5GHzL",
"serviceMetricDataType": "Neighbour" "serviceMetricDataType": "Neighbour"
}, },
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Neighbour"
},
{ {
"model_type": "ServiceMetricSurveyConfigParameters", "model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30, "samplingInterval": 30,
@@ -275,6 +251,18 @@
"radioType": "is5GHzU", "radioType": "is5GHzU",
"serviceMetricDataType": "Neighbour" "serviceMetricDataType": "Neighbour"
}, },
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzU",
"serviceMetricDataType": "Neighbour"
},
{ {
"model_type": "ServiceMetricSurveyConfigParameters", "model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30, "samplingInterval": 30,
@@ -286,13 +274,25 @@
"statsReportFormat": "RAW", "statsReportFormat": "RAW",
"radioType": "is5GHzL", "radioType": "is5GHzL",
"serviceMetricDataType": "Neighbour" "serviceMetricDataType": "Neighbour"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Neighbour"
} }
] ]
}, },
"profileType": "metrics" "profileType": "metrics"
}, },
"createdTimestamp": 1601961451756, "createdTimestamp": 1602113058699,
"lastModifiedTimestamp": 1601961451756, "lastModifiedTimestamp": 1602113058699,
"childProfileIds": [] "childProfileIds": []
} }
] ]

6
opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileOperator.json
View File

@@ -1,7 +1,7 @@
[ [
{ {
"model_type": "Profile", "model_type": "Profile",
"id": 5, "id": 6,
"customerId": 2, "customerId": 2,
"profileType": "operator", "profileType": "operator",
"name": "TipWlan-Hotspot20-Operator", "name": "TipWlan-Hotspot20-Operator",
@@ -30,8 +30,8 @@
], ],
"profileType": "operator" "profileType": "operator"
}, },
"createdTimestamp": 1602015573969, "createdTimestamp": 1602113058719,
"lastModifiedTimestamp": 1602015573969, "lastModifiedTimestamp": 1602113058719,
"childProfileIds": [] "childProfileIds": []
} }
] ]

6
opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileRf.json
View File

@@ -1,6 +1,6 @@
{ {
"model_type": "Profile", "model_type": "Profile",
"id": 11, "id": 12,
"customerId": 2, "customerId": 2,
"profileType": "rf", "profileType": "rf",
"name": "TipWlan-rf", "name": "TipWlan-rf",
@@ -250,7 +250,7 @@
}, },
"profileType": "rf" "profileType": "rf"
}, },
"createdTimestamp": 1601961452390, "createdTimestamp": 1602113059555,
"lastModifiedTimestamp": 1601961452390, "lastModifiedTimestamp": 1602113059555,
"childProfileIds": [] "childProfileIds": []
} }

77
opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileSsid.json
View File

@@ -1,7 +1,73 @@
[ [
{ {
"model_type": "Profile", "model_type": "Profile",
"id": 9, "id": 5,
"customerId": 2,
"profileType": "ssid",
"name": "TipWlan-cloud-hotspot-access",
"details": {
"model_type": "SsidConfiguration",
"ssid": "Default-SSID-1602113058718",
"appliedRadios": [
"is5GHzU",
"is5GHzL",
"is2dot4GHz"
],
"ssidAdminState": "enabled",
"secureMode": "wpa2PSK",
"vlanId": 1,
"keyStr": "testing123",
"broadcastSsid": "enabled",
"keyRefresh": 0,
"noLocalSubnets": false,
"radiusServiceName": null,
"captivePortalId": null,
"bandwidthLimitDown": 0,
"bandwidthLimitUp": 0,
"clientBandwidthLimitDown": 0,
"clientBandwidthLimitUp": 0,
"videoTrafficOnly": false,
"radioBasedConfigs": {
"is5GHz": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is2dot4GHz": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is5GHzU": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is5GHzL": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
}
},
"bonjourGatewayProfileId": null,
"enable80211w": null,
"wepConfig": null,
"forwardMode": null,
"profileType": "ssid"
},
"createdTimestamp": 1602113058718,
"lastModifiedTimestamp": 1602113059547,
"childProfileIds": [
9
]
},
{
"model_type": "Profile",
"id": 10,
"customerId": 2, "customerId": 2,
"profileType": "ssid", "profileType": "ssid",
"name": "TipWlan-cloud-3-radios", "name": "TipWlan-cloud-3-radios",
@@ -10,8 +76,8 @@
"ssid": "TipWlan-cloud-3-radios", "ssid": "TipWlan-cloud-3-radios",
"appliedRadios": [ "appliedRadios": [
"is5GHzU", "is5GHzU",
"is2dot4GHz", "is5GHzL",
"is5GHzL" "is2dot4GHz"
], ],
"ssidAdminState": "enabled", "ssidAdminState": "enabled",
"secureMode": "open", "secureMode": "open",
@@ -59,10 +125,9 @@
"forwardMode": null, "forwardMode": null,
"profileType": "ssid" "profileType": "ssid"
}, },
"createdTimestamp": 1601961452385, "createdTimestamp": 1602113059549,
"lastModifiedTimestamp": 1601961452385, "lastModifiedTimestamp": 1602113059549,
"childProfileIds": [ "childProfileIds": [
7,
8 8
] ]
} }

6
opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileVenue.json
View File

@@ -1,7 +1,7 @@
[ [
{ {
"model_type": "Profile", "model_type": "Profile",
"id": 6, "id": 7,
"customerId": 2, "customerId": 2,
"profileType": "venue", "profileType": "venue",
"name": "TipWlan-Hotspot20-Venue", "name": "TipWlan-Hotspot20-Venue",
@@ -35,8 +35,8 @@
}, },
"profileType": "venue" "profileType": "venue"
}, },
"createdTimestamp": 1602015573975, "createdTimestamp": 1602113058725,
"lastModifiedTimestamp": 1602015573975, "lastModifiedTimestamp": 1602113058725,
"childProfileIds": [] "childProfileIds": []
} }
] ]

11
opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileAPExample.json
View File

@@ -1,6 +1,6 @@
{ {
"model_type": "Profile", "model_type": "Profile",
"id": 15, "id": 16,
"customerId": 2, "customerId": 2,
"profileType": "equipment_ap", "profileType": "equipment_ap",
"name": "ApProfile-3-radios", "name": "ApProfile-3-radios",
@@ -39,11 +39,12 @@
}, },
"profileType": "equipment_ap" "profileType": "equipment_ap"
}, },
"createdTimestamp": 1601961452652, "createdTimestamp": 1602113059824,
"lastModifiedTimestamp": 1601961452652, "lastModifiedTimestamp": 1602113059824,
"childProfileIds": [ "childProfileIds": [
2, 2,
9, 5,
11 10,
12
] ]
} }

25
opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileHotspot20.json
View File

@@ -1,7 +1,7 @@
[ [
{ {
"model_type": "Profile", "model_type": "Profile",
"id": 8, "id": 9,
"customerId": 2, "customerId": 2,
"profileType": "hotspot_2pt0", "profileType": "hotspot_2pt0",
"name": "TipWlan-Hotspot20-Config", "name": "TipWlan-Hotspot20-Config",
@@ -45,9 +45,10 @@
"disableDownstreamGroupAddressedForwarding": false, "disableDownstreamGroupAddressedForwarding": false,
"enable2pt4GHz": true, "enable2pt4GHz": true,
"enable5GHz": true, "enable5GHz": true,
"associatedSsids": [ "associatedAccessSsidNames": [
"TipWlan-cloud-3-radios" "TipWlan-cloud-hotspot-access"
], ],
"osuSsidName": "TipWlan-cloud-3-radios",
"mccMnc3gppCellularNetworkInfo": [ "mccMnc3gppCellularNetworkInfo": [
{ {
"model_type": "MccMnc", "model_type": "MccMnc",
@@ -60,15 +61,23 @@
"mccMncPairing": "302,720" "mccMncPairing": "302,720"
} }
], ],
"operatorProfileName": "TipWlan-Hotspot20-Operator",
"venueProfileName": "TipWlan-Hotspot20-Venue",
"idProviderProfileNames": [
"TipWlan-Hotspot20-OSU-Provider"
],
"profileType": "hotspot_2pt0", "profileType": "hotspot_2pt0",
"mccMncList": "302,720" "mccMncList": "302,720",
"associatedSsids": [
"TipWlan-cloud-hotspot-access"
]
}, },
"createdTimestamp": 1602015574677, "createdTimestamp": 1602113059532,
"lastModifiedTimestamp": 1602015574677, "lastModifiedTimestamp": 1602113059532,
"childProfileIds": [ "childProfileIds": [
5,
6, 6,
7 7,
8
] ]
} }
] ]

15
opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileIdProvider.json
View File

@@ -1,7 +1,7 @@
[ [
{ {
"model_type": "Profile", "model_type": "Profile",
"id": 7, "id": 8,
"customerId": 2, "customerId": 2,
"profileType": "id_provider", "profileType": "id_provider",
"name": "TipWlan-Hotspot20-OSU-Provider", "name": "TipWlan-Hotspot20-OSU-Provider",
@@ -29,19 +29,16 @@
], ],
"encoding": 0, "encoding": 0,
"eapMethods": [ "eapMethods": [
"EAP-MSCHAP-V2 with username/password",
"EAP-TTLS with username/password", "EAP-TTLS with username/password",
"EAP-TLS with certificate" "EAP-TLS with certificate"
], ],
"eapMap": { "eapMap": {
"EAP-MSCHAP-V2 with username/password": [ "EAP-TTLS with username/password": [
"Credential Type:username/password",
"Non-EAP Inner Authentication Type:MSCHAPV2" "Non-EAP Inner Authentication Type:MSCHAPV2"
], ],
"EAP-TTLS with username/password": [
"Credential Type:username/password"
],
"EAP-TLS with certificate": [ "EAP-TLS with certificate": [
"Credential Type:username/password" "Credential Type:Certificate"
] ]
} }
} }
@@ -107,8 +104,8 @@
], ],
"profileType": "id_provider" "profileType": "id_provider"
}, },
"createdTimestamp": 1602015574295, "createdTimestamp": 1602113059086,
"lastModifiedTimestamp": 1602015574295, "lastModifiedTimestamp": 1602113059086,
"childProfileIds": [] "childProfileIds": []
} }
] ]

214
opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileMetrics.json
View File

@@ -9,8 +9,8 @@
"model_type": "ServiceMetricsCollectionConfigProfile", "model_type": "ServiceMetricsCollectionConfigProfile",
"radioTypes": [ "radioTypes": [
"is5GHzU", "is5GHzU",
"is2dot4GHz", "is5GHzL",
"is5GHzL" "is2dot4GHz"
], ],
"serviceMetricDataTypes": [ "serviceMetricDataTypes": [
"ApNode", "ApNode",
@@ -24,8 +24,32 @@
{ {
"model_type": "ServiceMetricSurveyConfigParameters", "model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30, "samplingInterval": 30,
"reportingIntervalSeconds": 60, "reportingIntervalSeconds": 120,
"channelSurveyType": "ON_CHANNEL", "channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzU",
"serviceMetricDataType": "ApNode"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"serviceMetricDataType": "ApNode"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0, "scanIntervalMillis": 0,
"percentUtilizationThreshold": 10, "percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600, "delayMillisecondsThreshold": 600,
@@ -48,13 +72,13 @@
{ {
"model_type": "ServiceMetricSurveyConfigParameters", "model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30, "samplingInterval": 30,
"reportingIntervalSeconds": 120, "reportingIntervalSeconds": 60,
"channelSurveyType": "OFF_CHANNEL", "channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0, "scanIntervalMillis": 0,
"percentUtilizationThreshold": 10, "percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600, "delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW", "statsReportFormat": "RAW",
"radioType": "is5GHzU", "radioType": "is2dot4GHz",
"serviceMetricDataType": "ApNode" "serviceMetricDataType": "ApNode"
}, },
{ {
@@ -68,30 +92,6 @@
"statsReportFormat": "RAW", "statsReportFormat": "RAW",
"radioType": "is5GHzU", "radioType": "is5GHzU",
"serviceMetricDataType": "ApNode" "serviceMetricDataType": "ApNode"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "ApNode"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"serviceMetricDataType": "ApNode"
} }
], ],
"ApSsid": [ "ApSsid": [
@@ -99,14 +99,14 @@
"model_type": "ServiceMetricRadioConfigParameters", "model_type": "ServiceMetricRadioConfigParameters",
"samplingInterval": 30, "samplingInterval": 30,
"reportingIntervalSeconds": 60, "reportingIntervalSeconds": 60,
"radioType": "is5GHzL", "radioType": "is2dot4GHz",
"serviceMetricDataType": "ApSsid" "serviceMetricDataType": "ApSsid"
}, },
{ {
"model_type": "ServiceMetricRadioConfigParameters", "model_type": "ServiceMetricRadioConfigParameters",
"samplingInterval": 30, "samplingInterval": 30,
"reportingIntervalSeconds": 60, "reportingIntervalSeconds": 60,
"radioType": "is2dot4GHz", "radioType": "is5GHzL",
"serviceMetricDataType": "ApSsid" "serviceMetricDataType": "ApSsid"
}, },
{ {
@@ -118,6 +118,13 @@
} }
], ],
"Client": [ "Client": [
{
"model_type": "ServiceMetricRadioConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Client"
},
{ {
"model_type": "ServiceMetricRadioConfigParameters", "model_type": "ServiceMetricRadioConfigParameters",
"samplingInterval": 30, "samplingInterval": 30,
@@ -131,21 +138,38 @@
"reportingIntervalSeconds": 60, "reportingIntervalSeconds": 60,
"radioType": "is5GHzU", "radioType": "is5GHzU",
"serviceMetricDataType": "Client" "serviceMetricDataType": "Client"
},
{
"model_type": "ServiceMetricRadioConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Client"
} }
], ],
"Channel": [ "Channel": [
{ {
"model_type": "ServiceMetricSurveyConfigParameters", "model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30, "samplingInterval": 30,
"reportingIntervalSeconds": 120, "reportingIntervalSeconds": 60,
"channelSurveyType": "OFF_CHANNEL", "channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0, "scanIntervalMillis": 0,
"percentUtilizationThreshold": 10, "percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600, "delayMillisecondsThreshold": 600,
@@ -156,13 +180,13 @@
{ {
"model_type": "ServiceMetricSurveyConfigParameters", "model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30, "samplingInterval": 30,
"reportingIntervalSeconds": 60, "reportingIntervalSeconds": 120,
"channelSurveyType": "ON_CHANNEL", "channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0, "scanIntervalMillis": 0,
"percentUtilizationThreshold": 10, "percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600, "delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW", "statsReportFormat": "RAW",
"radioType": "is2dot4GHz", "radioType": "is5GHzL",
"serviceMetricDataType": "Channel" "serviceMetricDataType": "Channel"
}, },
{ {
@@ -186,71 +210,11 @@
"percentUtilizationThreshold": 10, "percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600, "delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW", "statsReportFormat": "RAW",
"radioType": "is5GHzL",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzU", "radioType": "is5GHzU",
"serviceMetricDataType": "Channel" "serviceMetricDataType": "Channel"
} }
], ],
"Neighbour": [ "Neighbour": [
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzU",
"serviceMetricDataType": "Neighbour"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Neighbour"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Neighbour"
},
{ {
"model_type": "ServiceMetricSurveyConfigParameters", "model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30, "samplingInterval": 30,
@@ -263,6 +227,18 @@
"radioType": "is5GHzL", "radioType": "is5GHzL",
"serviceMetricDataType": "Neighbour" "serviceMetricDataType": "Neighbour"
}, },
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Neighbour"
},
{ {
"model_type": "ServiceMetricSurveyConfigParameters", "model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30, "samplingInterval": 30,
@@ -275,6 +251,18 @@
"radioType": "is5GHzU", "radioType": "is5GHzU",
"serviceMetricDataType": "Neighbour" "serviceMetricDataType": "Neighbour"
}, },
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzU",
"serviceMetricDataType": "Neighbour"
},
{ {
"model_type": "ServiceMetricSurveyConfigParameters", "model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30, "samplingInterval": 30,
@@ -286,13 +274,25 @@
"statsReportFormat": "RAW", "statsReportFormat": "RAW",
"radioType": "is5GHzL", "radioType": "is5GHzL",
"serviceMetricDataType": "Neighbour" "serviceMetricDataType": "Neighbour"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Neighbour"
} }
] ]
}, },
"profileType": "metrics" "profileType": "metrics"
}, },
"createdTimestamp": 1601961451756, "createdTimestamp": 1602113058699,
"lastModifiedTimestamp": 1601961451756, "lastModifiedTimestamp": 1602113058699,
"childProfileIds": [] "childProfileIds": []
} }
] ]

6
opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileOperator.json
View File

@@ -1,7 +1,7 @@
[ [
{ {
"model_type": "Profile", "model_type": "Profile",
"id": 5, "id": 6,
"customerId": 2, "customerId": 2,
"profileType": "operator", "profileType": "operator",
"name": "TipWlan-Hotspot20-Operator", "name": "TipWlan-Hotspot20-Operator",
@@ -30,8 +30,8 @@
], ],
"profileType": "operator" "profileType": "operator"
}, },
"createdTimestamp": 1602015573969, "createdTimestamp": 1602113058719,
"lastModifiedTimestamp": 1602015573969, "lastModifiedTimestamp": 1602113058719,
"childProfileIds": [] "childProfileIds": []
} }
] ]

6
opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileRf.json
View File

@@ -1,6 +1,6 @@
{ {
"model_type": "Profile", "model_type": "Profile",
"id": 11, "id": 12,
"customerId": 2, "customerId": 2,
"profileType": "rf", "profileType": "rf",
"name": "TipWlan-rf", "name": "TipWlan-rf",
@@ -250,7 +250,7 @@
}, },
"profileType": "rf" "profileType": "rf"
}, },
"createdTimestamp": 1601961452390, "createdTimestamp": 1602113059555,
"lastModifiedTimestamp": 1601961452390, "lastModifiedTimestamp": 1602113059555,
"childProfileIds": [] "childProfileIds": []
} }

77
opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileSsid.json
View File

@@ -1,7 +1,73 @@
[ [
{ {
"model_type": "Profile", "model_type": "Profile",
"id": 9, "id": 5,
"customerId": 2,
"profileType": "ssid",
"name": "TipWlan-cloud-hotspot-access",
"details": {
"model_type": "SsidConfiguration",
"ssid": "Default-SSID-1602113058718",
"appliedRadios": [
"is5GHzU",
"is5GHzL",
"is2dot4GHz"
],
"ssidAdminState": "enabled",
"secureMode": "wpa2PSK",
"vlanId": 1,
"keyStr": "testing123",
"broadcastSsid": "enabled",
"keyRefresh": 0,
"noLocalSubnets": false,
"radiusServiceName": null,
"captivePortalId": null,
"bandwidthLimitDown": 0,
"bandwidthLimitUp": 0,
"clientBandwidthLimitDown": 0,
"clientBandwidthLimitUp": 0,
"videoTrafficOnly": false,
"radioBasedConfigs": {
"is5GHz": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is2dot4GHz": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is5GHzU": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is5GHzL": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
}
},
"bonjourGatewayProfileId": null,
"enable80211w": null,
"wepConfig": null,
"forwardMode": null,
"profileType": "ssid"
},
"createdTimestamp": 1602113058718,
"lastModifiedTimestamp": 1602113059547,
"childProfileIds": [
9
]
},
{
"model_type": "Profile",
"id": 10,
"customerId": 2, "customerId": 2,
"profileType": "ssid", "profileType": "ssid",
"name": "TipWlan-cloud-3-radios", "name": "TipWlan-cloud-3-radios",
@@ -10,8 +76,8 @@
"ssid": "TipWlan-cloud-3-radios", "ssid": "TipWlan-cloud-3-radios",
"appliedRadios": [ "appliedRadios": [
"is5GHzU", "is5GHzU",
"is2dot4GHz", "is5GHzL",
"is5GHzL" "is2dot4GHz"
], ],
"ssidAdminState": "enabled", "ssidAdminState": "enabled",
"secureMode": "open", "secureMode": "open",
@@ -59,10 +125,9 @@
"forwardMode": null, "forwardMode": null,
"profileType": "ssid" "profileType": "ssid"
}, },
"createdTimestamp": 1601961452385, "createdTimestamp": 1602113059549,
"lastModifiedTimestamp": 1601961452385, "lastModifiedTimestamp": 1602113059549,
"childProfileIds": [ "childProfileIds": [
7,
8 8
] ]
} }

6
opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileVenue.json
View File

@@ -1,7 +1,7 @@
[ [
{ {
"model_type": "Profile", "model_type": "Profile",
"id": 6, "id": 7,
"customerId": 2, "customerId": 2,
"profileType": "venue", "profileType": "venue",
"name": "TipWlan-Hotspot20-Venue", "name": "TipWlan-Hotspot20-Venue",
@@ -35,8 +35,8 @@
}, },
"profileType": "venue" "profileType": "venue"
}, },
"createdTimestamp": 1602015573975, "createdTimestamp": 1602113058725,
"lastModifiedTimestamp": 1602015573975, "lastModifiedTimestamp": 1602113058725,
"childProfileIds": [] "childProfileIds": []
} }
] ]

11
opensync-gateway-static-process/src/main/resources/app/opensync/ProfileAPExample.json
View File

@@ -1,6 +1,6 @@
{ {
"model_type": "Profile", "model_type": "Profile",
"id": 15, "id": 16,
"customerId": 2, "customerId": 2,
"profileType": "equipment_ap", "profileType": "equipment_ap",
"name": "ApProfile-3-radios", "name": "ApProfile-3-radios",
@@ -39,11 +39,12 @@
}, },
"profileType": "equipment_ap" "profileType": "equipment_ap"
}, },
"createdTimestamp": 1601961452652, "createdTimestamp": 1602113059824,
"lastModifiedTimestamp": 1601961452652, "lastModifiedTimestamp": 1602113059824,
"childProfileIds": [ "childProfileIds": [
2, 2,
9, 5,
11 10,
12
] ]
} }

25
opensync-gateway-static-process/src/main/resources/app/opensync/ProfileHotspot20.json
View File

@@ -1,7 +1,7 @@
[ [
{ {
"model_type": "Profile", "model_type": "Profile",
"id": 8, "id": 9,
"customerId": 2, "customerId": 2,
"profileType": "hotspot_2pt0", "profileType": "hotspot_2pt0",
"name": "TipWlan-Hotspot20-Config", "name": "TipWlan-Hotspot20-Config",
@@ -45,9 +45,10 @@
"disableDownstreamGroupAddressedForwarding": false, "disableDownstreamGroupAddressedForwarding": false,
"enable2pt4GHz": true, "enable2pt4GHz": true,
"enable5GHz": true, "enable5GHz": true,
"associatedSsids": [ "associatedAccessSsidNames": [
"TipWlan-cloud-3-radios" "TipWlan-cloud-hotspot-access"
], ],
"osuSsidName": "TipWlan-cloud-3-radios",
"mccMnc3gppCellularNetworkInfo": [ "mccMnc3gppCellularNetworkInfo": [
{ {
"model_type": "MccMnc", "model_type": "MccMnc",
@@ -60,15 +61,23 @@
"mccMncPairing": "302,720" "mccMncPairing": "302,720"
} }
], ],
"operatorProfileName": "TipWlan-Hotspot20-Operator",
"venueProfileName": "TipWlan-Hotspot20-Venue",
"idProviderProfileNames": [
"TipWlan-Hotspot20-OSU-Provider"
],
"profileType": "hotspot_2pt0", "profileType": "hotspot_2pt0",
"mccMncList": "302,720" "mccMncList": "302,720",
"associatedSsids": [
"TipWlan-cloud-hotspot-access"
]
}, },
"createdTimestamp": 1602015574677, "createdTimestamp": 1602113059532,
"lastModifiedTimestamp": 1602015574677, "lastModifiedTimestamp": 1602113059532,
"childProfileIds": [ "childProfileIds": [
5,
6, 6,
7 7,
8
] ]
} }
] ]

15
opensync-gateway-static-process/src/main/resources/app/opensync/ProfileIdProvider.json
View File

@@ -1,7 +1,7 @@
[ [
{ {
"model_type": "Profile", "model_type": "Profile",
"id": 7, "id": 8,
"customerId": 2, "customerId": 2,
"profileType": "id_provider", "profileType": "id_provider",
"name": "TipWlan-Hotspot20-OSU-Provider", "name": "TipWlan-Hotspot20-OSU-Provider",
@@ -29,19 +29,16 @@
], ],
"encoding": 0, "encoding": 0,
"eapMethods": [ "eapMethods": [
"EAP-MSCHAP-V2 with username/password",
"EAP-TTLS with username/password", "EAP-TTLS with username/password",
"EAP-TLS with certificate" "EAP-TLS with certificate"
], ],
"eapMap": { "eapMap": {
"EAP-MSCHAP-V2 with username/password": [ "EAP-TTLS with username/password": [
"Credential Type:username/password",
"Non-EAP Inner Authentication Type:MSCHAPV2" "Non-EAP Inner Authentication Type:MSCHAPV2"
], ],
"EAP-TTLS with username/password": [
"Credential Type:username/password"
],
"EAP-TLS with certificate": [ "EAP-TLS with certificate": [
"Credential Type:username/password" "Credential Type:Certificate"
] ]
} }
} }
@@ -107,8 +104,8 @@
], ],
"profileType": "id_provider" "profileType": "id_provider"
}, },
"createdTimestamp": 1602015574295, "createdTimestamp": 1602113059086,
"lastModifiedTimestamp": 1602015574295, "lastModifiedTimestamp": 1602113059086,
"childProfileIds": [] "childProfileIds": []
} }
] ]

214
opensync-gateway-static-process/src/main/resources/app/opensync/ProfileMetrics.json
View File

@@ -9,8 +9,8 @@
"model_type": "ServiceMetricsCollectionConfigProfile", "model_type": "ServiceMetricsCollectionConfigProfile",
"radioTypes": [ "radioTypes": [
"is5GHzU", "is5GHzU",
"is2dot4GHz", "is5GHzL",
"is5GHzL" "is2dot4GHz"
], ],
"serviceMetricDataTypes": [ "serviceMetricDataTypes": [
"ApNode", "ApNode",
@@ -24,8 +24,32 @@
{ {
"model_type": "ServiceMetricSurveyConfigParameters", "model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30, "samplingInterval": 30,
"reportingIntervalSeconds": 60, "reportingIntervalSeconds": 120,
"channelSurveyType": "ON_CHANNEL", "channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzU",
"serviceMetricDataType": "ApNode"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"serviceMetricDataType": "ApNode"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0, "scanIntervalMillis": 0,
"percentUtilizationThreshold": 10, "percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600, "delayMillisecondsThreshold": 600,
@@ -48,13 +72,13 @@
{ {
"model_type": "ServiceMetricSurveyConfigParameters", "model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30, "samplingInterval": 30,
"reportingIntervalSeconds": 120, "reportingIntervalSeconds": 60,
"channelSurveyType": "OFF_CHANNEL", "channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0, "scanIntervalMillis": 0,
"percentUtilizationThreshold": 10, "percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600, "delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW", "statsReportFormat": "RAW",
"radioType": "is5GHzU", "radioType": "is2dot4GHz",
"serviceMetricDataType": "ApNode" "serviceMetricDataType": "ApNode"
}, },
{ {
@@ -68,30 +92,6 @@
"statsReportFormat": "RAW", "statsReportFormat": "RAW",
"radioType": "is5GHzU", "radioType": "is5GHzU",
"serviceMetricDataType": "ApNode" "serviceMetricDataType": "ApNode"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "ApNode"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"serviceMetricDataType": "ApNode"
} }
], ],
"ApSsid": [ "ApSsid": [
@@ -99,14 +99,14 @@
"model_type": "ServiceMetricRadioConfigParameters", "model_type": "ServiceMetricRadioConfigParameters",
"samplingInterval": 30, "samplingInterval": 30,
"reportingIntervalSeconds": 60, "reportingIntervalSeconds": 60,
"radioType": "is5GHzL", "radioType": "is2dot4GHz",
"serviceMetricDataType": "ApSsid" "serviceMetricDataType": "ApSsid"
}, },
{ {
"model_type": "ServiceMetricRadioConfigParameters", "model_type": "ServiceMetricRadioConfigParameters",
"samplingInterval": 30, "samplingInterval": 30,
"reportingIntervalSeconds": 60, "reportingIntervalSeconds": 60,
"radioType": "is2dot4GHz", "radioType": "is5GHzL",
"serviceMetricDataType": "ApSsid" "serviceMetricDataType": "ApSsid"
}, },
{ {
@@ -118,6 +118,13 @@
} }
], ],
"Client": [ "Client": [
{
"model_type": "ServiceMetricRadioConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Client"
},
{ {
"model_type": "ServiceMetricRadioConfigParameters", "model_type": "ServiceMetricRadioConfigParameters",
"samplingInterval": 30, "samplingInterval": 30,
@@ -131,21 +138,38 @@
"reportingIntervalSeconds": 60, "reportingIntervalSeconds": 60,
"radioType": "is5GHzU", "radioType": "is5GHzU",
"serviceMetricDataType": "Client" "serviceMetricDataType": "Client"
},
{
"model_type": "ServiceMetricRadioConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Client"
} }
], ],
"Channel": [ "Channel": [
{ {
"model_type": "ServiceMetricSurveyConfigParameters", "model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30, "samplingInterval": 30,
"reportingIntervalSeconds": 120, "reportingIntervalSeconds": 60,
"channelSurveyType": "OFF_CHANNEL", "channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0, "scanIntervalMillis": 0,
"percentUtilizationThreshold": 10, "percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600, "delayMillisecondsThreshold": 600,
@@ -156,13 +180,13 @@
{ {
"model_type": "ServiceMetricSurveyConfigParameters", "model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30, "samplingInterval": 30,
"reportingIntervalSeconds": 60, "reportingIntervalSeconds": 120,
"channelSurveyType": "ON_CHANNEL", "channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0, "scanIntervalMillis": 0,
"percentUtilizationThreshold": 10, "percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600, "delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW", "statsReportFormat": "RAW",
"radioType": "is2dot4GHz", "radioType": "is5GHzL",
"serviceMetricDataType": "Channel" "serviceMetricDataType": "Channel"
}, },
{ {
@@ -186,71 +210,11 @@
"percentUtilizationThreshold": 10, "percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600, "delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW", "statsReportFormat": "RAW",
"radioType": "is5GHzL",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzU", "radioType": "is5GHzU",
"serviceMetricDataType": "Channel" "serviceMetricDataType": "Channel"
} }
], ],
"Neighbour": [ "Neighbour": [
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzU",
"serviceMetricDataType": "Neighbour"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Neighbour"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Neighbour"
},
{ {
"model_type": "ServiceMetricSurveyConfigParameters", "model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30, "samplingInterval": 30,
@@ -263,6 +227,18 @@
"radioType": "is5GHzL", "radioType": "is5GHzL",
"serviceMetricDataType": "Neighbour" "serviceMetricDataType": "Neighbour"
}, },
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Neighbour"
},
{ {
"model_type": "ServiceMetricSurveyConfigParameters", "model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30, "samplingInterval": 30,
@@ -275,6 +251,18 @@
"radioType": "is5GHzU", "radioType": "is5GHzU",
"serviceMetricDataType": "Neighbour" "serviceMetricDataType": "Neighbour"
}, },
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzU",
"serviceMetricDataType": "Neighbour"
},
{ {
"model_type": "ServiceMetricSurveyConfigParameters", "model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30, "samplingInterval": 30,
@@ -286,13 +274,25 @@
"statsReportFormat": "RAW", "statsReportFormat": "RAW",
"radioType": "is5GHzL", "radioType": "is5GHzL",
"serviceMetricDataType": "Neighbour" "serviceMetricDataType": "Neighbour"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Neighbour"
} }
] ]
}, },
"profileType": "metrics" "profileType": "metrics"
}, },
"createdTimestamp": 1601961451756, "createdTimestamp": 1602113058699,
"lastModifiedTimestamp": 1601961451756, "lastModifiedTimestamp": 1602113058699,
"childProfileIds": [] "childProfileIds": []
} }
] ]

6
opensync-gateway-static-process/src/main/resources/app/opensync/ProfileOperator.json
View File

@@ -1,7 +1,7 @@
[ [
{ {
"model_type": "Profile", "model_type": "Profile",
"id": 5, "id": 6,
"customerId": 2, "customerId": 2,
"profileType": "operator", "profileType": "operator",
"name": "TipWlan-Hotspot20-Operator", "name": "TipWlan-Hotspot20-Operator",
@@ -30,8 +30,8 @@
], ],
"profileType": "operator" "profileType": "operator"
}, },
"createdTimestamp": 1602015573969, "createdTimestamp": 1602113058719,
"lastModifiedTimestamp": 1602015573969, "lastModifiedTimestamp": 1602113058719,
"childProfileIds": [] "childProfileIds": []
} }
] ]

6
opensync-gateway-static-process/src/main/resources/app/opensync/ProfileRf.json
View File

@@ -1,6 +1,6 @@
{ {
"model_type": "Profile", "model_type": "Profile",
"id": 11, "id": 12,
"customerId": 2, "customerId": 2,
"profileType": "rf", "profileType": "rf",
"name": "TipWlan-rf", "name": "TipWlan-rf",
@@ -250,7 +250,7 @@
}, },
"profileType": "rf" "profileType": "rf"
}, },
"createdTimestamp": 1601961452390, "createdTimestamp": 1602113059555,
"lastModifiedTimestamp": 1601961452390, "lastModifiedTimestamp": 1602113059555,
"childProfileIds": [] "childProfileIds": []
} }

77
opensync-gateway-static-process/src/main/resources/app/opensync/ProfileSsid.json
View File

@@ -1,7 +1,73 @@
[ [
{ {
"model_type": "Profile", "model_type": "Profile",
"id": 9, "id": 5,
"customerId": 2,
"profileType": "ssid",
"name": "TipWlan-cloud-hotspot-access",
"details": {
"model_type": "SsidConfiguration",
"ssid": "Default-SSID-1602113058718",
"appliedRadios": [
"is5GHzU",
"is5GHzL",
"is2dot4GHz"
],
"ssidAdminState": "enabled",
"secureMode": "wpa2PSK",
"vlanId": 1,
"keyStr": "testing123",
"broadcastSsid": "enabled",
"keyRefresh": 0,
"noLocalSubnets": false,
"radiusServiceName": null,
"captivePortalId": null,
"bandwidthLimitDown": 0,
"bandwidthLimitUp": 0,
"clientBandwidthLimitDown": 0,
"clientBandwidthLimitUp": 0,
"videoTrafficOnly": false,
"radioBasedConfigs": {
"is5GHz": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is2dot4GHz": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is5GHzU": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is5GHzL": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
}
},
"bonjourGatewayProfileId": null,
"enable80211w": null,
"wepConfig": null,
"forwardMode": null,
"profileType": "ssid"
},
"createdTimestamp": 1602113058718,
"lastModifiedTimestamp": 1602113059547,
"childProfileIds": [
9
]
},
{
"model_type": "Profile",
"id": 10,
"customerId": 2, "customerId": 2,
"profileType": "ssid", "profileType": "ssid",
"name": "TipWlan-cloud-3-radios", "name": "TipWlan-cloud-3-radios",
@@ -10,8 +76,8 @@
"ssid": "TipWlan-cloud-3-radios", "ssid": "TipWlan-cloud-3-radios",
"appliedRadios": [ "appliedRadios": [
"is5GHzU", "is5GHzU",
"is2dot4GHz", "is5GHzL",
"is5GHzL" "is2dot4GHz"
], ],
"ssidAdminState": "enabled", "ssidAdminState": "enabled",
"secureMode": "open", "secureMode": "open",
@@ -59,10 +125,9 @@
"forwardMode": null, "forwardMode": null,
"profileType": "ssid" "profileType": "ssid"
}, },
"createdTimestamp": 1601961452385, "createdTimestamp": 1602113059549,
"lastModifiedTimestamp": 1601961452385, "lastModifiedTimestamp": 1602113059549,
"childProfileIds": [ "childProfileIds": [
7,
8 8
] ]
} }

6
opensync-gateway-static-process/src/main/resources/app/opensync/ProfileVenue.json
View File

@@ -1,7 +1,7 @@
[ [
{ {
"model_type": "Profile", "model_type": "Profile",
"id": 6, "id": 7,
"customerId": 2, "customerId": 2,
"profileType": "venue", "profileType": "venue",
"name": "TipWlan-Hotspot20-Venue", "name": "TipWlan-Hotspot20-Venue",
@@ -35,8 +35,8 @@
}, },
"profileType": "venue" "profileType": "venue"
}, },
"createdTimestamp": 1602015573975, "createdTimestamp": 1602113058725,
"lastModifiedTimestamp": 1602015573975, "lastModifiedTimestamp": 1602113058725,
"childProfileIds": [] "childProfileIds": []
} }
] ]

83
opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java
View File

@@ -3439,35 +3439,32 @@ public class OvsdbDao {
if (hs20cfg.getHotspot20ProfileSet() != null) { if (hs20cfg.getHotspot20ProfileSet() != null) {
List<Operation> operations = new ArrayList<>(); List<Operation> operations = new ArrayList<>();
for (Profile hotspotProfile : hs20cfg.getHotspot20ProfileSet()) { for (Profile hotspotProfile : hs20cfg.getHotspot20ProfileSet()) {
OperatorProfile operatorProfile = null;
if (hs20cfg.getHotspot20OperatorSet() != null) {
List<Profile> operator = hs20cfg.getHotspot20OperatorSet().stream()
.filter(new Predicate<Profile>() {
@Override
public boolean test(Profile t) {
return hotspotProfile.getChildProfileIds().contains(t.getId());
}
}).collect(Collectors.toList());
operatorProfile = (OperatorProfile) operator.get(0).getDetails();
}
VenueProfile venueProfile = null;
if (hs20cfg.getHotspot20VenueSet() != null) {
List<Profile> venue = hs20cfg.getHotspot20VenueSet().stream()
.filter(new Predicate<Profile>() {
@Override
public boolean test(Profile t) {
return hotspotProfile.getChildProfileIds().contains(t.getId());
}
}).collect(Collectors.toList());
venueProfile = (VenueProfile) venue.get(0).getDetails();
}
Hotspot2Profile hs2Profile = (Hotspot2Profile) hotspotProfile.getDetails(); Hotspot2Profile hs2Profile = (Hotspot2Profile) hotspotProfile.getDetails();
Profile operator = hs20cfg.getHotspot20OperatorSet().stream().filter(new Predicate<Profile>() {
@Override
public boolean test(Profile t) {
return t.getName().equals(hs2Profile.getOperatorProfileName());
}
}).findFirst().get();
OperatorProfile operatorProfile = (OperatorProfile)operator.getDetails();
Profile venue = hs20cfg.getHotspot20VenueSet().stream().filter(new Predicate<Profile>() {
@Override
public boolean test(Profile t) {
return t.getName().equals(hs2Profile.getVenueProfileName());
}
}).findFirst().get();
VenueProfile venueProfile = (VenueProfile)venue.getDetails();
Map<String, Value> rowColumns = new HashMap<>(); Map<String, Value> rowColumns = new HashMap<>();
@@ -3487,16 +3484,17 @@ public class OvsdbDao {
Set<Uuid> osuProvidersUuids = new HashSet<>(); Set<Uuid> osuProvidersUuids = new HashSet<>();
Set<Uuid> osuIconUuids = new HashSet<>(); Set<Uuid> osuIconUuids = new HashSet<>();
Set<Atom<String>> osuNai = new HashSet<>();
for (Profile provider : providerList) { for (Profile provider : providerList) {
Hotspot20IdProviderProfile providerProfile = (Hotspot20IdProviderProfile) provider Hotspot20IdProviderProfile providerProfile = (Hotspot20IdProviderProfile) provider
.getDetails(); .getDetails();
if (osuProviders.containsKey(providerProfile.getOsuServerUri())) { if (osuProviders.containsKey(providerProfile.getOsuServerUri())) {
osuProvidersUuids.add(osuProviders.get(providerProfile.getOsuServerUri()).uuid); osuProvidersUuids.add(osuProviders.get(providerProfile.getOsuServerUri()).uuid);
osuIconUuids.addAll(osuProviders.get(providerProfile.getOsuServerUri()).osuIcons); osuIconUuids.addAll(osuProviders.get(providerProfile.getOsuServerUri()).osuIcons);
osuProviders.get(providerProfile.getOsuServerUri()).osuNai.stream().forEach(n -> { getNaiRealms(providerProfile, rowColumns);
osuNai.add(new Atom<String>(n));
}); // osuProviders.get(providerProfile.getOsuServerUri()).osuNai.stream().forEach(n -> {
// osuNai.add(new Atom<String>(n));
// });
} }
} }
@@ -3513,13 +3511,6 @@ public class OvsdbDao {
rowColumns.put("operator_icons", iconUuids); rowColumns.put("operator_icons", iconUuids);
} }
if (osuNai.size() > 0) {
com.vmware.ovsdb.protocol.operation.notation.Set osuNaiSet = com.vmware.ovsdb.protocol.operation.notation.Set
.of(osuNai);
rowColumns.put("nai_realm", osuNaiSet);
}
rowColumns.put("deauth_request_timeout", new Atom<>(hs2Profile.getDeauthRequestTimeout())); rowColumns.put("deauth_request_timeout", new Atom<>(hs2Profile.getDeauthRequestTimeout()));
rowColumns.put("osen", rowColumns.put("osen",
new Atom<>(operatorProfile.isServerOnlyAuthenticatedL2EncryptionNetwork())); new Atom<>(operatorProfile.isServerOnlyAuthenticatedL2EncryptionNetwork()));
@@ -3539,15 +3530,18 @@ public class OvsdbDao {
rowColumns.put("anqp_domain_id", new Atom<>(hs2Profile.getAnqpDomainId())); rowColumns.put("anqp_domain_id", new Atom<>(hs2Profile.getAnqpDomainId()));
Set<Atom<String>> mccMnc = new HashSet<>(); Set<Atom<String>> mccMnc = new HashSet<>();
hs2Profile.getMccMnc3gppCellularNetworkInfo().stream() hs2Profile.getMccMnc3gppCellularNetworkInfo().stream()
.forEach(c -> mccMnc.add(new Atom<>(c.getMccMncPairing()))); .forEach(c -> {
String pair = c.getMccMncPairing() + ";";
mccMnc.add(new Atom<>(pair));
});
com.vmware.ovsdb.protocol.operation.notation.Set mccMncSet = com.vmware.ovsdb.protocol.operation.notation.Set com.vmware.ovsdb.protocol.operation.notation.Set mccMncSet = com.vmware.ovsdb.protocol.operation.notation.Set
.of(mccMnc); .of(mccMnc);
rowColumns.put("mcc_mnc", mccMncSet); rowColumns.put("mcc_mnc", mccMncSet);
Set<Atom<String>> connectionCapabilities = new HashSet<>(); Set<Atom<String>> connectionCapabilities = new HashSet<>();
hs2Profile.getConnectionCapabilitySet().stream().forEach( hs2Profile.getConnectionCapabilitySet().stream().forEach(
c -> connectionCapabilities.add(new Atom<>(c.getConnectionCapabilitiesIpProtocol() + ":" c -> connectionCapabilities.add(new Atom<>(c.getConnectionCapabilitiesIpProtocol().getId() + ":"
+ c.getConnectionCapabilitiesPortNumber() + ":" + c.getConnectionCapabilitiesPortNumber() + ":"
+ c.getConnectionCapabilitiesStatus()))); + c.getConnectionCapabilitiesStatus().getId())));
com.vmware.ovsdb.protocol.operation.notation.Set connectionCapabilitySet = com.vmware.ovsdb.protocol.operation.notation.Set com.vmware.ovsdb.protocol.operation.notation.Set connectionCapabilitySet = com.vmware.ovsdb.protocol.operation.notation.Set
.of(connectionCapabilities); .of(connectionCapabilities);
rowColumns.put("connection_capability", connectionCapabilitySet); rowColumns.put("connection_capability", connectionCapabilitySet);
@@ -3609,6 +3603,8 @@ public class OvsdbDao {
rowColumns.put("hessid", new Atom<>(hessids.get(0))); rowColumns.put("hessid", new Atom<>(hessids.get(0)));
} }
rowColumns.put("osu_ssid", new Atom<>(hs2Profile.getOsuSsidName()));
Row row = new Row(rowColumns); Row row = new Row(rowColumns);
@@ -3659,8 +3655,9 @@ public class OvsdbDao {
for (Profile provider : hs20cfg.getHotspot20ProviderSet()) { for (Profile provider : hs20cfg.getHotspot20ProviderSet()) {
Hotspot20IdProviderProfile providerProfile = (Hotspot20IdProviderProfile) provider.getDetails(); Hotspot20IdProviderProfile providerProfile = (Hotspot20IdProviderProfile) provider.getDetails();
Map<String, Value> rowColumns = new HashMap<>(); Map<String, Value> rowColumns = new HashMap<>();
rowColumns.put("osu_nai", new Atom<>(providerProfile.getOsuNaiStandalone()));
// rowColumns.put("osu_nai2", new Atom<>(providerProfile.getOsuNaiShared()));
getNaiRealmsForOsuProvider(providerProfile, rowColumns);
getOsuIconUuidsForOsuProvider(ovsdbClient, providerProfile, rowColumns); getOsuIconUuidsForOsuProvider(ovsdbClient, providerProfile, rowColumns);
getOsuProviderFriendlyNames(providerProfile, rowColumns); getOsuProviderFriendlyNames(providerProfile, rowColumns);
getOsuProviderMethodList(providerProfile, rowColumns); getOsuProviderMethodList(providerProfile, rowColumns);
@@ -3773,7 +3770,7 @@ public class OvsdbDao {
} }
protected void getNaiRealmsForOsuProvider(Hotspot20IdProviderProfile providerProfile, protected void getNaiRealms(Hotspot20IdProviderProfile providerProfile,
Map<String, Value> rowColumns) { Map<String, Value> rowColumns) {
Set<Atom<String>> naiRealms = new HashSet<>(); Set<Atom<String>> naiRealms = new HashSet<>();
providerProfile.getNaiRealmList().stream().forEach(c -> { providerProfile.getNaiRealmList().stream().forEach(c -> {
@@ -3854,7 +3851,7 @@ public class OvsdbDao {
com.vmware.ovsdb.protocol.operation.notation.Set naiRealmsSet = com.vmware.ovsdb.protocol.operation.notation.Set com.vmware.ovsdb.protocol.operation.notation.Set naiRealmsSet = com.vmware.ovsdb.protocol.operation.notation.Set
.of(naiRealms); .of(naiRealms);
rowColumns.put("osu_nai", naiRealmsSet); rowColumns.put("nai_realm", naiRealmsSet);
} }
public void provisionHotspot2IconConfig(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncApConfig) { public void provisionHotspot2IconConfig(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncApConfig) {