From d79917d20f3a8a96dba0862abac544598c610cd4 Mon Sep 17 00:00:00 2001 From: Mike Hansen Date: Mon, 30 Nov 2020 18:32:01 -0500 Subject: [PATCH] WIFI-1132: Cloud osgw static changes --- .../src/main/resources/EquipmentExample.json | 2 +- .../src/main/resources/ProfileAPExample.json | 109 ++--- .../src/main/resources/ProfileHotspot20.json | 139 +++--- .../src/main/resources/ProfileIdProvider.json | 12 +- .../src/main/resources/ProfileMetrics.json | 166 +++---- .../src/main/resources/ProfileOperator.json | 6 +- .../src/main/resources/ProfileRf.json | 407 +++++++++--------- .../src/main/resources/ProfileSsid.json | 97 ++++- .../src/main/resources/ProfileVenue.json | 8 +- .../app/opensync/EquipmentExample.json | 2 +- .../app/opensync/ProfileAPExample.json | 109 ++--- .../app/opensync/ProfileHotspot20.json | 139 +++--- .../app/opensync/ProfileIdProvider.json | 12 +- .../app/opensync/ProfileMetrics.json | 166 +++---- .../app/opensync/ProfileOperator.json | 6 +- .../app/opensync/ProfileRf.json | 407 +++++++++--------- .../app/opensync/ProfileSsid.json | 97 ++++- .../app/opensync/ProfileVenue.json | 8 +- .../docker/app/opensync/EquipmentExample.json | 2 +- .../docker/app/opensync/ProfileAPExample.json | 109 ++--- .../docker/app/opensync/ProfileHotspot20.json | 139 +++--- .../app/opensync/ProfileIdProvider.json | 12 +- .../docker/app/opensync/ProfileMetrics.json | 166 +++---- .../docker/app/opensync/ProfileOperator.json | 6 +- .../main/docker/app/opensync/ProfileRf.json | 407 +++++++++--------- .../main/docker/app/opensync/ProfileSsid.json | 97 ++++- .../docker/app/opensync/ProfileVenue.json | 8 +- .../app/opensync/EquipmentExample.json | 2 +- .../app/opensync/ProfileAPExample.json | 109 ++--- .../app/opensync/ProfileHotspot20.json | 139 +++--- .../app/opensync/ProfileIdProvider.json | 12 +- .../app/opensync/ProfileMetrics.json | 166 +++---- .../app/opensync/ProfileOperator.json | 6 +- .../resources/app/opensync/ProfileRf.json | 407 +++++++++--------- .../resources/app/opensync/ProfileSsid.json | 97 ++++- .../resources/app/opensync/ProfileVenue.json | 8 +- 36 files changed, 2028 insertions(+), 1756 deletions(-) diff --git a/opensync-ext-static/src/main/resources/EquipmentExample.json b/opensync-ext-static/src/main/resources/EquipmentExample.json index 6f0d669..a05e266 100644 --- a/opensync-ext-static/src/main/resources/EquipmentExample.json +++ b/opensync-ext-static/src/main/resources/EquipmentExample.json @@ -2,7 +2,7 @@ "model_type": "Equipment", "id": 51, "customerId": 2, - "profileId": 5, + "profileId": 12, "locationId": 8, "equipmentType": "AP", "inventoryId": "Test_Client_21P10C68818122", diff --git a/opensync-ext-static/src/main/resources/ProfileAPExample.json b/opensync-ext-static/src/main/resources/ProfileAPExample.json index 4fb3e66..ad5fe5b 100644 --- a/opensync-ext-static/src/main/resources/ProfileAPExample.json +++ b/opensync-ext-static/src/main/resources/ProfileAPExample.json @@ -1,55 +1,56 @@ { - "model_type": "Profile", - "id": 23, - "customerId": 2, - "profileType": "equipment_ap", - "name": "ApProfile-3-radios-passpoint", - "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, - "greTunnelName": null, - "greParentIfName": null, - "greLocalInetAddr": null, - "greRemoteInetAddr": null, - "greRemoteMacAddr": null, - "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": 1605711197140, - "lastModifiedTimestamp": 1605711197140, - "childProfileIds": [ - 16, - 21, - 22, - 15 - ] -} + "model_type": "Profile", + "id": 12, + "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, + "greTunnelName": null, + "greParentIfName": null, + "greLocalInetAddr": null, + "greRemoteInetAddr": null, + "greRemoteMacAddr": null, + "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": 1606778369934, + "lastModifiedTimestamp": 1606778443413, + "childProfileIds": [ + 16, + 5, + 10, + 11, + 15 + ] +} \ 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 9e40b89..b15c575 100644 --- a/opensync-ext-static/src/main/resources/ProfileHotspot20.json +++ b/opensync-ext-static/src/main/resources/ProfileHotspot20.json @@ -1,72 +1,71 @@ [ -{ - "model_type": "Profile", - "id": 24, - "customerId": 2, - "profileType": "passpoint", - "name": "TipWlan-Hotspot20-Config", - "details": { - "model_type": "PasspointProfile", - "enableInterworkingAndHs20": true, - "hessid": null, - "additionalStepsRequiredForAccess": 0, - "deauthRequestTimeout": 0, - "operatingClass": 0, - "termsAndConditionsFile": { - "model_type": "ManagedFileInfo", - "md5checksum": null, - "lastModifiedTimestamp": null, - "apExportUrl": "https://localhost:9091/filestore/termsAndConditions", - "fileCategory": "ExternalPolicyConfiguration", - "fileType": "TEXT", - "altSlot": false - }, - "whitelistDomain": null, - "emergencyServicesReachable": true, - "unauthenticatedEmergencyServiceAccessible": false, - "internetConnectivity": true, - "connectionCapabilitySet": [ - { - "model_type": "PasspointConnectionCapability", - "connectionCapabilitiesPortNumber": 8888, - "connectionCapabilitiesIpProtocol": "TCP", - "connectionCapabilitiesStatus": "open" - } - ], - "ipAddressTypeAvailability": "public_IPv4_address_available", - "qosMapSetConfiguration": null, - "apGeospatialLocation": null, - "apCivicLocation": null, - "apPublicLocationIdUri": null, - "gasAddr3Behaviour": "p2pSpecWorkaroundFromRequest", - "anqpDomainId": 1234, - "disableDownstreamGroupAddressedForwarding": false, - "enable2pt4GHz": true, - "enable5GHz": true, - "associatedAccessSsidNames": [ - "TipWlan-cloud-hotspot-access" - ], - "osuSsidName": "TipWlan-cloud-hotspot-osu", - "operatorProfileName": "TipWlan-Hotspot20-Operator", - "venueProfileName": "TipWlan-Hotspot20-Venue", - "idProviderProfileNames": [ - "TipWlan-Hotspot20-OSU-Provider-2", - "TipWlan-Hotspot20-OSU-Provider" - ], - "accessNetworkType": "free_public_network", - "networkAuthenticationType": "acceptance_of_terms_and_conditions", - "associatedSsids": [ - "TipWlan-cloud-hotspot-access" - ], - "profileType": "passpoint" - }, - "createdTimestamp": 1605711223339, - "lastModifiedTimestamp": 1605711223339, - "childProfileIds": [ - 17, - 18, - 19, - 20 - ] - } + { + "model_type": "Profile", + "id": 24, + "customerId": 2, + "profileType": "passpoint", + "name": "TipWlan-Passpoint-Config", + "details": { + "model_type": "PasspointProfile", + "enableInterworkingAndHs20": true, + "hessid": null, + "passpointAccessNetworkType": "free_public_network", + "passpointNetworkAuthenticationType": "acceptance_of_terms_and_conditions", + "additionalStepsRequiredForAccess": 0, + "deauthRequestTimeout": 0, + "operatingClass": 0, + "termsAndConditionsFile": { + "model_type": "ManagedFileInfo", + "md5checksum": null, + "lastModifiedTimestamp": null, + "apExportUrl": "https://localhost:9091/filestore/termsAndConditions", + "fileCategory": "ExternalPolicyConfiguration", + "fileType": "TEXT", + "altSlot": false + }, + "whitelistDomain": null, + "emergencyServicesReachable": true, + "unauthenticatedEmergencyServiceAccessible": false, + "internetConnectivity": true, + "connectionCapabilitySet": [ + { + "model_type": "PasspointConnectionCapability", + "connectionCapabilitiesPortNumber": 8888, + "connectionCapabilitiesStatus": "open", + "connectionCapabilitiesIpProtocol": "TCP" + } + ], + "ipAddressTypeAvailability": "public_IPv4_address_available", + "qosMapSetConfiguration": null, + "apGeospatialLocation": null, + "apCivicLocation": null, + "apPublicLocationIdUri": null, + "gasAddr3Behaviour": "p2pSpecWorkaroundFromRequest", + "anqpDomainId": 1234, + "disableDownstreamGroupAddressedForwarding": false, + "enable2pt4GHz": true, + "enable5GHz": true, + "associatedAccessSsidProfileIds": [ + 15 + ], + "osuSsidProfileId": 16, + "passpointOperatorProfileId": 17, + "passpointVenueProfileId": 18, + "passpointOsuProviderProfileIds": [ + 19, + 20 + ], + "accessNetworkType": "free_public_network", + "networkAuthenticationType": "acceptance_of_terms_and_conditions", + "profileType": "passpoint" + }, + "createdTimestamp": 1606778370807, + "lastModifiedTimestamp": 1606778370807, + "childProfileIds": [ + 17, + 18, + 19, + 20 + ] + } ] diff --git a/opensync-ext-static/src/main/resources/ProfileIdProvider.json b/opensync-ext-static/src/main/resources/ProfileIdProvider.json index 5dd9fa4..4d09f6f 100644 --- a/opensync-ext-static/src/main/resources/ProfileIdProvider.json +++ b/opensync-ext-static/src/main/resources/ProfileIdProvider.json @@ -4,7 +4,7 @@ "id": 19, "customerId": 2, "profileType": "passpoint_osu_id_provider", - "name": "TipWlan-Hotspot20-OSU-Provider", + "name": "TipWlan-Passpoint-OSU-Provider", "details": { "model_type": "PasspointOsuProviderProfile", "domainName": "rogers.com", @@ -128,8 +128,8 @@ ], "profileType": "passpoint_osu_id_provider" }, - "createdTimestamp": 1605711165325, - "lastModifiedTimestamp": 1605711165325, + "createdTimestamp": 1606778370345, + "lastModifiedTimestamp": 1606778370345, "childProfileIds": [ ] }, @@ -138,7 +138,7 @@ "id": 20, "customerId": 2, "profileType": "passpoint_osu_id_provider", - "name": "TipWlan-Hotspot20-OSU-Provider-2", + "name": "TipWlan-Passpoint-OSU-Provider-2", "details": { "model_type": "PasspointOsuProviderProfile", "domainName": "telus.com", @@ -262,8 +262,8 @@ ], "profileType": "passpoint_osu_id_provider" }, - "createdTimestamp": 1605711165330, - "lastModifiedTimestamp": 1605711165330, + "createdTimestamp": 1606778370351, + "lastModifiedTimestamp": 1606778370351, "childProfileIds": [ ] } diff --git a/opensync-ext-static/src/main/resources/ProfileMetrics.json b/opensync-ext-static/src/main/resources/ProfileMetrics.json index 595c13e..54d7d28 100644 --- a/opensync-ext-static/src/main/resources/ProfileMetrics.json +++ b/opensync-ext-static/src/main/resources/ProfileMetrics.json @@ -1,10 +1,10 @@ [ { "model_type": "Profile", - "id": 22, + "id": 10, "customerId": 2, "profileType": "service_metrics_collection_config", - "name": "Metrics-Profile-Passpoint", + "name": "Metrics-Profile-3-Radios", "details": { "model_type": "ServiceMetricsCollectionConfigProfile", "radioTypes": [ @@ -21,30 +21,6 @@ ], "metricConfigParameterMap": { "ApNode": [ - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "radioType": "is2dot4GHz", - "serviceMetricDataType": "ApNode", - "statsReportFormat": "RAW" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "radioType": "is5GHzU", - "serviceMetricDataType": "ApNode", - "statsReportFormat": "RAW" - }, { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, @@ -69,18 +45,6 @@ "serviceMetricDataType": "ApNode", "statsReportFormat": "RAW" }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "radioType": "is5GHzL", - "serviceMetricDataType": "ApNode", - "statsReportFormat": "RAW" - }, { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, @@ -92,9 +56,52 @@ "radioType": "is2dot4GHz", "serviceMetricDataType": "ApNode", "statsReportFormat": "RAW" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "radioType": "is5GHzU", + "serviceMetricDataType": "ApNode", + "statsReportFormat": "RAW" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "radioType": "is2dot4GHz", + "serviceMetricDataType": "ApNode", + "statsReportFormat": "RAW" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "radioType": "is5GHzL", + "serviceMetricDataType": "ApNode", + "statsReportFormat": "RAW" } ], "ApSsid": [ + { + "model_type": "ServiceMetricRadioConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "radioType": "is5GHzU", + "serviceMetricDataType": "ApSsid" + }, { "model_type": "ServiceMetricRadioConfigParameters", "samplingInterval": 30, @@ -108,13 +115,6 @@ "reportingIntervalSeconds": 60, "radioType": "is2dot4GHz", "serviceMetricDataType": "ApSsid" - }, - { - "model_type": "ServiceMetricRadioConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "radioType": "is5GHzU", - "serviceMetricDataType": "ApSsid" } ], "Client": [ @@ -144,12 +144,12 @@ { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", + "reportingIntervalSeconds": 120, + "channelSurveyType": "OFF_CHANNEL", "scanIntervalMillis": 0, "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, - "radioType": "is2dot4GHz", + "radioType": "is5GHzL", "serviceMetricDataType": "Channel", "statsReportFormat": "RAW" }, @@ -168,12 +168,12 @@ { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", + "reportingIntervalSeconds": 120, + "channelSurveyType": "OFF_CHANNEL", "scanIntervalMillis": 0, "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, - "radioType": "is5GHzL", + "radioType": "is2dot4GHz", "serviceMetricDataType": "Channel", "statsReportFormat": "RAW" }, @@ -192,41 +192,29 @@ { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, - "reportingIntervalSeconds": 120, - "channelSurveyType": "OFF_CHANNEL", + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", "scanIntervalMillis": 0, "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, - "radioType": "is5GHzL", + "radioType": "is2dot4GHz", "serviceMetricDataType": "Channel", "statsReportFormat": "RAW" }, { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, - "reportingIntervalSeconds": 120, - "channelSurveyType": "OFF_CHANNEL", + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", "scanIntervalMillis": 0, "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, - "radioType": "is2dot4GHz", + "radioType": "is5GHzL", "serviceMetricDataType": "Channel", "statsReportFormat": "RAW" } ], "Neighbour": [ - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 120, - "channelSurveyType": "OFF_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "radioType": "is5GHzL", - "serviceMetricDataType": "Neighbour", - "statsReportFormat": "RAW" - }, { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, @@ -251,18 +239,6 @@ "serviceMetricDataType": "Neighbour", "statsReportFormat": "RAW" }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "radioType": "is2dot4GHz", - "serviceMetricDataType": "Neighbour", - "statsReportFormat": "RAW" - }, { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, @@ -286,13 +262,37 @@ "radioType": "is5GHzU", "serviceMetricDataType": "Neighbour", "statsReportFormat": "RAW" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 120, + "channelSurveyType": "OFF_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "radioType": "is5GHzL", + "serviceMetricDataType": "Neighbour", + "statsReportFormat": "RAW" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "radioType": "is2dot4GHz", + "serviceMetricDataType": "Neighbour", + "statsReportFormat": "RAW" } ] }, "profileType": "service_metrics_collection_config" }, - "createdTimestamp": 1605711195528, - "lastModifiedTimestamp": 1605711195528, + "createdTimestamp": 1606778369931, + "lastModifiedTimestamp": 1606778369931, "childProfileIds": [ ] } diff --git a/opensync-ext-static/src/main/resources/ProfileOperator.json b/opensync-ext-static/src/main/resources/ProfileOperator.json index 11585da..413cb46 100644 --- a/opensync-ext-static/src/main/resources/ProfileOperator.json +++ b/opensync-ext-static/src/main/resources/ProfileOperator.json @@ -4,7 +4,7 @@ "id": 17, "customerId": 2, "profileType": "passpoint_operator", - "name": "TipWlan-Hotspot20-Operator", + "name": "TipWlan-Passpoint-Operator", "details": { "model_type": "PasspointOperatorProfile", "serverOnlyAuthenticatedL2EncryptionNetwork": false, @@ -29,8 +29,8 @@ ], "profileType": "passpoint_operator" }, - "createdTimestamp": 1605711164952, - "lastModifiedTimestamp": 1605711164952, + "createdTimestamp": 1606778369945, + "lastModifiedTimestamp": 1606778369945, "childProfileIds": [ ] } diff --git a/opensync-ext-static/src/main/resources/ProfileRf.json b/opensync-ext-static/src/main/resources/ProfileRf.json index cfb75e9..0a3a9cf 100644 --- a/opensync-ext-static/src/main/resources/ProfileRf.json +++ b/opensync-ext-static/src/main/resources/ProfileRf.json @@ -1,205 +1,204 @@ { - "model_type": "Profile", - "id": 21, - "customerId": 2, - "profileType": "rf", - "name": "TipWlan-rf-passpoint", - "details": { - "model_type": "RfConfiguration", - "rfConfigMap": { - "is5GHz": { - "model_type": "RfElementConfiguration", - "radioType": "is5GHz", - "radioMode": "modeAC", - "rf": "TipWlan-rf-passpoint", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is80MHz", - "mimoMode": "twoByTwo", - "maxNumClients": 100, - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "minAutoCellSize": -65, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApEnabled": null, - "multicastRate": "auto", - "managementRate": "auto", - "rxCellSizeDb": -90, - "probeResponseThresholdDb": -90, - "clientDisconnectThresholdDb": -90, - "eirpTxPower": 18, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } - }, - "is2dot4GHz": { - "model_type": "RfElementConfiguration", - "radioType": "is2dot4GHz", - "radioMode": "modeN", - "rf": "TipWlan-rf-passpoint", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is20MHz", - "mimoMode": "twoByTwo", - "maxNumClients": 100, - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "minAutoCellSize": -65, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApEnabled": null, - "multicastRate": "auto", - "managementRate": "auto", - "rxCellSizeDb": -90, - "probeResponseThresholdDb": -90, - "clientDisconnectThresholdDb": -90, - "eirpTxPower": 18, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 20, - "minLoadFactor": 50 - } - }, - "is5GHzU": { - "model_type": "RfElementConfiguration", - "radioType": "is5GHzU", - "radioMode": "modeAC", - "rf": "TipWlan-rf-passpoint", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is80MHz", - "mimoMode": "twoByTwo", - "maxNumClients": 100, - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "minAutoCellSize": -65, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApEnabled": null, - "multicastRate": "auto", - "managementRate": "auto", - "rxCellSizeDb": -90, - "probeResponseThresholdDb": -90, - "clientDisconnectThresholdDb": -90, - "eirpTxPower": 18, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } - }, - "is5GHzL": { - "model_type": "RfElementConfiguration", - "radioType": "is5GHzL", - "radioMode": "modeAC", - "rf": "TipWlan-rf-passpoint", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is80MHz", - "mimoMode": "twoByTwo", - "maxNumClients": 100, - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "minAutoCellSize": -65, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApEnabled": null, - "multicastRate": "auto", - "managementRate": "auto", - "rxCellSizeDb": -90, - "probeResponseThresholdDb": -90, - "clientDisconnectThresholdDb": -90, - "eirpTxPower": 18, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } - } - }, - "profileType": "rf" - }, - "createdTimestamp": 1605711191976, - "lastModifiedTimestamp": 1605711191976, - "childProfileIds": [ - ] -} + "model_type": "Profile", + "id": 11, + "customerId": 2, + "profileType": "rf", + "name": "TipWlan-rf", + "details": { + "model_type": "RfConfiguration", + "rfConfigMap": { + "is5GHz": { + "model_type": "RfElementConfiguration", + "radioType": "is5GHz", + "radioMode": "modeAC", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is80MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "minAutoCellSize": -65, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApEnabled": null, + "multicastRate": "auto", + "managementRate": "auto", + "rxCellSizeDb": -90, + "probeResponseThresholdDb": -90, + "clientDisconnectThresholdDb": -90, + "eirpTxPower": 18, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 30, + "minLoadFactor": 40 + } + }, + "is2dot4GHz": { + "model_type": "RfElementConfiguration", + "radioType": "is2dot4GHz", + "radioMode": "modeN", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is20MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "minAutoCellSize": -65, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApEnabled": null, + "multicastRate": "auto", + "managementRate": "auto", + "rxCellSizeDb": -90, + "probeResponseThresholdDb": -90, + "clientDisconnectThresholdDb": -90, + "eirpTxPower": 18, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 20, + "minLoadFactor": 50 + } + }, + "is5GHzU": { + "model_type": "RfElementConfiguration", + "radioType": "is5GHzU", + "radioMode": "modeAC", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is80MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "minAutoCellSize": -65, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApEnabled": null, + "multicastRate": "auto", + "managementRate": "auto", + "rxCellSizeDb": -90, + "probeResponseThresholdDb": -90, + "clientDisconnectThresholdDb": -90, + "eirpTxPower": 18, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 30, + "minLoadFactor": 40 + } + }, + "is5GHzL": { + "model_type": "RfElementConfiguration", + "radioType": "is5GHzL", + "radioMode": "modeAC", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is80MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "minAutoCellSize": -65, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApEnabled": null, + "multicastRate": "auto", + "managementRate": "auto", + "rxCellSizeDb": -90, + "probeResponseThresholdDb": -90, + "clientDisconnectThresholdDb": -90, + "eirpTxPower": 18, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 30, + "minLoadFactor": 40 + } + } + }, + "profileType": "rf" + }, + "createdTimestamp": 1606778369933, + "lastModifiedTimestamp": 1606778369933, + "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 7e9cdbe..4b9e61c 100644 --- a/opensync-ext-static/src/main/resources/ProfileSsid.json +++ b/opensync-ext-static/src/main/resources/ProfileSsid.json @@ -1,13 +1,80 @@ [ + { + "model_type": "Profile", + "id": 5, + "customerId": 2, + "profileType": "ssid", + "name": "TipWlan-cloud-3-radios", + "details": { + "model_type": "SsidConfiguration", + "ssid": "TipWlan-cloud-3-radios", + "appliedRadios": [ + "is5GHzL", + "is2dot4GHz", + "is5GHzU" + ], + "ssidAdminState": "enabled", + "secureMode": "wpa2OnlyPSK", + "vlanId": 1, + "keyStr": "openwifi", + "broadcastSsid": "enabled", + "keyRefresh": 0, + "noLocalSubnets": false, + "radiusServiceName": null, + "radiusAccountingServiceName": null, + "radiusAcountingServiceInterval": null, + "captivePortalId": null, + "bandwidthLimitDown": 0, + "bandwidthLimitUp": 0, + "clientBandwidthLimitDown": 0, + "clientBandwidthLimitUp": 0, + "videoTrafficOnly": false, + "radioBasedConfigs": { + "is5GHzL": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + }, + "is2dot4GHz": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + }, + "is5GHz": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + }, + "is5GHzU": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + } + }, + "bonjourGatewayProfileId": null, + "enable80211w": null, + "wepConfig": null, + "forwardMode": "BRIDGE", + "profileType": "ssid" + }, + "createdTimestamp": 1606778369598, + "lastModifiedTimestamp": 1606778369598, + "childProfileIds": [ + ] + }, { "model_type": "Profile", "id": 15, "customerId": 2, "profileType": "ssid", - "name": "TipWlan-cloud-hotspot-access", + "name": "TipWlan-cloud-passpoint-access", "details": { "model_type": "SsidConfiguration", - "ssid": "TipWlan-cloud-hotspot-access", + "ssid": "TipWlan-cloud-passpoint-access", "appliedRadios": [ "is5GHzL", "is5GHzU" @@ -21,6 +88,7 @@ "noLocalSubnets": false, "radiusServiceName": null, "radiusAccountingServiceName": null, + "radiusAcountingServiceInterval": null, "captivePortalId": null, "bandwidthLimitDown": 0, "bandwidthLimitUp": 0, @@ -28,7 +96,7 @@ "clientBandwidthLimitUp": 0, "videoTrafficOnly": false, "radioBasedConfigs": { - "is5GHz": { + "is5GHzL": { "model_type": "RadioBasedSsidConfiguration", "enable80211r": null, "enable80211k": null, @@ -40,13 +108,13 @@ "enable80211k": null, "enable80211v": null }, - "is5GHzU": { + "is5GHz": { "model_type": "RadioBasedSsidConfiguration", "enable80211r": null, "enable80211k": null, "enable80211v": null }, - "is5GHzL": { + "is5GHzU": { "model_type": "RadioBasedSsidConfiguration", "enable80211r": null, "enable80211k": null, @@ -59,8 +127,8 @@ "forwardMode": null, "profileType": "ssid" }, - "createdTimestamp": 1605711164949, - "lastModifiedTimestamp": 1605711223372, + "createdTimestamp": 1606778369943, + "lastModifiedTimestamp": 1606778370811, "childProfileIds": [ 24 ] @@ -70,10 +138,10 @@ "id": 16, "customerId": 2, "profileType": "ssid", - "name": "TipWlan-cloud-hotspot-osu", + "name": "TipWlan-cloud-passpoint-osu", "details": { "model_type": "SsidConfiguration", - "ssid": "TipWlan-cloud-hotspot-osu", + "ssid": "TipWlan-cloud-passpoint-osu", "appliedRadios": [ "is2dot4GHz" ], @@ -86,6 +154,7 @@ "noLocalSubnets": false, "radiusServiceName": null, "radiusAccountingServiceName": null, + "radiusAcountingServiceInterval": null, "captivePortalId": null, "bandwidthLimitDown": 0, "bandwidthLimitUp": 0, @@ -93,7 +162,7 @@ "clientBandwidthLimitUp": 0, "videoTrafficOnly": false, "radioBasedConfigs": { - "is5GHz": { + "is5GHzL": { "model_type": "RadioBasedSsidConfiguration", "enable80211r": null, "enable80211k": null, @@ -105,13 +174,13 @@ "enable80211k": null, "enable80211v": null }, - "is5GHzU": { + "is5GHz": { "model_type": "RadioBasedSsidConfiguration", "enable80211r": null, "enable80211k": null, "enable80211v": null }, - "is5GHzL": { + "is5GHzU": { "model_type": "RadioBasedSsidConfiguration", "enable80211r": null, "enable80211k": null, @@ -124,8 +193,8 @@ "forwardMode": null, "profileType": "ssid" }, - "createdTimestamp": 1605711164950, - "lastModifiedTimestamp": 1605711171732, + "createdTimestamp": 1606778369944, + "lastModifiedTimestamp": 1606778370352, "childProfileIds": [ 19, 20 diff --git a/opensync-ext-static/src/main/resources/ProfileVenue.json b/opensync-ext-static/src/main/resources/ProfileVenue.json index 7351880..820929f 100644 --- a/opensync-ext-static/src/main/resources/ProfileVenue.json +++ b/opensync-ext-static/src/main/resources/ProfileVenue.json @@ -4,7 +4,7 @@ "id": 18, "customerId": 2, "profileType": "passpoint_venue", - "name": "TipWlan-Hotspot20-Venue", + "name": "TipWlan-Passpoint-Venue", "details": { "model_type": "PasspointVenueProfile", "venueNameSet": [ @@ -28,15 +28,15 @@ } ], "venueTypeAssignment": { - "model_type": "ProfileVenueTypeAssignment", + "model_type": "PasspointVenueTypeAssignment", "venueDescription": "Research and Development Facility", "venueGroupId": 2, "venueTypeId": 8 }, "profileType": "passpoint_venue" }, - "createdTimestamp": 1605711164956, - "lastModifiedTimestamp": 1605711164956, + "createdTimestamp": 1606778369950, + "lastModifiedTimestamp": 1606778369950, "childProfileIds": [ ] } diff --git a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/EquipmentExample.json b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/EquipmentExample.json index 6f0d669..a05e266 100644 --- a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/EquipmentExample.json +++ b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/EquipmentExample.json @@ -2,7 +2,7 @@ "model_type": "Equipment", "id": 51, "customerId": 2, - "profileId": 5, + "profileId": 12, "locationId": 8, "equipmentType": "AP", "inventoryId": "Test_Client_21P10C68818122", 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 4fb3e66..ad5fe5b 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,55 +1,56 @@ { - "model_type": "Profile", - "id": 23, - "customerId": 2, - "profileType": "equipment_ap", - "name": "ApProfile-3-radios-passpoint", - "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, - "greTunnelName": null, - "greParentIfName": null, - "greLocalInetAddr": null, - "greRemoteInetAddr": null, - "greRemoteMacAddr": null, - "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": 1605711197140, - "lastModifiedTimestamp": 1605711197140, - "childProfileIds": [ - 16, - 21, - 22, - 15 - ] -} + "model_type": "Profile", + "id": 12, + "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, + "greTunnelName": null, + "greParentIfName": null, + "greLocalInetAddr": null, + "greRemoteInetAddr": null, + "greRemoteMacAddr": null, + "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": 1606778369934, + "lastModifiedTimestamp": 1606778443413, + "childProfileIds": [ + 16, + 5, + 10, + 11, + 15 + ] +} \ 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 9e40b89..b15c575 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,72 +1,71 @@ [ -{ - "model_type": "Profile", - "id": 24, - "customerId": 2, - "profileType": "passpoint", - "name": "TipWlan-Hotspot20-Config", - "details": { - "model_type": "PasspointProfile", - "enableInterworkingAndHs20": true, - "hessid": null, - "additionalStepsRequiredForAccess": 0, - "deauthRequestTimeout": 0, - "operatingClass": 0, - "termsAndConditionsFile": { - "model_type": "ManagedFileInfo", - "md5checksum": null, - "lastModifiedTimestamp": null, - "apExportUrl": "https://localhost:9091/filestore/termsAndConditions", - "fileCategory": "ExternalPolicyConfiguration", - "fileType": "TEXT", - "altSlot": false - }, - "whitelistDomain": null, - "emergencyServicesReachable": true, - "unauthenticatedEmergencyServiceAccessible": false, - "internetConnectivity": true, - "connectionCapabilitySet": [ - { - "model_type": "PasspointConnectionCapability", - "connectionCapabilitiesPortNumber": 8888, - "connectionCapabilitiesIpProtocol": "TCP", - "connectionCapabilitiesStatus": "open" - } - ], - "ipAddressTypeAvailability": "public_IPv4_address_available", - "qosMapSetConfiguration": null, - "apGeospatialLocation": null, - "apCivicLocation": null, - "apPublicLocationIdUri": null, - "gasAddr3Behaviour": "p2pSpecWorkaroundFromRequest", - "anqpDomainId": 1234, - "disableDownstreamGroupAddressedForwarding": false, - "enable2pt4GHz": true, - "enable5GHz": true, - "associatedAccessSsidNames": [ - "TipWlan-cloud-hotspot-access" - ], - "osuSsidName": "TipWlan-cloud-hotspot-osu", - "operatorProfileName": "TipWlan-Hotspot20-Operator", - "venueProfileName": "TipWlan-Hotspot20-Venue", - "idProviderProfileNames": [ - "TipWlan-Hotspot20-OSU-Provider-2", - "TipWlan-Hotspot20-OSU-Provider" - ], - "accessNetworkType": "free_public_network", - "networkAuthenticationType": "acceptance_of_terms_and_conditions", - "associatedSsids": [ - "TipWlan-cloud-hotspot-access" - ], - "profileType": "passpoint" - }, - "createdTimestamp": 1605711223339, - "lastModifiedTimestamp": 1605711223339, - "childProfileIds": [ - 17, - 18, - 19, - 20 - ] - } + { + "model_type": "Profile", + "id": 24, + "customerId": 2, + "profileType": "passpoint", + "name": "TipWlan-Passpoint-Config", + "details": { + "model_type": "PasspointProfile", + "enableInterworkingAndHs20": true, + "hessid": null, + "passpointAccessNetworkType": "free_public_network", + "passpointNetworkAuthenticationType": "acceptance_of_terms_and_conditions", + "additionalStepsRequiredForAccess": 0, + "deauthRequestTimeout": 0, + "operatingClass": 0, + "termsAndConditionsFile": { + "model_type": "ManagedFileInfo", + "md5checksum": null, + "lastModifiedTimestamp": null, + "apExportUrl": "https://localhost:9091/filestore/termsAndConditions", + "fileCategory": "ExternalPolicyConfiguration", + "fileType": "TEXT", + "altSlot": false + }, + "whitelistDomain": null, + "emergencyServicesReachable": true, + "unauthenticatedEmergencyServiceAccessible": false, + "internetConnectivity": true, + "connectionCapabilitySet": [ + { + "model_type": "PasspointConnectionCapability", + "connectionCapabilitiesPortNumber": 8888, + "connectionCapabilitiesStatus": "open", + "connectionCapabilitiesIpProtocol": "TCP" + } + ], + "ipAddressTypeAvailability": "public_IPv4_address_available", + "qosMapSetConfiguration": null, + "apGeospatialLocation": null, + "apCivicLocation": null, + "apPublicLocationIdUri": null, + "gasAddr3Behaviour": "p2pSpecWorkaroundFromRequest", + "anqpDomainId": 1234, + "disableDownstreamGroupAddressedForwarding": false, + "enable2pt4GHz": true, + "enable5GHz": true, + "associatedAccessSsidProfileIds": [ + 15 + ], + "osuSsidProfileId": 16, + "passpointOperatorProfileId": 17, + "passpointVenueProfileId": 18, + "passpointOsuProviderProfileIds": [ + 19, + 20 + ], + "accessNetworkType": "free_public_network", + "networkAuthenticationType": "acceptance_of_terms_and_conditions", + "profileType": "passpoint" + }, + "createdTimestamp": 1606778370807, + "lastModifiedTimestamp": 1606778370807, + "childProfileIds": [ + 17, + 18, + 19, + 20 + ] + } ] 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 5dd9fa4..4d09f6f 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 @@ -4,7 +4,7 @@ "id": 19, "customerId": 2, "profileType": "passpoint_osu_id_provider", - "name": "TipWlan-Hotspot20-OSU-Provider", + "name": "TipWlan-Passpoint-OSU-Provider", "details": { "model_type": "PasspointOsuProviderProfile", "domainName": "rogers.com", @@ -128,8 +128,8 @@ ], "profileType": "passpoint_osu_id_provider" }, - "createdTimestamp": 1605711165325, - "lastModifiedTimestamp": 1605711165325, + "createdTimestamp": 1606778370345, + "lastModifiedTimestamp": 1606778370345, "childProfileIds": [ ] }, @@ -138,7 +138,7 @@ "id": 20, "customerId": 2, "profileType": "passpoint_osu_id_provider", - "name": "TipWlan-Hotspot20-OSU-Provider-2", + "name": "TipWlan-Passpoint-OSU-Provider-2", "details": { "model_type": "PasspointOsuProviderProfile", "domainName": "telus.com", @@ -262,8 +262,8 @@ ], "profileType": "passpoint_osu_id_provider" }, - "createdTimestamp": 1605711165330, - "lastModifiedTimestamp": 1605711165330, + "createdTimestamp": 1606778370351, + "lastModifiedTimestamp": 1606778370351, "childProfileIds": [ ] } 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 595c13e..54d7d28 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,10 +1,10 @@ [ { "model_type": "Profile", - "id": 22, + "id": 10, "customerId": 2, "profileType": "service_metrics_collection_config", - "name": "Metrics-Profile-Passpoint", + "name": "Metrics-Profile-3-Radios", "details": { "model_type": "ServiceMetricsCollectionConfigProfile", "radioTypes": [ @@ -21,30 +21,6 @@ ], "metricConfigParameterMap": { "ApNode": [ - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "radioType": "is2dot4GHz", - "serviceMetricDataType": "ApNode", - "statsReportFormat": "RAW" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "radioType": "is5GHzU", - "serviceMetricDataType": "ApNode", - "statsReportFormat": "RAW" - }, { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, @@ -69,18 +45,6 @@ "serviceMetricDataType": "ApNode", "statsReportFormat": "RAW" }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "radioType": "is5GHzL", - "serviceMetricDataType": "ApNode", - "statsReportFormat": "RAW" - }, { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, @@ -92,9 +56,52 @@ "radioType": "is2dot4GHz", "serviceMetricDataType": "ApNode", "statsReportFormat": "RAW" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "radioType": "is5GHzU", + "serviceMetricDataType": "ApNode", + "statsReportFormat": "RAW" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "radioType": "is2dot4GHz", + "serviceMetricDataType": "ApNode", + "statsReportFormat": "RAW" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "radioType": "is5GHzL", + "serviceMetricDataType": "ApNode", + "statsReportFormat": "RAW" } ], "ApSsid": [ + { + "model_type": "ServiceMetricRadioConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "radioType": "is5GHzU", + "serviceMetricDataType": "ApSsid" + }, { "model_type": "ServiceMetricRadioConfigParameters", "samplingInterval": 30, @@ -108,13 +115,6 @@ "reportingIntervalSeconds": 60, "radioType": "is2dot4GHz", "serviceMetricDataType": "ApSsid" - }, - { - "model_type": "ServiceMetricRadioConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "radioType": "is5GHzU", - "serviceMetricDataType": "ApSsid" } ], "Client": [ @@ -144,12 +144,12 @@ { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", + "reportingIntervalSeconds": 120, + "channelSurveyType": "OFF_CHANNEL", "scanIntervalMillis": 0, "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, - "radioType": "is2dot4GHz", + "radioType": "is5GHzL", "serviceMetricDataType": "Channel", "statsReportFormat": "RAW" }, @@ -168,12 +168,12 @@ { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", + "reportingIntervalSeconds": 120, + "channelSurveyType": "OFF_CHANNEL", "scanIntervalMillis": 0, "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, - "radioType": "is5GHzL", + "radioType": "is2dot4GHz", "serviceMetricDataType": "Channel", "statsReportFormat": "RAW" }, @@ -192,41 +192,29 @@ { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, - "reportingIntervalSeconds": 120, - "channelSurveyType": "OFF_CHANNEL", + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", "scanIntervalMillis": 0, "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, - "radioType": "is5GHzL", + "radioType": "is2dot4GHz", "serviceMetricDataType": "Channel", "statsReportFormat": "RAW" }, { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, - "reportingIntervalSeconds": 120, - "channelSurveyType": "OFF_CHANNEL", + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", "scanIntervalMillis": 0, "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, - "radioType": "is2dot4GHz", + "radioType": "is5GHzL", "serviceMetricDataType": "Channel", "statsReportFormat": "RAW" } ], "Neighbour": [ - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 120, - "channelSurveyType": "OFF_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "radioType": "is5GHzL", - "serviceMetricDataType": "Neighbour", - "statsReportFormat": "RAW" - }, { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, @@ -251,18 +239,6 @@ "serviceMetricDataType": "Neighbour", "statsReportFormat": "RAW" }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "radioType": "is2dot4GHz", - "serviceMetricDataType": "Neighbour", - "statsReportFormat": "RAW" - }, { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, @@ -286,13 +262,37 @@ "radioType": "is5GHzU", "serviceMetricDataType": "Neighbour", "statsReportFormat": "RAW" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 120, + "channelSurveyType": "OFF_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "radioType": "is5GHzL", + "serviceMetricDataType": "Neighbour", + "statsReportFormat": "RAW" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "radioType": "is2dot4GHz", + "serviceMetricDataType": "Neighbour", + "statsReportFormat": "RAW" } ] }, "profileType": "service_metrics_collection_config" }, - "createdTimestamp": 1605711195528, - "lastModifiedTimestamp": 1605711195528, + "createdTimestamp": 1606778369931, + "lastModifiedTimestamp": 1606778369931, "childProfileIds": [ ] } 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 11585da..413cb46 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 @@ -4,7 +4,7 @@ "id": 17, "customerId": 2, "profileType": "passpoint_operator", - "name": "TipWlan-Hotspot20-Operator", + "name": "TipWlan-Passpoint-Operator", "details": { "model_type": "PasspointOperatorProfile", "serverOnlyAuthenticatedL2EncryptionNetwork": false, @@ -29,8 +29,8 @@ ], "profileType": "passpoint_operator" }, - "createdTimestamp": 1605711164952, - "lastModifiedTimestamp": 1605711164952, + "createdTimestamp": 1606778369945, + "lastModifiedTimestamp": 1606778369945, "childProfileIds": [ ] } 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 cfb75e9..0a3a9cf 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,205 +1,204 @@ { - "model_type": "Profile", - "id": 21, - "customerId": 2, - "profileType": "rf", - "name": "TipWlan-rf-passpoint", - "details": { - "model_type": "RfConfiguration", - "rfConfigMap": { - "is5GHz": { - "model_type": "RfElementConfiguration", - "radioType": "is5GHz", - "radioMode": "modeAC", - "rf": "TipWlan-rf-passpoint", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is80MHz", - "mimoMode": "twoByTwo", - "maxNumClients": 100, - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "minAutoCellSize": -65, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApEnabled": null, - "multicastRate": "auto", - "managementRate": "auto", - "rxCellSizeDb": -90, - "probeResponseThresholdDb": -90, - "clientDisconnectThresholdDb": -90, - "eirpTxPower": 18, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } - }, - "is2dot4GHz": { - "model_type": "RfElementConfiguration", - "radioType": "is2dot4GHz", - "radioMode": "modeN", - "rf": "TipWlan-rf-passpoint", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is20MHz", - "mimoMode": "twoByTwo", - "maxNumClients": 100, - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "minAutoCellSize": -65, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApEnabled": null, - "multicastRate": "auto", - "managementRate": "auto", - "rxCellSizeDb": -90, - "probeResponseThresholdDb": -90, - "clientDisconnectThresholdDb": -90, - "eirpTxPower": 18, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 20, - "minLoadFactor": 50 - } - }, - "is5GHzU": { - "model_type": "RfElementConfiguration", - "radioType": "is5GHzU", - "radioMode": "modeAC", - "rf": "TipWlan-rf-passpoint", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is80MHz", - "mimoMode": "twoByTwo", - "maxNumClients": 100, - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "minAutoCellSize": -65, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApEnabled": null, - "multicastRate": "auto", - "managementRate": "auto", - "rxCellSizeDb": -90, - "probeResponseThresholdDb": -90, - "clientDisconnectThresholdDb": -90, - "eirpTxPower": 18, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } - }, - "is5GHzL": { - "model_type": "RfElementConfiguration", - "radioType": "is5GHzL", - "radioMode": "modeAC", - "rf": "TipWlan-rf-passpoint", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is80MHz", - "mimoMode": "twoByTwo", - "maxNumClients": 100, - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "minAutoCellSize": -65, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApEnabled": null, - "multicastRate": "auto", - "managementRate": "auto", - "rxCellSizeDb": -90, - "probeResponseThresholdDb": -90, - "clientDisconnectThresholdDb": -90, - "eirpTxPower": 18, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } - } - }, - "profileType": "rf" - }, - "createdTimestamp": 1605711191976, - "lastModifiedTimestamp": 1605711191976, - "childProfileIds": [ - ] -} + "model_type": "Profile", + "id": 11, + "customerId": 2, + "profileType": "rf", + "name": "TipWlan-rf", + "details": { + "model_type": "RfConfiguration", + "rfConfigMap": { + "is5GHz": { + "model_type": "RfElementConfiguration", + "radioType": "is5GHz", + "radioMode": "modeAC", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is80MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "minAutoCellSize": -65, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApEnabled": null, + "multicastRate": "auto", + "managementRate": "auto", + "rxCellSizeDb": -90, + "probeResponseThresholdDb": -90, + "clientDisconnectThresholdDb": -90, + "eirpTxPower": 18, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 30, + "minLoadFactor": 40 + } + }, + "is2dot4GHz": { + "model_type": "RfElementConfiguration", + "radioType": "is2dot4GHz", + "radioMode": "modeN", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is20MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "minAutoCellSize": -65, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApEnabled": null, + "multicastRate": "auto", + "managementRate": "auto", + "rxCellSizeDb": -90, + "probeResponseThresholdDb": -90, + "clientDisconnectThresholdDb": -90, + "eirpTxPower": 18, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 20, + "minLoadFactor": 50 + } + }, + "is5GHzU": { + "model_type": "RfElementConfiguration", + "radioType": "is5GHzU", + "radioMode": "modeAC", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is80MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "minAutoCellSize": -65, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApEnabled": null, + "multicastRate": "auto", + "managementRate": "auto", + "rxCellSizeDb": -90, + "probeResponseThresholdDb": -90, + "clientDisconnectThresholdDb": -90, + "eirpTxPower": 18, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 30, + "minLoadFactor": 40 + } + }, + "is5GHzL": { + "model_type": "RfElementConfiguration", + "radioType": "is5GHzL", + "radioMode": "modeAC", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is80MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "minAutoCellSize": -65, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApEnabled": null, + "multicastRate": "auto", + "managementRate": "auto", + "rxCellSizeDb": -90, + "probeResponseThresholdDb": -90, + "clientDisconnectThresholdDb": -90, + "eirpTxPower": 18, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 30, + "minLoadFactor": 40 + } + } + }, + "profileType": "rf" + }, + "createdTimestamp": 1606778369933, + "lastModifiedTimestamp": 1606778369933, + "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 7e9cdbe..4b9e61c 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,13 +1,80 @@ [ + { + "model_type": "Profile", + "id": 5, + "customerId": 2, + "profileType": "ssid", + "name": "TipWlan-cloud-3-radios", + "details": { + "model_type": "SsidConfiguration", + "ssid": "TipWlan-cloud-3-radios", + "appliedRadios": [ + "is5GHzL", + "is2dot4GHz", + "is5GHzU" + ], + "ssidAdminState": "enabled", + "secureMode": "wpa2OnlyPSK", + "vlanId": 1, + "keyStr": "openwifi", + "broadcastSsid": "enabled", + "keyRefresh": 0, + "noLocalSubnets": false, + "radiusServiceName": null, + "radiusAccountingServiceName": null, + "radiusAcountingServiceInterval": null, + "captivePortalId": null, + "bandwidthLimitDown": 0, + "bandwidthLimitUp": 0, + "clientBandwidthLimitDown": 0, + "clientBandwidthLimitUp": 0, + "videoTrafficOnly": false, + "radioBasedConfigs": { + "is5GHzL": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + }, + "is2dot4GHz": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + }, + "is5GHz": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + }, + "is5GHzU": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + } + }, + "bonjourGatewayProfileId": null, + "enable80211w": null, + "wepConfig": null, + "forwardMode": "BRIDGE", + "profileType": "ssid" + }, + "createdTimestamp": 1606778369598, + "lastModifiedTimestamp": 1606778369598, + "childProfileIds": [ + ] + }, { "model_type": "Profile", "id": 15, "customerId": 2, "profileType": "ssid", - "name": "TipWlan-cloud-hotspot-access", + "name": "TipWlan-cloud-passpoint-access", "details": { "model_type": "SsidConfiguration", - "ssid": "TipWlan-cloud-hotspot-access", + "ssid": "TipWlan-cloud-passpoint-access", "appliedRadios": [ "is5GHzL", "is5GHzU" @@ -21,6 +88,7 @@ "noLocalSubnets": false, "radiusServiceName": null, "radiusAccountingServiceName": null, + "radiusAcountingServiceInterval": null, "captivePortalId": null, "bandwidthLimitDown": 0, "bandwidthLimitUp": 0, @@ -28,7 +96,7 @@ "clientBandwidthLimitUp": 0, "videoTrafficOnly": false, "radioBasedConfigs": { - "is5GHz": { + "is5GHzL": { "model_type": "RadioBasedSsidConfiguration", "enable80211r": null, "enable80211k": null, @@ -40,13 +108,13 @@ "enable80211k": null, "enable80211v": null }, - "is5GHzU": { + "is5GHz": { "model_type": "RadioBasedSsidConfiguration", "enable80211r": null, "enable80211k": null, "enable80211v": null }, - "is5GHzL": { + "is5GHzU": { "model_type": "RadioBasedSsidConfiguration", "enable80211r": null, "enable80211k": null, @@ -59,8 +127,8 @@ "forwardMode": null, "profileType": "ssid" }, - "createdTimestamp": 1605711164949, - "lastModifiedTimestamp": 1605711223372, + "createdTimestamp": 1606778369943, + "lastModifiedTimestamp": 1606778370811, "childProfileIds": [ 24 ] @@ -70,10 +138,10 @@ "id": 16, "customerId": 2, "profileType": "ssid", - "name": "TipWlan-cloud-hotspot-osu", + "name": "TipWlan-cloud-passpoint-osu", "details": { "model_type": "SsidConfiguration", - "ssid": "TipWlan-cloud-hotspot-osu", + "ssid": "TipWlan-cloud-passpoint-osu", "appliedRadios": [ "is2dot4GHz" ], @@ -86,6 +154,7 @@ "noLocalSubnets": false, "radiusServiceName": null, "radiusAccountingServiceName": null, + "radiusAcountingServiceInterval": null, "captivePortalId": null, "bandwidthLimitDown": 0, "bandwidthLimitUp": 0, @@ -93,7 +162,7 @@ "clientBandwidthLimitUp": 0, "videoTrafficOnly": false, "radioBasedConfigs": { - "is5GHz": { + "is5GHzL": { "model_type": "RadioBasedSsidConfiguration", "enable80211r": null, "enable80211k": null, @@ -105,13 +174,13 @@ "enable80211k": null, "enable80211v": null }, - "is5GHzU": { + "is5GHz": { "model_type": "RadioBasedSsidConfiguration", "enable80211r": null, "enable80211k": null, "enable80211v": null }, - "is5GHzL": { + "is5GHzU": { "model_type": "RadioBasedSsidConfiguration", "enable80211r": null, "enable80211k": null, @@ -124,8 +193,8 @@ "forwardMode": null, "profileType": "ssid" }, - "createdTimestamp": 1605711164950, - "lastModifiedTimestamp": 1605711171732, + "createdTimestamp": 1606778369944, + "lastModifiedTimestamp": 1606778370352, "childProfileIds": [ 19, 20 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 7351880..820929f 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 @@ -4,7 +4,7 @@ "id": 18, "customerId": 2, "profileType": "passpoint_venue", - "name": "TipWlan-Hotspot20-Venue", + "name": "TipWlan-Passpoint-Venue", "details": { "model_type": "PasspointVenueProfile", "venueNameSet": [ @@ -28,15 +28,15 @@ } ], "venueTypeAssignment": { - "model_type": "ProfileVenueTypeAssignment", + "model_type": "PasspointVenueTypeAssignment", "venueDescription": "Research and Development Facility", "venueGroupId": 2, "venueTypeId": 8 }, "profileType": "passpoint_venue" }, - "createdTimestamp": 1605711164956, - "lastModifiedTimestamp": 1605711164956, + "createdTimestamp": 1606778369950, + "lastModifiedTimestamp": 1606778369950, "childProfileIds": [ ] } diff --git a/opensync-gateway-static-docker/src/main/docker/app/opensync/EquipmentExample.json b/opensync-gateway-static-docker/src/main/docker/app/opensync/EquipmentExample.json index 6f0d669..a05e266 100644 --- a/opensync-gateway-static-docker/src/main/docker/app/opensync/EquipmentExample.json +++ b/opensync-gateway-static-docker/src/main/docker/app/opensync/EquipmentExample.json @@ -2,7 +2,7 @@ "model_type": "Equipment", "id": 51, "customerId": 2, - "profileId": 5, + "profileId": 12, "locationId": 8, "equipmentType": "AP", "inventoryId": "Test_Client_21P10C68818122", 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 4fb3e66..ad5fe5b 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,55 +1,56 @@ { - "model_type": "Profile", - "id": 23, - "customerId": 2, - "profileType": "equipment_ap", - "name": "ApProfile-3-radios-passpoint", - "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, - "greTunnelName": null, - "greParentIfName": null, - "greLocalInetAddr": null, - "greRemoteInetAddr": null, - "greRemoteMacAddr": null, - "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": 1605711197140, - "lastModifiedTimestamp": 1605711197140, - "childProfileIds": [ - 16, - 21, - 22, - 15 - ] -} + "model_type": "Profile", + "id": 12, + "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, + "greTunnelName": null, + "greParentIfName": null, + "greLocalInetAddr": null, + "greRemoteInetAddr": null, + "greRemoteMacAddr": null, + "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": 1606778369934, + "lastModifiedTimestamp": 1606778443413, + "childProfileIds": [ + 16, + 5, + 10, + 11, + 15 + ] +} \ 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 9e40b89..b15c575 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,72 +1,71 @@ [ -{ - "model_type": "Profile", - "id": 24, - "customerId": 2, - "profileType": "passpoint", - "name": "TipWlan-Hotspot20-Config", - "details": { - "model_type": "PasspointProfile", - "enableInterworkingAndHs20": true, - "hessid": null, - "additionalStepsRequiredForAccess": 0, - "deauthRequestTimeout": 0, - "operatingClass": 0, - "termsAndConditionsFile": { - "model_type": "ManagedFileInfo", - "md5checksum": null, - "lastModifiedTimestamp": null, - "apExportUrl": "https://localhost:9091/filestore/termsAndConditions", - "fileCategory": "ExternalPolicyConfiguration", - "fileType": "TEXT", - "altSlot": false - }, - "whitelistDomain": null, - "emergencyServicesReachable": true, - "unauthenticatedEmergencyServiceAccessible": false, - "internetConnectivity": true, - "connectionCapabilitySet": [ - { - "model_type": "PasspointConnectionCapability", - "connectionCapabilitiesPortNumber": 8888, - "connectionCapabilitiesIpProtocol": "TCP", - "connectionCapabilitiesStatus": "open" - } - ], - "ipAddressTypeAvailability": "public_IPv4_address_available", - "qosMapSetConfiguration": null, - "apGeospatialLocation": null, - "apCivicLocation": null, - "apPublicLocationIdUri": null, - "gasAddr3Behaviour": "p2pSpecWorkaroundFromRequest", - "anqpDomainId": 1234, - "disableDownstreamGroupAddressedForwarding": false, - "enable2pt4GHz": true, - "enable5GHz": true, - "associatedAccessSsidNames": [ - "TipWlan-cloud-hotspot-access" - ], - "osuSsidName": "TipWlan-cloud-hotspot-osu", - "operatorProfileName": "TipWlan-Hotspot20-Operator", - "venueProfileName": "TipWlan-Hotspot20-Venue", - "idProviderProfileNames": [ - "TipWlan-Hotspot20-OSU-Provider-2", - "TipWlan-Hotspot20-OSU-Provider" - ], - "accessNetworkType": "free_public_network", - "networkAuthenticationType": "acceptance_of_terms_and_conditions", - "associatedSsids": [ - "TipWlan-cloud-hotspot-access" - ], - "profileType": "passpoint" - }, - "createdTimestamp": 1605711223339, - "lastModifiedTimestamp": 1605711223339, - "childProfileIds": [ - 17, - 18, - 19, - 20 - ] - } + { + "model_type": "Profile", + "id": 24, + "customerId": 2, + "profileType": "passpoint", + "name": "TipWlan-Passpoint-Config", + "details": { + "model_type": "PasspointProfile", + "enableInterworkingAndHs20": true, + "hessid": null, + "passpointAccessNetworkType": "free_public_network", + "passpointNetworkAuthenticationType": "acceptance_of_terms_and_conditions", + "additionalStepsRequiredForAccess": 0, + "deauthRequestTimeout": 0, + "operatingClass": 0, + "termsAndConditionsFile": { + "model_type": "ManagedFileInfo", + "md5checksum": null, + "lastModifiedTimestamp": null, + "apExportUrl": "https://localhost:9091/filestore/termsAndConditions", + "fileCategory": "ExternalPolicyConfiguration", + "fileType": "TEXT", + "altSlot": false + }, + "whitelistDomain": null, + "emergencyServicesReachable": true, + "unauthenticatedEmergencyServiceAccessible": false, + "internetConnectivity": true, + "connectionCapabilitySet": [ + { + "model_type": "PasspointConnectionCapability", + "connectionCapabilitiesPortNumber": 8888, + "connectionCapabilitiesStatus": "open", + "connectionCapabilitiesIpProtocol": "TCP" + } + ], + "ipAddressTypeAvailability": "public_IPv4_address_available", + "qosMapSetConfiguration": null, + "apGeospatialLocation": null, + "apCivicLocation": null, + "apPublicLocationIdUri": null, + "gasAddr3Behaviour": "p2pSpecWorkaroundFromRequest", + "anqpDomainId": 1234, + "disableDownstreamGroupAddressedForwarding": false, + "enable2pt4GHz": true, + "enable5GHz": true, + "associatedAccessSsidProfileIds": [ + 15 + ], + "osuSsidProfileId": 16, + "passpointOperatorProfileId": 17, + "passpointVenueProfileId": 18, + "passpointOsuProviderProfileIds": [ + 19, + 20 + ], + "accessNetworkType": "free_public_network", + "networkAuthenticationType": "acceptance_of_terms_and_conditions", + "profileType": "passpoint" + }, + "createdTimestamp": 1606778370807, + "lastModifiedTimestamp": 1606778370807, + "childProfileIds": [ + 17, + 18, + 19, + 20 + ] + } ] 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 5dd9fa4..4d09f6f 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 @@ -4,7 +4,7 @@ "id": 19, "customerId": 2, "profileType": "passpoint_osu_id_provider", - "name": "TipWlan-Hotspot20-OSU-Provider", + "name": "TipWlan-Passpoint-OSU-Provider", "details": { "model_type": "PasspointOsuProviderProfile", "domainName": "rogers.com", @@ -128,8 +128,8 @@ ], "profileType": "passpoint_osu_id_provider" }, - "createdTimestamp": 1605711165325, - "lastModifiedTimestamp": 1605711165325, + "createdTimestamp": 1606778370345, + "lastModifiedTimestamp": 1606778370345, "childProfileIds": [ ] }, @@ -138,7 +138,7 @@ "id": 20, "customerId": 2, "profileType": "passpoint_osu_id_provider", - "name": "TipWlan-Hotspot20-OSU-Provider-2", + "name": "TipWlan-Passpoint-OSU-Provider-2", "details": { "model_type": "PasspointOsuProviderProfile", "domainName": "telus.com", @@ -262,8 +262,8 @@ ], "profileType": "passpoint_osu_id_provider" }, - "createdTimestamp": 1605711165330, - "lastModifiedTimestamp": 1605711165330, + "createdTimestamp": 1606778370351, + "lastModifiedTimestamp": 1606778370351, "childProfileIds": [ ] } 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 595c13e..54d7d28 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,10 +1,10 @@ [ { "model_type": "Profile", - "id": 22, + "id": 10, "customerId": 2, "profileType": "service_metrics_collection_config", - "name": "Metrics-Profile-Passpoint", + "name": "Metrics-Profile-3-Radios", "details": { "model_type": "ServiceMetricsCollectionConfigProfile", "radioTypes": [ @@ -21,30 +21,6 @@ ], "metricConfigParameterMap": { "ApNode": [ - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "radioType": "is2dot4GHz", - "serviceMetricDataType": "ApNode", - "statsReportFormat": "RAW" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "radioType": "is5GHzU", - "serviceMetricDataType": "ApNode", - "statsReportFormat": "RAW" - }, { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, @@ -69,18 +45,6 @@ "serviceMetricDataType": "ApNode", "statsReportFormat": "RAW" }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "radioType": "is5GHzL", - "serviceMetricDataType": "ApNode", - "statsReportFormat": "RAW" - }, { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, @@ -92,9 +56,52 @@ "radioType": "is2dot4GHz", "serviceMetricDataType": "ApNode", "statsReportFormat": "RAW" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "radioType": "is5GHzU", + "serviceMetricDataType": "ApNode", + "statsReportFormat": "RAW" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "radioType": "is2dot4GHz", + "serviceMetricDataType": "ApNode", + "statsReportFormat": "RAW" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "radioType": "is5GHzL", + "serviceMetricDataType": "ApNode", + "statsReportFormat": "RAW" } ], "ApSsid": [ + { + "model_type": "ServiceMetricRadioConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "radioType": "is5GHzU", + "serviceMetricDataType": "ApSsid" + }, { "model_type": "ServiceMetricRadioConfigParameters", "samplingInterval": 30, @@ -108,13 +115,6 @@ "reportingIntervalSeconds": 60, "radioType": "is2dot4GHz", "serviceMetricDataType": "ApSsid" - }, - { - "model_type": "ServiceMetricRadioConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "radioType": "is5GHzU", - "serviceMetricDataType": "ApSsid" } ], "Client": [ @@ -144,12 +144,12 @@ { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", + "reportingIntervalSeconds": 120, + "channelSurveyType": "OFF_CHANNEL", "scanIntervalMillis": 0, "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, - "radioType": "is2dot4GHz", + "radioType": "is5GHzL", "serviceMetricDataType": "Channel", "statsReportFormat": "RAW" }, @@ -168,12 +168,12 @@ { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", + "reportingIntervalSeconds": 120, + "channelSurveyType": "OFF_CHANNEL", "scanIntervalMillis": 0, "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, - "radioType": "is5GHzL", + "radioType": "is2dot4GHz", "serviceMetricDataType": "Channel", "statsReportFormat": "RAW" }, @@ -192,41 +192,29 @@ { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, - "reportingIntervalSeconds": 120, - "channelSurveyType": "OFF_CHANNEL", + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", "scanIntervalMillis": 0, "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, - "radioType": "is5GHzL", + "radioType": "is2dot4GHz", "serviceMetricDataType": "Channel", "statsReportFormat": "RAW" }, { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, - "reportingIntervalSeconds": 120, - "channelSurveyType": "OFF_CHANNEL", + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", "scanIntervalMillis": 0, "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, - "radioType": "is2dot4GHz", + "radioType": "is5GHzL", "serviceMetricDataType": "Channel", "statsReportFormat": "RAW" } ], "Neighbour": [ - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 120, - "channelSurveyType": "OFF_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "radioType": "is5GHzL", - "serviceMetricDataType": "Neighbour", - "statsReportFormat": "RAW" - }, { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, @@ -251,18 +239,6 @@ "serviceMetricDataType": "Neighbour", "statsReportFormat": "RAW" }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "radioType": "is2dot4GHz", - "serviceMetricDataType": "Neighbour", - "statsReportFormat": "RAW" - }, { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, @@ -286,13 +262,37 @@ "radioType": "is5GHzU", "serviceMetricDataType": "Neighbour", "statsReportFormat": "RAW" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 120, + "channelSurveyType": "OFF_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "radioType": "is5GHzL", + "serviceMetricDataType": "Neighbour", + "statsReportFormat": "RAW" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "radioType": "is2dot4GHz", + "serviceMetricDataType": "Neighbour", + "statsReportFormat": "RAW" } ] }, "profileType": "service_metrics_collection_config" }, - "createdTimestamp": 1605711195528, - "lastModifiedTimestamp": 1605711195528, + "createdTimestamp": 1606778369931, + "lastModifiedTimestamp": 1606778369931, "childProfileIds": [ ] } 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 11585da..413cb46 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 @@ -4,7 +4,7 @@ "id": 17, "customerId": 2, "profileType": "passpoint_operator", - "name": "TipWlan-Hotspot20-Operator", + "name": "TipWlan-Passpoint-Operator", "details": { "model_type": "PasspointOperatorProfile", "serverOnlyAuthenticatedL2EncryptionNetwork": false, @@ -29,8 +29,8 @@ ], "profileType": "passpoint_operator" }, - "createdTimestamp": 1605711164952, - "lastModifiedTimestamp": 1605711164952, + "createdTimestamp": 1606778369945, + "lastModifiedTimestamp": 1606778369945, "childProfileIds": [ ] } 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 cfb75e9..0a3a9cf 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,205 +1,204 @@ { - "model_type": "Profile", - "id": 21, - "customerId": 2, - "profileType": "rf", - "name": "TipWlan-rf-passpoint", - "details": { - "model_type": "RfConfiguration", - "rfConfigMap": { - "is5GHz": { - "model_type": "RfElementConfiguration", - "radioType": "is5GHz", - "radioMode": "modeAC", - "rf": "TipWlan-rf-passpoint", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is80MHz", - "mimoMode": "twoByTwo", - "maxNumClients": 100, - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "minAutoCellSize": -65, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApEnabled": null, - "multicastRate": "auto", - "managementRate": "auto", - "rxCellSizeDb": -90, - "probeResponseThresholdDb": -90, - "clientDisconnectThresholdDb": -90, - "eirpTxPower": 18, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } - }, - "is2dot4GHz": { - "model_type": "RfElementConfiguration", - "radioType": "is2dot4GHz", - "radioMode": "modeN", - "rf": "TipWlan-rf-passpoint", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is20MHz", - "mimoMode": "twoByTwo", - "maxNumClients": 100, - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "minAutoCellSize": -65, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApEnabled": null, - "multicastRate": "auto", - "managementRate": "auto", - "rxCellSizeDb": -90, - "probeResponseThresholdDb": -90, - "clientDisconnectThresholdDb": -90, - "eirpTxPower": 18, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 20, - "minLoadFactor": 50 - } - }, - "is5GHzU": { - "model_type": "RfElementConfiguration", - "radioType": "is5GHzU", - "radioMode": "modeAC", - "rf": "TipWlan-rf-passpoint", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is80MHz", - "mimoMode": "twoByTwo", - "maxNumClients": 100, - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "minAutoCellSize": -65, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApEnabled": null, - "multicastRate": "auto", - "managementRate": "auto", - "rxCellSizeDb": -90, - "probeResponseThresholdDb": -90, - "clientDisconnectThresholdDb": -90, - "eirpTxPower": 18, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } - }, - "is5GHzL": { - "model_type": "RfElementConfiguration", - "radioType": "is5GHzL", - "radioMode": "modeAC", - "rf": "TipWlan-rf-passpoint", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is80MHz", - "mimoMode": "twoByTwo", - "maxNumClients": 100, - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "minAutoCellSize": -65, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApEnabled": null, - "multicastRate": "auto", - "managementRate": "auto", - "rxCellSizeDb": -90, - "probeResponseThresholdDb": -90, - "clientDisconnectThresholdDb": -90, - "eirpTxPower": 18, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } - } - }, - "profileType": "rf" - }, - "createdTimestamp": 1605711191976, - "lastModifiedTimestamp": 1605711191976, - "childProfileIds": [ - ] -} + "model_type": "Profile", + "id": 11, + "customerId": 2, + "profileType": "rf", + "name": "TipWlan-rf", + "details": { + "model_type": "RfConfiguration", + "rfConfigMap": { + "is5GHz": { + "model_type": "RfElementConfiguration", + "radioType": "is5GHz", + "radioMode": "modeAC", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is80MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "minAutoCellSize": -65, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApEnabled": null, + "multicastRate": "auto", + "managementRate": "auto", + "rxCellSizeDb": -90, + "probeResponseThresholdDb": -90, + "clientDisconnectThresholdDb": -90, + "eirpTxPower": 18, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 30, + "minLoadFactor": 40 + } + }, + "is2dot4GHz": { + "model_type": "RfElementConfiguration", + "radioType": "is2dot4GHz", + "radioMode": "modeN", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is20MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "minAutoCellSize": -65, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApEnabled": null, + "multicastRate": "auto", + "managementRate": "auto", + "rxCellSizeDb": -90, + "probeResponseThresholdDb": -90, + "clientDisconnectThresholdDb": -90, + "eirpTxPower": 18, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 20, + "minLoadFactor": 50 + } + }, + "is5GHzU": { + "model_type": "RfElementConfiguration", + "radioType": "is5GHzU", + "radioMode": "modeAC", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is80MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "minAutoCellSize": -65, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApEnabled": null, + "multicastRate": "auto", + "managementRate": "auto", + "rxCellSizeDb": -90, + "probeResponseThresholdDb": -90, + "clientDisconnectThresholdDb": -90, + "eirpTxPower": 18, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 30, + "minLoadFactor": 40 + } + }, + "is5GHzL": { + "model_type": "RfElementConfiguration", + "radioType": "is5GHzL", + "radioMode": "modeAC", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is80MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "minAutoCellSize": -65, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApEnabled": null, + "multicastRate": "auto", + "managementRate": "auto", + "rxCellSizeDb": -90, + "probeResponseThresholdDb": -90, + "clientDisconnectThresholdDb": -90, + "eirpTxPower": 18, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 30, + "minLoadFactor": 40 + } + } + }, + "profileType": "rf" + }, + "createdTimestamp": 1606778369933, + "lastModifiedTimestamp": 1606778369933, + "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 7e9cdbe..4b9e61c 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,13 +1,80 @@ [ + { + "model_type": "Profile", + "id": 5, + "customerId": 2, + "profileType": "ssid", + "name": "TipWlan-cloud-3-radios", + "details": { + "model_type": "SsidConfiguration", + "ssid": "TipWlan-cloud-3-radios", + "appliedRadios": [ + "is5GHzL", + "is2dot4GHz", + "is5GHzU" + ], + "ssidAdminState": "enabled", + "secureMode": "wpa2OnlyPSK", + "vlanId": 1, + "keyStr": "openwifi", + "broadcastSsid": "enabled", + "keyRefresh": 0, + "noLocalSubnets": false, + "radiusServiceName": null, + "radiusAccountingServiceName": null, + "radiusAcountingServiceInterval": null, + "captivePortalId": null, + "bandwidthLimitDown": 0, + "bandwidthLimitUp": 0, + "clientBandwidthLimitDown": 0, + "clientBandwidthLimitUp": 0, + "videoTrafficOnly": false, + "radioBasedConfigs": { + "is5GHzL": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + }, + "is2dot4GHz": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + }, + "is5GHz": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + }, + "is5GHzU": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + } + }, + "bonjourGatewayProfileId": null, + "enable80211w": null, + "wepConfig": null, + "forwardMode": "BRIDGE", + "profileType": "ssid" + }, + "createdTimestamp": 1606778369598, + "lastModifiedTimestamp": 1606778369598, + "childProfileIds": [ + ] + }, { "model_type": "Profile", "id": 15, "customerId": 2, "profileType": "ssid", - "name": "TipWlan-cloud-hotspot-access", + "name": "TipWlan-cloud-passpoint-access", "details": { "model_type": "SsidConfiguration", - "ssid": "TipWlan-cloud-hotspot-access", + "ssid": "TipWlan-cloud-passpoint-access", "appliedRadios": [ "is5GHzL", "is5GHzU" @@ -21,6 +88,7 @@ "noLocalSubnets": false, "radiusServiceName": null, "radiusAccountingServiceName": null, + "radiusAcountingServiceInterval": null, "captivePortalId": null, "bandwidthLimitDown": 0, "bandwidthLimitUp": 0, @@ -28,7 +96,7 @@ "clientBandwidthLimitUp": 0, "videoTrafficOnly": false, "radioBasedConfigs": { - "is5GHz": { + "is5GHzL": { "model_type": "RadioBasedSsidConfiguration", "enable80211r": null, "enable80211k": null, @@ -40,13 +108,13 @@ "enable80211k": null, "enable80211v": null }, - "is5GHzU": { + "is5GHz": { "model_type": "RadioBasedSsidConfiguration", "enable80211r": null, "enable80211k": null, "enable80211v": null }, - "is5GHzL": { + "is5GHzU": { "model_type": "RadioBasedSsidConfiguration", "enable80211r": null, "enable80211k": null, @@ -59,8 +127,8 @@ "forwardMode": null, "profileType": "ssid" }, - "createdTimestamp": 1605711164949, - "lastModifiedTimestamp": 1605711223372, + "createdTimestamp": 1606778369943, + "lastModifiedTimestamp": 1606778370811, "childProfileIds": [ 24 ] @@ -70,10 +138,10 @@ "id": 16, "customerId": 2, "profileType": "ssid", - "name": "TipWlan-cloud-hotspot-osu", + "name": "TipWlan-cloud-passpoint-osu", "details": { "model_type": "SsidConfiguration", - "ssid": "TipWlan-cloud-hotspot-osu", + "ssid": "TipWlan-cloud-passpoint-osu", "appliedRadios": [ "is2dot4GHz" ], @@ -86,6 +154,7 @@ "noLocalSubnets": false, "radiusServiceName": null, "radiusAccountingServiceName": null, + "radiusAcountingServiceInterval": null, "captivePortalId": null, "bandwidthLimitDown": 0, "bandwidthLimitUp": 0, @@ -93,7 +162,7 @@ "clientBandwidthLimitUp": 0, "videoTrafficOnly": false, "radioBasedConfigs": { - "is5GHz": { + "is5GHzL": { "model_type": "RadioBasedSsidConfiguration", "enable80211r": null, "enable80211k": null, @@ -105,13 +174,13 @@ "enable80211k": null, "enable80211v": null }, - "is5GHzU": { + "is5GHz": { "model_type": "RadioBasedSsidConfiguration", "enable80211r": null, "enable80211k": null, "enable80211v": null }, - "is5GHzL": { + "is5GHzU": { "model_type": "RadioBasedSsidConfiguration", "enable80211r": null, "enable80211k": null, @@ -124,8 +193,8 @@ "forwardMode": null, "profileType": "ssid" }, - "createdTimestamp": 1605711164950, - "lastModifiedTimestamp": 1605711171732, + "createdTimestamp": 1606778369944, + "lastModifiedTimestamp": 1606778370352, "childProfileIds": [ 19, 20 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 7351880..820929f 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 @@ -4,7 +4,7 @@ "id": 18, "customerId": 2, "profileType": "passpoint_venue", - "name": "TipWlan-Hotspot20-Venue", + "name": "TipWlan-Passpoint-Venue", "details": { "model_type": "PasspointVenueProfile", "venueNameSet": [ @@ -28,15 +28,15 @@ } ], "venueTypeAssignment": { - "model_type": "ProfileVenueTypeAssignment", + "model_type": "PasspointVenueTypeAssignment", "venueDescription": "Research and Development Facility", "venueGroupId": 2, "venueTypeId": 8 }, "profileType": "passpoint_venue" }, - "createdTimestamp": 1605711164956, - "lastModifiedTimestamp": 1605711164956, + "createdTimestamp": 1606778369950, + "lastModifiedTimestamp": 1606778369950, "childProfileIds": [ ] } diff --git a/opensync-gateway-static-process/src/main/resources/app/opensync/EquipmentExample.json b/opensync-gateway-static-process/src/main/resources/app/opensync/EquipmentExample.json index 6f0d669..a05e266 100644 --- a/opensync-gateway-static-process/src/main/resources/app/opensync/EquipmentExample.json +++ b/opensync-gateway-static-process/src/main/resources/app/opensync/EquipmentExample.json @@ -2,7 +2,7 @@ "model_type": "Equipment", "id": 51, "customerId": 2, - "profileId": 5, + "profileId": 12, "locationId": 8, "equipmentType": "AP", "inventoryId": "Test_Client_21P10C68818122", 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 4fb3e66..ad5fe5b 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,55 +1,56 @@ { - "model_type": "Profile", - "id": 23, - "customerId": 2, - "profileType": "equipment_ap", - "name": "ApProfile-3-radios-passpoint", - "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, - "greTunnelName": null, - "greParentIfName": null, - "greLocalInetAddr": null, - "greRemoteInetAddr": null, - "greRemoteMacAddr": null, - "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": 1605711197140, - "lastModifiedTimestamp": 1605711197140, - "childProfileIds": [ - 16, - 21, - 22, - 15 - ] -} + "model_type": "Profile", + "id": 12, + "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, + "greTunnelName": null, + "greParentIfName": null, + "greLocalInetAddr": null, + "greRemoteInetAddr": null, + "greRemoteMacAddr": null, + "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": 1606778369934, + "lastModifiedTimestamp": 1606778443413, + "childProfileIds": [ + 16, + 5, + 10, + 11, + 15 + ] +} \ 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 9e40b89..b15c575 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,72 +1,71 @@ [ -{ - "model_type": "Profile", - "id": 24, - "customerId": 2, - "profileType": "passpoint", - "name": "TipWlan-Hotspot20-Config", - "details": { - "model_type": "PasspointProfile", - "enableInterworkingAndHs20": true, - "hessid": null, - "additionalStepsRequiredForAccess": 0, - "deauthRequestTimeout": 0, - "operatingClass": 0, - "termsAndConditionsFile": { - "model_type": "ManagedFileInfo", - "md5checksum": null, - "lastModifiedTimestamp": null, - "apExportUrl": "https://localhost:9091/filestore/termsAndConditions", - "fileCategory": "ExternalPolicyConfiguration", - "fileType": "TEXT", - "altSlot": false - }, - "whitelistDomain": null, - "emergencyServicesReachable": true, - "unauthenticatedEmergencyServiceAccessible": false, - "internetConnectivity": true, - "connectionCapabilitySet": [ - { - "model_type": "PasspointConnectionCapability", - "connectionCapabilitiesPortNumber": 8888, - "connectionCapabilitiesIpProtocol": "TCP", - "connectionCapabilitiesStatus": "open" - } - ], - "ipAddressTypeAvailability": "public_IPv4_address_available", - "qosMapSetConfiguration": null, - "apGeospatialLocation": null, - "apCivicLocation": null, - "apPublicLocationIdUri": null, - "gasAddr3Behaviour": "p2pSpecWorkaroundFromRequest", - "anqpDomainId": 1234, - "disableDownstreamGroupAddressedForwarding": false, - "enable2pt4GHz": true, - "enable5GHz": true, - "associatedAccessSsidNames": [ - "TipWlan-cloud-hotspot-access" - ], - "osuSsidName": "TipWlan-cloud-hotspot-osu", - "operatorProfileName": "TipWlan-Hotspot20-Operator", - "venueProfileName": "TipWlan-Hotspot20-Venue", - "idProviderProfileNames": [ - "TipWlan-Hotspot20-OSU-Provider-2", - "TipWlan-Hotspot20-OSU-Provider" - ], - "accessNetworkType": "free_public_network", - "networkAuthenticationType": "acceptance_of_terms_and_conditions", - "associatedSsids": [ - "TipWlan-cloud-hotspot-access" - ], - "profileType": "passpoint" - }, - "createdTimestamp": 1605711223339, - "lastModifiedTimestamp": 1605711223339, - "childProfileIds": [ - 17, - 18, - 19, - 20 - ] - } + { + "model_type": "Profile", + "id": 24, + "customerId": 2, + "profileType": "passpoint", + "name": "TipWlan-Passpoint-Config", + "details": { + "model_type": "PasspointProfile", + "enableInterworkingAndHs20": true, + "hessid": null, + "passpointAccessNetworkType": "free_public_network", + "passpointNetworkAuthenticationType": "acceptance_of_terms_and_conditions", + "additionalStepsRequiredForAccess": 0, + "deauthRequestTimeout": 0, + "operatingClass": 0, + "termsAndConditionsFile": { + "model_type": "ManagedFileInfo", + "md5checksum": null, + "lastModifiedTimestamp": null, + "apExportUrl": "https://localhost:9091/filestore/termsAndConditions", + "fileCategory": "ExternalPolicyConfiguration", + "fileType": "TEXT", + "altSlot": false + }, + "whitelistDomain": null, + "emergencyServicesReachable": true, + "unauthenticatedEmergencyServiceAccessible": false, + "internetConnectivity": true, + "connectionCapabilitySet": [ + { + "model_type": "PasspointConnectionCapability", + "connectionCapabilitiesPortNumber": 8888, + "connectionCapabilitiesStatus": "open", + "connectionCapabilitiesIpProtocol": "TCP" + } + ], + "ipAddressTypeAvailability": "public_IPv4_address_available", + "qosMapSetConfiguration": null, + "apGeospatialLocation": null, + "apCivicLocation": null, + "apPublicLocationIdUri": null, + "gasAddr3Behaviour": "p2pSpecWorkaroundFromRequest", + "anqpDomainId": 1234, + "disableDownstreamGroupAddressedForwarding": false, + "enable2pt4GHz": true, + "enable5GHz": true, + "associatedAccessSsidProfileIds": [ + 15 + ], + "osuSsidProfileId": 16, + "passpointOperatorProfileId": 17, + "passpointVenueProfileId": 18, + "passpointOsuProviderProfileIds": [ + 19, + 20 + ], + "accessNetworkType": "free_public_network", + "networkAuthenticationType": "acceptance_of_terms_and_conditions", + "profileType": "passpoint" + }, + "createdTimestamp": 1606778370807, + "lastModifiedTimestamp": 1606778370807, + "childProfileIds": [ + 17, + 18, + 19, + 20 + ] + } ] 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 5dd9fa4..4d09f6f 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 @@ -4,7 +4,7 @@ "id": 19, "customerId": 2, "profileType": "passpoint_osu_id_provider", - "name": "TipWlan-Hotspot20-OSU-Provider", + "name": "TipWlan-Passpoint-OSU-Provider", "details": { "model_type": "PasspointOsuProviderProfile", "domainName": "rogers.com", @@ -128,8 +128,8 @@ ], "profileType": "passpoint_osu_id_provider" }, - "createdTimestamp": 1605711165325, - "lastModifiedTimestamp": 1605711165325, + "createdTimestamp": 1606778370345, + "lastModifiedTimestamp": 1606778370345, "childProfileIds": [ ] }, @@ -138,7 +138,7 @@ "id": 20, "customerId": 2, "profileType": "passpoint_osu_id_provider", - "name": "TipWlan-Hotspot20-OSU-Provider-2", + "name": "TipWlan-Passpoint-OSU-Provider-2", "details": { "model_type": "PasspointOsuProviderProfile", "domainName": "telus.com", @@ -262,8 +262,8 @@ ], "profileType": "passpoint_osu_id_provider" }, - "createdTimestamp": 1605711165330, - "lastModifiedTimestamp": 1605711165330, + "createdTimestamp": 1606778370351, + "lastModifiedTimestamp": 1606778370351, "childProfileIds": [ ] } 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 595c13e..54d7d28 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,10 +1,10 @@ [ { "model_type": "Profile", - "id": 22, + "id": 10, "customerId": 2, "profileType": "service_metrics_collection_config", - "name": "Metrics-Profile-Passpoint", + "name": "Metrics-Profile-3-Radios", "details": { "model_type": "ServiceMetricsCollectionConfigProfile", "radioTypes": [ @@ -21,30 +21,6 @@ ], "metricConfigParameterMap": { "ApNode": [ - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "radioType": "is2dot4GHz", - "serviceMetricDataType": "ApNode", - "statsReportFormat": "RAW" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "radioType": "is5GHzU", - "serviceMetricDataType": "ApNode", - "statsReportFormat": "RAW" - }, { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, @@ -69,18 +45,6 @@ "serviceMetricDataType": "ApNode", "statsReportFormat": "RAW" }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "radioType": "is5GHzL", - "serviceMetricDataType": "ApNode", - "statsReportFormat": "RAW" - }, { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, @@ -92,9 +56,52 @@ "radioType": "is2dot4GHz", "serviceMetricDataType": "ApNode", "statsReportFormat": "RAW" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "radioType": "is5GHzU", + "serviceMetricDataType": "ApNode", + "statsReportFormat": "RAW" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "radioType": "is2dot4GHz", + "serviceMetricDataType": "ApNode", + "statsReportFormat": "RAW" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "radioType": "is5GHzL", + "serviceMetricDataType": "ApNode", + "statsReportFormat": "RAW" } ], "ApSsid": [ + { + "model_type": "ServiceMetricRadioConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "radioType": "is5GHzU", + "serviceMetricDataType": "ApSsid" + }, { "model_type": "ServiceMetricRadioConfigParameters", "samplingInterval": 30, @@ -108,13 +115,6 @@ "reportingIntervalSeconds": 60, "radioType": "is2dot4GHz", "serviceMetricDataType": "ApSsid" - }, - { - "model_type": "ServiceMetricRadioConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "radioType": "is5GHzU", - "serviceMetricDataType": "ApSsid" } ], "Client": [ @@ -144,12 +144,12 @@ { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", + "reportingIntervalSeconds": 120, + "channelSurveyType": "OFF_CHANNEL", "scanIntervalMillis": 0, "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, - "radioType": "is2dot4GHz", + "radioType": "is5GHzL", "serviceMetricDataType": "Channel", "statsReportFormat": "RAW" }, @@ -168,12 +168,12 @@ { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", + "reportingIntervalSeconds": 120, + "channelSurveyType": "OFF_CHANNEL", "scanIntervalMillis": 0, "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, - "radioType": "is5GHzL", + "radioType": "is2dot4GHz", "serviceMetricDataType": "Channel", "statsReportFormat": "RAW" }, @@ -192,41 +192,29 @@ { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, - "reportingIntervalSeconds": 120, - "channelSurveyType": "OFF_CHANNEL", + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", "scanIntervalMillis": 0, "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, - "radioType": "is5GHzL", + "radioType": "is2dot4GHz", "serviceMetricDataType": "Channel", "statsReportFormat": "RAW" }, { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, - "reportingIntervalSeconds": 120, - "channelSurveyType": "OFF_CHANNEL", + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", "scanIntervalMillis": 0, "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, - "radioType": "is2dot4GHz", + "radioType": "is5GHzL", "serviceMetricDataType": "Channel", "statsReportFormat": "RAW" } ], "Neighbour": [ - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 120, - "channelSurveyType": "OFF_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "radioType": "is5GHzL", - "serviceMetricDataType": "Neighbour", - "statsReportFormat": "RAW" - }, { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, @@ -251,18 +239,6 @@ "serviceMetricDataType": "Neighbour", "statsReportFormat": "RAW" }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "radioType": "is2dot4GHz", - "serviceMetricDataType": "Neighbour", - "statsReportFormat": "RAW" - }, { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, @@ -286,13 +262,37 @@ "radioType": "is5GHzU", "serviceMetricDataType": "Neighbour", "statsReportFormat": "RAW" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 120, + "channelSurveyType": "OFF_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "radioType": "is5GHzL", + "serviceMetricDataType": "Neighbour", + "statsReportFormat": "RAW" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "radioType": "is2dot4GHz", + "serviceMetricDataType": "Neighbour", + "statsReportFormat": "RAW" } ] }, "profileType": "service_metrics_collection_config" }, - "createdTimestamp": 1605711195528, - "lastModifiedTimestamp": 1605711195528, + "createdTimestamp": 1606778369931, + "lastModifiedTimestamp": 1606778369931, "childProfileIds": [ ] } 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 11585da..413cb46 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 @@ -4,7 +4,7 @@ "id": 17, "customerId": 2, "profileType": "passpoint_operator", - "name": "TipWlan-Hotspot20-Operator", + "name": "TipWlan-Passpoint-Operator", "details": { "model_type": "PasspointOperatorProfile", "serverOnlyAuthenticatedL2EncryptionNetwork": false, @@ -29,8 +29,8 @@ ], "profileType": "passpoint_operator" }, - "createdTimestamp": 1605711164952, - "lastModifiedTimestamp": 1605711164952, + "createdTimestamp": 1606778369945, + "lastModifiedTimestamp": 1606778369945, "childProfileIds": [ ] } 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 cfb75e9..0a3a9cf 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,205 +1,204 @@ { - "model_type": "Profile", - "id": 21, - "customerId": 2, - "profileType": "rf", - "name": "TipWlan-rf-passpoint", - "details": { - "model_type": "RfConfiguration", - "rfConfigMap": { - "is5GHz": { - "model_type": "RfElementConfiguration", - "radioType": "is5GHz", - "radioMode": "modeAC", - "rf": "TipWlan-rf-passpoint", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is80MHz", - "mimoMode": "twoByTwo", - "maxNumClients": 100, - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "minAutoCellSize": -65, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApEnabled": null, - "multicastRate": "auto", - "managementRate": "auto", - "rxCellSizeDb": -90, - "probeResponseThresholdDb": -90, - "clientDisconnectThresholdDb": -90, - "eirpTxPower": 18, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } - }, - "is2dot4GHz": { - "model_type": "RfElementConfiguration", - "radioType": "is2dot4GHz", - "radioMode": "modeN", - "rf": "TipWlan-rf-passpoint", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is20MHz", - "mimoMode": "twoByTwo", - "maxNumClients": 100, - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "minAutoCellSize": -65, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApEnabled": null, - "multicastRate": "auto", - "managementRate": "auto", - "rxCellSizeDb": -90, - "probeResponseThresholdDb": -90, - "clientDisconnectThresholdDb": -90, - "eirpTxPower": 18, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 20, - "minLoadFactor": 50 - } - }, - "is5GHzU": { - "model_type": "RfElementConfiguration", - "radioType": "is5GHzU", - "radioMode": "modeAC", - "rf": "TipWlan-rf-passpoint", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is80MHz", - "mimoMode": "twoByTwo", - "maxNumClients": 100, - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "minAutoCellSize": -65, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApEnabled": null, - "multicastRate": "auto", - "managementRate": "auto", - "rxCellSizeDb": -90, - "probeResponseThresholdDb": -90, - "clientDisconnectThresholdDb": -90, - "eirpTxPower": 18, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } - }, - "is5GHzL": { - "model_type": "RfElementConfiguration", - "radioType": "is5GHzL", - "radioMode": "modeAC", - "rf": "TipWlan-rf-passpoint", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is80MHz", - "mimoMode": "twoByTwo", - "maxNumClients": 100, - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "minAutoCellSize": -65, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApEnabled": null, - "multicastRate": "auto", - "managementRate": "auto", - "rxCellSizeDb": -90, - "probeResponseThresholdDb": -90, - "clientDisconnectThresholdDb": -90, - "eirpTxPower": 18, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } - } - }, - "profileType": "rf" - }, - "createdTimestamp": 1605711191976, - "lastModifiedTimestamp": 1605711191976, - "childProfileIds": [ - ] -} + "model_type": "Profile", + "id": 11, + "customerId": 2, + "profileType": "rf", + "name": "TipWlan-rf", + "details": { + "model_type": "RfConfiguration", + "rfConfigMap": { + "is5GHz": { + "model_type": "RfElementConfiguration", + "radioType": "is5GHz", + "radioMode": "modeAC", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is80MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "minAutoCellSize": -65, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApEnabled": null, + "multicastRate": "auto", + "managementRate": "auto", + "rxCellSizeDb": -90, + "probeResponseThresholdDb": -90, + "clientDisconnectThresholdDb": -90, + "eirpTxPower": 18, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 30, + "minLoadFactor": 40 + } + }, + "is2dot4GHz": { + "model_type": "RfElementConfiguration", + "radioType": "is2dot4GHz", + "radioMode": "modeN", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is20MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "minAutoCellSize": -65, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApEnabled": null, + "multicastRate": "auto", + "managementRate": "auto", + "rxCellSizeDb": -90, + "probeResponseThresholdDb": -90, + "clientDisconnectThresholdDb": -90, + "eirpTxPower": 18, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 20, + "minLoadFactor": 50 + } + }, + "is5GHzU": { + "model_type": "RfElementConfiguration", + "radioType": "is5GHzU", + "radioMode": "modeAC", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is80MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "minAutoCellSize": -65, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApEnabled": null, + "multicastRate": "auto", + "managementRate": "auto", + "rxCellSizeDb": -90, + "probeResponseThresholdDb": -90, + "clientDisconnectThresholdDb": -90, + "eirpTxPower": 18, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 30, + "minLoadFactor": 40 + } + }, + "is5GHzL": { + "model_type": "RfElementConfiguration", + "radioType": "is5GHzL", + "radioMode": "modeAC", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is80MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "minAutoCellSize": -65, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApEnabled": null, + "multicastRate": "auto", + "managementRate": "auto", + "rxCellSizeDb": -90, + "probeResponseThresholdDb": -90, + "clientDisconnectThresholdDb": -90, + "eirpTxPower": 18, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 30, + "minLoadFactor": 40 + } + } + }, + "profileType": "rf" + }, + "createdTimestamp": 1606778369933, + "lastModifiedTimestamp": 1606778369933, + "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 7e9cdbe..4b9e61c 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,13 +1,80 @@ [ + { + "model_type": "Profile", + "id": 5, + "customerId": 2, + "profileType": "ssid", + "name": "TipWlan-cloud-3-radios", + "details": { + "model_type": "SsidConfiguration", + "ssid": "TipWlan-cloud-3-radios", + "appliedRadios": [ + "is5GHzL", + "is2dot4GHz", + "is5GHzU" + ], + "ssidAdminState": "enabled", + "secureMode": "wpa2OnlyPSK", + "vlanId": 1, + "keyStr": "openwifi", + "broadcastSsid": "enabled", + "keyRefresh": 0, + "noLocalSubnets": false, + "radiusServiceName": null, + "radiusAccountingServiceName": null, + "radiusAcountingServiceInterval": null, + "captivePortalId": null, + "bandwidthLimitDown": 0, + "bandwidthLimitUp": 0, + "clientBandwidthLimitDown": 0, + "clientBandwidthLimitUp": 0, + "videoTrafficOnly": false, + "radioBasedConfigs": { + "is5GHzL": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + }, + "is2dot4GHz": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + }, + "is5GHz": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + }, + "is5GHzU": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + } + }, + "bonjourGatewayProfileId": null, + "enable80211w": null, + "wepConfig": null, + "forwardMode": "BRIDGE", + "profileType": "ssid" + }, + "createdTimestamp": 1606778369598, + "lastModifiedTimestamp": 1606778369598, + "childProfileIds": [ + ] + }, { "model_type": "Profile", "id": 15, "customerId": 2, "profileType": "ssid", - "name": "TipWlan-cloud-hotspot-access", + "name": "TipWlan-cloud-passpoint-access", "details": { "model_type": "SsidConfiguration", - "ssid": "TipWlan-cloud-hotspot-access", + "ssid": "TipWlan-cloud-passpoint-access", "appliedRadios": [ "is5GHzL", "is5GHzU" @@ -21,6 +88,7 @@ "noLocalSubnets": false, "radiusServiceName": null, "radiusAccountingServiceName": null, + "radiusAcountingServiceInterval": null, "captivePortalId": null, "bandwidthLimitDown": 0, "bandwidthLimitUp": 0, @@ -28,7 +96,7 @@ "clientBandwidthLimitUp": 0, "videoTrafficOnly": false, "radioBasedConfigs": { - "is5GHz": { + "is5GHzL": { "model_type": "RadioBasedSsidConfiguration", "enable80211r": null, "enable80211k": null, @@ -40,13 +108,13 @@ "enable80211k": null, "enable80211v": null }, - "is5GHzU": { + "is5GHz": { "model_type": "RadioBasedSsidConfiguration", "enable80211r": null, "enable80211k": null, "enable80211v": null }, - "is5GHzL": { + "is5GHzU": { "model_type": "RadioBasedSsidConfiguration", "enable80211r": null, "enable80211k": null, @@ -59,8 +127,8 @@ "forwardMode": null, "profileType": "ssid" }, - "createdTimestamp": 1605711164949, - "lastModifiedTimestamp": 1605711223372, + "createdTimestamp": 1606778369943, + "lastModifiedTimestamp": 1606778370811, "childProfileIds": [ 24 ] @@ -70,10 +138,10 @@ "id": 16, "customerId": 2, "profileType": "ssid", - "name": "TipWlan-cloud-hotspot-osu", + "name": "TipWlan-cloud-passpoint-osu", "details": { "model_type": "SsidConfiguration", - "ssid": "TipWlan-cloud-hotspot-osu", + "ssid": "TipWlan-cloud-passpoint-osu", "appliedRadios": [ "is2dot4GHz" ], @@ -86,6 +154,7 @@ "noLocalSubnets": false, "radiusServiceName": null, "radiusAccountingServiceName": null, + "radiusAcountingServiceInterval": null, "captivePortalId": null, "bandwidthLimitDown": 0, "bandwidthLimitUp": 0, @@ -93,7 +162,7 @@ "clientBandwidthLimitUp": 0, "videoTrafficOnly": false, "radioBasedConfigs": { - "is5GHz": { + "is5GHzL": { "model_type": "RadioBasedSsidConfiguration", "enable80211r": null, "enable80211k": null, @@ -105,13 +174,13 @@ "enable80211k": null, "enable80211v": null }, - "is5GHzU": { + "is5GHz": { "model_type": "RadioBasedSsidConfiguration", "enable80211r": null, "enable80211k": null, "enable80211v": null }, - "is5GHzL": { + "is5GHzU": { "model_type": "RadioBasedSsidConfiguration", "enable80211r": null, "enable80211k": null, @@ -124,8 +193,8 @@ "forwardMode": null, "profileType": "ssid" }, - "createdTimestamp": 1605711164950, - "lastModifiedTimestamp": 1605711171732, + "createdTimestamp": 1606778369944, + "lastModifiedTimestamp": 1606778370352, "childProfileIds": [ 19, 20 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 7351880..820929f 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 @@ -4,7 +4,7 @@ "id": 18, "customerId": 2, "profileType": "passpoint_venue", - "name": "TipWlan-Hotspot20-Venue", + "name": "TipWlan-Passpoint-Venue", "details": { "model_type": "PasspointVenueProfile", "venueNameSet": [ @@ -28,15 +28,15 @@ } ], "venueTypeAssignment": { - "model_type": "ProfileVenueTypeAssignment", + "model_type": "PasspointVenueTypeAssignment", "venueDescription": "Research and Development Facility", "venueGroupId": 2, "venueTypeId": 8 }, "profileType": "passpoint_venue" }, - "createdTimestamp": 1605711164956, - "lastModifiedTimestamp": 1605711164956, + "createdTimestamp": 1606778369950, + "lastModifiedTimestamp": 1606778369950, "childProfileIds": [ ] }