diff --git a/opensync-ext-static/src/main/resources/ProfileAPExample.json b/opensync-ext-static/src/main/resources/ProfileAPExample.json index cd61fe3..c57203d 100644 --- a/opensync-ext-static/src/main/resources/ProfileAPExample.json +++ b/opensync-ext-static/src/main/resources/ProfileAPExample.json @@ -1,49 +1,50 @@ - { - "model_type": "Profile", - "id": 15, - "customerId": 2, - "profileType": "equipment_ap", - "name": "ApProfile-3-radios", - "details": { - "model_type": "ApNetworkConfiguration", - "networkConfigVersion": "AP-1", - "equipmentType": "AP", - "vlanNative": true, - "vlan": 0, - "ntpServer": { - "model_type": "AutoOrManualString", - "auto": true, - "value": "pool.ntp.org" - }, - "syslogRelay": null, - "rtlsSettings": null, - "syntheticClientEnabled": true, - "ledControlEnabled": true, - "equipmentDiscovery": false, - "radioMap": { - "is2dot4GHz": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is5GHzU": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is5GHzL": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - } - }, - "profileType": "equipment_ap" +{ + "model_type": "Profile", + "id": 16, + "customerId": 2, + "profileType": "equipment_ap", + "name": "ApProfile-3-radios", + "details": { + "model_type": "ApNetworkConfiguration", + "networkConfigVersion": "AP-1", + "equipmentType": "AP", + "vlanNative": true, + "vlan": 0, + "ntpServer": { + "model_type": "AutoOrManualString", + "auto": true, + "value": "pool.ntp.org" }, - "createdTimestamp": 1601961452652, - "lastModifiedTimestamp": 1601961452652, - "childProfileIds": [ - 2, - 9, - 11 - ] - } \ No newline at end of file + "syslogRelay": null, + "rtlsSettings": null, + "syntheticClientEnabled": true, + "ledControlEnabled": true, + "equipmentDiscovery": false, + "radioMap": { + "is2dot4GHz": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + }, + "is5GHzU": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + }, + "is5GHzL": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + } + }, + "profileType": "equipment_ap" + }, + "createdTimestamp": 1602113059824, + "lastModifiedTimestamp": 1602113059824, + "childProfileIds": [ + 2, + 5, + 10, + 12 + ] + } \ No newline at end of file diff --git a/opensync-ext-static/src/main/resources/ProfileHotspot20.json b/opensync-ext-static/src/main/resources/ProfileHotspot20.json index f8c107f..de2aa3d 100644 --- a/opensync-ext-static/src/main/resources/ProfileHotspot20.json +++ b/opensync-ext-static/src/main/resources/ProfileHotspot20.json @@ -1,7 +1,7 @@ [ { "model_type": "Profile", - "id": 8, + "id": 9, "customerId": 2, "profileType": "hotspot_2pt0", "name": "TipWlan-Hotspot20-Config", @@ -45,9 +45,10 @@ "disableDownstreamGroupAddressedForwarding": false, "enable2pt4GHz": true, "enable5GHz": true, - "associatedSsids": [ - "TipWlan-cloud-3-radios" + "associatedAccessSsidNames": [ + "TipWlan-cloud-hotspot-access" ], + "osuSsidName": "TipWlan-cloud-3-radios", "mccMnc3gppCellularNetworkInfo": [ { "model_type": "MccMnc", @@ -60,15 +61,23 @@ "mccMncPairing": "302,720" } ], + "operatorProfileName": "TipWlan-Hotspot20-Operator", + "venueProfileName": "TipWlan-Hotspot20-Venue", + "idProviderProfileNames": [ + "TipWlan-Hotspot20-OSU-Provider" + ], "profileType": "hotspot_2pt0", - "mccMncList": "302,720" + "mccMncList": "302,720", + "associatedSsids": [ + "TipWlan-cloud-hotspot-access" + ] }, - "createdTimestamp": 1602015574677, - "lastModifiedTimestamp": 1602015574677, + "createdTimestamp": 1602113059532, + "lastModifiedTimestamp": 1602113059532, "childProfileIds": [ - 5, 6, - 7 + 7, + 8 ] } ] \ No newline at end of file diff --git a/opensync-ext-static/src/main/resources/ProfileIdProvider.json b/opensync-ext-static/src/main/resources/ProfileIdProvider.json index 4ea327e..b12abad 100644 --- a/opensync-ext-static/src/main/resources/ProfileIdProvider.json +++ b/opensync-ext-static/src/main/resources/ProfileIdProvider.json @@ -1,7 +1,7 @@ [ { "model_type": "Profile", - "id": 7, + "id": 8, "customerId": 2, "profileType": "id_provider", "name": "TipWlan-Hotspot20-OSU-Provider", @@ -29,19 +29,16 @@ ], "encoding": 0, "eapMethods": [ - "EAP-MSCHAP-V2 with username/password", "EAP-TTLS with username/password", "EAP-TLS with certificate" ], "eapMap": { - "EAP-MSCHAP-V2 with username/password": [ + "EAP-TTLS with username/password": [ + "Credential Type:username/password", "Non-EAP Inner Authentication Type:MSCHAPV2" ], - "EAP-TTLS with username/password": [ - "Credential Type:username/password" - ], "EAP-TLS with certificate": [ - "Credential Type:username/password" + "Credential Type:Certificate" ] } } @@ -107,8 +104,8 @@ ], "profileType": "id_provider" }, - "createdTimestamp": 1602015574295, - "lastModifiedTimestamp": 1602015574295, + "createdTimestamp": 1602113059086, + "lastModifiedTimestamp": 1602113059086, "childProfileIds": [] } ] \ No newline at end of file diff --git a/opensync-ext-static/src/main/resources/ProfileMetrics.json b/opensync-ext-static/src/main/resources/ProfileMetrics.json index 4ac6711..8187736 100644 --- a/opensync-ext-static/src/main/resources/ProfileMetrics.json +++ b/opensync-ext-static/src/main/resources/ProfileMetrics.json @@ -1,298 +1,298 @@ [ -{ - "model_type": "Profile", - "id": 2, - "customerId": 2, - "profileType": "metrics", - "name": "Metrics-Profile-3-radios", - "details": { - "model_type": "ServiceMetricsCollectionConfigProfile", - "radioTypes": [ - "is5GHzU", - "is2dot4GHz", - "is5GHzL" - ], - "serviceMetricDataTypes": [ - "ApNode", - "ApSsid", - "Client", - "Channel", - "Neighbour" - ], - "metricConfigParameterMap": { - "ApNode": [ - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is2dot4GHz", - "serviceMetricDataType": "ApNode" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_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, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is5GHzU", - "serviceMetricDataType": "ApNode" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_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": "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" - } + { + "model_type": "Profile", + "id": 2, + "customerId": 2, + "profileType": "metrics", + "name": "Metrics-Profile-3-radios", + "details": { + "model_type": "ServiceMetricsCollectionConfigProfile", + "radioTypes": [ + "is5GHzU", + "is5GHzL", + "is2dot4GHz" ], - "ApSsid": [ - { - "model_type": "ServiceMetricRadioConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "radioType": "is5GHzL", - "serviceMetricDataType": "ApSsid" - }, - { - "model_type": "ServiceMetricRadioConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "radioType": "is2dot4GHz", - "serviceMetricDataType": "ApSsid" - }, - { - "model_type": "ServiceMetricRadioConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "radioType": "is5GHzU", - "serviceMetricDataType": "ApSsid" - } + "serviceMetricDataTypes": [ + "ApNode", + "ApSsid", + "Client", + "Channel", + "Neighbour" ], - "Client": [ - { - "model_type": "ServiceMetricRadioConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "radioType": "is5GHzL", - "serviceMetricDataType": "Client" - }, - { - "model_type": "ServiceMetricRadioConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "radioType": "is5GHzU", - "serviceMetricDataType": "Client" - }, - { - "model_type": "ServiceMetricRadioConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "radioType": "is2dot4GHz", - "serviceMetricDataType": "Client" - } - ], - "Channel": [ - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 120, - "channelSurveyType": "OFF_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is5GHzU", - "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": 120, - "channelSurveyType": "OFF_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is2dot4GHz", - "serviceMetricDataType": "Channel" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 120, - "channelSurveyType": "OFF_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": "is5GHzL", - "serviceMetricDataType": "Channel" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is5GHzU", - "serviceMetricDataType": "Channel" - } - ], - "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", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is5GHzL", - "serviceMetricDataType": "Neighbour" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is5GHzU", - "serviceMetricDataType": "Neighbour" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 120, - "channelSurveyType": "OFF_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is5GHzL", - "serviceMetricDataType": "Neighbour" - } - ] + "metricConfigParameterMap": { + "ApNode": [ + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 120, + "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, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is2dot4GHz", + "serviceMetricDataType": "ApNode" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is5GHzL", + "serviceMetricDataType": "ApNode" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is2dot4GHz", + "serviceMetricDataType": "ApNode" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is5GHzU", + "serviceMetricDataType": "ApNode" + } + ], + "ApSsid": [ + { + "model_type": "ServiceMetricRadioConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "radioType": "is2dot4GHz", + "serviceMetricDataType": "ApSsid" + }, + { + "model_type": "ServiceMetricRadioConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "radioType": "is5GHzL", + "serviceMetricDataType": "ApSsid" + }, + { + "model_type": "ServiceMetricRadioConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "radioType": "is5GHzU", + "serviceMetricDataType": "ApSsid" + } + ], + "Client": [ + { + "model_type": "ServiceMetricRadioConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "radioType": "is2dot4GHz", + "serviceMetricDataType": "Client" + }, + { + "model_type": "ServiceMetricRadioConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "radioType": "is5GHzL", + "serviceMetricDataType": "Client" + }, + { + "model_type": "ServiceMetricRadioConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "radioType": "is5GHzU", + "serviceMetricDataType": "Client" + } + ], + "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": "is2dot4GHz", + "serviceMetricDataType": "Channel" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is5GHzU", + "serviceMetricDataType": "Channel" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 120, + "channelSurveyType": "OFF_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is5GHzL", + "serviceMetricDataType": "Channel" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 120, + "channelSurveyType": "OFF_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is2dot4GHz", + "serviceMetricDataType": "Channel" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 120, + "channelSurveyType": "OFF_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is5GHzU", + "serviceMetricDataType": "Channel" + } + ], + "Neighbour": [ + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is5GHzL", + "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": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is5GHzU", + "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", + "samplingInterval": 30, + "reportingIntervalSeconds": 120, + "channelSurveyType": "OFF_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is5GHzL", + "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, - "lastModifiedTimestamp": 1601961451756, - "childProfileIds": [] -} + "createdTimestamp": 1602113058699, + "lastModifiedTimestamp": 1602113058699, + "childProfileIds": [] + } ] \ No newline at end of file diff --git a/opensync-ext-static/src/main/resources/ProfileOperator.json b/opensync-ext-static/src/main/resources/ProfileOperator.json index 54da14f..d9a4844 100644 --- a/opensync-ext-static/src/main/resources/ProfileOperator.json +++ b/opensync-ext-static/src/main/resources/ProfileOperator.json @@ -1,7 +1,7 @@ [ { "model_type": "Profile", - "id": 5, + "id": 6, "customerId": 2, "profileType": "operator", "name": "TipWlan-Hotspot20-Operator", @@ -30,8 +30,8 @@ ], "profileType": "operator" }, - "createdTimestamp": 1602015573969, - "lastModifiedTimestamp": 1602015573969, + "createdTimestamp": 1602113058719, + "lastModifiedTimestamp": 1602113058719, "childProfileIds": [] } ] \ No newline at end of file diff --git a/opensync-ext-static/src/main/resources/ProfileRf.json b/opensync-ext-static/src/main/resources/ProfileRf.json index f8a2b9b..9efbb54 100644 --- a/opensync-ext-static/src/main/resources/ProfileRf.json +++ b/opensync-ext-static/src/main/resources/ProfileRf.json @@ -1,256 +1,256 @@ -{ - "model_type": "Profile", - "id": 11, - "customerId": 2, - "profileType": "rf", - "name": "TipWlan-rf", - "details": { - "model_type": "RfConfiguration", - "rfConfigMap": { - "is5GHz": { - "model_type": "RfElementConfiguration", - "rf": "TipWlan-rf", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is80MHz", - "mimoMode": "twoByTwo", - "maxNumClients": 100, - "multicastRate": "auto", - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 + { + "model_type": "Profile", + "id": 12, + "customerId": 2, + "profileType": "rf", + "name": "TipWlan-rf", + "details": { + "model_type": "RfConfiguration", + "rfConfigMap": { + "is5GHz": { + "model_type": "RfElementConfiguration", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is80MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "multicastRate": "auto", + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "managementRate": "auto", + "rxCellSizeDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "eirpTxPower": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": 18 + }, + "bestApEnabled": null, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 30, + "minLoadFactor": 40 + } }, - "managementRate": "auto", - "rxCellSizeDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 + "is2dot4GHz": { + "model_type": "RfElementConfiguration", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is20MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "multicastRate": "auto", + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "managementRate": "auto", + "rxCellSizeDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "eirpTxPower": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": 18 + }, + "bestApEnabled": null, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 20, + "minLoadFactor": 50 + } }, - "probeResponseThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 + "is5GHzU": { + "model_type": "RfElementConfiguration", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is80MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "multicastRate": "auto", + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "managementRate": "auto", + "rxCellSizeDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "eirpTxPower": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": 18 + }, + "bestApEnabled": null, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 30, + "minLoadFactor": 40 + } }, - "clientDisconnectThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "eirpTxPower": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": 18 - }, - "bestApEnabled": null, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 + "is5GHzL": { + "model_type": "RfElementConfiguration", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is80MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "multicastRate": "auto", + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "managementRate": "auto", + "rxCellSizeDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "eirpTxPower": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": 18 + }, + "bestApEnabled": null, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 30, + "minLoadFactor": 40 + } } }, - "is2dot4GHz": { - "model_type": "RfElementConfiguration", - "rf": "TipWlan-rf", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is20MHz", - "mimoMode": "twoByTwo", - "maxNumClients": 100, - "multicastRate": "auto", - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "managementRate": "auto", - "rxCellSizeDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "eirpTxPower": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": 18 - }, - "bestApEnabled": null, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 20, - "minLoadFactor": 50 - } - }, - "is5GHzU": { - "model_type": "RfElementConfiguration", - "rf": "TipWlan-rf", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is80MHz", - "mimoMode": "twoByTwo", - "maxNumClients": 100, - "multicastRate": "auto", - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "managementRate": "auto", - "rxCellSizeDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "eirpTxPower": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": 18 - }, - "bestApEnabled": null, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } - }, - "is5GHzL": { - "model_type": "RfElementConfiguration", - "rf": "TipWlan-rf", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is80MHz", - "mimoMode": "twoByTwo", - "maxNumClients": 100, - "multicastRate": "auto", - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "managementRate": "auto", - "rxCellSizeDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "eirpTxPower": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": 18 - }, - "bestApEnabled": null, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } - } + "profileType": "rf" }, - "profileType": "rf" - }, - "createdTimestamp": 1601961452390, - "lastModifiedTimestamp": 1601961452390, - "childProfileIds": [] -} \ No newline at end of file + "createdTimestamp": 1602113059555, + "lastModifiedTimestamp": 1602113059555, + "childProfileIds": [] + } \ No newline at end of file diff --git a/opensync-ext-static/src/main/resources/ProfileSsid.json b/opensync-ext-static/src/main/resources/ProfileSsid.json index 12ac606..5d39cb4 100644 --- a/opensync-ext-static/src/main/resources/ProfileSsid.json +++ b/opensync-ext-static/src/main/resources/ProfileSsid.json @@ -1,69 +1,134 @@ [ -{ - "model_type": "Profile", - "id": 9, - "customerId": 2, - "profileType": "ssid", - "name": "TipWlan-cloud-3-radios", - "details": { - "model_type": "SsidConfiguration", - "ssid": "TipWlan-cloud-3-radios", - "appliedRadios": [ - "is5GHzU", - "is2dot4GHz", - "is5GHzL" - ], - "ssidAdminState": "enabled", - "secureMode": "open", - "vlanId": 1, - "keyStr": null, - "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 - } + { + "model_type": "Profile", + "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 }, - "bonjourGatewayProfileId": null, - "enable80211w": null, - "wepConfig": null, - "forwardMode": null, - "profileType": "ssid" + "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 + } }, - "createdTimestamp": 1601961452385, - "lastModifiedTimestamp": 1601961452385, - "childProfileIds": [ - 7, - 8 - ] - } + "bonjourGatewayProfileId": null, + "enable80211w": null, + "wepConfig": null, + "forwardMode": null, + "profileType": "ssid" + }, + "createdTimestamp": 1602113058718, + "lastModifiedTimestamp": 1602113059547, + "childProfileIds": [ + 9 + ] + }, + { + "model_type": "Profile", + "id": 10, + "customerId": 2, + "profileType": "ssid", + "name": "TipWlan-cloud-3-radios", + "details": { + "model_type": "SsidConfiguration", + "ssid": "TipWlan-cloud-3-radios", + "appliedRadios": [ + "is5GHzU", + "is5GHzL", + "is2dot4GHz" + ], + "ssidAdminState": "enabled", + "secureMode": "open", + "vlanId": 1, + "keyStr": null, + "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": 1602113059549, + "lastModifiedTimestamp": 1602113059549, + "childProfileIds": [ + 8 + ] + } ] diff --git a/opensync-ext-static/src/main/resources/ProfileVenue.json b/opensync-ext-static/src/main/resources/ProfileVenue.json index 6dee334..10e1aa3 100644 --- a/opensync-ext-static/src/main/resources/ProfileVenue.json +++ b/opensync-ext-static/src/main/resources/ProfileVenue.json @@ -1,7 +1,7 @@ [ -{ + { "model_type": "Profile", - "id": 6, + "id": 7, "customerId": 2, "profileType": "venue", "name": "TipWlan-Hotspot20-Venue", @@ -35,8 +35,8 @@ }, "profileType": "venue" }, - "createdTimestamp": 1602015573975, - "lastModifiedTimestamp": 1602015573975, + "createdTimestamp": 1602113058725, + "lastModifiedTimestamp": 1602113058725, "childProfileIds": [] } ] \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileAPExample.json b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileAPExample.json index cd61fe3..c57203d 100644 --- a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileAPExample.json +++ b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileAPExample.json @@ -1,49 +1,50 @@ - { - "model_type": "Profile", - "id": 15, - "customerId": 2, - "profileType": "equipment_ap", - "name": "ApProfile-3-radios", - "details": { - "model_type": "ApNetworkConfiguration", - "networkConfigVersion": "AP-1", - "equipmentType": "AP", - "vlanNative": true, - "vlan": 0, - "ntpServer": { - "model_type": "AutoOrManualString", - "auto": true, - "value": "pool.ntp.org" - }, - "syslogRelay": null, - "rtlsSettings": null, - "syntheticClientEnabled": true, - "ledControlEnabled": true, - "equipmentDiscovery": false, - "radioMap": { - "is2dot4GHz": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is5GHzU": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is5GHzL": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - } - }, - "profileType": "equipment_ap" +{ + "model_type": "Profile", + "id": 16, + "customerId": 2, + "profileType": "equipment_ap", + "name": "ApProfile-3-radios", + "details": { + "model_type": "ApNetworkConfiguration", + "networkConfigVersion": "AP-1", + "equipmentType": "AP", + "vlanNative": true, + "vlan": 0, + "ntpServer": { + "model_type": "AutoOrManualString", + "auto": true, + "value": "pool.ntp.org" }, - "createdTimestamp": 1601961452652, - "lastModifiedTimestamp": 1601961452652, - "childProfileIds": [ - 2, - 9, - 11 - ] - } \ No newline at end of file + "syslogRelay": null, + "rtlsSettings": null, + "syntheticClientEnabled": true, + "ledControlEnabled": true, + "equipmentDiscovery": false, + "radioMap": { + "is2dot4GHz": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + }, + "is5GHzU": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + }, + "is5GHzL": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + } + }, + "profileType": "equipment_ap" + }, + "createdTimestamp": 1602113059824, + "lastModifiedTimestamp": 1602113059824, + "childProfileIds": [ + 2, + 5, + 10, + 12 + ] + } \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileHotspot20.json b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileHotspot20.json index f8c107f..de2aa3d 100644 --- a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileHotspot20.json +++ b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileHotspot20.json @@ -1,7 +1,7 @@ [ { "model_type": "Profile", - "id": 8, + "id": 9, "customerId": 2, "profileType": "hotspot_2pt0", "name": "TipWlan-Hotspot20-Config", @@ -45,9 +45,10 @@ "disableDownstreamGroupAddressedForwarding": false, "enable2pt4GHz": true, "enable5GHz": true, - "associatedSsids": [ - "TipWlan-cloud-3-radios" + "associatedAccessSsidNames": [ + "TipWlan-cloud-hotspot-access" ], + "osuSsidName": "TipWlan-cloud-3-radios", "mccMnc3gppCellularNetworkInfo": [ { "model_type": "MccMnc", @@ -60,15 +61,23 @@ "mccMncPairing": "302,720" } ], + "operatorProfileName": "TipWlan-Hotspot20-Operator", + "venueProfileName": "TipWlan-Hotspot20-Venue", + "idProviderProfileNames": [ + "TipWlan-Hotspot20-OSU-Provider" + ], "profileType": "hotspot_2pt0", - "mccMncList": "302,720" + "mccMncList": "302,720", + "associatedSsids": [ + "TipWlan-cloud-hotspot-access" + ] }, - "createdTimestamp": 1602015574677, - "lastModifiedTimestamp": 1602015574677, + "createdTimestamp": 1602113059532, + "lastModifiedTimestamp": 1602113059532, "childProfileIds": [ - 5, 6, - 7 + 7, + 8 ] } ] \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileIdProvider.json b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileIdProvider.json index 4ea327e..b12abad 100644 --- a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileIdProvider.json +++ b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileIdProvider.json @@ -1,7 +1,7 @@ [ { "model_type": "Profile", - "id": 7, + "id": 8, "customerId": 2, "profileType": "id_provider", "name": "TipWlan-Hotspot20-OSU-Provider", @@ -29,19 +29,16 @@ ], "encoding": 0, "eapMethods": [ - "EAP-MSCHAP-V2 with username/password", "EAP-TTLS with username/password", "EAP-TLS with certificate" ], "eapMap": { - "EAP-MSCHAP-V2 with username/password": [ + "EAP-TTLS with username/password": [ + "Credential Type:username/password", "Non-EAP Inner Authentication Type:MSCHAPV2" ], - "EAP-TTLS with username/password": [ - "Credential Type:username/password" - ], "EAP-TLS with certificate": [ - "Credential Type:username/password" + "Credential Type:Certificate" ] } } @@ -107,8 +104,8 @@ ], "profileType": "id_provider" }, - "createdTimestamp": 1602015574295, - "lastModifiedTimestamp": 1602015574295, + "createdTimestamp": 1602113059086, + "lastModifiedTimestamp": 1602113059086, "childProfileIds": [] } ] \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileMetrics.json b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileMetrics.json index 4ac6711..8187736 100644 --- a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileMetrics.json +++ b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileMetrics.json @@ -1,298 +1,298 @@ [ -{ - "model_type": "Profile", - "id": 2, - "customerId": 2, - "profileType": "metrics", - "name": "Metrics-Profile-3-radios", - "details": { - "model_type": "ServiceMetricsCollectionConfigProfile", - "radioTypes": [ - "is5GHzU", - "is2dot4GHz", - "is5GHzL" - ], - "serviceMetricDataTypes": [ - "ApNode", - "ApSsid", - "Client", - "Channel", - "Neighbour" - ], - "metricConfigParameterMap": { - "ApNode": [ - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is2dot4GHz", - "serviceMetricDataType": "ApNode" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_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, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is5GHzU", - "serviceMetricDataType": "ApNode" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_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": "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" - } + { + "model_type": "Profile", + "id": 2, + "customerId": 2, + "profileType": "metrics", + "name": "Metrics-Profile-3-radios", + "details": { + "model_type": "ServiceMetricsCollectionConfigProfile", + "radioTypes": [ + "is5GHzU", + "is5GHzL", + "is2dot4GHz" ], - "ApSsid": [ - { - "model_type": "ServiceMetricRadioConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "radioType": "is5GHzL", - "serviceMetricDataType": "ApSsid" - }, - { - "model_type": "ServiceMetricRadioConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "radioType": "is2dot4GHz", - "serviceMetricDataType": "ApSsid" - }, - { - "model_type": "ServiceMetricRadioConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "radioType": "is5GHzU", - "serviceMetricDataType": "ApSsid" - } + "serviceMetricDataTypes": [ + "ApNode", + "ApSsid", + "Client", + "Channel", + "Neighbour" ], - "Client": [ - { - "model_type": "ServiceMetricRadioConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "radioType": "is5GHzL", - "serviceMetricDataType": "Client" - }, - { - "model_type": "ServiceMetricRadioConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "radioType": "is5GHzU", - "serviceMetricDataType": "Client" - }, - { - "model_type": "ServiceMetricRadioConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "radioType": "is2dot4GHz", - "serviceMetricDataType": "Client" - } - ], - "Channel": [ - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 120, - "channelSurveyType": "OFF_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is5GHzU", - "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": 120, - "channelSurveyType": "OFF_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is2dot4GHz", - "serviceMetricDataType": "Channel" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 120, - "channelSurveyType": "OFF_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": "is5GHzL", - "serviceMetricDataType": "Channel" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is5GHzU", - "serviceMetricDataType": "Channel" - } - ], - "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", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is5GHzL", - "serviceMetricDataType": "Neighbour" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is5GHzU", - "serviceMetricDataType": "Neighbour" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 120, - "channelSurveyType": "OFF_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is5GHzL", - "serviceMetricDataType": "Neighbour" - } - ] + "metricConfigParameterMap": { + "ApNode": [ + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 120, + "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, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is2dot4GHz", + "serviceMetricDataType": "ApNode" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is5GHzL", + "serviceMetricDataType": "ApNode" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is2dot4GHz", + "serviceMetricDataType": "ApNode" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is5GHzU", + "serviceMetricDataType": "ApNode" + } + ], + "ApSsid": [ + { + "model_type": "ServiceMetricRadioConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "radioType": "is2dot4GHz", + "serviceMetricDataType": "ApSsid" + }, + { + "model_type": "ServiceMetricRadioConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "radioType": "is5GHzL", + "serviceMetricDataType": "ApSsid" + }, + { + "model_type": "ServiceMetricRadioConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "radioType": "is5GHzU", + "serviceMetricDataType": "ApSsid" + } + ], + "Client": [ + { + "model_type": "ServiceMetricRadioConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "radioType": "is2dot4GHz", + "serviceMetricDataType": "Client" + }, + { + "model_type": "ServiceMetricRadioConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "radioType": "is5GHzL", + "serviceMetricDataType": "Client" + }, + { + "model_type": "ServiceMetricRadioConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "radioType": "is5GHzU", + "serviceMetricDataType": "Client" + } + ], + "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": "is2dot4GHz", + "serviceMetricDataType": "Channel" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is5GHzU", + "serviceMetricDataType": "Channel" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 120, + "channelSurveyType": "OFF_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is5GHzL", + "serviceMetricDataType": "Channel" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 120, + "channelSurveyType": "OFF_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is2dot4GHz", + "serviceMetricDataType": "Channel" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 120, + "channelSurveyType": "OFF_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is5GHzU", + "serviceMetricDataType": "Channel" + } + ], + "Neighbour": [ + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is5GHzL", + "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": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is5GHzU", + "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", + "samplingInterval": 30, + "reportingIntervalSeconds": 120, + "channelSurveyType": "OFF_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is5GHzL", + "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, - "lastModifiedTimestamp": 1601961451756, - "childProfileIds": [] -} + "createdTimestamp": 1602113058699, + "lastModifiedTimestamp": 1602113058699, + "childProfileIds": [] + } ] \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileOperator.json b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileOperator.json index 54da14f..d9a4844 100644 --- a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileOperator.json +++ b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileOperator.json @@ -1,7 +1,7 @@ [ { "model_type": "Profile", - "id": 5, + "id": 6, "customerId": 2, "profileType": "operator", "name": "TipWlan-Hotspot20-Operator", @@ -30,8 +30,8 @@ ], "profileType": "operator" }, - "createdTimestamp": 1602015573969, - "lastModifiedTimestamp": 1602015573969, + "createdTimestamp": 1602113058719, + "lastModifiedTimestamp": 1602113058719, "childProfileIds": [] } ] \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileRf.json b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileRf.json index f8a2b9b..9efbb54 100644 --- a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileRf.json +++ b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileRf.json @@ -1,256 +1,256 @@ -{ - "model_type": "Profile", - "id": 11, - "customerId": 2, - "profileType": "rf", - "name": "TipWlan-rf", - "details": { - "model_type": "RfConfiguration", - "rfConfigMap": { - "is5GHz": { - "model_type": "RfElementConfiguration", - "rf": "TipWlan-rf", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is80MHz", - "mimoMode": "twoByTwo", - "maxNumClients": 100, - "multicastRate": "auto", - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 + { + "model_type": "Profile", + "id": 12, + "customerId": 2, + "profileType": "rf", + "name": "TipWlan-rf", + "details": { + "model_type": "RfConfiguration", + "rfConfigMap": { + "is5GHz": { + "model_type": "RfElementConfiguration", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is80MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "multicastRate": "auto", + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "managementRate": "auto", + "rxCellSizeDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "eirpTxPower": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": 18 + }, + "bestApEnabled": null, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 30, + "minLoadFactor": 40 + } }, - "managementRate": "auto", - "rxCellSizeDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 + "is2dot4GHz": { + "model_type": "RfElementConfiguration", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is20MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "multicastRate": "auto", + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "managementRate": "auto", + "rxCellSizeDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "eirpTxPower": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": 18 + }, + "bestApEnabled": null, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 20, + "minLoadFactor": 50 + } }, - "probeResponseThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 + "is5GHzU": { + "model_type": "RfElementConfiguration", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is80MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "multicastRate": "auto", + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "managementRate": "auto", + "rxCellSizeDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "eirpTxPower": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": 18 + }, + "bestApEnabled": null, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 30, + "minLoadFactor": 40 + } }, - "clientDisconnectThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "eirpTxPower": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": 18 - }, - "bestApEnabled": null, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 + "is5GHzL": { + "model_type": "RfElementConfiguration", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is80MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "multicastRate": "auto", + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "managementRate": "auto", + "rxCellSizeDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "eirpTxPower": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": 18 + }, + "bestApEnabled": null, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 30, + "minLoadFactor": 40 + } } }, - "is2dot4GHz": { - "model_type": "RfElementConfiguration", - "rf": "TipWlan-rf", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is20MHz", - "mimoMode": "twoByTwo", - "maxNumClients": 100, - "multicastRate": "auto", - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "managementRate": "auto", - "rxCellSizeDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "eirpTxPower": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": 18 - }, - "bestApEnabled": null, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 20, - "minLoadFactor": 50 - } - }, - "is5GHzU": { - "model_type": "RfElementConfiguration", - "rf": "TipWlan-rf", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is80MHz", - "mimoMode": "twoByTwo", - "maxNumClients": 100, - "multicastRate": "auto", - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "managementRate": "auto", - "rxCellSizeDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "eirpTxPower": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": 18 - }, - "bestApEnabled": null, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } - }, - "is5GHzL": { - "model_type": "RfElementConfiguration", - "rf": "TipWlan-rf", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is80MHz", - "mimoMode": "twoByTwo", - "maxNumClients": 100, - "multicastRate": "auto", - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "managementRate": "auto", - "rxCellSizeDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "eirpTxPower": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": 18 - }, - "bestApEnabled": null, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } - } + "profileType": "rf" }, - "profileType": "rf" - }, - "createdTimestamp": 1601961452390, - "lastModifiedTimestamp": 1601961452390, - "childProfileIds": [] -} \ No newline at end of file + "createdTimestamp": 1602113059555, + "lastModifiedTimestamp": 1602113059555, + "childProfileIds": [] + } \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileSsid.json b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileSsid.json index 12ac606..5d39cb4 100644 --- a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileSsid.json +++ b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileSsid.json @@ -1,69 +1,134 @@ [ -{ - "model_type": "Profile", - "id": 9, - "customerId": 2, - "profileType": "ssid", - "name": "TipWlan-cloud-3-radios", - "details": { - "model_type": "SsidConfiguration", - "ssid": "TipWlan-cloud-3-radios", - "appliedRadios": [ - "is5GHzU", - "is2dot4GHz", - "is5GHzL" - ], - "ssidAdminState": "enabled", - "secureMode": "open", - "vlanId": 1, - "keyStr": null, - "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 - } + { + "model_type": "Profile", + "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 }, - "bonjourGatewayProfileId": null, - "enable80211w": null, - "wepConfig": null, - "forwardMode": null, - "profileType": "ssid" + "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 + } }, - "createdTimestamp": 1601961452385, - "lastModifiedTimestamp": 1601961452385, - "childProfileIds": [ - 7, - 8 - ] - } + "bonjourGatewayProfileId": null, + "enable80211w": null, + "wepConfig": null, + "forwardMode": null, + "profileType": "ssid" + }, + "createdTimestamp": 1602113058718, + "lastModifiedTimestamp": 1602113059547, + "childProfileIds": [ + 9 + ] + }, + { + "model_type": "Profile", + "id": 10, + "customerId": 2, + "profileType": "ssid", + "name": "TipWlan-cloud-3-radios", + "details": { + "model_type": "SsidConfiguration", + "ssid": "TipWlan-cloud-3-radios", + "appliedRadios": [ + "is5GHzU", + "is5GHzL", + "is2dot4GHz" + ], + "ssidAdminState": "enabled", + "secureMode": "open", + "vlanId": 1, + "keyStr": null, + "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": 1602113059549, + "lastModifiedTimestamp": 1602113059549, + "childProfileIds": [ + 8 + ] + } ] diff --git a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileVenue.json b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileVenue.json index 6dee334..10e1aa3 100644 --- a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileVenue.json +++ b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileVenue.json @@ -1,7 +1,7 @@ [ -{ + { "model_type": "Profile", - "id": 6, + "id": 7, "customerId": 2, "profileType": "venue", "name": "TipWlan-Hotspot20-Venue", @@ -35,8 +35,8 @@ }, "profileType": "venue" }, - "createdTimestamp": 1602015573975, - "lastModifiedTimestamp": 1602015573975, + "createdTimestamp": 1602113058725, + "lastModifiedTimestamp": 1602113058725, "childProfileIds": [] } ] \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileAPExample.json b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileAPExample.json index cd61fe3..c57203d 100644 --- a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileAPExample.json +++ b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileAPExample.json @@ -1,49 +1,50 @@ - { - "model_type": "Profile", - "id": 15, - "customerId": 2, - "profileType": "equipment_ap", - "name": "ApProfile-3-radios", - "details": { - "model_type": "ApNetworkConfiguration", - "networkConfigVersion": "AP-1", - "equipmentType": "AP", - "vlanNative": true, - "vlan": 0, - "ntpServer": { - "model_type": "AutoOrManualString", - "auto": true, - "value": "pool.ntp.org" - }, - "syslogRelay": null, - "rtlsSettings": null, - "syntheticClientEnabled": true, - "ledControlEnabled": true, - "equipmentDiscovery": false, - "radioMap": { - "is2dot4GHz": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is5GHzU": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is5GHzL": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - } - }, - "profileType": "equipment_ap" +{ + "model_type": "Profile", + "id": 16, + "customerId": 2, + "profileType": "equipment_ap", + "name": "ApProfile-3-radios", + "details": { + "model_type": "ApNetworkConfiguration", + "networkConfigVersion": "AP-1", + "equipmentType": "AP", + "vlanNative": true, + "vlan": 0, + "ntpServer": { + "model_type": "AutoOrManualString", + "auto": true, + "value": "pool.ntp.org" }, - "createdTimestamp": 1601961452652, - "lastModifiedTimestamp": 1601961452652, - "childProfileIds": [ - 2, - 9, - 11 - ] - } \ No newline at end of file + "syslogRelay": null, + "rtlsSettings": null, + "syntheticClientEnabled": true, + "ledControlEnabled": true, + "equipmentDiscovery": false, + "radioMap": { + "is2dot4GHz": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + }, + "is5GHzU": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + }, + "is5GHzL": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + } + }, + "profileType": "equipment_ap" + }, + "createdTimestamp": 1602113059824, + "lastModifiedTimestamp": 1602113059824, + "childProfileIds": [ + 2, + 5, + 10, + 12 + ] + } \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileHotspot20.json b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileHotspot20.json index f8c107f..de2aa3d 100644 --- a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileHotspot20.json +++ b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileHotspot20.json @@ -1,7 +1,7 @@ [ { "model_type": "Profile", - "id": 8, + "id": 9, "customerId": 2, "profileType": "hotspot_2pt0", "name": "TipWlan-Hotspot20-Config", @@ -45,9 +45,10 @@ "disableDownstreamGroupAddressedForwarding": false, "enable2pt4GHz": true, "enable5GHz": true, - "associatedSsids": [ - "TipWlan-cloud-3-radios" + "associatedAccessSsidNames": [ + "TipWlan-cloud-hotspot-access" ], + "osuSsidName": "TipWlan-cloud-3-radios", "mccMnc3gppCellularNetworkInfo": [ { "model_type": "MccMnc", @@ -60,15 +61,23 @@ "mccMncPairing": "302,720" } ], + "operatorProfileName": "TipWlan-Hotspot20-Operator", + "venueProfileName": "TipWlan-Hotspot20-Venue", + "idProviderProfileNames": [ + "TipWlan-Hotspot20-OSU-Provider" + ], "profileType": "hotspot_2pt0", - "mccMncList": "302,720" + "mccMncList": "302,720", + "associatedSsids": [ + "TipWlan-cloud-hotspot-access" + ] }, - "createdTimestamp": 1602015574677, - "lastModifiedTimestamp": 1602015574677, + "createdTimestamp": 1602113059532, + "lastModifiedTimestamp": 1602113059532, "childProfileIds": [ - 5, 6, - 7 + 7, + 8 ] } ] \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileIdProvider.json b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileIdProvider.json index 4ea327e..b12abad 100644 --- a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileIdProvider.json +++ b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileIdProvider.json @@ -1,7 +1,7 @@ [ { "model_type": "Profile", - "id": 7, + "id": 8, "customerId": 2, "profileType": "id_provider", "name": "TipWlan-Hotspot20-OSU-Provider", @@ -29,19 +29,16 @@ ], "encoding": 0, "eapMethods": [ - "EAP-MSCHAP-V2 with username/password", "EAP-TTLS with username/password", "EAP-TLS with certificate" ], "eapMap": { - "EAP-MSCHAP-V2 with username/password": [ + "EAP-TTLS with username/password": [ + "Credential Type:username/password", "Non-EAP Inner Authentication Type:MSCHAPV2" ], - "EAP-TTLS with username/password": [ - "Credential Type:username/password" - ], "EAP-TLS with certificate": [ - "Credential Type:username/password" + "Credential Type:Certificate" ] } } @@ -107,8 +104,8 @@ ], "profileType": "id_provider" }, - "createdTimestamp": 1602015574295, - "lastModifiedTimestamp": 1602015574295, + "createdTimestamp": 1602113059086, + "lastModifiedTimestamp": 1602113059086, "childProfileIds": [] } ] \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileMetrics.json b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileMetrics.json index 4ac6711..8187736 100644 --- a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileMetrics.json +++ b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileMetrics.json @@ -1,298 +1,298 @@ [ -{ - "model_type": "Profile", - "id": 2, - "customerId": 2, - "profileType": "metrics", - "name": "Metrics-Profile-3-radios", - "details": { - "model_type": "ServiceMetricsCollectionConfigProfile", - "radioTypes": [ - "is5GHzU", - "is2dot4GHz", - "is5GHzL" - ], - "serviceMetricDataTypes": [ - "ApNode", - "ApSsid", - "Client", - "Channel", - "Neighbour" - ], - "metricConfigParameterMap": { - "ApNode": [ - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is2dot4GHz", - "serviceMetricDataType": "ApNode" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_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, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is5GHzU", - "serviceMetricDataType": "ApNode" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_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": "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" - } + { + "model_type": "Profile", + "id": 2, + "customerId": 2, + "profileType": "metrics", + "name": "Metrics-Profile-3-radios", + "details": { + "model_type": "ServiceMetricsCollectionConfigProfile", + "radioTypes": [ + "is5GHzU", + "is5GHzL", + "is2dot4GHz" ], - "ApSsid": [ - { - "model_type": "ServiceMetricRadioConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "radioType": "is5GHzL", - "serviceMetricDataType": "ApSsid" - }, - { - "model_type": "ServiceMetricRadioConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "radioType": "is2dot4GHz", - "serviceMetricDataType": "ApSsid" - }, - { - "model_type": "ServiceMetricRadioConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "radioType": "is5GHzU", - "serviceMetricDataType": "ApSsid" - } + "serviceMetricDataTypes": [ + "ApNode", + "ApSsid", + "Client", + "Channel", + "Neighbour" ], - "Client": [ - { - "model_type": "ServiceMetricRadioConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "radioType": "is5GHzL", - "serviceMetricDataType": "Client" - }, - { - "model_type": "ServiceMetricRadioConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "radioType": "is5GHzU", - "serviceMetricDataType": "Client" - }, - { - "model_type": "ServiceMetricRadioConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "radioType": "is2dot4GHz", - "serviceMetricDataType": "Client" - } - ], - "Channel": [ - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 120, - "channelSurveyType": "OFF_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is5GHzU", - "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": 120, - "channelSurveyType": "OFF_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is2dot4GHz", - "serviceMetricDataType": "Channel" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 120, - "channelSurveyType": "OFF_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": "is5GHzL", - "serviceMetricDataType": "Channel" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is5GHzU", - "serviceMetricDataType": "Channel" - } - ], - "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", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is5GHzL", - "serviceMetricDataType": "Neighbour" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is5GHzU", - "serviceMetricDataType": "Neighbour" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 120, - "channelSurveyType": "OFF_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is5GHzL", - "serviceMetricDataType": "Neighbour" - } - ] + "metricConfigParameterMap": { + "ApNode": [ + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 120, + "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, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is2dot4GHz", + "serviceMetricDataType": "ApNode" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is5GHzL", + "serviceMetricDataType": "ApNode" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is2dot4GHz", + "serviceMetricDataType": "ApNode" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is5GHzU", + "serviceMetricDataType": "ApNode" + } + ], + "ApSsid": [ + { + "model_type": "ServiceMetricRadioConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "radioType": "is2dot4GHz", + "serviceMetricDataType": "ApSsid" + }, + { + "model_type": "ServiceMetricRadioConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "radioType": "is5GHzL", + "serviceMetricDataType": "ApSsid" + }, + { + "model_type": "ServiceMetricRadioConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "radioType": "is5GHzU", + "serviceMetricDataType": "ApSsid" + } + ], + "Client": [ + { + "model_type": "ServiceMetricRadioConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "radioType": "is2dot4GHz", + "serviceMetricDataType": "Client" + }, + { + "model_type": "ServiceMetricRadioConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "radioType": "is5GHzL", + "serviceMetricDataType": "Client" + }, + { + "model_type": "ServiceMetricRadioConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "radioType": "is5GHzU", + "serviceMetricDataType": "Client" + } + ], + "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": "is2dot4GHz", + "serviceMetricDataType": "Channel" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is5GHzU", + "serviceMetricDataType": "Channel" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 120, + "channelSurveyType": "OFF_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is5GHzL", + "serviceMetricDataType": "Channel" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 120, + "channelSurveyType": "OFF_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is2dot4GHz", + "serviceMetricDataType": "Channel" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 120, + "channelSurveyType": "OFF_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is5GHzU", + "serviceMetricDataType": "Channel" + } + ], + "Neighbour": [ + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is5GHzL", + "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": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is5GHzU", + "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", + "samplingInterval": 30, + "reportingIntervalSeconds": 120, + "channelSurveyType": "OFF_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is5GHzL", + "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, - "lastModifiedTimestamp": 1601961451756, - "childProfileIds": [] -} + "createdTimestamp": 1602113058699, + "lastModifiedTimestamp": 1602113058699, + "childProfileIds": [] + } ] \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileOperator.json b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileOperator.json index 54da14f..d9a4844 100644 --- a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileOperator.json +++ b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileOperator.json @@ -1,7 +1,7 @@ [ { "model_type": "Profile", - "id": 5, + "id": 6, "customerId": 2, "profileType": "operator", "name": "TipWlan-Hotspot20-Operator", @@ -30,8 +30,8 @@ ], "profileType": "operator" }, - "createdTimestamp": 1602015573969, - "lastModifiedTimestamp": 1602015573969, + "createdTimestamp": 1602113058719, + "lastModifiedTimestamp": 1602113058719, "childProfileIds": [] } ] \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileRf.json b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileRf.json index f8a2b9b..9efbb54 100644 --- a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileRf.json +++ b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileRf.json @@ -1,256 +1,256 @@ -{ - "model_type": "Profile", - "id": 11, - "customerId": 2, - "profileType": "rf", - "name": "TipWlan-rf", - "details": { - "model_type": "RfConfiguration", - "rfConfigMap": { - "is5GHz": { - "model_type": "RfElementConfiguration", - "rf": "TipWlan-rf", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is80MHz", - "mimoMode": "twoByTwo", - "maxNumClients": 100, - "multicastRate": "auto", - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 + { + "model_type": "Profile", + "id": 12, + "customerId": 2, + "profileType": "rf", + "name": "TipWlan-rf", + "details": { + "model_type": "RfConfiguration", + "rfConfigMap": { + "is5GHz": { + "model_type": "RfElementConfiguration", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is80MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "multicastRate": "auto", + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "managementRate": "auto", + "rxCellSizeDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "eirpTxPower": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": 18 + }, + "bestApEnabled": null, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 30, + "minLoadFactor": 40 + } }, - "managementRate": "auto", - "rxCellSizeDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 + "is2dot4GHz": { + "model_type": "RfElementConfiguration", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is20MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "multicastRate": "auto", + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "managementRate": "auto", + "rxCellSizeDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "eirpTxPower": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": 18 + }, + "bestApEnabled": null, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 20, + "minLoadFactor": 50 + } }, - "probeResponseThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 + "is5GHzU": { + "model_type": "RfElementConfiguration", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is80MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "multicastRate": "auto", + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "managementRate": "auto", + "rxCellSizeDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "eirpTxPower": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": 18 + }, + "bestApEnabled": null, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 30, + "minLoadFactor": 40 + } }, - "clientDisconnectThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "eirpTxPower": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": 18 - }, - "bestApEnabled": null, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 + "is5GHzL": { + "model_type": "RfElementConfiguration", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is80MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "multicastRate": "auto", + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "managementRate": "auto", + "rxCellSizeDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "eirpTxPower": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": 18 + }, + "bestApEnabled": null, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 30, + "minLoadFactor": 40 + } } }, - "is2dot4GHz": { - "model_type": "RfElementConfiguration", - "rf": "TipWlan-rf", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is20MHz", - "mimoMode": "twoByTwo", - "maxNumClients": 100, - "multicastRate": "auto", - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "managementRate": "auto", - "rxCellSizeDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "eirpTxPower": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": 18 - }, - "bestApEnabled": null, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 20, - "minLoadFactor": 50 - } - }, - "is5GHzU": { - "model_type": "RfElementConfiguration", - "rf": "TipWlan-rf", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is80MHz", - "mimoMode": "twoByTwo", - "maxNumClients": 100, - "multicastRate": "auto", - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "managementRate": "auto", - "rxCellSizeDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "eirpTxPower": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": 18 - }, - "bestApEnabled": null, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } - }, - "is5GHzL": { - "model_type": "RfElementConfiguration", - "rf": "TipWlan-rf", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is80MHz", - "mimoMode": "twoByTwo", - "maxNumClients": 100, - "multicastRate": "auto", - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "managementRate": "auto", - "rxCellSizeDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "eirpTxPower": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": 18 - }, - "bestApEnabled": null, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } - } + "profileType": "rf" }, - "profileType": "rf" - }, - "createdTimestamp": 1601961452390, - "lastModifiedTimestamp": 1601961452390, - "childProfileIds": [] -} \ No newline at end of file + "createdTimestamp": 1602113059555, + "lastModifiedTimestamp": 1602113059555, + "childProfileIds": [] + } \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileSsid.json b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileSsid.json index 12ac606..5d39cb4 100644 --- a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileSsid.json +++ b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileSsid.json @@ -1,69 +1,134 @@ [ -{ - "model_type": "Profile", - "id": 9, - "customerId": 2, - "profileType": "ssid", - "name": "TipWlan-cloud-3-radios", - "details": { - "model_type": "SsidConfiguration", - "ssid": "TipWlan-cloud-3-radios", - "appliedRadios": [ - "is5GHzU", - "is2dot4GHz", - "is5GHzL" - ], - "ssidAdminState": "enabled", - "secureMode": "open", - "vlanId": 1, - "keyStr": null, - "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 - } + { + "model_type": "Profile", + "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 }, - "bonjourGatewayProfileId": null, - "enable80211w": null, - "wepConfig": null, - "forwardMode": null, - "profileType": "ssid" + "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 + } }, - "createdTimestamp": 1601961452385, - "lastModifiedTimestamp": 1601961452385, - "childProfileIds": [ - 7, - 8 - ] - } + "bonjourGatewayProfileId": null, + "enable80211w": null, + "wepConfig": null, + "forwardMode": null, + "profileType": "ssid" + }, + "createdTimestamp": 1602113058718, + "lastModifiedTimestamp": 1602113059547, + "childProfileIds": [ + 9 + ] + }, + { + "model_type": "Profile", + "id": 10, + "customerId": 2, + "profileType": "ssid", + "name": "TipWlan-cloud-3-radios", + "details": { + "model_type": "SsidConfiguration", + "ssid": "TipWlan-cloud-3-radios", + "appliedRadios": [ + "is5GHzU", + "is5GHzL", + "is2dot4GHz" + ], + "ssidAdminState": "enabled", + "secureMode": "open", + "vlanId": 1, + "keyStr": null, + "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": 1602113059549, + "lastModifiedTimestamp": 1602113059549, + "childProfileIds": [ + 8 + ] + } ] diff --git a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileVenue.json b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileVenue.json index 6dee334..10e1aa3 100644 --- a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileVenue.json +++ b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileVenue.json @@ -1,7 +1,7 @@ [ -{ + { "model_type": "Profile", - "id": 6, + "id": 7, "customerId": 2, "profileType": "venue", "name": "TipWlan-Hotspot20-Venue", @@ -35,8 +35,8 @@ }, "profileType": "venue" }, - "createdTimestamp": 1602015573975, - "lastModifiedTimestamp": 1602015573975, + "createdTimestamp": 1602113058725, + "lastModifiedTimestamp": 1602113058725, "childProfileIds": [] } ] \ No newline at end of file diff --git a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileAPExample.json b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileAPExample.json index cd61fe3..c57203d 100644 --- a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileAPExample.json +++ b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileAPExample.json @@ -1,49 +1,50 @@ - { - "model_type": "Profile", - "id": 15, - "customerId": 2, - "profileType": "equipment_ap", - "name": "ApProfile-3-radios", - "details": { - "model_type": "ApNetworkConfiguration", - "networkConfigVersion": "AP-1", - "equipmentType": "AP", - "vlanNative": true, - "vlan": 0, - "ntpServer": { - "model_type": "AutoOrManualString", - "auto": true, - "value": "pool.ntp.org" - }, - "syslogRelay": null, - "rtlsSettings": null, - "syntheticClientEnabled": true, - "ledControlEnabled": true, - "equipmentDiscovery": false, - "radioMap": { - "is2dot4GHz": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is5GHzU": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is5GHzL": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - } - }, - "profileType": "equipment_ap" +{ + "model_type": "Profile", + "id": 16, + "customerId": 2, + "profileType": "equipment_ap", + "name": "ApProfile-3-radios", + "details": { + "model_type": "ApNetworkConfiguration", + "networkConfigVersion": "AP-1", + "equipmentType": "AP", + "vlanNative": true, + "vlan": 0, + "ntpServer": { + "model_type": "AutoOrManualString", + "auto": true, + "value": "pool.ntp.org" }, - "createdTimestamp": 1601961452652, - "lastModifiedTimestamp": 1601961452652, - "childProfileIds": [ - 2, - 9, - 11 - ] - } \ No newline at end of file + "syslogRelay": null, + "rtlsSettings": null, + "syntheticClientEnabled": true, + "ledControlEnabled": true, + "equipmentDiscovery": false, + "radioMap": { + "is2dot4GHz": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + }, + "is5GHzU": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + }, + "is5GHzL": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + } + }, + "profileType": "equipment_ap" + }, + "createdTimestamp": 1602113059824, + "lastModifiedTimestamp": 1602113059824, + "childProfileIds": [ + 2, + 5, + 10, + 12 + ] + } \ No newline at end of file diff --git a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileHotspot20.json b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileHotspot20.json index f8c107f..de2aa3d 100644 --- a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileHotspot20.json +++ b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileHotspot20.json @@ -1,7 +1,7 @@ [ { "model_type": "Profile", - "id": 8, + "id": 9, "customerId": 2, "profileType": "hotspot_2pt0", "name": "TipWlan-Hotspot20-Config", @@ -45,9 +45,10 @@ "disableDownstreamGroupAddressedForwarding": false, "enable2pt4GHz": true, "enable5GHz": true, - "associatedSsids": [ - "TipWlan-cloud-3-radios" + "associatedAccessSsidNames": [ + "TipWlan-cloud-hotspot-access" ], + "osuSsidName": "TipWlan-cloud-3-radios", "mccMnc3gppCellularNetworkInfo": [ { "model_type": "MccMnc", @@ -60,15 +61,23 @@ "mccMncPairing": "302,720" } ], + "operatorProfileName": "TipWlan-Hotspot20-Operator", + "venueProfileName": "TipWlan-Hotspot20-Venue", + "idProviderProfileNames": [ + "TipWlan-Hotspot20-OSU-Provider" + ], "profileType": "hotspot_2pt0", - "mccMncList": "302,720" + "mccMncList": "302,720", + "associatedSsids": [ + "TipWlan-cloud-hotspot-access" + ] }, - "createdTimestamp": 1602015574677, - "lastModifiedTimestamp": 1602015574677, + "createdTimestamp": 1602113059532, + "lastModifiedTimestamp": 1602113059532, "childProfileIds": [ - 5, 6, - 7 + 7, + 8 ] } ] \ No newline at end of file diff --git a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileIdProvider.json b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileIdProvider.json index 4ea327e..b12abad 100644 --- a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileIdProvider.json +++ b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileIdProvider.json @@ -1,7 +1,7 @@ [ { "model_type": "Profile", - "id": 7, + "id": 8, "customerId": 2, "profileType": "id_provider", "name": "TipWlan-Hotspot20-OSU-Provider", @@ -29,19 +29,16 @@ ], "encoding": 0, "eapMethods": [ - "EAP-MSCHAP-V2 with username/password", "EAP-TTLS with username/password", "EAP-TLS with certificate" ], "eapMap": { - "EAP-MSCHAP-V2 with username/password": [ + "EAP-TTLS with username/password": [ + "Credential Type:username/password", "Non-EAP Inner Authentication Type:MSCHAPV2" ], - "EAP-TTLS with username/password": [ - "Credential Type:username/password" - ], "EAP-TLS with certificate": [ - "Credential Type:username/password" + "Credential Type:Certificate" ] } } @@ -107,8 +104,8 @@ ], "profileType": "id_provider" }, - "createdTimestamp": 1602015574295, - "lastModifiedTimestamp": 1602015574295, + "createdTimestamp": 1602113059086, + "lastModifiedTimestamp": 1602113059086, "childProfileIds": [] } ] \ No newline at end of file diff --git a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileMetrics.json b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileMetrics.json index 4ac6711..8187736 100644 --- a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileMetrics.json +++ b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileMetrics.json @@ -1,298 +1,298 @@ [ -{ - "model_type": "Profile", - "id": 2, - "customerId": 2, - "profileType": "metrics", - "name": "Metrics-Profile-3-radios", - "details": { - "model_type": "ServiceMetricsCollectionConfigProfile", - "radioTypes": [ - "is5GHzU", - "is2dot4GHz", - "is5GHzL" - ], - "serviceMetricDataTypes": [ - "ApNode", - "ApSsid", - "Client", - "Channel", - "Neighbour" - ], - "metricConfigParameterMap": { - "ApNode": [ - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is2dot4GHz", - "serviceMetricDataType": "ApNode" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_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, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is5GHzU", - "serviceMetricDataType": "ApNode" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_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": "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" - } + { + "model_type": "Profile", + "id": 2, + "customerId": 2, + "profileType": "metrics", + "name": "Metrics-Profile-3-radios", + "details": { + "model_type": "ServiceMetricsCollectionConfigProfile", + "radioTypes": [ + "is5GHzU", + "is5GHzL", + "is2dot4GHz" ], - "ApSsid": [ - { - "model_type": "ServiceMetricRadioConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "radioType": "is5GHzL", - "serviceMetricDataType": "ApSsid" - }, - { - "model_type": "ServiceMetricRadioConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "radioType": "is2dot4GHz", - "serviceMetricDataType": "ApSsid" - }, - { - "model_type": "ServiceMetricRadioConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "radioType": "is5GHzU", - "serviceMetricDataType": "ApSsid" - } + "serviceMetricDataTypes": [ + "ApNode", + "ApSsid", + "Client", + "Channel", + "Neighbour" ], - "Client": [ - { - "model_type": "ServiceMetricRadioConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "radioType": "is5GHzL", - "serviceMetricDataType": "Client" - }, - { - "model_type": "ServiceMetricRadioConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "radioType": "is5GHzU", - "serviceMetricDataType": "Client" - }, - { - "model_type": "ServiceMetricRadioConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "radioType": "is2dot4GHz", - "serviceMetricDataType": "Client" - } - ], - "Channel": [ - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 120, - "channelSurveyType": "OFF_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is5GHzU", - "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": 120, - "channelSurveyType": "OFF_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is2dot4GHz", - "serviceMetricDataType": "Channel" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 120, - "channelSurveyType": "OFF_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": "is5GHzL", - "serviceMetricDataType": "Channel" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is5GHzU", - "serviceMetricDataType": "Channel" - } - ], - "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", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is5GHzL", - "serviceMetricDataType": "Neighbour" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is5GHzU", - "serviceMetricDataType": "Neighbour" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 120, - "channelSurveyType": "OFF_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is5GHzL", - "serviceMetricDataType": "Neighbour" - } - ] + "metricConfigParameterMap": { + "ApNode": [ + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 120, + "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, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is2dot4GHz", + "serviceMetricDataType": "ApNode" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is5GHzL", + "serviceMetricDataType": "ApNode" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is2dot4GHz", + "serviceMetricDataType": "ApNode" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is5GHzU", + "serviceMetricDataType": "ApNode" + } + ], + "ApSsid": [ + { + "model_type": "ServiceMetricRadioConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "radioType": "is2dot4GHz", + "serviceMetricDataType": "ApSsid" + }, + { + "model_type": "ServiceMetricRadioConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "radioType": "is5GHzL", + "serviceMetricDataType": "ApSsid" + }, + { + "model_type": "ServiceMetricRadioConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "radioType": "is5GHzU", + "serviceMetricDataType": "ApSsid" + } + ], + "Client": [ + { + "model_type": "ServiceMetricRadioConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "radioType": "is2dot4GHz", + "serviceMetricDataType": "Client" + }, + { + "model_type": "ServiceMetricRadioConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "radioType": "is5GHzL", + "serviceMetricDataType": "Client" + }, + { + "model_type": "ServiceMetricRadioConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "radioType": "is5GHzU", + "serviceMetricDataType": "Client" + } + ], + "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": "is2dot4GHz", + "serviceMetricDataType": "Channel" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is5GHzU", + "serviceMetricDataType": "Channel" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 120, + "channelSurveyType": "OFF_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is5GHzL", + "serviceMetricDataType": "Channel" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 120, + "channelSurveyType": "OFF_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is2dot4GHz", + "serviceMetricDataType": "Channel" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 120, + "channelSurveyType": "OFF_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is5GHzU", + "serviceMetricDataType": "Channel" + } + ], + "Neighbour": [ + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is5GHzL", + "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": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is5GHzU", + "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", + "samplingInterval": 30, + "reportingIntervalSeconds": 120, + "channelSurveyType": "OFF_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is5GHzL", + "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, - "lastModifiedTimestamp": 1601961451756, - "childProfileIds": [] -} + "createdTimestamp": 1602113058699, + "lastModifiedTimestamp": 1602113058699, + "childProfileIds": [] + } ] \ No newline at end of file diff --git a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileOperator.json b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileOperator.json index 54da14f..d9a4844 100644 --- a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileOperator.json +++ b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileOperator.json @@ -1,7 +1,7 @@ [ { "model_type": "Profile", - "id": 5, + "id": 6, "customerId": 2, "profileType": "operator", "name": "TipWlan-Hotspot20-Operator", @@ -30,8 +30,8 @@ ], "profileType": "operator" }, - "createdTimestamp": 1602015573969, - "lastModifiedTimestamp": 1602015573969, + "createdTimestamp": 1602113058719, + "lastModifiedTimestamp": 1602113058719, "childProfileIds": [] } ] \ No newline at end of file diff --git a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileRf.json b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileRf.json index f8a2b9b..9efbb54 100644 --- a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileRf.json +++ b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileRf.json @@ -1,256 +1,256 @@ -{ - "model_type": "Profile", - "id": 11, - "customerId": 2, - "profileType": "rf", - "name": "TipWlan-rf", - "details": { - "model_type": "RfConfiguration", - "rfConfigMap": { - "is5GHz": { - "model_type": "RfElementConfiguration", - "rf": "TipWlan-rf", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is80MHz", - "mimoMode": "twoByTwo", - "maxNumClients": 100, - "multicastRate": "auto", - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 + { + "model_type": "Profile", + "id": 12, + "customerId": 2, + "profileType": "rf", + "name": "TipWlan-rf", + "details": { + "model_type": "RfConfiguration", + "rfConfigMap": { + "is5GHz": { + "model_type": "RfElementConfiguration", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is80MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "multicastRate": "auto", + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "managementRate": "auto", + "rxCellSizeDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "eirpTxPower": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": 18 + }, + "bestApEnabled": null, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 30, + "minLoadFactor": 40 + } }, - "managementRate": "auto", - "rxCellSizeDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 + "is2dot4GHz": { + "model_type": "RfElementConfiguration", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is20MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "multicastRate": "auto", + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "managementRate": "auto", + "rxCellSizeDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "eirpTxPower": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": 18 + }, + "bestApEnabled": null, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 20, + "minLoadFactor": 50 + } }, - "probeResponseThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 + "is5GHzU": { + "model_type": "RfElementConfiguration", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is80MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "multicastRate": "auto", + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "managementRate": "auto", + "rxCellSizeDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "eirpTxPower": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": 18 + }, + "bestApEnabled": null, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 30, + "minLoadFactor": 40 + } }, - "clientDisconnectThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "eirpTxPower": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": 18 - }, - "bestApEnabled": null, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 + "is5GHzL": { + "model_type": "RfElementConfiguration", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is80MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "multicastRate": "auto", + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "managementRate": "auto", + "rxCellSizeDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "eirpTxPower": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": 18 + }, + "bestApEnabled": null, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 30, + "minLoadFactor": 40 + } } }, - "is2dot4GHz": { - "model_type": "RfElementConfiguration", - "rf": "TipWlan-rf", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is20MHz", - "mimoMode": "twoByTwo", - "maxNumClients": 100, - "multicastRate": "auto", - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "managementRate": "auto", - "rxCellSizeDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "eirpTxPower": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": 18 - }, - "bestApEnabled": null, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 20, - "minLoadFactor": 50 - } - }, - "is5GHzU": { - "model_type": "RfElementConfiguration", - "rf": "TipWlan-rf", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is80MHz", - "mimoMode": "twoByTwo", - "maxNumClients": 100, - "multicastRate": "auto", - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "managementRate": "auto", - "rxCellSizeDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "eirpTxPower": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": 18 - }, - "bestApEnabled": null, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } - }, - "is5GHzL": { - "model_type": "RfElementConfiguration", - "rf": "TipWlan-rf", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is80MHz", - "mimoMode": "twoByTwo", - "maxNumClients": 100, - "multicastRate": "auto", - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "managementRate": "auto", - "rxCellSizeDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "eirpTxPower": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": 18 - }, - "bestApEnabled": null, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } - } + "profileType": "rf" }, - "profileType": "rf" - }, - "createdTimestamp": 1601961452390, - "lastModifiedTimestamp": 1601961452390, - "childProfileIds": [] -} \ No newline at end of file + "createdTimestamp": 1602113059555, + "lastModifiedTimestamp": 1602113059555, + "childProfileIds": [] + } \ No newline at end of file diff --git a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileSsid.json b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileSsid.json index 12ac606..5d39cb4 100644 --- a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileSsid.json +++ b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileSsid.json @@ -1,69 +1,134 @@ [ -{ - "model_type": "Profile", - "id": 9, - "customerId": 2, - "profileType": "ssid", - "name": "TipWlan-cloud-3-radios", - "details": { - "model_type": "SsidConfiguration", - "ssid": "TipWlan-cloud-3-radios", - "appliedRadios": [ - "is5GHzU", - "is2dot4GHz", - "is5GHzL" - ], - "ssidAdminState": "enabled", - "secureMode": "open", - "vlanId": 1, - "keyStr": null, - "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 - } + { + "model_type": "Profile", + "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 }, - "bonjourGatewayProfileId": null, - "enable80211w": null, - "wepConfig": null, - "forwardMode": null, - "profileType": "ssid" + "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 + } }, - "createdTimestamp": 1601961452385, - "lastModifiedTimestamp": 1601961452385, - "childProfileIds": [ - 7, - 8 - ] - } + "bonjourGatewayProfileId": null, + "enable80211w": null, + "wepConfig": null, + "forwardMode": null, + "profileType": "ssid" + }, + "createdTimestamp": 1602113058718, + "lastModifiedTimestamp": 1602113059547, + "childProfileIds": [ + 9 + ] + }, + { + "model_type": "Profile", + "id": 10, + "customerId": 2, + "profileType": "ssid", + "name": "TipWlan-cloud-3-radios", + "details": { + "model_type": "SsidConfiguration", + "ssid": "TipWlan-cloud-3-radios", + "appliedRadios": [ + "is5GHzU", + "is5GHzL", + "is2dot4GHz" + ], + "ssidAdminState": "enabled", + "secureMode": "open", + "vlanId": 1, + "keyStr": null, + "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": 1602113059549, + "lastModifiedTimestamp": 1602113059549, + "childProfileIds": [ + 8 + ] + } ] diff --git a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileVenue.json b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileVenue.json index 6dee334..10e1aa3 100644 --- a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileVenue.json +++ b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileVenue.json @@ -1,7 +1,7 @@ [ -{ + { "model_type": "Profile", - "id": 6, + "id": 7, "customerId": 2, "profileType": "venue", "name": "TipWlan-Hotspot20-Venue", @@ -35,8 +35,8 @@ }, "profileType": "venue" }, - "createdTimestamp": 1602015573975, - "lastModifiedTimestamp": 1602015573975, + "createdTimestamp": 1602113058725, + "lastModifiedTimestamp": 1602113058725, "childProfileIds": [] } ] \ No newline at end of file diff --git a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java index 804d488..3fa2376 100644 --- a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java +++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java @@ -3439,35 +3439,32 @@ public class OvsdbDao { if (hs20cfg.getHotspot20ProfileSet() != null) { List operations = new ArrayList<>(); for (Profile hotspotProfile : hs20cfg.getHotspot20ProfileSet()) { - OperatorProfile operatorProfile = null; - - if (hs20cfg.getHotspot20OperatorSet() != null) { - List operator = hs20cfg.getHotspot20OperatorSet().stream() - .filter(new Predicate() { - - @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 venue = hs20cfg.getHotspot20VenueSet().stream() - .filter(new Predicate() { - - @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(); + + Profile operator = hs20cfg.getHotspot20OperatorSet().stream().filter(new Predicate() { + + @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() { + + @Override + public boolean test(Profile t) { + return t.getName().equals(hs2Profile.getVenueProfileName()); + } + + }).findFirst().get(); + + VenueProfile venueProfile = (VenueProfile)venue.getDetails(); + Map rowColumns = new HashMap<>(); @@ -3487,16 +3484,17 @@ public class OvsdbDao { Set osuProvidersUuids = new HashSet<>(); Set osuIconUuids = new HashSet<>(); - Set> osuNai = new HashSet<>(); for (Profile provider : providerList) { Hotspot20IdProviderProfile providerProfile = (Hotspot20IdProviderProfile) provider .getDetails(); if (osuProviders.containsKey(providerProfile.getOsuServerUri())) { osuProvidersUuids.add(osuProviders.get(providerProfile.getOsuServerUri()).uuid); osuIconUuids.addAll(osuProviders.get(providerProfile.getOsuServerUri()).osuIcons); - osuProviders.get(providerProfile.getOsuServerUri()).osuNai.stream().forEach(n -> { - osuNai.add(new Atom(n)); - }); + getNaiRealms(providerProfile, rowColumns); + +// osuProviders.get(providerProfile.getOsuServerUri()).osuNai.stream().forEach(n -> { +// osuNai.add(new Atom(n)); +// }); } } @@ -3513,13 +3511,6 @@ public class OvsdbDao { 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("osen", new Atom<>(operatorProfile.isServerOnlyAuthenticatedL2EncryptionNetwork())); @@ -3539,15 +3530,18 @@ public class OvsdbDao { rowColumns.put("anqp_domain_id", new Atom<>(hs2Profile.getAnqpDomainId())); Set> mccMnc = new HashSet<>(); 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 .of(mccMnc); rowColumns.put("mcc_mnc", mccMncSet); Set> connectionCapabilities = new HashSet<>(); hs2Profile.getConnectionCapabilitySet().stream().forEach( - c -> connectionCapabilities.add(new Atom<>(c.getConnectionCapabilitiesIpProtocol() + ":" + c -> connectionCapabilities.add(new Atom<>(c.getConnectionCapabilitiesIpProtocol().getId() + ":" + c.getConnectionCapabilitiesPortNumber() + ":" - + c.getConnectionCapabilitiesStatus()))); + + c.getConnectionCapabilitiesStatus().getId()))); com.vmware.ovsdb.protocol.operation.notation.Set connectionCapabilitySet = com.vmware.ovsdb.protocol.operation.notation.Set .of(connectionCapabilities); rowColumns.put("connection_capability", connectionCapabilitySet); @@ -3609,6 +3603,8 @@ public class OvsdbDao { rowColumns.put("hessid", new Atom<>(hessids.get(0))); } + rowColumns.put("osu_ssid", new Atom<>(hs2Profile.getOsuSsidName())); + Row row = new Row(rowColumns); @@ -3659,8 +3655,9 @@ public class OvsdbDao { for (Profile provider : hs20cfg.getHotspot20ProviderSet()) { Hotspot20IdProviderProfile providerProfile = (Hotspot20IdProviderProfile) provider.getDetails(); Map 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); getOsuProviderFriendlyNames(providerProfile, rowColumns); getOsuProviderMethodList(providerProfile, rowColumns); @@ -3773,7 +3770,7 @@ public class OvsdbDao { } - protected void getNaiRealmsForOsuProvider(Hotspot20IdProviderProfile providerProfile, + protected void getNaiRealms(Hotspot20IdProviderProfile providerProfile, Map rowColumns) { Set> naiRealms = new HashSet<>(); 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 .of(naiRealms); - rowColumns.put("osu_nai", naiRealmsSet); + rowColumns.put("nai_realm", naiRealmsSet); } public void provisionHotspot2IconConfig(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncApConfig) {