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

Radius Profile Provisioning

Browse Source
This commit is contained in:
Mike Hansen
2021-01-21 18:28:25 -05:00
parent cdc29b6b32
commit 095c611b8a
46 changed files with 3999 additions and 3869 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java vendored
View File

@@ -471,7 +471,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
ssidProfile.setName(autoProvisionedSsid + radioType.name() + " for " + ce.getName());
SsidConfiguration ssidConfig = SsidConfiguration.createWithDefaults();
ssidConfig.setSsid(ssidProfile.getName());
ssidConfig.setSsid(autoProvisionedSsid);
ssidConfig.setSsidAdminState(StateSetting.enabled);
ssidConfig.setBroadcastSsid(StateSetting.enabled);
ssidConfig.setSecureMode(SecureMode.wpa2PSK);
@@ -975,7 +975,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
hotspot20ProfileSet
.addAll(profileContainer.getChildrenOfType(ssidProfile.getId(), ProfileType.passpoint));
radiusSet.addAll(profileContainer.getChildrenOfType(ret.getApProfile().getId(), ProfileType.radius));
radiusSet.addAll(profileContainer.getChildrenOfType(ssidProfile.getId(), ProfileType.radius));
if (ssidProfile.getDetails() != null) {
Long captivePortId = ((SsidConfiguration) ssidProfile.getDetails()).getCaptivePortalId();
if (captivePortId != null) {

5
opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/utils/MqttStatsPublisher.java vendored
View File

@@ -190,7 +190,6 @@ public class MqttStatsPublisher {
long locationId = ce.getLocationId();
long profileId = ce.getProfileId();
if (LOG.isTraceEnabled()) {
// prepare a JSONPrinter to format protobuf messages as
// json
List<Descriptors.Descriptor> protobufDescriptors = new ArrayList<>();
@@ -200,12 +199,12 @@ public class MqttStatsPublisher {
.includingDefaultValueFields().usingTypeRegistry(oldRegistry);
try {
LOG.trace("MQTT OpensyncStats.report = {}", jsonPrinter.print(report));
LOG.info(jsonPrinter.print(report));
} catch (InvalidProtocolBufferException e1) {
LOG.error("Couldn't parse OpensyncStats.report.", e1);
}
}
List<ServiceMetric> metricRecordList = new ArrayList<>();

124
opensync-ext-static/src/main/resources/EquipmentExample.json
View File

@@ -1,12 +1,12 @@
{
"model_type": "Equipment",
"id": 51,
"id": 1,
"customerId": 2,
"profileId": 12,
"profileId": 38,
"locationId": 8,
"equipmentType": "AP",
"inventoryId": "Test_Client_21P10C68818122",
"name": "Test_Client_21P10C68818122",
"inventoryId": "Open_AP_21P10C68818122",
"name": "Open_AP_21P10C68818122",
"details": {
"model_type": "ApElementConfiguration",
"equipmentModel": "EA8300-CA",
@@ -21,7 +21,7 @@
"staticDnsIp1": null,
"staticDnsIp2": null,
"peerInfoList": [],
"deviceName": "Default Device Name",
"deviceName": "Open_AP_21P10C68818122",
"locationData": null,
"locallyConfiguredMgmtVlan": 0,
"locallyConfigured": false,
@@ -38,33 +38,43 @@
"channelNumber": 6,
"manualChannelNumber": 6,
"backupChannelNumber": 11,
"bannedChannels": [],
"allowedChannels": [],
"allowedChannels": [
1,
2,
3,
4,
5,
6,
7,
8,
9,
10,
11
],
"rxCellSizeDb": {
"model_type": "SourceSelectionValue",
"source": "auto",
"source": "profile",
"value": -90
},
"probeResponseThresholdDb": {
"model_type": "SourceSelectionValue",
"source": "auto",
"source": "profile",
"value": -90
},
"clientDisconnectThresholdDb": {
"model_type": "SourceSelectionValue",
"source": "auto",
"source": "profile",
"value": -90
},
"eirpTxPower": {
"model_type": "SourceSelectionValue",
"source": "auto",
"value": 32
"source": "profile",
"value": 18
},
"perimeterDetectionEnabled": true,
"bestAPSteerType": "both",
"deauthAttackDetection": null,
"allowedChannelsPowerLevels": [],
"activeChannel": 6
"allowedChannelsPowerLevels": []
},
"is5GHzU": {
"model_type": "ElementRadioConfiguration",
@@ -72,33 +82,37 @@
"channelNumber": 149,
"manualChannelNumber": 149,
"backupChannelNumber": 154,
"bannedChannels": [],
"allowedChannels": [],
"allowedChannels": [
161,
149,
165,
153,
157
],
"rxCellSizeDb": {
"model_type": "SourceSelectionValue",
"source": "auto",
"source": "profile",
"value": -90
},
"probeResponseThresholdDb": {
"model_type": "SourceSelectionValue",
"source": "auto",
"source": "profile",
"value": -90
},
"clientDisconnectThresholdDb": {
"model_type": "SourceSelectionValue",
"source": "auto",
"source": "profile",
"value": -90
},
"eirpTxPower": {
"model_type": "SourceSelectionValue",
"source": "auto",
"value": 32
"source": "profile",
"value": 18
},
"perimeterDetectionEnabled": true,
"bestAPSteerType": "both",
"deauthAttackDetection": null,
"allowedChannelsPowerLevels": [],
"activeChannel": 149
"allowedChannelsPowerLevels": []
},
"is5GHzL": {
"model_type": "ElementRadioConfiguration",
@@ -106,33 +120,36 @@
"channelNumber": 36,
"manualChannelNumber": 36,
"backupChannelNumber": 44,
"bannedChannels": [],
"allowedChannels": [],
"allowedChannels": [
48,
36,
40,
44
],
"rxCellSizeDb": {
"model_type": "SourceSelectionValue",
"source": "auto",
"source": "profile",
"value": -90
},
"probeResponseThresholdDb": {
"model_type": "SourceSelectionValue",
"source": "auto",
"source": "profile",
"value": -90
},
"clientDisconnectThresholdDb": {
"model_type": "SourceSelectionValue",
"source": "auto",
"source": "profile",
"value": -90
},
"eirpTxPower": {
"model_type": "SourceSelectionValue",
"source": "auto",
"value": 32
"source": "profile",
"value": 18
},
"perimeterDetectionEnabled": true,
"bestAPSteerType": "both",
"deauthAttackDetection": null,
"allowedChannelsPowerLevels": [],
"activeChannel": 36
"allowedChannelsPowerLevels": []
}
},
"advancedRadioMap": {
@@ -143,22 +160,28 @@
"fragmentationThresholdBytes": 2346,
"uapsdState": "enabled",
"stationIsolation": "disabled",
"multicastRate": {
"model_type": "SourceSelectionMulticast",
"source": "profile",
"value": "auto"
},
"managementRate": {
"model_type": "SourceSelectionManagement",
"source": "auto",
"source": "profile",
"value": "auto"
},
"bestApSettings": {
"model_type": "SourceSelectionSteering",
"source": "auto",
"source": "manual",
"value": {
"model_type": "RadioBestApSettings",
"mlComputed": true,
"dropInSnrPercentage": 30,
"minLoadFactor": 40
"dropInSnrPercentage": 20,
"minLoadFactor": 50
}
},
"legacyBSSRate": "enabled",
"dtimPeriod": 2,
"deauthAttackDetection": null
},
"is5GHzU": {
@@ -168,14 +191,19 @@
"fragmentationThresholdBytes": 2346,
"uapsdState": "enabled",
"stationIsolation": "disabled",
"multicastRate": {
"model_type": "SourceSelectionMulticast",
"source": "profile",
"value": "auto"
},
"managementRate": {
"model_type": "SourceSelectionManagement",
"source": "auto",
"source": "profile",
"value": "auto"
},
"bestApSettings": {
"model_type": "SourceSelectionSteering",
"source": "auto",
"source": "manual",
"value": {
"model_type": "RadioBestApSettings",
"mlComputed": true,
@@ -184,6 +212,7 @@
}
},
"legacyBSSRate": "enabled",
"dtimPeriod": 2,
"deauthAttackDetection": null
},
"is5GHzL": {
@@ -193,14 +222,19 @@
"fragmentationThresholdBytes": 2346,
"uapsdState": "enabled",
"stationIsolation": "disabled",
"multicastRate": {
"model_type": "SourceSelectionMulticast",
"source": "profile",
"value": "auto"
},
"managementRate": {
"model_type": "SourceSelectionManagement",
"source": "auto",
"source": "profile",
"value": "auto"
},
"bestApSettings": {
"model_type": "SourceSelectionSteering",
"source": "auto",
"source": "manual",
"value": {
"model_type": "RadioBestApSettings",
"mlComputed": true,
@@ -209,13 +243,19 @@
}
},
"legacyBSSRate": "enabled",
"dtimPeriod": 2,
"deauthAttackDetection": null
}
}
},
"latitude": null,
"longitude": null,
"baseMacAddress": {
"model_type": "MacAddress",
"address": "JPWi7y5T",
"addressAsString": "24:f5:a2:ef:2e:53"
},
"serial": "21P10C68818122",
"createdTimestamp": 1591653239821,
"lastModifiedTimestamp": 1591653241398
"createdTimestamp": 0,
"lastModifiedTimestamp": 1611264546193
}

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

@@ -1,9 +1,9 @@
{
"model_type": "Profile",
"id": 12,
"id": 38,
"customerId": 2,
"profileType": "equipment_ap",
"name": "ApProfile-3-radios",
"name": "ap-profile-2021-01-21T21:28:59.371Z",
"details": {
"model_type": "ApNetworkConfiguration",
"networkConfigVersion": "AP-1",
@@ -20,12 +20,12 @@
"syntheticClientEnabled": true,
"ledControlEnabled": true,
"equipmentDiscovery": false,
"greTunnelName": null,
"greParentIfName": null,
"greLocalInetAddr": null,
"greRemoteInetAddr": null,
"greRemoteMacAddr": null,
"radioMap": {
"is5GHz": {
"model_type": "RadioProfileConfiguration",
"bestApEnabled": true,
"bestAPSteerType": "both"
},
"is2dot4GHz": {
"model_type": "RadioProfileConfiguration",
"bestApEnabled": true,
@@ -45,29 +45,23 @@
"greTunnelConfigurations": [
{
"model_type": "GreTunnelConfiguration",
"greTunnelName": "gre1",
"greParentIfName": "wan",
"greLocalInetAddr": "10.0.0.129",
"greRemoteInetAddr": "192.168.1.101",
"greRemoteMacAddr": {
"model_type": "MacAddress",
"address": "ZEvwIFf/",
"addressAsString": "64:4b:f0:20:57:ff"
},
"greTunnelName": null,
"greParentIfName": null,
"greLocalInetAddr": null,
"greRemoteInetAddr": null,
"greRemoteMacAddr": null,
"vlanIdsInGreTunnel": [
100
]
}
],
"profileType": "equipment_ap"
},
"createdTimestamp": 1606778369934,
"lastModifiedTimestamp": 1606778443413,
"createdTimestamp": 1611264539383,
"lastModifiedTimestamp": 1611264539383,
"childProfileIds": [
16,
4,
5,
10,
11,
15
31,
32
]
}

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

@@ -1,7 +1,7 @@
[
{
"model_type": "Profile",
"id": 14,
"id": 5,
"customerId": 2,
"profileType": "captive_portal",
"name": "Captive-portal",
@@ -17,7 +17,8 @@
"sessionTimeoutInMinutes": 60,
"logoFile": null,
"backgroundFile": null,
"walledGardenAllowlist": [],
"walledGardenAllowlist": [
],
"usernamePasswordFile": {
"model_type": "ManagedFileInfo",
"md5checksum": null,
@@ -40,8 +41,8 @@
"model_type": "TimedAccessUserRecord",
"username": "customer",
"password": "testing123",
"activationTime": 1602183994956,
"expirationTime": 1602212794956,
"activationTime": 1611262628973,
"expirationTime": 1611291428973,
"numDevices": 1,
"userDetails": {
"model_type": "TimedAccessUserDetails",
@@ -62,8 +63,8 @@
"model_type": "TimedAccessUserRecord",
"username": "customer",
"password": "testing123",
"activationTime": 1602183994957,
"expirationTime": 1602187594957,
"activationTime": 1611262628974,
"expirationTime": 1611266228974,
"numDevices": 0,
"userDetails": {
"model_type": "TimedAccessUserDetails",
@@ -84,8 +85,8 @@
"model_type": "TimedAccessUserRecord",
"username": "customer2",
"password": "testing1234",
"activationTime": 1602183994957,
"expirationTime": 1602788794957,
"activationTime": 1611262628974,
"expirationTime": 1611867428974,
"numDevices": 1,
"userDetails": {
"model_type": "TimedAccessUserDetails",
@@ -106,8 +107,8 @@
"model_type": "TimedAccessUserRecord",
"username": "customer2",
"password": "testing1234",
"activationTime": 1602183994957,
"expirationTime": 1602270394957,
"activationTime": 1611262628974,
"expirationTime": 1611349028974,
"numDevices": 0,
"userDetails": {
"model_type": "TimedAccessUserDetails",
@@ -125,11 +126,13 @@
"lastModifiedTimestamp": 0
}
],
"macAllowList": [],
"macAllowList": [
],
"profileType": "captive_portal"
},
"createdTimestamp": 1602183994959,
"lastModifiedTimestamp": 1602183994959,
"childProfileIds": []
"createdTimestamp": 1611262628978,
"lastModifiedTimestamp": 1611262628978,
"childProfileIds": [
]
}
]

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

@@ -1,10 +1,10 @@
[
{
"model_type": "Profile",
"id": 24,
"id": 37,
"customerId": 2,
"profileType": "passpoint",
"name": "TipWlan-Passpoint-Config",
"name": "hotspot20-profile-2021-01-21T21:28:59.171Z",
"details": {
"model_type": "PasspointProfile",
"enableInterworkingAndHs20": true,
@@ -31,8 +31,8 @@
{
"model_type": "PasspointConnectionCapability",
"connectionCapabilitiesPortNumber": 8888,
"connectionCapabilitiesStatus": "open",
"connectionCapabilitiesIpProtocol": "TCP"
"connectionCapabilitiesIpProtocol": "TCP",
"connectionCapabilitiesStatus": "open"
}
],
"ipAddressTypeAvailability": "public_IPv4_address_available",
@@ -46,26 +46,26 @@
"enable2pt4GHz": true,
"enable5GHz": true,
"associatedAccessSsidProfileIds": [
15
32
],
"osuSsidProfileId": 16,
"passpointOperatorProfileId": 17,
"passpointVenueProfileId": 18,
"osuSsidProfileId": 31,
"passpointOperatorProfileId": 34,
"passpointVenueProfileId": 33,
"passpointOsuProviderProfileIds": [
19,
20
35,
36
],
"accessNetworkType": "free_public_network",
"networkAuthenticationType": "acceptance_of_terms_and_conditions",
"profileType": "passpoint"
},
"createdTimestamp": 1606778370807,
"lastModifiedTimestamp": 1606778370807,
"createdTimestamp": 0,
"lastModifiedTimestamp": 1611264539331,
"childProfileIds": [
17,
18,
19,
20
33,
34,
35,
36
]
}
]

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

@@ -1,10 +1,10 @@
[
{
"model_type": "Profile",
"id": 19,
"id": 35,
"customerId": 2,
"profileType": "passpoint_osu_id_provider",
"name": "TipWlan-Passpoint-OSU-Provider",
"name": "provider1-profile-2021-01-21T21:28:59.057Z",
"details": {
"model_type": "PasspointOsuProviderProfile",
"mccMncList": [
@@ -80,7 +80,7 @@
"osuFriendlyName": [
{
"model_type": "PasspointDuple",
"locale": "en_CA",
"locale": "eng",
"dupleIso3Language": "eng",
"dupleName": "Example provider rogers",
"defaultDupleSeparator": ":",
@@ -88,7 +88,7 @@
},
{
"model_type": "PasspointDuple",
"locale": "fr_CA",
"locale": "fra",
"dupleIso3Language": "fra",
"dupleName": "Exemple de fournisseur rogers",
"defaultDupleSeparator": ":",
@@ -104,7 +104,7 @@
"osuServiceDescription": [
{
"model_type": "PasspointDuple",
"locale": "en_CA",
"locale": "eng",
"dupleIso3Language": "eng",
"dupleName": "Example services rogers",
"defaultDupleSeparator": ":",
@@ -112,7 +112,7 @@
},
{
"model_type": "PasspointDuple",
"locale": "fr_CA",
"locale": "fra",
"dupleIso3Language": "fra",
"dupleName": "Exemples de services rogers",
"defaultDupleSeparator": ":",
@@ -125,17 +125,16 @@
],
"profileType": "passpoint_osu_id_provider"
},
"createdTimestamp": 1606778370345,
"lastModifiedTimestamp": 1606778370345,
"childProfileIds": [
]
"createdTimestamp": 1611264539070,
"lastModifiedTimestamp": 1611264539070,
"childProfileIds": []
},
{
"model_type": "Profile",
"id": 20,
"id": 36,
"customerId": 2,
"profileType": "passpoint_osu_id_provider",
"name": "TipWlan-Passpoint-OSU-Provider-2",
"name": "provider2-profile-2021-01-21T21:28:59.118Z",
"details": {
"model_type": "PasspointOsuProviderProfile",
"mccMncList": [
@@ -211,7 +210,7 @@
"osuFriendlyName": [
{
"model_type": "PasspointDuple",
"locale": "en_CA",
"locale": "eng",
"dupleIso3Language": "eng",
"dupleName": "Example provider telus",
"defaultDupleSeparator": ":",
@@ -219,7 +218,7 @@
},
{
"model_type": "PasspointDuple",
"locale": "fr_CA",
"locale": "fra",
"dupleIso3Language": "fra",
"dupleName": "Exemple de fournisseur telus",
"defaultDupleSeparator": ":",
@@ -235,7 +234,7 @@
"osuServiceDescription": [
{
"model_type": "PasspointDuple",
"locale": "en_CA",
"locale": "eng",
"dupleIso3Language": "eng",
"dupleName": "Example services telus",
"defaultDupleSeparator": ":",
@@ -243,7 +242,7 @@
},
{
"model_type": "PasspointDuple",
"locale": "fr_CA",
"locale": "fra",
"dupleIso3Language": "fra",
"dupleName": "Exemples de services telus",
"defaultDupleSeparator": ":",
@@ -257,9 +256,8 @@
],
"profileType": "passpoint_osu_id_provider"
},
"createdTimestamp": 1606778370351,
"lastModifiedTimestamp": 1606778370351,
"childProfileIds": [
]
"createdTimestamp": 1611264539131,
"lastModifiedTimestamp": 1611264539131,
"childProfileIds": []
}
]

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

@@ -1,10 +1,10 @@
[
{
"model_type": "Profile",
"id": 17,
"id": 34,
"customerId": 2,
"profileType": "passpoint_operator",
"name": "TipWlan-Passpoint-Operator",
"name": "operator-profile-2021-01-21T21:28:58.994Z",
"details": {
"model_type": "PasspointOperatorProfile",
"serverOnlyAuthenticatedL2EncryptionNetwork": false,
@@ -12,31 +12,30 @@
"operatorFriendlyName": [
{
"model_type": "PasspointDuple",
"locale": "en_CA",
"dupleIso3Language": "eng",
"dupleName": "Default friendly passpoint_operator name",
"defaultDupleSeparator": ":",
"asDuple": "eng:Default friendly passpoint_operator name"
},
{
"model_type": "PasspointDuple",
"locale": "fr_CA",
"locale": "fra",
"dupleIso3Language": "fra",
"dupleName": "Nom de l'opérateur convivial par défaut",
"defaultDupleSeparator": ":",
"asDuple": "fra:Nom de l'opérateur convivial par défaut"
},
{
"model_type": "PasspointDuple",
"locale": "eng",
"dupleIso3Language": "eng",
"dupleName": "Default friendly passpoint_operator name",
"defaultDupleSeparator": ":",
"asDuple": "eng:Default friendly passpoint_operator name"
}
],
"domainNameList": [
"bell.ca",
"telus.com",
"rogers.com",
"bell.ca"
"rogers.com"
],
"profileType": "passpoint_operator"
},
"createdTimestamp": 1606778369945,
"lastModifiedTimestamp": 1606778369945,
"childProfileIds": [
]
"createdTimestamp": 1611264539004,
"lastModifiedTimestamp": 1611264539004,
"childProfileIds": []
}
]

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

@@ -7,28 +7,26 @@
"name": "Radius-Profile",
"details": {
"model_type": "RadiusProfile",
"subnetConfiguration": null,
"serviceRegionMap": {
"Ottawa": {
"model_type": "RadiusServiceRegion",
"serverMap": {
"Radius-Profile": [
{
"primaryRadiusServer": {
"model_type": "RadiusServer",
"ipAddress": "192.168.0.1",
"secret": "testing123",
"authPort": 1812,
"timeout": null
}
]
},
"regionName": "Ottawa"
}
"secondaryRadiusServer": {
"model_type": "RadiusServer",
"ipAddress": "192.168.0.2",
"secret": "testing123",
"authPort": 1812,
"timeout": null
},
"radiusSubnetConfiguration": null,
"profileType": "radius"
},
"createdTimestamp": 1601961451668,
"lastModifiedTimestamp": 1601961451668,
"childProfileIds": []
"createdTimestamp": 1611262628767,
"lastModifiedTimestamp": 1611262628767,
"childProfileIds": [
]
}
]

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

@@ -1,6 +1,6 @@
{
"model_type": "Profile",
"id": 11,
"id": 4,
"customerId": 2,
"profileType": "rf",
"name": "TipWlan-rf",
@@ -198,7 +198,7 @@
},
"profileType": "rf"
},
"createdTimestamp": 1606778369933,
"lastModifiedTimestamp": 1606778369933,
"createdTimestamp": 1611262628788,
"lastModifiedTimestamp": 1611262628788,
"childProfileIds": []
}

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

@@ -20,9 +20,9 @@
"broadcastSsid": "enabled",
"keyRefresh": 0,
"noLocalSubnets": false,
"radiusServiceName": null,
"radiusAccountingServiceName": null,
"radiusAcountingServiceInterval": null,
"radiusServiceId": 0,
"radiusAccountingServiceId": 0,
"radiusAcountingServiceInterval": 60,
"captivePortalId": null,
"bandwidthLimitDown": 0,
"bandwidthLimitUp": 0,
@@ -76,27 +76,27 @@
},
{
"model_type": "Profile",
"id": 15,
"id": 32,
"customerId": 2,
"profileType": "ssid",
"name": "TipWlan-cloud-passpoint-access",
"name": "access-ssid-profile-2021-01-21T21:28:58.871Z",
"details": {
"model_type": "SsidConfiguration",
"ssid": "TipWlan-cloud-passpoint-access",
"ssid": "ssid-access-passpoint",
"appliedRadios": [
"is5GHzL",
"is5GHzU"
"is5GHzU",
"is5GHzL"
],
"ssidAdminState": "enabled",
"secureMode": "wpa2PSK",
"secureMode": "wpa2EAP",
"vlanId": 1,
"keyStr": "testing123",
"broadcastSsid": "enabled",
"keyRefresh": 0,
"noLocalSubnets": false,
"radiusServiceName": null,
"radiusAccountingServiceName": null,
"radiusAcountingServiceInterval": null,
"radiusServiceId": 1,
"radiusAccountingServiceId": 1,
"radiusAcountingServiceInterval": 60,
"captivePortalId": null,
"bandwidthLimitDown": 0,
"bandwidthLimitUp": 0,
@@ -104,18 +104,6 @@
"clientBandwidthLimitUp": 0,
"videoTrafficOnly": false,
"radioBasedConfigs": {
"is5GHzL": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is2dot4GHz": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is5GHz": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
@@ -127,13 +115,24 @@
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is2dot4GHz": {
"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",
"radiusClientConfiguration": {
"model_type": "RadiusNasConfiguration",
"nasClientId": "DEFAULT",
@@ -141,23 +140,25 @@
"userDefinedNasId": null,
"userDefinedNasIp": null,
"operatorId": null
}
},
"createdTimestamp": 1606778369943,
"lastModifiedTimestamp": 1606778370811,
"profileType": "ssid"
},
"createdTimestamp": 0,
"lastModifiedTimestamp": 1611264539281,
"childProfileIds": [
24
37,
1
]
},
{
"model_type": "Profile",
"id": 16,
"id": 31,
"customerId": 2,
"profileType": "ssid",
"name": "TipWlan-cloud-passpoint-osu",
"name": "osu-ssid-profile-2021-01-21T21:28:58.798Z",
"details": {
"model_type": "SsidConfiguration",
"ssid": "TipWlan-cloud-passpoint-osu",
"ssid": "ssid-open-passpoint",
"appliedRadios": [
"is2dot4GHz"
],
@@ -168,9 +169,9 @@
"broadcastSsid": "enabled",
"keyRefresh": 0,
"noLocalSubnets": false,
"radiusServiceName": null,
"radiusAccountingServiceName": null,
"radiusAcountingServiceInterval": null,
"radiusServiceId": 0,
"radiusAccountingServiceId": 0,
"radiusAcountingServiceInterval": 60,
"captivePortalId": null,
"bandwidthLimitDown": 0,
"bandwidthLimitUp": 0,
@@ -178,18 +179,6 @@
"clientBandwidthLimitUp": 0,
"videoTrafficOnly": false,
"radioBasedConfigs": {
"is5GHzL": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is2dot4GHz": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is5GHz": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
@@ -201,13 +190,24 @@
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is2dot4GHz": {
"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",
"radiusClientConfiguration": {
"model_type": "RadiusNasConfiguration",
"nasClientId": "DEFAULT",
@@ -215,13 +215,13 @@
"userDefinedNasId": null,
"userDefinedNasIp": null,
"operatorId": null
}
},
"createdTimestamp": 1606778369944,
"lastModifiedTimestamp": 1606778370352,
"profileType": "ssid"
},
"createdTimestamp": 0,
"lastModifiedTimestamp": 1611264539231,
"childProfileIds": [
19,
20
37
]
}
]

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

@@ -1,16 +1,16 @@
[
{
"model_type": "Profile",
"id": 18,
"id": 33,
"customerId": 2,
"profileType": "passpoint_venue",
"name": "TipWlan-Passpoint-Venue",
"name": "venue-profile-2021-01-21T21:28:58.934Z",
"details": {
"model_type": "PasspointVenueProfile",
"venueNameSet": [
{
"model_type": "PasspointVenueName",
"locale": "fr_CA",
"locale": "fra",
"dupleIso3Language": "fra",
"dupleName": "Exemple de lieu",
"defaultDupleSeparator": ":",
@@ -19,7 +19,7 @@
},
{
"model_type": "PasspointVenueName",
"locale": "en_CA",
"locale": "eng",
"dupleIso3Language": "eng",
"dupleName": "Example passpoint_venue",
"defaultDupleSeparator": ":",
@@ -35,9 +35,8 @@
},
"profileType": "passpoint_venue"
},
"createdTimestamp": 1606778369950,
"lastModifiedTimestamp": 1606778369950,
"childProfileIds": [
]
"createdTimestamp": 1611264538947,
"lastModifiedTimestamp": 1611264538947,
"childProfileIds": []
}
]

124
opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/EquipmentExample.json
View File

@@ -1,12 +1,12 @@
{
"model_type": "Equipment",
"id": 51,
"id": 1,
"customerId": 2,
"profileId": 12,
"profileId": 38,
"locationId": 8,
"equipmentType": "AP",
"inventoryId": "Test_Client_21P10C68818122",
"name": "Test_Client_21P10C68818122",
"inventoryId": "Open_AP_21P10C68818122",
"name": "Open_AP_21P10C68818122",
"details": {
"model_type": "ApElementConfiguration",
"equipmentModel": "EA8300-CA",
@@ -21,7 +21,7 @@
"staticDnsIp1": null,
"staticDnsIp2": null,
"peerInfoList": [],
"deviceName": "Default Device Name",
"deviceName": "Open_AP_21P10C68818122",
"locationData": null,
"locallyConfiguredMgmtVlan": 0,
"locallyConfigured": false,
@@ -38,33 +38,43 @@
"channelNumber": 6,
"manualChannelNumber": 6,
"backupChannelNumber": 11,
"bannedChannels": [],
"allowedChannels": [],
"allowedChannels": [
1,
2,
3,
4,
5,
6,
7,
8,
9,
10,
11
],
"rxCellSizeDb": {
"model_type": "SourceSelectionValue",
"source": "auto",
"source": "profile",
"value": -90
},
"probeResponseThresholdDb": {
"model_type": "SourceSelectionValue",
"source": "auto",
"source": "profile",
"value": -90
},
"clientDisconnectThresholdDb": {
"model_type": "SourceSelectionValue",
"source": "auto",
"source": "profile",
"value": -90
},
"eirpTxPower": {
"model_type": "SourceSelectionValue",
"source": "auto",
"value": 32
"source": "profile",
"value": 18
},
"perimeterDetectionEnabled": true,
"bestAPSteerType": "both",
"deauthAttackDetection": null,
"allowedChannelsPowerLevels": [],
"activeChannel": 6
"allowedChannelsPowerLevels": []
},
"is5GHzU": {
"model_type": "ElementRadioConfiguration",
@@ -72,33 +82,37 @@
"channelNumber": 149,
"manualChannelNumber": 149,
"backupChannelNumber": 154,
"bannedChannels": [],
"allowedChannels": [],
"allowedChannels": [
161,
149,
165,
153,
157
],
"rxCellSizeDb": {
"model_type": "SourceSelectionValue",
"source": "auto",
"source": "profile",
"value": -90
},
"probeResponseThresholdDb": {
"model_type": "SourceSelectionValue",
"source": "auto",
"source": "profile",
"value": -90
},
"clientDisconnectThresholdDb": {
"model_type": "SourceSelectionValue",
"source": "auto",
"source": "profile",
"value": -90
},
"eirpTxPower": {
"model_type": "SourceSelectionValue",
"source": "auto",
"value": 32
"source": "profile",
"value": 18
},
"perimeterDetectionEnabled": true,
"bestAPSteerType": "both",
"deauthAttackDetection": null,
"allowedChannelsPowerLevels": [],
"activeChannel": 149
"allowedChannelsPowerLevels": []
},
"is5GHzL": {
"model_type": "ElementRadioConfiguration",
@@ -106,33 +120,36 @@
"channelNumber": 36,
"manualChannelNumber": 36,
"backupChannelNumber": 44,
"bannedChannels": [],
"allowedChannels": [],
"allowedChannels": [
48,
36,
40,
44
],
"rxCellSizeDb": {
"model_type": "SourceSelectionValue",
"source": "auto",
"source": "profile",
"value": -90
},
"probeResponseThresholdDb": {
"model_type": "SourceSelectionValue",
"source": "auto",
"source": "profile",
"value": -90
},
"clientDisconnectThresholdDb": {
"model_type": "SourceSelectionValue",
"source": "auto",
"source": "profile",
"value": -90
},
"eirpTxPower": {
"model_type": "SourceSelectionValue",
"source": "auto",
"value": 32
"source": "profile",
"value": 18
},
"perimeterDetectionEnabled": true,
"bestAPSteerType": "both",
"deauthAttackDetection": null,
"allowedChannelsPowerLevels": [],
"activeChannel": 36
"allowedChannelsPowerLevels": []
}
},
"advancedRadioMap": {
@@ -143,22 +160,28 @@
"fragmentationThresholdBytes": 2346,
"uapsdState": "enabled",
"stationIsolation": "disabled",
"multicastRate": {
"model_type": "SourceSelectionMulticast",
"source": "profile",
"value": "auto"
},
"managementRate": {
"model_type": "SourceSelectionManagement",
"source": "auto",
"source": "profile",
"value": "auto"
},
"bestApSettings": {
"model_type": "SourceSelectionSteering",
"source": "auto",
"source": "manual",
"value": {
"model_type": "RadioBestApSettings",
"mlComputed": true,
"dropInSnrPercentage": 30,
"minLoadFactor": 40
"dropInSnrPercentage": 20,
"minLoadFactor": 50
}
},
"legacyBSSRate": "enabled",
"dtimPeriod": 2,
"deauthAttackDetection": null
},
"is5GHzU": {
@@ -168,14 +191,19 @@
"fragmentationThresholdBytes": 2346,
"uapsdState": "enabled",
"stationIsolation": "disabled",
"multicastRate": {
"model_type": "SourceSelectionMulticast",
"source": "profile",
"value": "auto"
},
"managementRate": {
"model_type": "SourceSelectionManagement",
"source": "auto",
"source": "profile",
"value": "auto"
},
"bestApSettings": {
"model_type": "SourceSelectionSteering",
"source": "auto",
"source": "manual",
"value": {
"model_type": "RadioBestApSettings",
"mlComputed": true,
@@ -184,6 +212,7 @@
}
},
"legacyBSSRate": "enabled",
"dtimPeriod": 2,
"deauthAttackDetection": null
},
"is5GHzL": {
@@ -193,14 +222,19 @@
"fragmentationThresholdBytes": 2346,
"uapsdState": "enabled",
"stationIsolation": "disabled",
"multicastRate": {
"model_type": "SourceSelectionMulticast",
"source": "profile",
"value": "auto"
},
"managementRate": {
"model_type": "SourceSelectionManagement",
"source": "auto",
"source": "profile",
"value": "auto"
},
"bestApSettings": {
"model_type": "SourceSelectionSteering",
"source": "auto",
"source": "manual",
"value": {
"model_type": "RadioBestApSettings",
"mlComputed": true,
@@ -209,13 +243,19 @@
}
},
"legacyBSSRate": "enabled",
"dtimPeriod": 2,
"deauthAttackDetection": null
}
}
},
"latitude": null,
"longitude": null,
"baseMacAddress": {
"model_type": "MacAddress",
"address": "JPWi7y5T",
"addressAsString": "24:f5:a2:ef:2e:53"
},
"serial": "21P10C68818122",
"createdTimestamp": 1591653239821,
"lastModifiedTimestamp": 1591653241398
"createdTimestamp": 0,
"lastModifiedTimestamp": 1611264546193
}

40
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": 12,
"id": 38,
"customerId": 2,
"profileType": "equipment_ap",
"name": "ApProfile-3-radios",
"name": "ap-profile-2021-01-21T21:28:59.371Z",
"details": {
"model_type": "ApNetworkConfiguration",
"networkConfigVersion": "AP-1",
@@ -20,12 +20,12 @@
"syntheticClientEnabled": true,
"ledControlEnabled": true,
"equipmentDiscovery": false,
"greTunnelName": null,
"greParentIfName": null,
"greLocalInetAddr": null,
"greRemoteInetAddr": null,
"greRemoteMacAddr": null,
"radioMap": {
"is5GHz": {
"model_type": "RadioProfileConfiguration",
"bestApEnabled": true,
"bestAPSteerType": "both"
},
"is2dot4GHz": {
"model_type": "RadioProfileConfiguration",
"bestApEnabled": true,
@@ -45,29 +45,23 @@
"greTunnelConfigurations": [
{
"model_type": "GreTunnelConfiguration",
"greTunnelName": "gre1",
"greParentIfName": "wan",
"greLocalInetAddr": "10.0.0.129",
"greRemoteInetAddr": "192.168.1.101",
"greRemoteMacAddr": {
"model_type": "MacAddress",
"address": "ZEvwIFf/",
"addressAsString": "64:4b:f0:20:57:ff"
},
"greTunnelName": null,
"greParentIfName": null,
"greLocalInetAddr": null,
"greRemoteInetAddr": null,
"greRemoteMacAddr": null,
"vlanIdsInGreTunnel": [
100
]
}
],
"profileType": "equipment_ap"
},
"createdTimestamp": 1606778369934,
"lastModifiedTimestamp": 1606778443413,
"createdTimestamp": 1611264539383,
"lastModifiedTimestamp": 1611264539383,
"childProfileIds": [
16,
4,
5,
10,
11,
15
31,
32
]
}

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

@@ -1,7 +1,7 @@
[
{
"model_type": "Profile",
"id": 14,
"id": 5,
"customerId": 2,
"profileType": "captive_portal",
"name": "Captive-portal",
@@ -17,7 +17,8 @@
"sessionTimeoutInMinutes": 60,
"logoFile": null,
"backgroundFile": null,
"walledGardenAllowlist": [],
"walledGardenAllowlist": [
],
"usernamePasswordFile": {
"model_type": "ManagedFileInfo",
"md5checksum": null,
@@ -40,8 +41,8 @@
"model_type": "TimedAccessUserRecord",
"username": "customer",
"password": "testing123",
"activationTime": 1602183994956,
"expirationTime": 1602212794956,
"activationTime": 1611262628973,
"expirationTime": 1611291428973,
"numDevices": 1,
"userDetails": {
"model_type": "TimedAccessUserDetails",
@@ -62,8 +63,8 @@
"model_type": "TimedAccessUserRecord",
"username": "customer",
"password": "testing123",
"activationTime": 1602183994957,
"expirationTime": 1602187594957,
"activationTime": 1611262628974,
"expirationTime": 1611266228974,
"numDevices": 0,
"userDetails": {
"model_type": "TimedAccessUserDetails",
@@ -84,8 +85,8 @@
"model_type": "TimedAccessUserRecord",
"username": "customer2",
"password": "testing1234",
"activationTime": 1602183994957,
"expirationTime": 1602788794957,
"activationTime": 1611262628974,
"expirationTime": 1611867428974,
"numDevices": 1,
"userDetails": {
"model_type": "TimedAccessUserDetails",
@@ -106,8 +107,8 @@
"model_type": "TimedAccessUserRecord",
"username": "customer2",
"password": "testing1234",
"activationTime": 1602183994957,
"expirationTime": 1602270394957,
"activationTime": 1611262628974,
"expirationTime": 1611349028974,
"numDevices": 0,
"userDetails": {
"model_type": "TimedAccessUserDetails",
@@ -125,11 +126,13 @@
"lastModifiedTimestamp": 0
}
],
"macAllowList": [],
"macAllowList": [
],
"profileType": "captive_portal"
},
"createdTimestamp": 1602183994959,
"lastModifiedTimestamp": 1602183994959,
"childProfileIds": []
"createdTimestamp": 1611262628978,
"lastModifiedTimestamp": 1611262628978,
"childProfileIds": [
]
}
]

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

@@ -1,10 +1,10 @@
[
{
"model_type": "Profile",
"id": 24,
"id": 37,
"customerId": 2,
"profileType": "passpoint",
"name": "TipWlan-Passpoint-Config",
"name": "hotspot20-profile-2021-01-21T21:28:59.171Z",
"details": {
"model_type": "PasspointProfile",
"enableInterworkingAndHs20": true,
@@ -31,8 +31,8 @@
{
"model_type": "PasspointConnectionCapability",
"connectionCapabilitiesPortNumber": 8888,
"connectionCapabilitiesStatus": "open",
"connectionCapabilitiesIpProtocol": "TCP"
"connectionCapabilitiesIpProtocol": "TCP",
"connectionCapabilitiesStatus": "open"
}
],
"ipAddressTypeAvailability": "public_IPv4_address_available",
@@ -46,26 +46,26 @@
"enable2pt4GHz": true,
"enable5GHz": true,
"associatedAccessSsidProfileIds": [
15
32
],
"osuSsidProfileId": 16,
"passpointOperatorProfileId": 17,
"passpointVenueProfileId": 18,
"osuSsidProfileId": 31,
"passpointOperatorProfileId": 34,
"passpointVenueProfileId": 33,
"passpointOsuProviderProfileIds": [
19,
20
35,
36
],
"accessNetworkType": "free_public_network",
"networkAuthenticationType": "acceptance_of_terms_and_conditions",
"profileType": "passpoint"
},
"createdTimestamp": 1606778370807,
"lastModifiedTimestamp": 1606778370807,
"createdTimestamp": 0,
"lastModifiedTimestamp": 1611264539331,
"childProfileIds": [
17,
18,
19,
20
33,
34,
35,
36
]
}
]

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

@@ -1,10 +1,10 @@
[
{
"model_type": "Profile",
"id": 19,
"id": 35,
"customerId": 2,
"profileType": "passpoint_osu_id_provider",
"name": "TipWlan-Passpoint-OSU-Provider",
"name": "provider1-profile-2021-01-21T21:28:59.057Z",
"details": {
"model_type": "PasspointOsuProviderProfile",
"mccMncList": [
@@ -80,7 +80,7 @@
"osuFriendlyName": [
{
"model_type": "PasspointDuple",
"locale": "en_CA",
"locale": "eng",
"dupleIso3Language": "eng",
"dupleName": "Example provider rogers",
"defaultDupleSeparator": ":",
@@ -88,7 +88,7 @@
},
{
"model_type": "PasspointDuple",
"locale": "fr_CA",
"locale": "fra",
"dupleIso3Language": "fra",
"dupleName": "Exemple de fournisseur rogers",
"defaultDupleSeparator": ":",
@@ -104,7 +104,7 @@
"osuServiceDescription": [
{
"model_type": "PasspointDuple",
"locale": "en_CA",
"locale": "eng",
"dupleIso3Language": "eng",
"dupleName": "Example services rogers",
"defaultDupleSeparator": ":",
@@ -112,7 +112,7 @@
},
{
"model_type": "PasspointDuple",
"locale": "fr_CA",
"locale": "fra",
"dupleIso3Language": "fra",
"dupleName": "Exemples de services rogers",
"defaultDupleSeparator": ":",
@@ -125,17 +125,16 @@
],
"profileType": "passpoint_osu_id_provider"
},
"createdTimestamp": 1606778370345,
"lastModifiedTimestamp": 1606778370345,
"childProfileIds": [
]
"createdTimestamp": 1611264539070,
"lastModifiedTimestamp": 1611264539070,
"childProfileIds": []
},
{
"model_type": "Profile",
"id": 20,
"id": 36,
"customerId": 2,
"profileType": "passpoint_osu_id_provider",
"name": "TipWlan-Passpoint-OSU-Provider-2",
"name": "provider2-profile-2021-01-21T21:28:59.118Z",
"details": {
"model_type": "PasspointOsuProviderProfile",
"mccMncList": [
@@ -211,7 +210,7 @@
"osuFriendlyName": [
{
"model_type": "PasspointDuple",
"locale": "en_CA",
"locale": "eng",
"dupleIso3Language": "eng",
"dupleName": "Example provider telus",
"defaultDupleSeparator": ":",
@@ -219,7 +218,7 @@
},
{
"model_type": "PasspointDuple",
"locale": "fr_CA",
"locale": "fra",
"dupleIso3Language": "fra",
"dupleName": "Exemple de fournisseur telus",
"defaultDupleSeparator": ":",
@@ -235,7 +234,7 @@
"osuServiceDescription": [
{
"model_type": "PasspointDuple",
"locale": "en_CA",
"locale": "eng",
"dupleIso3Language": "eng",
"dupleName": "Example services telus",
"defaultDupleSeparator": ":",
@@ -243,7 +242,7 @@
},
{
"model_type": "PasspointDuple",
"locale": "fr_CA",
"locale": "fra",
"dupleIso3Language": "fra",
"dupleName": "Exemples de services telus",
"defaultDupleSeparator": ":",
@@ -257,9 +256,8 @@
],
"profileType": "passpoint_osu_id_provider"
},
"createdTimestamp": 1606778370351,
"lastModifiedTimestamp": 1606778370351,
"childProfileIds": [
]
"createdTimestamp": 1611264539131,
"lastModifiedTimestamp": 1611264539131,
"childProfileIds": []
}
]

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

@@ -1,10 +1,10 @@
[
{
"model_type": "Profile",
"id": 17,
"id": 34,
"customerId": 2,
"profileType": "passpoint_operator",
"name": "TipWlan-Passpoint-Operator",
"name": "operator-profile-2021-01-21T21:28:58.994Z",
"details": {
"model_type": "PasspointOperatorProfile",
"serverOnlyAuthenticatedL2EncryptionNetwork": false,
@@ -12,31 +12,30 @@
"operatorFriendlyName": [
{
"model_type": "PasspointDuple",
"locale": "en_CA",
"dupleIso3Language": "eng",
"dupleName": "Default friendly passpoint_operator name",
"defaultDupleSeparator": ":",
"asDuple": "eng:Default friendly passpoint_operator name"
},
{
"model_type": "PasspointDuple",
"locale": "fr_CA",
"locale": "fra",
"dupleIso3Language": "fra",
"dupleName": "Nom de l'opérateur convivial par défaut",
"defaultDupleSeparator": ":",
"asDuple": "fra:Nom de l'opérateur convivial par défaut"
},
{
"model_type": "PasspointDuple",
"locale": "eng",
"dupleIso3Language": "eng",
"dupleName": "Default friendly passpoint_operator name",
"defaultDupleSeparator": ":",
"asDuple": "eng:Default friendly passpoint_operator name"
}
],
"domainNameList": [
"bell.ca",
"telus.com",
"rogers.com",
"bell.ca"
"rogers.com"
],
"profileType": "passpoint_operator"
},
"createdTimestamp": 1606778369945,
"lastModifiedTimestamp": 1606778369945,
"childProfileIds": [
]
"createdTimestamp": 1611264539004,
"lastModifiedTimestamp": 1611264539004,
"childProfileIds": []
}
]

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

@@ -7,28 +7,26 @@
"name": "Radius-Profile",
"details": {
"model_type": "RadiusProfile",
"subnetConfiguration": null,
"serviceRegionMap": {
"Ottawa": {
"model_type": "RadiusServiceRegion",
"serverMap": {
"Radius-Profile": [
{
"primaryRadiusServer": {
"model_type": "RadiusServer",
"ipAddress": "192.168.0.1",
"secret": "testing123",
"authPort": 1812,
"timeout": null
}
]
},
"regionName": "Ottawa"
}
"secondaryRadiusServer": {
"model_type": "RadiusServer",
"ipAddress": "192.168.0.2",
"secret": "testing123",
"authPort": 1812,
"timeout": null
},
"radiusSubnetConfiguration": null,
"profileType": "radius"
},
"createdTimestamp": 1601961451668,
"lastModifiedTimestamp": 1601961451668,
"childProfileIds": []
"createdTimestamp": 1611262628767,
"lastModifiedTimestamp": 1611262628767,
"childProfileIds": [
]
}
]

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

@@ -1,6 +1,6 @@
{
"model_type": "Profile",
"id": 11,
"id": 4,
"customerId": 2,
"profileType": "rf",
"name": "TipWlan-rf",
@@ -198,7 +198,7 @@
},
"profileType": "rf"
},
"createdTimestamp": 1606778369933,
"lastModifiedTimestamp": 1606778369933,
"createdTimestamp": 1611262628788,
"lastModifiedTimestamp": 1611262628788,
"childProfileIds": []
}

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

@@ -20,9 +20,9 @@
"broadcastSsid": "enabled",
"keyRefresh": 0,
"noLocalSubnets": false,
"radiusServiceName": null,
"radiusAccountingServiceName": null,
"radiusAcountingServiceInterval": null,
"radiusServiceId": 0,
"radiusAccountingServiceId": 0,
"radiusAcountingServiceInterval": 60,
"captivePortalId": null,
"bandwidthLimitDown": 0,
"bandwidthLimitUp": 0,
@@ -76,27 +76,27 @@
},
{
"model_type": "Profile",
"id": 15,
"id": 32,
"customerId": 2,
"profileType": "ssid",
"name": "TipWlan-cloud-passpoint-access",
"name": "access-ssid-profile-2021-01-21T21:28:58.871Z",
"details": {
"model_type": "SsidConfiguration",
"ssid": "TipWlan-cloud-passpoint-access",
"ssid": "ssid-access-passpoint",
"appliedRadios": [
"is5GHzL",
"is5GHzU"
"is5GHzU",
"is5GHzL"
],
"ssidAdminState": "enabled",
"secureMode": "wpa2PSK",
"secureMode": "wpa2EAP",
"vlanId": 1,
"keyStr": "testing123",
"broadcastSsid": "enabled",
"keyRefresh": 0,
"noLocalSubnets": false,
"radiusServiceName": null,
"radiusAccountingServiceName": null,
"radiusAcountingServiceInterval": null,
"radiusServiceId": 1,
"radiusAccountingServiceId": 1,
"radiusAcountingServiceInterval": 60,
"captivePortalId": null,
"bandwidthLimitDown": 0,
"bandwidthLimitUp": 0,
@@ -104,18 +104,6 @@
"clientBandwidthLimitUp": 0,
"videoTrafficOnly": false,
"radioBasedConfigs": {
"is5GHzL": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is2dot4GHz": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is5GHz": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
@@ -127,13 +115,24 @@
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is2dot4GHz": {
"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",
"radiusClientConfiguration": {
"model_type": "RadiusNasConfiguration",
"nasClientId": "DEFAULT",
@@ -141,23 +140,25 @@
"userDefinedNasId": null,
"userDefinedNasIp": null,
"operatorId": null
}
},
"createdTimestamp": 1606778369943,
"lastModifiedTimestamp": 1606778370811,
"profileType": "ssid"
},
"createdTimestamp": 0,
"lastModifiedTimestamp": 1611264539281,
"childProfileIds": [
24
37,
1
]
},
{
"model_type": "Profile",
"id": 16,
"id": 31,
"customerId": 2,
"profileType": "ssid",
"name": "TipWlan-cloud-passpoint-osu",
"name": "osu-ssid-profile-2021-01-21T21:28:58.798Z",
"details": {
"model_type": "SsidConfiguration",
"ssid": "TipWlan-cloud-passpoint-osu",
"ssid": "ssid-open-passpoint",
"appliedRadios": [
"is2dot4GHz"
],
@@ -168,9 +169,9 @@
"broadcastSsid": "enabled",
"keyRefresh": 0,
"noLocalSubnets": false,
"radiusServiceName": null,
"radiusAccountingServiceName": null,
"radiusAcountingServiceInterval": null,
"radiusServiceId": 0,
"radiusAccountingServiceId": 0,
"radiusAcountingServiceInterval": 60,
"captivePortalId": null,
"bandwidthLimitDown": 0,
"bandwidthLimitUp": 0,
@@ -178,18 +179,6 @@
"clientBandwidthLimitUp": 0,
"videoTrafficOnly": false,
"radioBasedConfigs": {
"is5GHzL": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is2dot4GHz": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is5GHz": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
@@ -201,13 +190,24 @@
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is2dot4GHz": {
"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",
"radiusClientConfiguration": {
"model_type": "RadiusNasConfiguration",
"nasClientId": "DEFAULT",
@@ -215,13 +215,13 @@
"userDefinedNasId": null,
"userDefinedNasIp": null,
"operatorId": null
}
},
"createdTimestamp": 1606778369944,
"lastModifiedTimestamp": 1606778370352,
"profileType": "ssid"
},
"createdTimestamp": 0,
"lastModifiedTimestamp": 1611264539231,
"childProfileIds": [
19,
20
37
]
}
]

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

@@ -1,16 +1,16 @@
[
{
"model_type": "Profile",
"id": 18,
"id": 33,
"customerId": 2,
"profileType": "passpoint_venue",
"name": "TipWlan-Passpoint-Venue",
"name": "venue-profile-2021-01-21T21:28:58.934Z",
"details": {
"model_type": "PasspointVenueProfile",
"venueNameSet": [
{
"model_type": "PasspointVenueName",
"locale": "fr_CA",
"locale": "fra",
"dupleIso3Language": "fra",
"dupleName": "Exemple de lieu",
"defaultDupleSeparator": ":",
@@ -19,7 +19,7 @@
},
{
"model_type": "PasspointVenueName",
"locale": "en_CA",
"locale": "eng",
"dupleIso3Language": "eng",
"dupleName": "Example passpoint_venue",
"defaultDupleSeparator": ":",
@@ -35,9 +35,8 @@
},
"profileType": "passpoint_venue"
},
"createdTimestamp": 1606778369950,
"lastModifiedTimestamp": 1606778369950,
"childProfileIds": [
]
"createdTimestamp": 1611264538947,
"lastModifiedTimestamp": 1611264538947,
"childProfileIds": []
}
]

124
opensync-gateway-static-docker/src/main/docker/app/opensync/EquipmentExample.json
View File

@@ -1,12 +1,12 @@
{
"model_type": "Equipment",
"id": 51,
"id": 1,
"customerId": 2,
"profileId": 12,
"profileId": 38,
"locationId": 8,
"equipmentType": "AP",
"inventoryId": "Test_Client_21P10C68818122",
"name": "Test_Client_21P10C68818122",
"inventoryId": "Open_AP_21P10C68818122",
"name": "Open_AP_21P10C68818122",
"details": {
"model_type": "ApElementConfiguration",
"equipmentModel": "EA8300-CA",
@@ -21,7 +21,7 @@
"staticDnsIp1": null,
"staticDnsIp2": null,
"peerInfoList": [],
"deviceName": "Default Device Name",
"deviceName": "Open_AP_21P10C68818122",
"locationData": null,
"locallyConfiguredMgmtVlan": 0,
"locallyConfigured": false,
@@ -38,33 +38,43 @@
"channelNumber": 6,
"manualChannelNumber": 6,
"backupChannelNumber": 11,
"bannedChannels": [],
"allowedChannels": [],
"allowedChannels": [
1,
2,
3,
4,
5,
6,
7,
8,
9,
10,
11
],
"rxCellSizeDb": {
"model_type": "SourceSelectionValue",
"source": "auto",
"source": "profile",
"value": -90
},
"probeResponseThresholdDb": {
"model_type": "SourceSelectionValue",
"source": "auto",
"source": "profile",
"value": -90
},
"clientDisconnectThresholdDb": {
"model_type": "SourceSelectionValue",
"source": "auto",
"source": "profile",
"value": -90
},
"eirpTxPower": {
"model_type": "SourceSelectionValue",
"source": "auto",
"value": 32
"source": "profile",
"value": 18
},
"perimeterDetectionEnabled": true,
"bestAPSteerType": "both",
"deauthAttackDetection": null,
"allowedChannelsPowerLevels": [],
"activeChannel": 6
"allowedChannelsPowerLevels": []
},
"is5GHzU": {
"model_type": "ElementRadioConfiguration",
@@ -72,33 +82,37 @@
"channelNumber": 149,
"manualChannelNumber": 149,
"backupChannelNumber": 154,
"bannedChannels": [],
"allowedChannels": [],
"allowedChannels": [
161,
149,
165,
153,
157
],
"rxCellSizeDb": {
"model_type": "SourceSelectionValue",
"source": "auto",
"source": "profile",
"value": -90
},
"probeResponseThresholdDb": {
"model_type": "SourceSelectionValue",
"source": "auto",
"source": "profile",
"value": -90
},
"clientDisconnectThresholdDb": {
"model_type": "SourceSelectionValue",
"source": "auto",
"source": "profile",
"value": -90
},
"eirpTxPower": {
"model_type": "SourceSelectionValue",
"source": "auto",
"value": 32
"source": "profile",
"value": 18
},
"perimeterDetectionEnabled": true,
"bestAPSteerType": "both",
"deauthAttackDetection": null,
"allowedChannelsPowerLevels": [],
"activeChannel": 149
"allowedChannelsPowerLevels": []
},
"is5GHzL": {
"model_type": "ElementRadioConfiguration",
@@ -106,33 +120,36 @@
"channelNumber": 36,
"manualChannelNumber": 36,
"backupChannelNumber": 44,
"bannedChannels": [],
"allowedChannels": [],
"allowedChannels": [
48,
36,
40,
44
],
"rxCellSizeDb": {
"model_type": "SourceSelectionValue",
"source": "auto",
"source": "profile",
"value": -90
},
"probeResponseThresholdDb": {
"model_type": "SourceSelectionValue",
"source": "auto",
"source": "profile",
"value": -90
},
"clientDisconnectThresholdDb": {
"model_type": "SourceSelectionValue",
"source": "auto",
"source": "profile",
"value": -90
},
"eirpTxPower": {
"model_type": "SourceSelectionValue",
"source": "auto",
"value": 32
"source": "profile",
"value": 18
},
"perimeterDetectionEnabled": true,
"bestAPSteerType": "both",
"deauthAttackDetection": null,
"allowedChannelsPowerLevels": [],
"activeChannel": 36
"allowedChannelsPowerLevels": []
}
},
"advancedRadioMap": {
@@ -143,22 +160,28 @@
"fragmentationThresholdBytes": 2346,
"uapsdState": "enabled",
"stationIsolation": "disabled",
"multicastRate": {
"model_type": "SourceSelectionMulticast",
"source": "profile",
"value": "auto"
},
"managementRate": {
"model_type": "SourceSelectionManagement",
"source": "auto",
"source": "profile",
"value": "auto"
},
"bestApSettings": {
"model_type": "SourceSelectionSteering",
"source": "auto",
"source": "manual",
"value": {
"model_type": "RadioBestApSettings",
"mlComputed": true,
"dropInSnrPercentage": 30,
"minLoadFactor": 40
"dropInSnrPercentage": 20,
"minLoadFactor": 50
}
},
"legacyBSSRate": "enabled",
"dtimPeriod": 2,
"deauthAttackDetection": null
},
"is5GHzU": {
@@ -168,14 +191,19 @@
"fragmentationThresholdBytes": 2346,
"uapsdState": "enabled",
"stationIsolation": "disabled",
"multicastRate": {
"model_type": "SourceSelectionMulticast",
"source": "profile",
"value": "auto"
},
"managementRate": {
"model_type": "SourceSelectionManagement",
"source": "auto",
"source": "profile",
"value": "auto"
},
"bestApSettings": {
"model_type": "SourceSelectionSteering",
"source": "auto",
"source": "manual",
"value": {
"model_type": "RadioBestApSettings",
"mlComputed": true,
@@ -184,6 +212,7 @@
}
},
"legacyBSSRate": "enabled",
"dtimPeriod": 2,
"deauthAttackDetection": null
},
"is5GHzL": {
@@ -193,14 +222,19 @@
"fragmentationThresholdBytes": 2346,
"uapsdState": "enabled",
"stationIsolation": "disabled",
"multicastRate": {
"model_type": "SourceSelectionMulticast",
"source": "profile",
"value": "auto"
},
"managementRate": {
"model_type": "SourceSelectionManagement",
"source": "auto",
"source": "profile",
"value": "auto"
},
"bestApSettings": {
"model_type": "SourceSelectionSteering",
"source": "auto",
"source": "manual",
"value": {
"model_type": "RadioBestApSettings",
"mlComputed": true,
@@ -209,13 +243,19 @@
}
},
"legacyBSSRate": "enabled",
"dtimPeriod": 2,
"deauthAttackDetection": null
}
}
},
"latitude": null,
"longitude": null,
"baseMacAddress": {
"model_type": "MacAddress",
"address": "JPWi7y5T",
"addressAsString": "24:f5:a2:ef:2e:53"
},
"serial": "21P10C68818122",
"createdTimestamp": 1591653239821,
"lastModifiedTimestamp": 1591653241398
"createdTimestamp": 0,
"lastModifiedTimestamp": 1611264546193
}

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

@@ -1,9 +1,9 @@
{
"model_type": "Profile",
"id": 12,
"id": 38,
"customerId": 2,
"profileType": "equipment_ap",
"name": "ApProfile-3-radios",
"name": "ap-profile-2021-01-21T21:28:59.371Z",
"details": {
"model_type": "ApNetworkConfiguration",
"networkConfigVersion": "AP-1",
@@ -20,12 +20,12 @@
"syntheticClientEnabled": true,
"ledControlEnabled": true,
"equipmentDiscovery": false,
"greTunnelName": null,
"greParentIfName": null,
"greLocalInetAddr": null,
"greRemoteInetAddr": null,
"greRemoteMacAddr": null,
"radioMap": {
"is5GHz": {
"model_type": "RadioProfileConfiguration",
"bestApEnabled": true,
"bestAPSteerType": "both"
},
"is2dot4GHz": {
"model_type": "RadioProfileConfiguration",
"bestApEnabled": true,
@@ -45,29 +45,23 @@
"greTunnelConfigurations": [
{
"model_type": "GreTunnelConfiguration",
"greTunnelName": "gre1",
"greParentIfName": "wan",
"greLocalInetAddr": "10.0.0.129",
"greRemoteInetAddr": "192.168.1.101",
"greRemoteMacAddr": {
"model_type": "MacAddress",
"address": "ZEvwIFf/",
"addressAsString": "64:4b:f0:20:57:ff"
},
"greTunnelName": null,
"greParentIfName": null,
"greLocalInetAddr": null,
"greRemoteInetAddr": null,
"greRemoteMacAddr": null,
"vlanIdsInGreTunnel": [
100
]
}
],
"profileType": "equipment_ap"
},
"createdTimestamp": 1606778369934,
"lastModifiedTimestamp": 1606778443413,
"createdTimestamp": 1611264539383,
"lastModifiedTimestamp": 1611264539383,
"childProfileIds": [
16,
4,
5,
10,
11,
15
31,
32
]
}

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

@@ -1,7 +1,7 @@
[
{
"model_type": "Profile",
"id": 14,
"id": 5,
"customerId": 2,
"profileType": "captive_portal",
"name": "Captive-portal",
@@ -17,7 +17,8 @@
"sessionTimeoutInMinutes": 60,
"logoFile": null,
"backgroundFile": null,
"walledGardenAllowlist": [],
"walledGardenAllowlist": [
],
"usernamePasswordFile": {
"model_type": "ManagedFileInfo",
"md5checksum": null,
@@ -40,8 +41,8 @@
"model_type": "TimedAccessUserRecord",
"username": "customer",
"password": "testing123",
"activationTime": 1602183994956,
"expirationTime": 1602212794956,
"activationTime": 1611262628973,
"expirationTime": 1611291428973,
"numDevices": 1,
"userDetails": {
"model_type": "TimedAccessUserDetails",
@@ -62,8 +63,8 @@
"model_type": "TimedAccessUserRecord",
"username": "customer",
"password": "testing123",
"activationTime": 1602183994957,
"expirationTime": 1602187594957,
"activationTime": 1611262628974,
"expirationTime": 1611266228974,
"numDevices": 0,
"userDetails": {
"model_type": "TimedAccessUserDetails",
@@ -84,8 +85,8 @@
"model_type": "TimedAccessUserRecord",
"username": "customer2",
"password": "testing1234",
"activationTime": 1602183994957,
"expirationTime": 1602788794957,
"activationTime": 1611262628974,
"expirationTime": 1611867428974,
"numDevices": 1,
"userDetails": {
"model_type": "TimedAccessUserDetails",
@@ -106,8 +107,8 @@
"model_type": "TimedAccessUserRecord",
"username": "customer2",
"password": "testing1234",
"activationTime": 1602183994957,
"expirationTime": 1602270394957,
"activationTime": 1611262628974,
"expirationTime": 1611349028974,
"numDevices": 0,
"userDetails": {
"model_type": "TimedAccessUserDetails",
@@ -125,11 +126,13 @@
"lastModifiedTimestamp": 0
}
],
"macAllowList": [],
"macAllowList": [
],
"profileType": "captive_portal"
},
"createdTimestamp": 1602183994959,
"lastModifiedTimestamp": 1602183994959,
"childProfileIds": []
"createdTimestamp": 1611262628978,
"lastModifiedTimestamp": 1611262628978,
"childProfileIds": [
]
}
]

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

@@ -1,10 +1,10 @@
[
{
"model_type": "Profile",
"id": 24,
"id": 37,
"customerId": 2,
"profileType": "passpoint",
"name": "TipWlan-Passpoint-Config",
"name": "hotspot20-profile-2021-01-21T21:28:59.171Z",
"details": {
"model_type": "PasspointProfile",
"enableInterworkingAndHs20": true,
@@ -31,8 +31,8 @@
{
"model_type": "PasspointConnectionCapability",
"connectionCapabilitiesPortNumber": 8888,
"connectionCapabilitiesStatus": "open",
"connectionCapabilitiesIpProtocol": "TCP"
"connectionCapabilitiesIpProtocol": "TCP",
"connectionCapabilitiesStatus": "open"
}
],
"ipAddressTypeAvailability": "public_IPv4_address_available",
@@ -46,26 +46,26 @@
"enable2pt4GHz": true,
"enable5GHz": true,
"associatedAccessSsidProfileIds": [
15
32
],
"osuSsidProfileId": 16,
"passpointOperatorProfileId": 17,
"passpointVenueProfileId": 18,
"osuSsidProfileId": 31,
"passpointOperatorProfileId": 34,
"passpointVenueProfileId": 33,
"passpointOsuProviderProfileIds": [
19,
20
35,
36
],
"accessNetworkType": "free_public_network",
"networkAuthenticationType": "acceptance_of_terms_and_conditions",
"profileType": "passpoint"
},
"createdTimestamp": 1606778370807,
"lastModifiedTimestamp": 1606778370807,
"createdTimestamp": 0,
"lastModifiedTimestamp": 1611264539331,
"childProfileIds": [
17,
18,
19,
20
33,
34,
35,
36
]
}
]

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

@@ -1,13 +1,12 @@
[
{
"model_type": "Profile",
"id": 19,
"id": 35,
"customerId": 2,
"profileType": "passpoint_osu_id_provider",
"name": "TipWlan-Passpoint-OSU-Provider",
"name": "provider1-profile-2021-01-21T21:28:59.057Z",
"details": {
"model_type": "PasspointOsuProviderProfile",
"domainName": "rogers.com",
"mccMncList": [
{
"model_type": "PasspointMccMnc",
@@ -81,7 +80,7 @@
"osuFriendlyName": [
{
"model_type": "PasspointDuple",
"locale": "en_CA",
"locale": "eng",
"dupleIso3Language": "eng",
"dupleName": "Example provider rogers",
"defaultDupleSeparator": ":",
@@ -89,7 +88,7 @@
},
{
"model_type": "PasspointDuple",
"locale": "fr_CA",
"locale": "fra",
"dupleIso3Language": "fra",
"dupleName": "Exemple de fournisseur rogers",
"defaultDupleSeparator": ":",
@@ -105,7 +104,7 @@
"osuServiceDescription": [
{
"model_type": "PasspointDuple",
"locale": "en_CA",
"locale": "eng",
"dupleIso3Language": "eng",
"dupleName": "Example services rogers",
"defaultDupleSeparator": ":",
@@ -113,7 +112,7 @@
},
{
"model_type": "PasspointDuple",
"locale": "fr_CA",
"locale": "fra",
"dupleIso3Language": "fra",
"dupleName": "Exemples de services rogers",
"defaultDupleSeparator": ":",
@@ -126,20 +125,18 @@
],
"profileType": "passpoint_osu_id_provider"
},
"createdTimestamp": 1606778370345,
"lastModifiedTimestamp": 1606778370345,
"childProfileIds": [
]
"createdTimestamp": 1611264539070,
"lastModifiedTimestamp": 1611264539070,
"childProfileIds": []
},
{
"model_type": "Profile",
"id": 20,
"id": 36,
"customerId": 2,
"profileType": "passpoint_osu_id_provider",
"name": "TipWlan-Passpoint-OSU-Provider-2",
"name": "provider2-profile-2021-01-21T21:28:59.118Z",
"details": {
"model_type": "PasspointOsuProviderProfile",
"domainName": "telus.com",
"mccMncList": [
{
"model_type": "PasspointMccMnc",
@@ -213,7 +210,7 @@
"osuFriendlyName": [
{
"model_type": "PasspointDuple",
"locale": "en_CA",
"locale": "eng",
"dupleIso3Language": "eng",
"dupleName": "Example provider telus",
"defaultDupleSeparator": ":",
@@ -221,7 +218,7 @@
},
{
"model_type": "PasspointDuple",
"locale": "fr_CA",
"locale": "fra",
"dupleIso3Language": "fra",
"dupleName": "Exemple de fournisseur telus",
"defaultDupleSeparator": ":",
@@ -237,7 +234,7 @@
"osuServiceDescription": [
{
"model_type": "PasspointDuple",
"locale": "en_CA",
"locale": "eng",
"dupleIso3Language": "eng",
"dupleName": "Example services telus",
"defaultDupleSeparator": ":",
@@ -245,7 +242,7 @@
},
{
"model_type": "PasspointDuple",
"locale": "fr_CA",
"locale": "fra",
"dupleIso3Language": "fra",
"dupleName": "Exemples de services telus",
"defaultDupleSeparator": ":",
@@ -259,9 +256,8 @@
],
"profileType": "passpoint_osu_id_provider"
},
"createdTimestamp": 1606778370351,
"lastModifiedTimestamp": 1606778370351,
"childProfileIds": [
]
"createdTimestamp": 1611264539131,
"lastModifiedTimestamp": 1611264539131,
"childProfileIds": []
}
]

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

@@ -1,10 +1,10 @@
[
{
"model_type": "Profile",
"id": 17,
"id": 34,
"customerId": 2,
"profileType": "passpoint_operator",
"name": "TipWlan-Passpoint-Operator",
"name": "operator-profile-2021-01-21T21:28:58.994Z",
"details": {
"model_type": "PasspointOperatorProfile",
"serverOnlyAuthenticatedL2EncryptionNetwork": false,
@@ -12,26 +12,30 @@
"operatorFriendlyName": [
{
"model_type": "PasspointDuple",
"locale": "en_CA",
"dupleIso3Language": "eng",
"dupleName": "Default friendly passpoint_operator name",
"defaultDupleSeparator": ":",
"asDuple": "eng:Default friendly passpoint_operator name"
},
{
"model_type": "PasspointDuple",
"locale": "fr_CA",
"locale": "fra",
"dupleIso3Language": "fra",
"dupleName": "Nom de l'opérateur convivial par défaut",
"defaultDupleSeparator": ":",
"asDuple": "fra:Nom de l'opérateur convivial par défaut"
},
{
"model_type": "PasspointDuple",
"locale": "eng",
"dupleIso3Language": "eng",
"dupleName": "Default friendly passpoint_operator name",
"defaultDupleSeparator": ":",
"asDuple": "eng:Default friendly passpoint_operator name"
}
],
"domainNameList": [
"bell.ca",
"telus.com",
"rogers.com"
],
"profileType": "passpoint_operator"
},
"createdTimestamp": 1606778369945,
"lastModifiedTimestamp": 1606778369945,
"childProfileIds": [
]
"createdTimestamp": 1611264539004,
"lastModifiedTimestamp": 1611264539004,
"childProfileIds": []
}
]

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

@@ -7,28 +7,26 @@
"name": "Radius-Profile",
"details": {
"model_type": "RadiusProfile",
"subnetConfiguration": null,
"serviceRegionMap": {
"Ottawa": {
"model_type": "RadiusServiceRegion",
"serverMap": {
"Radius-Profile": [
{
"primaryRadiusServer": {
"model_type": "RadiusServer",
"ipAddress": "192.168.0.1",
"secret": "testing123",
"authPort": 1812,
"timeout": null
}
]
},
"regionName": "Ottawa"
}
"secondaryRadiusServer": {
"model_type": "RadiusServer",
"ipAddress": "192.168.0.2",
"secret": "testing123",
"authPort": 1812,
"timeout": null
},
"radiusSubnetConfiguration": null,
"profileType": "radius"
},
"createdTimestamp": 1601961451668,
"lastModifiedTimestamp": 1601961451668,
"childProfileIds": []
"createdTimestamp": 1611262628767,
"lastModifiedTimestamp": 1611262628767,
"childProfileIds": [
]
}
]

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

@@ -1,6 +1,6 @@
{
"model_type": "Profile",
"id": 11,
"id": 4,
"customerId": 2,
"profileType": "rf",
"name": "TipWlan-rf",
@@ -198,7 +198,7 @@
},
"profileType": "rf"
},
"createdTimestamp": 1606778369933,
"lastModifiedTimestamp": 1606778369933,
"createdTimestamp": 1611262628788,
"lastModifiedTimestamp": 1611262628788,
"childProfileIds": []
}

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

@@ -20,9 +20,9 @@
"broadcastSsid": "enabled",
"keyRefresh": 0,
"noLocalSubnets": false,
"radiusServiceName": null,
"radiusAccountingServiceName": null,
"radiusAcountingServiceInterval": null,
"radiusServiceId": 0,
"radiusAccountingServiceId": 0,
"radiusAcountingServiceInterval": 60,
"captivePortalId": null,
"bandwidthLimitDown": 0,
"bandwidthLimitUp": 0,
@@ -76,27 +76,27 @@
},
{
"model_type": "Profile",
"id": 15,
"id": 32,
"customerId": 2,
"profileType": "ssid",
"name": "TipWlan-cloud-passpoint-access",
"name": "access-ssid-profile-2021-01-21T21:28:58.871Z",
"details": {
"model_type": "SsidConfiguration",
"ssid": "TipWlan-cloud-passpoint-access",
"ssid": "ssid-access-passpoint",
"appliedRadios": [
"is5GHzL",
"is5GHzU"
"is5GHzU",
"is5GHzL"
],
"ssidAdminState": "enabled",
"secureMode": "wpa2PSK",
"secureMode": "wpa2EAP",
"vlanId": 1,
"keyStr": "testing123",
"broadcastSsid": "enabled",
"keyRefresh": 0,
"noLocalSubnets": false,
"radiusServiceName": null,
"radiusAccountingServiceName": null,
"radiusAcountingServiceInterval": null,
"radiusServiceId": 1,
"radiusAccountingServiceId": 1,
"radiusAcountingServiceInterval": 60,
"captivePortalId": null,
"bandwidthLimitDown": 0,
"bandwidthLimitUp": 0,
@@ -104,18 +104,6 @@
"clientBandwidthLimitUp": 0,
"videoTrafficOnly": false,
"radioBasedConfigs": {
"is5GHzL": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is2dot4GHz": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is5GHz": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
@@ -127,13 +115,24 @@
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is2dot4GHz": {
"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",
"radiusClientConfiguration": {
"model_type": "RadiusNasConfiguration",
"nasClientId": "DEFAULT",
@@ -141,23 +140,25 @@
"userDefinedNasId": null,
"userDefinedNasIp": null,
"operatorId": null
}
},
"createdTimestamp": 1606778369943,
"lastModifiedTimestamp": 1606778370811,
"profileType": "ssid"
},
"createdTimestamp": 0,
"lastModifiedTimestamp": 1611264539281,
"childProfileIds": [
24
37,
1
]
},
{
"model_type": "Profile",
"id": 16,
"id": 31,
"customerId": 2,
"profileType": "ssid",
"name": "TipWlan-cloud-passpoint-osu",
"name": "osu-ssid-profile-2021-01-21T21:28:58.798Z",
"details": {
"model_type": "SsidConfiguration",
"ssid": "TipWlan-cloud-passpoint-osu",
"ssid": "ssid-open-passpoint",
"appliedRadios": [
"is2dot4GHz"
],
@@ -168,9 +169,9 @@
"broadcastSsid": "enabled",
"keyRefresh": 0,
"noLocalSubnets": false,
"radiusServiceName": null,
"radiusAccountingServiceName": null,
"radiusAcountingServiceInterval": null,
"radiusServiceId": 0,
"radiusAccountingServiceId": 0,
"radiusAcountingServiceInterval": 60,
"captivePortalId": null,
"bandwidthLimitDown": 0,
"bandwidthLimitUp": 0,
@@ -178,18 +179,6 @@
"clientBandwidthLimitUp": 0,
"videoTrafficOnly": false,
"radioBasedConfigs": {
"is5GHzL": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is2dot4GHz": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is5GHz": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
@@ -201,13 +190,24 @@
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is2dot4GHz": {
"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",
"radiusClientConfiguration": {
"model_type": "RadiusNasConfiguration",
"nasClientId": "DEFAULT",
@@ -215,13 +215,13 @@
"userDefinedNasId": null,
"userDefinedNasIp": null,
"operatorId": null
}
},
"createdTimestamp": 1606778369944,
"lastModifiedTimestamp": 1606778370352,
"profileType": "ssid"
},
"createdTimestamp": 0,
"lastModifiedTimestamp": 1611264539231,
"childProfileIds": [
19,
20
37
]
}
]

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

@@ -1,16 +1,16 @@
[
{
"model_type": "Profile",
"id": 18,
"id": 33,
"customerId": 2,
"profileType": "passpoint_venue",
"name": "TipWlan-Passpoint-Venue",
"name": "venue-profile-2021-01-21T21:28:58.934Z",
"details": {
"model_type": "PasspointVenueProfile",
"venueNameSet": [
{
"model_type": "PasspointVenueName",
"locale": "fr_CA",
"locale": "fra",
"dupleIso3Language": "fra",
"dupleName": "Exemple de lieu",
"defaultDupleSeparator": ":",
@@ -19,7 +19,7 @@
},
{
"model_type": "PasspointVenueName",
"locale": "en_CA",
"locale": "eng",
"dupleIso3Language": "eng",
"dupleName": "Example passpoint_venue",
"defaultDupleSeparator": ":",
@@ -35,9 +35,8 @@
},
"profileType": "passpoint_venue"
},
"createdTimestamp": 1606778369950,
"lastModifiedTimestamp": 1606778369950,
"childProfileIds": [
]
"createdTimestamp": 1611264538947,
"lastModifiedTimestamp": 1611264538947,
"childProfileIds": []
}
]

124
opensync-gateway-static-process/src/main/resources/app/opensync/EquipmentExample.json
View File

@@ -1,12 +1,12 @@
{
"model_type": "Equipment",
"id": 51,
"id": 1,
"customerId": 2,
"profileId": 12,
"profileId": 38,
"locationId": 8,
"equipmentType": "AP",
"inventoryId": "Test_Client_21P10C68818122",
"name": "Test_Client_21P10C68818122",
"inventoryId": "Open_AP_21P10C68818122",
"name": "Open_AP_21P10C68818122",
"details": {
"model_type": "ApElementConfiguration",
"equipmentModel": "EA8300-CA",
@@ -21,7 +21,7 @@
"staticDnsIp1": null,
"staticDnsIp2": null,
"peerInfoList": [],
"deviceName": "Default Device Name",
"deviceName": "Open_AP_21P10C68818122",
"locationData": null,
"locallyConfiguredMgmtVlan": 0,
"locallyConfigured": false,
@@ -38,33 +38,43 @@
"channelNumber": 6,
"manualChannelNumber": 6,
"backupChannelNumber": 11,
"bannedChannels": [],
"allowedChannels": [],
"allowedChannels": [
1,
2,
3,
4,
5,
6,
7,
8,
9,
10,
11
],
"rxCellSizeDb": {
"model_type": "SourceSelectionValue",
"source": "auto",
"source": "profile",
"value": -90
},
"probeResponseThresholdDb": {
"model_type": "SourceSelectionValue",
"source": "auto",
"source": "profile",
"value": -90
},
"clientDisconnectThresholdDb": {
"model_type": "SourceSelectionValue",
"source": "auto",
"source": "profile",
"value": -90
},
"eirpTxPower": {
"model_type": "SourceSelectionValue",
"source": "auto",
"value": 32
"source": "profile",
"value": 18
},
"perimeterDetectionEnabled": true,
"bestAPSteerType": "both",
"deauthAttackDetection": null,
"allowedChannelsPowerLevels": [],
"activeChannel": 6
"allowedChannelsPowerLevels": []
},
"is5GHzU": {
"model_type": "ElementRadioConfiguration",
@@ -72,33 +82,37 @@
"channelNumber": 149,
"manualChannelNumber": 149,
"backupChannelNumber": 154,
"bannedChannels": [],
"allowedChannels": [],
"allowedChannels": [
161,
149,
165,
153,
157
],
"rxCellSizeDb": {
"model_type": "SourceSelectionValue",
"source": "auto",
"source": "profile",
"value": -90
},
"probeResponseThresholdDb": {
"model_type": "SourceSelectionValue",
"source": "auto",
"source": "profile",
"value": -90
},
"clientDisconnectThresholdDb": {
"model_type": "SourceSelectionValue",
"source": "auto",
"source": "profile",
"value": -90
},
"eirpTxPower": {
"model_type": "SourceSelectionValue",
"source": "auto",
"value": 32
"source": "profile",
"value": 18
},
"perimeterDetectionEnabled": true,
"bestAPSteerType": "both",
"deauthAttackDetection": null,
"allowedChannelsPowerLevels": [],
"activeChannel": 149
"allowedChannelsPowerLevels": []
},
"is5GHzL": {
"model_type": "ElementRadioConfiguration",
@@ -106,33 +120,36 @@
"channelNumber": 36,
"manualChannelNumber": 36,
"backupChannelNumber": 44,
"bannedChannels": [],
"allowedChannels": [],
"allowedChannels": [
48,
36,
40,
44
],
"rxCellSizeDb": {
"model_type": "SourceSelectionValue",
"source": "auto",
"source": "profile",
"value": -90
},
"probeResponseThresholdDb": {
"model_type": "SourceSelectionValue",
"source": "auto",
"source": "profile",
"value": -90
},
"clientDisconnectThresholdDb": {
"model_type": "SourceSelectionValue",
"source": "auto",
"source": "profile",
"value": -90
},
"eirpTxPower": {
"model_type": "SourceSelectionValue",
"source": "auto",
"value": 32
"source": "profile",
"value": 18
},
"perimeterDetectionEnabled": true,
"bestAPSteerType": "both",
"deauthAttackDetection": null,
"allowedChannelsPowerLevels": [],
"activeChannel": 36
"allowedChannelsPowerLevels": []
}
},
"advancedRadioMap": {
@@ -143,22 +160,28 @@
"fragmentationThresholdBytes": 2346,
"uapsdState": "enabled",
"stationIsolation": "disabled",
"multicastRate": {
"model_type": "SourceSelectionMulticast",
"source": "profile",
"value": "auto"
},
"managementRate": {
"model_type": "SourceSelectionManagement",
"source": "auto",
"source": "profile",
"value": "auto"
},
"bestApSettings": {
"model_type": "SourceSelectionSteering",
"source": "auto",
"source": "manual",
"value": {
"model_type": "RadioBestApSettings",
"mlComputed": true,
"dropInSnrPercentage": 30,
"minLoadFactor": 40
"dropInSnrPercentage": 20,
"minLoadFactor": 50
}
},
"legacyBSSRate": "enabled",
"dtimPeriod": 2,
"deauthAttackDetection": null
},
"is5GHzU": {
@@ -168,14 +191,19 @@
"fragmentationThresholdBytes": 2346,
"uapsdState": "enabled",
"stationIsolation": "disabled",
"multicastRate": {
"model_type": "SourceSelectionMulticast",
"source": "profile",
"value": "auto"
},
"managementRate": {
"model_type": "SourceSelectionManagement",
"source": "auto",
"source": "profile",
"value": "auto"
},
"bestApSettings": {
"model_type": "SourceSelectionSteering",
"source": "auto",
"source": "manual",
"value": {
"model_type": "RadioBestApSettings",
"mlComputed": true,
@@ -184,6 +212,7 @@
}
},
"legacyBSSRate": "enabled",
"dtimPeriod": 2,
"deauthAttackDetection": null
},
"is5GHzL": {
@@ -193,14 +222,19 @@
"fragmentationThresholdBytes": 2346,
"uapsdState": "enabled",
"stationIsolation": "disabled",
"multicastRate": {
"model_type": "SourceSelectionMulticast",
"source": "profile",
"value": "auto"
},
"managementRate": {
"model_type": "SourceSelectionManagement",
"source": "auto",
"source": "profile",
"value": "auto"
},
"bestApSettings": {
"model_type": "SourceSelectionSteering",
"source": "auto",
"source": "manual",
"value": {
"model_type": "RadioBestApSettings",
"mlComputed": true,
@@ -209,13 +243,19 @@
}
},
"legacyBSSRate": "enabled",
"dtimPeriod": 2,
"deauthAttackDetection": null
}
}
},
"latitude": null,
"longitude": null,
"baseMacAddress": {
"model_type": "MacAddress",
"address": "JPWi7y5T",
"addressAsString": "24:f5:a2:ef:2e:53"
},
"serial": "21P10C68818122",
"createdTimestamp": 1591653239821,
"lastModifiedTimestamp": 1591653241398
"createdTimestamp": 0,
"lastModifiedTimestamp": 1611264546193
}

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

@@ -1,9 +1,9 @@
{
"model_type": "Profile",
"id": 12,
"id": 38,
"customerId": 2,
"profileType": "equipment_ap",
"name": "ApProfile-3-radios",
"name": "ap-profile-2021-01-21T21:28:59.371Z",
"details": {
"model_type": "ApNetworkConfiguration",
"networkConfigVersion": "AP-1",
@@ -20,12 +20,12 @@
"syntheticClientEnabled": true,
"ledControlEnabled": true,
"equipmentDiscovery": false,
"greTunnelName": null,
"greParentIfName": null,
"greLocalInetAddr": null,
"greRemoteInetAddr": null,
"greRemoteMacAddr": null,
"radioMap": {
"is5GHz": {
"model_type": "RadioProfileConfiguration",
"bestApEnabled": true,
"bestAPSteerType": "both"
},
"is2dot4GHz": {
"model_type": "RadioProfileConfiguration",
"bestApEnabled": true,
@@ -45,29 +45,23 @@
"greTunnelConfigurations": [
{
"model_type": "GreTunnelConfiguration",
"greTunnelName": "gre1",
"greParentIfName": "wan",
"greLocalInetAddr": "10.0.0.129",
"greRemoteInetAddr": "192.168.1.101",
"greRemoteMacAddr": {
"model_type": "MacAddress",
"address": "ZEvwIFf/",
"addressAsString": "64:4b:f0:20:57:ff"
},
"greTunnelName": null,
"greParentIfName": null,
"greLocalInetAddr": null,
"greRemoteInetAddr": null,
"greRemoteMacAddr": null,
"vlanIdsInGreTunnel": [
100
]
}
],
"profileType": "equipment_ap"
},
"createdTimestamp": 1606778369934,
"lastModifiedTimestamp": 1606778443413,
"createdTimestamp": 1611264539383,
"lastModifiedTimestamp": 1611264539383,
"childProfileIds": [
16,
4,
5,
10,
11,
15
31,
32
]
}

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

@@ -1,7 +1,7 @@
[
{
"model_type": "Profile",
"id": 14,
"id": 5,
"customerId": 2,
"profileType": "captive_portal",
"name": "Captive-portal",
@@ -17,7 +17,8 @@
"sessionTimeoutInMinutes": 60,
"logoFile": null,
"backgroundFile": null,
"walledGardenAllowlist": [],
"walledGardenAllowlist": [
],
"usernamePasswordFile": {
"model_type": "ManagedFileInfo",
"md5checksum": null,
@@ -40,8 +41,8 @@
"model_type": "TimedAccessUserRecord",
"username": "customer",
"password": "testing123",
"activationTime": 1602183994956,
"expirationTime": 1602212794956,
"activationTime": 1611262628973,
"expirationTime": 1611291428973,
"numDevices": 1,
"userDetails": {
"model_type": "TimedAccessUserDetails",
@@ -62,8 +63,8 @@
"model_type": "TimedAccessUserRecord",
"username": "customer",
"password": "testing123",
"activationTime": 1602183994957,
"expirationTime": 1602187594957,
"activationTime": 1611262628974,
"expirationTime": 1611266228974,
"numDevices": 0,
"userDetails": {
"model_type": "TimedAccessUserDetails",
@@ -84,8 +85,8 @@
"model_type": "TimedAccessUserRecord",
"username": "customer2",
"password": "testing1234",
"activationTime": 1602183994957,
"expirationTime": 1602788794957,
"activationTime": 1611262628974,
"expirationTime": 1611867428974,
"numDevices": 1,
"userDetails": {
"model_type": "TimedAccessUserDetails",
@@ -106,8 +107,8 @@
"model_type": "TimedAccessUserRecord",
"username": "customer2",
"password": "testing1234",
"activationTime": 1602183994957,
"expirationTime": 1602270394957,
"activationTime": 1611262628974,
"expirationTime": 1611349028974,
"numDevices": 0,
"userDetails": {
"model_type": "TimedAccessUserDetails",
@@ -125,11 +126,13 @@
"lastModifiedTimestamp": 0
}
],
"macAllowList": [],
"macAllowList": [
],
"profileType": "captive_portal"
},
"createdTimestamp": 1602183994959,
"lastModifiedTimestamp": 1602183994959,
"childProfileIds": []
"createdTimestamp": 1611262628978,
"lastModifiedTimestamp": 1611262628978,
"childProfileIds": [
]
}
]

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

@@ -1,10 +1,10 @@
[
{
"model_type": "Profile",
"id": 24,
"id": 37,
"customerId": 2,
"profileType": "passpoint",
"name": "TipWlan-Passpoint-Config",
"name": "hotspot20-profile-2021-01-21T21:28:59.171Z",
"details": {
"model_type": "PasspointProfile",
"enableInterworkingAndHs20": true,
@@ -31,8 +31,8 @@
{
"model_type": "PasspointConnectionCapability",
"connectionCapabilitiesPortNumber": 8888,
"connectionCapabilitiesStatus": "open",
"connectionCapabilitiesIpProtocol": "TCP"
"connectionCapabilitiesIpProtocol": "TCP",
"connectionCapabilitiesStatus": "open"
}
],
"ipAddressTypeAvailability": "public_IPv4_address_available",
@@ -46,26 +46,26 @@
"enable2pt4GHz": true,
"enable5GHz": true,
"associatedAccessSsidProfileIds": [
15
32
],
"osuSsidProfileId": 16,
"passpointOperatorProfileId": 17,
"passpointVenueProfileId": 18,
"osuSsidProfileId": 31,
"passpointOperatorProfileId": 34,
"passpointVenueProfileId": 33,
"passpointOsuProviderProfileIds": [
19,
20
35,
36
],
"accessNetworkType": "free_public_network",
"networkAuthenticationType": "acceptance_of_terms_and_conditions",
"profileType": "passpoint"
},
"createdTimestamp": 1606778370807,
"lastModifiedTimestamp": 1606778370807,
"createdTimestamp": 0,
"lastModifiedTimestamp": 1611264539331,
"childProfileIds": [
17,
18,
19,
20
33,
34,
35,
36
]
}
]

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

@@ -1,10 +1,10 @@
[
{
"model_type": "Profile",
"id": 19,
"id": 35,
"customerId": 2,
"profileType": "passpoint_osu_id_provider",
"name": "TipWlan-Passpoint-OSU-Provider",
"name": "provider1-profile-2021-01-21T21:28:59.057Z",
"details": {
"model_type": "PasspointOsuProviderProfile",
"mccMncList": [
@@ -80,7 +80,7 @@
"osuFriendlyName": [
{
"model_type": "PasspointDuple",
"locale": "en_CA",
"locale": "eng",
"dupleIso3Language": "eng",
"dupleName": "Example provider rogers",
"defaultDupleSeparator": ":",
@@ -88,7 +88,7 @@
},
{
"model_type": "PasspointDuple",
"locale": "fr_CA",
"locale": "fra",
"dupleIso3Language": "fra",
"dupleName": "Exemple de fournisseur rogers",
"defaultDupleSeparator": ":",
@@ -104,7 +104,7 @@
"osuServiceDescription": [
{
"model_type": "PasspointDuple",
"locale": "en_CA",
"locale": "eng",
"dupleIso3Language": "eng",
"dupleName": "Example services rogers",
"defaultDupleSeparator": ":",
@@ -112,7 +112,7 @@
},
{
"model_type": "PasspointDuple",
"locale": "fr_CA",
"locale": "fra",
"dupleIso3Language": "fra",
"dupleName": "Exemples de services rogers",
"defaultDupleSeparator": ":",
@@ -125,17 +125,16 @@
],
"profileType": "passpoint_osu_id_provider"
},
"createdTimestamp": 1606778370345,
"lastModifiedTimestamp": 1606778370345,
"childProfileIds": [
]
"createdTimestamp": 1611264539070,
"lastModifiedTimestamp": 1611264539070,
"childProfileIds": []
},
{
"model_type": "Profile",
"id": 20,
"id": 36,
"customerId": 2,
"profileType": "passpoint_osu_id_provider",
"name": "TipWlan-Passpoint-OSU-Provider-2",
"name": "provider2-profile-2021-01-21T21:28:59.118Z",
"details": {
"model_type": "PasspointOsuProviderProfile",
"mccMncList": [
@@ -211,7 +210,7 @@
"osuFriendlyName": [
{
"model_type": "PasspointDuple",
"locale": "en_CA",
"locale": "eng",
"dupleIso3Language": "eng",
"dupleName": "Example provider telus",
"defaultDupleSeparator": ":",
@@ -219,7 +218,7 @@
},
{
"model_type": "PasspointDuple",
"locale": "fr_CA",
"locale": "fra",
"dupleIso3Language": "fra",
"dupleName": "Exemple de fournisseur telus",
"defaultDupleSeparator": ":",
@@ -235,7 +234,7 @@
"osuServiceDescription": [
{
"model_type": "PasspointDuple",
"locale": "en_CA",
"locale": "eng",
"dupleIso3Language": "eng",
"dupleName": "Example services telus",
"defaultDupleSeparator": ":",
@@ -243,7 +242,7 @@
},
{
"model_type": "PasspointDuple",
"locale": "fr_CA",
"locale": "fra",
"dupleIso3Language": "fra",
"dupleName": "Exemples de services telus",
"defaultDupleSeparator": ":",
@@ -257,9 +256,8 @@
],
"profileType": "passpoint_osu_id_provider"
},
"createdTimestamp": 1606778370351,
"lastModifiedTimestamp": 1606778370351,
"childProfileIds": [
]
"createdTimestamp": 1611264539131,
"lastModifiedTimestamp": 1611264539131,
"childProfileIds": []
}
]

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

@@ -1,10 +1,10 @@
[
{
"model_type": "Profile",
"id": 17,
"id": 34,
"customerId": 2,
"profileType": "passpoint_operator",
"name": "TipWlan-Passpoint-Operator",
"name": "operator-profile-2021-01-21T21:28:58.994Z",
"details": {
"model_type": "PasspointOperatorProfile",
"serverOnlyAuthenticatedL2EncryptionNetwork": false,
@@ -12,31 +12,30 @@
"operatorFriendlyName": [
{
"model_type": "PasspointDuple",
"locale": "en_CA",
"dupleIso3Language": "eng",
"dupleName": "Default friendly passpoint_operator name",
"defaultDupleSeparator": ":",
"asDuple": "eng:Default friendly passpoint_operator name"
},
{
"model_type": "PasspointDuple",
"locale": "fr_CA",
"locale": "fra",
"dupleIso3Language": "fra",
"dupleName": "Nom de l'opérateur convivial par défaut",
"defaultDupleSeparator": ":",
"asDuple": "fra:Nom de l'opérateur convivial par défaut"
},
{
"model_type": "PasspointDuple",
"locale": "eng",
"dupleIso3Language": "eng",
"dupleName": "Default friendly passpoint_operator name",
"defaultDupleSeparator": ":",
"asDuple": "eng:Default friendly passpoint_operator name"
}
],
"domainNameList": [
"bell.ca",
"telus.com",
"rogers.com",
"bell.ca"
"rogers.com"
],
"profileType": "passpoint_operator"
},
"createdTimestamp": 1606778369945,
"lastModifiedTimestamp": 1606778369945,
"childProfileIds": [
]
"createdTimestamp": 1611264539004,
"lastModifiedTimestamp": 1611264539004,
"childProfileIds": []
}
]

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

@@ -7,28 +7,26 @@
"name": "Radius-Profile",
"details": {
"model_type": "RadiusProfile",
"subnetConfiguration": null,
"serviceRegionMap": {
"Ottawa": {
"model_type": "RadiusServiceRegion",
"serverMap": {
"Radius-Profile": [
{
"primaryRadiusServer": {
"model_type": "RadiusServer",
"ipAddress": "192.168.0.1",
"secret": "testing123",
"authPort": 1812,
"timeout": null
}
]
},
"regionName": "Ottawa"
}
"secondaryRadiusServer": {
"model_type": "RadiusServer",
"ipAddress": "192.168.0.2",
"secret": "testing123",
"authPort": 1812,
"timeout": null
},
"radiusSubnetConfiguration": null,
"profileType": "radius"
},
"createdTimestamp": 1601961451668,
"lastModifiedTimestamp": 1601961451668,
"childProfileIds": []
"createdTimestamp": 1611262628767,
"lastModifiedTimestamp": 1611262628767,
"childProfileIds": [
]
}
]

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

@@ -1,6 +1,6 @@
{
"model_type": "Profile",
"id": 11,
"id": 4,
"customerId": 2,
"profileType": "rf",
"name": "TipWlan-rf",
@@ -198,7 +198,7 @@
},
"profileType": "rf"
},
"createdTimestamp": 1606778369933,
"lastModifiedTimestamp": 1606778369933,
"createdTimestamp": 1611262628788,
"lastModifiedTimestamp": 1611262628788,
"childProfileIds": []
}

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

@@ -20,9 +20,9 @@
"broadcastSsid": "enabled",
"keyRefresh": 0,
"noLocalSubnets": false,
"radiusServiceName": null,
"radiusAccountingServiceName": null,
"radiusAcountingServiceInterval": null,
"radiusServiceId": 0,
"radiusAccountingServiceId": 0,
"radiusAcountingServiceInterval": 60,
"captivePortalId": null,
"bandwidthLimitDown": 0,
"bandwidthLimitUp": 0,
@@ -76,27 +76,27 @@
},
{
"model_type": "Profile",
"id": 15,
"id": 32,
"customerId": 2,
"profileType": "ssid",
"name": "TipWlan-cloud-passpoint-access",
"name": "access-ssid-profile-2021-01-21T21:28:58.871Z",
"details": {
"model_type": "SsidConfiguration",
"ssid": "TipWlan-cloud-passpoint-access",
"ssid": "ssid-access-passpoint",
"appliedRadios": [
"is5GHzL",
"is5GHzU"
"is5GHzU",
"is5GHzL"
],
"ssidAdminState": "enabled",
"secureMode": "wpa2PSK",
"secureMode": "wpa2EAP",
"vlanId": 1,
"keyStr": "testing123",
"broadcastSsid": "enabled",
"keyRefresh": 0,
"noLocalSubnets": false,
"radiusServiceName": null,
"radiusAccountingServiceName": null,
"radiusAcountingServiceInterval": null,
"radiusServiceId": 1,
"radiusAccountingServiceId": 1,
"radiusAcountingServiceInterval": 60,
"captivePortalId": null,
"bandwidthLimitDown": 0,
"bandwidthLimitUp": 0,
@@ -104,18 +104,6 @@
"clientBandwidthLimitUp": 0,
"videoTrafficOnly": false,
"radioBasedConfigs": {
"is5GHzL": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is2dot4GHz": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is5GHz": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
@@ -127,13 +115,24 @@
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is2dot4GHz": {
"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",
"radiusClientConfiguration": {
"model_type": "RadiusNasConfiguration",
"nasClientId": "DEFAULT",
@@ -141,23 +140,25 @@
"userDefinedNasId": null,
"userDefinedNasIp": null,
"operatorId": null
}
},
"createdTimestamp": 1606778369943,
"lastModifiedTimestamp": 1606778370811,
"profileType": "ssid"
},
"createdTimestamp": 0,
"lastModifiedTimestamp": 1611264539281,
"childProfileIds": [
24
37,
1
]
},
{
"model_type": "Profile",
"id": 16,
"id": 31,
"customerId": 2,
"profileType": "ssid",
"name": "TipWlan-cloud-passpoint-osu",
"name": "osu-ssid-profile-2021-01-21T21:28:58.798Z",
"details": {
"model_type": "SsidConfiguration",
"ssid": "TipWlan-cloud-passpoint-osu",
"ssid": "ssid-open-passpoint",
"appliedRadios": [
"is2dot4GHz"
],
@@ -168,9 +169,9 @@
"broadcastSsid": "enabled",
"keyRefresh": 0,
"noLocalSubnets": false,
"radiusServiceName": null,
"radiusAccountingServiceName": null,
"radiusAcountingServiceInterval": null,
"radiusServiceId": 0,
"radiusAccountingServiceId": 0,
"radiusAcountingServiceInterval": 60,
"captivePortalId": null,
"bandwidthLimitDown": 0,
"bandwidthLimitUp": 0,
@@ -178,18 +179,6 @@
"clientBandwidthLimitUp": 0,
"videoTrafficOnly": false,
"radioBasedConfigs": {
"is5GHzL": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is2dot4GHz": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is5GHz": {
"model_type": "RadioBasedSsidConfiguration",
"enable80211r": null,
@@ -201,13 +190,24 @@
"enable80211r": null,
"enable80211k": null,
"enable80211v": null
},
"is2dot4GHz": {
"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",
"radiusClientConfiguration": {
"model_type": "RadiusNasConfiguration",
"nasClientId": "DEFAULT",
@@ -215,13 +215,13 @@
"userDefinedNasId": null,
"userDefinedNasIp": null,
"operatorId": null
}
},
"createdTimestamp": 1606778369944,
"lastModifiedTimestamp": 1606778370352,
"profileType": "ssid"
},
"createdTimestamp": 0,
"lastModifiedTimestamp": 1611264539231,
"childProfileIds": [
19,
20
37
]
}
]

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

@@ -1,16 +1,16 @@
[
{
"model_type": "Profile",
"id": 18,
"id": 33,
"customerId": 2,
"profileType": "passpoint_venue",
"name": "TipWlan-Passpoint-Venue",
"name": "venue-profile-2021-01-21T21:28:58.934Z",
"details": {
"model_type": "PasspointVenueProfile",
"venueNameSet": [
{
"model_type": "PasspointVenueName",
"locale": "fr_CA",
"locale": "fra",
"dupleIso3Language": "fra",
"dupleName": "Exemple de lieu",
"defaultDupleSeparator": ":",
@@ -19,7 +19,7 @@
},
{
"model_type": "PasspointVenueName",
"locale": "en_CA",
"locale": "eng",
"dupleIso3Language": "eng",
"dupleName": "Example passpoint_venue",
"defaultDupleSeparator": ":",
@@ -35,9 +35,8 @@
},
"profileType": "passpoint_venue"
},
"createdTimestamp": 1606778369950,
"lastModifiedTimestamp": 1606778369950,
"childProfileIds": [
]
"createdTimestamp": 1611264538947,
"lastModifiedTimestamp": 1611264538947,
"childProfileIds": []
}
]

2
opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/mqtt/OpensyncMqttClient.java
View File

@@ -141,7 +141,7 @@ public class OpensyncMqttClient implements ApplicationListener<ContextClosedEven
// new Topic("#", QoS.AT_LEAST_ONCE),
// new Topic("test/#", QoS.EXACTLY_ONCE),
// new Topic("foo/+/bar", QoS.AT_LEAST_ONCE)
Topic[] topics = { new Topic("/ap/+/opensync", QoS.AT_LEAST_ONCE), };
Topic[] topics = { new Topic("#", QoS.AT_LEAST_ONCE), };
futureConnection.subscribe(topics);
LOG.info("Subscribed to mqtt topics {}", Arrays.asList(topics));

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

@@ -32,7 +32,6 @@ import com.telecominfraproject.wlan.core.model.equipment.MacAddress;
import com.telecominfraproject.wlan.core.model.equipment.RadioBestApSettings;
import com.telecominfraproject.wlan.core.model.equipment.RadioType;
import com.telecominfraproject.wlan.core.model.equipment.SourceType;
import com.telecominfraproject.wlan.core.model.json.BaseJsonModel;
import com.telecominfraproject.wlan.equipment.models.ApElementConfiguration;
import com.telecominfraproject.wlan.equipment.models.ElementRadioConfiguration;
import com.telecominfraproject.wlan.equipment.models.ManagementRate;
@@ -69,11 +68,7 @@ import com.telecominfraproject.wlan.profile.bonjour.models.BonjourGatewayProfile
import com.telecominfraproject.wlan.profile.bonjour.models.BonjourServiceSet;
import com.telecominfraproject.wlan.profile.captiveportal.models.CaptivePortalAuthenticationType;
import com.telecominfraproject.wlan.profile.captiveportal.models.CaptivePortalConfiguration;
import com.telecominfraproject.wlan.profile.metrics.ServiceMetricConfigParameters;
import com.telecominfraproject.wlan.profile.metrics.ServiceMetricRadioConfigParameters;
import com.telecominfraproject.wlan.profile.metrics.ServiceMetricSurveyConfigParameters;
import com.telecominfraproject.wlan.profile.metrics.ServiceMetricsChannelUtilizationSurveyType;
import com.telecominfraproject.wlan.profile.metrics.ServiceMetricsCollectionConfigProfile;
import com.telecominfraproject.wlan.profile.metrics.ServiceMetricsStatsReportFormat;
import com.telecominfraproject.wlan.profile.models.Profile;
import com.telecominfraproject.wlan.profile.models.common.ManagedFileInfo;
@@ -96,13 +91,11 @@ import com.telecominfraproject.wlan.profile.passpoint.models.venue.PasspointVenu
import com.telecominfraproject.wlan.profile.passpoint.models.venue.PasspointVenueTypeAssignment;
import com.telecominfraproject.wlan.profile.radius.models.RadiusProfile;
import com.telecominfraproject.wlan.profile.radius.models.RadiusServer;
import com.telecominfraproject.wlan.profile.radius.models.RadiusServiceRegion;
import com.telecominfraproject.wlan.profile.rf.models.RfConfiguration;
import com.telecominfraproject.wlan.profile.rf.models.RfElementConfiguration;
import com.telecominfraproject.wlan.profile.ssid.models.NasIdType;
import com.telecominfraproject.wlan.profile.ssid.models.NasIpType;
import com.telecominfraproject.wlan.profile.ssid.models.SsidConfiguration;
import com.telecominfraproject.wlan.servicemetric.models.ServiceMetricDataType;
import com.vmware.ovsdb.exception.OvsdbClientException;
import com.vmware.ovsdb.protocol.methods.RowUpdate;
import com.vmware.ovsdb.protocol.methods.TableUpdate;
@@ -3223,7 +3216,6 @@ public class OvsdbDao {
minHwMode = "11x";
}
// off by default
boolean enable80211r = false;
int mobilityDomain = 0;
@@ -3392,26 +3384,26 @@ public class OvsdbDao {
} else if (ssidSecurityMode.equals("wpa2OnlyEAP") || ssidSecurityMode.equals("wpa2OnlyRadius")) {
security.put("mode", "2");
getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
if (ssidConfig.getRadiusAccountingServiceName() != null) {
if (ssidConfig.getRadiusAccountingServiceId() > 0) {
getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
}
} else if (ssidSecurityMode.equals("wpa3OnlyEAP")) {
security.put("mode", "3");
getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
if (ssidConfig.getRadiusAccountingServiceName() != null) {
if (ssidConfig.getRadiusAccountingServiceId() > 0) {
getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
}
} else if (ssidSecurityMode.equals("wpa2EAP") || ssidSecurityMode.equals("wpa2Radius")
|| ssidSecurityMode.equals("wpa3MixedEAP")) {
security.put("mode", "mixed");
getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
if (ssidConfig.getRadiusAccountingServiceName() != null) {
if (ssidConfig.getRadiusAccountingServiceId() > 0) {
getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
}
} else if (ssidSecurityMode.equals("wpaEAP") || ssidSecurityMode.equals("wpaRadius")) {
security.put("mode", "1");
getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
if (ssidConfig.getRadiusAccountingServiceName() != null) {
if (ssidConfig.getRadiusAccountingServiceId() > 0) {
getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
}
} else if (ssidSecurityMode.equals("wep")) {
@@ -3742,30 +3734,25 @@ public class OvsdbDao {
void getRadiusAccountingConfiguration(OpensyncAPConfig opensyncApConfig, SsidConfiguration ssidConfig,
Map<String, String> security) {
LOG.info("getRadiusAccountingConfiguration for ssidConfig {} from radiusProfiles {}", ssidConfig,
LOG.debug("getRadiusAccountingConfiguration for ssidConfig {} from radiusProfiles {}", ssidConfig,
opensyncApConfig.getRadiusProfiles());
List<Profile> radiusServiceList = opensyncApConfig.getRadiusProfiles().stream()
LOG.debug("Radius Accounting Profiles {}", opensyncApConfig.getRadiusProfiles());
List<Profile> radiusProfileList = opensyncApConfig.getRadiusProfiles().stream()
.filter(new Predicate<Profile>() {
@Override
public boolean test(Profile p) {
return p.getName().equals((ssidConfig.getRadiusAccountingServiceName()));
public boolean test(Profile t) {
return t.getId() == ssidConfig.getRadiusAccountingServiceId();
}
}).collect(Collectors.toList());
if (radiusServiceList != null && radiusServiceList.size() > 0) {
Profile profileRadius = radiusServiceList.get(0);
String region = opensyncApConfig.getEquipmentLocation().getName();
List<RadiusServer> radiusServerList = new ArrayList<>();
RadiusProfile radiusProfileDetails = ((RadiusProfile) profileRadius.getDetails());
RadiusServiceRegion radiusServiceRegion = radiusProfileDetails.findServiceRegion(region);
if (radiusServiceRegion != null) {
radiusServerList = radiusServiceRegion
.findServerConfiguration(ssidConfig.getRadiusAccountingServiceName());
if (radiusServerList != null && radiusServerList.size() > 0) {
RadiusServer rServer = radiusServerList.get(0);
if (rServer != null) {
if (radiusProfileList != null && radiusProfileList.size() > 0) {
Profile profileRadius = radiusProfileList.get(0);
RadiusProfile profileDetails = ((RadiusProfile) profileRadius.getDetails());
RadiusServer rServer = profileDetails.getPrimaryRadiusServer();
security.put("radius_acct_ip",
rServer.getIpAddress() != null ? rServer.getIpAddress().getHostAddress() : null);
security.put("radius_acct_port",
@@ -3787,17 +3774,9 @@ public class OvsdbDao {
security.get("radius_acct_ip"), security.get("radius_acct_port"),
security.get("radius_acct_secret"), security.get("radius_acct_interval"));
}
} else {
LOG.warn("Could not get RadiusServerConfiguration for {} from RadiusProfile {}",
ssidConfig.getRadiusAccountingServiceName(), profileRadius);
}
} else {
LOG.warn("Could not get RadiusServiceRegion {} from RadiusProfile {}", region, profileRadius);
}
} else {
LOG.warn("Could not find radius profile {} in {}", ssidConfig.getRadiusAccountingServiceName(),
LOG.warn("Could not find radius profile {} in {}", ssidConfig.getRadiusServiceId(),
opensyncApConfig.getRadiusProfiles());
}
@@ -3809,45 +3788,33 @@ public class OvsdbDao {
LOG.debug("getRadiusConfiguration for ssidConfig {} from radiusProfiles {}", ssidConfig,
opensyncApConfig.getRadiusProfiles());
List<Profile> radiusServiceList = opensyncApConfig.getRadiusProfiles().stream()
LOG.debug("Radius Profiles {}", opensyncApConfig.getRadiusProfiles());
List<Profile> radiusProfileList = opensyncApConfig.getRadiusProfiles().stream()
.filter(new Predicate<Profile>() {
@Override
public boolean test(Profile p) {
return p.getName().equals((ssidConfig.getRadiusServiceName()));
public boolean test(Profile t) {
return t.getId() == ssidConfig.getRadiusServiceId();
}
}).collect(Collectors.toList());
if (radiusServiceList != null && radiusServiceList.size() > 0) {
Profile profileRadius = radiusServiceList.get(0);
String region = opensyncApConfig.getEquipmentLocation().getName();
List<RadiusServer> radiusServerList = new ArrayList<>();
RadiusProfile radiusProfileDetails = ((RadiusProfile) profileRadius.getDetails());
RadiusServiceRegion radiusServiceRegion = radiusProfileDetails.findServiceRegion(region);
if (radiusServiceRegion != null) {
radiusServerList = radiusServiceRegion.findServerConfiguration(ssidConfig.getRadiusServiceName());
if (radiusServerList != null && radiusServerList.size() > 0) {
RadiusServer rServer = radiusServerList.get(0);
if (rServer != null) {
if (radiusProfileList != null && radiusProfileList.size() > 0) {
Profile profileRadius = radiusProfileList.get(0);
RadiusProfile profileDetails = ((RadiusProfile) profileRadius.getDetails());
RadiusServer radiusServer = profileDetails.getPrimaryRadiusServer();
security.put("radius_server_ip",
rServer.getIpAddress() != null ? rServer.getIpAddress().getHostAddress() : null);
radiusServer.getIpAddress() != null ? radiusServer.getIpAddress().getHostAddress() : null);
security.put("radius_server_port",
rServer.getAuthPort() != null ? String.valueOf(rServer.getAuthPort()) : null);
security.put("radius_server_secret", rServer.getSecret());
LOG.info(
"set Radius server attributes radius_server_ip {} radius_server_port {} radius_server_secret {}",
radiusServer.getAuthPort() != null ? String.valueOf(radiusServer.getAuthPort()) : null);
security.put("radius_server_secret", radiusServer.getSecret());
LOG.info("set Radius server attributes radius_server_ip {} radius_server_port {} radius_server_secret {}",
security.get("radius_server_ip"), security.get("radius_server_port"),
security.get("radius_server_secret"));
}
} else {
LOG.warn("Could not get RadiusServerConfiguration for {} from RadiusProfile {}",
ssidConfig.getRadiusServiceName(), profileRadius);
}
} else {
LOG.warn("Could not get RadiusServiceRegion {} from RadiusProfile {}", region, profileRadius);
}
} else {
LOG.warn("Could not find radius profile {} in {}", ssidConfig.getRadiusServiceName(),
LOG.warn("Could not find radius profile {} in {}", ssidConfig.getRadiusServiceId(),
opensyncApConfig.getRadiusProfiles());
}
}
@@ -4811,125 +4778,153 @@ public class OvsdbDao {
}
public void configureStatsFromProfile(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncApConfig) {
if (opensyncApConfig.getMetricsProfiles() == null || opensyncApConfig.getMetricsProfiles().isEmpty()) {
configureStats(ovsdbClient);
} else {
List<Operation> operations = new ArrayList<>();
for (Profile metricsProfile : opensyncApConfig.getMetricsProfiles()) {
ServiceMetricsCollectionConfigProfile details = ((ServiceMetricsCollectionConfigProfile) metricsProfile
.getDetails());
for (ServiceMetricDataType dataType : details.getMetricConfigParameterMap().keySet()) {
if (dataType.equals(ServiceMetricDataType.ApNode)
|| dataType.equals(ServiceMetricDataType.Neighbour)
|| dataType.equals(ServiceMetricDataType.Channel)) {
details.getMetricConfigParameterMap().get(dataType).stream().forEach(c -> {
ServiceMetricSurveyConfigParameters parameters = (ServiceMetricSurveyConfigParameters) c;
Map<String, Integer> thresholdMap = new HashMap<>();
thresholdMap.put("max_delay", parameters.getDelayMillisecondsThreshold());
thresholdMap.put("util", parameters.getPercentUtilizationThreshold());
@SuppressWarnings("unchecked")
com.vmware.ovsdb.protocol.operation.notation.Map<String, Integer> thresholds = com.vmware.ovsdb.protocol.operation.notation.Map
.of(thresholdMap);
RadioType radioType = parameters.getRadioType();
ServiceMetricsChannelUtilizationSurveyType channelType = parameters.getChannelSurveyType();
int scanInterval = parameters.getScanIntervalMillis();
ServiceMetricsStatsReportFormat format = parameters.getStatsReportFormat();
int reportingInterval = parameters.getReportingIntervalSeconds();
int samplingInterval = parameters.getSamplingInterval();
if (dataType.equals(ServiceMetricDataType.ApNode)
|| dataType.equals(ServiceMetricDataType.Channel)) {
provisionWifiStatsConfigFromProfile("survey", getAllowedChannels(ovsdbClient),
radioType, channelType, scanInterval, format, reportingInterval,
samplingInterval, operations, thresholds);
if (dataType.equals(ServiceMetricDataType.ApNode)) {
// extra reports that are part of ApNode
// metric
if (channelType.equals(ServiceMetricsChannelUtilizationSurveyType.ON_CHANNEL)) {
provisionWifiStatsConfigFromProfile("device", reportingInterval,
samplingInterval, operations);
if (((ApNetworkConfiguration) opensyncApConfig.getApProfile().getDetails())
.getSyntheticClientEnabled()) {
provisionWifiStatsConfigFromProfile("network_probe", reportingInterval,
samplingInterval, operations);
}
}
}
} else if (dataType.equals(ServiceMetricDataType.Neighbour)) {
provisionWifiStatsConfigFromProfile("neighbor", getAllowedChannels(ovsdbClient),
radioType, channelType, scanInterval, format, reportingInterval,
samplingInterval, operations, thresholds);
}
});
} else if (dataType.equals(ServiceMetricDataType.ApSsid)
|| dataType.equals(ServiceMetricDataType.Client)) {
details.getMetricConfigParameterMap().get(dataType).stream().forEach(c -> {
ServiceMetricRadioConfigParameters parameters = (ServiceMetricRadioConfigParameters) c;
RadioType radioType = parameters.getRadioType();
int reportingInterval = parameters.getReportingIntervalSeconds();
int samplingInterval = parameters.getSamplingInterval();
provisionWifiStatsConfigFromProfile("client", radioType, reportingInterval,
samplingInterval, operations);
provisionWifiStatsConfigFromProfile("video_voice", reportingInterval, samplingInterval,
operations);
LOG.debug("{}", BaseJsonModel.toPrettyJsonString(parameters));
});
} else {
details.getMetricConfigParameterMap().get(dataType).stream().forEach(c -> {
ServiceMetricConfigParameters parameters = (ServiceMetricConfigParameters) c;
int reportingInterval = parameters.getReportingIntervalSeconds();
int samplingInterval = parameters.getSamplingInterval();
provisionWifiStatsConfigFromProfile("video_voice", reportingInterval, samplingInterval,
operations);
// TODO: add when schema supports
// provisionWifiStatsConfigFromProfile("event",
// if (opensyncApConfig.getMetricsProfiles() == null ||
// opensyncApConfig.getMetricsProfiles().isEmpty()) {
// configureStats(ovsdbClient);
// } else {
//
// List<Operation> operations = new ArrayList<>();
//
// for (Profile metricsProfile : opensyncApConfig.getMetricsProfiles())
// {
//
// ServiceMetricsCollectionConfigProfile details =
// ((ServiceMetricsCollectionConfigProfile) metricsProfile
// .getDetails());
//
// for (ServiceMetricDataType dataType :
// details.getMetricConfigParameterMap().keySet()) {
//
// if (dataType.equals(ServiceMetricDataType.ApNode)
// || dataType.equals(ServiceMetricDataType.Neighbour)
// || dataType.equals(ServiceMetricDataType.Channel)) {
//
// details.getMetricConfigParameterMap().get(dataType).stream().forEach(c
// -> {
// ServiceMetricSurveyConfigParameters parameters =
// (ServiceMetricSurveyConfigParameters) c;
//
// Map<String, Integer> thresholdMap = new HashMap<>();
// thresholdMap.put("max_delay",
// parameters.getDelayMillisecondsThreshold());
// thresholdMap.put("util",
// parameters.getPercentUtilizationThreshold());
//
// @SuppressWarnings("unchecked")
// com.vmware.ovsdb.protocol.operation.notation.Map<String, Integer>
// thresholds = com.vmware.ovsdb.protocol.operation.notation.Map
// .of(thresholdMap);
//
// RadioType radioType = parameters.getRadioType();
// ServiceMetricsChannelUtilizationSurveyType channelType =
// parameters.getChannelSurveyType();
// int scanInterval = parameters.getScanIntervalMillis();
// ServiceMetricsStatsReportFormat format =
// parameters.getStatsReportFormat();
// int reportingInterval = parameters.getReportingIntervalSeconds();
// int samplingInterval = parameters.getSamplingInterval();
//
// if (dataType.equals(ServiceMetricDataType.ApNode)
// || dataType.equals(ServiceMetricDataType.Channel)) {
// provisionWifiStatsConfigFromProfile("survey",
// getAllowedChannels(ovsdbClient),
// radioType, channelType, scanInterval, format, reportingInterval,
// samplingInterval, operations, thresholds);
// if (dataType.equals(ServiceMetricDataType.ApNode)) {
// // extra reports that are part of ApNode
// // metric
// if
// (channelType.equals(ServiceMetricsChannelUtilizationSurveyType.ON_CHANNEL))
// {
// provisionWifiStatsConfigFromProfile("device", reportingInterval,
// samplingInterval, operations);
// if (((ApNetworkConfiguration)
// opensyncApConfig.getApProfile().getDetails())
// .getSyntheticClientEnabled()) {
// provisionWifiStatsConfigFromProfile("network_probe",
// reportingInterval,
// samplingInterval, operations);
LOG.debug("{}", BaseJsonModel.toPrettyJsonString(parameters));
});
}
}
}
if (!operations.isEmpty()) {
LOG.debug("Sending batch of operations : {} ", operations);
try {
CompletableFuture<OperationResult[]> fResult = ovsdbClient.transact(ovsdbName, operations);
OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
if (LOG.isDebugEnabled()) {
LOG.debug("Updated {}:", wifiStatsConfigDbTable);
for (OperationResult res : result) {
LOG.debug("Op Result {}", res);
}
}
} catch (OvsdbClientException | TimeoutException | ExecutionException | InterruptedException e) {
throw new RuntimeException(e);
}
}
}
// }
// }
//
// }
// } else if (dataType.equals(ServiceMetricDataType.Neighbour)) {
// provisionWifiStatsConfigFromProfile("neighbor",
// getAllowedChannels(ovsdbClient),
// radioType, channelType, scanInterval, format, reportingInterval,
// samplingInterval, operations, thresholds);
// }
//
// });
//
// } else if (dataType.equals(ServiceMetricDataType.ApSsid)
// || dataType.equals(ServiceMetricDataType.Client)) {
// details.getMetricConfigParameterMap().get(dataType).stream().forEach(c
// -> {
// ServiceMetricRadioConfigParameters parameters =
// (ServiceMetricRadioConfigParameters) c;
//
// RadioType radioType = parameters.getRadioType();
// int reportingInterval = parameters.getReportingIntervalSeconds();
// int samplingInterval = parameters.getSamplingInterval();
//
// provisionWifiStatsConfigFromProfile("client", radioType,
// reportingInterval,
// samplingInterval, operations);
//
// provisionWifiStatsConfigFromProfile("video_voice", reportingInterval,
// samplingInterval,
// operations);
// LOG.debug("{}", BaseJsonModel.toPrettyJsonString(parameters));
// });
// } else {
// details.getMetricConfigParameterMap().get(dataType).stream().forEach(c
// -> {
// ServiceMetricConfigParameters parameters =
// (ServiceMetricConfigParameters) c;
// int reportingInterval = parameters.getReportingIntervalSeconds();
// int samplingInterval = parameters.getSamplingInterval();
// provisionWifiStatsConfigFromProfile("video_voice", reportingInterval,
// samplingInterval,
// operations);
// // TODO: add when schema supports
// // provisionWifiStatsConfigFromProfile("event",
// // reportingInterval,
// // samplingInterval, operations);
//
// LOG.debug("{}", BaseJsonModel.toPrettyJsonString(parameters));
// });
// }
//
// }
//
// }
//
// if (!operations.isEmpty()) {
// LOG.debug("Sending batch of operations : {} ", operations);
//
// try {
// CompletableFuture<OperationResult[]> fResult =
// ovsdbClient.transact(ovsdbName, operations);
// OperationResult[] result = fResult.get(ovsdbTimeoutSec,
// TimeUnit.SECONDS);
//
// if (LOG.isDebugEnabled()) {
// LOG.debug("Updated {}:", wifiStatsConfigDbTable);
//
// for (OperationResult res : result) {
// LOG.debug("Op Result {}", res);
// }
// }
// } catch (OvsdbClientException | TimeoutException | ExecutionException
// | InterruptedException e) {
// throw new RuntimeException(e);
// }
// }
//
// }
}
@@ -5029,7 +5024,6 @@ public class OvsdbDao {
}
@Deprecated
public void configureStats(OvsdbClient ovsdbClient) {
try {
@@ -5143,7 +5137,7 @@ public class OvsdbDao {
rowColumns.put("report_type", new Atom<>("raw"));
rowColumns.put("sampling_interval", new Atom<>(10));
rowColumns.put("stats_type", new Atom<>("survey"));
rowColumns.put("survey_interval_ms", new Atom<>(65));
rowColumns.put("survey_interval_ms", new Atom<>(0));
rowColumns.put("survey_type", new Atom<>("on-chan"));
Row updateRow = new Row(rowColumns);
@@ -5168,12 +5162,12 @@ public class OvsdbDao {
rowColumns.put("channel_list", channels);
rowColumns.put("radio_type", new Atom<>(rc.freqBand));
rowColumns.put("reporting_interval", new Atom<>(300));
rowColumns.put("reporting_interval", new Atom<>(120));
rowColumns.put("report_type", new Atom<>("raw"));
rowColumns.put("stats_type", new Atom<>("survey"));
rowColumns.put("survey_type", new Atom<>("off-chan"));
rowColumns.put("sampling_interval", new Atom<>(30));
rowColumns.put("survey_interval_ms", new Atom<>(65));
rowColumns.put("sampling_interval", new Atom<>(10));
rowColumns.put("survey_interval_ms", new Atom<>(50));
rowColumns.put("threshold", thresholds);
Row updateRow = new Row(rowColumns);
operations.add(new Insert(wifiStatsConfigDbTable, updateRow));
@@ -5690,7 +5684,6 @@ public class OvsdbDao {
throw new RuntimeException(e);
}
}
}

8
opensync-gateway/src/test/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDaoTest.java
View File

@@ -178,7 +178,7 @@ public class OvsdbDaoTest {
Profile profileRadius = OvsdbDaoTestUtilities.createRadiusProfile(DEFAULT_CUSTOMER_ID);
apConfig.setRadiusProfiles(List.of(profileRadius));
SsidConfiguration ssidConfig = SsidConfiguration.createWithDefaults();
ssidConfig.setRadiusServiceName("Radius-Profile");
ssidConfig.setRadiusServiceId(profileRadius.getId());
Map<String, String> security = new HashMap<>();
Location location = new Location();
location.setName("Ottawa");
@@ -195,7 +195,7 @@ public class OvsdbDaoTest {
Profile profileRadius = OvsdbDaoTestUtilities.createRadiusProfile(DEFAULT_CUSTOMER_ID);
apConfig.setRadiusProfiles(List.of(profileRadius));
SsidConfiguration ssidConfig = SsidConfiguration.createWithDefaults();
ssidConfig.setRadiusAccountingServiceName("Radius-Profile");
ssidConfig.setRadiusAccountingServiceId(profileRadius.getId());
ssidConfig.setRadiusAcountingServiceInterval(60);
Map<String, String> security = new HashMap<>();
Location location = new Location();
@@ -215,13 +215,13 @@ public class OvsdbDaoTest {
Profile profileRadius = OvsdbDaoTestUtilities.createRadiusProfile(DEFAULT_CUSTOMER_ID);
apConfig.setRadiusProfiles(List.of(profileRadius));
SsidConfiguration ssidConfig = SsidConfiguration.createWithDefaults();
ssidConfig.setRadiusAccountingServiceName("Radius-Profile");
ssidConfig.setRadiusAccountingServiceId(profileRadius.getId());
Map<String, String> security = new HashMap<>();
Location location = new Location();
location.setName("Ottawa");
apConfig.setEquipmentLocation(location);
ovsdbDao.getRadiusAccountingConfiguration(apConfig, ssidConfig, security);
assert (security.get("radius_acct_interval").equals("0"));
assert (security.get("radius_acct_interval").equals("60"));
assert (security.get("radius_acct_ip").equals("192.168.0.1"));
assert (security.get("radius_acct_port").equals("1812"));
assert (security.get("radius_acct_secret").equals("testing123"));

29
opensync-gateway/src/test/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDaoTestUtilities.java
View File

@@ -29,7 +29,6 @@ import com.telecominfraproject.wlan.profile.passpoint.models.provider.PasspointO
import com.telecominfraproject.wlan.profile.passpoint.models.venue.PasspointVenueProfile;
import com.telecominfraproject.wlan.profile.radius.models.RadiusProfile;
import com.telecominfraproject.wlan.profile.radius.models.RadiusServer;
import com.telecominfraproject.wlan.profile.radius.models.RadiusServiceRegion;
import com.telecominfraproject.wlan.profile.rf.models.RfConfiguration;
import com.telecominfraproject.wlan.profile.ssid.models.SsidConfiguration;
import com.telecominfraproject.wlan.profile.ssid.models.SsidConfiguration.SecureMode;
@@ -44,6 +43,8 @@ import com.vmware.ovsdb.protocol.operation.result.UpdateResult;
public class OvsdbDaoTestUtilities {
public static long RADIUS_PROFILE_ID = 100L;
// Static creation of Profiles and Results to use with the OvsdbDao JUnit
// tests.
static void createPasspointHotspot(int customerId, Profile passpointHotspotConfig, Profile passpointOperatorProfile,
@@ -557,19 +558,29 @@ public class OvsdbDaoTestUtilities {
profileRadius.setName("Radius-Profile");
RadiusProfile radiusDetails = new RadiusProfile();
RadiusServiceRegion radiusServiceRegion = new RadiusServiceRegion();
RadiusServer radiusServer = new RadiusServer();
radiusServer.setAuthPort(1812);
RadiusServer primaryRadiusServer = new RadiusServer();
primaryRadiusServer.setAuthPort(1812);
try {
radiusServer.setIpAddress(InetAddress.getByName("192.168.0.1"));
primaryRadiusServer.setIpAddress(InetAddress.getByName("192.168.0.1"));
} catch (UnknownHostException e) {
throw new IllegalArgumentException(e);
}
radiusServer.setSecret("testing123");
radiusServiceRegion.addRadiusServer("Radius-Profile", radiusServer);
radiusServiceRegion.setRegionName("Ottawa");
radiusDetails.addRadiusServiceRegion(radiusServiceRegion);
primaryRadiusServer.setSecret("testing123");
radiusDetails.setPrimaryRadiusServer(primaryRadiusServer);
RadiusServer secondaryRadiusServer = new RadiusServer();
secondaryRadiusServer.setAuthPort(1812);
try {
secondaryRadiusServer.setIpAddress(InetAddress.getByName("192.168.0.2"));
} catch (UnknownHostException e) {
throw new IllegalArgumentException(e);
}
secondaryRadiusServer.setSecret("testing123");
radiusDetails.setSecondaryRadiusServer(secondaryRadiusServer);
profileRadius.setDetails(radiusDetails);
profileRadius.setId(RADIUS_PROFILE_ID);
return profileRadius;
}