diff --git a/opensync-ext-static/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationSimple.java b/opensync-ext-static/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationSimple.java index 1b71a4f..639e214 100644 --- a/opensync-ext-static/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationSimple.java +++ b/opensync-ext-static/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationSimple.java @@ -5,7 +5,6 @@ import java.io.IOException; import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Set; import javax.annotation.PostConstruct; @@ -60,6 +59,9 @@ public class OpensyncExternalIntegrationSimple implements OpensyncExternalIntegr @Value("${tip.wlan.ovsdb.hotspot20ProfileFileName:/app/config/ProfileHotspot20.json}") private String hotspot20ProfileFileName; + @Value("${tip.wlan.ovsdb.idProviderProfileFileName:/app/config/ProfileIdProvider.json}") + private String idProviderProfileFileName; + @Value("${tip.wlan.ovsdb.radiusProfileFileName:/app/config/ProfileRadius.json}") private String radiusProfileFileName; @@ -118,6 +120,8 @@ public class OpensyncExternalIntegrationSimple implements OpensyncExternalIntegr .listFromFile(operatorProfileFileName, com.telecominfraproject.wlan.profile.models.Profile.class); List venueProfiles = com.telecominfraproject.wlan.profile.models.Profile .listFromFile(venueProfileFileName, com.telecominfraproject.wlan.profile.models.Profile.class); + List providerProfiles = com.telecominfraproject.wlan.profile.models.Profile + .listFromFile(idProviderProfileFileName, com.telecominfraproject.wlan.profile.models.Profile.class); ssidProfiles.stream().forEach(p -> apProfile.getChildProfileIds().add(p.getId())); @@ -161,7 +165,8 @@ public class OpensyncExternalIntegrationSimple implements OpensyncExternalIntegr new HashSet(operatorProfiles)); hotspotConfig.setHotspot20VenueSet( new HashSet(venueProfiles)); - + hotspotConfig.setHotspot20ProviderSet( + new HashSet(providerProfiles)); ret = new OpensyncAPConfig(); ret.setCustomerEquipment(equipment); diff --git a/opensync-ext-static/src/main/resources/ProfileAPExample.json b/opensync-ext-static/src/main/resources/ProfileAPExample.json index fad16cd..cd61fe3 100644 --- a/opensync-ext-static/src/main/resources/ProfileAPExample.json +++ b/opensync-ext-static/src/main/resources/ProfileAPExample.json @@ -1,55 +1,49 @@ -{ - "model_type": "Profile", - "id": 5, - "customerId": 2, - "profileType": "equipment_ap", - "name": "DefaultApProfile", - "details": { - "model_type": "ApNetworkConfiguration", - "networkConfigVersion": "AP-1", - "equipmentType": "AP", - "vlanNative": true, - "vlan": 0, - "ntpServer": { - "model_type": "AutoOrManualString", - "auto": true, - "value": "pool.ntp.org" - }, - "syslogRelay": null, - "rtlsSettings": null, - "syntheticClientEnabled": true, - "ledControlEnabled": true, - "equipmentDiscovery": false, - "radioMap": { - "is5GHz": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is2dot4GHz": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is5GHzU": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is5GHzL": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - } - }, - "profileType": "equipment_ap" - }, - "createdTimestamp": 1591653239947, - "lastModifiedTimestamp": 1591654336724, - "childProfileIds": [ - 6, - 7, - 8, - 9 - ] -} \ No newline at end of file + { + "model_type": "Profile", + "id": 15, + "customerId": 2, + "profileType": "equipment_ap", + "name": "ApProfile-3-radios", + "details": { + "model_type": "ApNetworkConfiguration", + "networkConfigVersion": "AP-1", + "equipmentType": "AP", + "vlanNative": true, + "vlan": 0, + "ntpServer": { + "model_type": "AutoOrManualString", + "auto": true, + "value": "pool.ntp.org" + }, + "syslogRelay": null, + "rtlsSettings": null, + "syntheticClientEnabled": true, + "ledControlEnabled": true, + "equipmentDiscovery": false, + "radioMap": { + "is2dot4GHz": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + }, + "is5GHzU": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + }, + "is5GHzL": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + } + }, + "profileType": "equipment_ap" + }, + "createdTimestamp": 1601961452652, + "lastModifiedTimestamp": 1601961452652, + "childProfileIds": [ + 2, + 9, + 11 + ] + } \ No newline at end of file diff --git a/opensync-ext-static/src/main/resources/ProfileHotspot20.json b/opensync-ext-static/src/main/resources/ProfileHotspot20.json index f8953c3..c01b5a7 100644 --- a/opensync-ext-static/src/main/resources/ProfileHotspot20.json +++ b/opensync-ext-static/src/main/resources/ProfileHotspot20.json @@ -1,55 +1,74 @@ [ -{ - "model_type": "Profile", - "id": 7777, - "customerId": 2, - "profileType": "hotspot_2pt0", - "name": "TipWlan-Hotspot20-Config", - "details": { - "model_type": "Hotspot2Profile", - "enableInterworkingAndHs20": true, - "hessid": null, - "accessNetworkType": "free_public_network", - "networkAuthenticationType": "acceptance_of_terms_and_conditions", - "additionalStepsRequiredForAccess": 0, - "deauthRequestTimeout": 0, - "operatingClass": 0, - "termsAndConditionsFile": { - "model_type": "ManagedFileInfo", - "md5checksum": null, - "lastModifiedTimestamp": null, - "apExportUrl": "https://localhost:9091/filestore/termsAndConditions", - "fileCategory": "ExternalPolicyConfiguration", - "fileType": "TEXT", - "altSlot": false + { + "model_type": "Profile", + "id": 8, + "customerId": 2, + "profileType": "hotspot_2pt0", + "name": "TipWlan-Hotspot20-Config", + "details": { + "model_type": "Hotspot2Profile", + "enableInterworkingAndHs20": true, + "hessid": null, + "accessNetworkType": "free_public_network", + "networkAuthenticationType": "acceptance_of_terms_and_conditions", + "additionalStepsRequiredForAccess": 0, + "deauthRequestTimeout": 0, + "operatingClass": 0, + "termsAndConditionsFile": { + "model_type": "ManagedFileInfo", + "md5checksum": null, + "lastModifiedTimestamp": null, + "apExportUrl": "https://localhost:9091/filestore/termsAndConditions", + "fileCategory": "ExternalPolicyConfiguration", + "fileType": "TEXT", + "altSlot": false + }, + "whitelistDomain": null, + "emergencyServicesReachable": true, + "unauthenticatedEmergencyServiceAccessible": false, + "internetConnectivity": true, + "connectionCapabilitySet": [ + { + "model_type": "ConnectionCapability", + "connectionCapabilitiesPortNumber": 8888, + "connectionCapabilitiesIpProtocol": "TCP", + "connectionCapabilitiesStatus": "open" + } + ], + "ipAddressTypeAvailability": "public_IPv4_address_available", + "qosMapSetConfiguration": null, + "apGeospatialLocation": null, + "apCivicLocation": null, + "apPublicLocationIdUri": null, + "gasAddr3Behaviour": "p2pSpecWorkaroundFromRequest", + "anqpDomainId": 1234, + "disableDownstreamGroupAddressedForwarding": false, + "enable2pt4GHz": true, + "enable5GHz": true, + "associatedSsids": [ + "TipWlan-cloud-3-radios" + ], + "mccMnc3gppCellularNetworkInfo": [ + { + "model_type": "MccMnc", + "mcc": 302, + "mnc": 720, + "iso": "ca", + "country": "Canada", + "countryCode": 1, + "network": "Rogers AT&T Wireless", + "mccMncPairing": "302,720" + } + ], + "profileType": "hotspot_2pt0", + "mccMncList": "302,720" }, - "whitelistDomain": null, - "emergencyServicesReachable": true, - "unauthenticatedEmergencyServiceAccessible": false, - "internetConnectivity": true, - "connectionCapabilitySet": [ - { - "model_type": "ConnectionCapability", - "connectionCapabilitiesPortNumber": 8888, - "connectionCapabilitiesIpProtocol": "TCP", - "connectionCapabilitiesStatus": "open" - } - ], - "ipAddressTypeAvailability": "public_IPv4_address_available", - "qosMapSetConfiguration": null, - "apGeospatialLocation": null, - "apCivicLocation": null, - "apPublicLocationIdUri": null, - "gasAddr3Behaviour": "p2pSpecWorkaroundFromRequest", - "anqpDomainId": 1234, - "disableDownstreamGroupAddressedForwarding": false, - "profileType": "hotspot_2pt0" - }, - "createdTimestamp": 1601595307355, - "lastModifiedTimestamp": 1601595307355, - "childProfileIds": [ - 5555, - 6666 - ] -} + "createdTimestamp": 1601961452370, + "lastModifiedTimestamp": 1601961452370, + "childProfileIds": [ + 5, + 6, + 7 + ] + } ] \ No newline at end of file diff --git a/opensync-ext-static/src/main/resources/ProfileIdProvider.json b/opensync-ext-static/src/main/resources/ProfileIdProvider.json new file mode 100644 index 0000000..41daff9 --- /dev/null +++ b/opensync-ext-static/src/main/resources/ProfileIdProvider.json @@ -0,0 +1,98 @@ +[ + { + "model_type": "Profile", + "id": 7, + "customerId": 2, + "profileType": "id_provider", + "name": "TipWlan-Hotspot20-OSU-Provider", + "details": { + "model_type": "Hotspot20IdProviderProfile", + "domainName": "example.com", + "mccMncList": [ + { + "model_type": "MccMnc", + "mcc": 302, + "mnc": 720, + "iso": "ca", + "country": "Canada", + "countryCode": 1, + "network": "Rogers AT&T Wireless", + "mccMncPairing": "302,720" + } + ], + "naiRealmList": [ + { + "model_type": "NaiRealmInformation", + "naiRealms": [ + "example.net", + "example.com" + ], + "encoding": 0, + "eapMethods": [ + "EAP-TLS with certificate" + ], + "eapMap": { + "EAP-TLS with certificate": [ + "Softoken", + "Certificate" + ] + } + } + ], + "osuIconList": [ + { + "model_type": "OsuIcon", + "iconWidth": 32, + "iconHeight": 32, + "languageCode": "eng", + "iconLocale": "en_CA", + "iconName": "icon32.png", + "filePath": "/tmp/icon32.png", + "hs20IconString": "32:32:eng:image/png:icon32.png:/tmp/icon32.png" + } + ], + "radiusProfileAuth": "Radius-Profile", + "radiusProfileAccounting": "Radius-Profile", + "osuSsid": "TipWlan-cloud-3-radios", + "osuServerUri": "https://example.com/osu/", + "osuFriendlyName": { + "model_type": "Hotspot20Duple", + "locale": "en_CA", + "dupleIso3Language": "eng", + "dupleName": "Example provider", + "defaultDupleSeparator": ":", + "asDuple": "eng:Example provider" + }, + "osuNaiStandalone": "anonymous@example.com", + "osuNaiShared": "anonymous@example.com", + "osuMethodList": [ + 1, + 0 + ], + "osuServiceDescription": [ + { + "model_type": "Hotspot20Duple", + "locale": "en_CA", + "dupleIso3Language": "eng", + "dupleName": "Example services", + "defaultDupleSeparator": ":", + "asDuple": "eng:Example services" + }, + { + "model_type": "Hotspot20Duple", + "locale": "fr_CA", + "dupleIso3Language": "fra", + "dupleName": "Exemples de services", + "defaultDupleSeparator": ":", + "asDuple": "fra:Exemples de services" + } + ], + "profileType": "id_provider" + }, + "createdTimestamp": 1601961451981, + "lastModifiedTimestamp": 1601961451981, + "childProfileIds": [ + 1 + ] + } + ] \ No newline at end of file diff --git a/opensync-ext-static/src/main/resources/ProfileMetrics.json b/opensync-ext-static/src/main/resources/ProfileMetrics.json index b3fb86b..4ac6711 100644 --- a/opensync-ext-static/src/main/resources/ProfileMetrics.json +++ b/opensync-ext-static/src/main/resources/ProfileMetrics.json @@ -1,16 +1,16 @@ [ { "model_type": "Profile", - "id": 333, + "id": 2, "customerId": 2, "profileType": "metrics", "name": "Metrics-Profile-3-radios", "details": { "model_type": "ServiceMetricsCollectionConfigProfile", "radioTypes": [ - "is5GHzL", + "is5GHzU", "is2dot4GHz", - "is5GHzU" + "is5GHzL" ], "serviceMetricDataTypes": [ "ApNode", @@ -30,19 +30,7 @@ "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, "statsReportFormat": "RAW", - "radioType": "is5GHzU", - "serviceMetricDataType": "ApNode" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 120, - "channelSurveyType": "OFF_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is5GHzL", + "radioType": "is2dot4GHz", "serviceMetricDataType": "ApNode" }, { @@ -60,20 +48,20 @@ { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", + "reportingIntervalSeconds": 120, + "channelSurveyType": "OFF_CHANNEL", "scanIntervalMillis": 0, "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, "statsReportFormat": "RAW", - "radioType": "is2dot4GHz", + "radioType": "is5GHzU", "serviceMetricDataType": "ApNode" }, { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, - "reportingIntervalSeconds": 120, - "channelSurveyType": "OFF_CHANNEL", + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", "scanIntervalMillis": 0, "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, @@ -92,6 +80,18 @@ "statsReportFormat": "RAW", "radioType": "is2dot4GHz", "serviceMetricDataType": "ApNode" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 120, + "channelSurveyType": "OFF_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is5GHzL", + "serviceMetricDataType": "ApNode" } ], "ApSsid": [ @@ -99,14 +99,14 @@ "model_type": "ServiceMetricRadioConfigParameters", "samplingInterval": 30, "reportingIntervalSeconds": 60, - "radioType": "is2dot4GHz", + "radioType": "is5GHzL", "serviceMetricDataType": "ApSsid" }, { "model_type": "ServiceMetricRadioConfigParameters", "samplingInterval": 30, "reportingIntervalSeconds": 60, - "radioType": "is5GHzL", + "radioType": "is2dot4GHz", "serviceMetricDataType": "ApSsid" }, { @@ -118,13 +118,6 @@ } ], "Client": [ - { - "model_type": "ServiceMetricRadioConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "radioType": "is2dot4GHz", - "serviceMetricDataType": "Client" - }, { "model_type": "ServiceMetricRadioConfigParameters", "samplingInterval": 30, @@ -138,6 +131,13 @@ "reportingIntervalSeconds": 60, "radioType": "is5GHzU", "serviceMetricDataType": "Client" + }, + { + "model_type": "ServiceMetricRadioConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "radioType": "is2dot4GHz", + "serviceMetricDataType": "Client" } ], "Channel": [ @@ -150,57 +150,21 @@ "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, "statsReportFormat": "RAW", - "radioType": "is5GHzL", - "serviceMetricDataType": "Channel" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 120, - "channelSurveyType": "OFF_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is2dot4GHz", - "serviceMetricDataType": "Channel" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is5GHzL", - "serviceMetricDataType": "Channel" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is2dot4GHz", - "serviceMetricDataType": "Channel" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", "radioType": "is5GHzU", "serviceMetricDataType": "Channel" }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is2dot4GHz", + "serviceMetricDataType": "Channel" + }, { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, @@ -210,6 +174,42 @@ "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, "statsReportFormat": "RAW", + "radioType": "is2dot4GHz", + "serviceMetricDataType": "Channel" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 120, + "channelSurveyType": "OFF_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is5GHzL", + "serviceMetricDataType": "Channel" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is5GHzL", + "serviceMetricDataType": "Channel" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", "radioType": "is5GHzU", "serviceMetricDataType": "Channel" } @@ -224,7 +224,19 @@ "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, "statsReportFormat": "RAW", - "radioType": "is5GHzL", + "radioType": "is5GHzU", + "serviceMetricDataType": "Neighbour" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is2dot4GHz", "serviceMetricDataType": "Neighbour" }, { @@ -248,7 +260,7 @@ "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, "statsReportFormat": "RAW", - "radioType": "is2dot4GHz", + "radioType": "is5GHzL", "serviceMetricDataType": "Neighbour" }, { @@ -263,18 +275,6 @@ "radioType": "is5GHzU", "serviceMetricDataType": "Neighbour" }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is5GHzL", - "serviceMetricDataType": "Neighbour" - }, { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, @@ -284,15 +284,15 @@ "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, "statsReportFormat": "RAW", - "radioType": "is5GHzU", + "radioType": "is5GHzL", "serviceMetricDataType": "Neighbour" } ] }, "profileType": "metrics" }, - "createdTimestamp": 1601335086248, - "lastModifiedTimestamp": 1601335086248, + "createdTimestamp": 1601961451756, + "lastModifiedTimestamp": 1601961451756, "childProfileIds": [] } ] \ No newline at end of file diff --git a/opensync-ext-static/src/main/resources/ProfileOperator.json b/opensync-ext-static/src/main/resources/ProfileOperator.json index 36f7fb2..1c78d88 100644 --- a/opensync-ext-static/src/main/resources/ProfileOperator.json +++ b/opensync-ext-static/src/main/resources/ProfileOperator.json @@ -1,35 +1,37 @@ [ -{ - "model_type": "Profile", - "id": 5555, - "customerId": 2, - "profileType": "operator", - "name": "TipWlan-Hotspot20-Operator", - "details": { - "model_type": "OperatorProfile", - "domainName": "telecominfraproject.atlassian.net", - "serverOnlyAuthenticatedL2EncryptionNetwork": false, - "x509CertificateLocation": "/etc/ca.pem", - "operatorFriendlyName": [ - { - "model_type": "Hotspot20Duple", - "locale": "en_CA", - "language": "eng", - "friendlyName": "default Friendly Operator Name", - "formattedFriendlyName": "eng:default Friendly Operator Name" - }, - { - "model_type": "Hotspot20Duple", - "locale": "fr_CA", - "language": "fra", - "friendlyName": "Nom de l'opérateur convivial par défaut", - "formattedFriendlyName": "fra:Nom de l'opérateur convivial par défaut" - } - ], - "profileType": "operator" - }, - "createdTimestamp": 1601595306885, - "lastModifiedTimestamp": 1601595306885, - "childProfileIds": [] -} + { + "model_type": "Profile", + "id": 5, + "customerId": 2, + "profileType": "operator", + "name": "TipWlan-Hotspot20-Operator", + "details": { + "model_type": "OperatorProfile", + "domainName": "telecominfraproject.atlassian.net", + "serverOnlyAuthenticatedL2EncryptionNetwork": false, + "x509CertificateLocation": "/etc/ca.pem", + "operatorFriendlyName": [ + { + "model_type": "Hotspot20Duple", + "locale": "en_CA", + "dupleIso3Language": "eng", + "dupleName": "Default friendly operator name", + "defaultDupleSeparator": ":", + "asDuple": "eng:Default friendly operator name" + }, + { + "model_type": "Hotspot20Duple", + "locale": "fr_CA", + "dupleIso3Language": "fra", + "dupleName": "Nom de l'opérateur convivial par défaut", + "defaultDupleSeparator": ":", + "asDuple": "fra:Nom de l'opérateur convivial par défaut" + } + ], + "profileType": "operator" + }, + "createdTimestamp": 1601961451776, + "lastModifiedTimestamp": 1601961451776, + "childProfileIds": [] + } ] \ No newline at end of file diff --git a/opensync-ext-static/src/main/resources/ProfileRadius.json b/opensync-ext-static/src/main/resources/ProfileRadius.json index da5f8cb..d7390a1 100644 --- a/opensync-ext-static/src/main/resources/ProfileRadius.json +++ b/opensync-ext-static/src/main/resources/ProfileRadius.json @@ -1,34 +1,34 @@ [ -{ - "model_type": "Profile", - "id": 1, - "customerId": 2, - "profileType": "radius", - "name": "RadiusProfileOttawa", - "details": { - "model_type": "RadiusProfile", - "subnetConfiguration": null, - "serviceRegionMap": { - "Ottawa": { - "model_type": "RadiusServiceRegion", - "serverMap": { - "RadiusProfileOttawa": [ - { - "model_type": "RadiusServer", - "ipAddress": "localhost", - "secret": "testing123", - "authPort": 1812, - "timeout": null - } - ] - }, - "regionName": "Ottawa" - } - }, - "profileType": "radius" - }, - "createdTimestamp": 1591653174195, - "lastModifiedTimestamp": 1591653174195, - "childProfileIds": [] -} + { + "model_type": "Profile", + "id": 1, + "customerId": 2, + "profileType": "radius", + "name": "Radius-Profile", + "details": { + "model_type": "RadiusProfile", + "subnetConfiguration": null, + "serviceRegionMap": { + "Ottawa": { + "model_type": "RadiusServiceRegion", + "serverMap": { + "Radius-Profile": [ + { + "model_type": "RadiusServer", + "ipAddress": "192.168.0.1", + "secret": "testing123", + "authPort": 1812, + "timeout": null + } + ] + }, + "regionName": "Ottawa" + } + }, + "profileType": "radius" + }, + "createdTimestamp": 1601961451668, + "lastModifiedTimestamp": 1601961451668, + "childProfileIds": [] + } ] \ No newline at end of file diff --git a/opensync-ext-static/src/main/resources/ProfileRf.json b/opensync-ext-static/src/main/resources/ProfileRf.json index 437c898..f8a2b9b 100644 --- a/opensync-ext-static/src/main/resources/ProfileRf.json +++ b/opensync-ext-static/src/main/resources/ProfileRf.json @@ -1,258 +1,256 @@ { - "model_type": "Profile", - "id": 9, - "customerId": 2, - "profileType": "rf", - "name": "DefaultRf", - "details": { - "model_type": "RfConfiguration", - "rf": "Default-RF", - "profileType": "rf", - "rfConfigMap": { - "is2dot4GHz": { - "model_type": "RfElementConfiguration", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is20MHz", - "mimoMode": "twoBytwo", - "maxNumClients": 100, - "multicastRate": "auto", - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "managementRate": "auto", - "rxCellSizeDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "eirpTxPower": { - "model_type": "AutoOrManualValue", - "auto": false, - "value": 32 - }, - "bestApEnabled": null, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "minAutoCellSize": -80, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 20, - "minLoadFactor": 50 - } - }, - "is5GHz": { - "model_type": "RfElementConfiguration", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is80MHz", - "mimoMode": "twoBytwo", - "maxNumClients": 100, - "multicastRate": "auto", - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "managementRate": "auto", - "rxCellSizeDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "eirpTxPower": { - "model_type": "AutoOrManualValue", - "auto": false, - "value": 32 - }, - "bestApEnabled": null, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "minAutoCellSize": -80, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 20, - "minLoadFactor": 50 - } - }, - "is5GHzL": { - "model_type": "RfElementConfiguration", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is80MHz", - "mimoMode": "twoBytwo", - "maxNumClients": 100, - "multicastRate": "auto", - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "managementRate": "auto", - "rxCellSizeDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "eirpTxPower": { - "model_type": "AutoOrManualValue", - "auto": false, - "value": 32 - }, - "bestApEnabled": null, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "minAutoCellSize": -80, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } - }, - "is5GHzU": { - "model_type": "RfElementConfiguration", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is80MHz", - "mimoMode": "twoBytwo", - "maxNumClients": 100, - "multicastRate": "auto", - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "managementRate": "auto", - "rxCellSizeDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "eirpTxPower": { - "model_type": "AutoOrManualValue", - "auto": false, - "value": 32 - }, - "bestApEnabled": null, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "minAutoCellSize": -80, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } - } - }, - "createdTimestamp": 1591653239983, - "lastModifiedTimestamp": 1591653239983, - "childProfileIds": [ - ] - } -} + "model_type": "Profile", + "id": 11, + "customerId": 2, + "profileType": "rf", + "name": "TipWlan-rf", + "details": { + "model_type": "RfConfiguration", + "rfConfigMap": { + "is5GHz": { + "model_type": "RfElementConfiguration", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is80MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "multicastRate": "auto", + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "managementRate": "auto", + "rxCellSizeDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "eirpTxPower": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": 18 + }, + "bestApEnabled": null, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 30, + "minLoadFactor": 40 + } + }, + "is2dot4GHz": { + "model_type": "RfElementConfiguration", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is20MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "multicastRate": "auto", + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "managementRate": "auto", + "rxCellSizeDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "eirpTxPower": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": 18 + }, + "bestApEnabled": null, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 20, + "minLoadFactor": 50 + } + }, + "is5GHzU": { + "model_type": "RfElementConfiguration", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is80MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "multicastRate": "auto", + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "managementRate": "auto", + "rxCellSizeDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "eirpTxPower": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": 18 + }, + "bestApEnabled": null, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 30, + "minLoadFactor": 40 + } + }, + "is5GHzL": { + "model_type": "RfElementConfiguration", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is80MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "multicastRate": "auto", + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "managementRate": "auto", + "rxCellSizeDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "eirpTxPower": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": 18 + }, + "bestApEnabled": null, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 30, + "minLoadFactor": 40 + } + } + }, + "profileType": "rf" + }, + "createdTimestamp": 1601961452390, + "lastModifiedTimestamp": 1601961452390, + "childProfileIds": [] +} \ No newline at end of file diff --git a/opensync-ext-static/src/main/resources/ProfileSsid.json b/opensync-ext-static/src/main/resources/ProfileSsid.json index 29aacd7..12ac606 100644 --- a/opensync-ext-static/src/main/resources/ProfileSsid.json +++ b/opensync-ext-static/src/main/resources/ProfileSsid.json @@ -1,186 +1,69 @@ [ { - "model_type": "Profile", - "id": 6, - "customerId": 2, - "profileType": "ssid", - "name": "DefaultSsid-2g", - "details": { - "model_type": "SsidConfiguration", - "ssid": "Default-SSID-2g", - "appliedRadios": [ - "is2dot4GHz" - ], - "ssidAdminState": "enabled", - "secureMode": "wpa2PSK", - "vlanId": 1, - "keyStr": "12345678", - "broadcastSsid": "enabled", - "keyRefresh": 0, - "noLocalSubnets": false, - "radiusServiceName": null, - "captivePortalId": null, - "bandwidthLimitDown": 0, - "bandwidthLimitUp": 0, - "clientBandwidthLimitDown": 0, - "clientBandwidthLimitUp": 0, - "videoTrafficOnly": false, - "radioBasedConfigs": { - "is5GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is2dot4GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzU": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzL": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - } - }, - "bonjourGatewayProfileId": null, - "enable80211w": null, - "wepConfig": null, - "forwardMode": null, - "profileType": "ssid" - }, - "createdTimestamp": 1591653239983, - "lastModifiedTimestamp": 1591653239983, - "childProfileIds": [] -}, -{ - "model_type": "Profile", - "id": 7, - "customerId": 2, - "profileType": "ssid", - "name": "DefaultSsid-5gl", - "details": { - "model_type": "SsidConfiguration", - "ssid": "Default-SSID-5gl", - "appliedRadios": [ - "is5GHzL" - ], - "ssidAdminState": "enabled", - "secureMode": "wpaEAP", - "vlanId": 1, - "keyStr": "12345678", - "broadcastSsid": "enabled", - "keyRefresh": 0, - "noLocalSubnets": false, - "radiusServiceName": "RadiusProfileOttawa", - "captivePortalId": null, - "bandwidthLimitDown": 0, - "bandwidthLimitUp": 0, - "videoTrafficOnly": false, - "radioBasedConfigs": { - "is5GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is2dot4GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzU": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzL": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - } - }, - "bonjourGatewayProfileId": null, - "enable80211w": null, - "wepConfig": null, - "forwardMode": null, - "profileType": "ssid" - }, - "createdTimestamp": 1591653240017, - "lastModifiedTimestamp": 1591654215374, - "childProfileIds": [ - 1 - ] -}, -{ - "model_type": "Profile", - "id": 8, - "customerId": 2, - "profileType": "ssid", - "name": "DefaultSsid-5gu", - "details": { - "model_type": "SsidConfiguration", - "ssid": "Default-SSID-5gu", - "appliedRadios": [ - "is5GHzU" - ], - "ssidAdminState": "enabled", - "secureMode": "wpa2PSK", - "vlanId": 1, - "keyStr": "12345678", - "broadcastSsid": "enabled", - "keyRefresh": 0, - "noLocalSubnets": false, - "radiusServiceName": null, - "captivePortalId": null, - "bandwidthLimitDown": 0, - "bandwidthLimitUp": 0, - "videoTrafficOnly": false, - "radioBasedConfigs": { - "is5GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is2dot4GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzU": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzL": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - } - }, - "bonjourGatewayProfileId": null, - "enable80211w": null, - "wepConfig": null, - "forwardMode": null, - "profileType": "ssid" - }, - "createdTimestamp": 1591654301763, - "lastModifiedTimestamp": 1591654301763, - "childProfileIds": [] -} + "model_type": "Profile", + "id": 9, + "customerId": 2, + "profileType": "ssid", + "name": "TipWlan-cloud-3-radios", + "details": { + "model_type": "SsidConfiguration", + "ssid": "TipWlan-cloud-3-radios", + "appliedRadios": [ + "is5GHzU", + "is2dot4GHz", + "is5GHzL" + ], + "ssidAdminState": "enabled", + "secureMode": "open", + "vlanId": 1, + "keyStr": null, + "broadcastSsid": "enabled", + "keyRefresh": 0, + "noLocalSubnets": false, + "radiusServiceName": null, + "captivePortalId": null, + "bandwidthLimitDown": 0, + "bandwidthLimitUp": 0, + "clientBandwidthLimitDown": 0, + "clientBandwidthLimitUp": 0, + "videoTrafficOnly": false, + "radioBasedConfigs": { + "is5GHz": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + }, + "is2dot4GHz": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + }, + "is5GHzU": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + }, + "is5GHzL": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + } + }, + "bonjourGatewayProfileId": null, + "enable80211w": null, + "wepConfig": null, + "forwardMode": null, + "profileType": "ssid" + }, + "createdTimestamp": 1601961452385, + "lastModifiedTimestamp": 1601961452385, + "childProfileIds": [ + 7, + 8 + ] + } ] diff --git a/opensync-ext-static/src/main/resources/ProfileVenue.json b/opensync-ext-static/src/main/resources/ProfileVenue.json index c79f0d8..afa8f75 100644 --- a/opensync-ext-static/src/main/resources/ProfileVenue.json +++ b/opensync-ext-static/src/main/resources/ProfileVenue.json @@ -1,40 +1,42 @@ [ -{ - "model_type": "Profile", - "id": 6666, - "customerId": 2, - "profileType": "venue", - "name": "TipWlan-Hotspot20-Venue", - "details": { - "model_type": "VenueProfile", - "venueNameSet": [ - { - "model_type": "VenueName", - "locale": "en_CA", - "language": "eng", - "venueName": "Example venue", - "venueUrl": "http://www.example.com/info-eng", - "formattedVenueName": "eng:Example venue" + { + "model_type": "Profile", + "id": 6, + "customerId": 2, + "profileType": "venue", + "name": "TipWlan-Hotspot20-Venue", + "details": { + "model_type": "VenueProfile", + "venueNameSet": [ + { + "model_type": "VenueName", + "locale": "fr_CA", + "dupleIso3Language": "fra", + "dupleName": "Exemple de lieu", + "defaultDupleSeparator": ":", + "venueUrl": "http://www.example.com/info-fra", + "asDuple": "fra:Exemple de lieu" + }, + { + "model_type": "VenueName", + "locale": "en_CA", + "dupleIso3Language": "eng", + "dupleName": "Example venue", + "defaultDupleSeparator": ":", + "venueUrl": "http://www.example.com/info-eng", + "asDuple": "eng:Example venue" + } + ], + "venueTypeAssignment": { + "model_type": "VenueTypeAssignment", + "venueDescription": "Research and Development Facility", + "venueGroupId": 2, + "venueTypeId": 8 }, - { - "model_type": "VenueName", - "locale": "fr_CA", - "language": "fra", - "venueName": "Exemple de lieu", - "venueUrl": "http://www.example.com/info-fra", - "formattedVenueName": "fra:Exemple de lieu" - } - ], - "venueTypeAssignment": { - "model_type": "VenueTypeAssignment", - "venueDescription": "Research and Development Facility", - "venueGroupId": 2, - "venueTypeId": 8 + "profileType": "venue" }, - "profileType": "venue" - }, - "createdTimestamp": 1601595306891, - "lastModifiedTimestamp": 1601595306891, - "childProfileIds": [] -} + "createdTimestamp": 1601961451781, + "lastModifiedTimestamp": 1601961451781, + "childProfileIds": [] + } ] \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/Dockerfile b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/Dockerfile index c7cdb46..6aea929 100644 --- a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/Dockerfile +++ b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/Dockerfile @@ -31,6 +31,7 @@ COPY app/opensync/ProfileRf.json /app/opensync/ProfileRf.json COPY app/opensync/ProfileHotspot20.json /app/opensync/ProfileHotspot20.json COPY app/opensync/ProfileOperator.json /app/opensync/ProfileOperator.json COPY app/opensync/ProfileVenue.json /app/opensync/ProfileVenue.json +COPY app/opensync/ProfileIdProvider.json /app/opensync/ProfileIdProvider.json VOLUME ["/app/logs", "/app/config"] RUN chmod +x /app/run.sh diff --git a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileAPExample.json b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileAPExample.json index fad16cd..cd61fe3 100644 --- a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileAPExample.json +++ b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileAPExample.json @@ -1,55 +1,49 @@ -{ - "model_type": "Profile", - "id": 5, - "customerId": 2, - "profileType": "equipment_ap", - "name": "DefaultApProfile", - "details": { - "model_type": "ApNetworkConfiguration", - "networkConfigVersion": "AP-1", - "equipmentType": "AP", - "vlanNative": true, - "vlan": 0, - "ntpServer": { - "model_type": "AutoOrManualString", - "auto": true, - "value": "pool.ntp.org" - }, - "syslogRelay": null, - "rtlsSettings": null, - "syntheticClientEnabled": true, - "ledControlEnabled": true, - "equipmentDiscovery": false, - "radioMap": { - "is5GHz": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is2dot4GHz": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is5GHzU": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is5GHzL": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - } - }, - "profileType": "equipment_ap" - }, - "createdTimestamp": 1591653239947, - "lastModifiedTimestamp": 1591654336724, - "childProfileIds": [ - 6, - 7, - 8, - 9 - ] -} \ No newline at end of file + { + "model_type": "Profile", + "id": 15, + "customerId": 2, + "profileType": "equipment_ap", + "name": "ApProfile-3-radios", + "details": { + "model_type": "ApNetworkConfiguration", + "networkConfigVersion": "AP-1", + "equipmentType": "AP", + "vlanNative": true, + "vlan": 0, + "ntpServer": { + "model_type": "AutoOrManualString", + "auto": true, + "value": "pool.ntp.org" + }, + "syslogRelay": null, + "rtlsSettings": null, + "syntheticClientEnabled": true, + "ledControlEnabled": true, + "equipmentDiscovery": false, + "radioMap": { + "is2dot4GHz": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + }, + "is5GHzU": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + }, + "is5GHzL": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + } + }, + "profileType": "equipment_ap" + }, + "createdTimestamp": 1601961452652, + "lastModifiedTimestamp": 1601961452652, + "childProfileIds": [ + 2, + 9, + 11 + ] + } \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileHotspot20.json b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileHotspot20.json index f8953c3..c01b5a7 100644 --- a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileHotspot20.json +++ b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileHotspot20.json @@ -1,55 +1,74 @@ [ -{ - "model_type": "Profile", - "id": 7777, - "customerId": 2, - "profileType": "hotspot_2pt0", - "name": "TipWlan-Hotspot20-Config", - "details": { - "model_type": "Hotspot2Profile", - "enableInterworkingAndHs20": true, - "hessid": null, - "accessNetworkType": "free_public_network", - "networkAuthenticationType": "acceptance_of_terms_and_conditions", - "additionalStepsRequiredForAccess": 0, - "deauthRequestTimeout": 0, - "operatingClass": 0, - "termsAndConditionsFile": { - "model_type": "ManagedFileInfo", - "md5checksum": null, - "lastModifiedTimestamp": null, - "apExportUrl": "https://localhost:9091/filestore/termsAndConditions", - "fileCategory": "ExternalPolicyConfiguration", - "fileType": "TEXT", - "altSlot": false + { + "model_type": "Profile", + "id": 8, + "customerId": 2, + "profileType": "hotspot_2pt0", + "name": "TipWlan-Hotspot20-Config", + "details": { + "model_type": "Hotspot2Profile", + "enableInterworkingAndHs20": true, + "hessid": null, + "accessNetworkType": "free_public_network", + "networkAuthenticationType": "acceptance_of_terms_and_conditions", + "additionalStepsRequiredForAccess": 0, + "deauthRequestTimeout": 0, + "operatingClass": 0, + "termsAndConditionsFile": { + "model_type": "ManagedFileInfo", + "md5checksum": null, + "lastModifiedTimestamp": null, + "apExportUrl": "https://localhost:9091/filestore/termsAndConditions", + "fileCategory": "ExternalPolicyConfiguration", + "fileType": "TEXT", + "altSlot": false + }, + "whitelistDomain": null, + "emergencyServicesReachable": true, + "unauthenticatedEmergencyServiceAccessible": false, + "internetConnectivity": true, + "connectionCapabilitySet": [ + { + "model_type": "ConnectionCapability", + "connectionCapabilitiesPortNumber": 8888, + "connectionCapabilitiesIpProtocol": "TCP", + "connectionCapabilitiesStatus": "open" + } + ], + "ipAddressTypeAvailability": "public_IPv4_address_available", + "qosMapSetConfiguration": null, + "apGeospatialLocation": null, + "apCivicLocation": null, + "apPublicLocationIdUri": null, + "gasAddr3Behaviour": "p2pSpecWorkaroundFromRequest", + "anqpDomainId": 1234, + "disableDownstreamGroupAddressedForwarding": false, + "enable2pt4GHz": true, + "enable5GHz": true, + "associatedSsids": [ + "TipWlan-cloud-3-radios" + ], + "mccMnc3gppCellularNetworkInfo": [ + { + "model_type": "MccMnc", + "mcc": 302, + "mnc": 720, + "iso": "ca", + "country": "Canada", + "countryCode": 1, + "network": "Rogers AT&T Wireless", + "mccMncPairing": "302,720" + } + ], + "profileType": "hotspot_2pt0", + "mccMncList": "302,720" }, - "whitelistDomain": null, - "emergencyServicesReachable": true, - "unauthenticatedEmergencyServiceAccessible": false, - "internetConnectivity": true, - "connectionCapabilitySet": [ - { - "model_type": "ConnectionCapability", - "connectionCapabilitiesPortNumber": 8888, - "connectionCapabilitiesIpProtocol": "TCP", - "connectionCapabilitiesStatus": "open" - } - ], - "ipAddressTypeAvailability": "public_IPv4_address_available", - "qosMapSetConfiguration": null, - "apGeospatialLocation": null, - "apCivicLocation": null, - "apPublicLocationIdUri": null, - "gasAddr3Behaviour": "p2pSpecWorkaroundFromRequest", - "anqpDomainId": 1234, - "disableDownstreamGroupAddressedForwarding": false, - "profileType": "hotspot_2pt0" - }, - "createdTimestamp": 1601595307355, - "lastModifiedTimestamp": 1601595307355, - "childProfileIds": [ - 5555, - 6666 - ] -} + "createdTimestamp": 1601961452370, + "lastModifiedTimestamp": 1601961452370, + "childProfileIds": [ + 5, + 6, + 7 + ] + } ] \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileIdProvider.json b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileIdProvider.json new file mode 100644 index 0000000..41daff9 --- /dev/null +++ b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileIdProvider.json @@ -0,0 +1,98 @@ +[ + { + "model_type": "Profile", + "id": 7, + "customerId": 2, + "profileType": "id_provider", + "name": "TipWlan-Hotspot20-OSU-Provider", + "details": { + "model_type": "Hotspot20IdProviderProfile", + "domainName": "example.com", + "mccMncList": [ + { + "model_type": "MccMnc", + "mcc": 302, + "mnc": 720, + "iso": "ca", + "country": "Canada", + "countryCode": 1, + "network": "Rogers AT&T Wireless", + "mccMncPairing": "302,720" + } + ], + "naiRealmList": [ + { + "model_type": "NaiRealmInformation", + "naiRealms": [ + "example.net", + "example.com" + ], + "encoding": 0, + "eapMethods": [ + "EAP-TLS with certificate" + ], + "eapMap": { + "EAP-TLS with certificate": [ + "Softoken", + "Certificate" + ] + } + } + ], + "osuIconList": [ + { + "model_type": "OsuIcon", + "iconWidth": 32, + "iconHeight": 32, + "languageCode": "eng", + "iconLocale": "en_CA", + "iconName": "icon32.png", + "filePath": "/tmp/icon32.png", + "hs20IconString": "32:32:eng:image/png:icon32.png:/tmp/icon32.png" + } + ], + "radiusProfileAuth": "Radius-Profile", + "radiusProfileAccounting": "Radius-Profile", + "osuSsid": "TipWlan-cloud-3-radios", + "osuServerUri": "https://example.com/osu/", + "osuFriendlyName": { + "model_type": "Hotspot20Duple", + "locale": "en_CA", + "dupleIso3Language": "eng", + "dupleName": "Example provider", + "defaultDupleSeparator": ":", + "asDuple": "eng:Example provider" + }, + "osuNaiStandalone": "anonymous@example.com", + "osuNaiShared": "anonymous@example.com", + "osuMethodList": [ + 1, + 0 + ], + "osuServiceDescription": [ + { + "model_type": "Hotspot20Duple", + "locale": "en_CA", + "dupleIso3Language": "eng", + "dupleName": "Example services", + "defaultDupleSeparator": ":", + "asDuple": "eng:Example services" + }, + { + "model_type": "Hotspot20Duple", + "locale": "fr_CA", + "dupleIso3Language": "fra", + "dupleName": "Exemples de services", + "defaultDupleSeparator": ":", + "asDuple": "fra:Exemples de services" + } + ], + "profileType": "id_provider" + }, + "createdTimestamp": 1601961451981, + "lastModifiedTimestamp": 1601961451981, + "childProfileIds": [ + 1 + ] + } + ] \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileMetrics.json b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileMetrics.json index b3fb86b..4ac6711 100644 --- a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileMetrics.json +++ b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileMetrics.json @@ -1,16 +1,16 @@ [ { "model_type": "Profile", - "id": 333, + "id": 2, "customerId": 2, "profileType": "metrics", "name": "Metrics-Profile-3-radios", "details": { "model_type": "ServiceMetricsCollectionConfigProfile", "radioTypes": [ - "is5GHzL", + "is5GHzU", "is2dot4GHz", - "is5GHzU" + "is5GHzL" ], "serviceMetricDataTypes": [ "ApNode", @@ -30,19 +30,7 @@ "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, "statsReportFormat": "RAW", - "radioType": "is5GHzU", - "serviceMetricDataType": "ApNode" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 120, - "channelSurveyType": "OFF_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is5GHzL", + "radioType": "is2dot4GHz", "serviceMetricDataType": "ApNode" }, { @@ -60,20 +48,20 @@ { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", + "reportingIntervalSeconds": 120, + "channelSurveyType": "OFF_CHANNEL", "scanIntervalMillis": 0, "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, "statsReportFormat": "RAW", - "radioType": "is2dot4GHz", + "radioType": "is5GHzU", "serviceMetricDataType": "ApNode" }, { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, - "reportingIntervalSeconds": 120, - "channelSurveyType": "OFF_CHANNEL", + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", "scanIntervalMillis": 0, "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, @@ -92,6 +80,18 @@ "statsReportFormat": "RAW", "radioType": "is2dot4GHz", "serviceMetricDataType": "ApNode" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 120, + "channelSurveyType": "OFF_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is5GHzL", + "serviceMetricDataType": "ApNode" } ], "ApSsid": [ @@ -99,14 +99,14 @@ "model_type": "ServiceMetricRadioConfigParameters", "samplingInterval": 30, "reportingIntervalSeconds": 60, - "radioType": "is2dot4GHz", + "radioType": "is5GHzL", "serviceMetricDataType": "ApSsid" }, { "model_type": "ServiceMetricRadioConfigParameters", "samplingInterval": 30, "reportingIntervalSeconds": 60, - "radioType": "is5GHzL", + "radioType": "is2dot4GHz", "serviceMetricDataType": "ApSsid" }, { @@ -118,13 +118,6 @@ } ], "Client": [ - { - "model_type": "ServiceMetricRadioConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "radioType": "is2dot4GHz", - "serviceMetricDataType": "Client" - }, { "model_type": "ServiceMetricRadioConfigParameters", "samplingInterval": 30, @@ -138,6 +131,13 @@ "reportingIntervalSeconds": 60, "radioType": "is5GHzU", "serviceMetricDataType": "Client" + }, + { + "model_type": "ServiceMetricRadioConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "radioType": "is2dot4GHz", + "serviceMetricDataType": "Client" } ], "Channel": [ @@ -150,57 +150,21 @@ "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, "statsReportFormat": "RAW", - "radioType": "is5GHzL", - "serviceMetricDataType": "Channel" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 120, - "channelSurveyType": "OFF_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is2dot4GHz", - "serviceMetricDataType": "Channel" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is5GHzL", - "serviceMetricDataType": "Channel" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is2dot4GHz", - "serviceMetricDataType": "Channel" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", "radioType": "is5GHzU", "serviceMetricDataType": "Channel" }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is2dot4GHz", + "serviceMetricDataType": "Channel" + }, { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, @@ -210,6 +174,42 @@ "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, "statsReportFormat": "RAW", + "radioType": "is2dot4GHz", + "serviceMetricDataType": "Channel" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 120, + "channelSurveyType": "OFF_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is5GHzL", + "serviceMetricDataType": "Channel" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is5GHzL", + "serviceMetricDataType": "Channel" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", "radioType": "is5GHzU", "serviceMetricDataType": "Channel" } @@ -224,7 +224,19 @@ "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, "statsReportFormat": "RAW", - "radioType": "is5GHzL", + "radioType": "is5GHzU", + "serviceMetricDataType": "Neighbour" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is2dot4GHz", "serviceMetricDataType": "Neighbour" }, { @@ -248,7 +260,7 @@ "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, "statsReportFormat": "RAW", - "radioType": "is2dot4GHz", + "radioType": "is5GHzL", "serviceMetricDataType": "Neighbour" }, { @@ -263,18 +275,6 @@ "radioType": "is5GHzU", "serviceMetricDataType": "Neighbour" }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is5GHzL", - "serviceMetricDataType": "Neighbour" - }, { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, @@ -284,15 +284,15 @@ "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, "statsReportFormat": "RAW", - "radioType": "is5GHzU", + "radioType": "is5GHzL", "serviceMetricDataType": "Neighbour" } ] }, "profileType": "metrics" }, - "createdTimestamp": 1601335086248, - "lastModifiedTimestamp": 1601335086248, + "createdTimestamp": 1601961451756, + "lastModifiedTimestamp": 1601961451756, "childProfileIds": [] } ] \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileOperator.json b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileOperator.json index 36f7fb2..1c78d88 100644 --- a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileOperator.json +++ b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileOperator.json @@ -1,35 +1,37 @@ [ -{ - "model_type": "Profile", - "id": 5555, - "customerId": 2, - "profileType": "operator", - "name": "TipWlan-Hotspot20-Operator", - "details": { - "model_type": "OperatorProfile", - "domainName": "telecominfraproject.atlassian.net", - "serverOnlyAuthenticatedL2EncryptionNetwork": false, - "x509CertificateLocation": "/etc/ca.pem", - "operatorFriendlyName": [ - { - "model_type": "Hotspot20Duple", - "locale": "en_CA", - "language": "eng", - "friendlyName": "default Friendly Operator Name", - "formattedFriendlyName": "eng:default Friendly Operator Name" - }, - { - "model_type": "Hotspot20Duple", - "locale": "fr_CA", - "language": "fra", - "friendlyName": "Nom de l'opérateur convivial par défaut", - "formattedFriendlyName": "fra:Nom de l'opérateur convivial par défaut" - } - ], - "profileType": "operator" - }, - "createdTimestamp": 1601595306885, - "lastModifiedTimestamp": 1601595306885, - "childProfileIds": [] -} + { + "model_type": "Profile", + "id": 5, + "customerId": 2, + "profileType": "operator", + "name": "TipWlan-Hotspot20-Operator", + "details": { + "model_type": "OperatorProfile", + "domainName": "telecominfraproject.atlassian.net", + "serverOnlyAuthenticatedL2EncryptionNetwork": false, + "x509CertificateLocation": "/etc/ca.pem", + "operatorFriendlyName": [ + { + "model_type": "Hotspot20Duple", + "locale": "en_CA", + "dupleIso3Language": "eng", + "dupleName": "Default friendly operator name", + "defaultDupleSeparator": ":", + "asDuple": "eng:Default friendly operator name" + }, + { + "model_type": "Hotspot20Duple", + "locale": "fr_CA", + "dupleIso3Language": "fra", + "dupleName": "Nom de l'opérateur convivial par défaut", + "defaultDupleSeparator": ":", + "asDuple": "fra:Nom de l'opérateur convivial par défaut" + } + ], + "profileType": "operator" + }, + "createdTimestamp": 1601961451776, + "lastModifiedTimestamp": 1601961451776, + "childProfileIds": [] + } ] \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileRadius.json b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileRadius.json index da5f8cb..d7390a1 100644 --- a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileRadius.json +++ b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileRadius.json @@ -1,34 +1,34 @@ [ -{ - "model_type": "Profile", - "id": 1, - "customerId": 2, - "profileType": "radius", - "name": "RadiusProfileOttawa", - "details": { - "model_type": "RadiusProfile", - "subnetConfiguration": null, - "serviceRegionMap": { - "Ottawa": { - "model_type": "RadiusServiceRegion", - "serverMap": { - "RadiusProfileOttawa": [ - { - "model_type": "RadiusServer", - "ipAddress": "localhost", - "secret": "testing123", - "authPort": 1812, - "timeout": null - } - ] - }, - "regionName": "Ottawa" - } - }, - "profileType": "radius" - }, - "createdTimestamp": 1591653174195, - "lastModifiedTimestamp": 1591653174195, - "childProfileIds": [] -} + { + "model_type": "Profile", + "id": 1, + "customerId": 2, + "profileType": "radius", + "name": "Radius-Profile", + "details": { + "model_type": "RadiusProfile", + "subnetConfiguration": null, + "serviceRegionMap": { + "Ottawa": { + "model_type": "RadiusServiceRegion", + "serverMap": { + "Radius-Profile": [ + { + "model_type": "RadiusServer", + "ipAddress": "192.168.0.1", + "secret": "testing123", + "authPort": 1812, + "timeout": null + } + ] + }, + "regionName": "Ottawa" + } + }, + "profileType": "radius" + }, + "createdTimestamp": 1601961451668, + "lastModifiedTimestamp": 1601961451668, + "childProfileIds": [] + } ] \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileRf.json b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileRf.json index 1e3d235..f8a2b9b 100644 --- a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileRf.json +++ b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileRf.json @@ -1,258 +1,256 @@ { - "model_type": "Profile", - "id": 9, - "customerId": 2, - "profileType": "rf", - "name": "DefaultRf", - "details": { - "model_type": "RfConfiguration", - "rf": "Default-RF", - "profileType": "rf", - "rfConfigMap": { - "is2dot4GHz": { - "model_type": "RfElementConfiguration", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is20MHz", - "mimoMode": "twoBytwo", - "maxNumClients": 100, - "multicastRate": "auto", - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "managementRate": "auto", - "rxCellSizeDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "eirpTxPower": { - "model_type": "AutoOrManualValue", - "auto": false, - "value": 32 - }, - "bestApEnabled": null, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "minAutoCellSize": -80, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 20, - "minLoadFactor": 50 - } - }, - "is5GHz": { - "model_type": "RfElementConfiguration", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is80MHz", - "mimoMode": "twoBytwo", - "maxNumClients": 100, - "multicastRate": "auto", - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "managementRate": "auto", - "rxCellSizeDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "eirpTxPower": { - "model_type": "AutoOrManualValue", - "auto": false, - "value": 32 - }, - "bestApEnabled": null, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "minAutoCellSize": -80, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } - }, - "is5GHzL": { - "model_type": "RfElementConfiguration", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is80MHz", - "mimoMode": "twoBytwo", - "maxNumClients": 100, - "multicastRate": "auto", - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "managementRate": "auto", - "rxCellSizeDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "eirpTxPower": { - "model_type": "AutoOrManualValue", - "auto": false, - "value": 32 - }, - "bestApEnabled": null, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "minAutoCellSize": -80, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } - }, - "is5GHzU": { - "model_type": "RfElementConfiguration", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is80MHz", - "mimoMode": "twoBytwo", - "maxNumClients": 100, - "multicastRate": "auto", - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "managementRate": "auto", - "rxCellSizeDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "eirpTxPower": { - "model_type": "AutoOrManualValue", - "auto": false, - "value": 32 - }, - "bestApEnabled": null, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "minAutoCellSize": -80, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } - } - }, - "createdTimestamp": 1591653239983, - "lastModifiedTimestamp": 1591653239983, - "childProfileIds": [ - ] - } -} + "model_type": "Profile", + "id": 11, + "customerId": 2, + "profileType": "rf", + "name": "TipWlan-rf", + "details": { + "model_type": "RfConfiguration", + "rfConfigMap": { + "is5GHz": { + "model_type": "RfElementConfiguration", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is80MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "multicastRate": "auto", + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "managementRate": "auto", + "rxCellSizeDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "eirpTxPower": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": 18 + }, + "bestApEnabled": null, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 30, + "minLoadFactor": 40 + } + }, + "is2dot4GHz": { + "model_type": "RfElementConfiguration", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is20MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "multicastRate": "auto", + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "managementRate": "auto", + "rxCellSizeDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "eirpTxPower": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": 18 + }, + "bestApEnabled": null, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 20, + "minLoadFactor": 50 + } + }, + "is5GHzU": { + "model_type": "RfElementConfiguration", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is80MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "multicastRate": "auto", + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "managementRate": "auto", + "rxCellSizeDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "eirpTxPower": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": 18 + }, + "bestApEnabled": null, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 30, + "minLoadFactor": 40 + } + }, + "is5GHzL": { + "model_type": "RfElementConfiguration", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is80MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "multicastRate": "auto", + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "managementRate": "auto", + "rxCellSizeDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "eirpTxPower": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": 18 + }, + "bestApEnabled": null, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 30, + "minLoadFactor": 40 + } + } + }, + "profileType": "rf" + }, + "createdTimestamp": 1601961452390, + "lastModifiedTimestamp": 1601961452390, + "childProfileIds": [] +} \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileSsid.json b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileSsid.json index 29aacd7..12ac606 100644 --- a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileSsid.json +++ b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileSsid.json @@ -1,186 +1,69 @@ [ { - "model_type": "Profile", - "id": 6, - "customerId": 2, - "profileType": "ssid", - "name": "DefaultSsid-2g", - "details": { - "model_type": "SsidConfiguration", - "ssid": "Default-SSID-2g", - "appliedRadios": [ - "is2dot4GHz" - ], - "ssidAdminState": "enabled", - "secureMode": "wpa2PSK", - "vlanId": 1, - "keyStr": "12345678", - "broadcastSsid": "enabled", - "keyRefresh": 0, - "noLocalSubnets": false, - "radiusServiceName": null, - "captivePortalId": null, - "bandwidthLimitDown": 0, - "bandwidthLimitUp": 0, - "clientBandwidthLimitDown": 0, - "clientBandwidthLimitUp": 0, - "videoTrafficOnly": false, - "radioBasedConfigs": { - "is5GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is2dot4GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzU": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzL": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - } - }, - "bonjourGatewayProfileId": null, - "enable80211w": null, - "wepConfig": null, - "forwardMode": null, - "profileType": "ssid" - }, - "createdTimestamp": 1591653239983, - "lastModifiedTimestamp": 1591653239983, - "childProfileIds": [] -}, -{ - "model_type": "Profile", - "id": 7, - "customerId": 2, - "profileType": "ssid", - "name": "DefaultSsid-5gl", - "details": { - "model_type": "SsidConfiguration", - "ssid": "Default-SSID-5gl", - "appliedRadios": [ - "is5GHzL" - ], - "ssidAdminState": "enabled", - "secureMode": "wpaEAP", - "vlanId": 1, - "keyStr": "12345678", - "broadcastSsid": "enabled", - "keyRefresh": 0, - "noLocalSubnets": false, - "radiusServiceName": "RadiusProfileOttawa", - "captivePortalId": null, - "bandwidthLimitDown": 0, - "bandwidthLimitUp": 0, - "videoTrafficOnly": false, - "radioBasedConfigs": { - "is5GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is2dot4GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzU": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzL": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - } - }, - "bonjourGatewayProfileId": null, - "enable80211w": null, - "wepConfig": null, - "forwardMode": null, - "profileType": "ssid" - }, - "createdTimestamp": 1591653240017, - "lastModifiedTimestamp": 1591654215374, - "childProfileIds": [ - 1 - ] -}, -{ - "model_type": "Profile", - "id": 8, - "customerId": 2, - "profileType": "ssid", - "name": "DefaultSsid-5gu", - "details": { - "model_type": "SsidConfiguration", - "ssid": "Default-SSID-5gu", - "appliedRadios": [ - "is5GHzU" - ], - "ssidAdminState": "enabled", - "secureMode": "wpa2PSK", - "vlanId": 1, - "keyStr": "12345678", - "broadcastSsid": "enabled", - "keyRefresh": 0, - "noLocalSubnets": false, - "radiusServiceName": null, - "captivePortalId": null, - "bandwidthLimitDown": 0, - "bandwidthLimitUp": 0, - "videoTrafficOnly": false, - "radioBasedConfigs": { - "is5GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is2dot4GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzU": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzL": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - } - }, - "bonjourGatewayProfileId": null, - "enable80211w": null, - "wepConfig": null, - "forwardMode": null, - "profileType": "ssid" - }, - "createdTimestamp": 1591654301763, - "lastModifiedTimestamp": 1591654301763, - "childProfileIds": [] -} + "model_type": "Profile", + "id": 9, + "customerId": 2, + "profileType": "ssid", + "name": "TipWlan-cloud-3-radios", + "details": { + "model_type": "SsidConfiguration", + "ssid": "TipWlan-cloud-3-radios", + "appliedRadios": [ + "is5GHzU", + "is2dot4GHz", + "is5GHzL" + ], + "ssidAdminState": "enabled", + "secureMode": "open", + "vlanId": 1, + "keyStr": null, + "broadcastSsid": "enabled", + "keyRefresh": 0, + "noLocalSubnets": false, + "radiusServiceName": null, + "captivePortalId": null, + "bandwidthLimitDown": 0, + "bandwidthLimitUp": 0, + "clientBandwidthLimitDown": 0, + "clientBandwidthLimitUp": 0, + "videoTrafficOnly": false, + "radioBasedConfigs": { + "is5GHz": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + }, + "is2dot4GHz": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + }, + "is5GHzU": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + }, + "is5GHzL": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + } + }, + "bonjourGatewayProfileId": null, + "enable80211w": null, + "wepConfig": null, + "forwardMode": null, + "profileType": "ssid" + }, + "createdTimestamp": 1601961452385, + "lastModifiedTimestamp": 1601961452385, + "childProfileIds": [ + 7, + 8 + ] + } ] diff --git a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileVenue.json b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileVenue.json index c79f0d8..afa8f75 100644 --- a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileVenue.json +++ b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileVenue.json @@ -1,40 +1,42 @@ [ -{ - "model_type": "Profile", - "id": 6666, - "customerId": 2, - "profileType": "venue", - "name": "TipWlan-Hotspot20-Venue", - "details": { - "model_type": "VenueProfile", - "venueNameSet": [ - { - "model_type": "VenueName", - "locale": "en_CA", - "language": "eng", - "venueName": "Example venue", - "venueUrl": "http://www.example.com/info-eng", - "formattedVenueName": "eng:Example venue" + { + "model_type": "Profile", + "id": 6, + "customerId": 2, + "profileType": "venue", + "name": "TipWlan-Hotspot20-Venue", + "details": { + "model_type": "VenueProfile", + "venueNameSet": [ + { + "model_type": "VenueName", + "locale": "fr_CA", + "dupleIso3Language": "fra", + "dupleName": "Exemple de lieu", + "defaultDupleSeparator": ":", + "venueUrl": "http://www.example.com/info-fra", + "asDuple": "fra:Exemple de lieu" + }, + { + "model_type": "VenueName", + "locale": "en_CA", + "dupleIso3Language": "eng", + "dupleName": "Example venue", + "defaultDupleSeparator": ":", + "venueUrl": "http://www.example.com/info-eng", + "asDuple": "eng:Example venue" + } + ], + "venueTypeAssignment": { + "model_type": "VenueTypeAssignment", + "venueDescription": "Research and Development Facility", + "venueGroupId": 2, + "venueTypeId": 8 }, - { - "model_type": "VenueName", - "locale": "fr_CA", - "language": "fra", - "venueName": "Exemple de lieu", - "venueUrl": "http://www.example.com/info-fra", - "formattedVenueName": "fra:Exemple de lieu" - } - ], - "venueTypeAssignment": { - "model_type": "VenueTypeAssignment", - "venueDescription": "Research and Development Facility", - "venueGroupId": 2, - "venueTypeId": 8 + "profileType": "venue" }, - "profileType": "venue" - }, - "createdTimestamp": 1601595306891, - "lastModifiedTimestamp": 1601595306891, - "childProfileIds": [] -} + "createdTimestamp": 1601961451781, + "lastModifiedTimestamp": 1601961451781, + "childProfileIds": [] + } ] \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/run.sh b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/run.sh index 027cb5d..5def356 100755 --- a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/run.sh +++ b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/run.sh @@ -36,7 +36,8 @@ OVSDB_APPROFILE_CONFIG_FILE="${OVSDB_AP_PROFILE_CONFIG_FILE:=/app/opensync/Profi OVSDB_METRICSPROFILE_CONFIG_FILE="${OVSDB_METRICSPROFILE_CONFIG_FILE:=/app/opensync/ProfileMetrics.json}" OVSDB_HOTSPOT20SPROFILE_CONFIG_FILE="${OVSDB_HOTSPOT20PROFILE_CONFIG_FILE:=/app/opensync/ProfileHotspot20.json}" OVSDB_OPERATORPROFILE_CONFIG_FILE="${OVSDB_OPERATORPROFILE_CONFIG_FILE:=/app/opensync/ProfileOperator.json}" -OVSDB_VENUEPROFILE_CONFIG_FILE="${OVSDB_VENUESPROFILE_CONFIG_FILE:=/app/opensync/ProfileVenue.json}" +OVSDB_VENUEPROFILE_CONFIG_FILE="${OVSDB_VENUEPROFILE_CONFIG_FILE:=/app/opensync/ProfileVenue.json}" +OVSDB_IDPROVIDERPROFILE_CONFIG_FILE="${OVSDB_IDPROVIDERPROFILE_CONFIG_FILE:=/app/opensync/ProfileIdProvider.json}" OVSDB_RFPROFILE_CONFIG_FILE="${OVSDB_RF_PROFILE_CONFIG_FILE:=/app/opensync/ProfileRf.json}" OVSDB_SSIDPROFILE_CONFIG_FILE="${OVSDB_SSIDPROFILE_CONFIG_FILE:=/app/opensync/ProfileSsid.json}" OVSDB_LOCATION_CONFIG_FILE="${OVSDB_LOCATION_CONFIG_FILE:=/app/opensync/LocationBuildingExample.json}" @@ -140,6 +141,7 @@ OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.metricsProfileFileName=$OVSDB_METRICS OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.hotspot20ProfileFileName=$OVSDB_HOTSPOT20PROFILE_CONFIG_FILE" OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.operatorProfileFileName=$OVSDB_OPERATORPROFILE_CONFIG_FILE" OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.venueProfileFileName=$OVSDB_VENUEPROFILE_CONFIG_FILE" +OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.idProviderProfileFileName=$OVSDB_IDPROVIDERPROFILE_CONFIG_FILE" OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.rfProfileFileName=$OVSDB_RFPROFILE_CONFIG_FILE" OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.preventClientCnAlteration=$OVSDB_PREVENT_CLIENTCN_ALTERATION" OVSDB_PROPS="$OVSDB_PROPS -Dtip.wlan.ovsdb.ssidProfileFileName=$OVSDB_SSIDPROFILE_CONFIG_FILE" diff --git a/opensync-gateway-static-docker/src/main/docker/Dockerfile b/opensync-gateway-static-docker/src/main/docker/Dockerfile index 1e5c6ef..5e1f183 100644 --- a/opensync-gateway-static-docker/src/main/docker/Dockerfile +++ b/opensync-gateway-static-docker/src/main/docker/Dockerfile @@ -18,6 +18,7 @@ COPY app/opensync/ProfileRf.json /app/opensync/ProfileRf.json COPY app/opensync/ProfileHotspot20.json /app/opensync/ProfileHotspot20.json COPY app/opensync/ProfileOperator.json /app/opensync/ProfileOperator.json COPY app/opensync/ProfileVenue.json /app/opensync/ProfileVenue.json +COPY app/opensync/ProfileIdProvider.json /app/opensync/ProfileIdProvider.json RUN chmod +x /app/run.sh diff --git a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileAPExample.json b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileAPExample.json index fad16cd..cd61fe3 100644 --- a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileAPExample.json +++ b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileAPExample.json @@ -1,55 +1,49 @@ -{ - "model_type": "Profile", - "id": 5, - "customerId": 2, - "profileType": "equipment_ap", - "name": "DefaultApProfile", - "details": { - "model_type": "ApNetworkConfiguration", - "networkConfigVersion": "AP-1", - "equipmentType": "AP", - "vlanNative": true, - "vlan": 0, - "ntpServer": { - "model_type": "AutoOrManualString", - "auto": true, - "value": "pool.ntp.org" - }, - "syslogRelay": null, - "rtlsSettings": null, - "syntheticClientEnabled": true, - "ledControlEnabled": true, - "equipmentDiscovery": false, - "radioMap": { - "is5GHz": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is2dot4GHz": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is5GHzU": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is5GHzL": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - } - }, - "profileType": "equipment_ap" - }, - "createdTimestamp": 1591653239947, - "lastModifiedTimestamp": 1591654336724, - "childProfileIds": [ - 6, - 7, - 8, - 9 - ] -} \ No newline at end of file + { + "model_type": "Profile", + "id": 15, + "customerId": 2, + "profileType": "equipment_ap", + "name": "ApProfile-3-radios", + "details": { + "model_type": "ApNetworkConfiguration", + "networkConfigVersion": "AP-1", + "equipmentType": "AP", + "vlanNative": true, + "vlan": 0, + "ntpServer": { + "model_type": "AutoOrManualString", + "auto": true, + "value": "pool.ntp.org" + }, + "syslogRelay": null, + "rtlsSettings": null, + "syntheticClientEnabled": true, + "ledControlEnabled": true, + "equipmentDiscovery": false, + "radioMap": { + "is2dot4GHz": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + }, + "is5GHzU": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + }, + "is5GHzL": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + } + }, + "profileType": "equipment_ap" + }, + "createdTimestamp": 1601961452652, + "lastModifiedTimestamp": 1601961452652, + "childProfileIds": [ + 2, + 9, + 11 + ] + } \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileHotspot20.json b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileHotspot20.json index f8953c3..c01b5a7 100644 --- a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileHotspot20.json +++ b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileHotspot20.json @@ -1,55 +1,74 @@ [ -{ - "model_type": "Profile", - "id": 7777, - "customerId": 2, - "profileType": "hotspot_2pt0", - "name": "TipWlan-Hotspot20-Config", - "details": { - "model_type": "Hotspot2Profile", - "enableInterworkingAndHs20": true, - "hessid": null, - "accessNetworkType": "free_public_network", - "networkAuthenticationType": "acceptance_of_terms_and_conditions", - "additionalStepsRequiredForAccess": 0, - "deauthRequestTimeout": 0, - "operatingClass": 0, - "termsAndConditionsFile": { - "model_type": "ManagedFileInfo", - "md5checksum": null, - "lastModifiedTimestamp": null, - "apExportUrl": "https://localhost:9091/filestore/termsAndConditions", - "fileCategory": "ExternalPolicyConfiguration", - "fileType": "TEXT", - "altSlot": false + { + "model_type": "Profile", + "id": 8, + "customerId": 2, + "profileType": "hotspot_2pt0", + "name": "TipWlan-Hotspot20-Config", + "details": { + "model_type": "Hotspot2Profile", + "enableInterworkingAndHs20": true, + "hessid": null, + "accessNetworkType": "free_public_network", + "networkAuthenticationType": "acceptance_of_terms_and_conditions", + "additionalStepsRequiredForAccess": 0, + "deauthRequestTimeout": 0, + "operatingClass": 0, + "termsAndConditionsFile": { + "model_type": "ManagedFileInfo", + "md5checksum": null, + "lastModifiedTimestamp": null, + "apExportUrl": "https://localhost:9091/filestore/termsAndConditions", + "fileCategory": "ExternalPolicyConfiguration", + "fileType": "TEXT", + "altSlot": false + }, + "whitelistDomain": null, + "emergencyServicesReachable": true, + "unauthenticatedEmergencyServiceAccessible": false, + "internetConnectivity": true, + "connectionCapabilitySet": [ + { + "model_type": "ConnectionCapability", + "connectionCapabilitiesPortNumber": 8888, + "connectionCapabilitiesIpProtocol": "TCP", + "connectionCapabilitiesStatus": "open" + } + ], + "ipAddressTypeAvailability": "public_IPv4_address_available", + "qosMapSetConfiguration": null, + "apGeospatialLocation": null, + "apCivicLocation": null, + "apPublicLocationIdUri": null, + "gasAddr3Behaviour": "p2pSpecWorkaroundFromRequest", + "anqpDomainId": 1234, + "disableDownstreamGroupAddressedForwarding": false, + "enable2pt4GHz": true, + "enable5GHz": true, + "associatedSsids": [ + "TipWlan-cloud-3-radios" + ], + "mccMnc3gppCellularNetworkInfo": [ + { + "model_type": "MccMnc", + "mcc": 302, + "mnc": 720, + "iso": "ca", + "country": "Canada", + "countryCode": 1, + "network": "Rogers AT&T Wireless", + "mccMncPairing": "302,720" + } + ], + "profileType": "hotspot_2pt0", + "mccMncList": "302,720" }, - "whitelistDomain": null, - "emergencyServicesReachable": true, - "unauthenticatedEmergencyServiceAccessible": false, - "internetConnectivity": true, - "connectionCapabilitySet": [ - { - "model_type": "ConnectionCapability", - "connectionCapabilitiesPortNumber": 8888, - "connectionCapabilitiesIpProtocol": "TCP", - "connectionCapabilitiesStatus": "open" - } - ], - "ipAddressTypeAvailability": "public_IPv4_address_available", - "qosMapSetConfiguration": null, - "apGeospatialLocation": null, - "apCivicLocation": null, - "apPublicLocationIdUri": null, - "gasAddr3Behaviour": "p2pSpecWorkaroundFromRequest", - "anqpDomainId": 1234, - "disableDownstreamGroupAddressedForwarding": false, - "profileType": "hotspot_2pt0" - }, - "createdTimestamp": 1601595307355, - "lastModifiedTimestamp": 1601595307355, - "childProfileIds": [ - 5555, - 6666 - ] -} + "createdTimestamp": 1601961452370, + "lastModifiedTimestamp": 1601961452370, + "childProfileIds": [ + 5, + 6, + 7 + ] + } ] \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileIdProvider.json b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileIdProvider.json new file mode 100644 index 0000000..41daff9 --- /dev/null +++ b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileIdProvider.json @@ -0,0 +1,98 @@ +[ + { + "model_type": "Profile", + "id": 7, + "customerId": 2, + "profileType": "id_provider", + "name": "TipWlan-Hotspot20-OSU-Provider", + "details": { + "model_type": "Hotspot20IdProviderProfile", + "domainName": "example.com", + "mccMncList": [ + { + "model_type": "MccMnc", + "mcc": 302, + "mnc": 720, + "iso": "ca", + "country": "Canada", + "countryCode": 1, + "network": "Rogers AT&T Wireless", + "mccMncPairing": "302,720" + } + ], + "naiRealmList": [ + { + "model_type": "NaiRealmInformation", + "naiRealms": [ + "example.net", + "example.com" + ], + "encoding": 0, + "eapMethods": [ + "EAP-TLS with certificate" + ], + "eapMap": { + "EAP-TLS with certificate": [ + "Softoken", + "Certificate" + ] + } + } + ], + "osuIconList": [ + { + "model_type": "OsuIcon", + "iconWidth": 32, + "iconHeight": 32, + "languageCode": "eng", + "iconLocale": "en_CA", + "iconName": "icon32.png", + "filePath": "/tmp/icon32.png", + "hs20IconString": "32:32:eng:image/png:icon32.png:/tmp/icon32.png" + } + ], + "radiusProfileAuth": "Radius-Profile", + "radiusProfileAccounting": "Radius-Profile", + "osuSsid": "TipWlan-cloud-3-radios", + "osuServerUri": "https://example.com/osu/", + "osuFriendlyName": { + "model_type": "Hotspot20Duple", + "locale": "en_CA", + "dupleIso3Language": "eng", + "dupleName": "Example provider", + "defaultDupleSeparator": ":", + "asDuple": "eng:Example provider" + }, + "osuNaiStandalone": "anonymous@example.com", + "osuNaiShared": "anonymous@example.com", + "osuMethodList": [ + 1, + 0 + ], + "osuServiceDescription": [ + { + "model_type": "Hotspot20Duple", + "locale": "en_CA", + "dupleIso3Language": "eng", + "dupleName": "Example services", + "defaultDupleSeparator": ":", + "asDuple": "eng:Example services" + }, + { + "model_type": "Hotspot20Duple", + "locale": "fr_CA", + "dupleIso3Language": "fra", + "dupleName": "Exemples de services", + "defaultDupleSeparator": ":", + "asDuple": "fra:Exemples de services" + } + ], + "profileType": "id_provider" + }, + "createdTimestamp": 1601961451981, + "lastModifiedTimestamp": 1601961451981, + "childProfileIds": [ + 1 + ] + } + ] \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileMetrics.json b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileMetrics.json index b3fb86b..4ac6711 100644 --- a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileMetrics.json +++ b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileMetrics.json @@ -1,16 +1,16 @@ [ { "model_type": "Profile", - "id": 333, + "id": 2, "customerId": 2, "profileType": "metrics", "name": "Metrics-Profile-3-radios", "details": { "model_type": "ServiceMetricsCollectionConfigProfile", "radioTypes": [ - "is5GHzL", + "is5GHzU", "is2dot4GHz", - "is5GHzU" + "is5GHzL" ], "serviceMetricDataTypes": [ "ApNode", @@ -30,19 +30,7 @@ "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, "statsReportFormat": "RAW", - "radioType": "is5GHzU", - "serviceMetricDataType": "ApNode" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 120, - "channelSurveyType": "OFF_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is5GHzL", + "radioType": "is2dot4GHz", "serviceMetricDataType": "ApNode" }, { @@ -60,20 +48,20 @@ { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", + "reportingIntervalSeconds": 120, + "channelSurveyType": "OFF_CHANNEL", "scanIntervalMillis": 0, "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, "statsReportFormat": "RAW", - "radioType": "is2dot4GHz", + "radioType": "is5GHzU", "serviceMetricDataType": "ApNode" }, { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, - "reportingIntervalSeconds": 120, - "channelSurveyType": "OFF_CHANNEL", + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", "scanIntervalMillis": 0, "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, @@ -92,6 +80,18 @@ "statsReportFormat": "RAW", "radioType": "is2dot4GHz", "serviceMetricDataType": "ApNode" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 120, + "channelSurveyType": "OFF_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is5GHzL", + "serviceMetricDataType": "ApNode" } ], "ApSsid": [ @@ -99,14 +99,14 @@ "model_type": "ServiceMetricRadioConfigParameters", "samplingInterval": 30, "reportingIntervalSeconds": 60, - "radioType": "is2dot4GHz", + "radioType": "is5GHzL", "serviceMetricDataType": "ApSsid" }, { "model_type": "ServiceMetricRadioConfigParameters", "samplingInterval": 30, "reportingIntervalSeconds": 60, - "radioType": "is5GHzL", + "radioType": "is2dot4GHz", "serviceMetricDataType": "ApSsid" }, { @@ -118,13 +118,6 @@ } ], "Client": [ - { - "model_type": "ServiceMetricRadioConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "radioType": "is2dot4GHz", - "serviceMetricDataType": "Client" - }, { "model_type": "ServiceMetricRadioConfigParameters", "samplingInterval": 30, @@ -138,6 +131,13 @@ "reportingIntervalSeconds": 60, "radioType": "is5GHzU", "serviceMetricDataType": "Client" + }, + { + "model_type": "ServiceMetricRadioConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "radioType": "is2dot4GHz", + "serviceMetricDataType": "Client" } ], "Channel": [ @@ -150,57 +150,21 @@ "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, "statsReportFormat": "RAW", - "radioType": "is5GHzL", - "serviceMetricDataType": "Channel" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 120, - "channelSurveyType": "OFF_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is2dot4GHz", - "serviceMetricDataType": "Channel" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is5GHzL", - "serviceMetricDataType": "Channel" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is2dot4GHz", - "serviceMetricDataType": "Channel" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", "radioType": "is5GHzU", "serviceMetricDataType": "Channel" }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is2dot4GHz", + "serviceMetricDataType": "Channel" + }, { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, @@ -210,6 +174,42 @@ "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, "statsReportFormat": "RAW", + "radioType": "is2dot4GHz", + "serviceMetricDataType": "Channel" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 120, + "channelSurveyType": "OFF_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is5GHzL", + "serviceMetricDataType": "Channel" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is5GHzL", + "serviceMetricDataType": "Channel" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", "radioType": "is5GHzU", "serviceMetricDataType": "Channel" } @@ -224,7 +224,19 @@ "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, "statsReportFormat": "RAW", - "radioType": "is5GHzL", + "radioType": "is5GHzU", + "serviceMetricDataType": "Neighbour" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is2dot4GHz", "serviceMetricDataType": "Neighbour" }, { @@ -248,7 +260,7 @@ "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, "statsReportFormat": "RAW", - "radioType": "is2dot4GHz", + "radioType": "is5GHzL", "serviceMetricDataType": "Neighbour" }, { @@ -263,18 +275,6 @@ "radioType": "is5GHzU", "serviceMetricDataType": "Neighbour" }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is5GHzL", - "serviceMetricDataType": "Neighbour" - }, { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, @@ -284,15 +284,15 @@ "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, "statsReportFormat": "RAW", - "radioType": "is5GHzU", + "radioType": "is5GHzL", "serviceMetricDataType": "Neighbour" } ] }, "profileType": "metrics" }, - "createdTimestamp": 1601335086248, - "lastModifiedTimestamp": 1601335086248, + "createdTimestamp": 1601961451756, + "lastModifiedTimestamp": 1601961451756, "childProfileIds": [] } ] \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileOperator.json b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileOperator.json index 36f7fb2..1c78d88 100644 --- a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileOperator.json +++ b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileOperator.json @@ -1,35 +1,37 @@ [ -{ - "model_type": "Profile", - "id": 5555, - "customerId": 2, - "profileType": "operator", - "name": "TipWlan-Hotspot20-Operator", - "details": { - "model_type": "OperatorProfile", - "domainName": "telecominfraproject.atlassian.net", - "serverOnlyAuthenticatedL2EncryptionNetwork": false, - "x509CertificateLocation": "/etc/ca.pem", - "operatorFriendlyName": [ - { - "model_type": "Hotspot20Duple", - "locale": "en_CA", - "language": "eng", - "friendlyName": "default Friendly Operator Name", - "formattedFriendlyName": "eng:default Friendly Operator Name" - }, - { - "model_type": "Hotspot20Duple", - "locale": "fr_CA", - "language": "fra", - "friendlyName": "Nom de l'opérateur convivial par défaut", - "formattedFriendlyName": "fra:Nom de l'opérateur convivial par défaut" - } - ], - "profileType": "operator" - }, - "createdTimestamp": 1601595306885, - "lastModifiedTimestamp": 1601595306885, - "childProfileIds": [] -} + { + "model_type": "Profile", + "id": 5, + "customerId": 2, + "profileType": "operator", + "name": "TipWlan-Hotspot20-Operator", + "details": { + "model_type": "OperatorProfile", + "domainName": "telecominfraproject.atlassian.net", + "serverOnlyAuthenticatedL2EncryptionNetwork": false, + "x509CertificateLocation": "/etc/ca.pem", + "operatorFriendlyName": [ + { + "model_type": "Hotspot20Duple", + "locale": "en_CA", + "dupleIso3Language": "eng", + "dupleName": "Default friendly operator name", + "defaultDupleSeparator": ":", + "asDuple": "eng:Default friendly operator name" + }, + { + "model_type": "Hotspot20Duple", + "locale": "fr_CA", + "dupleIso3Language": "fra", + "dupleName": "Nom de l'opérateur convivial par défaut", + "defaultDupleSeparator": ":", + "asDuple": "fra:Nom de l'opérateur convivial par défaut" + } + ], + "profileType": "operator" + }, + "createdTimestamp": 1601961451776, + "lastModifiedTimestamp": 1601961451776, + "childProfileIds": [] + } ] \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileRadius.json b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileRadius.json index da5f8cb..d7390a1 100644 --- a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileRadius.json +++ b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileRadius.json @@ -1,34 +1,34 @@ [ -{ - "model_type": "Profile", - "id": 1, - "customerId": 2, - "profileType": "radius", - "name": "RadiusProfileOttawa", - "details": { - "model_type": "RadiusProfile", - "subnetConfiguration": null, - "serviceRegionMap": { - "Ottawa": { - "model_type": "RadiusServiceRegion", - "serverMap": { - "RadiusProfileOttawa": [ - { - "model_type": "RadiusServer", - "ipAddress": "localhost", - "secret": "testing123", - "authPort": 1812, - "timeout": null - } - ] - }, - "regionName": "Ottawa" - } - }, - "profileType": "radius" - }, - "createdTimestamp": 1591653174195, - "lastModifiedTimestamp": 1591653174195, - "childProfileIds": [] -} + { + "model_type": "Profile", + "id": 1, + "customerId": 2, + "profileType": "radius", + "name": "Radius-Profile", + "details": { + "model_type": "RadiusProfile", + "subnetConfiguration": null, + "serviceRegionMap": { + "Ottawa": { + "model_type": "RadiusServiceRegion", + "serverMap": { + "Radius-Profile": [ + { + "model_type": "RadiusServer", + "ipAddress": "192.168.0.1", + "secret": "testing123", + "authPort": 1812, + "timeout": null + } + ] + }, + "regionName": "Ottawa" + } + }, + "profileType": "radius" + }, + "createdTimestamp": 1601961451668, + "lastModifiedTimestamp": 1601961451668, + "childProfileIds": [] + } ] \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileRf.json b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileRf.json index 1e3d235..f8a2b9b 100644 --- a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileRf.json +++ b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileRf.json @@ -1,258 +1,256 @@ { - "model_type": "Profile", - "id": 9, - "customerId": 2, - "profileType": "rf", - "name": "DefaultRf", - "details": { - "model_type": "RfConfiguration", - "rf": "Default-RF", - "profileType": "rf", - "rfConfigMap": { - "is2dot4GHz": { - "model_type": "RfElementConfiguration", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is20MHz", - "mimoMode": "twoBytwo", - "maxNumClients": 100, - "multicastRate": "auto", - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "managementRate": "auto", - "rxCellSizeDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "eirpTxPower": { - "model_type": "AutoOrManualValue", - "auto": false, - "value": 32 - }, - "bestApEnabled": null, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "minAutoCellSize": -80, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 20, - "minLoadFactor": 50 - } - }, - "is5GHz": { - "model_type": "RfElementConfiguration", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is80MHz", - "mimoMode": "twoBytwo", - "maxNumClients": 100, - "multicastRate": "auto", - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "managementRate": "auto", - "rxCellSizeDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "eirpTxPower": { - "model_type": "AutoOrManualValue", - "auto": false, - "value": 32 - }, - "bestApEnabled": null, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "minAutoCellSize": -80, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } - }, - "is5GHzL": { - "model_type": "RfElementConfiguration", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is80MHz", - "mimoMode": "twoBytwo", - "maxNumClients": 100, - "multicastRate": "auto", - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "managementRate": "auto", - "rxCellSizeDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "eirpTxPower": { - "model_type": "AutoOrManualValue", - "auto": false, - "value": 32 - }, - "bestApEnabled": null, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "minAutoCellSize": -80, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } - }, - "is5GHzU": { - "model_type": "RfElementConfiguration", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is80MHz", - "mimoMode": "twoBytwo", - "maxNumClients": 100, - "multicastRate": "auto", - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "managementRate": "auto", - "rxCellSizeDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "eirpTxPower": { - "model_type": "AutoOrManualValue", - "auto": false, - "value": 32 - }, - "bestApEnabled": null, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "minAutoCellSize": -80, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } - } - }, - "createdTimestamp": 1591653239983, - "lastModifiedTimestamp": 1591653239983, - "childProfileIds": [ - ] - } -} + "model_type": "Profile", + "id": 11, + "customerId": 2, + "profileType": "rf", + "name": "TipWlan-rf", + "details": { + "model_type": "RfConfiguration", + "rfConfigMap": { + "is5GHz": { + "model_type": "RfElementConfiguration", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is80MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "multicastRate": "auto", + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "managementRate": "auto", + "rxCellSizeDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "eirpTxPower": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": 18 + }, + "bestApEnabled": null, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 30, + "minLoadFactor": 40 + } + }, + "is2dot4GHz": { + "model_type": "RfElementConfiguration", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is20MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "multicastRate": "auto", + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "managementRate": "auto", + "rxCellSizeDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "eirpTxPower": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": 18 + }, + "bestApEnabled": null, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 20, + "minLoadFactor": 50 + } + }, + "is5GHzU": { + "model_type": "RfElementConfiguration", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is80MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "multicastRate": "auto", + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "managementRate": "auto", + "rxCellSizeDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "eirpTxPower": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": 18 + }, + "bestApEnabled": null, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 30, + "minLoadFactor": 40 + } + }, + "is5GHzL": { + "model_type": "RfElementConfiguration", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is80MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "multicastRate": "auto", + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "managementRate": "auto", + "rxCellSizeDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "eirpTxPower": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": 18 + }, + "bestApEnabled": null, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 30, + "minLoadFactor": 40 + } + } + }, + "profileType": "rf" + }, + "createdTimestamp": 1601961452390, + "lastModifiedTimestamp": 1601961452390, + "childProfileIds": [] +} \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileSsid.json b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileSsid.json index 29aacd7..12ac606 100644 --- a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileSsid.json +++ b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileSsid.json @@ -1,186 +1,69 @@ [ { - "model_type": "Profile", - "id": 6, - "customerId": 2, - "profileType": "ssid", - "name": "DefaultSsid-2g", - "details": { - "model_type": "SsidConfiguration", - "ssid": "Default-SSID-2g", - "appliedRadios": [ - "is2dot4GHz" - ], - "ssidAdminState": "enabled", - "secureMode": "wpa2PSK", - "vlanId": 1, - "keyStr": "12345678", - "broadcastSsid": "enabled", - "keyRefresh": 0, - "noLocalSubnets": false, - "radiusServiceName": null, - "captivePortalId": null, - "bandwidthLimitDown": 0, - "bandwidthLimitUp": 0, - "clientBandwidthLimitDown": 0, - "clientBandwidthLimitUp": 0, - "videoTrafficOnly": false, - "radioBasedConfigs": { - "is5GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is2dot4GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzU": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzL": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - } - }, - "bonjourGatewayProfileId": null, - "enable80211w": null, - "wepConfig": null, - "forwardMode": null, - "profileType": "ssid" - }, - "createdTimestamp": 1591653239983, - "lastModifiedTimestamp": 1591653239983, - "childProfileIds": [] -}, -{ - "model_type": "Profile", - "id": 7, - "customerId": 2, - "profileType": "ssid", - "name": "DefaultSsid-5gl", - "details": { - "model_type": "SsidConfiguration", - "ssid": "Default-SSID-5gl", - "appliedRadios": [ - "is5GHzL" - ], - "ssidAdminState": "enabled", - "secureMode": "wpaEAP", - "vlanId": 1, - "keyStr": "12345678", - "broadcastSsid": "enabled", - "keyRefresh": 0, - "noLocalSubnets": false, - "radiusServiceName": "RadiusProfileOttawa", - "captivePortalId": null, - "bandwidthLimitDown": 0, - "bandwidthLimitUp": 0, - "videoTrafficOnly": false, - "radioBasedConfigs": { - "is5GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is2dot4GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzU": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzL": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - } - }, - "bonjourGatewayProfileId": null, - "enable80211w": null, - "wepConfig": null, - "forwardMode": null, - "profileType": "ssid" - }, - "createdTimestamp": 1591653240017, - "lastModifiedTimestamp": 1591654215374, - "childProfileIds": [ - 1 - ] -}, -{ - "model_type": "Profile", - "id": 8, - "customerId": 2, - "profileType": "ssid", - "name": "DefaultSsid-5gu", - "details": { - "model_type": "SsidConfiguration", - "ssid": "Default-SSID-5gu", - "appliedRadios": [ - "is5GHzU" - ], - "ssidAdminState": "enabled", - "secureMode": "wpa2PSK", - "vlanId": 1, - "keyStr": "12345678", - "broadcastSsid": "enabled", - "keyRefresh": 0, - "noLocalSubnets": false, - "radiusServiceName": null, - "captivePortalId": null, - "bandwidthLimitDown": 0, - "bandwidthLimitUp": 0, - "videoTrafficOnly": false, - "radioBasedConfigs": { - "is5GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is2dot4GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzU": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzL": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - } - }, - "bonjourGatewayProfileId": null, - "enable80211w": null, - "wepConfig": null, - "forwardMode": null, - "profileType": "ssid" - }, - "createdTimestamp": 1591654301763, - "lastModifiedTimestamp": 1591654301763, - "childProfileIds": [] -} + "model_type": "Profile", + "id": 9, + "customerId": 2, + "profileType": "ssid", + "name": "TipWlan-cloud-3-radios", + "details": { + "model_type": "SsidConfiguration", + "ssid": "TipWlan-cloud-3-radios", + "appliedRadios": [ + "is5GHzU", + "is2dot4GHz", + "is5GHzL" + ], + "ssidAdminState": "enabled", + "secureMode": "open", + "vlanId": 1, + "keyStr": null, + "broadcastSsid": "enabled", + "keyRefresh": 0, + "noLocalSubnets": false, + "radiusServiceName": null, + "captivePortalId": null, + "bandwidthLimitDown": 0, + "bandwidthLimitUp": 0, + "clientBandwidthLimitDown": 0, + "clientBandwidthLimitUp": 0, + "videoTrafficOnly": false, + "radioBasedConfigs": { + "is5GHz": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + }, + "is2dot4GHz": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + }, + "is5GHzU": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + }, + "is5GHzL": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + } + }, + "bonjourGatewayProfileId": null, + "enable80211w": null, + "wepConfig": null, + "forwardMode": null, + "profileType": "ssid" + }, + "createdTimestamp": 1601961452385, + "lastModifiedTimestamp": 1601961452385, + "childProfileIds": [ + 7, + 8 + ] + } ] diff --git a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileVenue.json b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileVenue.json index c79f0d8..afa8f75 100644 --- a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileVenue.json +++ b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileVenue.json @@ -1,40 +1,42 @@ [ -{ - "model_type": "Profile", - "id": 6666, - "customerId": 2, - "profileType": "venue", - "name": "TipWlan-Hotspot20-Venue", - "details": { - "model_type": "VenueProfile", - "venueNameSet": [ - { - "model_type": "VenueName", - "locale": "en_CA", - "language": "eng", - "venueName": "Example venue", - "venueUrl": "http://www.example.com/info-eng", - "formattedVenueName": "eng:Example venue" + { + "model_type": "Profile", + "id": 6, + "customerId": 2, + "profileType": "venue", + "name": "TipWlan-Hotspot20-Venue", + "details": { + "model_type": "VenueProfile", + "venueNameSet": [ + { + "model_type": "VenueName", + "locale": "fr_CA", + "dupleIso3Language": "fra", + "dupleName": "Exemple de lieu", + "defaultDupleSeparator": ":", + "venueUrl": "http://www.example.com/info-fra", + "asDuple": "fra:Exemple de lieu" + }, + { + "model_type": "VenueName", + "locale": "en_CA", + "dupleIso3Language": "eng", + "dupleName": "Example venue", + "defaultDupleSeparator": ":", + "venueUrl": "http://www.example.com/info-eng", + "asDuple": "eng:Example venue" + } + ], + "venueTypeAssignment": { + "model_type": "VenueTypeAssignment", + "venueDescription": "Research and Development Facility", + "venueGroupId": 2, + "venueTypeId": 8 }, - { - "model_type": "VenueName", - "locale": "fr_CA", - "language": "fra", - "venueName": "Exemple de lieu", - "venueUrl": "http://www.example.com/info-fra", - "formattedVenueName": "fra:Exemple de lieu" - } - ], - "venueTypeAssignment": { - "model_type": "VenueTypeAssignment", - "venueDescription": "Research and Development Facility", - "venueGroupId": 2, - "venueTypeId": 8 + "profileType": "venue" }, - "profileType": "venue" - }, - "createdTimestamp": 1601595306891, - "lastModifiedTimestamp": 1601595306891, - "childProfileIds": [] -} + "createdTimestamp": 1601961451781, + "lastModifiedTimestamp": 1601961451781, + "childProfileIds": [] + } ] \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker/app/run.sh b/opensync-gateway-static-docker/src/main/docker/app/run.sh index fdd2551..f772fb7 100755 --- a/opensync-gateway-static-docker/src/main/docker/app/run.sh +++ b/opensync-gateway-static-docker/src/main/docker/app/run.sh @@ -25,6 +25,7 @@ OVSDB_PROPS+=" -Dtip.wlan.ovsdb.metricsProfileFileName=$OVSDB_METRICSPROFILE_CON OVSDB_PROPS+=" -Dtip.wlan.ovsdb.hotspot20ProfileFileName=$OVSDB_HOTSPOT20PROFILE_CONFIG_FILE" OVSDB_PROPS+=" -Dtip.wlan.ovsdb.operatorProfileFileName=$OVSDB_OPERATORPROFILE_CONFIG_FILE" OVSDB_PROPS+=" -Dtip.wlan.ovsdb.venueProfileFileName=$OVSDB_VENUEPROFILE_CONFIG_FILE" +OVSDB_PROPS+=" -Dtip.wlan.ovsdb.idProviderProfileFileName=$OVSDB_IDPROVIDERPROFILE_CONFIG_FILE" OVSDB_PROPS+=" -Dtip.wlan.ovsdb.rfProfileFileName=$OVSDB_RFPROFILE_CONFIG_FILE" OVSDB_PROPS+=" -Dtip.wlan.ovsdb.ssidProfileFileName=$OVSDB_SSIDPROFILE_CONFIG_FILE" OVSDB_PROPS+=" -Dtip.wlan.preventClientCnAlteration=$OVSDB_PREVENT_CLIENTCN_ALTERATION" diff --git a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileAPExample.json b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileAPExample.json index 8420e24..cd61fe3 100644 --- a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileAPExample.json +++ b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileAPExample.json @@ -1,54 +1,49 @@ -{ - "model_type": "Profile", - "id": 5, - "customerId": 2, - "profileType": "equipment_ap", - "name": "DefaultApProfile", - "details": { - "model_type": "ApNetworkConfiguration", - "networkConfigVersion": "AP-1", - "equipmentType": "AP", - "vlanNative": true, - "vlan": 0, - "ntpServer": { - "model_type": "AutoOrManualString", - "auto": true, - "value": "pool.ntp.org" - }, - "syslogRelay": null, - "rtlsSettings": null, - "syntheticClientEnabled": true, - "ledControlEnabled": true, - "equipmentDiscovery": false, - "radioMap": { - "is5GHz": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is2dot4GHz": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is5GHzU": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is5GHzL": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - } - }, - "profileType": "equipment_ap" - }, - "createdTimestamp": 1591653239947, - "lastModifiedTimestamp": 1591654336724, - "childProfileIds": [ - 6, - 7, - 8 - ] -} \ No newline at end of file + { + "model_type": "Profile", + "id": 15, + "customerId": 2, + "profileType": "equipment_ap", + "name": "ApProfile-3-radios", + "details": { + "model_type": "ApNetworkConfiguration", + "networkConfigVersion": "AP-1", + "equipmentType": "AP", + "vlanNative": true, + "vlan": 0, + "ntpServer": { + "model_type": "AutoOrManualString", + "auto": true, + "value": "pool.ntp.org" + }, + "syslogRelay": null, + "rtlsSettings": null, + "syntheticClientEnabled": true, + "ledControlEnabled": true, + "equipmentDiscovery": false, + "radioMap": { + "is2dot4GHz": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + }, + "is5GHzU": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + }, + "is5GHzL": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + } + }, + "profileType": "equipment_ap" + }, + "createdTimestamp": 1601961452652, + "lastModifiedTimestamp": 1601961452652, + "childProfileIds": [ + 2, + 9, + 11 + ] + } \ No newline at end of file diff --git a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileHotspot20.json b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileHotspot20.json index f8953c3..c01b5a7 100644 --- a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileHotspot20.json +++ b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileHotspot20.json @@ -1,55 +1,74 @@ [ -{ - "model_type": "Profile", - "id": 7777, - "customerId": 2, - "profileType": "hotspot_2pt0", - "name": "TipWlan-Hotspot20-Config", - "details": { - "model_type": "Hotspot2Profile", - "enableInterworkingAndHs20": true, - "hessid": null, - "accessNetworkType": "free_public_network", - "networkAuthenticationType": "acceptance_of_terms_and_conditions", - "additionalStepsRequiredForAccess": 0, - "deauthRequestTimeout": 0, - "operatingClass": 0, - "termsAndConditionsFile": { - "model_type": "ManagedFileInfo", - "md5checksum": null, - "lastModifiedTimestamp": null, - "apExportUrl": "https://localhost:9091/filestore/termsAndConditions", - "fileCategory": "ExternalPolicyConfiguration", - "fileType": "TEXT", - "altSlot": false + { + "model_type": "Profile", + "id": 8, + "customerId": 2, + "profileType": "hotspot_2pt0", + "name": "TipWlan-Hotspot20-Config", + "details": { + "model_type": "Hotspot2Profile", + "enableInterworkingAndHs20": true, + "hessid": null, + "accessNetworkType": "free_public_network", + "networkAuthenticationType": "acceptance_of_terms_and_conditions", + "additionalStepsRequiredForAccess": 0, + "deauthRequestTimeout": 0, + "operatingClass": 0, + "termsAndConditionsFile": { + "model_type": "ManagedFileInfo", + "md5checksum": null, + "lastModifiedTimestamp": null, + "apExportUrl": "https://localhost:9091/filestore/termsAndConditions", + "fileCategory": "ExternalPolicyConfiguration", + "fileType": "TEXT", + "altSlot": false + }, + "whitelistDomain": null, + "emergencyServicesReachable": true, + "unauthenticatedEmergencyServiceAccessible": false, + "internetConnectivity": true, + "connectionCapabilitySet": [ + { + "model_type": "ConnectionCapability", + "connectionCapabilitiesPortNumber": 8888, + "connectionCapabilitiesIpProtocol": "TCP", + "connectionCapabilitiesStatus": "open" + } + ], + "ipAddressTypeAvailability": "public_IPv4_address_available", + "qosMapSetConfiguration": null, + "apGeospatialLocation": null, + "apCivicLocation": null, + "apPublicLocationIdUri": null, + "gasAddr3Behaviour": "p2pSpecWorkaroundFromRequest", + "anqpDomainId": 1234, + "disableDownstreamGroupAddressedForwarding": false, + "enable2pt4GHz": true, + "enable5GHz": true, + "associatedSsids": [ + "TipWlan-cloud-3-radios" + ], + "mccMnc3gppCellularNetworkInfo": [ + { + "model_type": "MccMnc", + "mcc": 302, + "mnc": 720, + "iso": "ca", + "country": "Canada", + "countryCode": 1, + "network": "Rogers AT&T Wireless", + "mccMncPairing": "302,720" + } + ], + "profileType": "hotspot_2pt0", + "mccMncList": "302,720" }, - "whitelistDomain": null, - "emergencyServicesReachable": true, - "unauthenticatedEmergencyServiceAccessible": false, - "internetConnectivity": true, - "connectionCapabilitySet": [ - { - "model_type": "ConnectionCapability", - "connectionCapabilitiesPortNumber": 8888, - "connectionCapabilitiesIpProtocol": "TCP", - "connectionCapabilitiesStatus": "open" - } - ], - "ipAddressTypeAvailability": "public_IPv4_address_available", - "qosMapSetConfiguration": null, - "apGeospatialLocation": null, - "apCivicLocation": null, - "apPublicLocationIdUri": null, - "gasAddr3Behaviour": "p2pSpecWorkaroundFromRequest", - "anqpDomainId": 1234, - "disableDownstreamGroupAddressedForwarding": false, - "profileType": "hotspot_2pt0" - }, - "createdTimestamp": 1601595307355, - "lastModifiedTimestamp": 1601595307355, - "childProfileIds": [ - 5555, - 6666 - ] -} + "createdTimestamp": 1601961452370, + "lastModifiedTimestamp": 1601961452370, + "childProfileIds": [ + 5, + 6, + 7 + ] + } ] \ No newline at end of file diff --git a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileIdProvider.json b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileIdProvider.json new file mode 100644 index 0000000..41daff9 --- /dev/null +++ b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileIdProvider.json @@ -0,0 +1,98 @@ +[ + { + "model_type": "Profile", + "id": 7, + "customerId": 2, + "profileType": "id_provider", + "name": "TipWlan-Hotspot20-OSU-Provider", + "details": { + "model_type": "Hotspot20IdProviderProfile", + "domainName": "example.com", + "mccMncList": [ + { + "model_type": "MccMnc", + "mcc": 302, + "mnc": 720, + "iso": "ca", + "country": "Canada", + "countryCode": 1, + "network": "Rogers AT&T Wireless", + "mccMncPairing": "302,720" + } + ], + "naiRealmList": [ + { + "model_type": "NaiRealmInformation", + "naiRealms": [ + "example.net", + "example.com" + ], + "encoding": 0, + "eapMethods": [ + "EAP-TLS with certificate" + ], + "eapMap": { + "EAP-TLS with certificate": [ + "Softoken", + "Certificate" + ] + } + } + ], + "osuIconList": [ + { + "model_type": "OsuIcon", + "iconWidth": 32, + "iconHeight": 32, + "languageCode": "eng", + "iconLocale": "en_CA", + "iconName": "icon32.png", + "filePath": "/tmp/icon32.png", + "hs20IconString": "32:32:eng:image/png:icon32.png:/tmp/icon32.png" + } + ], + "radiusProfileAuth": "Radius-Profile", + "radiusProfileAccounting": "Radius-Profile", + "osuSsid": "TipWlan-cloud-3-radios", + "osuServerUri": "https://example.com/osu/", + "osuFriendlyName": { + "model_type": "Hotspot20Duple", + "locale": "en_CA", + "dupleIso3Language": "eng", + "dupleName": "Example provider", + "defaultDupleSeparator": ":", + "asDuple": "eng:Example provider" + }, + "osuNaiStandalone": "anonymous@example.com", + "osuNaiShared": "anonymous@example.com", + "osuMethodList": [ + 1, + 0 + ], + "osuServiceDescription": [ + { + "model_type": "Hotspot20Duple", + "locale": "en_CA", + "dupleIso3Language": "eng", + "dupleName": "Example services", + "defaultDupleSeparator": ":", + "asDuple": "eng:Example services" + }, + { + "model_type": "Hotspot20Duple", + "locale": "fr_CA", + "dupleIso3Language": "fra", + "dupleName": "Exemples de services", + "defaultDupleSeparator": ":", + "asDuple": "fra:Exemples de services" + } + ], + "profileType": "id_provider" + }, + "createdTimestamp": 1601961451981, + "lastModifiedTimestamp": 1601961451981, + "childProfileIds": [ + 1 + ] + } + ] \ No newline at end of file diff --git a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileMetrics.json b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileMetrics.json index b3fb86b..4ac6711 100644 --- a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileMetrics.json +++ b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileMetrics.json @@ -1,16 +1,16 @@ [ { "model_type": "Profile", - "id": 333, + "id": 2, "customerId": 2, "profileType": "metrics", "name": "Metrics-Profile-3-radios", "details": { "model_type": "ServiceMetricsCollectionConfigProfile", "radioTypes": [ - "is5GHzL", + "is5GHzU", "is2dot4GHz", - "is5GHzU" + "is5GHzL" ], "serviceMetricDataTypes": [ "ApNode", @@ -30,19 +30,7 @@ "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, "statsReportFormat": "RAW", - "radioType": "is5GHzU", - "serviceMetricDataType": "ApNode" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 120, - "channelSurveyType": "OFF_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is5GHzL", + "radioType": "is2dot4GHz", "serviceMetricDataType": "ApNode" }, { @@ -60,20 +48,20 @@ { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", + "reportingIntervalSeconds": 120, + "channelSurveyType": "OFF_CHANNEL", "scanIntervalMillis": 0, "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, "statsReportFormat": "RAW", - "radioType": "is2dot4GHz", + "radioType": "is5GHzU", "serviceMetricDataType": "ApNode" }, { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, - "reportingIntervalSeconds": 120, - "channelSurveyType": "OFF_CHANNEL", + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", "scanIntervalMillis": 0, "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, @@ -92,6 +80,18 @@ "statsReportFormat": "RAW", "radioType": "is2dot4GHz", "serviceMetricDataType": "ApNode" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 120, + "channelSurveyType": "OFF_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is5GHzL", + "serviceMetricDataType": "ApNode" } ], "ApSsid": [ @@ -99,14 +99,14 @@ "model_type": "ServiceMetricRadioConfigParameters", "samplingInterval": 30, "reportingIntervalSeconds": 60, - "radioType": "is2dot4GHz", + "radioType": "is5GHzL", "serviceMetricDataType": "ApSsid" }, { "model_type": "ServiceMetricRadioConfigParameters", "samplingInterval": 30, "reportingIntervalSeconds": 60, - "radioType": "is5GHzL", + "radioType": "is2dot4GHz", "serviceMetricDataType": "ApSsid" }, { @@ -118,13 +118,6 @@ } ], "Client": [ - { - "model_type": "ServiceMetricRadioConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "radioType": "is2dot4GHz", - "serviceMetricDataType": "Client" - }, { "model_type": "ServiceMetricRadioConfigParameters", "samplingInterval": 30, @@ -138,6 +131,13 @@ "reportingIntervalSeconds": 60, "radioType": "is5GHzU", "serviceMetricDataType": "Client" + }, + { + "model_type": "ServiceMetricRadioConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "radioType": "is2dot4GHz", + "serviceMetricDataType": "Client" } ], "Channel": [ @@ -150,57 +150,21 @@ "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, "statsReportFormat": "RAW", - "radioType": "is5GHzL", - "serviceMetricDataType": "Channel" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 120, - "channelSurveyType": "OFF_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is2dot4GHz", - "serviceMetricDataType": "Channel" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is5GHzL", - "serviceMetricDataType": "Channel" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is2dot4GHz", - "serviceMetricDataType": "Channel" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", "radioType": "is5GHzU", "serviceMetricDataType": "Channel" }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is2dot4GHz", + "serviceMetricDataType": "Channel" + }, { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, @@ -210,6 +174,42 @@ "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, "statsReportFormat": "RAW", + "radioType": "is2dot4GHz", + "serviceMetricDataType": "Channel" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 120, + "channelSurveyType": "OFF_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is5GHzL", + "serviceMetricDataType": "Channel" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is5GHzL", + "serviceMetricDataType": "Channel" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", "radioType": "is5GHzU", "serviceMetricDataType": "Channel" } @@ -224,7 +224,19 @@ "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, "statsReportFormat": "RAW", - "radioType": "is5GHzL", + "radioType": "is5GHzU", + "serviceMetricDataType": "Neighbour" + }, + { + "model_type": "ServiceMetricSurveyConfigParameters", + "samplingInterval": 30, + "reportingIntervalSeconds": 60, + "channelSurveyType": "ON_CHANNEL", + "scanIntervalMillis": 0, + "percentUtilizationThreshold": 10, + "delayMillisecondsThreshold": 600, + "statsReportFormat": "RAW", + "radioType": "is2dot4GHz", "serviceMetricDataType": "Neighbour" }, { @@ -248,7 +260,7 @@ "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, "statsReportFormat": "RAW", - "radioType": "is2dot4GHz", + "radioType": "is5GHzL", "serviceMetricDataType": "Neighbour" }, { @@ -263,18 +275,6 @@ "radioType": "is5GHzU", "serviceMetricDataType": "Neighbour" }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "statsReportFormat": "RAW", - "radioType": "is5GHzL", - "serviceMetricDataType": "Neighbour" - }, { "model_type": "ServiceMetricSurveyConfigParameters", "samplingInterval": 30, @@ -284,15 +284,15 @@ "percentUtilizationThreshold": 10, "delayMillisecondsThreshold": 600, "statsReportFormat": "RAW", - "radioType": "is5GHzU", + "radioType": "is5GHzL", "serviceMetricDataType": "Neighbour" } ] }, "profileType": "metrics" }, - "createdTimestamp": 1601335086248, - "lastModifiedTimestamp": 1601335086248, + "createdTimestamp": 1601961451756, + "lastModifiedTimestamp": 1601961451756, "childProfileIds": [] } ] \ No newline at end of file diff --git a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileOperator.json b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileOperator.json index 36f7fb2..1c78d88 100644 --- a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileOperator.json +++ b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileOperator.json @@ -1,35 +1,37 @@ [ -{ - "model_type": "Profile", - "id": 5555, - "customerId": 2, - "profileType": "operator", - "name": "TipWlan-Hotspot20-Operator", - "details": { - "model_type": "OperatorProfile", - "domainName": "telecominfraproject.atlassian.net", - "serverOnlyAuthenticatedL2EncryptionNetwork": false, - "x509CertificateLocation": "/etc/ca.pem", - "operatorFriendlyName": [ - { - "model_type": "Hotspot20Duple", - "locale": "en_CA", - "language": "eng", - "friendlyName": "default Friendly Operator Name", - "formattedFriendlyName": "eng:default Friendly Operator Name" - }, - { - "model_type": "Hotspot20Duple", - "locale": "fr_CA", - "language": "fra", - "friendlyName": "Nom de l'opérateur convivial par défaut", - "formattedFriendlyName": "fra:Nom de l'opérateur convivial par défaut" - } - ], - "profileType": "operator" - }, - "createdTimestamp": 1601595306885, - "lastModifiedTimestamp": 1601595306885, - "childProfileIds": [] -} + { + "model_type": "Profile", + "id": 5, + "customerId": 2, + "profileType": "operator", + "name": "TipWlan-Hotspot20-Operator", + "details": { + "model_type": "OperatorProfile", + "domainName": "telecominfraproject.atlassian.net", + "serverOnlyAuthenticatedL2EncryptionNetwork": false, + "x509CertificateLocation": "/etc/ca.pem", + "operatorFriendlyName": [ + { + "model_type": "Hotspot20Duple", + "locale": "en_CA", + "dupleIso3Language": "eng", + "dupleName": "Default friendly operator name", + "defaultDupleSeparator": ":", + "asDuple": "eng:Default friendly operator name" + }, + { + "model_type": "Hotspot20Duple", + "locale": "fr_CA", + "dupleIso3Language": "fra", + "dupleName": "Nom de l'opérateur convivial par défaut", + "defaultDupleSeparator": ":", + "asDuple": "fra:Nom de l'opérateur convivial par défaut" + } + ], + "profileType": "operator" + }, + "createdTimestamp": 1601961451776, + "lastModifiedTimestamp": 1601961451776, + "childProfileIds": [] + } ] \ No newline at end of file diff --git a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileRadius.json b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileRadius.json index da5f8cb..d7390a1 100644 --- a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileRadius.json +++ b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileRadius.json @@ -1,34 +1,34 @@ [ -{ - "model_type": "Profile", - "id": 1, - "customerId": 2, - "profileType": "radius", - "name": "RadiusProfileOttawa", - "details": { - "model_type": "RadiusProfile", - "subnetConfiguration": null, - "serviceRegionMap": { - "Ottawa": { - "model_type": "RadiusServiceRegion", - "serverMap": { - "RadiusProfileOttawa": [ - { - "model_type": "RadiusServer", - "ipAddress": "localhost", - "secret": "testing123", - "authPort": 1812, - "timeout": null - } - ] - }, - "regionName": "Ottawa" - } - }, - "profileType": "radius" - }, - "createdTimestamp": 1591653174195, - "lastModifiedTimestamp": 1591653174195, - "childProfileIds": [] -} + { + "model_type": "Profile", + "id": 1, + "customerId": 2, + "profileType": "radius", + "name": "Radius-Profile", + "details": { + "model_type": "RadiusProfile", + "subnetConfiguration": null, + "serviceRegionMap": { + "Ottawa": { + "model_type": "RadiusServiceRegion", + "serverMap": { + "Radius-Profile": [ + { + "model_type": "RadiusServer", + "ipAddress": "192.168.0.1", + "secret": "testing123", + "authPort": 1812, + "timeout": null + } + ] + }, + "regionName": "Ottawa" + } + }, + "profileType": "radius" + }, + "createdTimestamp": 1601961451668, + "lastModifiedTimestamp": 1601961451668, + "childProfileIds": [] + } ] \ No newline at end of file diff --git a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileRf.json b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileRf.json index 437c898..f8a2b9b 100644 --- a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileRf.json +++ b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileRf.json @@ -1,258 +1,256 @@ { - "model_type": "Profile", - "id": 9, - "customerId": 2, - "profileType": "rf", - "name": "DefaultRf", - "details": { - "model_type": "RfConfiguration", - "rf": "Default-RF", - "profileType": "rf", - "rfConfigMap": { - "is2dot4GHz": { - "model_type": "RfElementConfiguration", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is20MHz", - "mimoMode": "twoBytwo", - "maxNumClients": 100, - "multicastRate": "auto", - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "managementRate": "auto", - "rxCellSizeDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "eirpTxPower": { - "model_type": "AutoOrManualValue", - "auto": false, - "value": 32 - }, - "bestApEnabled": null, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "minAutoCellSize": -80, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 20, - "minLoadFactor": 50 - } - }, - "is5GHz": { - "model_type": "RfElementConfiguration", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is80MHz", - "mimoMode": "twoBytwo", - "maxNumClients": 100, - "multicastRate": "auto", - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "managementRate": "auto", - "rxCellSizeDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "eirpTxPower": { - "model_type": "AutoOrManualValue", - "auto": false, - "value": 32 - }, - "bestApEnabled": null, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "minAutoCellSize": -80, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 20, - "minLoadFactor": 50 - } - }, - "is5GHzL": { - "model_type": "RfElementConfiguration", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is80MHz", - "mimoMode": "twoBytwo", - "maxNumClients": 100, - "multicastRate": "auto", - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "managementRate": "auto", - "rxCellSizeDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "eirpTxPower": { - "model_type": "AutoOrManualValue", - "auto": false, - "value": 32 - }, - "bestApEnabled": null, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "minAutoCellSize": -80, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } - }, - "is5GHzU": { - "model_type": "RfElementConfiguration", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is80MHz", - "mimoMode": "twoBytwo", - "maxNumClients": 100, - "multicastRate": "auto", - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "managementRate": "auto", - "rxCellSizeDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "eirpTxPower": { - "model_type": "AutoOrManualValue", - "auto": false, - "value": 32 - }, - "bestApEnabled": null, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "minAutoCellSize": -80, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } - } - }, - "createdTimestamp": 1591653239983, - "lastModifiedTimestamp": 1591653239983, - "childProfileIds": [ - ] - } -} + "model_type": "Profile", + "id": 11, + "customerId": 2, + "profileType": "rf", + "name": "TipWlan-rf", + "details": { + "model_type": "RfConfiguration", + "rfConfigMap": { + "is5GHz": { + "model_type": "RfElementConfiguration", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is80MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "multicastRate": "auto", + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "managementRate": "auto", + "rxCellSizeDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "eirpTxPower": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": 18 + }, + "bestApEnabled": null, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 30, + "minLoadFactor": 40 + } + }, + "is2dot4GHz": { + "model_type": "RfElementConfiguration", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is20MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "multicastRate": "auto", + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "managementRate": "auto", + "rxCellSizeDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "eirpTxPower": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": 18 + }, + "bestApEnabled": null, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 20, + "minLoadFactor": 50 + } + }, + "is5GHzU": { + "model_type": "RfElementConfiguration", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is80MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "multicastRate": "auto", + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "managementRate": "auto", + "rxCellSizeDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "eirpTxPower": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": 18 + }, + "bestApEnabled": null, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 30, + "minLoadFactor": 40 + } + }, + "is5GHzL": { + "model_type": "RfElementConfiguration", + "rf": "TipWlan-rf", + "beaconInterval": 100, + "forceScanDuringVoice": "disabled", + "rtsCtsThreshold": 65535, + "channelBandwidth": "is80MHz", + "mimoMode": "twoByTwo", + "maxNumClients": 100, + "multicastRate": "auto", + "autoChannelSelection": false, + "activeScanSettings": { + "model_type": "ActiveScanSettings", + "enabled": true, + "scanFrequencySeconds": 10, + "scanDurationMillis": 65 + }, + "managementRate": "auto", + "rxCellSizeDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 + }, + "eirpTxPower": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": 18 + }, + "bestApEnabled": null, + "neighbouringListApConfig": { + "model_type": "NeighbouringAPListConfiguration", + "minSignal": -85, + "maxAps": 25 + }, + "perimeterDetectionEnabled": true, + "channelHopSettings": { + "model_type": "ChannelHopSettings", + "noiseFloorThresholdInDB": -75, + "noiseFloorThresholdTimeInSeconds": 180, + "nonWifiThresholdInPercentage": 50, + "nonWifiThresholdTimeInSeconds": 180, + "obssHopMode": "NON_WIFI" + }, + "bestApSettings": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 30, + "minLoadFactor": 40 + } + } + }, + "profileType": "rf" + }, + "createdTimestamp": 1601961452390, + "lastModifiedTimestamp": 1601961452390, + "childProfileIds": [] +} \ No newline at end of file diff --git a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileSsid.json b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileSsid.json index 29aacd7..12ac606 100644 --- a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileSsid.json +++ b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileSsid.json @@ -1,186 +1,69 @@ [ { - "model_type": "Profile", - "id": 6, - "customerId": 2, - "profileType": "ssid", - "name": "DefaultSsid-2g", - "details": { - "model_type": "SsidConfiguration", - "ssid": "Default-SSID-2g", - "appliedRadios": [ - "is2dot4GHz" - ], - "ssidAdminState": "enabled", - "secureMode": "wpa2PSK", - "vlanId": 1, - "keyStr": "12345678", - "broadcastSsid": "enabled", - "keyRefresh": 0, - "noLocalSubnets": false, - "radiusServiceName": null, - "captivePortalId": null, - "bandwidthLimitDown": 0, - "bandwidthLimitUp": 0, - "clientBandwidthLimitDown": 0, - "clientBandwidthLimitUp": 0, - "videoTrafficOnly": false, - "radioBasedConfigs": { - "is5GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is2dot4GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzU": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzL": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - } - }, - "bonjourGatewayProfileId": null, - "enable80211w": null, - "wepConfig": null, - "forwardMode": null, - "profileType": "ssid" - }, - "createdTimestamp": 1591653239983, - "lastModifiedTimestamp": 1591653239983, - "childProfileIds": [] -}, -{ - "model_type": "Profile", - "id": 7, - "customerId": 2, - "profileType": "ssid", - "name": "DefaultSsid-5gl", - "details": { - "model_type": "SsidConfiguration", - "ssid": "Default-SSID-5gl", - "appliedRadios": [ - "is5GHzL" - ], - "ssidAdminState": "enabled", - "secureMode": "wpaEAP", - "vlanId": 1, - "keyStr": "12345678", - "broadcastSsid": "enabled", - "keyRefresh": 0, - "noLocalSubnets": false, - "radiusServiceName": "RadiusProfileOttawa", - "captivePortalId": null, - "bandwidthLimitDown": 0, - "bandwidthLimitUp": 0, - "videoTrafficOnly": false, - "radioBasedConfigs": { - "is5GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is2dot4GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzU": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzL": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - } - }, - "bonjourGatewayProfileId": null, - "enable80211w": null, - "wepConfig": null, - "forwardMode": null, - "profileType": "ssid" - }, - "createdTimestamp": 1591653240017, - "lastModifiedTimestamp": 1591654215374, - "childProfileIds": [ - 1 - ] -}, -{ - "model_type": "Profile", - "id": 8, - "customerId": 2, - "profileType": "ssid", - "name": "DefaultSsid-5gu", - "details": { - "model_type": "SsidConfiguration", - "ssid": "Default-SSID-5gu", - "appliedRadios": [ - "is5GHzU" - ], - "ssidAdminState": "enabled", - "secureMode": "wpa2PSK", - "vlanId": 1, - "keyStr": "12345678", - "broadcastSsid": "enabled", - "keyRefresh": 0, - "noLocalSubnets": false, - "radiusServiceName": null, - "captivePortalId": null, - "bandwidthLimitDown": 0, - "bandwidthLimitUp": 0, - "videoTrafficOnly": false, - "radioBasedConfigs": { - "is5GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is2dot4GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzU": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzL": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - } - }, - "bonjourGatewayProfileId": null, - "enable80211w": null, - "wepConfig": null, - "forwardMode": null, - "profileType": "ssid" - }, - "createdTimestamp": 1591654301763, - "lastModifiedTimestamp": 1591654301763, - "childProfileIds": [] -} + "model_type": "Profile", + "id": 9, + "customerId": 2, + "profileType": "ssid", + "name": "TipWlan-cloud-3-radios", + "details": { + "model_type": "SsidConfiguration", + "ssid": "TipWlan-cloud-3-radios", + "appliedRadios": [ + "is5GHzU", + "is2dot4GHz", + "is5GHzL" + ], + "ssidAdminState": "enabled", + "secureMode": "open", + "vlanId": 1, + "keyStr": null, + "broadcastSsid": "enabled", + "keyRefresh": 0, + "noLocalSubnets": false, + "radiusServiceName": null, + "captivePortalId": null, + "bandwidthLimitDown": 0, + "bandwidthLimitUp": 0, + "clientBandwidthLimitDown": 0, + "clientBandwidthLimitUp": 0, + "videoTrafficOnly": false, + "radioBasedConfigs": { + "is5GHz": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + }, + "is2dot4GHz": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + }, + "is5GHzU": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + }, + "is5GHzL": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + } + }, + "bonjourGatewayProfileId": null, + "enable80211w": null, + "wepConfig": null, + "forwardMode": null, + "profileType": "ssid" + }, + "createdTimestamp": 1601961452385, + "lastModifiedTimestamp": 1601961452385, + "childProfileIds": [ + 7, + 8 + ] + } ] diff --git a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileVenue.json b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileVenue.json index c79f0d8..afa8f75 100644 --- a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileVenue.json +++ b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileVenue.json @@ -1,40 +1,42 @@ [ -{ - "model_type": "Profile", - "id": 6666, - "customerId": 2, - "profileType": "venue", - "name": "TipWlan-Hotspot20-Venue", - "details": { - "model_type": "VenueProfile", - "venueNameSet": [ - { - "model_type": "VenueName", - "locale": "en_CA", - "language": "eng", - "venueName": "Example venue", - "venueUrl": "http://www.example.com/info-eng", - "formattedVenueName": "eng:Example venue" + { + "model_type": "Profile", + "id": 6, + "customerId": 2, + "profileType": "venue", + "name": "TipWlan-Hotspot20-Venue", + "details": { + "model_type": "VenueProfile", + "venueNameSet": [ + { + "model_type": "VenueName", + "locale": "fr_CA", + "dupleIso3Language": "fra", + "dupleName": "Exemple de lieu", + "defaultDupleSeparator": ":", + "venueUrl": "http://www.example.com/info-fra", + "asDuple": "fra:Exemple de lieu" + }, + { + "model_type": "VenueName", + "locale": "en_CA", + "dupleIso3Language": "eng", + "dupleName": "Example venue", + "defaultDupleSeparator": ":", + "venueUrl": "http://www.example.com/info-eng", + "asDuple": "eng:Example venue" + } + ], + "venueTypeAssignment": { + "model_type": "VenueTypeAssignment", + "venueDescription": "Research and Development Facility", + "venueGroupId": 2, + "venueTypeId": 8 }, - { - "model_type": "VenueName", - "locale": "fr_CA", - "language": "fra", - "venueName": "Exemple de lieu", - "venueUrl": "http://www.example.com/info-fra", - "formattedVenueName": "fra:Exemple de lieu" - } - ], - "venueTypeAssignment": { - "model_type": "VenueTypeAssignment", - "venueDescription": "Research and Development Facility", - "venueGroupId": 2, - "venueTypeId": 8 + "profileType": "venue" }, - "profileType": "venue" - }, - "createdTimestamp": 1601595306891, - "lastModifiedTimestamp": 1601595306891, - "childProfileIds": [] -} + "createdTimestamp": 1601961451781, + "lastModifiedTimestamp": 1601961451781, + "childProfileIds": [] + } ] \ No newline at end of file diff --git a/opensync-gateway-static-process/src/main/resources/launchers/OpenSyncProcess (local, KDC certs) static.launch b/opensync-gateway-static-process/src/main/resources/launchers/OpenSyncProcess (local, KDC certs) static.launch index bad0fdf..dbccbc1 100644 --- a/opensync-gateway-static-process/src/main/resources/launchers/OpenSyncProcess (local, KDC certs) static.launch +++ b/opensync-gateway-static-process/src/main/resources/launchers/OpenSyncProcess (local, KDC certs) static.launch @@ -14,5 +14,5 @@ - + diff --git a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/TipWlanOvsdbClient.java b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/TipWlanOvsdbClient.java index 7f456d5..ef1822c 100644 --- a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/TipWlanOvsdbClient.java +++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/TipWlanOvsdbClient.java @@ -103,20 +103,7 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface { // successfully connected - register it in our // connectedClients table - String key = null; - // can clientCn be altered - if (preventClientCnAlteration) { - key = clientCn; - } else { - // does clientCn already end with the AP serial number, if so, use - // this - if (clientCn.endsWith("_" + connectNodeInfo.serialNumber)) { - key = clientCn; - } else { - // append the serial number - key = clientCn + "_" + connectNodeInfo.serialNumber; - } - } + String key = alterClientCnIfRequired(clientCn, connectNodeInfo); ovsdbSessionMapInterface.newSession(key, ovsdbClient); extIntegrationInterface.apConnected(key, connectNodeInfo); @@ -143,6 +130,7 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface { } + @Override public void disconnected(OvsdbClient ovsdbClient) { String remoteHost = ovsdbClient.getConnectionInfo().getRemoteAddress().getHostAddress(); @@ -199,20 +187,7 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface { // successfully connected - register it in our // connectedClients table - String apId = null; - // can clientCn be altered - if (preventClientCnAlteration) { - apId = clientCn; - } else { - // does clientCn already end with the AP serial number, if so, use - // this - if (clientCn.endsWith("_" + connectNodeInfo.serialNumber)) { - apId = clientCn; - } else { - // append the serial number - apId = clientCn + "_" + connectNodeInfo.serialNumber; - } - } + String apId = alterClientCnIfRequired(clientCn, connectNodeInfo); LOG.debug("Client connect for AP {}", apId); @@ -859,4 +834,21 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface { } + public String alterClientCnIfRequired(String clientCn, ConnectNodeInfo connectNodeInfo) { + String key; + // can clientCn be altered + if (preventClientCnAlteration) { + key = clientCn; + } else { + // does clientCn already end with the AP serial number, if so, use + // this + if (clientCn.endsWith("_" + connectNodeInfo.serialNumber)) { + key = clientCn; + } else { + // append the serial number + key = clientCn + "_" + connectNodeInfo.serialNumber; + } + } + return key; + } } diff --git a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java index 848da61..22e032b 100644 --- a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java +++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java @@ -3434,7 +3434,12 @@ public class OvsdbDao { rowColumns.put("gas_addr3_behavior", new Atom<>(hs2Profile.getGasAddr3Behaviour().getId())); rowColumns.put("operating_class", new Atom<>(hs2Profile.getOperatingClass())); rowColumns.put("anqp_domain_id", new Atom<>(hs2Profile.getAnqpDomainId())); - + Set> mccMnc = new HashSet<>(); + hs2Profile.getMccMnc3gppCellularNetworkInfo().stream() + .forEach(c -> mccMnc.add(new Atom<>(c.getMccMncPairing()))); + com.vmware.ovsdb.protocol.operation.notation.Set mccMncSet = com.vmware.ovsdb.protocol.operation.notation.Set + .of(mccMnc); + rowColumns.put("mcc_mnc", mccMncSet); Set> connectionCapabilities = new HashSet<>(); hs2Profile.getConnectionCapabilitySet().stream().forEach( c -> connectionCapabilities.add(new Atom<>(c.getConnectionCapabilitiesIpProtocol() + ":" @@ -3462,13 +3467,33 @@ public class OvsdbDao { rowColumns.put("venue_url", venueUrlSet); VenueTypeAssignment venueTypeAssignment = venueProfile.getVenueTypeAssignment(); - String groupType = String.valueOf(venueTypeAssignment.getVenueGroupId()) + ":" - + venueTypeAssignment.getVenueTypeId(); + String groupType = String.valueOf(venueTypeAssignment.getVenueGroupId()) + ":" + + venueTypeAssignment.getVenueTypeId(); rowColumns.put("venue_group_type", new Atom<>(groupType)); + + Map vifConfigMap = getProvisionedWifiVifConfigs(ovsdbClient); + + Set vifConfigs = new HashSet<>(); + for (String ssid : hs2Profile.getAssociatedSsids()) { + if (vifConfigMap != null) { + vifConfigMap.keySet().stream().forEach(k -> { + if (k.endsWith(ssid)) { + WifiVifConfigInfo vifConfig = vifConfigMap.get(k); + vifConfigs.add(vifConfig.uuid); + } + }); + } + } + + if (vifConfigs.size() > 0) { + com.vmware.ovsdb.protocol.operation.notation.Set vifConfigUuids = com.vmware.ovsdb.protocol.operation.notation.Set + .of(vifConfigs); + rowColumns.put("vif_config", vifConfigUuids); + } Row row = new Row(rowColumns); Insert newHs20Config = new Insert(hotspot20ConfigDbTable, row);