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

WIFI-872: Add Profile for Identity

Browse Source 
WIFI-878: Define Data Types for Passpoint Profile models
This commit is contained in:
Mike Hansen
2020-10-06 02:34:19 -04:00
parent 8f30d21f69
commit b04d71e75a
44 changed files with 3018 additions and 3006 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
opensync-ext-static/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationSimple.java vendored
View File

@@ -5,7 +5,6 @@ import java.io.IOException;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import javax.annotation.PostConstruct;
@@ -60,6 +59,9 @@ public class OpensyncExternalIntegrationSimple implements OpensyncExternalIntegr
@Value("${tip.wlan.ovsdb.hotspot20ProfileFileName:/app/config/ProfileHotspot20.json}")
private String hotspot20ProfileFileName;
@Value("${tip.wlan.ovsdb.idProviderProfileFileName:/app/config/ProfileIdProvider.json}")
private String idProviderProfileFileName;
@Value("${tip.wlan.ovsdb.radiusProfileFileName:/app/config/ProfileRadius.json}")
private String radiusProfileFileName;
@@ -118,6 +120,8 @@ public class OpensyncExternalIntegrationSimple implements OpensyncExternalIntegr
.listFromFile(operatorProfileFileName, com.telecominfraproject.wlan.profile.models.Profile.class);
List<com.telecominfraproject.wlan.profile.models.Profile> venueProfiles = com.telecominfraproject.wlan.profile.models.Profile
.listFromFile(venueProfileFileName, com.telecominfraproject.wlan.profile.models.Profile.class);
List<com.telecominfraproject.wlan.profile.models.Profile> providerProfiles = com.telecominfraproject.wlan.profile.models.Profile
.listFromFile(idProviderProfileFileName, com.telecominfraproject.wlan.profile.models.Profile.class);
ssidProfiles.stream().forEach(p -> apProfile.getChildProfileIds().add(p.getId()));
@@ -161,7 +165,8 @@ public class OpensyncExternalIntegrationSimple implements OpensyncExternalIntegr
new HashSet<com.telecominfraproject.wlan.profile.models.Profile>(operatorProfiles));
hotspotConfig.setHotspot20VenueSet(
new HashSet<com.telecominfraproject.wlan.profile.models.Profile>(venueProfiles));
hotspotConfig.setHotspot20ProviderSet(
new HashSet<com.telecominfraproject.wlan.profile.models.Profile>(providerProfiles));
ret = new OpensyncAPConfig();
ret.setCustomerEquipment(equipment);

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

@@ -1,9 +1,9 @@
{
"model_type": "Profile",
"id": 5,
"id": 15,
"customerId": 2,
"profileType": "equipment_ap",
"name": "DefaultApProfile",
"name": "ApProfile-3-radios",
"details": {
"model_type": "ApNetworkConfiguration",
"networkConfigVersion": "AP-1",
@@ -21,11 +21,6 @@
"ledControlEnabled": true,
"equipmentDiscovery": false,
"radioMap": {
"is5GHz": {
"model_type": "RadioProfileConfiguration",
"bestApEnabled": true,
"bestAPSteerType": "both"
},
"is2dot4GHz": {
"model_type": "RadioProfileConfiguration",
"bestApEnabled": true,
@@ -44,12 +39,11 @@
},
"profileType": "equipment_ap"
},
"createdTimestamp": 1591653239947,
"lastModifiedTimestamp": 1591654336724,
"createdTimestamp": 1601961452652,
"lastModifiedTimestamp": 1601961452652,
"childProfileIds": [
6,
7,
8,
9
2,
9,
11
]
}

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

@@ -1,7 +1,7 @@
[
{
"model_type": "Profile",
"id": 7777,
"id": 8,
"customerId": 2,
"profileType": "hotspot_2pt0",
"name": "TipWlan-Hotspot20-Config",
@@ -43,13 +43,32 @@
"gasAddr3Behaviour": "p2pSpecWorkaroundFromRequest",
"anqpDomainId": 1234,
"disableDownstreamGroupAddressedForwarding": false,
"profileType": "hotspot_2pt0"
"enable2pt4GHz": true,
"enable5GHz": true,
"associatedSsids": [
"TipWlan-cloud-3-radios"
],
"mccMnc3gppCellularNetworkInfo": [
{
"model_type": "MccMnc",
"mcc": 302,
"mnc": 720,
"iso": "ca",
"country": "Canada",
"countryCode": 1,
"network": "Rogers AT&T Wireless",
"mccMncPairing": "302,720"
}
],
"profileType": "hotspot_2pt0",
"mccMncList": "302,720"
},
"createdTimestamp": 1601595307355,
"lastModifiedTimestamp": 1601595307355,
"createdTimestamp": 1601961452370,
"lastModifiedTimestamp": 1601961452370,
"childProfileIds": [
5555,
6666
5,
6,
7
]
}
]

98
opensync-ext-static/src/main/resources/ProfileIdProvider.json Normal file
View File

@@ -0,0 +1,98 @@
[
{
"model_type": "Profile",
"id": 7,
"customerId": 2,
"profileType": "id_provider",
"name": "TipWlan-Hotspot20-OSU-Provider",
"details": {
"model_type": "Hotspot20IdProviderProfile",
"domainName": "example.com",
"mccMncList": [
{
"model_type": "MccMnc",
"mcc": 302,
"mnc": 720,
"iso": "ca",
"country": "Canada",
"countryCode": 1,
"network": "Rogers AT&T Wireless",
"mccMncPairing": "302,720"
}
],
"naiRealmList": [
{
"model_type": "NaiRealmInformation",
"naiRealms": [
"example.net",
"example.com"
],
"encoding": 0,
"eapMethods": [
"EAP-TLS with certificate"
],
"eapMap": {
"EAP-TLS with certificate": [
"Softoken",
"Certificate"
]
}
}
],
"osuIconList": [
{
"model_type": "OsuIcon",
"iconWidth": 32,
"iconHeight": 32,
"languageCode": "eng",
"iconLocale": "en_CA",
"iconName": "icon32.png",
"filePath": "/tmp/icon32.png",
"hs20IconString": "32:32:eng:image/png:icon32.png:/tmp/icon32.png"
}
],
"radiusProfileAuth": "Radius-Profile",
"radiusProfileAccounting": "Radius-Profile",
"osuSsid": "TipWlan-cloud-3-radios",
"osuServerUri": "https://example.com/osu/",
"osuFriendlyName": {
"model_type": "Hotspot20Duple",
"locale": "en_CA",
"dupleIso3Language": "eng",
"dupleName": "Example provider",
"defaultDupleSeparator": ":",
"asDuple": "eng:Example provider"
},
"osuNaiStandalone": "anonymous@example.com",
"osuNaiShared": "anonymous@example.com",
"osuMethodList": [
1,
0
],
"osuServiceDescription": [
{
"model_type": "Hotspot20Duple",
"locale": "en_CA",
"dupleIso3Language": "eng",
"dupleName": "Example services",
"defaultDupleSeparator": ":",
"asDuple": "eng:Example services"
},
{
"model_type": "Hotspot20Duple",
"locale": "fr_CA",
"dupleIso3Language": "fra",
"dupleName": "Exemples de services",
"defaultDupleSeparator": ":",
"asDuple": "fra:Exemples de services"
}
],
"profileType": "id_provider"
},
"createdTimestamp": 1601961451981,
"lastModifiedTimestamp": 1601961451981,
"childProfileIds": [
1
]
}
]

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

@@ -1,16 +1,16 @@
[
{
"model_type": "Profile",
"id": 333,
"id": 2,
"customerId": 2,
"profileType": "metrics",
"name": "Metrics-Profile-3-radios",
"details": {
"model_type": "ServiceMetricsCollectionConfigProfile",
"radioTypes": [
"is5GHzL",
"is5GHzU",
"is2dot4GHz",
"is5GHzU"
"is5GHzL"
],
"serviceMetricDataTypes": [
"ApNode",
@@ -30,19 +30,7 @@
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzU",
"serviceMetricDataType": "ApNode"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "ApNode"
},
{
@@ -60,20 +48,20 @@
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"radioType": "is5GHzU",
"serviceMetricDataType": "ApNode"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
@@ -92,6 +80,18 @@
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "ApNode"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"serviceMetricDataType": "ApNode"
}
],
"ApSsid": [
@@ -99,14 +99,14 @@
"model_type": "ServiceMetricRadioConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"radioType": "is2dot4GHz",
"radioType": "is5GHzL",
"serviceMetricDataType": "ApSsid"
},
{
"model_type": "ServiceMetricRadioConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"radioType": "is5GHzL",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "ApSsid"
},
{
@@ -118,13 +118,6 @@
}
],
"Client": [
{
"model_type": "ServiceMetricRadioConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Client"
},
{
"model_type": "ServiceMetricRadioConfigParameters",
"samplingInterval": 30,
@@ -138,6 +131,13 @@
"reportingIntervalSeconds": 60,
"radioType": "is5GHzU",
"serviceMetricDataType": "Client"
},
{
"model_type": "ServiceMetricRadioConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Client"
}
],
"Channel": [
@@ -150,57 +150,21 @@
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzU",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
@@ -210,6 +174,42 @@
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzU",
"serviceMetricDataType": "Channel"
}
@@ -224,7 +224,19 @@
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"radioType": "is5GHzU",
"serviceMetricDataType": "Neighbour"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Neighbour"
},
{
@@ -248,7 +260,7 @@
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"radioType": "is5GHzL",
"serviceMetricDataType": "Neighbour"
},
{
@@ -263,18 +275,6 @@
"radioType": "is5GHzU",
"serviceMetricDataType": "Neighbour"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"serviceMetricDataType": "Neighbour"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
@@ -284,15 +284,15 @@
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzU",
"radioType": "is5GHzL",
"serviceMetricDataType": "Neighbour"
}
]
},
"profileType": "metrics"
},
"createdTimestamp": 1601335086248,
"lastModifiedTimestamp": 1601335086248,
"createdTimestamp": 1601961451756,
"lastModifiedTimestamp": 1601961451756,
"childProfileIds": []
}
]

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

@@ -1,7 +1,7 @@
[
{
"model_type": "Profile",
"id": 5555,
"id": 5,
"customerId": 2,
"profileType": "operator",
"name": "TipWlan-Hotspot20-Operator",
@@ -14,22 +14,24 @@
{
"model_type": "Hotspot20Duple",
"locale": "en_CA",
"language": "eng",
"friendlyName": "default Friendly Operator Name",
"formattedFriendlyName": "eng:default Friendly Operator Name"
"dupleIso3Language": "eng",
"dupleName": "Default friendly operator name",
"defaultDupleSeparator": ":",
"asDuple": "eng:Default friendly operator name"
},
{
"model_type": "Hotspot20Duple",
"locale": "fr_CA",
"language": "fra",
"friendlyName": "Nom de l'opérateur convivial par défaut",
"formattedFriendlyName": "fra:Nom de l'opérateur convivial par défaut"
"dupleIso3Language": "fra",
"dupleName": "Nom de l'opérateur convivial par défaut",
"defaultDupleSeparator": ":",
"asDuple": "fra:Nom de l'opérateur convivial par défaut"
}
],
"profileType": "operator"
},
"createdTimestamp": 1601595306885,
"lastModifiedTimestamp": 1601595306885,
"createdTimestamp": 1601961451776,
"lastModifiedTimestamp": 1601961451776,
"childProfileIds": []
}
]

10
opensync-ext-static/src/main/resources/ProfileRadius.json
View File

@@ -4,7 +4,7 @@
"id": 1,
"customerId": 2,
"profileType": "radius",
"name": "RadiusProfileOttawa",
"name": "Radius-Profile",
"details": {
"model_type": "RadiusProfile",
"subnetConfiguration": null,
@@ -12,10 +12,10 @@
"Ottawa": {
"model_type": "RadiusServiceRegion",
"serverMap": {
"RadiusProfileOttawa": [
"Radius-Profile": [
{
"model_type": "RadiusServer",
"ipAddress": "localhost",
"ipAddress": "192.168.0.1",
"secret": "testing123",
"authPort": 1812,
"timeout": null
@@ -27,8 +27,8 @@
},
"profileType": "radius"
},
"createdTimestamp": 1591653174195,
"lastModifiedTimestamp": 1591653174195,
"createdTimestamp": 1601961451668,
"lastModifiedTimestamp": 1601961451668,
"childProfileIds": []
}
]

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

@@ -1,21 +1,80 @@
{
"model_type": "Profile",
"id": 9,
"id": 11,
"customerId": 2,
"profileType": "rf",
"name": "DefaultRf",
"name": "TipWlan-rf",
"details": {
"model_type": "RfConfiguration",
"rf": "Default-RF",
"profileType": "rf",
"rfConfigMap": {
"is5GHz": {
"model_type": "RfElementConfiguration",
"rf": "TipWlan-rf",
"beaconInterval": 100,
"forceScanDuringVoice": "disabled",
"rtsCtsThreshold": 65535,
"channelBandwidth": "is80MHz",
"mimoMode": "twoByTwo",
"maxNumClients": 100,
"multicastRate": "auto",
"autoChannelSelection": false,
"activeScanSettings": {
"model_type": "ActiveScanSettings",
"enabled": true,
"scanFrequencySeconds": 10,
"scanDurationMillis": 65
},
"managementRate": "auto",
"rxCellSizeDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"probeResponseThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"clientDisconnectThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"eirpTxPower": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": 18
},
"bestApEnabled": null,
"neighbouringListApConfig": {
"model_type": "NeighbouringAPListConfiguration",
"minSignal": -85,
"maxAps": 25
},
"perimeterDetectionEnabled": true,
"channelHopSettings": {
"model_type": "ChannelHopSettings",
"noiseFloorThresholdInDB": -75,
"noiseFloorThresholdTimeInSeconds": 180,
"nonWifiThresholdInPercentage": 50,
"nonWifiThresholdTimeInSeconds": 180,
"obssHopMode": "NON_WIFI"
},
"bestApSettings": {
"model_type": "RadioBestApSettings",
"mlComputed": true,
"dropInSnrPercentage": 30,
"minLoadFactor": 40
}
},
"is2dot4GHz": {
"model_type": "RfElementConfiguration",
"rf": "TipWlan-rf",
"beaconInterval": 100,
"forceScanDuringVoice": "disabled",
"rtsCtsThreshold": 65535,
"channelBandwidth": "is20MHz",
"mimoMode": "twoBytwo",
"mimoMode": "twoByTwo",
"maxNumClients": 100,
"multicastRate": "auto",
"autoChannelSelection": false,
@@ -43,8 +102,8 @@
},
"eirpTxPower": {
"model_type": "AutoOrManualValue",
"auto": false,
"value": 32
"auto": true,
"value": 18
},
"bestApEnabled": null,
"neighbouringListApConfig": {
@@ -52,7 +111,6 @@
"minSignal": -85,
"maxAps": 25
},
"minAutoCellSize": -80,
"perimeterDetectionEnabled": true,
"channelHopSettings": {
"model_type": "ChannelHopSettings",
@@ -69,133 +127,14 @@
"minLoadFactor": 50
}
},
"is5GHz": {
"model_type": "RfElementConfiguration",
"beaconInterval": 100,
"forceScanDuringVoice": "disabled",
"rtsCtsThreshold": 65535,
"channelBandwidth": "is80MHz",
"mimoMode": "twoBytwo",
"maxNumClients": 100,
"multicastRate": "auto",
"autoChannelSelection": false,
"activeScanSettings": {
"model_type": "ActiveScanSettings",
"enabled": true,
"scanFrequencySeconds": 10,
"scanDurationMillis": 65
},
"managementRate": "auto",
"rxCellSizeDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"probeResponseThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"clientDisconnectThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"eirpTxPower": {
"model_type": "AutoOrManualValue",
"auto": false,
"value": 32
},
"bestApEnabled": null,
"neighbouringListApConfig": {
"model_type": "NeighbouringAPListConfiguration",
"minSignal": -85,
"maxAps": 25
},
"minAutoCellSize": -80,
"perimeterDetectionEnabled": true,
"channelHopSettings": {
"model_type": "ChannelHopSettings",
"noiseFloorThresholdInDB": -75,
"noiseFloorThresholdTimeInSeconds": 180,
"nonWifiThresholdInPercentage": 50,
"nonWifiThresholdTimeInSeconds": 180,
"obssHopMode": "NON_WIFI"
},
"bestApSettings": {
"model_type": "RadioBestApSettings",
"mlComputed": true,
"dropInSnrPercentage": 20,
"minLoadFactor": 50
}
},
"is5GHzL": {
"model_type": "RfElementConfiguration",
"beaconInterval": 100,
"forceScanDuringVoice": "disabled",
"rtsCtsThreshold": 65535,
"channelBandwidth": "is80MHz",
"mimoMode": "twoBytwo",
"maxNumClients": 100,
"multicastRate": "auto",
"autoChannelSelection": false,
"activeScanSettings": {
"model_type": "ActiveScanSettings",
"enabled": true,
"scanFrequencySeconds": 10,
"scanDurationMillis": 65
},
"managementRate": "auto",
"rxCellSizeDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"probeResponseThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"clientDisconnectThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"eirpTxPower": {
"model_type": "AutoOrManualValue",
"auto": false,
"value": 32
},
"bestApEnabled": null,
"neighbouringListApConfig": {
"model_type": "NeighbouringAPListConfiguration",
"minSignal": -85,
"maxAps": 25
},
"minAutoCellSize": -80,
"perimeterDetectionEnabled": true,
"channelHopSettings": {
"model_type": "ChannelHopSettings",
"noiseFloorThresholdInDB": -75,
"noiseFloorThresholdTimeInSeconds": 180,
"nonWifiThresholdInPercentage": 50,
"nonWifiThresholdTimeInSeconds": 180,
"obssHopMode": "NON_WIFI"
},
"bestApSettings": {
"model_type": "RadioBestApSettings",
"mlComputed": true,
"dropInSnrPercentage": 30,
"minLoadFactor": 40
}
},
"is5GHzU": {
"model_type": "RfElementConfiguration",
"rf": "TipWlan-rf",
"beaconInterval": 100,
"forceScanDuringVoice": "disabled",
"rtsCtsThreshold": 65535,
"channelBandwidth": "is80MHz",
"mimoMode": "twoBytwo",
"mimoMode": "twoByTwo",
"maxNumClients": 100,
"multicastRate": "auto",
"autoChannelSelection": false,
@@ -223,8 +162,68 @@
},
"eirpTxPower": {
"model_type": "AutoOrManualValue",
"auto": false,
"value": 32
"auto": true,
"value": 18
},
"bestApEnabled": null,
"neighbouringListApConfig": {
"model_type": "NeighbouringAPListConfiguration",
"minSignal": -85,
"maxAps": 25
},
"perimeterDetectionEnabled": true,
"channelHopSettings": {
"model_type": "ChannelHopSettings",
"noiseFloorThresholdInDB": -75,
"noiseFloorThresholdTimeInSeconds": 180,
"nonWifiThresholdInPercentage": 50,
"nonWifiThresholdTimeInSeconds": 180,
"obssHopMode": "NON_WIFI"
},
"bestApSettings": {
"model_type": "RadioBestApSettings",
"mlComputed": true,
"dropInSnrPercentage": 30,
"minLoadFactor": 40
}
},
"is5GHzL": {
"model_type": "RfElementConfiguration",
"rf": "TipWlan-rf",
"beaconInterval": 100,
"forceScanDuringVoice": "disabled",
"rtsCtsThreshold": 65535,
"channelBandwidth": "is80MHz",
"mimoMode": "twoByTwo",
"maxNumClients": 100,
"multicastRate": "auto",
"autoChannelSelection": false,
"activeScanSettings": {
"model_type": "ActiveScanSettings",
"enabled": true,
"scanFrequencySeconds": 10,
"scanDurationMillis": 65
},
"managementRate": "auto",
"rxCellSizeDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"probeResponseThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"clientDisconnectThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"eirpTxPower": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": 18
},
"bestApEnabled": null,
"neighbouringListApConfig": {
@@ -232,7 +231,6 @@
"minSignal": -85,
"maxAps": 25
},
"minAutoCellSize": -80,
"perimeterDetectionEnabled": true,
"channelHopSettings": {
"model_type": "ChannelHopSettings",
@@ -250,9 +248,9 @@
}
}
},
"createdTimestamp": 1591653239983,
"lastModifiedTimestamp": 1591653239983,
"childProfileIds": [
]
}
"profileType": "rf"
},
"createdTimestamp": 1601961452390,
"lastModifiedTimestamp": 1601961452390,
"childProfileIds": []
}

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

@@ -1,20 +1,22 @@
[
{
"model_type": "Profile",
"id": 6,
"id": 9,
"customerId": 2,
"profileType": "ssid",
"name": "DefaultSsid-2g",
"name": "TipWlan-cloud-3-radios",
"details": {
"model_type": "SsidConfiguration",
"ssid": "Default-SSID-2g",
"ssid": "TipWlan-cloud-3-radios",
"appliedRadios": [
"is2dot4GHz"
"is5GHzU",
"is2dot4GHz",
"is5GHzL"
],
"ssidAdminState": "enabled",
"secureMode": "wpa2PSK",
"secureMode": "open",
"vlanId": 1,
"keyStr": "12345678",
"keyStr": null,
"broadcastSsid": "enabled",
"keyRefresh": 0,
"noLocalSubnets": false,
@@ -57,130 +59,11 @@
"forwardMode": null,
"profileType": "ssid"
},
"createdTimestamp": 1591653239983,
"lastModifiedTimestamp": 1591653239983,
"childProfileIds": []
},
{
"model_type": "Profile",
"id": 7,
"customerId": 2,
"profileType": "ssid",
"name": "DefaultSsid-5gl",
"details": {
"model_type": "SsidConfiguration",
"ssid": "Default-SSID-5gl",
"appliedRadios": [
"is5GHzL"
],
"ssidAdminState": "enabled",
"secureMode": "wpaEAP",
"vlanId": 1,
"keyStr": "12345678",
"broadcastSsid": "enabled",
"keyRefresh": 0,
"noLocalSubnets": false,
"radiusServiceName": "RadiusProfileOttawa",
"captivePortalId": null,
"bandwidthLimitDown": 0,
"bandwidthLimitUp": 0,
"videoTrafficOnly": false,
"radioBasedConfigs": {
"is5GHz": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is2dot4GHz": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is5GHzU": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is5GHzL": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
}
},
"bonjourGatewayProfileId": null,
"enable80211w": null,
"wepConfig": null,
"forwardMode": null,
"profileType": "ssid"
},
"createdTimestamp": 1591653240017,
"lastModifiedTimestamp": 1591654215374,
"createdTimestamp": 1601961452385,
"lastModifiedTimestamp": 1601961452385,
"childProfileIds": [
1
7,
8
]
},
{
"model_type": "Profile",
"id": 8,
"customerId": 2,
"profileType": "ssid",
"name": "DefaultSsid-5gu",
"details": {
"model_type": "SsidConfiguration",
"ssid": "Default-SSID-5gu",
"appliedRadios": [
"is5GHzU"
],
"ssidAdminState": "enabled",
"secureMode": "wpa2PSK",
"vlanId": 1,
"keyStr": "12345678",
"broadcastSsid": "enabled",
"keyRefresh": 0,
"noLocalSubnets": false,
"radiusServiceName": null,
"captivePortalId": null,
"bandwidthLimitDown": 0,
"bandwidthLimitUp": 0,
"videoTrafficOnly": false,
"radioBasedConfigs": {
"is5GHz": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is2dot4GHz": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is5GHzU": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is5GHzL": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
}
},
"bonjourGatewayProfileId": null,
"enable80211w": null,
"wepConfig": null,
"forwardMode": null,
"profileType": "ssid"
},
"createdTimestamp": 1591654301763,
"lastModifiedTimestamp": 1591654301763,
"childProfileIds": []
}
]

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

@@ -1,7 +1,7 @@
[
{
"model_type": "Profile",
"id": 6666,
"id": 6,
"customerId": 2,
"profileType": "venue",
"name": "TipWlan-Hotspot20-Venue",
@@ -10,19 +10,21 @@
"venueNameSet": [
{
"model_type": "VenueName",
"locale": "en_CA",
"language": "eng",
"venueName": "Example venue",
"venueUrl": "http://www.example.com/info-eng",
"formattedVenueName": "eng:Example venue"
"locale": "fr_CA",
"dupleIso3Language": "fra",
"dupleName": "Exemple de lieu",
"defaultDupleSeparator": ":",
"venueUrl": "http://www.example.com/info-fra",
"asDuple": "fra:Exemple de lieu"
},
{
"model_type": "VenueName",
"locale": "fr_CA",
"language": "fra",
"venueName": "Exemple de lieu",
"venueUrl": "http://www.example.com/info-fra",
"formattedVenueName": "fra:Exemple de lieu"
"locale": "en_CA",
"dupleIso3Language": "eng",
"dupleName": "Example venue",
"defaultDupleSeparator": ":",
"venueUrl": "http://www.example.com/info-eng",
"asDuple": "eng:Example venue"
}
],
"venueTypeAssignment": {
@@ -33,8 +35,8 @@
},
"profileType": "venue"
},
"createdTimestamp": 1601595306891,
"lastModifiedTimestamp": 1601595306891,
"createdTimestamp": 1601961451781,
"lastModifiedTimestamp": 1601961451781,
"childProfileIds": []
}
]

1
opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/Dockerfile
View File

@@ -31,6 +31,7 @@ COPY app/opensync/ProfileRf.json /app/opensync/ProfileRf.json
COPY app/opensync/ProfileHotspot20.json /app/opensync/ProfileHotspot20.json
COPY app/opensync/ProfileOperator.json /app/opensync/ProfileOperator.json
COPY app/opensync/ProfileVenue.json /app/opensync/ProfileVenue.json
COPY app/opensync/ProfileIdProvider.json /app/opensync/ProfileIdProvider.json
VOLUME ["/app/logs", "/app/config"]
RUN chmod +x /app/run.sh

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

@@ -1,9 +1,9 @@
{
"model_type": "Profile",
"id": 5,
"id": 15,
"customerId": 2,
"profileType": "equipment_ap",
"name": "DefaultApProfile",
"name": "ApProfile-3-radios",
"details": {
"model_type": "ApNetworkConfiguration",
"networkConfigVersion": "AP-1",
@@ -21,11 +21,6 @@
"ledControlEnabled": true,
"equipmentDiscovery": false,
"radioMap": {
"is5GHz": {
"model_type": "RadioProfileConfiguration",
"bestApEnabled": true,
"bestAPSteerType": "both"
},
"is2dot4GHz": {
"model_type": "RadioProfileConfiguration",
"bestApEnabled": true,
@@ -44,12 +39,11 @@
},
"profileType": "equipment_ap"
},
"createdTimestamp": 1591653239947,
"lastModifiedTimestamp": 1591654336724,
"createdTimestamp": 1601961452652,
"lastModifiedTimestamp": 1601961452652,
"childProfileIds": [
6,
7,
8,
9
2,
9,
11
]
}

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

@@ -1,7 +1,7 @@
[
{
"model_type": "Profile",
"id": 7777,
"id": 8,
"customerId": 2,
"profileType": "hotspot_2pt0",
"name": "TipWlan-Hotspot20-Config",
@@ -43,13 +43,32 @@
"gasAddr3Behaviour": "p2pSpecWorkaroundFromRequest",
"anqpDomainId": 1234,
"disableDownstreamGroupAddressedForwarding": false,
"profileType": "hotspot_2pt0"
"enable2pt4GHz": true,
"enable5GHz": true,
"associatedSsids": [
"TipWlan-cloud-3-radios"
],
"mccMnc3gppCellularNetworkInfo": [
{
"model_type": "MccMnc",
"mcc": 302,
"mnc": 720,
"iso": "ca",
"country": "Canada",
"countryCode": 1,
"network": "Rogers AT&T Wireless",
"mccMncPairing": "302,720"
}
],
"profileType": "hotspot_2pt0",
"mccMncList": "302,720"
},
"createdTimestamp": 1601595307355,
"lastModifiedTimestamp": 1601595307355,
"createdTimestamp": 1601961452370,
"lastModifiedTimestamp": 1601961452370,
"childProfileIds": [
5555,
6666
5,
6,
7
]
}
]

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

@@ -0,0 +1,98 @@
[
{
"model_type": "Profile",
"id": 7,
"customerId": 2,
"profileType": "id_provider",
"name": "TipWlan-Hotspot20-OSU-Provider",
"details": {
"model_type": "Hotspot20IdProviderProfile",
"domainName": "example.com",
"mccMncList": [
{
"model_type": "MccMnc",
"mcc": 302,
"mnc": 720,
"iso": "ca",
"country": "Canada",
"countryCode": 1,
"network": "Rogers AT&T Wireless",
"mccMncPairing": "302,720"
}
],
"naiRealmList": [
{
"model_type": "NaiRealmInformation",
"naiRealms": [
"example.net",
"example.com"
],
"encoding": 0,
"eapMethods": [
"EAP-TLS with certificate"
],
"eapMap": {
"EAP-TLS with certificate": [
"Softoken",
"Certificate"
]
}
}
],
"osuIconList": [
{
"model_type": "OsuIcon",
"iconWidth": 32,
"iconHeight": 32,
"languageCode": "eng",
"iconLocale": "en_CA",
"iconName": "icon32.png",
"filePath": "/tmp/icon32.png",
"hs20IconString": "32:32:eng:image/png:icon32.png:/tmp/icon32.png"
}
],
"radiusProfileAuth": "Radius-Profile",
"radiusProfileAccounting": "Radius-Profile",
"osuSsid": "TipWlan-cloud-3-radios",
"osuServerUri": "https://example.com/osu/",
"osuFriendlyName": {
"model_type": "Hotspot20Duple",
"locale": "en_CA",
"dupleIso3Language": "eng",
"dupleName": "Example provider",
"defaultDupleSeparator": ":",
"asDuple": "eng:Example provider"
},
"osuNaiStandalone": "anonymous@example.com",
"osuNaiShared": "anonymous@example.com",
"osuMethodList": [
1,
0
],
"osuServiceDescription": [
{
"model_type": "Hotspot20Duple",
"locale": "en_CA",
"dupleIso3Language": "eng",
"dupleName": "Example services",
"defaultDupleSeparator": ":",
"asDuple": "eng:Example services"
},
{
"model_type": "Hotspot20Duple",
"locale": "fr_CA",
"dupleIso3Language": "fra",
"dupleName": "Exemples de services",
"defaultDupleSeparator": ":",
"asDuple": "fra:Exemples de services"
}
],
"profileType": "id_provider"
},
"createdTimestamp": 1601961451981,
"lastModifiedTimestamp": 1601961451981,
"childProfileIds": [
1
]
}
]

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

@@ -1,16 +1,16 @@
[
{
"model_type": "Profile",
"id": 333,
"id": 2,
"customerId": 2,
"profileType": "metrics",
"name": "Metrics-Profile-3-radios",
"details": {
"model_type": "ServiceMetricsCollectionConfigProfile",
"radioTypes": [
"is5GHzL",
"is5GHzU",
"is2dot4GHz",
"is5GHzU"
"is5GHzL"
],
"serviceMetricDataTypes": [
"ApNode",
@@ -30,19 +30,7 @@
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzU",
"serviceMetricDataType": "ApNode"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "ApNode"
},
{
@@ -60,20 +48,20 @@
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"radioType": "is5GHzU",
"serviceMetricDataType": "ApNode"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
@@ -92,6 +80,18 @@
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "ApNode"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"serviceMetricDataType": "ApNode"
}
],
"ApSsid": [
@@ -99,14 +99,14 @@
"model_type": "ServiceMetricRadioConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"radioType": "is2dot4GHz",
"radioType": "is5GHzL",
"serviceMetricDataType": "ApSsid"
},
{
"model_type": "ServiceMetricRadioConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"radioType": "is5GHzL",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "ApSsid"
},
{
@@ -118,13 +118,6 @@
}
],
"Client": [
{
"model_type": "ServiceMetricRadioConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Client"
},
{
"model_type": "ServiceMetricRadioConfigParameters",
"samplingInterval": 30,
@@ -138,6 +131,13 @@
"reportingIntervalSeconds": 60,
"radioType": "is5GHzU",
"serviceMetricDataType": "Client"
},
{
"model_type": "ServiceMetricRadioConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Client"
}
],
"Channel": [
@@ -150,57 +150,21 @@
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzU",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
@@ -210,6 +174,42 @@
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzU",
"serviceMetricDataType": "Channel"
}
@@ -224,7 +224,19 @@
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"radioType": "is5GHzU",
"serviceMetricDataType": "Neighbour"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Neighbour"
},
{
@@ -248,7 +260,7 @@
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"radioType": "is5GHzL",
"serviceMetricDataType": "Neighbour"
},
{
@@ -263,18 +275,6 @@
"radioType": "is5GHzU",
"serviceMetricDataType": "Neighbour"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"serviceMetricDataType": "Neighbour"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
@@ -284,15 +284,15 @@
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzU",
"radioType": "is5GHzL",
"serviceMetricDataType": "Neighbour"
}
]
},
"profileType": "metrics"
},
"createdTimestamp": 1601335086248,
"lastModifiedTimestamp": 1601335086248,
"createdTimestamp": 1601961451756,
"lastModifiedTimestamp": 1601961451756,
"childProfileIds": []
}
]

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

@@ -1,7 +1,7 @@
[
{
"model_type": "Profile",
"id": 5555,
"id": 5,
"customerId": 2,
"profileType": "operator",
"name": "TipWlan-Hotspot20-Operator",
@@ -14,22 +14,24 @@
{
"model_type": "Hotspot20Duple",
"locale": "en_CA",
"language": "eng",
"friendlyName": "default Friendly Operator Name",
"formattedFriendlyName": "eng:default Friendly Operator Name"
"dupleIso3Language": "eng",
"dupleName": "Default friendly operator name",
"defaultDupleSeparator": ":",
"asDuple": "eng:Default friendly operator name"
},
{
"model_type": "Hotspot20Duple",
"locale": "fr_CA",
"language": "fra",
"friendlyName": "Nom de l'opérateur convivial par défaut",
"formattedFriendlyName": "fra:Nom de l'opérateur convivial par défaut"
"dupleIso3Language": "fra",
"dupleName": "Nom de l'opérateur convivial par défaut",
"defaultDupleSeparator": ":",
"asDuple": "fra:Nom de l'opérateur convivial par défaut"
}
],
"profileType": "operator"
},
"createdTimestamp": 1601595306885,
"lastModifiedTimestamp": 1601595306885,
"createdTimestamp": 1601961451776,
"lastModifiedTimestamp": 1601961451776,
"childProfileIds": []
}
]

10
opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileRadius.json
View File

@@ -4,7 +4,7 @@
"id": 1,
"customerId": 2,
"profileType": "radius",
"name": "RadiusProfileOttawa",
"name": "Radius-Profile",
"details": {
"model_type": "RadiusProfile",
"subnetConfiguration": null,
@@ -12,10 +12,10 @@
"Ottawa": {
"model_type": "RadiusServiceRegion",
"serverMap": {
"RadiusProfileOttawa": [
"Radius-Profile": [
{
"model_type": "RadiusServer",
"ipAddress": "localhost",
"ipAddress": "192.168.0.1",
"secret": "testing123",
"authPort": 1812,
"timeout": null
@@ -27,8 +27,8 @@
},
"profileType": "radius"
},
"createdTimestamp": 1591653174195,
"lastModifiedTimestamp": 1591653174195,
"createdTimestamp": 1601961451668,
"lastModifiedTimestamp": 1601961451668,
"childProfileIds": []
}
]

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

@@ -1,21 +1,20 @@
{
"model_type": "Profile",
"id": 9,
"id": 11,
"customerId": 2,
"profileType": "rf",
"name": "DefaultRf",
"name": "TipWlan-rf",
"details": {
"model_type": "RfConfiguration",
"rf": "Default-RF",
"profileType": "rf",
"rfConfigMap": {
"is2dot4GHz": {
"is5GHz": {
"model_type": "RfElementConfiguration",
"rf": "TipWlan-rf",
"beaconInterval": 100,
"forceScanDuringVoice": "disabled",
"rtsCtsThreshold": 65535,
"channelBandwidth": "is20MHz",
"mimoMode": "twoBytwo",
"channelBandwidth": "is80MHz",
"mimoMode": "twoByTwo",
"maxNumClients": 100,
"multicastRate": "auto",
"autoChannelSelection": false,
@@ -43,8 +42,68 @@
},
"eirpTxPower": {
"model_type": "AutoOrManualValue",
"auto": false,
"value": 32
"auto": true,
"value": 18
},
"bestApEnabled": null,
"neighbouringListApConfig": {
"model_type": "NeighbouringAPListConfiguration",
"minSignal": -85,
"maxAps": 25
},
"perimeterDetectionEnabled": true,
"channelHopSettings": {
"model_type": "ChannelHopSettings",
"noiseFloorThresholdInDB": -75,
"noiseFloorThresholdTimeInSeconds": 180,
"nonWifiThresholdInPercentage": 50,
"nonWifiThresholdTimeInSeconds": 180,
"obssHopMode": "NON_WIFI"
},
"bestApSettings": {
"model_type": "RadioBestApSettings",
"mlComputed": true,
"dropInSnrPercentage": 30,
"minLoadFactor": 40
}
},
"is2dot4GHz": {
"model_type": "RfElementConfiguration",
"rf": "TipWlan-rf",
"beaconInterval": 100,
"forceScanDuringVoice": "disabled",
"rtsCtsThreshold": 65535,
"channelBandwidth": "is20MHz",
"mimoMode": "twoByTwo",
"maxNumClients": 100,
"multicastRate": "auto",
"autoChannelSelection": false,
"activeScanSettings": {
"model_type": "ActiveScanSettings",
"enabled": true,
"scanFrequencySeconds": 10,
"scanDurationMillis": 65
},
"managementRate": "auto",
"rxCellSizeDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"probeResponseThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"clientDisconnectThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"eirpTxPower": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": 18
},
"bestApEnabled": null,
"neighbouringListApConfig": {
@@ -52,7 +111,6 @@
"minSignal": -85,
"maxAps": 25
},
"minAutoCellSize": -80,
"perimeterDetectionEnabled": true,
"channelHopSettings": {
"model_type": "ChannelHopSettings",
@@ -69,13 +127,14 @@
"minLoadFactor": 50
}
},
"is5GHz": {
"is5GHzU": {
"model_type": "RfElementConfiguration",
"rf": "TipWlan-rf",
"beaconInterval": 100,
"forceScanDuringVoice": "disabled",
"rtsCtsThreshold": 65535,
"channelBandwidth": "is80MHz",
"mimoMode": "twoBytwo",
"mimoMode": "twoByTwo",
"maxNumClients": 100,
"multicastRate": "auto",
"autoChannelSelection": false,
@@ -103,8 +162,8 @@
},
"eirpTxPower": {
"model_type": "AutoOrManualValue",
"auto": false,
"value": 32
"auto": true,
"value": 18
},
"bestApEnabled": null,
"neighbouringListApConfig": {
@@ -112,7 +171,6 @@
"minSignal": -85,
"maxAps": 25
},
"minAutoCellSize": -80,
"perimeterDetectionEnabled": true,
"channelHopSettings": {
"model_type": "ChannelHopSettings",
@@ -131,11 +189,12 @@
},
"is5GHzL": {
"model_type": "RfElementConfiguration",
"rf": "TipWlan-rf",
"beaconInterval": 100,
"forceScanDuringVoice": "disabled",
"rtsCtsThreshold": 65535,
"channelBandwidth": "is80MHz",
"mimoMode": "twoBytwo",
"mimoMode": "twoByTwo",
"maxNumClients": 100,
"multicastRate": "auto",
"autoChannelSelection": false,
@@ -163,8 +222,8 @@
},
"eirpTxPower": {
"model_type": "AutoOrManualValue",
"auto": false,
"value": 32
"auto": true,
"value": 18
},
"bestApEnabled": null,
"neighbouringListApConfig": {
@@ -172,67 +231,6 @@
"minSignal": -85,
"maxAps": 25
},
"minAutoCellSize": -80,
"perimeterDetectionEnabled": true,
"channelHopSettings": {
"model_type": "ChannelHopSettings",
"noiseFloorThresholdInDB": -75,
"noiseFloorThresholdTimeInSeconds": 180,
"nonWifiThresholdInPercentage": 50,
"nonWifiThresholdTimeInSeconds": 180,
"obssHopMode": "NON_WIFI"
},
"bestApSettings": {
"model_type": "RadioBestApSettings",
"mlComputed": true,
"dropInSnrPercentage": 30,
"minLoadFactor": 40
}
},
"is5GHzU": {
"model_type": "RfElementConfiguration",
"beaconInterval": 100,
"forceScanDuringVoice": "disabled",
"rtsCtsThreshold": 65535,
"channelBandwidth": "is80MHz",
"mimoMode": "twoBytwo",
"maxNumClients": 100,
"multicastRate": "auto",
"autoChannelSelection": false,
"activeScanSettings": {
"model_type": "ActiveScanSettings",
"enabled": true,
"scanFrequencySeconds": 10,
"scanDurationMillis": 65
},
"managementRate": "auto",
"rxCellSizeDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"probeResponseThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"clientDisconnectThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"eirpTxPower": {
"model_type": "AutoOrManualValue",
"auto": false,
"value": 32
},
"bestApEnabled": null,
"neighbouringListApConfig": {
"model_type": "NeighbouringAPListConfiguration",
"minSignal": -85,
"maxAps": 25
},
"minAutoCellSize": -80,
"perimeterDetectionEnabled": true,
"channelHopSettings": {
"model_type": "ChannelHopSettings",
@@ -250,9 +248,9 @@
}
}
},
"createdTimestamp": 1591653239983,
"lastModifiedTimestamp": 1591653239983,
"childProfileIds": [
]
}
"profileType": "rf"
},
"createdTimestamp": 1601961452390,
"lastModifiedTimestamp": 1601961452390,
"childProfileIds": []
}

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

@@ -1,20 +1,22 @@
[
{
"model_type": "Profile",
"id": 6,
"id": 9,
"customerId": 2,
"profileType": "ssid",
"name": "DefaultSsid-2g",
"name": "TipWlan-cloud-3-radios",
"details": {
"model_type": "SsidConfiguration",
"ssid": "Default-SSID-2g",
"ssid": "TipWlan-cloud-3-radios",
"appliedRadios": [
"is2dot4GHz"
"is5GHzU",
"is2dot4GHz",
"is5GHzL"
],
"ssidAdminState": "enabled",
"secureMode": "wpa2PSK",
"secureMode": "open",
"vlanId": 1,
"keyStr": "12345678",
"keyStr": null,
"broadcastSsid": "enabled",
"keyRefresh": 0,
"noLocalSubnets": false,
@@ -57,130 +59,11 @@
"forwardMode": null,
"profileType": "ssid"
},
"createdTimestamp": 1591653239983,
"lastModifiedTimestamp": 1591653239983,
"childProfileIds": []
},
{
"model_type": "Profile",
"id": 7,
"customerId": 2,
"profileType": "ssid",
"name": "DefaultSsid-5gl",
"details": {
"model_type": "SsidConfiguration",
"ssid": "Default-SSID-5gl",
"appliedRadios": [
"is5GHzL"
],
"ssidAdminState": "enabled",
"secureMode": "wpaEAP",
"vlanId": 1,
"keyStr": "12345678",
"broadcastSsid": "enabled",
"keyRefresh": 0,
"noLocalSubnets": false,
"radiusServiceName": "RadiusProfileOttawa",
"captivePortalId": null,
"bandwidthLimitDown": 0,
"bandwidthLimitUp": 0,
"videoTrafficOnly": false,
"radioBasedConfigs": {
"is5GHz": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is2dot4GHz": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is5GHzU": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is5GHzL": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
}
},
"bonjourGatewayProfileId": null,
"enable80211w": null,
"wepConfig": null,
"forwardMode": null,
"profileType": "ssid"
},
"createdTimestamp": 1591653240017,
"lastModifiedTimestamp": 1591654215374,
"createdTimestamp": 1601961452385,
"lastModifiedTimestamp": 1601961452385,
"childProfileIds": [
1
7,
8
]
},
{
"model_type": "Profile",
"id": 8,
"customerId": 2,
"profileType": "ssid",
"name": "DefaultSsid-5gu",
"details": {
"model_type": "SsidConfiguration",
"ssid": "Default-SSID-5gu",
"appliedRadios": [
"is5GHzU"
],
"ssidAdminState": "enabled",
"secureMode": "wpa2PSK",
"vlanId": 1,
"keyStr": "12345678",
"broadcastSsid": "enabled",
"keyRefresh": 0,
"noLocalSubnets": false,
"radiusServiceName": null,
"captivePortalId": null,
"bandwidthLimitDown": 0,
"bandwidthLimitUp": 0,
"videoTrafficOnly": false,
"radioBasedConfigs": {
"is5GHz": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is2dot4GHz": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is5GHzU": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is5GHzL": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
}
},
"bonjourGatewayProfileId": null,
"enable80211w": null,
"wepConfig": null,
"forwardMode": null,
"profileType": "ssid"
},
"createdTimestamp": 1591654301763,
"lastModifiedTimestamp": 1591654301763,
"childProfileIds": []
}
]

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

@@ -1,7 +1,7 @@
[
{
"model_type": "Profile",
"id": 6666,
"id": 6,
"customerId": 2,
"profileType": "venue",
"name": "TipWlan-Hotspot20-Venue",
@@ -10,19 +10,21 @@
"venueNameSet": [
{
"model_type": "VenueName",
"locale": "en_CA",
"language": "eng",
"venueName": "Example venue",
"venueUrl": "http://www.example.com/info-eng",
"formattedVenueName": "eng:Example venue"
"locale": "fr_CA",
"dupleIso3Language": "fra",
"dupleName": "Exemple de lieu",
"defaultDupleSeparator": ":",
"venueUrl": "http://www.example.com/info-fra",
"asDuple": "fra:Exemple de lieu"
},
{
"model_type": "VenueName",
"locale": "fr_CA",
"language": "fra",
"venueName": "Exemple de lieu",
"venueUrl": "http://www.example.com/info-fra",
"formattedVenueName": "fra:Exemple de lieu"
"locale": "en_CA",
"dupleIso3Language": "eng",
"dupleName": "Example venue",
"defaultDupleSeparator": ":",
"venueUrl": "http://www.example.com/info-eng",
"asDuple": "eng:Example venue"
}
],
"venueTypeAssignment": {
@@ -33,8 +35,8 @@
},
"profileType": "venue"
},
"createdTimestamp": 1601595306891,
"lastModifiedTimestamp": 1601595306891,
"createdTimestamp": 1601961451781,
"lastModifiedTimestamp": 1601961451781,
"childProfileIds": []
}
]

4
opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/run.sh
View File

@@ -36,7 +36,8 @@ OVSDB_APPROFILE_CONFIG_FILE="${OVSDB_AP_PROFILE_CONFIG_FILE:=/app/opensync/Profi
OVSDB_METRICSPROFILE_CONFIG_FILE="${OVSDB_METRICSPROFILE_CONFIG_FILE:=/app/opensync/ProfileMetrics.json}"
OVSDB_HOTSPOT20SPROFILE_CONFIG_FILE="${OVSDB_HOTSPOT20PROFILE_CONFIG_FILE:=/app/opensync/ProfileHotspot20.json}"
OVSDB_OPERATORPROFILE_CONFIG_FILE="${OVSDB_OPERATORPROFILE_CONFIG_FILE:=/app/opensync/ProfileOperator.json}"
OVSDB_VENUEPROFILE_CONFIG_FILE="${OVSDB_VENUESPROFILE_CONFIG_FILE:=/app/opensync/ProfileVenue.json}"
OVSDB_VENUEPROFILE_CONFIG_FILE="${OVSDB_VENUEPROFILE_CONFIG_FILE:=/app/opensync/ProfileVenue.json}"
OVSDB_IDPROVIDERPROFILE_CONFIG_FILE="${OVSDB_IDPROVIDERPROFILE_CONFIG_FILE:=/app/opensync/ProfileIdProvider.json}"
OVSDB_RFPROFILE_CONFIG_FILE="${OVSDB_RF_PROFILE_CONFIG_FILE:=/app/opensync/ProfileRf.json}"
OVSDB_SSIDPROFILE_CONFIG_FILE="${OVSDB_SSIDPROFILE_CONFIG_FILE:=/app/opensync/ProfileSsid.json}"
OVSDB_LOCATION_CONFIG_FILE="${OVSDB_LOCATION_CONFIG_FILE:=/app/opensync/LocationBuildingExample.json}"
@@ -140,6 +141,7 @@ OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.metricsProfileFileName=$OVSDB_METRICS
OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.hotspot20ProfileFileName=$OVSDB_HOTSPOT20PROFILE_CONFIG_FILE"
OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.operatorProfileFileName=$OVSDB_OPERATORPROFILE_CONFIG_FILE"
OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.venueProfileFileName=$OVSDB_VENUEPROFILE_CONFIG_FILE"
OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.idProviderProfileFileName=$OVSDB_IDPROVIDERPROFILE_CONFIG_FILE"
OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.rfProfileFileName=$OVSDB_RFPROFILE_CONFIG_FILE"
OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.preventClientCnAlteration=$OVSDB_PREVENT_CLIENTCN_ALTERATION"
OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.ssidProfileFileName=$OVSDB_SSIDPROFILE_CONFIG_FILE"

1
opensync-gateway-static-docker/src/main/docker/Dockerfile
View File

@@ -18,6 +18,7 @@ COPY app/opensync/ProfileRf.json /app/opensync/ProfileRf.json
COPY app/opensync/ProfileHotspot20.json /app/opensync/ProfileHotspot20.json
COPY app/opensync/ProfileOperator.json /app/opensync/ProfileOperator.json
COPY app/opensync/ProfileVenue.json /app/opensync/ProfileVenue.json
COPY app/opensync/ProfileIdProvider.json /app/opensync/ProfileIdProvider.json
RUN chmod +x /app/run.sh

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

@@ -1,9 +1,9 @@
{
"model_type": "Profile",
"id": 5,
"id": 15,
"customerId": 2,
"profileType": "equipment_ap",
"name": "DefaultApProfile",
"name": "ApProfile-3-radios",
"details": {
"model_type": "ApNetworkConfiguration",
"networkConfigVersion": "AP-1",
@@ -21,11 +21,6 @@
"ledControlEnabled": true,
"equipmentDiscovery": false,
"radioMap": {
"is5GHz": {
"model_type": "RadioProfileConfiguration",
"bestApEnabled": true,
"bestAPSteerType": "both"
},
"is2dot4GHz": {
"model_type": "RadioProfileConfiguration",
"bestApEnabled": true,
@@ -44,12 +39,11 @@
},
"profileType": "equipment_ap"
},
"createdTimestamp": 1591653239947,
"lastModifiedTimestamp": 1591654336724,
"createdTimestamp": 1601961452652,
"lastModifiedTimestamp": 1601961452652,
"childProfileIds": [
6,
7,
8,
9
2,
9,
11
]
}

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

@@ -1,7 +1,7 @@
[
{
"model_type": "Profile",
"id": 7777,
"id": 8,
"customerId": 2,
"profileType": "hotspot_2pt0",
"name": "TipWlan-Hotspot20-Config",
@@ -43,13 +43,32 @@
"gasAddr3Behaviour": "p2pSpecWorkaroundFromRequest",
"anqpDomainId": 1234,
"disableDownstreamGroupAddressedForwarding": false,
"profileType": "hotspot_2pt0"
"enable2pt4GHz": true,
"enable5GHz": true,
"associatedSsids": [
"TipWlan-cloud-3-radios"
],
"mccMnc3gppCellularNetworkInfo": [
{
"model_type": "MccMnc",
"mcc": 302,
"mnc": 720,
"iso": "ca",
"country": "Canada",
"countryCode": 1,
"network": "Rogers AT&T Wireless",
"mccMncPairing": "302,720"
}
],
"profileType": "hotspot_2pt0",
"mccMncList": "302,720"
},
"createdTimestamp": 1601595307355,
"lastModifiedTimestamp": 1601595307355,
"createdTimestamp": 1601961452370,
"lastModifiedTimestamp": 1601961452370,
"childProfileIds": [
5555,
6666
5,
6,
7
]
}
]

98
opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileIdProvider.json Normal file
View File

@@ -0,0 +1,98 @@
[
{
"model_type": "Profile",
"id": 7,
"customerId": 2,
"profileType": "id_provider",
"name": "TipWlan-Hotspot20-OSU-Provider",
"details": {
"model_type": "Hotspot20IdProviderProfile",
"domainName": "example.com",
"mccMncList": [
{
"model_type": "MccMnc",
"mcc": 302,
"mnc": 720,
"iso": "ca",
"country": "Canada",
"countryCode": 1,
"network": "Rogers AT&T Wireless",
"mccMncPairing": "302,720"
}
],
"naiRealmList": [
{
"model_type": "NaiRealmInformation",
"naiRealms": [
"example.net",
"example.com"
],
"encoding": 0,
"eapMethods": [
"EAP-TLS with certificate"
],
"eapMap": {
"EAP-TLS with certificate": [
"Softoken",
"Certificate"
]
}
}
],
"osuIconList": [
{
"model_type": "OsuIcon",
"iconWidth": 32,
"iconHeight": 32,
"languageCode": "eng",
"iconLocale": "en_CA",
"iconName": "icon32.png",
"filePath": "/tmp/icon32.png",
"hs20IconString": "32:32:eng:image/png:icon32.png:/tmp/icon32.png"
}
],
"radiusProfileAuth": "Radius-Profile",
"radiusProfileAccounting": "Radius-Profile",
"osuSsid": "TipWlan-cloud-3-radios",
"osuServerUri": "https://example.com/osu/",
"osuFriendlyName": {
"model_type": "Hotspot20Duple",
"locale": "en_CA",
"dupleIso3Language": "eng",
"dupleName": "Example provider",
"defaultDupleSeparator": ":",
"asDuple": "eng:Example provider"
},
"osuNaiStandalone": "anonymous@example.com",
"osuNaiShared": "anonymous@example.com",
"osuMethodList": [
1,
0
],
"osuServiceDescription": [
{
"model_type": "Hotspot20Duple",
"locale": "en_CA",
"dupleIso3Language": "eng",
"dupleName": "Example services",
"defaultDupleSeparator": ":",
"asDuple": "eng:Example services"
},
{
"model_type": "Hotspot20Duple",
"locale": "fr_CA",
"dupleIso3Language": "fra",
"dupleName": "Exemples de services",
"defaultDupleSeparator": ":",
"asDuple": "fra:Exemples de services"
}
],
"profileType": "id_provider"
},
"createdTimestamp": 1601961451981,
"lastModifiedTimestamp": 1601961451981,
"childProfileIds": [
1
]
}
]

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

@@ -1,16 +1,16 @@
[
{
"model_type": "Profile",
"id": 333,
"id": 2,
"customerId": 2,
"profileType": "metrics",
"name": "Metrics-Profile-3-radios",
"details": {
"model_type": "ServiceMetricsCollectionConfigProfile",
"radioTypes": [
"is5GHzL",
"is5GHzU",
"is2dot4GHz",
"is5GHzU"
"is5GHzL"
],
"serviceMetricDataTypes": [
"ApNode",
@@ -30,19 +30,7 @@
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzU",
"serviceMetricDataType": "ApNode"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "ApNode"
},
{
@@ -60,20 +48,20 @@
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"radioType": "is5GHzU",
"serviceMetricDataType": "ApNode"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
@@ -92,6 +80,18 @@
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "ApNode"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"serviceMetricDataType": "ApNode"
}
],
"ApSsid": [
@@ -99,14 +99,14 @@
"model_type": "ServiceMetricRadioConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"radioType": "is2dot4GHz",
"radioType": "is5GHzL",
"serviceMetricDataType": "ApSsid"
},
{
"model_type": "ServiceMetricRadioConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"radioType": "is5GHzL",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "ApSsid"
},
{
@@ -118,13 +118,6 @@
}
],
"Client": [
{
"model_type": "ServiceMetricRadioConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Client"
},
{
"model_type": "ServiceMetricRadioConfigParameters",
"samplingInterval": 30,
@@ -138,6 +131,13 @@
"reportingIntervalSeconds": 60,
"radioType": "is5GHzU",
"serviceMetricDataType": "Client"
},
{
"model_type": "ServiceMetricRadioConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Client"
}
],
"Channel": [
@@ -150,57 +150,21 @@
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzU",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
@@ -210,6 +174,42 @@
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzU",
"serviceMetricDataType": "Channel"
}
@@ -224,7 +224,19 @@
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"radioType": "is5GHzU",
"serviceMetricDataType": "Neighbour"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Neighbour"
},
{
@@ -248,7 +260,7 @@
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"radioType": "is5GHzL",
"serviceMetricDataType": "Neighbour"
},
{
@@ -263,18 +275,6 @@
"radioType": "is5GHzU",
"serviceMetricDataType": "Neighbour"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"serviceMetricDataType": "Neighbour"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
@@ -284,15 +284,15 @@
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzU",
"radioType": "is5GHzL",
"serviceMetricDataType": "Neighbour"
}
]
},
"profileType": "metrics"
},
"createdTimestamp": 1601335086248,
"lastModifiedTimestamp": 1601335086248,
"createdTimestamp": 1601961451756,
"lastModifiedTimestamp": 1601961451756,
"childProfileIds": []
}
]

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

@@ -1,7 +1,7 @@
[
{
"model_type": "Profile",
"id": 5555,
"id": 5,
"customerId": 2,
"profileType": "operator",
"name": "TipWlan-Hotspot20-Operator",
@@ -14,22 +14,24 @@
{
"model_type": "Hotspot20Duple",
"locale": "en_CA",
"language": "eng",
"friendlyName": "default Friendly Operator Name",
"formattedFriendlyName": "eng:default Friendly Operator Name"
"dupleIso3Language": "eng",
"dupleName": "Default friendly operator name",
"defaultDupleSeparator": ":",
"asDuple": "eng:Default friendly operator name"
},
{
"model_type": "Hotspot20Duple",
"locale": "fr_CA",
"language": "fra",
"friendlyName": "Nom de l'opérateur convivial par défaut",
"formattedFriendlyName": "fra:Nom de l'opérateur convivial par défaut"
"dupleIso3Language": "fra",
"dupleName": "Nom de l'opérateur convivial par défaut",
"defaultDupleSeparator": ":",
"asDuple": "fra:Nom de l'opérateur convivial par défaut"
}
],
"profileType": "operator"
},
"createdTimestamp": 1601595306885,
"lastModifiedTimestamp": 1601595306885,
"createdTimestamp": 1601961451776,
"lastModifiedTimestamp": 1601961451776,
"childProfileIds": []
}
]

10
opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileRadius.json
View File

@@ -4,7 +4,7 @@
"id": 1,
"customerId": 2,
"profileType": "radius",
"name": "RadiusProfileOttawa",
"name": "Radius-Profile",
"details": {
"model_type": "RadiusProfile",
"subnetConfiguration": null,
@@ -12,10 +12,10 @@
"Ottawa": {
"model_type": "RadiusServiceRegion",
"serverMap": {
"RadiusProfileOttawa": [
"Radius-Profile": [
{
"model_type": "RadiusServer",
"ipAddress": "localhost",
"ipAddress": "192.168.0.1",
"secret": "testing123",
"authPort": 1812,
"timeout": null
@@ -27,8 +27,8 @@
},
"profileType": "radius"
},
"createdTimestamp": 1591653174195,
"lastModifiedTimestamp": 1591653174195,
"createdTimestamp": 1601961451668,
"lastModifiedTimestamp": 1601961451668,
"childProfileIds": []
}
]

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

@@ -1,21 +1,20 @@
{
"model_type": "Profile",
"id": 9,
"id": 11,
"customerId": 2,
"profileType": "rf",
"name": "DefaultRf",
"name": "TipWlan-rf",
"details": {
"model_type": "RfConfiguration",
"rf": "Default-RF",
"profileType": "rf",
"rfConfigMap": {
"is2dot4GHz": {
"is5GHz": {
"model_type": "RfElementConfiguration",
"rf": "TipWlan-rf",
"beaconInterval": 100,
"forceScanDuringVoice": "disabled",
"rtsCtsThreshold": 65535,
"channelBandwidth": "is20MHz",
"mimoMode": "twoBytwo",
"channelBandwidth": "is80MHz",
"mimoMode": "twoByTwo",
"maxNumClients": 100,
"multicastRate": "auto",
"autoChannelSelection": false,
@@ -43,8 +42,68 @@
},
"eirpTxPower": {
"model_type": "AutoOrManualValue",
"auto": false,
"value": 32
"auto": true,
"value": 18
},
"bestApEnabled": null,
"neighbouringListApConfig": {
"model_type": "NeighbouringAPListConfiguration",
"minSignal": -85,
"maxAps": 25
},
"perimeterDetectionEnabled": true,
"channelHopSettings": {
"model_type": "ChannelHopSettings",
"noiseFloorThresholdInDB": -75,
"noiseFloorThresholdTimeInSeconds": 180,
"nonWifiThresholdInPercentage": 50,
"nonWifiThresholdTimeInSeconds": 180,
"obssHopMode": "NON_WIFI"
},
"bestApSettings": {
"model_type": "RadioBestApSettings",
"mlComputed": true,
"dropInSnrPercentage": 30,
"minLoadFactor": 40
}
},
"is2dot4GHz": {
"model_type": "RfElementConfiguration",
"rf": "TipWlan-rf",
"beaconInterval": 100,
"forceScanDuringVoice": "disabled",
"rtsCtsThreshold": 65535,
"channelBandwidth": "is20MHz",
"mimoMode": "twoByTwo",
"maxNumClients": 100,
"multicastRate": "auto",
"autoChannelSelection": false,
"activeScanSettings": {
"model_type": "ActiveScanSettings",
"enabled": true,
"scanFrequencySeconds": 10,
"scanDurationMillis": 65
},
"managementRate": "auto",
"rxCellSizeDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"probeResponseThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"clientDisconnectThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"eirpTxPower": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": 18
},
"bestApEnabled": null,
"neighbouringListApConfig": {
@@ -52,7 +111,6 @@
"minSignal": -85,
"maxAps": 25
},
"minAutoCellSize": -80,
"perimeterDetectionEnabled": true,
"channelHopSettings": {
"model_type": "ChannelHopSettings",
@@ -69,13 +127,14 @@
"minLoadFactor": 50
}
},
"is5GHz": {
"is5GHzU": {
"model_type": "RfElementConfiguration",
"rf": "TipWlan-rf",
"beaconInterval": 100,
"forceScanDuringVoice": "disabled",
"rtsCtsThreshold": 65535,
"channelBandwidth": "is80MHz",
"mimoMode": "twoBytwo",
"mimoMode": "twoByTwo",
"maxNumClients": 100,
"multicastRate": "auto",
"autoChannelSelection": false,
@@ -103,8 +162,8 @@
},
"eirpTxPower": {
"model_type": "AutoOrManualValue",
"auto": false,
"value": 32
"auto": true,
"value": 18
},
"bestApEnabled": null,
"neighbouringListApConfig": {
@@ -112,7 +171,6 @@
"minSignal": -85,
"maxAps": 25
},
"minAutoCellSize": -80,
"perimeterDetectionEnabled": true,
"channelHopSettings": {
"model_type": "ChannelHopSettings",
@@ -131,11 +189,12 @@
},
"is5GHzL": {
"model_type": "RfElementConfiguration",
"rf": "TipWlan-rf",
"beaconInterval": 100,
"forceScanDuringVoice": "disabled",
"rtsCtsThreshold": 65535,
"channelBandwidth": "is80MHz",
"mimoMode": "twoBytwo",
"mimoMode": "twoByTwo",
"maxNumClients": 100,
"multicastRate": "auto",
"autoChannelSelection": false,
@@ -163,8 +222,8 @@
},
"eirpTxPower": {
"model_type": "AutoOrManualValue",
"auto": false,
"value": 32
"auto": true,
"value": 18
},
"bestApEnabled": null,
"neighbouringListApConfig": {
@@ -172,67 +231,6 @@
"minSignal": -85,
"maxAps": 25
},
"minAutoCellSize": -80,
"perimeterDetectionEnabled": true,
"channelHopSettings": {
"model_type": "ChannelHopSettings",
"noiseFloorThresholdInDB": -75,
"noiseFloorThresholdTimeInSeconds": 180,
"nonWifiThresholdInPercentage": 50,
"nonWifiThresholdTimeInSeconds": 180,
"obssHopMode": "NON_WIFI"
},
"bestApSettings": {
"model_type": "RadioBestApSettings",
"mlComputed": true,
"dropInSnrPercentage": 30,
"minLoadFactor": 40
}
},
"is5GHzU": {
"model_type": "RfElementConfiguration",
"beaconInterval": 100,
"forceScanDuringVoice": "disabled",
"rtsCtsThreshold": 65535,
"channelBandwidth": "is80MHz",
"mimoMode": "twoBytwo",
"maxNumClients": 100,
"multicastRate": "auto",
"autoChannelSelection": false,
"activeScanSettings": {
"model_type": "ActiveScanSettings",
"enabled": true,
"scanFrequencySeconds": 10,
"scanDurationMillis": 65
},
"managementRate": "auto",
"rxCellSizeDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"probeResponseThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"clientDisconnectThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"eirpTxPower": {
"model_type": "AutoOrManualValue",
"auto": false,
"value": 32
},
"bestApEnabled": null,
"neighbouringListApConfig": {
"model_type": "NeighbouringAPListConfiguration",
"minSignal": -85,
"maxAps": 25
},
"minAutoCellSize": -80,
"perimeterDetectionEnabled": true,
"channelHopSettings": {
"model_type": "ChannelHopSettings",
@@ -250,9 +248,9 @@
}
}
},
"createdTimestamp": 1591653239983,
"lastModifiedTimestamp": 1591653239983,
"childProfileIds": [
]
}
"profileType": "rf"
},
"createdTimestamp": 1601961452390,
"lastModifiedTimestamp": 1601961452390,
"childProfileIds": []
}

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

@@ -1,20 +1,22 @@
[
{
"model_type": "Profile",
"id": 6,
"id": 9,
"customerId": 2,
"profileType": "ssid",
"name": "DefaultSsid-2g",
"name": "TipWlan-cloud-3-radios",
"details": {
"model_type": "SsidConfiguration",
"ssid": "Default-SSID-2g",
"ssid": "TipWlan-cloud-3-radios",
"appliedRadios": [
"is2dot4GHz"
"is5GHzU",
"is2dot4GHz",
"is5GHzL"
],
"ssidAdminState": "enabled",
"secureMode": "wpa2PSK",
"secureMode": "open",
"vlanId": 1,
"keyStr": "12345678",
"keyStr": null,
"broadcastSsid": "enabled",
"keyRefresh": 0,
"noLocalSubnets": false,
@@ -57,130 +59,11 @@
"forwardMode": null,
"profileType": "ssid"
},
"createdTimestamp": 1591653239983,
"lastModifiedTimestamp": 1591653239983,
"childProfileIds": []
},
{
"model_type": "Profile",
"id": 7,
"customerId": 2,
"profileType": "ssid",
"name": "DefaultSsid-5gl",
"details": {
"model_type": "SsidConfiguration",
"ssid": "Default-SSID-5gl",
"appliedRadios": [
"is5GHzL"
],
"ssidAdminState": "enabled",
"secureMode": "wpaEAP",
"vlanId": 1,
"keyStr": "12345678",
"broadcastSsid": "enabled",
"keyRefresh": 0,
"noLocalSubnets": false,
"radiusServiceName": "RadiusProfileOttawa",
"captivePortalId": null,
"bandwidthLimitDown": 0,
"bandwidthLimitUp": 0,
"videoTrafficOnly": false,
"radioBasedConfigs": {
"is5GHz": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is2dot4GHz": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is5GHzU": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is5GHzL": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
}
},
"bonjourGatewayProfileId": null,
"enable80211w": null,
"wepConfig": null,
"forwardMode": null,
"profileType": "ssid"
},
"createdTimestamp": 1591653240017,
"lastModifiedTimestamp": 1591654215374,
"createdTimestamp": 1601961452385,
"lastModifiedTimestamp": 1601961452385,
"childProfileIds": [
1
7,
8
]
},
{
"model_type": "Profile",
"id": 8,
"customerId": 2,
"profileType": "ssid",
"name": "DefaultSsid-5gu",
"details": {
"model_type": "SsidConfiguration",
"ssid": "Default-SSID-5gu",
"appliedRadios": [
"is5GHzU"
],
"ssidAdminState": "enabled",
"secureMode": "wpa2PSK",
"vlanId": 1,
"keyStr": "12345678",
"broadcastSsid": "enabled",
"keyRefresh": 0,
"noLocalSubnets": false,
"radiusServiceName": null,
"captivePortalId": null,
"bandwidthLimitDown": 0,
"bandwidthLimitUp": 0,
"videoTrafficOnly": false,
"radioBasedConfigs": {
"is5GHz": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is2dot4GHz": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is5GHzU": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is5GHzL": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
}
},
"bonjourGatewayProfileId": null,
"enable80211w": null,
"wepConfig": null,
"forwardMode": null,
"profileType": "ssid"
},
"createdTimestamp": 1591654301763,
"lastModifiedTimestamp": 1591654301763,
"childProfileIds": []
}
]

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

@@ -1,7 +1,7 @@
[
{
"model_type": "Profile",
"id": 6666,
"id": 6,
"customerId": 2,
"profileType": "venue",
"name": "TipWlan-Hotspot20-Venue",
@@ -10,19 +10,21 @@
"venueNameSet": [
{
"model_type": "VenueName",
"locale": "en_CA",
"language": "eng",
"venueName": "Example venue",
"venueUrl": "http://www.example.com/info-eng",
"formattedVenueName": "eng:Example venue"
"locale": "fr_CA",
"dupleIso3Language": "fra",
"dupleName": "Exemple de lieu",
"defaultDupleSeparator": ":",
"venueUrl": "http://www.example.com/info-fra",
"asDuple": "fra:Exemple de lieu"
},
{
"model_type": "VenueName",
"locale": "fr_CA",
"language": "fra",
"venueName": "Exemple de lieu",
"venueUrl": "http://www.example.com/info-fra",
"formattedVenueName": "fra:Exemple de lieu"
"locale": "en_CA",
"dupleIso3Language": "eng",
"dupleName": "Example venue",
"defaultDupleSeparator": ":",
"venueUrl": "http://www.example.com/info-eng",
"asDuple": "eng:Example venue"
}
],
"venueTypeAssignment": {
@@ -33,8 +35,8 @@
},
"profileType": "venue"
},
"createdTimestamp": 1601595306891,
"lastModifiedTimestamp": 1601595306891,
"createdTimestamp": 1601961451781,
"lastModifiedTimestamp": 1601961451781,
"childProfileIds": []
}
]

1
opensync-gateway-static-docker/src/main/docker/app/run.sh
View File

@@ -25,6 +25,7 @@ OVSDB_PROPS+=" -Dtip.wlan.ovsdb.metricsProfileFileName=$OVSDB_METRICSPROFILE_CON
OVSDB_PROPS+=" -Dtip.wlan.ovsdb.hotspot20ProfileFileName=$OVSDB_HOTSPOT20PROFILE_CONFIG_FILE"
OVSDB_PROPS+=" -Dtip.wlan.ovsdb.operatorProfileFileName=$OVSDB_OPERATORPROFILE_CONFIG_FILE"
OVSDB_PROPS+=" -Dtip.wlan.ovsdb.venueProfileFileName=$OVSDB_VENUEPROFILE_CONFIG_FILE"
OVSDB_PROPS+=" -Dtip.wlan.ovsdb.idProviderProfileFileName=$OVSDB_IDPROVIDERPROFILE_CONFIG_FILE"
OVSDB_PROPS+=" -Dtip.wlan.ovsdb.rfProfileFileName=$OVSDB_RFPROFILE_CONFIG_FILE"
OVSDB_PROPS+=" -Dtip.wlan.ovsdb.ssidProfileFileName=$OVSDB_SSIDPROFILE_CONFIG_FILE"
OVSDB_PROPS+=" -Dtip.wlan.preventClientCnAlteration=$OVSDB_PREVENT_CLIENTCN_ALTERATION"

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

@@ -1,9 +1,9 @@
{
"model_type": "Profile",
"id": 5,
"id": 15,
"customerId": 2,
"profileType": "equipment_ap",
"name": "DefaultApProfile",
"name": "ApProfile-3-radios",
"details": {
"model_type": "ApNetworkConfiguration",
"networkConfigVersion": "AP-1",
@@ -21,11 +21,6 @@
"ledControlEnabled": true,
"equipmentDiscovery": false,
"radioMap": {
"is5GHz": {
"model_type": "RadioProfileConfiguration",
"bestApEnabled": true,
"bestAPSteerType": "both"
},
"is2dot4GHz": {
"model_type": "RadioProfileConfiguration",
"bestApEnabled": true,
@@ -44,11 +39,11 @@
},
"profileType": "equipment_ap"
},
"createdTimestamp": 1591653239947,
"lastModifiedTimestamp": 1591654336724,
"createdTimestamp": 1601961452652,
"lastModifiedTimestamp": 1601961452652,
"childProfileIds": [
6,
7,
8
2,
9,
11
]
}

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

@@ -1,7 +1,7 @@
[
{
"model_type": "Profile",
"id": 7777,
"id": 8,
"customerId": 2,
"profileType": "hotspot_2pt0",
"name": "TipWlan-Hotspot20-Config",
@@ -43,13 +43,32 @@
"gasAddr3Behaviour": "p2pSpecWorkaroundFromRequest",
"anqpDomainId": 1234,
"disableDownstreamGroupAddressedForwarding": false,
"profileType": "hotspot_2pt0"
"enable2pt4GHz": true,
"enable5GHz": true,
"associatedSsids": [
"TipWlan-cloud-3-radios"
],
"mccMnc3gppCellularNetworkInfo": [
{
"model_type": "MccMnc",
"mcc": 302,
"mnc": 720,
"iso": "ca",
"country": "Canada",
"countryCode": 1,
"network": "Rogers AT&T Wireless",
"mccMncPairing": "302,720"
}
],
"profileType": "hotspot_2pt0",
"mccMncList": "302,720"
},
"createdTimestamp": 1601595307355,
"lastModifiedTimestamp": 1601595307355,
"createdTimestamp": 1601961452370,
"lastModifiedTimestamp": 1601961452370,
"childProfileIds": [
5555,
6666
5,
6,
7
]
}
]

98
opensync-gateway-static-process/src/main/resources/app/opensync/ProfileIdProvider.json Normal file
View File

@@ -0,0 +1,98 @@
[
{
"model_type": "Profile",
"id": 7,
"customerId": 2,
"profileType": "id_provider",
"name": "TipWlan-Hotspot20-OSU-Provider",
"details": {
"model_type": "Hotspot20IdProviderProfile",
"domainName": "example.com",
"mccMncList": [
{
"model_type": "MccMnc",
"mcc": 302,
"mnc": 720,
"iso": "ca",
"country": "Canada",
"countryCode": 1,
"network": "Rogers AT&T Wireless",
"mccMncPairing": "302,720"
}
],
"naiRealmList": [
{
"model_type": "NaiRealmInformation",
"naiRealms": [
"example.net",
"example.com"
],
"encoding": 0,
"eapMethods": [
"EAP-TLS with certificate"
],
"eapMap": {
"EAP-TLS with certificate": [
"Softoken",
"Certificate"
]
}
}
],
"osuIconList": [
{
"model_type": "OsuIcon",
"iconWidth": 32,
"iconHeight": 32,
"languageCode": "eng",
"iconLocale": "en_CA",
"iconName": "icon32.png",
"filePath": "/tmp/icon32.png",
"hs20IconString": "32:32:eng:image/png:icon32.png:/tmp/icon32.png"
}
],
"radiusProfileAuth": "Radius-Profile",
"radiusProfileAccounting": "Radius-Profile",
"osuSsid": "TipWlan-cloud-3-radios",
"osuServerUri": "https://example.com/osu/",
"osuFriendlyName": {
"model_type": "Hotspot20Duple",
"locale": "en_CA",
"dupleIso3Language": "eng",
"dupleName": "Example provider",
"defaultDupleSeparator": ":",
"asDuple": "eng:Example provider"
},
"osuNaiStandalone": "anonymous@example.com",
"osuNaiShared": "anonymous@example.com",
"osuMethodList": [
1,
0
],
"osuServiceDescription": [
{
"model_type": "Hotspot20Duple",
"locale": "en_CA",
"dupleIso3Language": "eng",
"dupleName": "Example services",
"defaultDupleSeparator": ":",
"asDuple": "eng:Example services"
},
{
"model_type": "Hotspot20Duple",
"locale": "fr_CA",
"dupleIso3Language": "fra",
"dupleName": "Exemples de services",
"defaultDupleSeparator": ":",
"asDuple": "fra:Exemples de services"
}
],
"profileType": "id_provider"
},
"createdTimestamp": 1601961451981,
"lastModifiedTimestamp": 1601961451981,
"childProfileIds": [
1
]
}
]

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

@@ -1,16 +1,16 @@
[
{
"model_type": "Profile",
"id": 333,
"id": 2,
"customerId": 2,
"profileType": "metrics",
"name": "Metrics-Profile-3-radios",
"details": {
"model_type": "ServiceMetricsCollectionConfigProfile",
"radioTypes": [
"is5GHzL",
"is5GHzU",
"is2dot4GHz",
"is5GHzU"
"is5GHzL"
],
"serviceMetricDataTypes": [
"ApNode",
@@ -30,19 +30,7 @@
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzU",
"serviceMetricDataType": "ApNode"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "ApNode"
},
{
@@ -60,20 +48,20 @@
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"radioType": "is5GHzU",
"serviceMetricDataType": "ApNode"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
@@ -92,6 +80,18 @@
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "ApNode"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"serviceMetricDataType": "ApNode"
}
],
"ApSsid": [
@@ -99,14 +99,14 @@
"model_type": "ServiceMetricRadioConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"radioType": "is2dot4GHz",
"radioType": "is5GHzL",
"serviceMetricDataType": "ApSsid"
},
{
"model_type": "ServiceMetricRadioConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"radioType": "is5GHzL",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "ApSsid"
},
{
@@ -118,13 +118,6 @@
}
],
"Client": [
{
"model_type": "ServiceMetricRadioConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Client"
},
{
"model_type": "ServiceMetricRadioConfigParameters",
"samplingInterval": 30,
@@ -138,6 +131,13 @@
"reportingIntervalSeconds": 60,
"radioType": "is5GHzU",
"serviceMetricDataType": "Client"
},
{
"model_type": "ServiceMetricRadioConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Client"
}
],
"Channel": [
@@ -150,57 +150,21 @@
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzU",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
@@ -210,6 +174,42 @@
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 120,
"channelSurveyType": "OFF_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"serviceMetricDataType": "Channel"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzU",
"serviceMetricDataType": "Channel"
}
@@ -224,7 +224,19 @@
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"radioType": "is5GHzU",
"serviceMetricDataType": "Neighbour"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"serviceMetricDataType": "Neighbour"
},
{
@@ -248,7 +260,7 @@
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is2dot4GHz",
"radioType": "is5GHzL",
"serviceMetricDataType": "Neighbour"
},
{
@@ -263,18 +275,6 @@
"radioType": "is5GHzU",
"serviceMetricDataType": "Neighbour"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
"reportingIntervalSeconds": 60,
"channelSurveyType": "ON_CHANNEL",
"scanIntervalMillis": 0,
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzL",
"serviceMetricDataType": "Neighbour"
},
{
"model_type": "ServiceMetricSurveyConfigParameters",
"samplingInterval": 30,
@@ -284,15 +284,15 @@
"percentUtilizationThreshold": 10,
"delayMillisecondsThreshold": 600,
"statsReportFormat": "RAW",
"radioType": "is5GHzU",
"radioType": "is5GHzL",
"serviceMetricDataType": "Neighbour"
}
]
},
"profileType": "metrics"
},
"createdTimestamp": 1601335086248,
"lastModifiedTimestamp": 1601335086248,
"createdTimestamp": 1601961451756,
"lastModifiedTimestamp": 1601961451756,
"childProfileIds": []
}
]

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

@@ -1,7 +1,7 @@
[
{
"model_type": "Profile",
"id": 5555,
"id": 5,
"customerId": 2,
"profileType": "operator",
"name": "TipWlan-Hotspot20-Operator",
@@ -14,22 +14,24 @@
{
"model_type": "Hotspot20Duple",
"locale": "en_CA",
"language": "eng",
"friendlyName": "default Friendly Operator Name",
"formattedFriendlyName": "eng:default Friendly Operator Name"
"dupleIso3Language": "eng",
"dupleName": "Default friendly operator name",
"defaultDupleSeparator": ":",
"asDuple": "eng:Default friendly operator name"
},
{
"model_type": "Hotspot20Duple",
"locale": "fr_CA",
"language": "fra",
"friendlyName": "Nom de l'opérateur convivial par défaut",
"formattedFriendlyName": "fra:Nom de l'opérateur convivial par défaut"
"dupleIso3Language": "fra",
"dupleName": "Nom de l'opérateur convivial par défaut",
"defaultDupleSeparator": ":",
"asDuple": "fra:Nom de l'opérateur convivial par défaut"
}
],
"profileType": "operator"
},
"createdTimestamp": 1601595306885,
"lastModifiedTimestamp": 1601595306885,
"createdTimestamp": 1601961451776,
"lastModifiedTimestamp": 1601961451776,
"childProfileIds": []
}
]

10
opensync-gateway-static-process/src/main/resources/app/opensync/ProfileRadius.json
View File

@@ -4,7 +4,7 @@
"id": 1,
"customerId": 2,
"profileType": "radius",
"name": "RadiusProfileOttawa",
"name": "Radius-Profile",
"details": {
"model_type": "RadiusProfile",
"subnetConfiguration": null,
@@ -12,10 +12,10 @@
"Ottawa": {
"model_type": "RadiusServiceRegion",
"serverMap": {
"RadiusProfileOttawa": [
"Radius-Profile": [
{
"model_type": "RadiusServer",
"ipAddress": "localhost",
"ipAddress": "192.168.0.1",
"secret": "testing123",
"authPort": 1812,
"timeout": null
@@ -27,8 +27,8 @@
},
"profileType": "radius"
},
"createdTimestamp": 1591653174195,
"lastModifiedTimestamp": 1591653174195,
"createdTimestamp": 1601961451668,
"lastModifiedTimestamp": 1601961451668,
"childProfileIds": []
}
]

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

@@ -1,21 +1,80 @@
{
"model_type": "Profile",
"id": 9,
"id": 11,
"customerId": 2,
"profileType": "rf",
"name": "DefaultRf",
"name": "TipWlan-rf",
"details": {
"model_type": "RfConfiguration",
"rf": "Default-RF",
"profileType": "rf",
"rfConfigMap": {
"is5GHz": {
"model_type": "RfElementConfiguration",
"rf": "TipWlan-rf",
"beaconInterval": 100,
"forceScanDuringVoice": "disabled",
"rtsCtsThreshold": 65535,
"channelBandwidth": "is80MHz",
"mimoMode": "twoByTwo",
"maxNumClients": 100,
"multicastRate": "auto",
"autoChannelSelection": false,
"activeScanSettings": {
"model_type": "ActiveScanSettings",
"enabled": true,
"scanFrequencySeconds": 10,
"scanDurationMillis": 65
},
"managementRate": "auto",
"rxCellSizeDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"probeResponseThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"clientDisconnectThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"eirpTxPower": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": 18
},
"bestApEnabled": null,
"neighbouringListApConfig": {
"model_type": "NeighbouringAPListConfiguration",
"minSignal": -85,
"maxAps": 25
},
"perimeterDetectionEnabled": true,
"channelHopSettings": {
"model_type": "ChannelHopSettings",
"noiseFloorThresholdInDB": -75,
"noiseFloorThresholdTimeInSeconds": 180,
"nonWifiThresholdInPercentage": 50,
"nonWifiThresholdTimeInSeconds": 180,
"obssHopMode": "NON_WIFI"
},
"bestApSettings": {
"model_type": "RadioBestApSettings",
"mlComputed": true,
"dropInSnrPercentage": 30,
"minLoadFactor": 40
}
},
"is2dot4GHz": {
"model_type": "RfElementConfiguration",
"rf": "TipWlan-rf",
"beaconInterval": 100,
"forceScanDuringVoice": "disabled",
"rtsCtsThreshold": 65535,
"channelBandwidth": "is20MHz",
"mimoMode": "twoBytwo",
"mimoMode": "twoByTwo",
"maxNumClients": 100,
"multicastRate": "auto",
"autoChannelSelection": false,
@@ -43,8 +102,8 @@
},
"eirpTxPower": {
"model_type": "AutoOrManualValue",
"auto": false,
"value": 32
"auto": true,
"value": 18
},
"bestApEnabled": null,
"neighbouringListApConfig": {
@@ -52,7 +111,6 @@
"minSignal": -85,
"maxAps": 25
},
"minAutoCellSize": -80,
"perimeterDetectionEnabled": true,
"channelHopSettings": {
"model_type": "ChannelHopSettings",
@@ -69,133 +127,14 @@
"minLoadFactor": 50
}
},
"is5GHz": {
"model_type": "RfElementConfiguration",
"beaconInterval": 100,
"forceScanDuringVoice": "disabled",
"rtsCtsThreshold": 65535,
"channelBandwidth": "is80MHz",
"mimoMode": "twoBytwo",
"maxNumClients": 100,
"multicastRate": "auto",
"autoChannelSelection": false,
"activeScanSettings": {
"model_type": "ActiveScanSettings",
"enabled": true,
"scanFrequencySeconds": 10,
"scanDurationMillis": 65
},
"managementRate": "auto",
"rxCellSizeDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"probeResponseThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"clientDisconnectThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"eirpTxPower": {
"model_type": "AutoOrManualValue",
"auto": false,
"value": 32
},
"bestApEnabled": null,
"neighbouringListApConfig": {
"model_type": "NeighbouringAPListConfiguration",
"minSignal": -85,
"maxAps": 25
},
"minAutoCellSize": -80,
"perimeterDetectionEnabled": true,
"channelHopSettings": {
"model_type": "ChannelHopSettings",
"noiseFloorThresholdInDB": -75,
"noiseFloorThresholdTimeInSeconds": 180,
"nonWifiThresholdInPercentage": 50,
"nonWifiThresholdTimeInSeconds": 180,
"obssHopMode": "NON_WIFI"
},
"bestApSettings": {
"model_type": "RadioBestApSettings",
"mlComputed": true,
"dropInSnrPercentage": 20,
"minLoadFactor": 50
}
},
"is5GHzL": {
"model_type": "RfElementConfiguration",
"beaconInterval": 100,
"forceScanDuringVoice": "disabled",
"rtsCtsThreshold": 65535,
"channelBandwidth": "is80MHz",
"mimoMode": "twoBytwo",
"maxNumClients": 100,
"multicastRate": "auto",
"autoChannelSelection": false,
"activeScanSettings": {
"model_type": "ActiveScanSettings",
"enabled": true,
"scanFrequencySeconds": 10,
"scanDurationMillis": 65
},
"managementRate": "auto",
"rxCellSizeDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"probeResponseThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"clientDisconnectThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"eirpTxPower": {
"model_type": "AutoOrManualValue",
"auto": false,
"value": 32
},
"bestApEnabled": null,
"neighbouringListApConfig": {
"model_type": "NeighbouringAPListConfiguration",
"minSignal": -85,
"maxAps": 25
},
"minAutoCellSize": -80,
"perimeterDetectionEnabled": true,
"channelHopSettings": {
"model_type": "ChannelHopSettings",
"noiseFloorThresholdInDB": -75,
"noiseFloorThresholdTimeInSeconds": 180,
"nonWifiThresholdInPercentage": 50,
"nonWifiThresholdTimeInSeconds": 180,
"obssHopMode": "NON_WIFI"
},
"bestApSettings": {
"model_type": "RadioBestApSettings",
"mlComputed": true,
"dropInSnrPercentage": 30,
"minLoadFactor": 40
}
},
"is5GHzU": {
"model_type": "RfElementConfiguration",
"rf": "TipWlan-rf",
"beaconInterval": 100,
"forceScanDuringVoice": "disabled",
"rtsCtsThreshold": 65535,
"channelBandwidth": "is80MHz",
"mimoMode": "twoBytwo",
"mimoMode": "twoByTwo",
"maxNumClients": 100,
"multicastRate": "auto",
"autoChannelSelection": false,
@@ -223,8 +162,68 @@
},
"eirpTxPower": {
"model_type": "AutoOrManualValue",
"auto": false,
"value": 32
"auto": true,
"value": 18
},
"bestApEnabled": null,
"neighbouringListApConfig": {
"model_type": "NeighbouringAPListConfiguration",
"minSignal": -85,
"maxAps": 25
},
"perimeterDetectionEnabled": true,
"channelHopSettings": {
"model_type": "ChannelHopSettings",
"noiseFloorThresholdInDB": -75,
"noiseFloorThresholdTimeInSeconds": 180,
"nonWifiThresholdInPercentage": 50,
"nonWifiThresholdTimeInSeconds": 180,
"obssHopMode": "NON_WIFI"
},
"bestApSettings": {
"model_type": "RadioBestApSettings",
"mlComputed": true,
"dropInSnrPercentage": 30,
"minLoadFactor": 40
}
},
"is5GHzL": {
"model_type": "RfElementConfiguration",
"rf": "TipWlan-rf",
"beaconInterval": 100,
"forceScanDuringVoice": "disabled",
"rtsCtsThreshold": 65535,
"channelBandwidth": "is80MHz",
"mimoMode": "twoByTwo",
"maxNumClients": 100,
"multicastRate": "auto",
"autoChannelSelection": false,
"activeScanSettings": {
"model_type": "ActiveScanSettings",
"enabled": true,
"scanFrequencySeconds": 10,
"scanDurationMillis": 65
},
"managementRate": "auto",
"rxCellSizeDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"probeResponseThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"clientDisconnectThresholdDb": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": -90
},
"eirpTxPower": {
"model_type": "AutoOrManualValue",
"auto": true,
"value": 18
},
"bestApEnabled": null,
"neighbouringListApConfig": {
@@ -232,7 +231,6 @@
"minSignal": -85,
"maxAps": 25
},
"minAutoCellSize": -80,
"perimeterDetectionEnabled": true,
"channelHopSettings": {
"model_type": "ChannelHopSettings",
@@ -250,9 +248,9 @@
}
}
},
"createdTimestamp": 1591653239983,
"lastModifiedTimestamp": 1591653239983,
"childProfileIds": [
]
}
"profileType": "rf"
},
"createdTimestamp": 1601961452390,
"lastModifiedTimestamp": 1601961452390,
"childProfileIds": []
}

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

@@ -1,20 +1,22 @@
[
{
"model_type": "Profile",
"id": 6,
"id": 9,
"customerId": 2,
"profileType": "ssid",
"name": "DefaultSsid-2g",
"name": "TipWlan-cloud-3-radios",
"details": {
"model_type": "SsidConfiguration",
"ssid": "Default-SSID-2g",
"ssid": "TipWlan-cloud-3-radios",
"appliedRadios": [
"is2dot4GHz"
"is5GHzU",
"is2dot4GHz",
"is5GHzL"
],
"ssidAdminState": "enabled",
"secureMode": "wpa2PSK",
"secureMode": "open",
"vlanId": 1,
"keyStr": "12345678",
"keyStr": null,
"broadcastSsid": "enabled",
"keyRefresh": 0,
"noLocalSubnets": false,
@@ -57,130 +59,11 @@
"forwardMode": null,
"profileType": "ssid"
},
"createdTimestamp": 1591653239983,
"lastModifiedTimestamp": 1591653239983,
"childProfileIds": []
},
{
"model_type": "Profile",
"id": 7,
"customerId": 2,
"profileType": "ssid",
"name": "DefaultSsid-5gl",
"details": {
"model_type": "SsidConfiguration",
"ssid": "Default-SSID-5gl",
"appliedRadios": [
"is5GHzL"
],
"ssidAdminState": "enabled",
"secureMode": "wpaEAP",
"vlanId": 1,
"keyStr": "12345678",
"broadcastSsid": "enabled",
"keyRefresh": 0,
"noLocalSubnets": false,
"radiusServiceName": "RadiusProfileOttawa",
"captivePortalId": null,
"bandwidthLimitDown": 0,
"bandwidthLimitUp": 0,
"videoTrafficOnly": false,
"radioBasedConfigs": {
"is5GHz": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is2dot4GHz": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is5GHzU": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is5GHzL": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
}
},
"bonjourGatewayProfileId": null,
"enable80211w": null,
"wepConfig": null,
"forwardMode": null,
"profileType": "ssid"
},
"createdTimestamp": 1591653240017,
"lastModifiedTimestamp": 1591654215374,
"createdTimestamp": 1601961452385,
"lastModifiedTimestamp": 1601961452385,
"childProfileIds": [
1
7,
8
]
},
{
"model_type": "Profile",
"id": 8,
"customerId": 2,
"profileType": "ssid",
"name": "DefaultSsid-5gu",
"details": {
"model_type": "SsidConfiguration",
"ssid": "Default-SSID-5gu",
"appliedRadios": [
"is5GHzU"
],
"ssidAdminState": "enabled",
"secureMode": "wpa2PSK",
"vlanId": 1,
"keyStr": "12345678",
"broadcastSsid": "enabled",
"keyRefresh": 0,
"noLocalSubnets": false,
"radiusServiceName": null,
"captivePortalId": null,
"bandwidthLimitDown": 0,
"bandwidthLimitUp": 0,
"videoTrafficOnly": false,
"radioBasedConfigs": {
"is5GHz": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is2dot4GHz": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is5GHzU": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is5GHzL": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
}
},
"bonjourGatewayProfileId": null,
"enable80211w": null,
"wepConfig": null,
"forwardMode": null,
"profileType": "ssid"
},
"createdTimestamp": 1591654301763,
"lastModifiedTimestamp": 1591654301763,
"childProfileIds": []
}
]

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

@@ -1,7 +1,7 @@
[
{
"model_type": "Profile",
"id": 6666,
"id": 6,
"customerId": 2,
"profileType": "venue",
"name": "TipWlan-Hotspot20-Venue",
@@ -10,19 +10,21 @@
"venueNameSet": [
{
"model_type": "VenueName",
"locale": "en_CA",
"language": "eng",
"venueName": "Example venue",
"venueUrl": "http://www.example.com/info-eng",
"formattedVenueName": "eng:Example venue"
"locale": "fr_CA",
"dupleIso3Language": "fra",
"dupleName": "Exemple de lieu",
"defaultDupleSeparator": ":",
"venueUrl": "http://www.example.com/info-fra",
"asDuple": "fra:Exemple de lieu"
},
{
"model_type": "VenueName",
"locale": "fr_CA",
"language": "fra",
"venueName": "Exemple de lieu",
"venueUrl": "http://www.example.com/info-fra",
"formattedVenueName": "fra:Exemple de lieu"
"locale": "en_CA",
"dupleIso3Language": "eng",
"dupleName": "Example venue",
"defaultDupleSeparator": ":",
"venueUrl": "http://www.example.com/info-eng",
"asDuple": "eng:Example venue"
}
],
"venueTypeAssignment": {
@@ -33,8 +35,8 @@
},
"profileType": "venue"
},
"createdTimestamp": 1601595306891,
"lastModifiedTimestamp": 1601595306891,
"createdTimestamp": 1601961451781,
"lastModifiedTimestamp": 1601961451781,
"childProfileIds": []
}
]

2
opensync-gateway-static-process/src/main/resources/launchers/OpenSyncProcess (local, KDC certs) static.launch
View File

@@ -14,5 +14,5 @@
<stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="opensync-gateway-static-process"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="opensync-gateway-static-process"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="--add-opens java.base/java.lang=ALL-UNNAMED&#10;&#10;-Dssl.props=file://${project_loc:opensync-gateway-static-process}/src/main/resources/app/certs/ssl.properties&#10;-Dtip.wlan.httpClientConfig=file://${project_loc:opensync-gateway-static-process}/src/main/resources/app/certs/httpClientConfig.json&#10;&#10;-Djavax.net.ssl.keyStore=${tip_wlan_service_certs}/client_keystore.jks&#10;-Djavax.net.ssl.keyStorePassword=mypassword&#10;-Djavax.net.ssl.trustStore=${tip_wlan_service_certs}/truststore.jks&#10;-Djavax.net.ssl.trustStorePassword=mypassword&#10;&#10;-Dtip.wlan.ovsdb.managerAddr=${local_server_address}&#10;-Dtip.wlan.ovsdb.listenPort=6640&#10;-Dtip.wlan.ovsdb.redirector.listenPort=6643&#10;-Dtip.wlan.ovsdb.timeoutSec=30&#10;-Dtip.wlan.ovsdb.trustStore=${tip_wlan_service_certs}/truststore.jks&#10;-Dtip.wlan.ovsdb.keyStore=${tip_wlan_service_certs}/server.pkcs12&#10;&#10;-Dtip.wlan.ovsdb.customerEquipmentFileName=${project_loc:opensync-ext-static}/src/main/resources/EquipmentExample.json&#10;-Dtip.wlan.ovsdb.apProfileFileName=${project_loc:opensync-ext-static}/src/main/resources/ProfileAPExample.json&#10;-Dtip.wlan.ovsdb.metricsProfileFileName=${project_loc:opensync-ext-static}/src/main/resources/ProfileMetrics.json&#10;-Dtip.wlan.ovsdb.rfProfileFileName=${project_loc:opensync-ext-static}/src/main/resources/ProfileRf.json&#10;-Dtip.wlan.ovsdb.hotspot20ProfileFileName=${project_loc:opensync-ext-static}/src/main/resources/ProfileHotspot20.json&#10;-Dtip.wlan.ovsdb.operatorProfileFileName=${project_loc:opensync-ext-static}/src/main/resources/ProfileOperator.json&#10;-Dtip.wlan.ovsdb.venueProfileFileName=${project_loc:opensync-ext-static}/src/main/resources/ProfileVenue.json&#10;-Dtip.wlan.ovsdb.ssidProfileFileName=${project_loc:opensync-ext-static}/src/main/resources/ProfileSsid.json&#10;-Dtip.wlan.ovsdb.locationFileName=${project_loc:opensync-ext-static}/src/main/resources/LocationBuildingExample.json&#10;-Dtip.wlan.ovsdb.radiusProfileFileName=${project_loc:opensync-ext-static}/src/main/resources/ProfileRadius.json&#10;-Dtip.wlan.ovsdb.captiveProfileFileName=${project_loc:opensync-ext-static}/src/main/resources/ProfileCaptive.json&#10;-Dtip.wlan.mqttBroker.address.internal=${local_server_address}&#10;-Dtip.wlan.mqttBroker.address.external=${local_server_address}&#10;-Dtip.wlan.mqttBroker.listenPort=1883&#10;-Dtip.wlan.ovsdb.wifi-iface.default_radio2g=home-ap-24&#10;-Dtip.wlan.ovsdb.wifi-iface.default_radio5gl=home-ap-l50&#10;-Dtip.wlan.ovsdb.wifi-iface.default_radio5gu=home-ap-u50&#10;-Dtip.wlan.ovsdb.wifi-iface.default_radio5g=home-ap-50&#10;-Dtip.wlan.ovsdb.wifi-iface.default_wan_type=eth&#10;-Dtip.wlan.ovsdb.wifi-iface.default_wan_name=eth1&#10;-Dtip.wlan.ovsdb.wifi-iface.default_lan_type=bridge&#10;-Dtip.wlan.ovsdb.wifi-iface.default_lan_name=lan&#10;-Dtip.wlan.preventClientCnAlteration=false&#10;-Dspring.profiles.include=use_ssl,use_webtoken_auth,use_single_ds,RestTemplateConfiguration_X509_client_cert_auth,opensync_static_config,mqtt_receiver,ovsdb_redirector,ovsdb_manager"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="--add-opens java.base/java.lang=ALL-UNNAMED&#10;&#10;-Dssl.props=file://${project_loc:opensync-gateway-static-process}/src/main/resources/app/certs/ssl.properties&#10;-Dtip.wlan.httpClientConfig=file://${project_loc:opensync-gateway-static-process}/src/main/resources/app/certs/httpClientConfig.json&#10;&#10;-Djavax.net.ssl.keyStore=${tip_wlan_service_certs}/client_keystore.jks&#10;-Djavax.net.ssl.keyStorePassword=mypassword&#10;-Djavax.net.ssl.trustStore=${tip_wlan_service_certs}/truststore.jks&#10;-Djavax.net.ssl.trustStorePassword=mypassword&#10;&#10;-Dtip.wlan.ovsdb.managerAddr=${local_server_address}&#10;-Dtip.wlan.ovsdb.listenPort=6640&#10;-Dtip.wlan.ovsdb.redirector.listenPort=6643&#10;-Dtip.wlan.ovsdb.timeoutSec=30&#10;-Dtip.wlan.ovsdb.trustStore=${tip_wlan_service_certs}/truststore.jks&#10;-Dtip.wlan.ovsdb.keyStore=${tip_wlan_service_certs}/server.pkcs12&#10;&#10;-Dtip.wlan.ovsdb.customerEquipmentFileName=${project_loc:opensync-ext-static}/src/main/resources/EquipmentExample.json&#10;-Dtip.wlan.ovsdb.apProfileFileName=${project_loc:opensync-ext-static}/src/main/resources/ProfileAPExample.json&#10;-Dtip.wlan.ovsdb.metricsProfileFileName=${project_loc:opensync-ext-static}/src/main/resources/ProfileMetrics.json&#10;-Dtip.wlan.ovsdb.rfProfileFileName=${project_loc:opensync-ext-static}/src/main/resources/ProfileRf.json&#10;-Dtip.wlan.ovsdb.hotspot20ProfileFileName=${project_loc:opensync-ext-static}/src/main/resources/ProfileHotspot20.json&#10;-Dtip.wlan.ovsdb.operatorProfileFileName=${project_loc:opensync-ext-static}/src/main/resources/ProfileOperator.json&#10;-Dtip.wlan.ovsdb.venueProfileFileName=${project_loc:opensync-ext-static}/src/main/resources/ProfileVenue.json&#10;-Dtip.wlan.ovsdb.idProviderProfileFileName=${project_loc:opensync-ext-static}/src/main/resources/ProfileIdProvider.json&#10;-Dtip.wlan.ovsdb.ssidProfileFileName=${project_loc:opensync-ext-static}/src/main/resources/ProfileSsid.json&#10;-Dtip.wlan.ovsdb.locationFileName=${project_loc:opensync-ext-static}/src/main/resources/LocationBuildingExample.json&#10;-Dtip.wlan.ovsdb.radiusProfileFileName=${project_loc:opensync-ext-static}/src/main/resources/ProfileRadius.json&#10;-Dtip.wlan.ovsdb.captiveProfileFileName=${project_loc:opensync-ext-static}/src/main/resources/ProfileCaptive.json&#10;-Dtip.wlan.mqttBroker.address.internal=${local_server_address}&#10;-Dtip.wlan.mqttBroker.address.external=${local_server_address}&#10;-Dtip.wlan.mqttBroker.listenPort=1883&#10;-Dtip.wlan.ovsdb.wifi-iface.default_radio2g=home-ap-24&#10;-Dtip.wlan.ovsdb.wifi-iface.default_radio5gl=home-ap-l50&#10;-Dtip.wlan.ovsdb.wifi-iface.default_radio5gu=home-ap-u50&#10;-Dtip.wlan.ovsdb.wifi-iface.default_radio5g=home-ap-50&#10;-Dtip.wlan.ovsdb.wifi-iface.default_wan_type=eth&#10;-Dtip.wlan.ovsdb.wifi-iface.default_wan_name=eth1&#10;-Dtip.wlan.ovsdb.wifi-iface.default_lan_type=bridge&#10;-Dtip.wlan.ovsdb.wifi-iface.default_lan_name=lan&#10;-Dtip.wlan.preventClientCnAlteration=false&#10;-Dspring.profiles.include=use_ssl,use_webtoken_auth,use_single_ds,RestTemplateConfiguration_X509_client_cert_auth,opensync_static_config,mqtt_receiver,ovsdb_redirector,ovsdb_manager"/>
</launchConfiguration>

48
opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/TipWlanOvsdbClient.java
View File

@@ -103,20 +103,7 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
// successfully connected - register it in our
// connectedClients table
String key = null;
// can clientCn be altered
if (preventClientCnAlteration) {
key = clientCn;
} else {
// does clientCn already end with the AP serial number, if so, use
// this
if (clientCn.endsWith("_" + connectNodeInfo.serialNumber)) {
key = clientCn;
} else {
// append the serial number
key = clientCn + "_" + connectNodeInfo.serialNumber;
}
}
String key = alterClientCnIfRequired(clientCn, connectNodeInfo);
ovsdbSessionMapInterface.newSession(key, ovsdbClient);
extIntegrationInterface.apConnected(key, connectNodeInfo);
@@ -143,6 +130,7 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
}
@Override
public void disconnected(OvsdbClient ovsdbClient) {
String remoteHost = ovsdbClient.getConnectionInfo().getRemoteAddress().getHostAddress();
@@ -199,20 +187,7 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
// successfully connected - register it in our
// connectedClients table
String apId = null;
// can clientCn be altered
if (preventClientCnAlteration) {
apId = clientCn;
} else {
// does clientCn already end with the AP serial number, if so, use
// this
if (clientCn.endsWith("_" + connectNodeInfo.serialNumber)) {
apId = clientCn;
} else {
// append the serial number
apId = clientCn + "_" + connectNodeInfo.serialNumber;
}
}
String apId = alterClientCnIfRequired(clientCn, connectNodeInfo);
LOG.debug("Client connect for AP {}", apId);
@@ -859,4 +834,21 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
}
public String alterClientCnIfRequired(String clientCn, ConnectNodeInfo connectNodeInfo) {
String key;
// can clientCn be altered
if (preventClientCnAlteration) {
key = clientCn;
} else {
// does clientCn already end with the AP serial number, if so, use
// this
if (clientCn.endsWith("_" + connectNodeInfo.serialNumber)) {
key = clientCn;
} else {
// append the serial number
key = clientCn + "_" + connectNodeInfo.serialNumber;
}
}
return key;
}
}

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

@@ -3434,7 +3434,12 @@ public class OvsdbDao {
rowColumns.put("gas_addr3_behavior", new Atom<>(hs2Profile.getGasAddr3Behaviour().getId()));
rowColumns.put("operating_class", new Atom<>(hs2Profile.getOperatingClass()));
rowColumns.put("anqp_domain_id", new Atom<>(hs2Profile.getAnqpDomainId()));
Set<Atom<String>> mccMnc = new HashSet<>();
hs2Profile.getMccMnc3gppCellularNetworkInfo().stream()
.forEach(c -> mccMnc.add(new Atom<>(c.getMccMncPairing())));
com.vmware.ovsdb.protocol.operation.notation.Set mccMncSet = com.vmware.ovsdb.protocol.operation.notation.Set
.of(mccMnc);
rowColumns.put("mcc_mnc", mccMncSet);
Set<Atom<String>> connectionCapabilities = new HashSet<>();
hs2Profile.getConnectionCapabilitySet().stream().forEach(
c -> connectionCapabilities.add(new Atom<>(c.getConnectionCapabilitiesIpProtocol() + ":"
@@ -3468,7 +3473,27 @@ public class OvsdbDao {
rowColumns.put("venue_group_type", new Atom<>(groupType));
Map<String, WifiVifConfigInfo> vifConfigMap = getProvisionedWifiVifConfigs(ovsdbClient);
Set<Uuid> vifConfigs = new HashSet<>();
for (String ssid : hs2Profile.getAssociatedSsids()) {
if (vifConfigMap != null) {
vifConfigMap.keySet().stream().forEach(k -> {
if (k.endsWith(ssid)) {
WifiVifConfigInfo vifConfig = vifConfigMap.get(k);
vifConfigs.add(vifConfig.uuid);
}
});
}
}
if (vifConfigs.size() > 0) {
com.vmware.ovsdb.protocol.operation.notation.Set vifConfigUuids = com.vmware.ovsdb.protocol.operation.notation.Set
.of(vifConfigs);
rowColumns.put("vif_config", vifConfigUuids);
}
Row row = new Row(rowColumns);
Insert newHs20Config = new Insert(hotspot20ConfigDbTable, row);