diff --git a/opensync-ext-static/src/main/resources/ProfileAPExample.json b/opensync-ext-static/src/main/resources/ProfileAPExample.json index c57203d..5b894a2 100644 --- a/opensync-ext-static/src/main/resources/ProfileAPExample.json +++ b/opensync-ext-static/src/main/resources/ProfileAPExample.json @@ -1,50 +1,50 @@ { - "model_type": "Profile", - "id": 16, - "customerId": 2, - "profileType": "equipment_ap", - "name": "ApProfile-3-radios", - "details": { - "model_type": "ApNetworkConfiguration", - "networkConfigVersion": "AP-1", - "equipmentType": "AP", - "vlanNative": true, - "vlan": 0, - "ntpServer": { - "model_type": "AutoOrManualString", - "auto": true, - "value": "pool.ntp.org" - }, - "syslogRelay": null, - "rtlsSettings": null, - "syntheticClientEnabled": true, - "ledControlEnabled": true, - "equipmentDiscovery": false, - "radioMap": { - "is2dot4GHz": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is5GHzU": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is5GHzL": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - } - }, - "profileType": "equipment_ap" + "model_type": "Profile", + "id": 17, + "customerId": 2, + "profileType": "equipment_ap", + "name": "ApProfile-3-radios", + "details": { + "model_type": "ApNetworkConfiguration", + "networkConfigVersion": "AP-1", + "equipmentType": "AP", + "vlanNative": true, + "vlan": 0, + "ntpServer": { + "model_type": "AutoOrManualString", + "auto": true, + "value": "pool.ntp.org" }, - "createdTimestamp": 1602113059824, - "lastModifiedTimestamp": 1602113059824, - "childProfileIds": [ - 2, - 5, - 10, - 12 - ] - } \ No newline at end of file + "syslogRelay": null, + "rtlsSettings": null, + "syntheticClientEnabled": true, + "ledControlEnabled": true, + "equipmentDiscovery": false, + "radioMap": { + "is2dot4GHz": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + }, + "is5GHzU": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + }, + "is5GHzL": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + } + }, + "profileType": "equipment_ap" + }, + "createdTimestamp": 1602182806348, + "lastModifiedTimestamp": 1602182806348, + "childProfileIds": [ + 2, + 5, + 11, + 13 + ] +} \ No newline at end of file diff --git a/opensync-ext-static/src/main/resources/ProfileCaptive.json b/opensync-ext-static/src/main/resources/ProfileCaptive.json index 8e6e489..e7766c9 100644 --- a/opensync-ext-static/src/main/resources/ProfileCaptive.json +++ b/opensync-ext-static/src/main/resources/ProfileCaptive.json @@ -1,44 +1,31 @@ -[ - { - "model_type": "Profile", - "id": 2, - "customerId": 2, - "profileType": "captive_portal", - "name": "Captive-portal", - "details": { +{ + "model_type": "Profile", + "id": 14, + "customerId": 2, + "profileType": "captive_portal", + "name": "Captive-portal", + "details": { "model_type": "CaptivePortalConfiguration", "name": "Captive-portal", "browserTitle": "Access the network as Guest", "headerContent": "Captive Portal", "userAcceptancePolicy": "Use this network at your own risk. No warranty of any kind.", "successPageMarkdownText": "Welcome to the network", - "redirectURL": "www.google.com", + "redirectURL": "", "externalCaptivePortalURL": null, "sessionTimeoutInMinutes": 60, - "logoFile": { - "model_type": "ManagedFileInfo", - "md5checksum": null, - "lastModifiedTimestamp": null, - "apExportUrl": "netExpLogo.png", - "fileCategory": "CaptivePortalLogo", - "fileType": "PNG", - "altSlot": false + "logoFile": null, + "backgroundFile": null, + "walledGardenAllowlist": [], + "usernamePasswordFile": { + "model_type": "ManagedFileInfo", + "md5checksum": null, + "lastModifiedTimestamp": null, + "apExportUrl": "userList", + "fileCategory": "UsernamePasswordList", + "fileType": "TEXT", + "altSlot": true }, - "backgroundFile": { - "model_type": "ManagedFileInfo", - "md5checksum": null, - "lastModifiedTimestamp": null, - "apExportUrl": "netExpBackgroud.jpg", - "fileCategory": "CaptivePortalBackground", - "fileType": "JPG", - "altSlot": false - }, - "walledGardenAllowlist": [ - "1.2.3.4", - "1.2.3.6-2.3.4.5", - "netexperience.com" - ], - "usernamePasswordFile": null, "authenticationType": "guest", "radiusAuthMethod": "CHAP", "maxUsersWithSameCredentials": 42, @@ -47,12 +34,100 @@ "backgroundRepeat": "no_repeat", "radiusServiceName": null, "expiryType": "unlimited", - "userList": [], + "userList": [ + { + "model_type": "TimedAccessUserRecord", + "username": "customer", + "password": "testing123", + "activationTime": 1602183994956, + "expirationTime": 1602212794956, + "numDevices": 1, + "userDetails": { + "model_type": "TimedAccessUserDetails", + "firstName": "Pac", + "lastName": "Man", + "passwordNeedsReset": false + }, + "userMacAddresses": [ + { + "model_type": "MacAddress", + "address": "fKtg5upO", + "addressAsString": "7c:ab:60:e6:ea:4e" + } + ], + "lastModifiedTimestamp": 0 + }, + { + "model_type": "TimedAccessUserRecord", + "username": "customer", + "password": "testing123", + "activationTime": 1602183994957, + "expirationTime": 1602187594957, + "numDevices": 0, + "userDetails": { + "model_type": "TimedAccessUserDetails", + "firstName": "Q", + "lastName": "Bert", + "passwordNeedsReset": false + }, + "userMacAddresses": [ + { + "model_type": "MacAddress", + "address": "wJrQdqho", + "addressAsString": "c0:9a:d0:76:a8:68" + } + ], + "lastModifiedTimestamp": 0 + }, + { + "model_type": "TimedAccessUserRecord", + "username": "customer2", + "password": "testing1234", + "activationTime": 1602183994957, + "expirationTime": 1602788794957, + "numDevices": 1, + "userDetails": { + "model_type": "TimedAccessUserDetails", + "firstName": "Duke", + "lastName": "Nukem", + "passwordNeedsReset": false + }, + "userMacAddresses": [ + { + "model_type": "MacAddress", + "address": "fKtg5upN", + "addressAsString": "7c:ab:60:e6:ea:4d" + } + ], + "lastModifiedTimestamp": 0 + }, + { + "model_type": "TimedAccessUserRecord", + "username": "customer2", + "password": "testing1234", + "activationTime": 1602183994957, + "expirationTime": 1602270394957, + "numDevices": 0, + "userDetails": { + "model_type": "TimedAccessUserDetails", + "firstName": "Missile", + "lastName": "Commander", + "passwordNeedsReset": false + }, + "userMacAddresses": [ + { + "model_type": "MacAddress", + "address": "wJrQdqhj", + "addressAsString": "c0:9a:d0:76:a8:63" + } + ], + "lastModifiedTimestamp": 0 + } + ], "macAllowList": [], "profileType": "captive_portal" - }, - "createdTimestamp": 1595341820188, - "lastModifiedTimestamp": 1595341820188, - "childProfileIds": [] - } -] \ No newline at end of file + }, + "createdTimestamp": 1602183994959, + "lastModifiedTimestamp": 1602183994959, + "childProfileIds": [] +} \ 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 de2aa3d..6561bc9 100644 --- a/opensync-ext-static/src/main/resources/ProfileHotspot20.json +++ b/opensync-ext-static/src/main/resources/ProfileHotspot20.json @@ -1,83 +1,72 @@ [ { - "model_type": "Profile", - "id": 9, - "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, - "associatedAccessSsidNames": [ - "TipWlan-cloud-hotspot-access" - ], - "osuSsidName": "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" - } - ], - "operatorProfileName": "TipWlan-Hotspot20-Operator", - "venueProfileName": "TipWlan-Hotspot20-Venue", - "idProviderProfileNames": [ - "TipWlan-Hotspot20-OSU-Provider" - ], - "profileType": "hotspot_2pt0", - "mccMncList": "302,720", - "associatedSsids": [ - "TipWlan-cloud-hotspot-access" - ] + "model_type": "Profile", + "id": 10, + "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 }, - "createdTimestamp": 1602113059532, - "lastModifiedTimestamp": 1602113059532, - "childProfileIds": [ - 6, - 7, - 8 + "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, + "associatedAccessSsidNames": [ + "TipWlan-cloud-hotspot-access" + ], + "osuSsidName": "TipWlan-cloud-3-radios", + "operatorProfileName": "TipWlan-Hotspot20-Operator", + "venueProfileName": "TipWlan-Hotspot20-Venue", + "idProviderProfileNames": [ + "TipWlan-Hotspot20-OSU-Provider-2", + "TipWlan-Hotspot20-OSU-Provider" + ], + "profileType": "hotspot_2pt0", + "associatedSsids": [ + "TipWlan-cloud-hotspot-access" ] - } + }, + "createdTimestamp": 1602182806040, + "lastModifiedTimestamp": 1602182806040, + "childProfileIds": [ + 6, + 7, + 8, + 9 + ] +} ] \ No newline at end of file diff --git a/opensync-ext-static/src/main/resources/ProfileIdProvider.json b/opensync-ext-static/src/main/resources/ProfileIdProvider.json index b12abad..01d4a9a 100644 --- a/opensync-ext-static/src/main/resources/ProfileIdProvider.json +++ b/opensync-ext-static/src/main/resources/ProfileIdProvider.json @@ -1,111 +1,262 @@ [ { - "model_type": "Profile", - "id": 8, - "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" + "model_type": "Profile", + "id": 8, + "customerId": 2, + "profileType": "id_provider", + "name": "TipWlan-Hotspot20-OSU-Provider", + "details": { + "model_type": "Hotspot20IdProviderProfile", + "domainName": "rogers.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": [ + "rogers.com" + ], + "encoding": 0, + "eapMethods": [ + "EAP-TTLS with username/password", + "EAP-TLS with certificate" + ], + "eapMap": { + "EAP-TTLS with username/password": [ + "Credential Type:username/password", + "Non-EAP Inner Authentication Type:MSCHAPV2" ], - "encoding": 0, - "eapMethods": [ - "EAP-TTLS with username/password", - "EAP-TLS with certificate" + "EAP-TLS with certificate": [ + "Credential Type:Certificate" + ] + } + } + ], + "osuIconList": [ + { + "model_type": "OsuIcon", + "iconWidth": 32, + "iconHeight": 32, + "languageCode": "eng", + "iconLocale": "en_CA", + "iconName": "icon32eng", + "filePath": "/tmp/icon32eng.png", + "imageUrl": "https://localhost:9096/icon32eng.png", + "hs20IconString": "32:32:eng:image/png:icon32eng:/tmp/icon32eng.png" + }, + { + "model_type": "OsuIcon", + "iconWidth": 32, + "iconHeight": 32, + "languageCode": "fra", + "iconLocale": "fr_CA", + "iconName": "icon32fra", + "filePath": "/tmp/icon32fra.png", + "imageUrl": "https://localhost:9096/icon32fra.png", + "hs20IconString": "32:32:fra:image/png:icon32fra:/tmp/icon32fra.png" + }, + { + "model_type": "OsuIcon", + "iconWidth": 32, + "iconHeight": 32, + "languageCode": "eng", + "iconLocale": "en_US", + "iconName": "icon32usa", + "filePath": "/tmp/icon32usa.png", + "imageUrl": "https://localhost:9096/icon32usa.png", + "hs20IconString": "32:32:eng:image/png:icon32usa:/tmp/icon32usa.png" + } + ], + "radiusProfileAuth": "Radius-Profile", + "radiusProfileAccounting": "Radius-Profile", + "osuSsid": "TipWlan-cloud-3-radios", + "osuServerUri": "https://example.com/osu/rogers/", + "osuFriendlyName": [ + { + "model_type": "Hotspot20Duple", + "locale": "en_CA", + "dupleIso3Language": "eng", + "dupleName": "Example provider rogers", + "defaultDupleSeparator": ":", + "asDuple": "eng:Example provider rogers" + }, + { + "model_type": "Hotspot20Duple", + "locale": "fr_CA", + "dupleIso3Language": "fra", + "dupleName": "Exemple de fournisseur rogers", + "defaultDupleSeparator": ":", + "asDuple": "fra:Exemple de fournisseur rogers" + } + ], + "osuNaiStandalone": "anonymous@rogers.com", + "osuNaiShared": "anonymous@rogers.com", + "osuMethodList": [ + 1, + 0 + ], + "osuServiceDescription": [ + { + "model_type": "Hotspot20Duple", + "locale": "en_CA", + "dupleIso3Language": "eng", + "dupleName": "Example services rogers", + "defaultDupleSeparator": ":", + "asDuple": "eng:Example services rogers" + }, + { + "model_type": "Hotspot20Duple", + "locale": "fr_CA", + "dupleIso3Language": "fra", + "dupleName": "Exemples de services rogers", + "defaultDupleSeparator": ":", + "asDuple": "fra:Exemples de services rogers" + } + ], + "profileType": "id_provider" + }, + "createdTimestamp": 1602182805654, + "lastModifiedTimestamp": 1602182805654, + "childProfileIds": [] +}, +{ + "model_type": "Profile", + "id": 9, + "customerId": 2, + "profileType": "id_provider", + "name": "TipWlan-Hotspot20-OSU-Provider-2", + "details": { + "model_type": "Hotspot20IdProviderProfile", + "domainName": "telus.com", + "mccMncList": [ + { + "model_type": "MccMnc", + "mcc": 302, + "mnc": 220, + "iso": "ca", + "country": "Canada", + "countryCode": 1, + "network": "Telus Mobility", + "mccMncPairing": "302,220" + } + ], + "naiRealmList": [ + { + "model_type": "NaiRealmInformation", + "naiRealms": [ + "telus.com" + ], + "encoding": 0, + "eapMethods": [ + "EAP-TTLS with username/password", + "EAP-TLS with certificate" + ], + "eapMap": { + "EAP-TTLS with username/password": [ + "Credential Type:username/password", + "Non-EAP Inner Authentication Type:MSCHAPV2" ], - "eapMap": { - "EAP-TTLS with username/password": [ - "Credential Type:username/password", - "Non-EAP Inner Authentication Type:MSCHAPV2" - ], - "EAP-TLS with certificate": [ - "Credential Type:Certificate" - ] - } + "EAP-TLS with certificate": [ + "Credential Type:Certificate" + ] } - ], - "osuIconList": [ - { - "model_type": "OsuIcon", - "iconWidth": 32, - "iconHeight": 32, - "languageCode": "eng", - "iconLocale": "en_CA", - "iconName": "icon32.png", - "filePath": "/tmp/icon32.png", - "imageUrl": "https://localhost:9096", - "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" - }, - { - "model_type": "Hotspot20Duple", - "locale": "fr_CA", - "dupleIso3Language": "fra", - "dupleName": "Exemple de fournisseur", - "defaultDupleSeparator": ":", - "asDuple": "fra:Exemple de fournisseur" - } - ], - "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": 1602113059086, - "lastModifiedTimestamp": 1602113059086, - "childProfileIds": [] - } + } + ], + "osuIconList": [ + { + "model_type": "OsuIcon", + "iconWidth": 32, + "iconHeight": 32, + "languageCode": "eng", + "iconLocale": "en_CA", + "iconName": "icon32eng", + "filePath": "/tmp/icon32eng.png", + "imageUrl": "https://localhost:9096/icon32eng.png", + "hs20IconString": "32:32:eng:image/png:icon32eng:/tmp/icon32eng.png" + }, + { + "model_type": "OsuIcon", + "iconWidth": 32, + "iconHeight": 32, + "languageCode": "fra", + "iconLocale": "fr_CA", + "iconName": "icon32fra", + "filePath": "/tmp/icon32fra.png", + "imageUrl": "https://localhost:9096/icon32fra.png", + "hs20IconString": "32:32:fra:image/png:icon32fra:/tmp/icon32fra.png" + }, + { + "model_type": "OsuIcon", + "iconWidth": 32, + "iconHeight": 32, + "languageCode": "eng", + "iconLocale": "en_US", + "iconName": "icon32usa", + "filePath": "/tmp/icon32usa.png", + "imageUrl": "https://localhost:9096/icon32usa.png", + "hs20IconString": "32:32:eng:image/png:icon32usa:/tmp/icon32usa.png" + } + ], + "radiusProfileAuth": "Radius-Profile", + "radiusProfileAccounting": "Radius-Profile", + "osuSsid": "TipWlan-cloud-3-radios", + "osuServerUri": "https://example.com/osu/telus/", + "osuFriendlyName": [ + { + "model_type": "Hotspot20Duple", + "locale": "en_CA", + "dupleIso3Language": "eng", + "dupleName": "Example provider telus", + "defaultDupleSeparator": ":", + "asDuple": "eng:Example provider telus" + }, + { + "model_type": "Hotspot20Duple", + "locale": "fr_CA", + "dupleIso3Language": "fra", + "dupleName": "Exemple de fournisseur telus", + "defaultDupleSeparator": ":", + "asDuple": "fra:Exemple de fournisseur telus" + } + ], + "osuNaiStandalone": "anonymous@telus.com", + "osuNaiShared": "anonymous@telus.com", + "osuMethodList": [ + 1, + 0 + ], + "osuServiceDescription": [ + { + "model_type": "Hotspot20Duple", + "locale": "en_CA", + "dupleIso3Language": "eng", + "dupleName": "Example services telus", + "defaultDupleSeparator": ":", + "asDuple": "eng:Example services telus" + }, + { + "model_type": "Hotspot20Duple", + "locale": "fr_CA", + "dupleIso3Language": "fra", + "dupleName": "Exemples de services telus", + "defaultDupleSeparator": ":", + "asDuple": "fra:Exemples de services telus" + } + ], + "profileType": "id_provider" + }, + "createdTimestamp": 1602182805660, + "lastModifiedTimestamp": 1602182805660, + "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 9efbb54..d76c61e 100644 --- a/opensync-ext-static/src/main/resources/ProfileRf.json +++ b/opensync-ext-static/src/main/resources/ProfileRf.json @@ -1,256 +1,256 @@ - { - "model_type": "Profile", - "id": 12, - "customerId": 2, - "profileType": "rf", - "name": "TipWlan-rf", - "details": { - "model_type": "RfConfiguration", - "rfConfigMap": { - "is5GHz": { - "model_type": "RfElementConfiguration", - "rf": "TipWlan-rf", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is80MHz", - "mimoMode": "twoByTwo", - "maxNumClients": 100, - "multicastRate": "auto", - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "managementRate": "auto", - "rxCellSizeDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "eirpTxPower": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": 18 - }, - "bestApEnabled": null, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } +{ + "model_type": "Profile", + "id": 13, + "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 }, - "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 - } + "managementRate": "auto", + "rxCellSizeDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 }, - "is5GHzU": { - "model_type": "RfElementConfiguration", - "rf": "TipWlan-rf", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is80MHz", - "mimoMode": "twoByTwo", - "maxNumClients": 100, - "multicastRate": "auto", - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "managementRate": "auto", - "rxCellSizeDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "eirpTxPower": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": 18 - }, - "bestApEnabled": null, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } + "probeResponseThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 }, - "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 - } + "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" + "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 + } + } }, - "createdTimestamp": 1602113059555, - "lastModifiedTimestamp": 1602113059555, - "childProfileIds": [] - } \ No newline at end of file + "profileType": "rf" + }, + "createdTimestamp": 1602182806063, + "lastModifiedTimestamp": 1602182806063, + "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 30b8275..101e9c9 100644 --- a/opensync-ext-static/src/main/resources/ProfileSsid.json +++ b/opensync-ext-static/src/main/resources/ProfileSsid.json @@ -1,134 +1,135 @@ [ - { - "model_type": "Profile", - "id": 5, - "customerId": 2, - "profileType": "ssid", - "name": "TipWlan-cloud-hotspot-access", - "details": { - "model_type": "SsidConfiguration", - "ssid": "TipWlan-cloud-hotspot-access", - "appliedRadios": [ - "is5GHzU", - "is5GHzL", - "is2dot4GHz" - ], - "ssidAdminState": "enabled", - "secureMode": "wpa2PSK", - "vlanId": 1, - "keyStr": "testing123", - "broadcastSsid": "enabled", - "keyRefresh": 0, - "noLocalSubnets": false, - "radiusServiceName": null, - "captivePortalId": null, - "bandwidthLimitDown": 0, - "bandwidthLimitUp": 0, - "clientBandwidthLimitDown": 0, - "clientBandwidthLimitUp": 0, - "videoTrafficOnly": false, - "radioBasedConfigs": { - "is5GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "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": 1602113058718, - "lastModifiedTimestamp": 1602113059547, - "childProfileIds": [ - 9 - ] - }, - { - "model_type": "Profile", - "id": 10, - "customerId": 2, - "profileType": "ssid", - "name": "TipWlan-cloud-3-radios", - "details": { - "model_type": "SsidConfiguration", - "ssid": "TipWlan-cloud-3-radios", - "appliedRadios": [ - "is5GHzU", - "is5GHzL", - "is2dot4GHz" - ], - "ssidAdminState": "enabled", - "secureMode": "open", - "vlanId": 1, - "keyStr": null, - "broadcastSsid": "enabled", - "keyRefresh": 0, - "noLocalSubnets": false, - "radiusServiceName": null, - "captivePortalId": null, - "bandwidthLimitDown": 0, - "bandwidthLimitUp": 0, - "clientBandwidthLimitDown": 0, - "clientBandwidthLimitUp": 0, - "videoTrafficOnly": false, - "radioBasedConfigs": { - "is5GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is2dot4GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzU": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzL": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - } - }, - "bonjourGatewayProfileId": null, - "enable80211w": null, - "wepConfig": null, - "forwardMode": null, - "profileType": "ssid" - }, - "createdTimestamp": 1602113059549, - "lastModifiedTimestamp": 1602113059549, - "childProfileIds": [ - 8 - ] - } + { + "model_type": "Profile", + "id": 5, + "customerId": 2, + "profileType": "ssid", + "name": "TipWlan-cloud-hotspot-access", + "details": { + "model_type": "SsidConfiguration", + "ssid": "TipWlan-cloud-hotspot-access", + "appliedRadios": [ + "is5GHzU", + "is5GHzL", + "is2dot4GHz" + ], + "ssidAdminState": "enabled", + "secureMode": "wpa2PSK", + "vlanId": 1, + "keyStr": "testing123", + "broadcastSsid": "enabled", + "keyRefresh": 0, + "noLocalSubnets": false, + "radiusServiceName": null, + "captivePortalId": null, + "bandwidthLimitDown": 0, + "bandwidthLimitUp": 0, + "clientBandwidthLimitDown": 0, + "clientBandwidthLimitUp": 0, + "videoTrafficOnly": false, + "radioBasedConfigs": { + "is5GHz": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + }, + "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": 1602113058718, + "lastModifiedTimestamp": 1602113059547, + "childProfileIds": [ + 10 + ] + }, + { + "model_type": "Profile", + "id": 11, + "customerId": 2, + "profileType": "ssid", + "name": "TipWlan-cloud-3-radios", + "details": { + "model_type": "SsidConfiguration", + "ssid": "TipWlan-cloud-3-radios", + "appliedRadios": [ + "is5GHzL", + "is2dot4GHz", + "is5GHzU" + ], + "ssidAdminState": "enabled", + "secureMode": "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": 1602183994766, + "lastModifiedTimestamp": 1602183994766, + "childProfileIds": [ + 8, + 9 + ] + } ] 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 c57203d..5b894a2 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,50 +1,50 @@ { - "model_type": "Profile", - "id": 16, - "customerId": 2, - "profileType": "equipment_ap", - "name": "ApProfile-3-radios", - "details": { - "model_type": "ApNetworkConfiguration", - "networkConfigVersion": "AP-1", - "equipmentType": "AP", - "vlanNative": true, - "vlan": 0, - "ntpServer": { - "model_type": "AutoOrManualString", - "auto": true, - "value": "pool.ntp.org" - }, - "syslogRelay": null, - "rtlsSettings": null, - "syntheticClientEnabled": true, - "ledControlEnabled": true, - "equipmentDiscovery": false, - "radioMap": { - "is2dot4GHz": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is5GHzU": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is5GHzL": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - } - }, - "profileType": "equipment_ap" + "model_type": "Profile", + "id": 17, + "customerId": 2, + "profileType": "equipment_ap", + "name": "ApProfile-3-radios", + "details": { + "model_type": "ApNetworkConfiguration", + "networkConfigVersion": "AP-1", + "equipmentType": "AP", + "vlanNative": true, + "vlan": 0, + "ntpServer": { + "model_type": "AutoOrManualString", + "auto": true, + "value": "pool.ntp.org" }, - "createdTimestamp": 1602113059824, - "lastModifiedTimestamp": 1602113059824, - "childProfileIds": [ - 2, - 5, - 10, - 12 - ] - } \ No newline at end of file + "syslogRelay": null, + "rtlsSettings": null, + "syntheticClientEnabled": true, + "ledControlEnabled": true, + "equipmentDiscovery": false, + "radioMap": { + "is2dot4GHz": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + }, + "is5GHzU": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + }, + "is5GHzL": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + } + }, + "profileType": "equipment_ap" + }, + "createdTimestamp": 1602182806348, + "lastModifiedTimestamp": 1602182806348, + "childProfileIds": [ + 2, + 5, + 11, + 13 + ] +} \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileCaptive.json b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileCaptive.json index 9f3b89e..e7766c9 100644 --- a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileCaptive.json +++ b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileCaptive.json @@ -1,11 +1,10 @@ -[ - { - "model_type": "Profile", - "id": 2, - "customerId": 2, - "profileType": "captive_portal", - "name": "Captive-portal", - "details": { +{ + "model_type": "Profile", + "id": 14, + "customerId": 2, + "profileType": "captive_portal", + "name": "Captive-portal", + "details": { "model_type": "CaptivePortalConfiguration", "name": "Captive-portal", "browserTitle": "Access the network as Guest", @@ -18,7 +17,15 @@ "logoFile": null, "backgroundFile": null, "walledGardenAllowlist": [], - "usernamePasswordFile": null, + "usernamePasswordFile": { + "model_type": "ManagedFileInfo", + "md5checksum": null, + "lastModifiedTimestamp": null, + "apExportUrl": "userList", + "fileCategory": "UsernamePasswordList", + "fileType": "TEXT", + "altSlot": true + }, "authenticationType": "guest", "radiusAuthMethod": "CHAP", "maxUsersWithSameCredentials": 42, @@ -27,12 +34,100 @@ "backgroundRepeat": "no_repeat", "radiusServiceName": null, "expiryType": "unlimited", - "userList": [], + "userList": [ + { + "model_type": "TimedAccessUserRecord", + "username": "customer", + "password": "testing123", + "activationTime": 1602183994956, + "expirationTime": 1602212794956, + "numDevices": 1, + "userDetails": { + "model_type": "TimedAccessUserDetails", + "firstName": "Pac", + "lastName": "Man", + "passwordNeedsReset": false + }, + "userMacAddresses": [ + { + "model_type": "MacAddress", + "address": "fKtg5upO", + "addressAsString": "7c:ab:60:e6:ea:4e" + } + ], + "lastModifiedTimestamp": 0 + }, + { + "model_type": "TimedAccessUserRecord", + "username": "customer", + "password": "testing123", + "activationTime": 1602183994957, + "expirationTime": 1602187594957, + "numDevices": 0, + "userDetails": { + "model_type": "TimedAccessUserDetails", + "firstName": "Q", + "lastName": "Bert", + "passwordNeedsReset": false + }, + "userMacAddresses": [ + { + "model_type": "MacAddress", + "address": "wJrQdqho", + "addressAsString": "c0:9a:d0:76:a8:68" + } + ], + "lastModifiedTimestamp": 0 + }, + { + "model_type": "TimedAccessUserRecord", + "username": "customer2", + "password": "testing1234", + "activationTime": 1602183994957, + "expirationTime": 1602788794957, + "numDevices": 1, + "userDetails": { + "model_type": "TimedAccessUserDetails", + "firstName": "Duke", + "lastName": "Nukem", + "passwordNeedsReset": false + }, + "userMacAddresses": [ + { + "model_type": "MacAddress", + "address": "fKtg5upN", + "addressAsString": "7c:ab:60:e6:ea:4d" + } + ], + "lastModifiedTimestamp": 0 + }, + { + "model_type": "TimedAccessUserRecord", + "username": "customer2", + "password": "testing1234", + "activationTime": 1602183994957, + "expirationTime": 1602270394957, + "numDevices": 0, + "userDetails": { + "model_type": "TimedAccessUserDetails", + "firstName": "Missile", + "lastName": "Commander", + "passwordNeedsReset": false + }, + "userMacAddresses": [ + { + "model_type": "MacAddress", + "address": "wJrQdqhj", + "addressAsString": "c0:9a:d0:76:a8:63" + } + ], + "lastModifiedTimestamp": 0 + } + ], "macAllowList": [], "profileType": "captive_portal" - }, - "createdTimestamp": 1595341820188, - "lastModifiedTimestamp": 1595341820188, - "childProfileIds": [] - } -] \ No newline at end of file + }, + "createdTimestamp": 1602183994959, + "lastModifiedTimestamp": 1602183994959, + "childProfileIds": [] +} \ 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 de2aa3d..6561bc9 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,83 +1,72 @@ [ { - "model_type": "Profile", - "id": 9, - "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, - "associatedAccessSsidNames": [ - "TipWlan-cloud-hotspot-access" - ], - "osuSsidName": "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" - } - ], - "operatorProfileName": "TipWlan-Hotspot20-Operator", - "venueProfileName": "TipWlan-Hotspot20-Venue", - "idProviderProfileNames": [ - "TipWlan-Hotspot20-OSU-Provider" - ], - "profileType": "hotspot_2pt0", - "mccMncList": "302,720", - "associatedSsids": [ - "TipWlan-cloud-hotspot-access" - ] + "model_type": "Profile", + "id": 10, + "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 }, - "createdTimestamp": 1602113059532, - "lastModifiedTimestamp": 1602113059532, - "childProfileIds": [ - 6, - 7, - 8 + "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, + "associatedAccessSsidNames": [ + "TipWlan-cloud-hotspot-access" + ], + "osuSsidName": "TipWlan-cloud-3-radios", + "operatorProfileName": "TipWlan-Hotspot20-Operator", + "venueProfileName": "TipWlan-Hotspot20-Venue", + "idProviderProfileNames": [ + "TipWlan-Hotspot20-OSU-Provider-2", + "TipWlan-Hotspot20-OSU-Provider" + ], + "profileType": "hotspot_2pt0", + "associatedSsids": [ + "TipWlan-cloud-hotspot-access" ] - } + }, + "createdTimestamp": 1602182806040, + "lastModifiedTimestamp": 1602182806040, + "childProfileIds": [ + 6, + 7, + 8, + 9 + ] +} ] \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileIdProvider.json b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileIdProvider.json index b12abad..01d4a9a 100644 --- a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileIdProvider.json +++ b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileIdProvider.json @@ -1,111 +1,262 @@ [ { - "model_type": "Profile", - "id": 8, - "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" + "model_type": "Profile", + "id": 8, + "customerId": 2, + "profileType": "id_provider", + "name": "TipWlan-Hotspot20-OSU-Provider", + "details": { + "model_type": "Hotspot20IdProviderProfile", + "domainName": "rogers.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": [ + "rogers.com" + ], + "encoding": 0, + "eapMethods": [ + "EAP-TTLS with username/password", + "EAP-TLS with certificate" + ], + "eapMap": { + "EAP-TTLS with username/password": [ + "Credential Type:username/password", + "Non-EAP Inner Authentication Type:MSCHAPV2" ], - "encoding": 0, - "eapMethods": [ - "EAP-TTLS with username/password", - "EAP-TLS with certificate" + "EAP-TLS with certificate": [ + "Credential Type:Certificate" + ] + } + } + ], + "osuIconList": [ + { + "model_type": "OsuIcon", + "iconWidth": 32, + "iconHeight": 32, + "languageCode": "eng", + "iconLocale": "en_CA", + "iconName": "icon32eng", + "filePath": "/tmp/icon32eng.png", + "imageUrl": "https://localhost:9096/icon32eng.png", + "hs20IconString": "32:32:eng:image/png:icon32eng:/tmp/icon32eng.png" + }, + { + "model_type": "OsuIcon", + "iconWidth": 32, + "iconHeight": 32, + "languageCode": "fra", + "iconLocale": "fr_CA", + "iconName": "icon32fra", + "filePath": "/tmp/icon32fra.png", + "imageUrl": "https://localhost:9096/icon32fra.png", + "hs20IconString": "32:32:fra:image/png:icon32fra:/tmp/icon32fra.png" + }, + { + "model_type": "OsuIcon", + "iconWidth": 32, + "iconHeight": 32, + "languageCode": "eng", + "iconLocale": "en_US", + "iconName": "icon32usa", + "filePath": "/tmp/icon32usa.png", + "imageUrl": "https://localhost:9096/icon32usa.png", + "hs20IconString": "32:32:eng:image/png:icon32usa:/tmp/icon32usa.png" + } + ], + "radiusProfileAuth": "Radius-Profile", + "radiusProfileAccounting": "Radius-Profile", + "osuSsid": "TipWlan-cloud-3-radios", + "osuServerUri": "https://example.com/osu/rogers/", + "osuFriendlyName": [ + { + "model_type": "Hotspot20Duple", + "locale": "en_CA", + "dupleIso3Language": "eng", + "dupleName": "Example provider rogers", + "defaultDupleSeparator": ":", + "asDuple": "eng:Example provider rogers" + }, + { + "model_type": "Hotspot20Duple", + "locale": "fr_CA", + "dupleIso3Language": "fra", + "dupleName": "Exemple de fournisseur rogers", + "defaultDupleSeparator": ":", + "asDuple": "fra:Exemple de fournisseur rogers" + } + ], + "osuNaiStandalone": "anonymous@rogers.com", + "osuNaiShared": "anonymous@rogers.com", + "osuMethodList": [ + 1, + 0 + ], + "osuServiceDescription": [ + { + "model_type": "Hotspot20Duple", + "locale": "en_CA", + "dupleIso3Language": "eng", + "dupleName": "Example services rogers", + "defaultDupleSeparator": ":", + "asDuple": "eng:Example services rogers" + }, + { + "model_type": "Hotspot20Duple", + "locale": "fr_CA", + "dupleIso3Language": "fra", + "dupleName": "Exemples de services rogers", + "defaultDupleSeparator": ":", + "asDuple": "fra:Exemples de services rogers" + } + ], + "profileType": "id_provider" + }, + "createdTimestamp": 1602182805654, + "lastModifiedTimestamp": 1602182805654, + "childProfileIds": [] +}, +{ + "model_type": "Profile", + "id": 9, + "customerId": 2, + "profileType": "id_provider", + "name": "TipWlan-Hotspot20-OSU-Provider-2", + "details": { + "model_type": "Hotspot20IdProviderProfile", + "domainName": "telus.com", + "mccMncList": [ + { + "model_type": "MccMnc", + "mcc": 302, + "mnc": 220, + "iso": "ca", + "country": "Canada", + "countryCode": 1, + "network": "Telus Mobility", + "mccMncPairing": "302,220" + } + ], + "naiRealmList": [ + { + "model_type": "NaiRealmInformation", + "naiRealms": [ + "telus.com" + ], + "encoding": 0, + "eapMethods": [ + "EAP-TTLS with username/password", + "EAP-TLS with certificate" + ], + "eapMap": { + "EAP-TTLS with username/password": [ + "Credential Type:username/password", + "Non-EAP Inner Authentication Type:MSCHAPV2" ], - "eapMap": { - "EAP-TTLS with username/password": [ - "Credential Type:username/password", - "Non-EAP Inner Authentication Type:MSCHAPV2" - ], - "EAP-TLS with certificate": [ - "Credential Type:Certificate" - ] - } + "EAP-TLS with certificate": [ + "Credential Type:Certificate" + ] } - ], - "osuIconList": [ - { - "model_type": "OsuIcon", - "iconWidth": 32, - "iconHeight": 32, - "languageCode": "eng", - "iconLocale": "en_CA", - "iconName": "icon32.png", - "filePath": "/tmp/icon32.png", - "imageUrl": "https://localhost:9096", - "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" - }, - { - "model_type": "Hotspot20Duple", - "locale": "fr_CA", - "dupleIso3Language": "fra", - "dupleName": "Exemple de fournisseur", - "defaultDupleSeparator": ":", - "asDuple": "fra:Exemple de fournisseur" - } - ], - "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": 1602113059086, - "lastModifiedTimestamp": 1602113059086, - "childProfileIds": [] - } + } + ], + "osuIconList": [ + { + "model_type": "OsuIcon", + "iconWidth": 32, + "iconHeight": 32, + "languageCode": "eng", + "iconLocale": "en_CA", + "iconName": "icon32eng", + "filePath": "/tmp/icon32eng.png", + "imageUrl": "https://localhost:9096/icon32eng.png", + "hs20IconString": "32:32:eng:image/png:icon32eng:/tmp/icon32eng.png" + }, + { + "model_type": "OsuIcon", + "iconWidth": 32, + "iconHeight": 32, + "languageCode": "fra", + "iconLocale": "fr_CA", + "iconName": "icon32fra", + "filePath": "/tmp/icon32fra.png", + "imageUrl": "https://localhost:9096/icon32fra.png", + "hs20IconString": "32:32:fra:image/png:icon32fra:/tmp/icon32fra.png" + }, + { + "model_type": "OsuIcon", + "iconWidth": 32, + "iconHeight": 32, + "languageCode": "eng", + "iconLocale": "en_US", + "iconName": "icon32usa", + "filePath": "/tmp/icon32usa.png", + "imageUrl": "https://localhost:9096/icon32usa.png", + "hs20IconString": "32:32:eng:image/png:icon32usa:/tmp/icon32usa.png" + } + ], + "radiusProfileAuth": "Radius-Profile", + "radiusProfileAccounting": "Radius-Profile", + "osuSsid": "TipWlan-cloud-3-radios", + "osuServerUri": "https://example.com/osu/telus/", + "osuFriendlyName": [ + { + "model_type": "Hotspot20Duple", + "locale": "en_CA", + "dupleIso3Language": "eng", + "dupleName": "Example provider telus", + "defaultDupleSeparator": ":", + "asDuple": "eng:Example provider telus" + }, + { + "model_type": "Hotspot20Duple", + "locale": "fr_CA", + "dupleIso3Language": "fra", + "dupleName": "Exemple de fournisseur telus", + "defaultDupleSeparator": ":", + "asDuple": "fra:Exemple de fournisseur telus" + } + ], + "osuNaiStandalone": "anonymous@telus.com", + "osuNaiShared": "anonymous@telus.com", + "osuMethodList": [ + 1, + 0 + ], + "osuServiceDescription": [ + { + "model_type": "Hotspot20Duple", + "locale": "en_CA", + "dupleIso3Language": "eng", + "dupleName": "Example services telus", + "defaultDupleSeparator": ":", + "asDuple": "eng:Example services telus" + }, + { + "model_type": "Hotspot20Duple", + "locale": "fr_CA", + "dupleIso3Language": "fra", + "dupleName": "Exemples de services telus", + "defaultDupleSeparator": ":", + "asDuple": "fra:Exemples de services telus" + } + ], + "profileType": "id_provider" + }, + "createdTimestamp": 1602182805660, + "lastModifiedTimestamp": 1602182805660, + "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 9efbb54..d76c61e 100644 --- a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileRf.json +++ b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileRf.json @@ -1,256 +1,256 @@ - { - "model_type": "Profile", - "id": 12, - "customerId": 2, - "profileType": "rf", - "name": "TipWlan-rf", - "details": { - "model_type": "RfConfiguration", - "rfConfigMap": { - "is5GHz": { - "model_type": "RfElementConfiguration", - "rf": "TipWlan-rf", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is80MHz", - "mimoMode": "twoByTwo", - "maxNumClients": 100, - "multicastRate": "auto", - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "managementRate": "auto", - "rxCellSizeDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "eirpTxPower": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": 18 - }, - "bestApEnabled": null, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } +{ + "model_type": "Profile", + "id": 13, + "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 }, - "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 - } + "managementRate": "auto", + "rxCellSizeDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 }, - "is5GHzU": { - "model_type": "RfElementConfiguration", - "rf": "TipWlan-rf", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is80MHz", - "mimoMode": "twoByTwo", - "maxNumClients": 100, - "multicastRate": "auto", - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "managementRate": "auto", - "rxCellSizeDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "eirpTxPower": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": 18 - }, - "bestApEnabled": null, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } + "probeResponseThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 }, - "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 - } + "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" + "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 + } + } }, - "createdTimestamp": 1602113059555, - "lastModifiedTimestamp": 1602113059555, - "childProfileIds": [] - } \ No newline at end of file + "profileType": "rf" + }, + "createdTimestamp": 1602182806063, + "lastModifiedTimestamp": 1602182806063, + "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 30b8275..101e9c9 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,134 +1,135 @@ [ - { - "model_type": "Profile", - "id": 5, - "customerId": 2, - "profileType": "ssid", - "name": "TipWlan-cloud-hotspot-access", - "details": { - "model_type": "SsidConfiguration", - "ssid": "TipWlan-cloud-hotspot-access", - "appliedRadios": [ - "is5GHzU", - "is5GHzL", - "is2dot4GHz" - ], - "ssidAdminState": "enabled", - "secureMode": "wpa2PSK", - "vlanId": 1, - "keyStr": "testing123", - "broadcastSsid": "enabled", - "keyRefresh": 0, - "noLocalSubnets": false, - "radiusServiceName": null, - "captivePortalId": null, - "bandwidthLimitDown": 0, - "bandwidthLimitUp": 0, - "clientBandwidthLimitDown": 0, - "clientBandwidthLimitUp": 0, - "videoTrafficOnly": false, - "radioBasedConfigs": { - "is5GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "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": 1602113058718, - "lastModifiedTimestamp": 1602113059547, - "childProfileIds": [ - 9 - ] - }, - { - "model_type": "Profile", - "id": 10, - "customerId": 2, - "profileType": "ssid", - "name": "TipWlan-cloud-3-radios", - "details": { - "model_type": "SsidConfiguration", - "ssid": "TipWlan-cloud-3-radios", - "appliedRadios": [ - "is5GHzU", - "is5GHzL", - "is2dot4GHz" - ], - "ssidAdminState": "enabled", - "secureMode": "open", - "vlanId": 1, - "keyStr": null, - "broadcastSsid": "enabled", - "keyRefresh": 0, - "noLocalSubnets": false, - "radiusServiceName": null, - "captivePortalId": null, - "bandwidthLimitDown": 0, - "bandwidthLimitUp": 0, - "clientBandwidthLimitDown": 0, - "clientBandwidthLimitUp": 0, - "videoTrafficOnly": false, - "radioBasedConfigs": { - "is5GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is2dot4GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzU": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzL": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - } - }, - "bonjourGatewayProfileId": null, - "enable80211w": null, - "wepConfig": null, - "forwardMode": null, - "profileType": "ssid" - }, - "createdTimestamp": 1602113059549, - "lastModifiedTimestamp": 1602113059549, - "childProfileIds": [ - 8 - ] - } + { + "model_type": "Profile", + "id": 5, + "customerId": 2, + "profileType": "ssid", + "name": "TipWlan-cloud-hotspot-access", + "details": { + "model_type": "SsidConfiguration", + "ssid": "TipWlan-cloud-hotspot-access", + "appliedRadios": [ + "is5GHzU", + "is5GHzL", + "is2dot4GHz" + ], + "ssidAdminState": "enabled", + "secureMode": "wpa2PSK", + "vlanId": 1, + "keyStr": "testing123", + "broadcastSsid": "enabled", + "keyRefresh": 0, + "noLocalSubnets": false, + "radiusServiceName": null, + "captivePortalId": null, + "bandwidthLimitDown": 0, + "bandwidthLimitUp": 0, + "clientBandwidthLimitDown": 0, + "clientBandwidthLimitUp": 0, + "videoTrafficOnly": false, + "radioBasedConfigs": { + "is5GHz": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + }, + "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": 1602113058718, + "lastModifiedTimestamp": 1602113059547, + "childProfileIds": [ + 10 + ] + }, + { + "model_type": "Profile", + "id": 11, + "customerId": 2, + "profileType": "ssid", + "name": "TipWlan-cloud-3-radios", + "details": { + "model_type": "SsidConfiguration", + "ssid": "TipWlan-cloud-3-radios", + "appliedRadios": [ + "is5GHzL", + "is2dot4GHz", + "is5GHzU" + ], + "ssidAdminState": "enabled", + "secureMode": "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": 1602183994766, + "lastModifiedTimestamp": 1602183994766, + "childProfileIds": [ + 8, + 9 + ] + } ] 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 c57203d..5b894a2 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,50 +1,50 @@ { - "model_type": "Profile", - "id": 16, - "customerId": 2, - "profileType": "equipment_ap", - "name": "ApProfile-3-radios", - "details": { - "model_type": "ApNetworkConfiguration", - "networkConfigVersion": "AP-1", - "equipmentType": "AP", - "vlanNative": true, - "vlan": 0, - "ntpServer": { - "model_type": "AutoOrManualString", - "auto": true, - "value": "pool.ntp.org" - }, - "syslogRelay": null, - "rtlsSettings": null, - "syntheticClientEnabled": true, - "ledControlEnabled": true, - "equipmentDiscovery": false, - "radioMap": { - "is2dot4GHz": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is5GHzU": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is5GHzL": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - } - }, - "profileType": "equipment_ap" + "model_type": "Profile", + "id": 17, + "customerId": 2, + "profileType": "equipment_ap", + "name": "ApProfile-3-radios", + "details": { + "model_type": "ApNetworkConfiguration", + "networkConfigVersion": "AP-1", + "equipmentType": "AP", + "vlanNative": true, + "vlan": 0, + "ntpServer": { + "model_type": "AutoOrManualString", + "auto": true, + "value": "pool.ntp.org" }, - "createdTimestamp": 1602113059824, - "lastModifiedTimestamp": 1602113059824, - "childProfileIds": [ - 2, - 5, - 10, - 12 - ] - } \ No newline at end of file + "syslogRelay": null, + "rtlsSettings": null, + "syntheticClientEnabled": true, + "ledControlEnabled": true, + "equipmentDiscovery": false, + "radioMap": { + "is2dot4GHz": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + }, + "is5GHzU": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + }, + "is5GHzL": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + } + }, + "profileType": "equipment_ap" + }, + "createdTimestamp": 1602182806348, + "lastModifiedTimestamp": 1602182806348, + "childProfileIds": [ + 2, + 5, + 11, + 13 + ] +} \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileCaptive.json b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileCaptive.json index 9f3b89e..e7766c9 100644 --- a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileCaptive.json +++ b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileCaptive.json @@ -1,11 +1,10 @@ -[ - { - "model_type": "Profile", - "id": 2, - "customerId": 2, - "profileType": "captive_portal", - "name": "Captive-portal", - "details": { +{ + "model_type": "Profile", + "id": 14, + "customerId": 2, + "profileType": "captive_portal", + "name": "Captive-portal", + "details": { "model_type": "CaptivePortalConfiguration", "name": "Captive-portal", "browserTitle": "Access the network as Guest", @@ -18,7 +17,15 @@ "logoFile": null, "backgroundFile": null, "walledGardenAllowlist": [], - "usernamePasswordFile": null, + "usernamePasswordFile": { + "model_type": "ManagedFileInfo", + "md5checksum": null, + "lastModifiedTimestamp": null, + "apExportUrl": "userList", + "fileCategory": "UsernamePasswordList", + "fileType": "TEXT", + "altSlot": true + }, "authenticationType": "guest", "radiusAuthMethod": "CHAP", "maxUsersWithSameCredentials": 42, @@ -27,12 +34,100 @@ "backgroundRepeat": "no_repeat", "radiusServiceName": null, "expiryType": "unlimited", - "userList": [], + "userList": [ + { + "model_type": "TimedAccessUserRecord", + "username": "customer", + "password": "testing123", + "activationTime": 1602183994956, + "expirationTime": 1602212794956, + "numDevices": 1, + "userDetails": { + "model_type": "TimedAccessUserDetails", + "firstName": "Pac", + "lastName": "Man", + "passwordNeedsReset": false + }, + "userMacAddresses": [ + { + "model_type": "MacAddress", + "address": "fKtg5upO", + "addressAsString": "7c:ab:60:e6:ea:4e" + } + ], + "lastModifiedTimestamp": 0 + }, + { + "model_type": "TimedAccessUserRecord", + "username": "customer", + "password": "testing123", + "activationTime": 1602183994957, + "expirationTime": 1602187594957, + "numDevices": 0, + "userDetails": { + "model_type": "TimedAccessUserDetails", + "firstName": "Q", + "lastName": "Bert", + "passwordNeedsReset": false + }, + "userMacAddresses": [ + { + "model_type": "MacAddress", + "address": "wJrQdqho", + "addressAsString": "c0:9a:d0:76:a8:68" + } + ], + "lastModifiedTimestamp": 0 + }, + { + "model_type": "TimedAccessUserRecord", + "username": "customer2", + "password": "testing1234", + "activationTime": 1602183994957, + "expirationTime": 1602788794957, + "numDevices": 1, + "userDetails": { + "model_type": "TimedAccessUserDetails", + "firstName": "Duke", + "lastName": "Nukem", + "passwordNeedsReset": false + }, + "userMacAddresses": [ + { + "model_type": "MacAddress", + "address": "fKtg5upN", + "addressAsString": "7c:ab:60:e6:ea:4d" + } + ], + "lastModifiedTimestamp": 0 + }, + { + "model_type": "TimedAccessUserRecord", + "username": "customer2", + "password": "testing1234", + "activationTime": 1602183994957, + "expirationTime": 1602270394957, + "numDevices": 0, + "userDetails": { + "model_type": "TimedAccessUserDetails", + "firstName": "Missile", + "lastName": "Commander", + "passwordNeedsReset": false + }, + "userMacAddresses": [ + { + "model_type": "MacAddress", + "address": "wJrQdqhj", + "addressAsString": "c0:9a:d0:76:a8:63" + } + ], + "lastModifiedTimestamp": 0 + } + ], "macAllowList": [], "profileType": "captive_portal" - }, - "createdTimestamp": 1595341820188, - "lastModifiedTimestamp": 1595341820188, - "childProfileIds": [] - } -] \ No newline at end of file + }, + "createdTimestamp": 1602183994959, + "lastModifiedTimestamp": 1602183994959, + "childProfileIds": [] +} \ 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 de2aa3d..6561bc9 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,83 +1,72 @@ [ { - "model_type": "Profile", - "id": 9, - "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, - "associatedAccessSsidNames": [ - "TipWlan-cloud-hotspot-access" - ], - "osuSsidName": "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" - } - ], - "operatorProfileName": "TipWlan-Hotspot20-Operator", - "venueProfileName": "TipWlan-Hotspot20-Venue", - "idProviderProfileNames": [ - "TipWlan-Hotspot20-OSU-Provider" - ], - "profileType": "hotspot_2pt0", - "mccMncList": "302,720", - "associatedSsids": [ - "TipWlan-cloud-hotspot-access" - ] + "model_type": "Profile", + "id": 10, + "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 }, - "createdTimestamp": 1602113059532, - "lastModifiedTimestamp": 1602113059532, - "childProfileIds": [ - 6, - 7, - 8 + "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, + "associatedAccessSsidNames": [ + "TipWlan-cloud-hotspot-access" + ], + "osuSsidName": "TipWlan-cloud-3-radios", + "operatorProfileName": "TipWlan-Hotspot20-Operator", + "venueProfileName": "TipWlan-Hotspot20-Venue", + "idProviderProfileNames": [ + "TipWlan-Hotspot20-OSU-Provider-2", + "TipWlan-Hotspot20-OSU-Provider" + ], + "profileType": "hotspot_2pt0", + "associatedSsids": [ + "TipWlan-cloud-hotspot-access" ] - } + }, + "createdTimestamp": 1602182806040, + "lastModifiedTimestamp": 1602182806040, + "childProfileIds": [ + 6, + 7, + 8, + 9 + ] +} ] \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileIdProvider.json b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileIdProvider.json index b12abad..01d4a9a 100644 --- a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileIdProvider.json +++ b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileIdProvider.json @@ -1,111 +1,262 @@ [ { - "model_type": "Profile", - "id": 8, - "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" + "model_type": "Profile", + "id": 8, + "customerId": 2, + "profileType": "id_provider", + "name": "TipWlan-Hotspot20-OSU-Provider", + "details": { + "model_type": "Hotspot20IdProviderProfile", + "domainName": "rogers.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": [ + "rogers.com" + ], + "encoding": 0, + "eapMethods": [ + "EAP-TTLS with username/password", + "EAP-TLS with certificate" + ], + "eapMap": { + "EAP-TTLS with username/password": [ + "Credential Type:username/password", + "Non-EAP Inner Authentication Type:MSCHAPV2" ], - "encoding": 0, - "eapMethods": [ - "EAP-TTLS with username/password", - "EAP-TLS with certificate" + "EAP-TLS with certificate": [ + "Credential Type:Certificate" + ] + } + } + ], + "osuIconList": [ + { + "model_type": "OsuIcon", + "iconWidth": 32, + "iconHeight": 32, + "languageCode": "eng", + "iconLocale": "en_CA", + "iconName": "icon32eng", + "filePath": "/tmp/icon32eng.png", + "imageUrl": "https://localhost:9096/icon32eng.png", + "hs20IconString": "32:32:eng:image/png:icon32eng:/tmp/icon32eng.png" + }, + { + "model_type": "OsuIcon", + "iconWidth": 32, + "iconHeight": 32, + "languageCode": "fra", + "iconLocale": "fr_CA", + "iconName": "icon32fra", + "filePath": "/tmp/icon32fra.png", + "imageUrl": "https://localhost:9096/icon32fra.png", + "hs20IconString": "32:32:fra:image/png:icon32fra:/tmp/icon32fra.png" + }, + { + "model_type": "OsuIcon", + "iconWidth": 32, + "iconHeight": 32, + "languageCode": "eng", + "iconLocale": "en_US", + "iconName": "icon32usa", + "filePath": "/tmp/icon32usa.png", + "imageUrl": "https://localhost:9096/icon32usa.png", + "hs20IconString": "32:32:eng:image/png:icon32usa:/tmp/icon32usa.png" + } + ], + "radiusProfileAuth": "Radius-Profile", + "radiusProfileAccounting": "Radius-Profile", + "osuSsid": "TipWlan-cloud-3-radios", + "osuServerUri": "https://example.com/osu/rogers/", + "osuFriendlyName": [ + { + "model_type": "Hotspot20Duple", + "locale": "en_CA", + "dupleIso3Language": "eng", + "dupleName": "Example provider rogers", + "defaultDupleSeparator": ":", + "asDuple": "eng:Example provider rogers" + }, + { + "model_type": "Hotspot20Duple", + "locale": "fr_CA", + "dupleIso3Language": "fra", + "dupleName": "Exemple de fournisseur rogers", + "defaultDupleSeparator": ":", + "asDuple": "fra:Exemple de fournisseur rogers" + } + ], + "osuNaiStandalone": "anonymous@rogers.com", + "osuNaiShared": "anonymous@rogers.com", + "osuMethodList": [ + 1, + 0 + ], + "osuServiceDescription": [ + { + "model_type": "Hotspot20Duple", + "locale": "en_CA", + "dupleIso3Language": "eng", + "dupleName": "Example services rogers", + "defaultDupleSeparator": ":", + "asDuple": "eng:Example services rogers" + }, + { + "model_type": "Hotspot20Duple", + "locale": "fr_CA", + "dupleIso3Language": "fra", + "dupleName": "Exemples de services rogers", + "defaultDupleSeparator": ":", + "asDuple": "fra:Exemples de services rogers" + } + ], + "profileType": "id_provider" + }, + "createdTimestamp": 1602182805654, + "lastModifiedTimestamp": 1602182805654, + "childProfileIds": [] +}, +{ + "model_type": "Profile", + "id": 9, + "customerId": 2, + "profileType": "id_provider", + "name": "TipWlan-Hotspot20-OSU-Provider-2", + "details": { + "model_type": "Hotspot20IdProviderProfile", + "domainName": "telus.com", + "mccMncList": [ + { + "model_type": "MccMnc", + "mcc": 302, + "mnc": 220, + "iso": "ca", + "country": "Canada", + "countryCode": 1, + "network": "Telus Mobility", + "mccMncPairing": "302,220" + } + ], + "naiRealmList": [ + { + "model_type": "NaiRealmInformation", + "naiRealms": [ + "telus.com" + ], + "encoding": 0, + "eapMethods": [ + "EAP-TTLS with username/password", + "EAP-TLS with certificate" + ], + "eapMap": { + "EAP-TTLS with username/password": [ + "Credential Type:username/password", + "Non-EAP Inner Authentication Type:MSCHAPV2" ], - "eapMap": { - "EAP-TTLS with username/password": [ - "Credential Type:username/password", - "Non-EAP Inner Authentication Type:MSCHAPV2" - ], - "EAP-TLS with certificate": [ - "Credential Type:Certificate" - ] - } + "EAP-TLS with certificate": [ + "Credential Type:Certificate" + ] } - ], - "osuIconList": [ - { - "model_type": "OsuIcon", - "iconWidth": 32, - "iconHeight": 32, - "languageCode": "eng", - "iconLocale": "en_CA", - "iconName": "icon32.png", - "filePath": "/tmp/icon32.png", - "imageUrl": "https://localhost:9096", - "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" - }, - { - "model_type": "Hotspot20Duple", - "locale": "fr_CA", - "dupleIso3Language": "fra", - "dupleName": "Exemple de fournisseur", - "defaultDupleSeparator": ":", - "asDuple": "fra:Exemple de fournisseur" - } - ], - "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": 1602113059086, - "lastModifiedTimestamp": 1602113059086, - "childProfileIds": [] - } + } + ], + "osuIconList": [ + { + "model_type": "OsuIcon", + "iconWidth": 32, + "iconHeight": 32, + "languageCode": "eng", + "iconLocale": "en_CA", + "iconName": "icon32eng", + "filePath": "/tmp/icon32eng.png", + "imageUrl": "https://localhost:9096/icon32eng.png", + "hs20IconString": "32:32:eng:image/png:icon32eng:/tmp/icon32eng.png" + }, + { + "model_type": "OsuIcon", + "iconWidth": 32, + "iconHeight": 32, + "languageCode": "fra", + "iconLocale": "fr_CA", + "iconName": "icon32fra", + "filePath": "/tmp/icon32fra.png", + "imageUrl": "https://localhost:9096/icon32fra.png", + "hs20IconString": "32:32:fra:image/png:icon32fra:/tmp/icon32fra.png" + }, + { + "model_type": "OsuIcon", + "iconWidth": 32, + "iconHeight": 32, + "languageCode": "eng", + "iconLocale": "en_US", + "iconName": "icon32usa", + "filePath": "/tmp/icon32usa.png", + "imageUrl": "https://localhost:9096/icon32usa.png", + "hs20IconString": "32:32:eng:image/png:icon32usa:/tmp/icon32usa.png" + } + ], + "radiusProfileAuth": "Radius-Profile", + "radiusProfileAccounting": "Radius-Profile", + "osuSsid": "TipWlan-cloud-3-radios", + "osuServerUri": "https://example.com/osu/telus/", + "osuFriendlyName": [ + { + "model_type": "Hotspot20Duple", + "locale": "en_CA", + "dupleIso3Language": "eng", + "dupleName": "Example provider telus", + "defaultDupleSeparator": ":", + "asDuple": "eng:Example provider telus" + }, + { + "model_type": "Hotspot20Duple", + "locale": "fr_CA", + "dupleIso3Language": "fra", + "dupleName": "Exemple de fournisseur telus", + "defaultDupleSeparator": ":", + "asDuple": "fra:Exemple de fournisseur telus" + } + ], + "osuNaiStandalone": "anonymous@telus.com", + "osuNaiShared": "anonymous@telus.com", + "osuMethodList": [ + 1, + 0 + ], + "osuServiceDescription": [ + { + "model_type": "Hotspot20Duple", + "locale": "en_CA", + "dupleIso3Language": "eng", + "dupleName": "Example services telus", + "defaultDupleSeparator": ":", + "asDuple": "eng:Example services telus" + }, + { + "model_type": "Hotspot20Duple", + "locale": "fr_CA", + "dupleIso3Language": "fra", + "dupleName": "Exemples de services telus", + "defaultDupleSeparator": ":", + "asDuple": "fra:Exemples de services telus" + } + ], + "profileType": "id_provider" + }, + "createdTimestamp": 1602182805660, + "lastModifiedTimestamp": 1602182805660, + "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 9efbb54..d76c61e 100644 --- a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileRf.json +++ b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileRf.json @@ -1,256 +1,256 @@ - { - "model_type": "Profile", - "id": 12, - "customerId": 2, - "profileType": "rf", - "name": "TipWlan-rf", - "details": { - "model_type": "RfConfiguration", - "rfConfigMap": { - "is5GHz": { - "model_type": "RfElementConfiguration", - "rf": "TipWlan-rf", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is80MHz", - "mimoMode": "twoByTwo", - "maxNumClients": 100, - "multicastRate": "auto", - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "managementRate": "auto", - "rxCellSizeDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "eirpTxPower": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": 18 - }, - "bestApEnabled": null, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } +{ + "model_type": "Profile", + "id": 13, + "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 }, - "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 - } + "managementRate": "auto", + "rxCellSizeDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 }, - "is5GHzU": { - "model_type": "RfElementConfiguration", - "rf": "TipWlan-rf", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is80MHz", - "mimoMode": "twoByTwo", - "maxNumClients": 100, - "multicastRate": "auto", - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "managementRate": "auto", - "rxCellSizeDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "eirpTxPower": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": 18 - }, - "bestApEnabled": null, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } + "probeResponseThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 }, - "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 - } + "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" + "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 + } + } }, - "createdTimestamp": 1602113059555, - "lastModifiedTimestamp": 1602113059555, - "childProfileIds": [] - } \ No newline at end of file + "profileType": "rf" + }, + "createdTimestamp": 1602182806063, + "lastModifiedTimestamp": 1602182806063, + "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 30b8275..101e9c9 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,134 +1,135 @@ [ - { - "model_type": "Profile", - "id": 5, - "customerId": 2, - "profileType": "ssid", - "name": "TipWlan-cloud-hotspot-access", - "details": { - "model_type": "SsidConfiguration", - "ssid": "TipWlan-cloud-hotspot-access", - "appliedRadios": [ - "is5GHzU", - "is5GHzL", - "is2dot4GHz" - ], - "ssidAdminState": "enabled", - "secureMode": "wpa2PSK", - "vlanId": 1, - "keyStr": "testing123", - "broadcastSsid": "enabled", - "keyRefresh": 0, - "noLocalSubnets": false, - "radiusServiceName": null, - "captivePortalId": null, - "bandwidthLimitDown": 0, - "bandwidthLimitUp": 0, - "clientBandwidthLimitDown": 0, - "clientBandwidthLimitUp": 0, - "videoTrafficOnly": false, - "radioBasedConfigs": { - "is5GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "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": 1602113058718, - "lastModifiedTimestamp": 1602113059547, - "childProfileIds": [ - 9 - ] - }, - { - "model_type": "Profile", - "id": 10, - "customerId": 2, - "profileType": "ssid", - "name": "TipWlan-cloud-3-radios", - "details": { - "model_type": "SsidConfiguration", - "ssid": "TipWlan-cloud-3-radios", - "appliedRadios": [ - "is5GHzU", - "is5GHzL", - "is2dot4GHz" - ], - "ssidAdminState": "enabled", - "secureMode": "open", - "vlanId": 1, - "keyStr": null, - "broadcastSsid": "enabled", - "keyRefresh": 0, - "noLocalSubnets": false, - "radiusServiceName": null, - "captivePortalId": null, - "bandwidthLimitDown": 0, - "bandwidthLimitUp": 0, - "clientBandwidthLimitDown": 0, - "clientBandwidthLimitUp": 0, - "videoTrafficOnly": false, - "radioBasedConfigs": { - "is5GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is2dot4GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzU": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzL": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - } - }, - "bonjourGatewayProfileId": null, - "enable80211w": null, - "wepConfig": null, - "forwardMode": null, - "profileType": "ssid" - }, - "createdTimestamp": 1602113059549, - "lastModifiedTimestamp": 1602113059549, - "childProfileIds": [ - 8 - ] - } + { + "model_type": "Profile", + "id": 5, + "customerId": 2, + "profileType": "ssid", + "name": "TipWlan-cloud-hotspot-access", + "details": { + "model_type": "SsidConfiguration", + "ssid": "TipWlan-cloud-hotspot-access", + "appliedRadios": [ + "is5GHzU", + "is5GHzL", + "is2dot4GHz" + ], + "ssidAdminState": "enabled", + "secureMode": "wpa2PSK", + "vlanId": 1, + "keyStr": "testing123", + "broadcastSsid": "enabled", + "keyRefresh": 0, + "noLocalSubnets": false, + "radiusServiceName": null, + "captivePortalId": null, + "bandwidthLimitDown": 0, + "bandwidthLimitUp": 0, + "clientBandwidthLimitDown": 0, + "clientBandwidthLimitUp": 0, + "videoTrafficOnly": false, + "radioBasedConfigs": { + "is5GHz": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + }, + "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": 1602113058718, + "lastModifiedTimestamp": 1602113059547, + "childProfileIds": [ + 10 + ] + }, + { + "model_type": "Profile", + "id": 11, + "customerId": 2, + "profileType": "ssid", + "name": "TipWlan-cloud-3-radios", + "details": { + "model_type": "SsidConfiguration", + "ssid": "TipWlan-cloud-3-radios", + "appliedRadios": [ + "is5GHzL", + "is2dot4GHz", + "is5GHzU" + ], + "ssidAdminState": "enabled", + "secureMode": "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": 1602183994766, + "lastModifiedTimestamp": 1602183994766, + "childProfileIds": [ + 8, + 9 + ] + } ] 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 c57203d..5b894a2 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,50 +1,50 @@ { - "model_type": "Profile", - "id": 16, - "customerId": 2, - "profileType": "equipment_ap", - "name": "ApProfile-3-radios", - "details": { - "model_type": "ApNetworkConfiguration", - "networkConfigVersion": "AP-1", - "equipmentType": "AP", - "vlanNative": true, - "vlan": 0, - "ntpServer": { - "model_type": "AutoOrManualString", - "auto": true, - "value": "pool.ntp.org" - }, - "syslogRelay": null, - "rtlsSettings": null, - "syntheticClientEnabled": true, - "ledControlEnabled": true, - "equipmentDiscovery": false, - "radioMap": { - "is2dot4GHz": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is5GHzU": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is5GHzL": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - } - }, - "profileType": "equipment_ap" + "model_type": "Profile", + "id": 17, + "customerId": 2, + "profileType": "equipment_ap", + "name": "ApProfile-3-radios", + "details": { + "model_type": "ApNetworkConfiguration", + "networkConfigVersion": "AP-1", + "equipmentType": "AP", + "vlanNative": true, + "vlan": 0, + "ntpServer": { + "model_type": "AutoOrManualString", + "auto": true, + "value": "pool.ntp.org" }, - "createdTimestamp": 1602113059824, - "lastModifiedTimestamp": 1602113059824, - "childProfileIds": [ - 2, - 5, - 10, - 12 - ] - } \ No newline at end of file + "syslogRelay": null, + "rtlsSettings": null, + "syntheticClientEnabled": true, + "ledControlEnabled": true, + "equipmentDiscovery": false, + "radioMap": { + "is2dot4GHz": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + }, + "is5GHzU": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + }, + "is5GHzL": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + } + }, + "profileType": "equipment_ap" + }, + "createdTimestamp": 1602182806348, + "lastModifiedTimestamp": 1602182806348, + "childProfileIds": [ + 2, + 5, + 11, + 13 + ] +} \ No newline at end of file diff --git a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileCaptive.json b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileCaptive.json new file mode 100644 index 0000000..e7766c9 --- /dev/null +++ b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileCaptive.json @@ -0,0 +1,133 @@ +{ + "model_type": "Profile", + "id": 14, + "customerId": 2, + "profileType": "captive_portal", + "name": "Captive-portal", + "details": { + "model_type": "CaptivePortalConfiguration", + "name": "Captive-portal", + "browserTitle": "Access the network as Guest", + "headerContent": "Captive Portal", + "userAcceptancePolicy": "Use this network at your own risk. No warranty of any kind.", + "successPageMarkdownText": "Welcome to the network", + "redirectURL": "", + "externalCaptivePortalURL": null, + "sessionTimeoutInMinutes": 60, + "logoFile": null, + "backgroundFile": null, + "walledGardenAllowlist": [], + "usernamePasswordFile": { + "model_type": "ManagedFileInfo", + "md5checksum": null, + "lastModifiedTimestamp": null, + "apExportUrl": "userList", + "fileCategory": "UsernamePasswordList", + "fileType": "TEXT", + "altSlot": true + }, + "authenticationType": "guest", + "radiusAuthMethod": "CHAP", + "maxUsersWithSameCredentials": 42, + "externalPolicyFile": null, + "backgroundPosition": "left_top", + "backgroundRepeat": "no_repeat", + "radiusServiceName": null, + "expiryType": "unlimited", + "userList": [ + { + "model_type": "TimedAccessUserRecord", + "username": "customer", + "password": "testing123", + "activationTime": 1602183994956, + "expirationTime": 1602212794956, + "numDevices": 1, + "userDetails": { + "model_type": "TimedAccessUserDetails", + "firstName": "Pac", + "lastName": "Man", + "passwordNeedsReset": false + }, + "userMacAddresses": [ + { + "model_type": "MacAddress", + "address": "fKtg5upO", + "addressAsString": "7c:ab:60:e6:ea:4e" + } + ], + "lastModifiedTimestamp": 0 + }, + { + "model_type": "TimedAccessUserRecord", + "username": "customer", + "password": "testing123", + "activationTime": 1602183994957, + "expirationTime": 1602187594957, + "numDevices": 0, + "userDetails": { + "model_type": "TimedAccessUserDetails", + "firstName": "Q", + "lastName": "Bert", + "passwordNeedsReset": false + }, + "userMacAddresses": [ + { + "model_type": "MacAddress", + "address": "wJrQdqho", + "addressAsString": "c0:9a:d0:76:a8:68" + } + ], + "lastModifiedTimestamp": 0 + }, + { + "model_type": "TimedAccessUserRecord", + "username": "customer2", + "password": "testing1234", + "activationTime": 1602183994957, + "expirationTime": 1602788794957, + "numDevices": 1, + "userDetails": { + "model_type": "TimedAccessUserDetails", + "firstName": "Duke", + "lastName": "Nukem", + "passwordNeedsReset": false + }, + "userMacAddresses": [ + { + "model_type": "MacAddress", + "address": "fKtg5upN", + "addressAsString": "7c:ab:60:e6:ea:4d" + } + ], + "lastModifiedTimestamp": 0 + }, + { + "model_type": "TimedAccessUserRecord", + "username": "customer2", + "password": "testing1234", + "activationTime": 1602183994957, + "expirationTime": 1602270394957, + "numDevices": 0, + "userDetails": { + "model_type": "TimedAccessUserDetails", + "firstName": "Missile", + "lastName": "Commander", + "passwordNeedsReset": false + }, + "userMacAddresses": [ + { + "model_type": "MacAddress", + "address": "wJrQdqhj", + "addressAsString": "c0:9a:d0:76:a8:63" + } + ], + "lastModifiedTimestamp": 0 + } + ], + "macAllowList": [], + "profileType": "captive_portal" + }, + "createdTimestamp": 1602183994959, + "lastModifiedTimestamp": 1602183994959, + "childProfileIds": [] +} \ 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 de2aa3d..6561bc9 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,83 +1,72 @@ [ { - "model_type": "Profile", - "id": 9, - "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, - "associatedAccessSsidNames": [ - "TipWlan-cloud-hotspot-access" - ], - "osuSsidName": "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" - } - ], - "operatorProfileName": "TipWlan-Hotspot20-Operator", - "venueProfileName": "TipWlan-Hotspot20-Venue", - "idProviderProfileNames": [ - "TipWlan-Hotspot20-OSU-Provider" - ], - "profileType": "hotspot_2pt0", - "mccMncList": "302,720", - "associatedSsids": [ - "TipWlan-cloud-hotspot-access" - ] + "model_type": "Profile", + "id": 10, + "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 }, - "createdTimestamp": 1602113059532, - "lastModifiedTimestamp": 1602113059532, - "childProfileIds": [ - 6, - 7, - 8 + "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, + "associatedAccessSsidNames": [ + "TipWlan-cloud-hotspot-access" + ], + "osuSsidName": "TipWlan-cloud-3-radios", + "operatorProfileName": "TipWlan-Hotspot20-Operator", + "venueProfileName": "TipWlan-Hotspot20-Venue", + "idProviderProfileNames": [ + "TipWlan-Hotspot20-OSU-Provider-2", + "TipWlan-Hotspot20-OSU-Provider" + ], + "profileType": "hotspot_2pt0", + "associatedSsids": [ + "TipWlan-cloud-hotspot-access" ] - } + }, + "createdTimestamp": 1602182806040, + "lastModifiedTimestamp": 1602182806040, + "childProfileIds": [ + 6, + 7, + 8, + 9 + ] +} ] \ No newline at end of file diff --git a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileIdProvider.json b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileIdProvider.json index b12abad..01d4a9a 100644 --- a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileIdProvider.json +++ b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileIdProvider.json @@ -1,111 +1,262 @@ [ { - "model_type": "Profile", - "id": 8, - "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" + "model_type": "Profile", + "id": 8, + "customerId": 2, + "profileType": "id_provider", + "name": "TipWlan-Hotspot20-OSU-Provider", + "details": { + "model_type": "Hotspot20IdProviderProfile", + "domainName": "rogers.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": [ + "rogers.com" + ], + "encoding": 0, + "eapMethods": [ + "EAP-TTLS with username/password", + "EAP-TLS with certificate" + ], + "eapMap": { + "EAP-TTLS with username/password": [ + "Credential Type:username/password", + "Non-EAP Inner Authentication Type:MSCHAPV2" ], - "encoding": 0, - "eapMethods": [ - "EAP-TTLS with username/password", - "EAP-TLS with certificate" + "EAP-TLS with certificate": [ + "Credential Type:Certificate" + ] + } + } + ], + "osuIconList": [ + { + "model_type": "OsuIcon", + "iconWidth": 32, + "iconHeight": 32, + "languageCode": "eng", + "iconLocale": "en_CA", + "iconName": "icon32eng", + "filePath": "/tmp/icon32eng.png", + "imageUrl": "https://localhost:9096/icon32eng.png", + "hs20IconString": "32:32:eng:image/png:icon32eng:/tmp/icon32eng.png" + }, + { + "model_type": "OsuIcon", + "iconWidth": 32, + "iconHeight": 32, + "languageCode": "fra", + "iconLocale": "fr_CA", + "iconName": "icon32fra", + "filePath": "/tmp/icon32fra.png", + "imageUrl": "https://localhost:9096/icon32fra.png", + "hs20IconString": "32:32:fra:image/png:icon32fra:/tmp/icon32fra.png" + }, + { + "model_type": "OsuIcon", + "iconWidth": 32, + "iconHeight": 32, + "languageCode": "eng", + "iconLocale": "en_US", + "iconName": "icon32usa", + "filePath": "/tmp/icon32usa.png", + "imageUrl": "https://localhost:9096/icon32usa.png", + "hs20IconString": "32:32:eng:image/png:icon32usa:/tmp/icon32usa.png" + } + ], + "radiusProfileAuth": "Radius-Profile", + "radiusProfileAccounting": "Radius-Profile", + "osuSsid": "TipWlan-cloud-3-radios", + "osuServerUri": "https://example.com/osu/rogers/", + "osuFriendlyName": [ + { + "model_type": "Hotspot20Duple", + "locale": "en_CA", + "dupleIso3Language": "eng", + "dupleName": "Example provider rogers", + "defaultDupleSeparator": ":", + "asDuple": "eng:Example provider rogers" + }, + { + "model_type": "Hotspot20Duple", + "locale": "fr_CA", + "dupleIso3Language": "fra", + "dupleName": "Exemple de fournisseur rogers", + "defaultDupleSeparator": ":", + "asDuple": "fra:Exemple de fournisseur rogers" + } + ], + "osuNaiStandalone": "anonymous@rogers.com", + "osuNaiShared": "anonymous@rogers.com", + "osuMethodList": [ + 1, + 0 + ], + "osuServiceDescription": [ + { + "model_type": "Hotspot20Duple", + "locale": "en_CA", + "dupleIso3Language": "eng", + "dupleName": "Example services rogers", + "defaultDupleSeparator": ":", + "asDuple": "eng:Example services rogers" + }, + { + "model_type": "Hotspot20Duple", + "locale": "fr_CA", + "dupleIso3Language": "fra", + "dupleName": "Exemples de services rogers", + "defaultDupleSeparator": ":", + "asDuple": "fra:Exemples de services rogers" + } + ], + "profileType": "id_provider" + }, + "createdTimestamp": 1602182805654, + "lastModifiedTimestamp": 1602182805654, + "childProfileIds": [] +}, +{ + "model_type": "Profile", + "id": 9, + "customerId": 2, + "profileType": "id_provider", + "name": "TipWlan-Hotspot20-OSU-Provider-2", + "details": { + "model_type": "Hotspot20IdProviderProfile", + "domainName": "telus.com", + "mccMncList": [ + { + "model_type": "MccMnc", + "mcc": 302, + "mnc": 220, + "iso": "ca", + "country": "Canada", + "countryCode": 1, + "network": "Telus Mobility", + "mccMncPairing": "302,220" + } + ], + "naiRealmList": [ + { + "model_type": "NaiRealmInformation", + "naiRealms": [ + "telus.com" + ], + "encoding": 0, + "eapMethods": [ + "EAP-TTLS with username/password", + "EAP-TLS with certificate" + ], + "eapMap": { + "EAP-TTLS with username/password": [ + "Credential Type:username/password", + "Non-EAP Inner Authentication Type:MSCHAPV2" ], - "eapMap": { - "EAP-TTLS with username/password": [ - "Credential Type:username/password", - "Non-EAP Inner Authentication Type:MSCHAPV2" - ], - "EAP-TLS with certificate": [ - "Credential Type:Certificate" - ] - } + "EAP-TLS with certificate": [ + "Credential Type:Certificate" + ] } - ], - "osuIconList": [ - { - "model_type": "OsuIcon", - "iconWidth": 32, - "iconHeight": 32, - "languageCode": "eng", - "iconLocale": "en_CA", - "iconName": "icon32.png", - "filePath": "/tmp/icon32.png", - "imageUrl": "https://localhost:9096", - "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" - }, - { - "model_type": "Hotspot20Duple", - "locale": "fr_CA", - "dupleIso3Language": "fra", - "dupleName": "Exemple de fournisseur", - "defaultDupleSeparator": ":", - "asDuple": "fra:Exemple de fournisseur" - } - ], - "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": 1602113059086, - "lastModifiedTimestamp": 1602113059086, - "childProfileIds": [] - } + } + ], + "osuIconList": [ + { + "model_type": "OsuIcon", + "iconWidth": 32, + "iconHeight": 32, + "languageCode": "eng", + "iconLocale": "en_CA", + "iconName": "icon32eng", + "filePath": "/tmp/icon32eng.png", + "imageUrl": "https://localhost:9096/icon32eng.png", + "hs20IconString": "32:32:eng:image/png:icon32eng:/tmp/icon32eng.png" + }, + { + "model_type": "OsuIcon", + "iconWidth": 32, + "iconHeight": 32, + "languageCode": "fra", + "iconLocale": "fr_CA", + "iconName": "icon32fra", + "filePath": "/tmp/icon32fra.png", + "imageUrl": "https://localhost:9096/icon32fra.png", + "hs20IconString": "32:32:fra:image/png:icon32fra:/tmp/icon32fra.png" + }, + { + "model_type": "OsuIcon", + "iconWidth": 32, + "iconHeight": 32, + "languageCode": "eng", + "iconLocale": "en_US", + "iconName": "icon32usa", + "filePath": "/tmp/icon32usa.png", + "imageUrl": "https://localhost:9096/icon32usa.png", + "hs20IconString": "32:32:eng:image/png:icon32usa:/tmp/icon32usa.png" + } + ], + "radiusProfileAuth": "Radius-Profile", + "radiusProfileAccounting": "Radius-Profile", + "osuSsid": "TipWlan-cloud-3-radios", + "osuServerUri": "https://example.com/osu/telus/", + "osuFriendlyName": [ + { + "model_type": "Hotspot20Duple", + "locale": "en_CA", + "dupleIso3Language": "eng", + "dupleName": "Example provider telus", + "defaultDupleSeparator": ":", + "asDuple": "eng:Example provider telus" + }, + { + "model_type": "Hotspot20Duple", + "locale": "fr_CA", + "dupleIso3Language": "fra", + "dupleName": "Exemple de fournisseur telus", + "defaultDupleSeparator": ":", + "asDuple": "fra:Exemple de fournisseur telus" + } + ], + "osuNaiStandalone": "anonymous@telus.com", + "osuNaiShared": "anonymous@telus.com", + "osuMethodList": [ + 1, + 0 + ], + "osuServiceDescription": [ + { + "model_type": "Hotspot20Duple", + "locale": "en_CA", + "dupleIso3Language": "eng", + "dupleName": "Example services telus", + "defaultDupleSeparator": ":", + "asDuple": "eng:Example services telus" + }, + { + "model_type": "Hotspot20Duple", + "locale": "fr_CA", + "dupleIso3Language": "fra", + "dupleName": "Exemples de services telus", + "defaultDupleSeparator": ":", + "asDuple": "fra:Exemples de services telus" + } + ], + "profileType": "id_provider" + }, + "createdTimestamp": 1602182805660, + "lastModifiedTimestamp": 1602182805660, + "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 9efbb54..d76c61e 100644 --- a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileRf.json +++ b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileRf.json @@ -1,256 +1,256 @@ - { - "model_type": "Profile", - "id": 12, - "customerId": 2, - "profileType": "rf", - "name": "TipWlan-rf", - "details": { - "model_type": "RfConfiguration", - "rfConfigMap": { - "is5GHz": { - "model_type": "RfElementConfiguration", - "rf": "TipWlan-rf", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is80MHz", - "mimoMode": "twoByTwo", - "maxNumClients": 100, - "multicastRate": "auto", - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "managementRate": "auto", - "rxCellSizeDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "eirpTxPower": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": 18 - }, - "bestApEnabled": null, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } +{ + "model_type": "Profile", + "id": 13, + "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 }, - "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 - } + "managementRate": "auto", + "rxCellSizeDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 }, - "is5GHzU": { - "model_type": "RfElementConfiguration", - "rf": "TipWlan-rf", - "beaconInterval": 100, - "forceScanDuringVoice": "disabled", - "rtsCtsThreshold": 65535, - "channelBandwidth": "is80MHz", - "mimoMode": "twoByTwo", - "maxNumClients": 100, - "multicastRate": "auto", - "autoChannelSelection": false, - "activeScanSettings": { - "model_type": "ActiveScanSettings", - "enabled": true, - "scanFrequencySeconds": 10, - "scanDurationMillis": 65 - }, - "managementRate": "auto", - "rxCellSizeDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": -90 - }, - "eirpTxPower": { - "model_type": "AutoOrManualValue", - "auto": true, - "value": 18 - }, - "bestApEnabled": null, - "neighbouringListApConfig": { - "model_type": "NeighbouringAPListConfiguration", - "minSignal": -85, - "maxAps": 25 - }, - "perimeterDetectionEnabled": true, - "channelHopSettings": { - "model_type": "ChannelHopSettings", - "noiseFloorThresholdInDB": -75, - "noiseFloorThresholdTimeInSeconds": 180, - "nonWifiThresholdInPercentage": 50, - "nonWifiThresholdTimeInSeconds": 180, - "obssHopMode": "NON_WIFI" - }, - "bestApSettings": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } + "probeResponseThresholdDb": { + "model_type": "AutoOrManualValue", + "auto": true, + "value": -90 }, - "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 - } + "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" + "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 + } + } }, - "createdTimestamp": 1602113059555, - "lastModifiedTimestamp": 1602113059555, - "childProfileIds": [] - } \ No newline at end of file + "profileType": "rf" + }, + "createdTimestamp": 1602182806063, + "lastModifiedTimestamp": 1602182806063, + "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 30b8275..101e9c9 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,134 +1,135 @@ [ - { - "model_type": "Profile", - "id": 5, - "customerId": 2, - "profileType": "ssid", - "name": "TipWlan-cloud-hotspot-access", - "details": { - "model_type": "SsidConfiguration", - "ssid": "TipWlan-cloud-hotspot-access", - "appliedRadios": [ - "is5GHzU", - "is5GHzL", - "is2dot4GHz" - ], - "ssidAdminState": "enabled", - "secureMode": "wpa2PSK", - "vlanId": 1, - "keyStr": "testing123", - "broadcastSsid": "enabled", - "keyRefresh": 0, - "noLocalSubnets": false, - "radiusServiceName": null, - "captivePortalId": null, - "bandwidthLimitDown": 0, - "bandwidthLimitUp": 0, - "clientBandwidthLimitDown": 0, - "clientBandwidthLimitUp": 0, - "videoTrafficOnly": false, - "radioBasedConfigs": { - "is5GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "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": 1602113058718, - "lastModifiedTimestamp": 1602113059547, - "childProfileIds": [ - 9 - ] - }, - { - "model_type": "Profile", - "id": 10, - "customerId": 2, - "profileType": "ssid", - "name": "TipWlan-cloud-3-radios", - "details": { - "model_type": "SsidConfiguration", - "ssid": "TipWlan-cloud-3-radios", - "appliedRadios": [ - "is5GHzU", - "is5GHzL", - "is2dot4GHz" - ], - "ssidAdminState": "enabled", - "secureMode": "open", - "vlanId": 1, - "keyStr": null, - "broadcastSsid": "enabled", - "keyRefresh": 0, - "noLocalSubnets": false, - "radiusServiceName": null, - "captivePortalId": null, - "bandwidthLimitDown": 0, - "bandwidthLimitUp": 0, - "clientBandwidthLimitDown": 0, - "clientBandwidthLimitUp": 0, - "videoTrafficOnly": false, - "radioBasedConfigs": { - "is5GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is2dot4GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzU": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzL": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - } - }, - "bonjourGatewayProfileId": null, - "enable80211w": null, - "wepConfig": null, - "forwardMode": null, - "profileType": "ssid" - }, - "createdTimestamp": 1602113059549, - "lastModifiedTimestamp": 1602113059549, - "childProfileIds": [ - 8 - ] - } + { + "model_type": "Profile", + "id": 5, + "customerId": 2, + "profileType": "ssid", + "name": "TipWlan-cloud-hotspot-access", + "details": { + "model_type": "SsidConfiguration", + "ssid": "TipWlan-cloud-hotspot-access", + "appliedRadios": [ + "is5GHzU", + "is5GHzL", + "is2dot4GHz" + ], + "ssidAdminState": "enabled", + "secureMode": "wpa2PSK", + "vlanId": 1, + "keyStr": "testing123", + "broadcastSsid": "enabled", + "keyRefresh": 0, + "noLocalSubnets": false, + "radiusServiceName": null, + "captivePortalId": null, + "bandwidthLimitDown": 0, + "bandwidthLimitUp": 0, + "clientBandwidthLimitDown": 0, + "clientBandwidthLimitUp": 0, + "videoTrafficOnly": false, + "radioBasedConfigs": { + "is5GHz": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + }, + "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": 1602113058718, + "lastModifiedTimestamp": 1602113059547, + "childProfileIds": [ + 10 + ] + }, + { + "model_type": "Profile", + "id": 11, + "customerId": 2, + "profileType": "ssid", + "name": "TipWlan-cloud-3-radios", + "details": { + "model_type": "SsidConfiguration", + "ssid": "TipWlan-cloud-3-radios", + "appliedRadios": [ + "is5GHzL", + "is2dot4GHz", + "is5GHzU" + ], + "ssidAdminState": "enabled", + "secureMode": "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": 1602183994766, + "lastModifiedTimestamp": 1602183994766, + "childProfileIds": [ + 8, + 9 + ] + } ] 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 3fa2376..953bf28 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 @@ -78,6 +78,9 @@ import com.telecominfraproject.wlan.profile.models.common.ManagedFileInfo; import com.telecominfraproject.wlan.profile.network.models.ApNetworkConfiguration; import com.telecominfraproject.wlan.profile.passpoint.hotspot.models.Hotspot2Profile; import com.telecominfraproject.wlan.profile.passpoint.models.Hotspot20Duple; +import com.telecominfraproject.wlan.profile.passpoint.models.IPv4PasspointAddressType; +import com.telecominfraproject.wlan.profile.passpoint.models.IPv6PasspointAddressType; +import com.telecominfraproject.wlan.profile.passpoint.models.MccMnc; import com.telecominfraproject.wlan.profile.passpoint.operator.models.OperatorProfile; import com.telecominfraproject.wlan.profile.passpoint.provider.models.AuthenticationParameterTypes; import com.telecominfraproject.wlan.profile.passpoint.provider.models.CredentialType; @@ -3439,32 +3442,32 @@ public class OvsdbDao { if (hs20cfg.getHotspot20ProfileSet() != null) { List operations = new ArrayList<>(); for (Profile hotspotProfile : hs20cfg.getHotspot20ProfileSet()) { - + Hotspot2Profile hs2Profile = (Hotspot2Profile) hotspotProfile.getDetails(); - + Profile operator = hs20cfg.getHotspot20OperatorSet().stream().filter(new Predicate() { - @Override - public boolean test(Profile t) { - return t.getName().equals(hs2Profile.getOperatorProfileName()); - } - + @Override + public boolean test(Profile t) { + return t.getName().equals(hs2Profile.getOperatorProfileName()); + } + }).findFirst().get(); - - OperatorProfile operatorProfile = (OperatorProfile)operator.getDetails(); + + OperatorProfile operatorProfile = (OperatorProfile) operator.getDetails(); Profile venue = hs20cfg.getHotspot20VenueSet().stream().filter(new Predicate() { - @Override - public boolean test(Profile t) { - return t.getName().equals(hs2Profile.getVenueProfileName()); - } - + @Override + public boolean test(Profile t) { + return t.getName().equals(hs2Profile.getVenueProfileName()); + } + }).findFirst().get(); - - VenueProfile venueProfile = (VenueProfile)venue.getDetails(); - + + VenueProfile venueProfile = (VenueProfile) venue.getDetails(); + Map rowColumns = new HashMap<>(); @@ -3484,21 +3487,40 @@ public class OvsdbDao { Set osuProvidersUuids = new HashSet<>(); Set osuIconUuids = new HashSet<>(); + Set> domainNames = new HashSet<>(); + StringBuffer mccMncBuffer = new StringBuffer(); + Set> naiRealms = new HashSet<>(); for (Profile provider : providerList) { Hotspot20IdProviderProfile providerProfile = (Hotspot20IdProviderProfile) provider .getDetails(); if (osuProviders.containsKey(providerProfile.getOsuServerUri())) { - osuProvidersUuids.add(osuProviders.get(providerProfile.getOsuServerUri()).uuid); - osuIconUuids.addAll(osuProviders.get(providerProfile.getOsuServerUri()).osuIcons); - getNaiRealms(providerProfile, rowColumns); + Hotspot20OsuProviders hotspot2OsuProviders = osuProviders + .get(providerProfile.getOsuServerUri()); -// osuProviders.get(providerProfile.getOsuServerUri()).osuNai.stream().forEach(n -> { -// osuNai.add(new Atom(n)); -// }); + osuProvidersUuids.add(hotspot2OsuProviders.uuid); + osuIconUuids.addAll(hotspot2OsuProviders.osuIcons); + domainNames.add(new Atom<>(providerProfile.getDomainName())); + getNaiRealms(providerProfile, naiRealms); + + for (MccMnc mccMnc : providerProfile.getMccMncList()) { + mccMncBuffer.append(mccMnc.getMccMncPairing()); + mccMncBuffer.append(";"); + } + } } + + String mccMncString = mccMncBuffer.toString(); + if (mccMncString.endsWith(";")) { + mccMncString = mccMncString.substring(0, mccMncString.lastIndexOf(";")); + } + rowColumns.put("mcc_mnc", new Atom<>(mccMncString)); + com.vmware.ovsdb.protocol.operation.notation.Set naiRealmsSet = com.vmware.ovsdb.protocol.operation.notation.Set + .of(naiRealms); + rowColumns.put("nai_realm", naiRealmsSet); + if (osuProvidersUuids.size() > 0) { com.vmware.ovsdb.protocol.operation.notation.Set providerUuids = com.vmware.ovsdb.protocol.operation.notation.Set .of(osuProvidersUuids); @@ -3511,6 +3533,13 @@ public class OvsdbDao { rowColumns.put("operator_icons", iconUuids); } + if (domainNames.size() > 0) { + com.vmware.ovsdb.protocol.operation.notation.Set domainNameSet = com.vmware.ovsdb.protocol.operation.notation.Set + .of(domainNames); + rowColumns.put("domain_name", domainNameSet); + } + + hs2Profile.getIpAddressTypeAvailability(); rowColumns.put("deauth_request_timeout", new Atom<>(hs2Profile.getDeauthRequestTimeout())); rowColumns.put("osen", new Atom<>(operatorProfile.isServerOnlyAuthenticatedL2EncryptionNetwork())); @@ -3528,20 +3557,13 @@ 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 -> { - String pair = c.getMccMncPairing() + ";"; - mccMnc.add(new Atom<>(pair)); - }); - com.vmware.ovsdb.protocol.operation.notation.Set mccMncSet = com.vmware.ovsdb.protocol.operation.notation.Set - .of(mccMnc); - rowColumns.put("mcc_mnc", mccMncSet); + Set> connectionCapabilities = new HashSet<>(); - hs2Profile.getConnectionCapabilitySet().stream().forEach( - c -> connectionCapabilities.add(new Atom<>(c.getConnectionCapabilitiesIpProtocol().getId() + ":" - + c.getConnectionCapabilitiesPortNumber() + ":" - + c.getConnectionCapabilitiesStatus().getId()))); + hs2Profile.getConnectionCapabilitySet().stream() + .forEach(c -> connectionCapabilities + .add(new Atom<>(c.getConnectionCapabilitiesIpProtocol().getId() + ":" + + c.getConnectionCapabilitiesPortNumber() + ":" + + c.getConnectionCapabilitiesStatus().getId()))); com.vmware.ovsdb.protocol.operation.notation.Set connectionCapabilitySet = com.vmware.ovsdb.protocol.operation.notation.Set .of(connectionCapabilities); rowColumns.put("connection_capability", connectionCapabilitySet); @@ -3570,6 +3592,25 @@ public class OvsdbDao { rowColumns.put("venue_group_type", new Atom<>(groupType)); + // # format: <1-octet encoded value as hex str> + // # (ipv4_type & 0x3f) << 2 | (ipv6_type & 0x3) << 2 + // 0x3f = 63 in decimal + // 0x3 = 3 in decimal + if (IPv6PasspointAddressType.getByName( + hs2Profile.getIpAddressTypeAvailability()) != IPv6PasspointAddressType.UNSUPPORTED) { + int availability = IPv6PasspointAddressType + .getByName(hs2Profile.getIpAddressTypeAvailability()).getId(); + String hexString = Integer.toHexString((availability & 3) << 2); + rowColumns.put("ipaddr_type_availability", new Atom<>(hexString)); + } else if (IPv4PasspointAddressType.getByName( + hs2Profile.getIpAddressTypeAvailability()) != IPv4PasspointAddressType.UNSUPPORTED) { + int availability = IPv4PasspointAddressType + .getByName(hs2Profile.getIpAddressTypeAvailability()).getId(); + String hexString = Integer.toHexString((availability & 63) << 2); + rowColumns.put("ipaddr_type_availability", new Atom<>(hexString)); + } + + Map vifConfigMap = getProvisionedWifiVifConfigs(ovsdbClient); Set vifConfigs = new HashSet<>(); @@ -3589,7 +3630,7 @@ public class OvsdbDao { for (String mac : vifStates) { hessids.add(new Atom<>(mac)); } - + } if (vifConfigs.size() > 0) { @@ -3597,14 +3638,14 @@ public class OvsdbDao { .of(vifConfigs); rowColumns.put("vif_config", vifConfigUuids); } - + if (hessids.size() > 0) { - + rowColumns.put("hessid", new Atom<>(hessids.get(0))); } - + rowColumns.put("osu_ssid", new Atom<>(hs2Profile.getOsuSsidName())); - + Row row = new Row(rowColumns); @@ -3656,7 +3697,8 @@ public class OvsdbDao { Hotspot20IdProviderProfile providerProfile = (Hotspot20IdProviderProfile) provider.getDetails(); Map rowColumns = new HashMap<>(); rowColumns.put("osu_nai", new Atom<>(providerProfile.getOsuNaiStandalone())); -// rowColumns.put("osu_nai2", new Atom<>(providerProfile.getOsuNaiShared())); + // rowColumns.put("osu_nai2", new + // Atom<>(providerProfile.getOsuNaiShared())); getOsuIconUuidsForOsuProvider(ovsdbClient, providerProfile, rowColumns); getOsuProviderFriendlyNames(providerProfile, rowColumns); @@ -3770,9 +3812,7 @@ public class OvsdbDao { } - protected void getNaiRealms(Hotspot20IdProviderProfile providerProfile, - Map rowColumns) { - Set> naiRealms = new HashSet<>(); + protected void getNaiRealms(Hotspot20IdProviderProfile providerProfile, Set> naiRealms) { providerProfile.getNaiRealmList().stream().forEach(c -> { StringBuffer naiBuffer = new StringBuffer(); @@ -3849,9 +3889,7 @@ public class OvsdbDao { }); - com.vmware.ovsdb.protocol.operation.notation.Set naiRealmsSet = com.vmware.ovsdb.protocol.operation.notation.Set - .of(naiRealms); - rowColumns.put("nai_realm", naiRealmsSet); + } public void provisionHotspot2IconConfig(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncApConfig) { diff --git a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/models/Hotspot20IconConfig.java b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/models/Hotspot20IconConfig.java index 5fc3405..1fd85c1 100644 --- a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/models/Hotspot20IconConfig.java +++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/models/Hotspot20IconConfig.java @@ -7,11 +7,10 @@ import com.vmware.ovsdb.protocol.operation.notation.Uuid; public class Hotspot20IconConfig implements Cloneable { - public static String[] ovsdbColumns = { "_version", "name", "path", "url", "lang_code", "height", "img_type", + public static String[] ovsdbColumns = { "_version", "name", "url", "lang_code", "height", "img_type", "_uuid", "width" }; public String name; - public String path; public String url; public String langCode; public Integer height; @@ -31,10 +30,6 @@ public class Hotspot20IconConfig implements Cloneable { .equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) { this.name = row.getStringColumn("name"); } - if ((row.getColumns().get("path") != null) && row.getColumns().get("path").getClass() - .equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) { - this.path = row.getStringColumn("path"); - } if ((row.getColumns().get("url") != null) && row.getColumns().get("url").getClass() .equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) { this.url = row.getStringColumn("url"); @@ -74,14 +69,14 @@ public class Hotspot20IconConfig implements Cloneable { @Override public String toString() { - return "Hotspot20IconConfig [name=" + name + ", path=" + path + ", url=" + url + ", langCode=" + langCode + return "Hotspot20IconConfig [name=" + name + ", url=" + url + ", langCode=" + langCode + ", height=" + height + ", imgType=" + imgType + ", width=" + width + ", uuid=" + uuid + ", version=" + version + "]"; } @Override public int hashCode() { - return Objects.hash(height, imgType, langCode, name, path, url, uuid, version, width); + return Objects.hash(height, imgType, langCode, name, url, uuid, version, width); } @Override @@ -95,7 +90,7 @@ public class Hotspot20IconConfig implements Cloneable { Hotspot20IconConfig other = (Hotspot20IconConfig) obj; return Objects.equals(height, other.height) && Objects.equals(imgType, other.imgType) && Objects.equals(langCode, other.langCode) && Objects.equals(name, other.name) - && Objects.equals(path, other.path) && Objects.equals(url, other.url) + && Objects.equals(url, other.url) && Objects.equals(uuid, other.uuid) && Objects.equals(version, other.version) && Objects.equals(width, other.width); }