From 095c611b8a458a3724cd48d5d3d128e3d0cc9c58 Mon Sep 17 00:00:00 2001 From: Mike Hansen Date: Thu, 21 Jan 2021 18:28:25 -0500 Subject: [PATCH] Radius Profile Provisioning --- .../OpensyncExternalIntegrationCloud.java | 4 +- .../integration/utils/MqttStatsPublisher.java | 25 +- .../src/main/resources/EquipmentExample.json | 474 ++++++++-------- .../src/main/resources/ProfileAPExample.json | 128 +++-- .../src/main/resources/ProfileCaptive.json | 255 ++++----- .../src/main/resources/ProfileHotspot20.json | 138 ++--- .../src/main/resources/ProfileIdProvider.json | 510 +++++++++-------- .../src/main/resources/ProfileOperator.json | 81 ++- .../src/main/resources/ProfileRadius.json | 64 ++- .../src/main/resources/ProfileRf.json | 6 +- .../src/main/resources/ProfileSsid.json | 106 ++-- .../src/main/resources/ProfileVenue.json | 83 ++- .../app/opensync/EquipmentExample.json | 474 ++++++++-------- .../app/opensync/ProfileAPExample.json | 128 +++-- .../app/opensync/ProfileCaptive.json | 255 ++++----- .../app/opensync/ProfileHotspot20.json | 138 ++--- .../app/opensync/ProfileIdProvider.json | 510 +++++++++-------- .../app/opensync/ProfileOperator.json | 81 ++- .../app/opensync/ProfileRadius.json | 64 ++- .../app/opensync/ProfileRf.json | 6 +- .../app/opensync/ProfileSsid.json | 106 ++-- .../app/opensync/ProfileVenue.json | 83 ++- .../docker/app/opensync/EquipmentExample.json | 474 ++++++++-------- .../docker/app/opensync/ProfileAPExample.json | 128 +++-- .../docker/app/opensync/ProfileCaptive.json | 255 ++++----- .../docker/app/opensync/ProfileHotspot20.json | 138 ++--- .../app/opensync/ProfileIdProvider.json | 512 +++++++++--------- .../docker/app/opensync/ProfileOperator.json | 76 +-- .../docker/app/opensync/ProfileRadius.json | 64 ++- .../main/docker/app/opensync/ProfileRf.json | 6 +- .../main/docker/app/opensync/ProfileSsid.json | 106 ++-- .../docker/app/opensync/ProfileVenue.json | 83 ++- .../app/opensync/EquipmentExample.json | 474 ++++++++-------- .../app/opensync/ProfileAPExample.json | 128 +++-- .../app/opensync/ProfileCaptive.json | 255 ++++----- .../app/opensync/ProfileHotspot20.json | 138 ++--- .../app/opensync/ProfileIdProvider.json | 510 +++++++++-------- .../app/opensync/ProfileOperator.json | 81 ++- .../resources/app/opensync/ProfileRadius.json | 64 ++- .../resources/app/opensync/ProfileRf.json | 6 +- .../resources/app/opensync/ProfileSsid.json | 106 ++-- .../resources/app/opensync/ProfileVenue.json | 83 ++- .../opensync/mqtt/OpensyncMqttClient.java | 2 +- .../wlan/opensync/ovsdb/dao/OvsdbDao.java | 423 +++++++-------- .../wlan/opensync/ovsdb/dao/OvsdbDaoTest.java | 8 +- .../ovsdb/dao/OvsdbDaoTestUtilities.java | 29 +- 46 files changed, 3999 insertions(+), 3869 deletions(-) diff --git a/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java b/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java index b3b1873..6f3dead 100644 --- a/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java +++ b/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java @@ -471,7 +471,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra ssidProfile.setName(autoProvisionedSsid + radioType.name() + " for " + ce.getName()); SsidConfiguration ssidConfig = SsidConfiguration.createWithDefaults(); - ssidConfig.setSsid(ssidProfile.getName()); + ssidConfig.setSsid(autoProvisionedSsid); ssidConfig.setSsidAdminState(StateSetting.enabled); ssidConfig.setBroadcastSsid(StateSetting.enabled); ssidConfig.setSecureMode(SecureMode.wpa2PSK); @@ -975,7 +975,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra hotspot20ProfileSet .addAll(profileContainer.getChildrenOfType(ssidProfile.getId(), ProfileType.passpoint)); - radiusSet.addAll(profileContainer.getChildrenOfType(ret.getApProfile().getId(), ProfileType.radius)); + radiusSet.addAll(profileContainer.getChildrenOfType(ssidProfile.getId(), ProfileType.radius)); if (ssidProfile.getDetails() != null) { Long captivePortId = ((SsidConfiguration) ssidProfile.getDetails()).getCaptivePortalId(); if (captivePortId != null) { diff --git a/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/utils/MqttStatsPublisher.java b/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/utils/MqttStatsPublisher.java index b6aafac..9aab2de 100644 --- a/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/utils/MqttStatsPublisher.java +++ b/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/utils/MqttStatsPublisher.java @@ -190,22 +190,21 @@ public class MqttStatsPublisher { long locationId = ce.getLocationId(); long profileId = ce.getProfileId(); - if (LOG.isTraceEnabled()) { - // prepare a JSONPrinter to format protobuf messages as - // json - List protobufDescriptors = new ArrayList<>(); - protobufDescriptors.addAll(OpensyncStats.getDescriptor().getMessageTypes()); - TypeRegistry oldRegistry = TypeRegistry.newBuilder().add(protobufDescriptors).build(); - JsonFormat.Printer jsonPrinter = JsonFormat.printer().preservingProtoFieldNames() - .includingDefaultValueFields().usingTypeRegistry(oldRegistry); + // prepare a JSONPrinter to format protobuf messages as + // json + List protobufDescriptors = new ArrayList<>(); + protobufDescriptors.addAll(OpensyncStats.getDescriptor().getMessageTypes()); + TypeRegistry oldRegistry = TypeRegistry.newBuilder().add(protobufDescriptors).build(); + JsonFormat.Printer jsonPrinter = JsonFormat.printer().preservingProtoFieldNames() + .includingDefaultValueFields().usingTypeRegistry(oldRegistry); - try { - LOG.trace("MQTT OpensyncStats.report = {}", jsonPrinter.print(report)); + try { + LOG.info(jsonPrinter.print(report)); - } catch (InvalidProtocolBufferException e1) { - LOG.error("Couldn't parse OpensyncStats.report.", e1); - } + } catch (InvalidProtocolBufferException e1) { + LOG.error("Couldn't parse OpensyncStats.report.", e1); } + List metricRecordList = new ArrayList<>(); diff --git a/opensync-ext-static/src/main/resources/EquipmentExample.json b/opensync-ext-static/src/main/resources/EquipmentExample.json index a05e266..232b2b3 100644 --- a/opensync-ext-static/src/main/resources/EquipmentExample.json +++ b/opensync-ext-static/src/main/resources/EquipmentExample.json @@ -1,221 +1,261 @@ { - "model_type": "Equipment", - "id": 51, - "customerId": 2, - "profileId": 12, - "locationId": 8, - "equipmentType": "AP", - "inventoryId": "Test_Client_21P10C68818122", - "name": "Test_Client_21P10C68818122", - "details": { - "model_type": "ApElementConfiguration", - "equipmentModel": "EA8300-CA", - "elementConfigVersion": "AP-V1", + "model_type": "Equipment", + "id": 1, + "customerId": 2, + "profileId": 38, + "locationId": 8, "equipmentType": "AP", - "deviceMode": "standaloneAP", - "gettingIP": "dhcp", - "staticIP": null, - "staticIpMaskCidr": null, - "staticIpGw": null, - "gettingDNS": "dhcp", - "staticDnsIp1": null, - "staticDnsIp2": null, - "peerInfoList": [], - "deviceName": "Default Device Name", - "locationData": null, - "locallyConfiguredMgmtVlan": 0, - "locallyConfigured": false, - "deploymentType": "CEILING", - "syntheticClientEnabled": null, - "frameReportThrottleEnabled": true, - "antennaType": "OMNI", - "costSavingEventsEnabled": true, - "forwardMode": "BRIDGE", - "radioMap": { - "is2dot4GHz": { - "model_type": "ElementRadioConfiguration", - "radioType": "is2dot4GHz", - "channelNumber": 6, - "manualChannelNumber": 6, - "backupChannelNumber": 11, - "bannedChannels": [], - "allowedChannels": [], - "rxCellSizeDb": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": -90 + "inventoryId": "Open_AP_21P10C68818122", + "name": "Open_AP_21P10C68818122", + "details": { + "model_type": "ApElementConfiguration", + "equipmentModel": "EA8300-CA", + "elementConfigVersion": "AP-V1", + "equipmentType": "AP", + "deviceMode": "standaloneAP", + "gettingIP": "dhcp", + "staticIP": null, + "staticIpMaskCidr": null, + "staticIpGw": null, + "gettingDNS": "dhcp", + "staticDnsIp1": null, + "staticDnsIp2": null, + "peerInfoList": [], + "deviceName": "Open_AP_21P10C68818122", + "locationData": null, + "locallyConfiguredMgmtVlan": 0, + "locallyConfigured": false, + "deploymentType": "CEILING", + "syntheticClientEnabled": null, + "frameReportThrottleEnabled": true, + "antennaType": "OMNI", + "costSavingEventsEnabled": true, + "forwardMode": "BRIDGE", + "radioMap": { + "is2dot4GHz": { + "model_type": "ElementRadioConfiguration", + "radioType": "is2dot4GHz", + "channelNumber": 6, + "manualChannelNumber": 6, + "backupChannelNumber": 11, + "allowedChannels": [ + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11 + ], + "rxCellSizeDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "eirpTxPower": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": 18 + }, + "perimeterDetectionEnabled": true, + "bestAPSteerType": "both", + "deauthAttackDetection": null, + "allowedChannelsPowerLevels": [] + }, + "is5GHzU": { + "model_type": "ElementRadioConfiguration", + "radioType": "is5GHzU", + "channelNumber": 149, + "manualChannelNumber": 149, + "backupChannelNumber": 154, + "allowedChannels": [ + 161, + 149, + 165, + 153, + 157 + ], + "rxCellSizeDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "eirpTxPower": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": 18 + }, + "perimeterDetectionEnabled": true, + "bestAPSteerType": "both", + "deauthAttackDetection": null, + "allowedChannelsPowerLevels": [] + }, + "is5GHzL": { + "model_type": "ElementRadioConfiguration", + "radioType": "is5GHzL", + "channelNumber": 36, + "manualChannelNumber": 36, + "backupChannelNumber": 44, + "allowedChannels": [ + 48, + 36, + 40, + 44 + ], + "rxCellSizeDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "eirpTxPower": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": 18 + }, + "perimeterDetectionEnabled": true, + "bestAPSteerType": "both", + "deauthAttackDetection": null, + "allowedChannelsPowerLevels": [] + } }, - "probeResponseThresholdDb": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": -90 - }, - "eirpTxPower": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": 32 - }, - "perimeterDetectionEnabled": true, - "bestAPSteerType": "both", - "deauthAttackDetection": null, - "allowedChannelsPowerLevels": [], - "activeChannel": 6 - }, - "is5GHzU": { - "model_type": "ElementRadioConfiguration", - "radioType": "is5GHzU", - "channelNumber": 149, - "manualChannelNumber": 149, - "backupChannelNumber": 154, - "bannedChannels": [], - "allowedChannels": [], - "rxCellSizeDb": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": -90 - }, - "eirpTxPower": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": 32 - }, - "perimeterDetectionEnabled": true, - "bestAPSteerType": "both", - "deauthAttackDetection": null, - "allowedChannelsPowerLevels": [], - "activeChannel": 149 - }, - "is5GHzL": { - "model_type": "ElementRadioConfiguration", - "radioType": "is5GHzL", - "channelNumber": 36, - "manualChannelNumber": 36, - "backupChannelNumber": 44, - "bannedChannels": [], - "allowedChannels": [], - "rxCellSizeDb": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": -90 - }, - "eirpTxPower": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": 32 - }, - "perimeterDetectionEnabled": true, - "bestAPSteerType": "both", - "deauthAttackDetection": null, - "allowedChannelsPowerLevels": [], - "activeChannel": 36 - } + "advancedRadioMap": { + "is2dot4GHz": { + "model_type": "RadioConfiguration", + "radioType": "is2dot4GHz", + "radioAdminState": "enabled", + "fragmentationThresholdBytes": 2346, + "uapsdState": "enabled", + "stationIsolation": "disabled", + "multicastRate": { + "model_type": "SourceSelectionMulticast", + "source": "profile", + "value": "auto" + }, + "managementRate": { + "model_type": "SourceSelectionManagement", + "source": "profile", + "value": "auto" + }, + "bestApSettings": { + "model_type": "SourceSelectionSteering", + "source": "manual", + "value": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 20, + "minLoadFactor": 50 + } + }, + "legacyBSSRate": "enabled", + "dtimPeriod": 2, + "deauthAttackDetection": null + }, + "is5GHzU": { + "model_type": "RadioConfiguration", + "radioType": "is5GHzU", + "radioAdminState": "enabled", + "fragmentationThresholdBytes": 2346, + "uapsdState": "enabled", + "stationIsolation": "disabled", + "multicastRate": { + "model_type": "SourceSelectionMulticast", + "source": "profile", + "value": "auto" + }, + "managementRate": { + "model_type": "SourceSelectionManagement", + "source": "profile", + "value": "auto" + }, + "bestApSettings": { + "model_type": "SourceSelectionSteering", + "source": "manual", + "value": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 30, + "minLoadFactor": 40 + } + }, + "legacyBSSRate": "enabled", + "dtimPeriod": 2, + "deauthAttackDetection": null + }, + "is5GHzL": { + "model_type": "RadioConfiguration", + "radioType": "is5GHzL", + "radioAdminState": "enabled", + "fragmentationThresholdBytes": 2346, + "uapsdState": "enabled", + "stationIsolation": "disabled", + "multicastRate": { + "model_type": "SourceSelectionMulticast", + "source": "profile", + "value": "auto" + }, + "managementRate": { + "model_type": "SourceSelectionManagement", + "source": "profile", + "value": "auto" + }, + "bestApSettings": { + "model_type": "SourceSelectionSteering", + "source": "manual", + "value": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 30, + "minLoadFactor": 40 + } + }, + "legacyBSSRate": "enabled", + "dtimPeriod": 2, + "deauthAttackDetection": null + } + } }, - "advancedRadioMap": { - "is2dot4GHz": { - "model_type": "RadioConfiguration", - "radioType": "is2dot4GHz", - "radioAdminState": "enabled", - "fragmentationThresholdBytes": 2346, - "uapsdState": "enabled", - "stationIsolation": "disabled", - "managementRate": { - "model_type": "SourceSelectionManagement", - "source": "auto", - "value": "auto" - }, - "bestApSettings": { - "model_type": "SourceSelectionSteering", - "source": "auto", - "value": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } - }, - "legacyBSSRate": "enabled", - "deauthAttackDetection": null - }, - "is5GHzU": { - "model_type": "RadioConfiguration", - "radioType": "is5GHzU", - "radioAdminState": "enabled", - "fragmentationThresholdBytes": 2346, - "uapsdState": "enabled", - "stationIsolation": "disabled", - "managementRate": { - "model_type": "SourceSelectionManagement", - "source": "auto", - "value": "auto" - }, - "bestApSettings": { - "model_type": "SourceSelectionSteering", - "source": "auto", - "value": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } - }, - "legacyBSSRate": "enabled", - "deauthAttackDetection": null - }, - "is5GHzL": { - "model_type": "RadioConfiguration", - "radioType": "is5GHzL", - "radioAdminState": "enabled", - "fragmentationThresholdBytes": 2346, - "uapsdState": "enabled", - "stationIsolation": "disabled", - "managementRate": { - "model_type": "SourceSelectionManagement", - "source": "auto", - "value": "auto" - }, - "bestApSettings": { - "model_type": "SourceSelectionSteering", - "source": "auto", - "value": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } - }, - "legacyBSSRate": "enabled", - "deauthAttackDetection": null - } - } - }, - "latitude": null, - "longitude": null, - "serial": "21P10C68818122", - "createdTimestamp": 1591653239821, - "lastModifiedTimestamp": 1591653241398 -} + "latitude": null, + "longitude": null, + "baseMacAddress": { + "model_type": "MacAddress", + "address": "JPWi7y5T", + "addressAsString": "24:f5:a2:ef:2e:53" + }, + "serial": "21P10C68818122", + "createdTimestamp": 0, + "lastModifiedTimestamp": 1611264546193 +} \ No newline at end of file diff --git a/opensync-ext-static/src/main/resources/ProfileAPExample.json b/opensync-ext-static/src/main/resources/ProfileAPExample.json index 9001597..b2c6ae0 100644 --- a/opensync-ext-static/src/main/resources/ProfileAPExample.json +++ b/opensync-ext-static/src/main/resources/ProfileAPExample.json @@ -1,73 +1,67 @@ { - "model_type": "Profile", - "id": 12, - "customerId": 2, - "profileType": "equipment_ap", - "name": "ApProfile-3-radios", - "details": { - "model_type": "ApNetworkConfiguration", - "networkConfigVersion": "AP-1", - "equipmentType": "AP", - "vlanNative": true, - "vlan": 0, - "ntpServer": { - "model_type": "AutoOrManualString", - "auto": true, - "value": "pool.ntp.org" - }, - "syslogRelay": null, - "rtlsSettings": null, - "syntheticClientEnabled": true, - "ledControlEnabled": true, - "equipmentDiscovery": false, + "model_type": "Profile", + "id": 38, + "customerId": 2, + "profileType": "equipment_ap", + "name": "ap-profile-2021-01-21T21:28:59.371Z", + "details": { + "model_type": "ApNetworkConfiguration", + "networkConfigVersion": "AP-1", + "equipmentType": "AP", + "vlanNative": true, + "vlan": 0, + "ntpServer": { + "model_type": "AutoOrManualString", + "auto": true, + "value": "pool.ntp.org" + }, + "syslogRelay": null, + "rtlsSettings": null, + "syntheticClientEnabled": true, + "ledControlEnabled": true, + "equipmentDiscovery": false, + "radioMap": { + "is5GHz": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + }, + "is2dot4GHz": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + }, + "is5GHzU": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + }, + "is5GHzL": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + } + }, + "greTunnelConfigurations": [ + { + "model_type": "GreTunnelConfiguration", "greTunnelName": null, "greParentIfName": null, "greLocalInetAddr": null, "greRemoteInetAddr": null, "greRemoteMacAddr": null, - "radioMap": { - "is2dot4GHz": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is5GHzU": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is5GHzL": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - } - }, - "greTunnelConfigurations": [ - { - "model_type": "GreTunnelConfiguration", - "greTunnelName": "gre1", - "greParentIfName": "wan", - "greLocalInetAddr": "10.0.0.129", - "greRemoteInetAddr": "192.168.1.101", - "greRemoteMacAddr": { - "model_type": "MacAddress", - "address": "ZEvwIFf/", - "addressAsString": "64:4b:f0:20:57:ff" - }, - "vlanIdsInGreTunnel": [ - 100 - ] - } - ], - "profileType": "equipment_ap" - }, - "createdTimestamp": 1606778369934, - "lastModifiedTimestamp": 1606778443413, - "childProfileIds": [ - 16, - 5, - 10, - 11, - 15 - ] -} \ No newline at end of file + "vlanIdsInGreTunnel": [ + ] + } + ], + "profileType": "equipment_ap" + }, + "createdTimestamp": 1611264539383, + "lastModifiedTimestamp": 1611264539383, + "childProfileIds": [ + 4, + 5, + 31, + 32 + ] +} diff --git a/opensync-ext-static/src/main/resources/ProfileCaptive.json b/opensync-ext-static/src/main/resources/ProfileCaptive.json index 9c9b52f..9c1a3d0 100644 --- a/opensync-ext-static/src/main/resources/ProfileCaptive.json +++ b/opensync-ext-static/src/main/resources/ProfileCaptive.json @@ -1,135 +1,138 @@ [ -{ + { "model_type": "Profile", - "id": 14, + "id": 5, "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": "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": 1611262628973, + "expirationTime": 1611291428973, + "numDevices": 1, + "userDetails": { + "model_type": "TimedAccessUserDetails", + "firstName": "Pac", + "lastName": "Man", + "passwordNeedsReset": false + }, + "userMacAddresses": [ { - "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 + "model_type": "MacAddress", + "address": "fKtg5upO", + "addressAsString": "7c:ab:60:e6:ea:4e" } - ], - "macAllowList": [], - "profileType": "captive_portal" + ], + "lastModifiedTimestamp": 0 + }, + { + "model_type": "TimedAccessUserRecord", + "username": "customer", + "password": "testing123", + "activationTime": 1611262628974, + "expirationTime": 1611266228974, + "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": 1611262628974, + "expirationTime": 1611867428974, + "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": 1611262628974, + "expirationTime": 1611349028974, + "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 + "createdTimestamp": 1611262628978, + "lastModifiedTimestamp": 1611262628978, + "childProfileIds": [ + ] + } +] diff --git a/opensync-ext-static/src/main/resources/ProfileHotspot20.json b/opensync-ext-static/src/main/resources/ProfileHotspot20.json index b15c575..7c0559e 100644 --- a/opensync-ext-static/src/main/resources/ProfileHotspot20.json +++ b/opensync-ext-static/src/main/resources/ProfileHotspot20.json @@ -1,71 +1,71 @@ [ - { - "model_type": "Profile", - "id": 24, - "customerId": 2, - "profileType": "passpoint", - "name": "TipWlan-Passpoint-Config", - "details": { - "model_type": "PasspointProfile", - "enableInterworkingAndHs20": true, - "hessid": null, - "passpointAccessNetworkType": "free_public_network", - "passpointNetworkAuthenticationType": "acceptance_of_terms_and_conditions", - "additionalStepsRequiredForAccess": 0, - "deauthRequestTimeout": 0, - "operatingClass": 0, - "termsAndConditionsFile": { - "model_type": "ManagedFileInfo", - "md5checksum": null, - "lastModifiedTimestamp": null, - "apExportUrl": "https://localhost:9091/filestore/termsAndConditions", - "fileCategory": "ExternalPolicyConfiguration", - "fileType": "TEXT", - "altSlot": false - }, - "whitelistDomain": null, - "emergencyServicesReachable": true, - "unauthenticatedEmergencyServiceAccessible": false, - "internetConnectivity": true, - "connectionCapabilitySet": [ - { - "model_type": "PasspointConnectionCapability", - "connectionCapabilitiesPortNumber": 8888, - "connectionCapabilitiesStatus": "open", - "connectionCapabilitiesIpProtocol": "TCP" - } - ], - "ipAddressTypeAvailability": "public_IPv4_address_available", - "qosMapSetConfiguration": null, - "apGeospatialLocation": null, - "apCivicLocation": null, - "apPublicLocationIdUri": null, - "gasAddr3Behaviour": "p2pSpecWorkaroundFromRequest", - "anqpDomainId": 1234, - "disableDownstreamGroupAddressedForwarding": false, - "enable2pt4GHz": true, - "enable5GHz": true, - "associatedAccessSsidProfileIds": [ - 15 - ], - "osuSsidProfileId": 16, - "passpointOperatorProfileId": 17, - "passpointVenueProfileId": 18, - "passpointOsuProviderProfileIds": [ - 19, - 20 - ], - "accessNetworkType": "free_public_network", - "networkAuthenticationType": "acceptance_of_terms_and_conditions", - "profileType": "passpoint" - }, - "createdTimestamp": 1606778370807, - "lastModifiedTimestamp": 1606778370807, - "childProfileIds": [ - 17, - 18, - 19, - 20 - ] - } +{ + "model_type": "Profile", + "id": 37, + "customerId": 2, + "profileType": "passpoint", + "name": "hotspot20-profile-2021-01-21T21:28:59.171Z", + "details": { + "model_type": "PasspointProfile", + "enableInterworkingAndHs20": true, + "hessid": null, + "passpointAccessNetworkType": "free_public_network", + "passpointNetworkAuthenticationType": "acceptance_of_terms_and_conditions", + "additionalStepsRequiredForAccess": 0, + "deauthRequestTimeout": 0, + "operatingClass": 0, + "termsAndConditionsFile": { + "model_type": "ManagedFileInfo", + "md5checksum": null, + "lastModifiedTimestamp": null, + "apExportUrl": "https://localhost:9091/filestore/termsAndConditions", + "fileCategory": "ExternalPolicyConfiguration", + "fileType": "TEXT", + "altSlot": false + }, + "whitelistDomain": null, + "emergencyServicesReachable": true, + "unauthenticatedEmergencyServiceAccessible": false, + "internetConnectivity": true, + "connectionCapabilitySet": [ + { + "model_type": "PasspointConnectionCapability", + "connectionCapabilitiesPortNumber": 8888, + "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, + "associatedAccessSsidProfileIds": [ + 32 + ], + "osuSsidProfileId": 31, + "passpointOperatorProfileId": 34, + "passpointVenueProfileId": 33, + "passpointOsuProviderProfileIds": [ + 35, + 36 + ], + "accessNetworkType": "free_public_network", + "networkAuthenticationType": "acceptance_of_terms_and_conditions", + "profileType": "passpoint" + }, + "createdTimestamp": 0, + "lastModifiedTimestamp": 1611264539331, + "childProfileIds": [ + 33, + 34, + 35, + 36 + ] +} ] diff --git a/opensync-ext-static/src/main/resources/ProfileIdProvider.json b/opensync-ext-static/src/main/resources/ProfileIdProvider.json index 6fdb9c2..c9ee1e9 100644 --- a/opensync-ext-static/src/main/resources/ProfileIdProvider.json +++ b/opensync-ext-static/src/main/resources/ProfileIdProvider.json @@ -1,265 +1,263 @@ [ - { - "model_type": "Profile", - "id": 19, - "customerId": 2, - "profileType": "passpoint_osu_id_provider", - "name": "TipWlan-Passpoint-OSU-Provider", - "details": { - "model_type": "PasspointOsuProviderProfile", - "mccMncList": [ - { - "model_type": "PasspointMccMnc", - "mcc": 302, - "mnc": 720, - "iso": "ca", - "country": "Canada", - "countryCode": 1, - "network": "Rogers AT&T Wireless", - "mccMncPairing": "302,720" - } - ], - "naiRealmList": [ - { - "model_type": "PasspointNaiRealmInformation", - "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" - ], - "EAP-TLS with certificate": [ - "Credential Type:Certificate" - ] - } - } - ], - "osuIconList": [ - { - "model_type": "PasspointOsuIcon", - "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": "PasspointOsuIcon", - "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": "PasspointOsuIcon", - "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" - } - ], - "osuServerUri": "https://example.com/osu/rogers", - "osuFriendlyName": [ - { - "model_type": "PasspointDuple", - "locale": "en_CA", - "dupleIso3Language": "eng", - "dupleName": "Example provider rogers", - "defaultDupleSeparator": ":", - "asDuple": "eng:Example provider rogers" - }, - { - "model_type": "PasspointDuple", - "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": "PasspointDuple", - "locale": "en_CA", - "dupleIso3Language": "eng", - "dupleName": "Example services rogers", - "defaultDupleSeparator": ":", - "asDuple": "eng:Example services rogers" - }, - { - "model_type": "PasspointDuple", - "locale": "fr_CA", - "dupleIso3Language": "fra", - "dupleName": "Exemples de services rogers", - "defaultDupleSeparator": ":", - "asDuple": "fra:Exemples de services rogers" - } - ], + { + "model_type": "Profile", + "id": 35, + "customerId": 2, + "profileType": "passpoint_osu_id_provider", + "name": "provider1-profile-2021-01-21T21:28:59.057Z", + "details": { + "model_type": "PasspointOsuProviderProfile", + "mccMncList": [ + { + "model_type": "PasspointMccMnc", + "mcc": 302, + "mnc": 720, + "iso": "ca", + "country": "Canada", + "countryCode": 1, + "network": "Rogers AT&T Wireless", + "mccMncPairing": "302,720" + } + ], + "naiRealmList": [ + { + "model_type": "PasspointNaiRealmInformation", + "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" + ], + "EAP-TLS with certificate": [ + "Credential Type:Certificate" + ] + } + } + ], + "osuIconList": [ + { + "model_type": "PasspointOsuIcon", + "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": "PasspointOsuIcon", + "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": "PasspointOsuIcon", + "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" + } + ], + "osuServerUri": "https://example.com/osu/rogers", + "osuFriendlyName": [ + { + "model_type": "PasspointDuple", + "locale": "eng", + "dupleIso3Language": "eng", + "dupleName": "Example provider rogers", + "defaultDupleSeparator": ":", + "asDuple": "eng:Example provider rogers" + }, + { + "model_type": "PasspointDuple", + "locale": "fra", + "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": "PasspointDuple", + "locale": "eng", + "dupleIso3Language": "eng", + "dupleName": "Example services rogers", + "defaultDupleSeparator": ":", + "asDuple": "eng:Example services rogers" + }, + { + "model_type": "PasspointDuple", + "locale": "fra", + "dupleIso3Language": "fra", + "dupleName": "Exemples de services rogers", + "defaultDupleSeparator": ":", + "asDuple": "fra:Exemples de services rogers" + } + ], "roamingOi": [ "BAA2D00100", "BAA2D00000" ], - "profileType": "passpoint_osu_id_provider" - }, - "createdTimestamp": 1606778370345, - "lastModifiedTimestamp": 1606778370345, - "childProfileIds": [ - ] - }, - { - "model_type": "Profile", - "id": 20, - "customerId": 2, - "profileType": "passpoint_osu_id_provider", - "name": "TipWlan-Passpoint-OSU-Provider-2", - "details": { - "model_type": "PasspointOsuProviderProfile", - "mccMncList": [ - { - "model_type": "PasspointMccMnc", - "mcc": 302, - "mnc": 220, - "iso": "ca", - "country": "Canada", - "countryCode": 1, - "network": "Telus Mobility", - "mccMncPairing": "302,220" - } - ], - "naiRealmList": [ - { - "model_type": "PasspointNaiRealmInformation", - "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" - ], - "EAP-TLS with certificate": [ - "Credential Type:Certificate" - ] - } - } - ], - "osuIconList": [ - { - "model_type": "PasspointOsuIcon", - "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": "PasspointOsuIcon", - "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": "PasspointOsuIcon", - "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" - } - ], - "osuServerUri": "https://example.com/osu/telus", - "osuFriendlyName": [ - { - "model_type": "PasspointDuple", - "locale": "en_CA", - "dupleIso3Language": "eng", - "dupleName": "Example provider telus", - "defaultDupleSeparator": ":", - "asDuple": "eng:Example provider telus" - }, - { - "model_type": "PasspointDuple", - "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": "PasspointDuple", - "locale": "en_CA", - "dupleIso3Language": "eng", - "dupleName": "Example services telus", - "defaultDupleSeparator": ":", - "asDuple": "eng:Example services telus" - }, - { - "model_type": "PasspointDuple", - "locale": "fr_CA", - "dupleIso3Language": "fra", - "dupleName": "Exemples de services telus", - "defaultDupleSeparator": ":", - "asDuple": "fra:Exemples de services telus" - } - ], - "roamingOi": [ + "profileType": "passpoint_osu_id_provider" + }, + "createdTimestamp": 1611264539070, + "lastModifiedTimestamp": 1611264539070, + "childProfileIds": [] + }, + { + "model_type": "Profile", + "id": 36, + "customerId": 2, + "profileType": "passpoint_osu_id_provider", + "name": "provider2-profile-2021-01-21T21:28:59.118Z", + "details": { + "model_type": "PasspointOsuProviderProfile", + "mccMncList": [ + { + "model_type": "PasspointMccMnc", + "mcc": 302, + "mnc": 220, + "iso": "ca", + "country": "Canada", + "countryCode": 1, + "network": "Telus Mobility", + "mccMncPairing": "302,220" + } + ], + "naiRealmList": [ + { + "model_type": "PasspointNaiRealmInformation", + "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" + ], + "EAP-TLS with certificate": [ + "Credential Type:Certificate" + ] + } + } + ], + "osuIconList": [ + { + "model_type": "PasspointOsuIcon", + "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": "PasspointOsuIcon", + "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": "PasspointOsuIcon", + "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" + } + ], + "osuServerUri": "https://example.com/osu/telus", + "osuFriendlyName": [ + { + "model_type": "PasspointDuple", + "locale": "eng", + "dupleIso3Language": "eng", + "dupleName": "Example provider telus", + "defaultDupleSeparator": ":", + "asDuple": "eng:Example provider telus" + }, + { + "model_type": "PasspointDuple", + "locale": "fra", + "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": "PasspointDuple", + "locale": "eng", + "dupleIso3Language": "eng", + "dupleName": "Example services telus", + "defaultDupleSeparator": ":", + "asDuple": "eng:Example services telus" + }, + { + "model_type": "PasspointDuple", + "locale": "fra", + "dupleIso3Language": "fra", + "dupleName": "Exemples de services telus", + "defaultDupleSeparator": ":", + "asDuple": "fra:Exemples de services telus" + } + ], + "roamingOi": [ "004096", "005014", "F4F5E8F5F4" ], - "profileType": "passpoint_osu_id_provider" - }, - "createdTimestamp": 1606778370351, - "lastModifiedTimestamp": 1606778370351, - "childProfileIds": [ - ] - } -] + "profileType": "passpoint_osu_id_provider" + }, + "createdTimestamp": 1611264539131, + "lastModifiedTimestamp": 1611264539131, + "childProfileIds": [] + } +] \ No newline at end of file diff --git a/opensync-ext-static/src/main/resources/ProfileOperator.json b/opensync-ext-static/src/main/resources/ProfileOperator.json index 6554732..0d8df1d 100644 --- a/opensync-ext-static/src/main/resources/ProfileOperator.json +++ b/opensync-ext-static/src/main/resources/ProfileOperator.json @@ -1,42 +1,41 @@ [ - { - "model_type": "Profile", - "id": 17, - "customerId": 2, - "profileType": "passpoint_operator", - "name": "TipWlan-Passpoint-Operator", - "details": { - "model_type": "PasspointOperatorProfile", - "serverOnlyAuthenticatedL2EncryptionNetwork": false, - "x509CertificateLocation": "/etc/ca.pem", - "operatorFriendlyName": [ - { - "model_type": "PasspointDuple", - "locale": "en_CA", - "dupleIso3Language": "eng", - "dupleName": "Default friendly passpoint_operator name", - "defaultDupleSeparator": ":", - "asDuple": "eng:Default friendly passpoint_operator name" - }, - { - "model_type": "PasspointDuple", - "locale": "fr_CA", - "dupleIso3Language": "fra", - "dupleName": "Nom de l'opérateur convivial par défaut", - "defaultDupleSeparator": ":", - "asDuple": "fra:Nom de l'opérateur convivial par défaut" - } - ], - "domainNameList": [ - "telus.com", - "rogers.com", - "bell.ca" - ], - "profileType": "passpoint_operator" - }, - "createdTimestamp": 1606778369945, - "lastModifiedTimestamp": 1606778369945, - "childProfileIds": [ - ] - } -] +{ + "model_type": "Profile", + "id": 34, + "customerId": 2, + "profileType": "passpoint_operator", + "name": "operator-profile-2021-01-21T21:28:58.994Z", + "details": { + "model_type": "PasspointOperatorProfile", + "serverOnlyAuthenticatedL2EncryptionNetwork": false, + "x509CertificateLocation": "/etc/ca.pem", + "operatorFriendlyName": [ + { + "model_type": "PasspointDuple", + "locale": "fra", + "dupleIso3Language": "fra", + "dupleName": "Nom de l'opérateur convivial par défaut", + "defaultDupleSeparator": ":", + "asDuple": "fra:Nom de l'opérateur convivial par défaut" + }, + { + "model_type": "PasspointDuple", + "locale": "eng", + "dupleIso3Language": "eng", + "dupleName": "Default friendly passpoint_operator name", + "defaultDupleSeparator": ":", + "asDuple": "eng:Default friendly passpoint_operator name" + } + ], + "domainNameList": [ + "bell.ca", + "telus.com", + "rogers.com" + ], + "profileType": "passpoint_operator" + }, + "createdTimestamp": 1611264539004, + "lastModifiedTimestamp": 1611264539004, + "childProfileIds": [] +} +] \ No newline at end of file diff --git a/opensync-ext-static/src/main/resources/ProfileRadius.json b/opensync-ext-static/src/main/resources/ProfileRadius.json index d7390a1..0a49b4d 100644 --- a/opensync-ext-static/src/main/resources/ProfileRadius.json +++ b/opensync-ext-static/src/main/resources/ProfileRadius.json @@ -1,34 +1,32 @@ [ - { - "model_type": "Profile", - "id": 1, - "customerId": 2, - "profileType": "radius", - "name": "Radius-Profile", - "details": { - "model_type": "RadiusProfile", - "subnetConfiguration": null, - "serviceRegionMap": { - "Ottawa": { - "model_type": "RadiusServiceRegion", - "serverMap": { - "Radius-Profile": [ - { - "model_type": "RadiusServer", - "ipAddress": "192.168.0.1", - "secret": "testing123", - "authPort": 1812, - "timeout": null - } - ] - }, - "regionName": "Ottawa" - } - }, - "profileType": "radius" - }, - "createdTimestamp": 1601961451668, - "lastModifiedTimestamp": 1601961451668, - "childProfileIds": [] - } -] \ No newline at end of file + { + "model_type": "Profile", + "id": 1, + "customerId": 2, + "profileType": "radius", + "name": "Radius-Profile", + "details": { + "model_type": "RadiusProfile", + "primaryRadiusServer": { + "model_type": "RadiusServer", + "ipAddress": "192.168.0.1", + "secret": "testing123", + "authPort": 1812, + "timeout": null + }, + "secondaryRadiusServer": { + "model_type": "RadiusServer", + "ipAddress": "192.168.0.2", + "secret": "testing123", + "authPort": 1812, + "timeout": null + }, + "radiusSubnetConfiguration": null, + "profileType": "radius" + }, + "createdTimestamp": 1611262628767, + "lastModifiedTimestamp": 1611262628767, + "childProfileIds": [ + ] + } +] diff --git a/opensync-ext-static/src/main/resources/ProfileRf.json b/opensync-ext-static/src/main/resources/ProfileRf.json index 0a3a9cf..96330d1 100644 --- a/opensync-ext-static/src/main/resources/ProfileRf.json +++ b/opensync-ext-static/src/main/resources/ProfileRf.json @@ -1,6 +1,6 @@ { "model_type": "Profile", - "id": 11, + "id": 4, "customerId": 2, "profileType": "rf", "name": "TipWlan-rf", @@ -198,7 +198,7 @@ }, "profileType": "rf" }, - "createdTimestamp": 1606778369933, - "lastModifiedTimestamp": 1606778369933, + "createdTimestamp": 1611262628788, + "lastModifiedTimestamp": 1611262628788, "childProfileIds": [] } \ 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 75c0435..27f36f6 100644 --- a/opensync-ext-static/src/main/resources/ProfileSsid.json +++ b/opensync-ext-static/src/main/resources/ProfileSsid.json @@ -20,9 +20,9 @@ "broadcastSsid": "enabled", "keyRefresh": 0, "noLocalSubnets": false, - "radiusServiceName": null, - "radiusAccountingServiceName": null, - "radiusAcountingServiceInterval": null, + "radiusServiceId": 0, + "radiusAccountingServiceId": 0, + "radiusAcountingServiceInterval": 60, "captivePortalId": null, "bandwidthLimitDown": 0, "bandwidthLimitUp": 0, @@ -76,27 +76,27 @@ }, { "model_type": "Profile", - "id": 15, + "id": 32, "customerId": 2, "profileType": "ssid", - "name": "TipWlan-cloud-passpoint-access", + "name": "access-ssid-profile-2021-01-21T21:28:58.871Z", "details": { "model_type": "SsidConfiguration", - "ssid": "TipWlan-cloud-passpoint-access", + "ssid": "ssid-access-passpoint", "appliedRadios": [ - "is5GHzL", - "is5GHzU" + "is5GHzU", + "is5GHzL" ], "ssidAdminState": "enabled", - "secureMode": "wpa2PSK", + "secureMode": "wpa2EAP", "vlanId": 1, "keyStr": "testing123", "broadcastSsid": "enabled", "keyRefresh": 0, "noLocalSubnets": false, - "radiusServiceName": null, - "radiusAccountingServiceName": null, - "radiusAcountingServiceInterval": null, + "radiusServiceId": 1, + "radiusAccountingServiceId": 1, + "radiusAcountingServiceInterval": 60, "captivePortalId": null, "bandwidthLimitDown": 0, "bandwidthLimitUp": 0, @@ -104,18 +104,6 @@ "clientBandwidthLimitUp": 0, "videoTrafficOnly": false, "radioBasedConfigs": { - "is5GHzL": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is2dot4GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, "is5GHz": { "model_type": "RadioBasedSsidConfiguration", "enable80211r": null, @@ -127,13 +115,24 @@ "enable80211r": null, "enable80211k": null, "enable80211v": null + }, + "is2dot4GHz": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + }, + "is5GHzL": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null } }, "bonjourGatewayProfileId": null, "enable80211w": null, "wepConfig": null, "forwardMode": null, - "profileType": "ssid", "radiusClientConfiguration": { "model_type": "RadiusNasConfiguration", "nasClientId": "DEFAULT", @@ -141,23 +140,25 @@ "userDefinedNasId": null, "userDefinedNasIp": null, "operatorId": null - } + }, + "profileType": "ssid" }, - "createdTimestamp": 1606778369943, - "lastModifiedTimestamp": 1606778370811, + "createdTimestamp": 0, + "lastModifiedTimestamp": 1611264539281, "childProfileIds": [ - 24 + 37, + 1 ] }, { "model_type": "Profile", - "id": 16, + "id": 31, "customerId": 2, "profileType": "ssid", - "name": "TipWlan-cloud-passpoint-osu", + "name": "osu-ssid-profile-2021-01-21T21:28:58.798Z", "details": { "model_type": "SsidConfiguration", - "ssid": "TipWlan-cloud-passpoint-osu", + "ssid": "ssid-open-passpoint", "appliedRadios": [ "is2dot4GHz" ], @@ -168,9 +169,9 @@ "broadcastSsid": "enabled", "keyRefresh": 0, "noLocalSubnets": false, - "radiusServiceName": null, - "radiusAccountingServiceName": null, - "radiusAcountingServiceInterval": null, + "radiusServiceId": 0, + "radiusAccountingServiceId": 0, + "radiusAcountingServiceInterval": 60, "captivePortalId": null, "bandwidthLimitDown": 0, "bandwidthLimitUp": 0, @@ -178,18 +179,6 @@ "clientBandwidthLimitUp": 0, "videoTrafficOnly": false, "radioBasedConfigs": { - "is5GHzL": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is2dot4GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, "is5GHz": { "model_type": "RadioBasedSsidConfiguration", "enable80211r": null, @@ -201,13 +190,24 @@ "enable80211r": null, "enable80211k": null, "enable80211v": null + }, + "is2dot4GHz": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + }, + "is5GHzL": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null } }, "bonjourGatewayProfileId": null, "enable80211w": null, "wepConfig": null, "forwardMode": null, - "profileType": "ssid", "radiusClientConfiguration": { "model_type": "RadiusNasConfiguration", "nasClientId": "DEFAULT", @@ -215,13 +215,13 @@ "userDefinedNasId": null, "userDefinedNasIp": null, "operatorId": null - } + }, + "profileType": "ssid" }, - "createdTimestamp": 1606778369944, - "lastModifiedTimestamp": 1606778370352, + "createdTimestamp": 0, + "lastModifiedTimestamp": 1611264539231, "childProfileIds": [ - 19, - 20 + 37 ] } ] diff --git a/opensync-ext-static/src/main/resources/ProfileVenue.json b/opensync-ext-static/src/main/resources/ProfileVenue.json index 820929f..fd674e3 100644 --- a/opensync-ext-static/src/main/resources/ProfileVenue.json +++ b/opensync-ext-static/src/main/resources/ProfileVenue.json @@ -1,43 +1,42 @@ [ - { - "model_type": "Profile", - "id": 18, - "customerId": 2, - "profileType": "passpoint_venue", - "name": "TipWlan-Passpoint-Venue", - "details": { - "model_type": "PasspointVenueProfile", - "venueNameSet": [ - { - "model_type": "PasspointVenueName", - "locale": "fr_CA", - "dupleIso3Language": "fra", - "dupleName": "Exemple de lieu", - "defaultDupleSeparator": ":", - "venueUrl": "http://www.example.com/info-fra", - "asDuple": "fra:Exemple de lieu" - }, - { - "model_type": "PasspointVenueName", - "locale": "en_CA", - "dupleIso3Language": "eng", - "dupleName": "Example passpoint_venue", - "defaultDupleSeparator": ":", - "venueUrl": "http://www.example.com/info-eng", - "asDuple": "eng:Example passpoint_venue" - } - ], - "venueTypeAssignment": { - "model_type": "PasspointVenueTypeAssignment", - "venueDescription": "Research and Development Facility", - "venueGroupId": 2, - "venueTypeId": 8 - }, - "profileType": "passpoint_venue" - }, - "createdTimestamp": 1606778369950, - "lastModifiedTimestamp": 1606778369950, - "childProfileIds": [ - ] - } -] +{ + "model_type": "Profile", + "id": 33, + "customerId": 2, + "profileType": "passpoint_venue", + "name": "venue-profile-2021-01-21T21:28:58.934Z", + "details": { + "model_type": "PasspointVenueProfile", + "venueNameSet": [ + { + "model_type": "PasspointVenueName", + "locale": "fra", + "dupleIso3Language": "fra", + "dupleName": "Exemple de lieu", + "defaultDupleSeparator": ":", + "venueUrl": "http://www.example.com/info-fra", + "asDuple": "fra:Exemple de lieu" + }, + { + "model_type": "PasspointVenueName", + "locale": "eng", + "dupleIso3Language": "eng", + "dupleName": "Example passpoint_venue", + "defaultDupleSeparator": ":", + "venueUrl": "http://www.example.com/info-eng", + "asDuple": "eng:Example passpoint_venue" + } + ], + "venueTypeAssignment": { + "model_type": "PasspointVenueTypeAssignment", + "venueDescription": "Research and Development Facility", + "venueGroupId": 2, + "venueTypeId": 8 + }, + "profileType": "passpoint_venue" + }, + "createdTimestamp": 1611264538947, + "lastModifiedTimestamp": 1611264538947, + "childProfileIds": [] +} +] \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/EquipmentExample.json b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/EquipmentExample.json index a05e266..232b2b3 100644 --- a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/EquipmentExample.json +++ b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/EquipmentExample.json @@ -1,221 +1,261 @@ { - "model_type": "Equipment", - "id": 51, - "customerId": 2, - "profileId": 12, - "locationId": 8, - "equipmentType": "AP", - "inventoryId": "Test_Client_21P10C68818122", - "name": "Test_Client_21P10C68818122", - "details": { - "model_type": "ApElementConfiguration", - "equipmentModel": "EA8300-CA", - "elementConfigVersion": "AP-V1", + "model_type": "Equipment", + "id": 1, + "customerId": 2, + "profileId": 38, + "locationId": 8, "equipmentType": "AP", - "deviceMode": "standaloneAP", - "gettingIP": "dhcp", - "staticIP": null, - "staticIpMaskCidr": null, - "staticIpGw": null, - "gettingDNS": "dhcp", - "staticDnsIp1": null, - "staticDnsIp2": null, - "peerInfoList": [], - "deviceName": "Default Device Name", - "locationData": null, - "locallyConfiguredMgmtVlan": 0, - "locallyConfigured": false, - "deploymentType": "CEILING", - "syntheticClientEnabled": null, - "frameReportThrottleEnabled": true, - "antennaType": "OMNI", - "costSavingEventsEnabled": true, - "forwardMode": "BRIDGE", - "radioMap": { - "is2dot4GHz": { - "model_type": "ElementRadioConfiguration", - "radioType": "is2dot4GHz", - "channelNumber": 6, - "manualChannelNumber": 6, - "backupChannelNumber": 11, - "bannedChannels": [], - "allowedChannels": [], - "rxCellSizeDb": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": -90 + "inventoryId": "Open_AP_21P10C68818122", + "name": "Open_AP_21P10C68818122", + "details": { + "model_type": "ApElementConfiguration", + "equipmentModel": "EA8300-CA", + "elementConfigVersion": "AP-V1", + "equipmentType": "AP", + "deviceMode": "standaloneAP", + "gettingIP": "dhcp", + "staticIP": null, + "staticIpMaskCidr": null, + "staticIpGw": null, + "gettingDNS": "dhcp", + "staticDnsIp1": null, + "staticDnsIp2": null, + "peerInfoList": [], + "deviceName": "Open_AP_21P10C68818122", + "locationData": null, + "locallyConfiguredMgmtVlan": 0, + "locallyConfigured": false, + "deploymentType": "CEILING", + "syntheticClientEnabled": null, + "frameReportThrottleEnabled": true, + "antennaType": "OMNI", + "costSavingEventsEnabled": true, + "forwardMode": "BRIDGE", + "radioMap": { + "is2dot4GHz": { + "model_type": "ElementRadioConfiguration", + "radioType": "is2dot4GHz", + "channelNumber": 6, + "manualChannelNumber": 6, + "backupChannelNumber": 11, + "allowedChannels": [ + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11 + ], + "rxCellSizeDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "eirpTxPower": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": 18 + }, + "perimeterDetectionEnabled": true, + "bestAPSteerType": "both", + "deauthAttackDetection": null, + "allowedChannelsPowerLevels": [] + }, + "is5GHzU": { + "model_type": "ElementRadioConfiguration", + "radioType": "is5GHzU", + "channelNumber": 149, + "manualChannelNumber": 149, + "backupChannelNumber": 154, + "allowedChannels": [ + 161, + 149, + 165, + 153, + 157 + ], + "rxCellSizeDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "eirpTxPower": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": 18 + }, + "perimeterDetectionEnabled": true, + "bestAPSteerType": "both", + "deauthAttackDetection": null, + "allowedChannelsPowerLevels": [] + }, + "is5GHzL": { + "model_type": "ElementRadioConfiguration", + "radioType": "is5GHzL", + "channelNumber": 36, + "manualChannelNumber": 36, + "backupChannelNumber": 44, + "allowedChannels": [ + 48, + 36, + 40, + 44 + ], + "rxCellSizeDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "eirpTxPower": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": 18 + }, + "perimeterDetectionEnabled": true, + "bestAPSteerType": "both", + "deauthAttackDetection": null, + "allowedChannelsPowerLevels": [] + } }, - "probeResponseThresholdDb": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": -90 - }, - "eirpTxPower": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": 32 - }, - "perimeterDetectionEnabled": true, - "bestAPSteerType": "both", - "deauthAttackDetection": null, - "allowedChannelsPowerLevels": [], - "activeChannel": 6 - }, - "is5GHzU": { - "model_type": "ElementRadioConfiguration", - "radioType": "is5GHzU", - "channelNumber": 149, - "manualChannelNumber": 149, - "backupChannelNumber": 154, - "bannedChannels": [], - "allowedChannels": [], - "rxCellSizeDb": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": -90 - }, - "eirpTxPower": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": 32 - }, - "perimeterDetectionEnabled": true, - "bestAPSteerType": "both", - "deauthAttackDetection": null, - "allowedChannelsPowerLevels": [], - "activeChannel": 149 - }, - "is5GHzL": { - "model_type": "ElementRadioConfiguration", - "radioType": "is5GHzL", - "channelNumber": 36, - "manualChannelNumber": 36, - "backupChannelNumber": 44, - "bannedChannels": [], - "allowedChannels": [], - "rxCellSizeDb": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": -90 - }, - "eirpTxPower": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": 32 - }, - "perimeterDetectionEnabled": true, - "bestAPSteerType": "both", - "deauthAttackDetection": null, - "allowedChannelsPowerLevels": [], - "activeChannel": 36 - } + "advancedRadioMap": { + "is2dot4GHz": { + "model_type": "RadioConfiguration", + "radioType": "is2dot4GHz", + "radioAdminState": "enabled", + "fragmentationThresholdBytes": 2346, + "uapsdState": "enabled", + "stationIsolation": "disabled", + "multicastRate": { + "model_type": "SourceSelectionMulticast", + "source": "profile", + "value": "auto" + }, + "managementRate": { + "model_type": "SourceSelectionManagement", + "source": "profile", + "value": "auto" + }, + "bestApSettings": { + "model_type": "SourceSelectionSteering", + "source": "manual", + "value": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 20, + "minLoadFactor": 50 + } + }, + "legacyBSSRate": "enabled", + "dtimPeriod": 2, + "deauthAttackDetection": null + }, + "is5GHzU": { + "model_type": "RadioConfiguration", + "radioType": "is5GHzU", + "radioAdminState": "enabled", + "fragmentationThresholdBytes": 2346, + "uapsdState": "enabled", + "stationIsolation": "disabled", + "multicastRate": { + "model_type": "SourceSelectionMulticast", + "source": "profile", + "value": "auto" + }, + "managementRate": { + "model_type": "SourceSelectionManagement", + "source": "profile", + "value": "auto" + }, + "bestApSettings": { + "model_type": "SourceSelectionSteering", + "source": "manual", + "value": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 30, + "minLoadFactor": 40 + } + }, + "legacyBSSRate": "enabled", + "dtimPeriod": 2, + "deauthAttackDetection": null + }, + "is5GHzL": { + "model_type": "RadioConfiguration", + "radioType": "is5GHzL", + "radioAdminState": "enabled", + "fragmentationThresholdBytes": 2346, + "uapsdState": "enabled", + "stationIsolation": "disabled", + "multicastRate": { + "model_type": "SourceSelectionMulticast", + "source": "profile", + "value": "auto" + }, + "managementRate": { + "model_type": "SourceSelectionManagement", + "source": "profile", + "value": "auto" + }, + "bestApSettings": { + "model_type": "SourceSelectionSteering", + "source": "manual", + "value": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 30, + "minLoadFactor": 40 + } + }, + "legacyBSSRate": "enabled", + "dtimPeriod": 2, + "deauthAttackDetection": null + } + } }, - "advancedRadioMap": { - "is2dot4GHz": { - "model_type": "RadioConfiguration", - "radioType": "is2dot4GHz", - "radioAdminState": "enabled", - "fragmentationThresholdBytes": 2346, - "uapsdState": "enabled", - "stationIsolation": "disabled", - "managementRate": { - "model_type": "SourceSelectionManagement", - "source": "auto", - "value": "auto" - }, - "bestApSettings": { - "model_type": "SourceSelectionSteering", - "source": "auto", - "value": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } - }, - "legacyBSSRate": "enabled", - "deauthAttackDetection": null - }, - "is5GHzU": { - "model_type": "RadioConfiguration", - "radioType": "is5GHzU", - "radioAdminState": "enabled", - "fragmentationThresholdBytes": 2346, - "uapsdState": "enabled", - "stationIsolation": "disabled", - "managementRate": { - "model_type": "SourceSelectionManagement", - "source": "auto", - "value": "auto" - }, - "bestApSettings": { - "model_type": "SourceSelectionSteering", - "source": "auto", - "value": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } - }, - "legacyBSSRate": "enabled", - "deauthAttackDetection": null - }, - "is5GHzL": { - "model_type": "RadioConfiguration", - "radioType": "is5GHzL", - "radioAdminState": "enabled", - "fragmentationThresholdBytes": 2346, - "uapsdState": "enabled", - "stationIsolation": "disabled", - "managementRate": { - "model_type": "SourceSelectionManagement", - "source": "auto", - "value": "auto" - }, - "bestApSettings": { - "model_type": "SourceSelectionSteering", - "source": "auto", - "value": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } - }, - "legacyBSSRate": "enabled", - "deauthAttackDetection": null - } - } - }, - "latitude": null, - "longitude": null, - "serial": "21P10C68818122", - "createdTimestamp": 1591653239821, - "lastModifiedTimestamp": 1591653241398 -} + "latitude": null, + "longitude": null, + "baseMacAddress": { + "model_type": "MacAddress", + "address": "JPWi7y5T", + "addressAsString": "24:f5:a2:ef:2e:53" + }, + "serial": "21P10C68818122", + "createdTimestamp": 0, + "lastModifiedTimestamp": 1611264546193 +} \ No newline at end of file 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 9001597..b2c6ae0 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,73 +1,67 @@ { - "model_type": "Profile", - "id": 12, - "customerId": 2, - "profileType": "equipment_ap", - "name": "ApProfile-3-radios", - "details": { - "model_type": "ApNetworkConfiguration", - "networkConfigVersion": "AP-1", - "equipmentType": "AP", - "vlanNative": true, - "vlan": 0, - "ntpServer": { - "model_type": "AutoOrManualString", - "auto": true, - "value": "pool.ntp.org" - }, - "syslogRelay": null, - "rtlsSettings": null, - "syntheticClientEnabled": true, - "ledControlEnabled": true, - "equipmentDiscovery": false, + "model_type": "Profile", + "id": 38, + "customerId": 2, + "profileType": "equipment_ap", + "name": "ap-profile-2021-01-21T21:28:59.371Z", + "details": { + "model_type": "ApNetworkConfiguration", + "networkConfigVersion": "AP-1", + "equipmentType": "AP", + "vlanNative": true, + "vlan": 0, + "ntpServer": { + "model_type": "AutoOrManualString", + "auto": true, + "value": "pool.ntp.org" + }, + "syslogRelay": null, + "rtlsSettings": null, + "syntheticClientEnabled": true, + "ledControlEnabled": true, + "equipmentDiscovery": false, + "radioMap": { + "is5GHz": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + }, + "is2dot4GHz": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + }, + "is5GHzU": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + }, + "is5GHzL": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + } + }, + "greTunnelConfigurations": [ + { + "model_type": "GreTunnelConfiguration", "greTunnelName": null, "greParentIfName": null, "greLocalInetAddr": null, "greRemoteInetAddr": null, "greRemoteMacAddr": null, - "radioMap": { - "is2dot4GHz": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is5GHzU": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is5GHzL": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - } - }, - "greTunnelConfigurations": [ - { - "model_type": "GreTunnelConfiguration", - "greTunnelName": "gre1", - "greParentIfName": "wan", - "greLocalInetAddr": "10.0.0.129", - "greRemoteInetAddr": "192.168.1.101", - "greRemoteMacAddr": { - "model_type": "MacAddress", - "address": "ZEvwIFf/", - "addressAsString": "64:4b:f0:20:57:ff" - }, - "vlanIdsInGreTunnel": [ - 100 - ] - } - ], - "profileType": "equipment_ap" - }, - "createdTimestamp": 1606778369934, - "lastModifiedTimestamp": 1606778443413, - "childProfileIds": [ - 16, - 5, - 10, - 11, - 15 - ] -} \ No newline at end of file + "vlanIdsInGreTunnel": [ + ] + } + ], + "profileType": "equipment_ap" + }, + "createdTimestamp": 1611264539383, + "lastModifiedTimestamp": 1611264539383, + "childProfileIds": [ + 4, + 5, + 31, + 32 + ] +} 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 9c9b52f..9c1a3d0 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,135 +1,138 @@ [ -{ + { "model_type": "Profile", - "id": 14, + "id": 5, "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": "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": 1611262628973, + "expirationTime": 1611291428973, + "numDevices": 1, + "userDetails": { + "model_type": "TimedAccessUserDetails", + "firstName": "Pac", + "lastName": "Man", + "passwordNeedsReset": false + }, + "userMacAddresses": [ { - "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 + "model_type": "MacAddress", + "address": "fKtg5upO", + "addressAsString": "7c:ab:60:e6:ea:4e" } - ], - "macAllowList": [], - "profileType": "captive_portal" + ], + "lastModifiedTimestamp": 0 + }, + { + "model_type": "TimedAccessUserRecord", + "username": "customer", + "password": "testing123", + "activationTime": 1611262628974, + "expirationTime": 1611266228974, + "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": 1611262628974, + "expirationTime": 1611867428974, + "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": 1611262628974, + "expirationTime": 1611349028974, + "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 + "createdTimestamp": 1611262628978, + "lastModifiedTimestamp": 1611262628978, + "childProfileIds": [ + ] + } +] 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 b15c575..7c0559e 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,71 +1,71 @@ [ - { - "model_type": "Profile", - "id": 24, - "customerId": 2, - "profileType": "passpoint", - "name": "TipWlan-Passpoint-Config", - "details": { - "model_type": "PasspointProfile", - "enableInterworkingAndHs20": true, - "hessid": null, - "passpointAccessNetworkType": "free_public_network", - "passpointNetworkAuthenticationType": "acceptance_of_terms_and_conditions", - "additionalStepsRequiredForAccess": 0, - "deauthRequestTimeout": 0, - "operatingClass": 0, - "termsAndConditionsFile": { - "model_type": "ManagedFileInfo", - "md5checksum": null, - "lastModifiedTimestamp": null, - "apExportUrl": "https://localhost:9091/filestore/termsAndConditions", - "fileCategory": "ExternalPolicyConfiguration", - "fileType": "TEXT", - "altSlot": false - }, - "whitelistDomain": null, - "emergencyServicesReachable": true, - "unauthenticatedEmergencyServiceAccessible": false, - "internetConnectivity": true, - "connectionCapabilitySet": [ - { - "model_type": "PasspointConnectionCapability", - "connectionCapabilitiesPortNumber": 8888, - "connectionCapabilitiesStatus": "open", - "connectionCapabilitiesIpProtocol": "TCP" - } - ], - "ipAddressTypeAvailability": "public_IPv4_address_available", - "qosMapSetConfiguration": null, - "apGeospatialLocation": null, - "apCivicLocation": null, - "apPublicLocationIdUri": null, - "gasAddr3Behaviour": "p2pSpecWorkaroundFromRequest", - "anqpDomainId": 1234, - "disableDownstreamGroupAddressedForwarding": false, - "enable2pt4GHz": true, - "enable5GHz": true, - "associatedAccessSsidProfileIds": [ - 15 - ], - "osuSsidProfileId": 16, - "passpointOperatorProfileId": 17, - "passpointVenueProfileId": 18, - "passpointOsuProviderProfileIds": [ - 19, - 20 - ], - "accessNetworkType": "free_public_network", - "networkAuthenticationType": "acceptance_of_terms_and_conditions", - "profileType": "passpoint" - }, - "createdTimestamp": 1606778370807, - "lastModifiedTimestamp": 1606778370807, - "childProfileIds": [ - 17, - 18, - 19, - 20 - ] - } +{ + "model_type": "Profile", + "id": 37, + "customerId": 2, + "profileType": "passpoint", + "name": "hotspot20-profile-2021-01-21T21:28:59.171Z", + "details": { + "model_type": "PasspointProfile", + "enableInterworkingAndHs20": true, + "hessid": null, + "passpointAccessNetworkType": "free_public_network", + "passpointNetworkAuthenticationType": "acceptance_of_terms_and_conditions", + "additionalStepsRequiredForAccess": 0, + "deauthRequestTimeout": 0, + "operatingClass": 0, + "termsAndConditionsFile": { + "model_type": "ManagedFileInfo", + "md5checksum": null, + "lastModifiedTimestamp": null, + "apExportUrl": "https://localhost:9091/filestore/termsAndConditions", + "fileCategory": "ExternalPolicyConfiguration", + "fileType": "TEXT", + "altSlot": false + }, + "whitelistDomain": null, + "emergencyServicesReachable": true, + "unauthenticatedEmergencyServiceAccessible": false, + "internetConnectivity": true, + "connectionCapabilitySet": [ + { + "model_type": "PasspointConnectionCapability", + "connectionCapabilitiesPortNumber": 8888, + "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, + "associatedAccessSsidProfileIds": [ + 32 + ], + "osuSsidProfileId": 31, + "passpointOperatorProfileId": 34, + "passpointVenueProfileId": 33, + "passpointOsuProviderProfileIds": [ + 35, + 36 + ], + "accessNetworkType": "free_public_network", + "networkAuthenticationType": "acceptance_of_terms_and_conditions", + "profileType": "passpoint" + }, + "createdTimestamp": 0, + "lastModifiedTimestamp": 1611264539331, + "childProfileIds": [ + 33, + 34, + 35, + 36 + ] +} ] 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 6fdb9c2..c9ee1e9 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,265 +1,263 @@ [ - { - "model_type": "Profile", - "id": 19, - "customerId": 2, - "profileType": "passpoint_osu_id_provider", - "name": "TipWlan-Passpoint-OSU-Provider", - "details": { - "model_type": "PasspointOsuProviderProfile", - "mccMncList": [ - { - "model_type": "PasspointMccMnc", - "mcc": 302, - "mnc": 720, - "iso": "ca", - "country": "Canada", - "countryCode": 1, - "network": "Rogers AT&T Wireless", - "mccMncPairing": "302,720" - } - ], - "naiRealmList": [ - { - "model_type": "PasspointNaiRealmInformation", - "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" - ], - "EAP-TLS with certificate": [ - "Credential Type:Certificate" - ] - } - } - ], - "osuIconList": [ - { - "model_type": "PasspointOsuIcon", - "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": "PasspointOsuIcon", - "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": "PasspointOsuIcon", - "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" - } - ], - "osuServerUri": "https://example.com/osu/rogers", - "osuFriendlyName": [ - { - "model_type": "PasspointDuple", - "locale": "en_CA", - "dupleIso3Language": "eng", - "dupleName": "Example provider rogers", - "defaultDupleSeparator": ":", - "asDuple": "eng:Example provider rogers" - }, - { - "model_type": "PasspointDuple", - "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": "PasspointDuple", - "locale": "en_CA", - "dupleIso3Language": "eng", - "dupleName": "Example services rogers", - "defaultDupleSeparator": ":", - "asDuple": "eng:Example services rogers" - }, - { - "model_type": "PasspointDuple", - "locale": "fr_CA", - "dupleIso3Language": "fra", - "dupleName": "Exemples de services rogers", - "defaultDupleSeparator": ":", - "asDuple": "fra:Exemples de services rogers" - } - ], + { + "model_type": "Profile", + "id": 35, + "customerId": 2, + "profileType": "passpoint_osu_id_provider", + "name": "provider1-profile-2021-01-21T21:28:59.057Z", + "details": { + "model_type": "PasspointOsuProviderProfile", + "mccMncList": [ + { + "model_type": "PasspointMccMnc", + "mcc": 302, + "mnc": 720, + "iso": "ca", + "country": "Canada", + "countryCode": 1, + "network": "Rogers AT&T Wireless", + "mccMncPairing": "302,720" + } + ], + "naiRealmList": [ + { + "model_type": "PasspointNaiRealmInformation", + "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" + ], + "EAP-TLS with certificate": [ + "Credential Type:Certificate" + ] + } + } + ], + "osuIconList": [ + { + "model_type": "PasspointOsuIcon", + "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": "PasspointOsuIcon", + "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": "PasspointOsuIcon", + "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" + } + ], + "osuServerUri": "https://example.com/osu/rogers", + "osuFriendlyName": [ + { + "model_type": "PasspointDuple", + "locale": "eng", + "dupleIso3Language": "eng", + "dupleName": "Example provider rogers", + "defaultDupleSeparator": ":", + "asDuple": "eng:Example provider rogers" + }, + { + "model_type": "PasspointDuple", + "locale": "fra", + "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": "PasspointDuple", + "locale": "eng", + "dupleIso3Language": "eng", + "dupleName": "Example services rogers", + "defaultDupleSeparator": ":", + "asDuple": "eng:Example services rogers" + }, + { + "model_type": "PasspointDuple", + "locale": "fra", + "dupleIso3Language": "fra", + "dupleName": "Exemples de services rogers", + "defaultDupleSeparator": ":", + "asDuple": "fra:Exemples de services rogers" + } + ], "roamingOi": [ "BAA2D00100", "BAA2D00000" ], - "profileType": "passpoint_osu_id_provider" - }, - "createdTimestamp": 1606778370345, - "lastModifiedTimestamp": 1606778370345, - "childProfileIds": [ - ] - }, - { - "model_type": "Profile", - "id": 20, - "customerId": 2, - "profileType": "passpoint_osu_id_provider", - "name": "TipWlan-Passpoint-OSU-Provider-2", - "details": { - "model_type": "PasspointOsuProviderProfile", - "mccMncList": [ - { - "model_type": "PasspointMccMnc", - "mcc": 302, - "mnc": 220, - "iso": "ca", - "country": "Canada", - "countryCode": 1, - "network": "Telus Mobility", - "mccMncPairing": "302,220" - } - ], - "naiRealmList": [ - { - "model_type": "PasspointNaiRealmInformation", - "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" - ], - "EAP-TLS with certificate": [ - "Credential Type:Certificate" - ] - } - } - ], - "osuIconList": [ - { - "model_type": "PasspointOsuIcon", - "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": "PasspointOsuIcon", - "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": "PasspointOsuIcon", - "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" - } - ], - "osuServerUri": "https://example.com/osu/telus", - "osuFriendlyName": [ - { - "model_type": "PasspointDuple", - "locale": "en_CA", - "dupleIso3Language": "eng", - "dupleName": "Example provider telus", - "defaultDupleSeparator": ":", - "asDuple": "eng:Example provider telus" - }, - { - "model_type": "PasspointDuple", - "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": "PasspointDuple", - "locale": "en_CA", - "dupleIso3Language": "eng", - "dupleName": "Example services telus", - "defaultDupleSeparator": ":", - "asDuple": "eng:Example services telus" - }, - { - "model_type": "PasspointDuple", - "locale": "fr_CA", - "dupleIso3Language": "fra", - "dupleName": "Exemples de services telus", - "defaultDupleSeparator": ":", - "asDuple": "fra:Exemples de services telus" - } - ], - "roamingOi": [ + "profileType": "passpoint_osu_id_provider" + }, + "createdTimestamp": 1611264539070, + "lastModifiedTimestamp": 1611264539070, + "childProfileIds": [] + }, + { + "model_type": "Profile", + "id": 36, + "customerId": 2, + "profileType": "passpoint_osu_id_provider", + "name": "provider2-profile-2021-01-21T21:28:59.118Z", + "details": { + "model_type": "PasspointOsuProviderProfile", + "mccMncList": [ + { + "model_type": "PasspointMccMnc", + "mcc": 302, + "mnc": 220, + "iso": "ca", + "country": "Canada", + "countryCode": 1, + "network": "Telus Mobility", + "mccMncPairing": "302,220" + } + ], + "naiRealmList": [ + { + "model_type": "PasspointNaiRealmInformation", + "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" + ], + "EAP-TLS with certificate": [ + "Credential Type:Certificate" + ] + } + } + ], + "osuIconList": [ + { + "model_type": "PasspointOsuIcon", + "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": "PasspointOsuIcon", + "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": "PasspointOsuIcon", + "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" + } + ], + "osuServerUri": "https://example.com/osu/telus", + "osuFriendlyName": [ + { + "model_type": "PasspointDuple", + "locale": "eng", + "dupleIso3Language": "eng", + "dupleName": "Example provider telus", + "defaultDupleSeparator": ":", + "asDuple": "eng:Example provider telus" + }, + { + "model_type": "PasspointDuple", + "locale": "fra", + "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": "PasspointDuple", + "locale": "eng", + "dupleIso3Language": "eng", + "dupleName": "Example services telus", + "defaultDupleSeparator": ":", + "asDuple": "eng:Example services telus" + }, + { + "model_type": "PasspointDuple", + "locale": "fra", + "dupleIso3Language": "fra", + "dupleName": "Exemples de services telus", + "defaultDupleSeparator": ":", + "asDuple": "fra:Exemples de services telus" + } + ], + "roamingOi": [ "004096", "005014", "F4F5E8F5F4" ], - "profileType": "passpoint_osu_id_provider" - }, - "createdTimestamp": 1606778370351, - "lastModifiedTimestamp": 1606778370351, - "childProfileIds": [ - ] - } -] + "profileType": "passpoint_osu_id_provider" + }, + "createdTimestamp": 1611264539131, + "lastModifiedTimestamp": 1611264539131, + "childProfileIds": [] + } +] \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileOperator.json b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileOperator.json index 6554732..0d8df1d 100644 --- a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileOperator.json +++ b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileOperator.json @@ -1,42 +1,41 @@ [ - { - "model_type": "Profile", - "id": 17, - "customerId": 2, - "profileType": "passpoint_operator", - "name": "TipWlan-Passpoint-Operator", - "details": { - "model_type": "PasspointOperatorProfile", - "serverOnlyAuthenticatedL2EncryptionNetwork": false, - "x509CertificateLocation": "/etc/ca.pem", - "operatorFriendlyName": [ - { - "model_type": "PasspointDuple", - "locale": "en_CA", - "dupleIso3Language": "eng", - "dupleName": "Default friendly passpoint_operator name", - "defaultDupleSeparator": ":", - "asDuple": "eng:Default friendly passpoint_operator name" - }, - { - "model_type": "PasspointDuple", - "locale": "fr_CA", - "dupleIso3Language": "fra", - "dupleName": "Nom de l'opérateur convivial par défaut", - "defaultDupleSeparator": ":", - "asDuple": "fra:Nom de l'opérateur convivial par défaut" - } - ], - "domainNameList": [ - "telus.com", - "rogers.com", - "bell.ca" - ], - "profileType": "passpoint_operator" - }, - "createdTimestamp": 1606778369945, - "lastModifiedTimestamp": 1606778369945, - "childProfileIds": [ - ] - } -] +{ + "model_type": "Profile", + "id": 34, + "customerId": 2, + "profileType": "passpoint_operator", + "name": "operator-profile-2021-01-21T21:28:58.994Z", + "details": { + "model_type": "PasspointOperatorProfile", + "serverOnlyAuthenticatedL2EncryptionNetwork": false, + "x509CertificateLocation": "/etc/ca.pem", + "operatorFriendlyName": [ + { + "model_type": "PasspointDuple", + "locale": "fra", + "dupleIso3Language": "fra", + "dupleName": "Nom de l'opérateur convivial par défaut", + "defaultDupleSeparator": ":", + "asDuple": "fra:Nom de l'opérateur convivial par défaut" + }, + { + "model_type": "PasspointDuple", + "locale": "eng", + "dupleIso3Language": "eng", + "dupleName": "Default friendly passpoint_operator name", + "defaultDupleSeparator": ":", + "asDuple": "eng:Default friendly passpoint_operator name" + } + ], + "domainNameList": [ + "bell.ca", + "telus.com", + "rogers.com" + ], + "profileType": "passpoint_operator" + }, + "createdTimestamp": 1611264539004, + "lastModifiedTimestamp": 1611264539004, + "childProfileIds": [] +} +] \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileRadius.json b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileRadius.json index d7390a1..0a49b4d 100644 --- a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileRadius.json +++ b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileRadius.json @@ -1,34 +1,32 @@ [ - { - "model_type": "Profile", - "id": 1, - "customerId": 2, - "profileType": "radius", - "name": "Radius-Profile", - "details": { - "model_type": "RadiusProfile", - "subnetConfiguration": null, - "serviceRegionMap": { - "Ottawa": { - "model_type": "RadiusServiceRegion", - "serverMap": { - "Radius-Profile": [ - { - "model_type": "RadiusServer", - "ipAddress": "192.168.0.1", - "secret": "testing123", - "authPort": 1812, - "timeout": null - } - ] - }, - "regionName": "Ottawa" - } - }, - "profileType": "radius" - }, - "createdTimestamp": 1601961451668, - "lastModifiedTimestamp": 1601961451668, - "childProfileIds": [] - } -] \ No newline at end of file + { + "model_type": "Profile", + "id": 1, + "customerId": 2, + "profileType": "radius", + "name": "Radius-Profile", + "details": { + "model_type": "RadiusProfile", + "primaryRadiusServer": { + "model_type": "RadiusServer", + "ipAddress": "192.168.0.1", + "secret": "testing123", + "authPort": 1812, + "timeout": null + }, + "secondaryRadiusServer": { + "model_type": "RadiusServer", + "ipAddress": "192.168.0.2", + "secret": "testing123", + "authPort": 1812, + "timeout": null + }, + "radiusSubnetConfiguration": null, + "profileType": "radius" + }, + "createdTimestamp": 1611262628767, + "lastModifiedTimestamp": 1611262628767, + "childProfileIds": [ + ] + } +] diff --git a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileRf.json b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileRf.json index 0a3a9cf..96330d1 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,6 +1,6 @@ { "model_type": "Profile", - "id": 11, + "id": 4, "customerId": 2, "profileType": "rf", "name": "TipWlan-rf", @@ -198,7 +198,7 @@ }, "profileType": "rf" }, - "createdTimestamp": 1606778369933, - "lastModifiedTimestamp": 1606778369933, + "createdTimestamp": 1611262628788, + "lastModifiedTimestamp": 1611262628788, "childProfileIds": [] } \ 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 75c0435..27f36f6 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 @@ -20,9 +20,9 @@ "broadcastSsid": "enabled", "keyRefresh": 0, "noLocalSubnets": false, - "radiusServiceName": null, - "radiusAccountingServiceName": null, - "radiusAcountingServiceInterval": null, + "radiusServiceId": 0, + "radiusAccountingServiceId": 0, + "radiusAcountingServiceInterval": 60, "captivePortalId": null, "bandwidthLimitDown": 0, "bandwidthLimitUp": 0, @@ -76,27 +76,27 @@ }, { "model_type": "Profile", - "id": 15, + "id": 32, "customerId": 2, "profileType": "ssid", - "name": "TipWlan-cloud-passpoint-access", + "name": "access-ssid-profile-2021-01-21T21:28:58.871Z", "details": { "model_type": "SsidConfiguration", - "ssid": "TipWlan-cloud-passpoint-access", + "ssid": "ssid-access-passpoint", "appliedRadios": [ - "is5GHzL", - "is5GHzU" + "is5GHzU", + "is5GHzL" ], "ssidAdminState": "enabled", - "secureMode": "wpa2PSK", + "secureMode": "wpa2EAP", "vlanId": 1, "keyStr": "testing123", "broadcastSsid": "enabled", "keyRefresh": 0, "noLocalSubnets": false, - "radiusServiceName": null, - "radiusAccountingServiceName": null, - "radiusAcountingServiceInterval": null, + "radiusServiceId": 1, + "radiusAccountingServiceId": 1, + "radiusAcountingServiceInterval": 60, "captivePortalId": null, "bandwidthLimitDown": 0, "bandwidthLimitUp": 0, @@ -104,18 +104,6 @@ "clientBandwidthLimitUp": 0, "videoTrafficOnly": false, "radioBasedConfigs": { - "is5GHzL": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is2dot4GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, "is5GHz": { "model_type": "RadioBasedSsidConfiguration", "enable80211r": null, @@ -127,13 +115,24 @@ "enable80211r": null, "enable80211k": null, "enable80211v": null + }, + "is2dot4GHz": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + }, + "is5GHzL": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null } }, "bonjourGatewayProfileId": null, "enable80211w": null, "wepConfig": null, "forwardMode": null, - "profileType": "ssid", "radiusClientConfiguration": { "model_type": "RadiusNasConfiguration", "nasClientId": "DEFAULT", @@ -141,23 +140,25 @@ "userDefinedNasId": null, "userDefinedNasIp": null, "operatorId": null - } + }, + "profileType": "ssid" }, - "createdTimestamp": 1606778369943, - "lastModifiedTimestamp": 1606778370811, + "createdTimestamp": 0, + "lastModifiedTimestamp": 1611264539281, "childProfileIds": [ - 24 + 37, + 1 ] }, { "model_type": "Profile", - "id": 16, + "id": 31, "customerId": 2, "profileType": "ssid", - "name": "TipWlan-cloud-passpoint-osu", + "name": "osu-ssid-profile-2021-01-21T21:28:58.798Z", "details": { "model_type": "SsidConfiguration", - "ssid": "TipWlan-cloud-passpoint-osu", + "ssid": "ssid-open-passpoint", "appliedRadios": [ "is2dot4GHz" ], @@ -168,9 +169,9 @@ "broadcastSsid": "enabled", "keyRefresh": 0, "noLocalSubnets": false, - "radiusServiceName": null, - "radiusAccountingServiceName": null, - "radiusAcountingServiceInterval": null, + "radiusServiceId": 0, + "radiusAccountingServiceId": 0, + "radiusAcountingServiceInterval": 60, "captivePortalId": null, "bandwidthLimitDown": 0, "bandwidthLimitUp": 0, @@ -178,18 +179,6 @@ "clientBandwidthLimitUp": 0, "videoTrafficOnly": false, "radioBasedConfigs": { - "is5GHzL": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is2dot4GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, "is5GHz": { "model_type": "RadioBasedSsidConfiguration", "enable80211r": null, @@ -201,13 +190,24 @@ "enable80211r": null, "enable80211k": null, "enable80211v": null + }, + "is2dot4GHz": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + }, + "is5GHzL": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null } }, "bonjourGatewayProfileId": null, "enable80211w": null, "wepConfig": null, "forwardMode": null, - "profileType": "ssid", "radiusClientConfiguration": { "model_type": "RadiusNasConfiguration", "nasClientId": "DEFAULT", @@ -215,13 +215,13 @@ "userDefinedNasId": null, "userDefinedNasIp": null, "operatorId": null - } + }, + "profileType": "ssid" }, - "createdTimestamp": 1606778369944, - "lastModifiedTimestamp": 1606778370352, + "createdTimestamp": 0, + "lastModifiedTimestamp": 1611264539231, "childProfileIds": [ - 19, - 20 + 37 ] } ] diff --git a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileVenue.json b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileVenue.json index 820929f..fd674e3 100644 --- a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileVenue.json +++ b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileVenue.json @@ -1,43 +1,42 @@ [ - { - "model_type": "Profile", - "id": 18, - "customerId": 2, - "profileType": "passpoint_venue", - "name": "TipWlan-Passpoint-Venue", - "details": { - "model_type": "PasspointVenueProfile", - "venueNameSet": [ - { - "model_type": "PasspointVenueName", - "locale": "fr_CA", - "dupleIso3Language": "fra", - "dupleName": "Exemple de lieu", - "defaultDupleSeparator": ":", - "venueUrl": "http://www.example.com/info-fra", - "asDuple": "fra:Exemple de lieu" - }, - { - "model_type": "PasspointVenueName", - "locale": "en_CA", - "dupleIso3Language": "eng", - "dupleName": "Example passpoint_venue", - "defaultDupleSeparator": ":", - "venueUrl": "http://www.example.com/info-eng", - "asDuple": "eng:Example passpoint_venue" - } - ], - "venueTypeAssignment": { - "model_type": "PasspointVenueTypeAssignment", - "venueDescription": "Research and Development Facility", - "venueGroupId": 2, - "venueTypeId": 8 - }, - "profileType": "passpoint_venue" - }, - "createdTimestamp": 1606778369950, - "lastModifiedTimestamp": 1606778369950, - "childProfileIds": [ - ] - } -] +{ + "model_type": "Profile", + "id": 33, + "customerId": 2, + "profileType": "passpoint_venue", + "name": "venue-profile-2021-01-21T21:28:58.934Z", + "details": { + "model_type": "PasspointVenueProfile", + "venueNameSet": [ + { + "model_type": "PasspointVenueName", + "locale": "fra", + "dupleIso3Language": "fra", + "dupleName": "Exemple de lieu", + "defaultDupleSeparator": ":", + "venueUrl": "http://www.example.com/info-fra", + "asDuple": "fra:Exemple de lieu" + }, + { + "model_type": "PasspointVenueName", + "locale": "eng", + "dupleIso3Language": "eng", + "dupleName": "Example passpoint_venue", + "defaultDupleSeparator": ":", + "venueUrl": "http://www.example.com/info-eng", + "asDuple": "eng:Example passpoint_venue" + } + ], + "venueTypeAssignment": { + "model_type": "PasspointVenueTypeAssignment", + "venueDescription": "Research and Development Facility", + "venueGroupId": 2, + "venueTypeId": 8 + }, + "profileType": "passpoint_venue" + }, + "createdTimestamp": 1611264538947, + "lastModifiedTimestamp": 1611264538947, + "childProfileIds": [] +} +] \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker/app/opensync/EquipmentExample.json b/opensync-gateway-static-docker/src/main/docker/app/opensync/EquipmentExample.json index a05e266..232b2b3 100644 --- a/opensync-gateway-static-docker/src/main/docker/app/opensync/EquipmentExample.json +++ b/opensync-gateway-static-docker/src/main/docker/app/opensync/EquipmentExample.json @@ -1,221 +1,261 @@ { - "model_type": "Equipment", - "id": 51, - "customerId": 2, - "profileId": 12, - "locationId": 8, - "equipmentType": "AP", - "inventoryId": "Test_Client_21P10C68818122", - "name": "Test_Client_21P10C68818122", - "details": { - "model_type": "ApElementConfiguration", - "equipmentModel": "EA8300-CA", - "elementConfigVersion": "AP-V1", + "model_type": "Equipment", + "id": 1, + "customerId": 2, + "profileId": 38, + "locationId": 8, "equipmentType": "AP", - "deviceMode": "standaloneAP", - "gettingIP": "dhcp", - "staticIP": null, - "staticIpMaskCidr": null, - "staticIpGw": null, - "gettingDNS": "dhcp", - "staticDnsIp1": null, - "staticDnsIp2": null, - "peerInfoList": [], - "deviceName": "Default Device Name", - "locationData": null, - "locallyConfiguredMgmtVlan": 0, - "locallyConfigured": false, - "deploymentType": "CEILING", - "syntheticClientEnabled": null, - "frameReportThrottleEnabled": true, - "antennaType": "OMNI", - "costSavingEventsEnabled": true, - "forwardMode": "BRIDGE", - "radioMap": { - "is2dot4GHz": { - "model_type": "ElementRadioConfiguration", - "radioType": "is2dot4GHz", - "channelNumber": 6, - "manualChannelNumber": 6, - "backupChannelNumber": 11, - "bannedChannels": [], - "allowedChannels": [], - "rxCellSizeDb": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": -90 + "inventoryId": "Open_AP_21P10C68818122", + "name": "Open_AP_21P10C68818122", + "details": { + "model_type": "ApElementConfiguration", + "equipmentModel": "EA8300-CA", + "elementConfigVersion": "AP-V1", + "equipmentType": "AP", + "deviceMode": "standaloneAP", + "gettingIP": "dhcp", + "staticIP": null, + "staticIpMaskCidr": null, + "staticIpGw": null, + "gettingDNS": "dhcp", + "staticDnsIp1": null, + "staticDnsIp2": null, + "peerInfoList": [], + "deviceName": "Open_AP_21P10C68818122", + "locationData": null, + "locallyConfiguredMgmtVlan": 0, + "locallyConfigured": false, + "deploymentType": "CEILING", + "syntheticClientEnabled": null, + "frameReportThrottleEnabled": true, + "antennaType": "OMNI", + "costSavingEventsEnabled": true, + "forwardMode": "BRIDGE", + "radioMap": { + "is2dot4GHz": { + "model_type": "ElementRadioConfiguration", + "radioType": "is2dot4GHz", + "channelNumber": 6, + "manualChannelNumber": 6, + "backupChannelNumber": 11, + "allowedChannels": [ + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11 + ], + "rxCellSizeDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "eirpTxPower": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": 18 + }, + "perimeterDetectionEnabled": true, + "bestAPSteerType": "both", + "deauthAttackDetection": null, + "allowedChannelsPowerLevels": [] + }, + "is5GHzU": { + "model_type": "ElementRadioConfiguration", + "radioType": "is5GHzU", + "channelNumber": 149, + "manualChannelNumber": 149, + "backupChannelNumber": 154, + "allowedChannels": [ + 161, + 149, + 165, + 153, + 157 + ], + "rxCellSizeDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "eirpTxPower": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": 18 + }, + "perimeterDetectionEnabled": true, + "bestAPSteerType": "both", + "deauthAttackDetection": null, + "allowedChannelsPowerLevels": [] + }, + "is5GHzL": { + "model_type": "ElementRadioConfiguration", + "radioType": "is5GHzL", + "channelNumber": 36, + "manualChannelNumber": 36, + "backupChannelNumber": 44, + "allowedChannels": [ + 48, + 36, + 40, + 44 + ], + "rxCellSizeDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "eirpTxPower": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": 18 + }, + "perimeterDetectionEnabled": true, + "bestAPSteerType": "both", + "deauthAttackDetection": null, + "allowedChannelsPowerLevels": [] + } }, - "probeResponseThresholdDb": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": -90 - }, - "eirpTxPower": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": 32 - }, - "perimeterDetectionEnabled": true, - "bestAPSteerType": "both", - "deauthAttackDetection": null, - "allowedChannelsPowerLevels": [], - "activeChannel": 6 - }, - "is5GHzU": { - "model_type": "ElementRadioConfiguration", - "radioType": "is5GHzU", - "channelNumber": 149, - "manualChannelNumber": 149, - "backupChannelNumber": 154, - "bannedChannels": [], - "allowedChannels": [], - "rxCellSizeDb": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": -90 - }, - "eirpTxPower": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": 32 - }, - "perimeterDetectionEnabled": true, - "bestAPSteerType": "both", - "deauthAttackDetection": null, - "allowedChannelsPowerLevels": [], - "activeChannel": 149 - }, - "is5GHzL": { - "model_type": "ElementRadioConfiguration", - "radioType": "is5GHzL", - "channelNumber": 36, - "manualChannelNumber": 36, - "backupChannelNumber": 44, - "bannedChannels": [], - "allowedChannels": [], - "rxCellSizeDb": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": -90 - }, - "eirpTxPower": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": 32 - }, - "perimeterDetectionEnabled": true, - "bestAPSteerType": "both", - "deauthAttackDetection": null, - "allowedChannelsPowerLevels": [], - "activeChannel": 36 - } + "advancedRadioMap": { + "is2dot4GHz": { + "model_type": "RadioConfiguration", + "radioType": "is2dot4GHz", + "radioAdminState": "enabled", + "fragmentationThresholdBytes": 2346, + "uapsdState": "enabled", + "stationIsolation": "disabled", + "multicastRate": { + "model_type": "SourceSelectionMulticast", + "source": "profile", + "value": "auto" + }, + "managementRate": { + "model_type": "SourceSelectionManagement", + "source": "profile", + "value": "auto" + }, + "bestApSettings": { + "model_type": "SourceSelectionSteering", + "source": "manual", + "value": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 20, + "minLoadFactor": 50 + } + }, + "legacyBSSRate": "enabled", + "dtimPeriod": 2, + "deauthAttackDetection": null + }, + "is5GHzU": { + "model_type": "RadioConfiguration", + "radioType": "is5GHzU", + "radioAdminState": "enabled", + "fragmentationThresholdBytes": 2346, + "uapsdState": "enabled", + "stationIsolation": "disabled", + "multicastRate": { + "model_type": "SourceSelectionMulticast", + "source": "profile", + "value": "auto" + }, + "managementRate": { + "model_type": "SourceSelectionManagement", + "source": "profile", + "value": "auto" + }, + "bestApSettings": { + "model_type": "SourceSelectionSteering", + "source": "manual", + "value": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 30, + "minLoadFactor": 40 + } + }, + "legacyBSSRate": "enabled", + "dtimPeriod": 2, + "deauthAttackDetection": null + }, + "is5GHzL": { + "model_type": "RadioConfiguration", + "radioType": "is5GHzL", + "radioAdminState": "enabled", + "fragmentationThresholdBytes": 2346, + "uapsdState": "enabled", + "stationIsolation": "disabled", + "multicastRate": { + "model_type": "SourceSelectionMulticast", + "source": "profile", + "value": "auto" + }, + "managementRate": { + "model_type": "SourceSelectionManagement", + "source": "profile", + "value": "auto" + }, + "bestApSettings": { + "model_type": "SourceSelectionSteering", + "source": "manual", + "value": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 30, + "minLoadFactor": 40 + } + }, + "legacyBSSRate": "enabled", + "dtimPeriod": 2, + "deauthAttackDetection": null + } + } }, - "advancedRadioMap": { - "is2dot4GHz": { - "model_type": "RadioConfiguration", - "radioType": "is2dot4GHz", - "radioAdminState": "enabled", - "fragmentationThresholdBytes": 2346, - "uapsdState": "enabled", - "stationIsolation": "disabled", - "managementRate": { - "model_type": "SourceSelectionManagement", - "source": "auto", - "value": "auto" - }, - "bestApSettings": { - "model_type": "SourceSelectionSteering", - "source": "auto", - "value": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } - }, - "legacyBSSRate": "enabled", - "deauthAttackDetection": null - }, - "is5GHzU": { - "model_type": "RadioConfiguration", - "radioType": "is5GHzU", - "radioAdminState": "enabled", - "fragmentationThresholdBytes": 2346, - "uapsdState": "enabled", - "stationIsolation": "disabled", - "managementRate": { - "model_type": "SourceSelectionManagement", - "source": "auto", - "value": "auto" - }, - "bestApSettings": { - "model_type": "SourceSelectionSteering", - "source": "auto", - "value": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } - }, - "legacyBSSRate": "enabled", - "deauthAttackDetection": null - }, - "is5GHzL": { - "model_type": "RadioConfiguration", - "radioType": "is5GHzL", - "radioAdminState": "enabled", - "fragmentationThresholdBytes": 2346, - "uapsdState": "enabled", - "stationIsolation": "disabled", - "managementRate": { - "model_type": "SourceSelectionManagement", - "source": "auto", - "value": "auto" - }, - "bestApSettings": { - "model_type": "SourceSelectionSteering", - "source": "auto", - "value": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } - }, - "legacyBSSRate": "enabled", - "deauthAttackDetection": null - } - } - }, - "latitude": null, - "longitude": null, - "serial": "21P10C68818122", - "createdTimestamp": 1591653239821, - "lastModifiedTimestamp": 1591653241398 -} + "latitude": null, + "longitude": null, + "baseMacAddress": { + "model_type": "MacAddress", + "address": "JPWi7y5T", + "addressAsString": "24:f5:a2:ef:2e:53" + }, + "serial": "21P10C68818122", + "createdTimestamp": 0, + "lastModifiedTimestamp": 1611264546193 +} \ No newline at end of file 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 9001597..b2c6ae0 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,73 +1,67 @@ { - "model_type": "Profile", - "id": 12, - "customerId": 2, - "profileType": "equipment_ap", - "name": "ApProfile-3-radios", - "details": { - "model_type": "ApNetworkConfiguration", - "networkConfigVersion": "AP-1", - "equipmentType": "AP", - "vlanNative": true, - "vlan": 0, - "ntpServer": { - "model_type": "AutoOrManualString", - "auto": true, - "value": "pool.ntp.org" - }, - "syslogRelay": null, - "rtlsSettings": null, - "syntheticClientEnabled": true, - "ledControlEnabled": true, - "equipmentDiscovery": false, + "model_type": "Profile", + "id": 38, + "customerId": 2, + "profileType": "equipment_ap", + "name": "ap-profile-2021-01-21T21:28:59.371Z", + "details": { + "model_type": "ApNetworkConfiguration", + "networkConfigVersion": "AP-1", + "equipmentType": "AP", + "vlanNative": true, + "vlan": 0, + "ntpServer": { + "model_type": "AutoOrManualString", + "auto": true, + "value": "pool.ntp.org" + }, + "syslogRelay": null, + "rtlsSettings": null, + "syntheticClientEnabled": true, + "ledControlEnabled": true, + "equipmentDiscovery": false, + "radioMap": { + "is5GHz": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + }, + "is2dot4GHz": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + }, + "is5GHzU": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + }, + "is5GHzL": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + } + }, + "greTunnelConfigurations": [ + { + "model_type": "GreTunnelConfiguration", "greTunnelName": null, "greParentIfName": null, "greLocalInetAddr": null, "greRemoteInetAddr": null, "greRemoteMacAddr": null, - "radioMap": { - "is2dot4GHz": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is5GHzU": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is5GHzL": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - } - }, - "greTunnelConfigurations": [ - { - "model_type": "GreTunnelConfiguration", - "greTunnelName": "gre1", - "greParentIfName": "wan", - "greLocalInetAddr": "10.0.0.129", - "greRemoteInetAddr": "192.168.1.101", - "greRemoteMacAddr": { - "model_type": "MacAddress", - "address": "ZEvwIFf/", - "addressAsString": "64:4b:f0:20:57:ff" - }, - "vlanIdsInGreTunnel": [ - 100 - ] - } - ], - "profileType": "equipment_ap" - }, - "createdTimestamp": 1606778369934, - "lastModifiedTimestamp": 1606778443413, - "childProfileIds": [ - 16, - 5, - 10, - 11, - 15 - ] -} \ No newline at end of file + "vlanIdsInGreTunnel": [ + ] + } + ], + "profileType": "equipment_ap" + }, + "createdTimestamp": 1611264539383, + "lastModifiedTimestamp": 1611264539383, + "childProfileIds": [ + 4, + 5, + 31, + 32 + ] +} 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 9c9b52f..9c1a3d0 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,135 +1,138 @@ [ -{ + { "model_type": "Profile", - "id": 14, + "id": 5, "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": "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": 1611262628973, + "expirationTime": 1611291428973, + "numDevices": 1, + "userDetails": { + "model_type": "TimedAccessUserDetails", + "firstName": "Pac", + "lastName": "Man", + "passwordNeedsReset": false + }, + "userMacAddresses": [ { - "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 + "model_type": "MacAddress", + "address": "fKtg5upO", + "addressAsString": "7c:ab:60:e6:ea:4e" } - ], - "macAllowList": [], - "profileType": "captive_portal" + ], + "lastModifiedTimestamp": 0 + }, + { + "model_type": "TimedAccessUserRecord", + "username": "customer", + "password": "testing123", + "activationTime": 1611262628974, + "expirationTime": 1611266228974, + "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": 1611262628974, + "expirationTime": 1611867428974, + "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": 1611262628974, + "expirationTime": 1611349028974, + "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 + "createdTimestamp": 1611262628978, + "lastModifiedTimestamp": 1611262628978, + "childProfileIds": [ + ] + } +] 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 b15c575..7c0559e 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,71 +1,71 @@ [ - { - "model_type": "Profile", - "id": 24, - "customerId": 2, - "profileType": "passpoint", - "name": "TipWlan-Passpoint-Config", - "details": { - "model_type": "PasspointProfile", - "enableInterworkingAndHs20": true, - "hessid": null, - "passpointAccessNetworkType": "free_public_network", - "passpointNetworkAuthenticationType": "acceptance_of_terms_and_conditions", - "additionalStepsRequiredForAccess": 0, - "deauthRequestTimeout": 0, - "operatingClass": 0, - "termsAndConditionsFile": { - "model_type": "ManagedFileInfo", - "md5checksum": null, - "lastModifiedTimestamp": null, - "apExportUrl": "https://localhost:9091/filestore/termsAndConditions", - "fileCategory": "ExternalPolicyConfiguration", - "fileType": "TEXT", - "altSlot": false - }, - "whitelistDomain": null, - "emergencyServicesReachable": true, - "unauthenticatedEmergencyServiceAccessible": false, - "internetConnectivity": true, - "connectionCapabilitySet": [ - { - "model_type": "PasspointConnectionCapability", - "connectionCapabilitiesPortNumber": 8888, - "connectionCapabilitiesStatus": "open", - "connectionCapabilitiesIpProtocol": "TCP" - } - ], - "ipAddressTypeAvailability": "public_IPv4_address_available", - "qosMapSetConfiguration": null, - "apGeospatialLocation": null, - "apCivicLocation": null, - "apPublicLocationIdUri": null, - "gasAddr3Behaviour": "p2pSpecWorkaroundFromRequest", - "anqpDomainId": 1234, - "disableDownstreamGroupAddressedForwarding": false, - "enable2pt4GHz": true, - "enable5GHz": true, - "associatedAccessSsidProfileIds": [ - 15 - ], - "osuSsidProfileId": 16, - "passpointOperatorProfileId": 17, - "passpointVenueProfileId": 18, - "passpointOsuProviderProfileIds": [ - 19, - 20 - ], - "accessNetworkType": "free_public_network", - "networkAuthenticationType": "acceptance_of_terms_and_conditions", - "profileType": "passpoint" - }, - "createdTimestamp": 1606778370807, - "lastModifiedTimestamp": 1606778370807, - "childProfileIds": [ - 17, - 18, - 19, - 20 - ] - } +{ + "model_type": "Profile", + "id": 37, + "customerId": 2, + "profileType": "passpoint", + "name": "hotspot20-profile-2021-01-21T21:28:59.171Z", + "details": { + "model_type": "PasspointProfile", + "enableInterworkingAndHs20": true, + "hessid": null, + "passpointAccessNetworkType": "free_public_network", + "passpointNetworkAuthenticationType": "acceptance_of_terms_and_conditions", + "additionalStepsRequiredForAccess": 0, + "deauthRequestTimeout": 0, + "operatingClass": 0, + "termsAndConditionsFile": { + "model_type": "ManagedFileInfo", + "md5checksum": null, + "lastModifiedTimestamp": null, + "apExportUrl": "https://localhost:9091/filestore/termsAndConditions", + "fileCategory": "ExternalPolicyConfiguration", + "fileType": "TEXT", + "altSlot": false + }, + "whitelistDomain": null, + "emergencyServicesReachable": true, + "unauthenticatedEmergencyServiceAccessible": false, + "internetConnectivity": true, + "connectionCapabilitySet": [ + { + "model_type": "PasspointConnectionCapability", + "connectionCapabilitiesPortNumber": 8888, + "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, + "associatedAccessSsidProfileIds": [ + 32 + ], + "osuSsidProfileId": 31, + "passpointOperatorProfileId": 34, + "passpointVenueProfileId": 33, + "passpointOsuProviderProfileIds": [ + 35, + 36 + ], + "accessNetworkType": "free_public_network", + "networkAuthenticationType": "acceptance_of_terms_and_conditions", + "profileType": "passpoint" + }, + "createdTimestamp": 0, + "lastModifiedTimestamp": 1611264539331, + "childProfileIds": [ + 33, + 34, + 35, + 36 + ] +} ] 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 e1a1cb9..c9ee1e9 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,267 +1,263 @@ [ - { - "model_type": "Profile", - "id": 19, - "customerId": 2, - "profileType": "passpoint_osu_id_provider", - "name": "TipWlan-Passpoint-OSU-Provider", - "details": { - "model_type": "PasspointOsuProviderProfile", - "domainName": "rogers.com", - "mccMncList": [ - { - "model_type": "PasspointMccMnc", - "mcc": 302, - "mnc": 720, - "iso": "ca", - "country": "Canada", - "countryCode": 1, - "network": "Rogers AT&T Wireless", - "mccMncPairing": "302,720" - } - ], - "naiRealmList": [ - { - "model_type": "PasspointNaiRealmInformation", - "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" - ], - "EAP-TLS with certificate": [ - "Credential Type:Certificate" - ] - } - } - ], - "osuIconList": [ - { - "model_type": "PasspointOsuIcon", - "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": "PasspointOsuIcon", - "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": "PasspointOsuIcon", - "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" - } - ], - "osuServerUri": "https://example.com/osu/rogers", - "osuFriendlyName": [ - { - "model_type": "PasspointDuple", - "locale": "en_CA", - "dupleIso3Language": "eng", - "dupleName": "Example provider rogers", - "defaultDupleSeparator": ":", - "asDuple": "eng:Example provider rogers" - }, - { - "model_type": "PasspointDuple", - "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": "PasspointDuple", - "locale": "en_CA", - "dupleIso3Language": "eng", - "dupleName": "Example services rogers", - "defaultDupleSeparator": ":", - "asDuple": "eng:Example services rogers" - }, - { - "model_type": "PasspointDuple", - "locale": "fr_CA", - "dupleIso3Language": "fra", - "dupleName": "Exemples de services rogers", - "defaultDupleSeparator": ":", - "asDuple": "fra:Exemples de services rogers" - } - ], + { + "model_type": "Profile", + "id": 35, + "customerId": 2, + "profileType": "passpoint_osu_id_provider", + "name": "provider1-profile-2021-01-21T21:28:59.057Z", + "details": { + "model_type": "PasspointOsuProviderProfile", + "mccMncList": [ + { + "model_type": "PasspointMccMnc", + "mcc": 302, + "mnc": 720, + "iso": "ca", + "country": "Canada", + "countryCode": 1, + "network": "Rogers AT&T Wireless", + "mccMncPairing": "302,720" + } + ], + "naiRealmList": [ + { + "model_type": "PasspointNaiRealmInformation", + "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" + ], + "EAP-TLS with certificate": [ + "Credential Type:Certificate" + ] + } + } + ], + "osuIconList": [ + { + "model_type": "PasspointOsuIcon", + "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": "PasspointOsuIcon", + "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": "PasspointOsuIcon", + "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" + } + ], + "osuServerUri": "https://example.com/osu/rogers", + "osuFriendlyName": [ + { + "model_type": "PasspointDuple", + "locale": "eng", + "dupleIso3Language": "eng", + "dupleName": "Example provider rogers", + "defaultDupleSeparator": ":", + "asDuple": "eng:Example provider rogers" + }, + { + "model_type": "PasspointDuple", + "locale": "fra", + "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": "PasspointDuple", + "locale": "eng", + "dupleIso3Language": "eng", + "dupleName": "Example services rogers", + "defaultDupleSeparator": ":", + "asDuple": "eng:Example services rogers" + }, + { + "model_type": "PasspointDuple", + "locale": "fra", + "dupleIso3Language": "fra", + "dupleName": "Exemples de services rogers", + "defaultDupleSeparator": ":", + "asDuple": "fra:Exemples de services rogers" + } + ], "roamingOi": [ "BAA2D00100", "BAA2D00000" ], - "profileType": "passpoint_osu_id_provider" - }, - "createdTimestamp": 1606778370345, - "lastModifiedTimestamp": 1606778370345, - "childProfileIds": [ - ] - }, - { - "model_type": "Profile", - "id": 20, - "customerId": 2, - "profileType": "passpoint_osu_id_provider", - "name": "TipWlan-Passpoint-OSU-Provider-2", - "details": { - "model_type": "PasspointOsuProviderProfile", - "domainName": "telus.com", - "mccMncList": [ - { - "model_type": "PasspointMccMnc", - "mcc": 302, - "mnc": 220, - "iso": "ca", - "country": "Canada", - "countryCode": 1, - "network": "Telus Mobility", - "mccMncPairing": "302,220" - } - ], - "naiRealmList": [ - { - "model_type": "PasspointNaiRealmInformation", - "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" - ], - "EAP-TLS with certificate": [ - "Credential Type:Certificate" - ] - } - } - ], - "osuIconList": [ - { - "model_type": "PasspointOsuIcon", - "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": "PasspointOsuIcon", - "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": "PasspointOsuIcon", - "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" - } - ], - "osuServerUri": "https://example.com/osu/telus", - "osuFriendlyName": [ - { - "model_type": "PasspointDuple", - "locale": "en_CA", - "dupleIso3Language": "eng", - "dupleName": "Example provider telus", - "defaultDupleSeparator": ":", - "asDuple": "eng:Example provider telus" - }, - { - "model_type": "PasspointDuple", - "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": "PasspointDuple", - "locale": "en_CA", - "dupleIso3Language": "eng", - "dupleName": "Example services telus", - "defaultDupleSeparator": ":", - "asDuple": "eng:Example services telus" - }, - { - "model_type": "PasspointDuple", - "locale": "fr_CA", - "dupleIso3Language": "fra", - "dupleName": "Exemples de services telus", - "defaultDupleSeparator": ":", - "asDuple": "fra:Exemples de services telus" - } - ], - "roamingOi": [ + "profileType": "passpoint_osu_id_provider" + }, + "createdTimestamp": 1611264539070, + "lastModifiedTimestamp": 1611264539070, + "childProfileIds": [] + }, + { + "model_type": "Profile", + "id": 36, + "customerId": 2, + "profileType": "passpoint_osu_id_provider", + "name": "provider2-profile-2021-01-21T21:28:59.118Z", + "details": { + "model_type": "PasspointOsuProviderProfile", + "mccMncList": [ + { + "model_type": "PasspointMccMnc", + "mcc": 302, + "mnc": 220, + "iso": "ca", + "country": "Canada", + "countryCode": 1, + "network": "Telus Mobility", + "mccMncPairing": "302,220" + } + ], + "naiRealmList": [ + { + "model_type": "PasspointNaiRealmInformation", + "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" + ], + "EAP-TLS with certificate": [ + "Credential Type:Certificate" + ] + } + } + ], + "osuIconList": [ + { + "model_type": "PasspointOsuIcon", + "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": "PasspointOsuIcon", + "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": "PasspointOsuIcon", + "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" + } + ], + "osuServerUri": "https://example.com/osu/telus", + "osuFriendlyName": [ + { + "model_type": "PasspointDuple", + "locale": "eng", + "dupleIso3Language": "eng", + "dupleName": "Example provider telus", + "defaultDupleSeparator": ":", + "asDuple": "eng:Example provider telus" + }, + { + "model_type": "PasspointDuple", + "locale": "fra", + "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": "PasspointDuple", + "locale": "eng", + "dupleIso3Language": "eng", + "dupleName": "Example services telus", + "defaultDupleSeparator": ":", + "asDuple": "eng:Example services telus" + }, + { + "model_type": "PasspointDuple", + "locale": "fra", + "dupleIso3Language": "fra", + "dupleName": "Exemples de services telus", + "defaultDupleSeparator": ":", + "asDuple": "fra:Exemples de services telus" + } + ], + "roamingOi": [ "004096", "005014", "F4F5E8F5F4" ], - "profileType": "passpoint_osu_id_provider" - }, - "createdTimestamp": 1606778370351, - "lastModifiedTimestamp": 1606778370351, - "childProfileIds": [ - ] - } -] + "profileType": "passpoint_osu_id_provider" + }, + "createdTimestamp": 1611264539131, + "lastModifiedTimestamp": 1611264539131, + "childProfileIds": [] + } +] \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileOperator.json b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileOperator.json index 413cb46..0d8df1d 100644 --- a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileOperator.json +++ b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileOperator.json @@ -1,37 +1,41 @@ [ - { - "model_type": "Profile", - "id": 17, - "customerId": 2, - "profileType": "passpoint_operator", - "name": "TipWlan-Passpoint-Operator", - "details": { - "model_type": "PasspointOperatorProfile", - "serverOnlyAuthenticatedL2EncryptionNetwork": false, - "x509CertificateLocation": "/etc/ca.pem", - "operatorFriendlyName": [ - { - "model_type": "PasspointDuple", - "locale": "en_CA", - "dupleIso3Language": "eng", - "dupleName": "Default friendly passpoint_operator name", - "defaultDupleSeparator": ":", - "asDuple": "eng:Default friendly passpoint_operator name" - }, - { - "model_type": "PasspointDuple", - "locale": "fr_CA", - "dupleIso3Language": "fra", - "dupleName": "Nom de l'opérateur convivial par défaut", - "defaultDupleSeparator": ":", - "asDuple": "fra:Nom de l'opérateur convivial par défaut" - } - ], - "profileType": "passpoint_operator" - }, - "createdTimestamp": 1606778369945, - "lastModifiedTimestamp": 1606778369945, - "childProfileIds": [ - ] - } -] +{ + "model_type": "Profile", + "id": 34, + "customerId": 2, + "profileType": "passpoint_operator", + "name": "operator-profile-2021-01-21T21:28:58.994Z", + "details": { + "model_type": "PasspointOperatorProfile", + "serverOnlyAuthenticatedL2EncryptionNetwork": false, + "x509CertificateLocation": "/etc/ca.pem", + "operatorFriendlyName": [ + { + "model_type": "PasspointDuple", + "locale": "fra", + "dupleIso3Language": "fra", + "dupleName": "Nom de l'opérateur convivial par défaut", + "defaultDupleSeparator": ":", + "asDuple": "fra:Nom de l'opérateur convivial par défaut" + }, + { + "model_type": "PasspointDuple", + "locale": "eng", + "dupleIso3Language": "eng", + "dupleName": "Default friendly passpoint_operator name", + "defaultDupleSeparator": ":", + "asDuple": "eng:Default friendly passpoint_operator name" + } + ], + "domainNameList": [ + "bell.ca", + "telus.com", + "rogers.com" + ], + "profileType": "passpoint_operator" + }, + "createdTimestamp": 1611264539004, + "lastModifiedTimestamp": 1611264539004, + "childProfileIds": [] +} +] \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileRadius.json b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileRadius.json index d7390a1..0a49b4d 100644 --- a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileRadius.json +++ b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileRadius.json @@ -1,34 +1,32 @@ [ - { - "model_type": "Profile", - "id": 1, - "customerId": 2, - "profileType": "radius", - "name": "Radius-Profile", - "details": { - "model_type": "RadiusProfile", - "subnetConfiguration": null, - "serviceRegionMap": { - "Ottawa": { - "model_type": "RadiusServiceRegion", - "serverMap": { - "Radius-Profile": [ - { - "model_type": "RadiusServer", - "ipAddress": "192.168.0.1", - "secret": "testing123", - "authPort": 1812, - "timeout": null - } - ] - }, - "regionName": "Ottawa" - } - }, - "profileType": "radius" - }, - "createdTimestamp": 1601961451668, - "lastModifiedTimestamp": 1601961451668, - "childProfileIds": [] - } -] \ No newline at end of file + { + "model_type": "Profile", + "id": 1, + "customerId": 2, + "profileType": "radius", + "name": "Radius-Profile", + "details": { + "model_type": "RadiusProfile", + "primaryRadiusServer": { + "model_type": "RadiusServer", + "ipAddress": "192.168.0.1", + "secret": "testing123", + "authPort": 1812, + "timeout": null + }, + "secondaryRadiusServer": { + "model_type": "RadiusServer", + "ipAddress": "192.168.0.2", + "secret": "testing123", + "authPort": 1812, + "timeout": null + }, + "radiusSubnetConfiguration": null, + "profileType": "radius" + }, + "createdTimestamp": 1611262628767, + "lastModifiedTimestamp": 1611262628767, + "childProfileIds": [ + ] + } +] diff --git a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileRf.json b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileRf.json index 0a3a9cf..96330d1 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,6 +1,6 @@ { "model_type": "Profile", - "id": 11, + "id": 4, "customerId": 2, "profileType": "rf", "name": "TipWlan-rf", @@ -198,7 +198,7 @@ }, "profileType": "rf" }, - "createdTimestamp": 1606778369933, - "lastModifiedTimestamp": 1606778369933, + "createdTimestamp": 1611262628788, + "lastModifiedTimestamp": 1611262628788, "childProfileIds": [] } \ 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 75c0435..27f36f6 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 @@ -20,9 +20,9 @@ "broadcastSsid": "enabled", "keyRefresh": 0, "noLocalSubnets": false, - "radiusServiceName": null, - "radiusAccountingServiceName": null, - "radiusAcountingServiceInterval": null, + "radiusServiceId": 0, + "radiusAccountingServiceId": 0, + "radiusAcountingServiceInterval": 60, "captivePortalId": null, "bandwidthLimitDown": 0, "bandwidthLimitUp": 0, @@ -76,27 +76,27 @@ }, { "model_type": "Profile", - "id": 15, + "id": 32, "customerId": 2, "profileType": "ssid", - "name": "TipWlan-cloud-passpoint-access", + "name": "access-ssid-profile-2021-01-21T21:28:58.871Z", "details": { "model_type": "SsidConfiguration", - "ssid": "TipWlan-cloud-passpoint-access", + "ssid": "ssid-access-passpoint", "appliedRadios": [ - "is5GHzL", - "is5GHzU" + "is5GHzU", + "is5GHzL" ], "ssidAdminState": "enabled", - "secureMode": "wpa2PSK", + "secureMode": "wpa2EAP", "vlanId": 1, "keyStr": "testing123", "broadcastSsid": "enabled", "keyRefresh": 0, "noLocalSubnets": false, - "radiusServiceName": null, - "radiusAccountingServiceName": null, - "radiusAcountingServiceInterval": null, + "radiusServiceId": 1, + "radiusAccountingServiceId": 1, + "radiusAcountingServiceInterval": 60, "captivePortalId": null, "bandwidthLimitDown": 0, "bandwidthLimitUp": 0, @@ -104,18 +104,6 @@ "clientBandwidthLimitUp": 0, "videoTrafficOnly": false, "radioBasedConfigs": { - "is5GHzL": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is2dot4GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, "is5GHz": { "model_type": "RadioBasedSsidConfiguration", "enable80211r": null, @@ -127,13 +115,24 @@ "enable80211r": null, "enable80211k": null, "enable80211v": null + }, + "is2dot4GHz": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + }, + "is5GHzL": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null } }, "bonjourGatewayProfileId": null, "enable80211w": null, "wepConfig": null, "forwardMode": null, - "profileType": "ssid", "radiusClientConfiguration": { "model_type": "RadiusNasConfiguration", "nasClientId": "DEFAULT", @@ -141,23 +140,25 @@ "userDefinedNasId": null, "userDefinedNasIp": null, "operatorId": null - } + }, + "profileType": "ssid" }, - "createdTimestamp": 1606778369943, - "lastModifiedTimestamp": 1606778370811, + "createdTimestamp": 0, + "lastModifiedTimestamp": 1611264539281, "childProfileIds": [ - 24 + 37, + 1 ] }, { "model_type": "Profile", - "id": 16, + "id": 31, "customerId": 2, "profileType": "ssid", - "name": "TipWlan-cloud-passpoint-osu", + "name": "osu-ssid-profile-2021-01-21T21:28:58.798Z", "details": { "model_type": "SsidConfiguration", - "ssid": "TipWlan-cloud-passpoint-osu", + "ssid": "ssid-open-passpoint", "appliedRadios": [ "is2dot4GHz" ], @@ -168,9 +169,9 @@ "broadcastSsid": "enabled", "keyRefresh": 0, "noLocalSubnets": false, - "radiusServiceName": null, - "radiusAccountingServiceName": null, - "radiusAcountingServiceInterval": null, + "radiusServiceId": 0, + "radiusAccountingServiceId": 0, + "radiusAcountingServiceInterval": 60, "captivePortalId": null, "bandwidthLimitDown": 0, "bandwidthLimitUp": 0, @@ -178,18 +179,6 @@ "clientBandwidthLimitUp": 0, "videoTrafficOnly": false, "radioBasedConfigs": { - "is5GHzL": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is2dot4GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, "is5GHz": { "model_type": "RadioBasedSsidConfiguration", "enable80211r": null, @@ -201,13 +190,24 @@ "enable80211r": null, "enable80211k": null, "enable80211v": null + }, + "is2dot4GHz": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + }, + "is5GHzL": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null } }, "bonjourGatewayProfileId": null, "enable80211w": null, "wepConfig": null, "forwardMode": null, - "profileType": "ssid", "radiusClientConfiguration": { "model_type": "RadiusNasConfiguration", "nasClientId": "DEFAULT", @@ -215,13 +215,13 @@ "userDefinedNasId": null, "userDefinedNasIp": null, "operatorId": null - } + }, + "profileType": "ssid" }, - "createdTimestamp": 1606778369944, - "lastModifiedTimestamp": 1606778370352, + "createdTimestamp": 0, + "lastModifiedTimestamp": 1611264539231, "childProfileIds": [ - 19, - 20 + 37 ] } ] diff --git a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileVenue.json b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileVenue.json index 820929f..fd674e3 100644 --- a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileVenue.json +++ b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileVenue.json @@ -1,43 +1,42 @@ [ - { - "model_type": "Profile", - "id": 18, - "customerId": 2, - "profileType": "passpoint_venue", - "name": "TipWlan-Passpoint-Venue", - "details": { - "model_type": "PasspointVenueProfile", - "venueNameSet": [ - { - "model_type": "PasspointVenueName", - "locale": "fr_CA", - "dupleIso3Language": "fra", - "dupleName": "Exemple de lieu", - "defaultDupleSeparator": ":", - "venueUrl": "http://www.example.com/info-fra", - "asDuple": "fra:Exemple de lieu" - }, - { - "model_type": "PasspointVenueName", - "locale": "en_CA", - "dupleIso3Language": "eng", - "dupleName": "Example passpoint_venue", - "defaultDupleSeparator": ":", - "venueUrl": "http://www.example.com/info-eng", - "asDuple": "eng:Example passpoint_venue" - } - ], - "venueTypeAssignment": { - "model_type": "PasspointVenueTypeAssignment", - "venueDescription": "Research and Development Facility", - "venueGroupId": 2, - "venueTypeId": 8 - }, - "profileType": "passpoint_venue" - }, - "createdTimestamp": 1606778369950, - "lastModifiedTimestamp": 1606778369950, - "childProfileIds": [ - ] - } -] +{ + "model_type": "Profile", + "id": 33, + "customerId": 2, + "profileType": "passpoint_venue", + "name": "venue-profile-2021-01-21T21:28:58.934Z", + "details": { + "model_type": "PasspointVenueProfile", + "venueNameSet": [ + { + "model_type": "PasspointVenueName", + "locale": "fra", + "dupleIso3Language": "fra", + "dupleName": "Exemple de lieu", + "defaultDupleSeparator": ":", + "venueUrl": "http://www.example.com/info-fra", + "asDuple": "fra:Exemple de lieu" + }, + { + "model_type": "PasspointVenueName", + "locale": "eng", + "dupleIso3Language": "eng", + "dupleName": "Example passpoint_venue", + "defaultDupleSeparator": ":", + "venueUrl": "http://www.example.com/info-eng", + "asDuple": "eng:Example passpoint_venue" + } + ], + "venueTypeAssignment": { + "model_type": "PasspointVenueTypeAssignment", + "venueDescription": "Research and Development Facility", + "venueGroupId": 2, + "venueTypeId": 8 + }, + "profileType": "passpoint_venue" + }, + "createdTimestamp": 1611264538947, + "lastModifiedTimestamp": 1611264538947, + "childProfileIds": [] +} +] \ No newline at end of file diff --git a/opensync-gateway-static-process/src/main/resources/app/opensync/EquipmentExample.json b/opensync-gateway-static-process/src/main/resources/app/opensync/EquipmentExample.json index a05e266..232b2b3 100644 --- a/opensync-gateway-static-process/src/main/resources/app/opensync/EquipmentExample.json +++ b/opensync-gateway-static-process/src/main/resources/app/opensync/EquipmentExample.json @@ -1,221 +1,261 @@ { - "model_type": "Equipment", - "id": 51, - "customerId": 2, - "profileId": 12, - "locationId": 8, - "equipmentType": "AP", - "inventoryId": "Test_Client_21P10C68818122", - "name": "Test_Client_21P10C68818122", - "details": { - "model_type": "ApElementConfiguration", - "equipmentModel": "EA8300-CA", - "elementConfigVersion": "AP-V1", + "model_type": "Equipment", + "id": 1, + "customerId": 2, + "profileId": 38, + "locationId": 8, "equipmentType": "AP", - "deviceMode": "standaloneAP", - "gettingIP": "dhcp", - "staticIP": null, - "staticIpMaskCidr": null, - "staticIpGw": null, - "gettingDNS": "dhcp", - "staticDnsIp1": null, - "staticDnsIp2": null, - "peerInfoList": [], - "deviceName": "Default Device Name", - "locationData": null, - "locallyConfiguredMgmtVlan": 0, - "locallyConfigured": false, - "deploymentType": "CEILING", - "syntheticClientEnabled": null, - "frameReportThrottleEnabled": true, - "antennaType": "OMNI", - "costSavingEventsEnabled": true, - "forwardMode": "BRIDGE", - "radioMap": { - "is2dot4GHz": { - "model_type": "ElementRadioConfiguration", - "radioType": "is2dot4GHz", - "channelNumber": 6, - "manualChannelNumber": 6, - "backupChannelNumber": 11, - "bannedChannels": [], - "allowedChannels": [], - "rxCellSizeDb": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": -90 + "inventoryId": "Open_AP_21P10C68818122", + "name": "Open_AP_21P10C68818122", + "details": { + "model_type": "ApElementConfiguration", + "equipmentModel": "EA8300-CA", + "elementConfigVersion": "AP-V1", + "equipmentType": "AP", + "deviceMode": "standaloneAP", + "gettingIP": "dhcp", + "staticIP": null, + "staticIpMaskCidr": null, + "staticIpGw": null, + "gettingDNS": "dhcp", + "staticDnsIp1": null, + "staticDnsIp2": null, + "peerInfoList": [], + "deviceName": "Open_AP_21P10C68818122", + "locationData": null, + "locallyConfiguredMgmtVlan": 0, + "locallyConfigured": false, + "deploymentType": "CEILING", + "syntheticClientEnabled": null, + "frameReportThrottleEnabled": true, + "antennaType": "OMNI", + "costSavingEventsEnabled": true, + "forwardMode": "BRIDGE", + "radioMap": { + "is2dot4GHz": { + "model_type": "ElementRadioConfiguration", + "radioType": "is2dot4GHz", + "channelNumber": 6, + "manualChannelNumber": 6, + "backupChannelNumber": 11, + "allowedChannels": [ + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11 + ], + "rxCellSizeDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "eirpTxPower": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": 18 + }, + "perimeterDetectionEnabled": true, + "bestAPSteerType": "both", + "deauthAttackDetection": null, + "allowedChannelsPowerLevels": [] + }, + "is5GHzU": { + "model_type": "ElementRadioConfiguration", + "radioType": "is5GHzU", + "channelNumber": 149, + "manualChannelNumber": 149, + "backupChannelNumber": 154, + "allowedChannels": [ + 161, + 149, + 165, + 153, + 157 + ], + "rxCellSizeDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "eirpTxPower": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": 18 + }, + "perimeterDetectionEnabled": true, + "bestAPSteerType": "both", + "deauthAttackDetection": null, + "allowedChannelsPowerLevels": [] + }, + "is5GHzL": { + "model_type": "ElementRadioConfiguration", + "radioType": "is5GHzL", + "channelNumber": 36, + "manualChannelNumber": 36, + "backupChannelNumber": 44, + "allowedChannels": [ + 48, + 36, + 40, + 44 + ], + "rxCellSizeDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "eirpTxPower": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": 18 + }, + "perimeterDetectionEnabled": true, + "bestAPSteerType": "both", + "deauthAttackDetection": null, + "allowedChannelsPowerLevels": [] + } }, - "probeResponseThresholdDb": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": -90 - }, - "eirpTxPower": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": 32 - }, - "perimeterDetectionEnabled": true, - "bestAPSteerType": "both", - "deauthAttackDetection": null, - "allowedChannelsPowerLevels": [], - "activeChannel": 6 - }, - "is5GHzU": { - "model_type": "ElementRadioConfiguration", - "radioType": "is5GHzU", - "channelNumber": 149, - "manualChannelNumber": 149, - "backupChannelNumber": 154, - "bannedChannels": [], - "allowedChannels": [], - "rxCellSizeDb": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": -90 - }, - "eirpTxPower": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": 32 - }, - "perimeterDetectionEnabled": true, - "bestAPSteerType": "both", - "deauthAttackDetection": null, - "allowedChannelsPowerLevels": [], - "activeChannel": 149 - }, - "is5GHzL": { - "model_type": "ElementRadioConfiguration", - "radioType": "is5GHzL", - "channelNumber": 36, - "manualChannelNumber": 36, - "backupChannelNumber": 44, - "bannedChannels": [], - "allowedChannels": [], - "rxCellSizeDb": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": -90 - }, - "eirpTxPower": { - "model_type": "SourceSelectionValue", - "source": "auto", - "value": 32 - }, - "perimeterDetectionEnabled": true, - "bestAPSteerType": "both", - "deauthAttackDetection": null, - "allowedChannelsPowerLevels": [], - "activeChannel": 36 - } + "advancedRadioMap": { + "is2dot4GHz": { + "model_type": "RadioConfiguration", + "radioType": "is2dot4GHz", + "radioAdminState": "enabled", + "fragmentationThresholdBytes": 2346, + "uapsdState": "enabled", + "stationIsolation": "disabled", + "multicastRate": { + "model_type": "SourceSelectionMulticast", + "source": "profile", + "value": "auto" + }, + "managementRate": { + "model_type": "SourceSelectionManagement", + "source": "profile", + "value": "auto" + }, + "bestApSettings": { + "model_type": "SourceSelectionSteering", + "source": "manual", + "value": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 20, + "minLoadFactor": 50 + } + }, + "legacyBSSRate": "enabled", + "dtimPeriod": 2, + "deauthAttackDetection": null + }, + "is5GHzU": { + "model_type": "RadioConfiguration", + "radioType": "is5GHzU", + "radioAdminState": "enabled", + "fragmentationThresholdBytes": 2346, + "uapsdState": "enabled", + "stationIsolation": "disabled", + "multicastRate": { + "model_type": "SourceSelectionMulticast", + "source": "profile", + "value": "auto" + }, + "managementRate": { + "model_type": "SourceSelectionManagement", + "source": "profile", + "value": "auto" + }, + "bestApSettings": { + "model_type": "SourceSelectionSteering", + "source": "manual", + "value": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 30, + "minLoadFactor": 40 + } + }, + "legacyBSSRate": "enabled", + "dtimPeriod": 2, + "deauthAttackDetection": null + }, + "is5GHzL": { + "model_type": "RadioConfiguration", + "radioType": "is5GHzL", + "radioAdminState": "enabled", + "fragmentationThresholdBytes": 2346, + "uapsdState": "enabled", + "stationIsolation": "disabled", + "multicastRate": { + "model_type": "SourceSelectionMulticast", + "source": "profile", + "value": "auto" + }, + "managementRate": { + "model_type": "SourceSelectionManagement", + "source": "profile", + "value": "auto" + }, + "bestApSettings": { + "model_type": "SourceSelectionSteering", + "source": "manual", + "value": { + "model_type": "RadioBestApSettings", + "mlComputed": true, + "dropInSnrPercentage": 30, + "minLoadFactor": 40 + } + }, + "legacyBSSRate": "enabled", + "dtimPeriod": 2, + "deauthAttackDetection": null + } + } }, - "advancedRadioMap": { - "is2dot4GHz": { - "model_type": "RadioConfiguration", - "radioType": "is2dot4GHz", - "radioAdminState": "enabled", - "fragmentationThresholdBytes": 2346, - "uapsdState": "enabled", - "stationIsolation": "disabled", - "managementRate": { - "model_type": "SourceSelectionManagement", - "source": "auto", - "value": "auto" - }, - "bestApSettings": { - "model_type": "SourceSelectionSteering", - "source": "auto", - "value": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } - }, - "legacyBSSRate": "enabled", - "deauthAttackDetection": null - }, - "is5GHzU": { - "model_type": "RadioConfiguration", - "radioType": "is5GHzU", - "radioAdminState": "enabled", - "fragmentationThresholdBytes": 2346, - "uapsdState": "enabled", - "stationIsolation": "disabled", - "managementRate": { - "model_type": "SourceSelectionManagement", - "source": "auto", - "value": "auto" - }, - "bestApSettings": { - "model_type": "SourceSelectionSteering", - "source": "auto", - "value": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } - }, - "legacyBSSRate": "enabled", - "deauthAttackDetection": null - }, - "is5GHzL": { - "model_type": "RadioConfiguration", - "radioType": "is5GHzL", - "radioAdminState": "enabled", - "fragmentationThresholdBytes": 2346, - "uapsdState": "enabled", - "stationIsolation": "disabled", - "managementRate": { - "model_type": "SourceSelectionManagement", - "source": "auto", - "value": "auto" - }, - "bestApSettings": { - "model_type": "SourceSelectionSteering", - "source": "auto", - "value": { - "model_type": "RadioBestApSettings", - "mlComputed": true, - "dropInSnrPercentage": 30, - "minLoadFactor": 40 - } - }, - "legacyBSSRate": "enabled", - "deauthAttackDetection": null - } - } - }, - "latitude": null, - "longitude": null, - "serial": "21P10C68818122", - "createdTimestamp": 1591653239821, - "lastModifiedTimestamp": 1591653241398 -} + "latitude": null, + "longitude": null, + "baseMacAddress": { + "model_type": "MacAddress", + "address": "JPWi7y5T", + "addressAsString": "24:f5:a2:ef:2e:53" + }, + "serial": "21P10C68818122", + "createdTimestamp": 0, + "lastModifiedTimestamp": 1611264546193 +} \ No newline at end of file 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 9001597..b2c6ae0 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,73 +1,67 @@ { - "model_type": "Profile", - "id": 12, - "customerId": 2, - "profileType": "equipment_ap", - "name": "ApProfile-3-radios", - "details": { - "model_type": "ApNetworkConfiguration", - "networkConfigVersion": "AP-1", - "equipmentType": "AP", - "vlanNative": true, - "vlan": 0, - "ntpServer": { - "model_type": "AutoOrManualString", - "auto": true, - "value": "pool.ntp.org" - }, - "syslogRelay": null, - "rtlsSettings": null, - "syntheticClientEnabled": true, - "ledControlEnabled": true, - "equipmentDiscovery": false, + "model_type": "Profile", + "id": 38, + "customerId": 2, + "profileType": "equipment_ap", + "name": "ap-profile-2021-01-21T21:28:59.371Z", + "details": { + "model_type": "ApNetworkConfiguration", + "networkConfigVersion": "AP-1", + "equipmentType": "AP", + "vlanNative": true, + "vlan": 0, + "ntpServer": { + "model_type": "AutoOrManualString", + "auto": true, + "value": "pool.ntp.org" + }, + "syslogRelay": null, + "rtlsSettings": null, + "syntheticClientEnabled": true, + "ledControlEnabled": true, + "equipmentDiscovery": false, + "radioMap": { + "is5GHz": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + }, + "is2dot4GHz": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + }, + "is5GHzU": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + }, + "is5GHzL": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + } + }, + "greTunnelConfigurations": [ + { + "model_type": "GreTunnelConfiguration", "greTunnelName": null, "greParentIfName": null, "greLocalInetAddr": null, "greRemoteInetAddr": null, "greRemoteMacAddr": null, - "radioMap": { - "is2dot4GHz": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is5GHzU": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is5GHzL": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - } - }, - "greTunnelConfigurations": [ - { - "model_type": "GreTunnelConfiguration", - "greTunnelName": "gre1", - "greParentIfName": "wan", - "greLocalInetAddr": "10.0.0.129", - "greRemoteInetAddr": "192.168.1.101", - "greRemoteMacAddr": { - "model_type": "MacAddress", - "address": "ZEvwIFf/", - "addressAsString": "64:4b:f0:20:57:ff" - }, - "vlanIdsInGreTunnel": [ - 100 - ] - } - ], - "profileType": "equipment_ap" - }, - "createdTimestamp": 1606778369934, - "lastModifiedTimestamp": 1606778443413, - "childProfileIds": [ - 16, - 5, - 10, - 11, - 15 - ] -} \ No newline at end of file + "vlanIdsInGreTunnel": [ + ] + } + ], + "profileType": "equipment_ap" + }, + "createdTimestamp": 1611264539383, + "lastModifiedTimestamp": 1611264539383, + "childProfileIds": [ + 4, + 5, + 31, + 32 + ] +} 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 index 9c9b52f..9c1a3d0 100644 --- a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileCaptive.json +++ b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileCaptive.json @@ -1,135 +1,138 @@ [ -{ + { "model_type": "Profile", - "id": 14, + "id": 5, "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": "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": 1611262628973, + "expirationTime": 1611291428973, + "numDevices": 1, + "userDetails": { + "model_type": "TimedAccessUserDetails", + "firstName": "Pac", + "lastName": "Man", + "passwordNeedsReset": false + }, + "userMacAddresses": [ { - "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 + "model_type": "MacAddress", + "address": "fKtg5upO", + "addressAsString": "7c:ab:60:e6:ea:4e" } - ], - "macAllowList": [], - "profileType": "captive_portal" + ], + "lastModifiedTimestamp": 0 + }, + { + "model_type": "TimedAccessUserRecord", + "username": "customer", + "password": "testing123", + "activationTime": 1611262628974, + "expirationTime": 1611266228974, + "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": 1611262628974, + "expirationTime": 1611867428974, + "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": 1611262628974, + "expirationTime": 1611349028974, + "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 + "createdTimestamp": 1611262628978, + "lastModifiedTimestamp": 1611262628978, + "childProfileIds": [ + ] + } +] 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 b15c575..7c0559e 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,71 +1,71 @@ [ - { - "model_type": "Profile", - "id": 24, - "customerId": 2, - "profileType": "passpoint", - "name": "TipWlan-Passpoint-Config", - "details": { - "model_type": "PasspointProfile", - "enableInterworkingAndHs20": true, - "hessid": null, - "passpointAccessNetworkType": "free_public_network", - "passpointNetworkAuthenticationType": "acceptance_of_terms_and_conditions", - "additionalStepsRequiredForAccess": 0, - "deauthRequestTimeout": 0, - "operatingClass": 0, - "termsAndConditionsFile": { - "model_type": "ManagedFileInfo", - "md5checksum": null, - "lastModifiedTimestamp": null, - "apExportUrl": "https://localhost:9091/filestore/termsAndConditions", - "fileCategory": "ExternalPolicyConfiguration", - "fileType": "TEXT", - "altSlot": false - }, - "whitelistDomain": null, - "emergencyServicesReachable": true, - "unauthenticatedEmergencyServiceAccessible": false, - "internetConnectivity": true, - "connectionCapabilitySet": [ - { - "model_type": "PasspointConnectionCapability", - "connectionCapabilitiesPortNumber": 8888, - "connectionCapabilitiesStatus": "open", - "connectionCapabilitiesIpProtocol": "TCP" - } - ], - "ipAddressTypeAvailability": "public_IPv4_address_available", - "qosMapSetConfiguration": null, - "apGeospatialLocation": null, - "apCivicLocation": null, - "apPublicLocationIdUri": null, - "gasAddr3Behaviour": "p2pSpecWorkaroundFromRequest", - "anqpDomainId": 1234, - "disableDownstreamGroupAddressedForwarding": false, - "enable2pt4GHz": true, - "enable5GHz": true, - "associatedAccessSsidProfileIds": [ - 15 - ], - "osuSsidProfileId": 16, - "passpointOperatorProfileId": 17, - "passpointVenueProfileId": 18, - "passpointOsuProviderProfileIds": [ - 19, - 20 - ], - "accessNetworkType": "free_public_network", - "networkAuthenticationType": "acceptance_of_terms_and_conditions", - "profileType": "passpoint" - }, - "createdTimestamp": 1606778370807, - "lastModifiedTimestamp": 1606778370807, - "childProfileIds": [ - 17, - 18, - 19, - 20 - ] - } +{ + "model_type": "Profile", + "id": 37, + "customerId": 2, + "profileType": "passpoint", + "name": "hotspot20-profile-2021-01-21T21:28:59.171Z", + "details": { + "model_type": "PasspointProfile", + "enableInterworkingAndHs20": true, + "hessid": null, + "passpointAccessNetworkType": "free_public_network", + "passpointNetworkAuthenticationType": "acceptance_of_terms_and_conditions", + "additionalStepsRequiredForAccess": 0, + "deauthRequestTimeout": 0, + "operatingClass": 0, + "termsAndConditionsFile": { + "model_type": "ManagedFileInfo", + "md5checksum": null, + "lastModifiedTimestamp": null, + "apExportUrl": "https://localhost:9091/filestore/termsAndConditions", + "fileCategory": "ExternalPolicyConfiguration", + "fileType": "TEXT", + "altSlot": false + }, + "whitelistDomain": null, + "emergencyServicesReachable": true, + "unauthenticatedEmergencyServiceAccessible": false, + "internetConnectivity": true, + "connectionCapabilitySet": [ + { + "model_type": "PasspointConnectionCapability", + "connectionCapabilitiesPortNumber": 8888, + "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, + "associatedAccessSsidProfileIds": [ + 32 + ], + "osuSsidProfileId": 31, + "passpointOperatorProfileId": 34, + "passpointVenueProfileId": 33, + "passpointOsuProviderProfileIds": [ + 35, + 36 + ], + "accessNetworkType": "free_public_network", + "networkAuthenticationType": "acceptance_of_terms_and_conditions", + "profileType": "passpoint" + }, + "createdTimestamp": 0, + "lastModifiedTimestamp": 1611264539331, + "childProfileIds": [ + 33, + 34, + 35, + 36 + ] +} ] 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 6fdb9c2..c9ee1e9 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,265 +1,263 @@ [ - { - "model_type": "Profile", - "id": 19, - "customerId": 2, - "profileType": "passpoint_osu_id_provider", - "name": "TipWlan-Passpoint-OSU-Provider", - "details": { - "model_type": "PasspointOsuProviderProfile", - "mccMncList": [ - { - "model_type": "PasspointMccMnc", - "mcc": 302, - "mnc": 720, - "iso": "ca", - "country": "Canada", - "countryCode": 1, - "network": "Rogers AT&T Wireless", - "mccMncPairing": "302,720" - } - ], - "naiRealmList": [ - { - "model_type": "PasspointNaiRealmInformation", - "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" - ], - "EAP-TLS with certificate": [ - "Credential Type:Certificate" - ] - } - } - ], - "osuIconList": [ - { - "model_type": "PasspointOsuIcon", - "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": "PasspointOsuIcon", - "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": "PasspointOsuIcon", - "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" - } - ], - "osuServerUri": "https://example.com/osu/rogers", - "osuFriendlyName": [ - { - "model_type": "PasspointDuple", - "locale": "en_CA", - "dupleIso3Language": "eng", - "dupleName": "Example provider rogers", - "defaultDupleSeparator": ":", - "asDuple": "eng:Example provider rogers" - }, - { - "model_type": "PasspointDuple", - "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": "PasspointDuple", - "locale": "en_CA", - "dupleIso3Language": "eng", - "dupleName": "Example services rogers", - "defaultDupleSeparator": ":", - "asDuple": "eng:Example services rogers" - }, - { - "model_type": "PasspointDuple", - "locale": "fr_CA", - "dupleIso3Language": "fra", - "dupleName": "Exemples de services rogers", - "defaultDupleSeparator": ":", - "asDuple": "fra:Exemples de services rogers" - } - ], + { + "model_type": "Profile", + "id": 35, + "customerId": 2, + "profileType": "passpoint_osu_id_provider", + "name": "provider1-profile-2021-01-21T21:28:59.057Z", + "details": { + "model_type": "PasspointOsuProviderProfile", + "mccMncList": [ + { + "model_type": "PasspointMccMnc", + "mcc": 302, + "mnc": 720, + "iso": "ca", + "country": "Canada", + "countryCode": 1, + "network": "Rogers AT&T Wireless", + "mccMncPairing": "302,720" + } + ], + "naiRealmList": [ + { + "model_type": "PasspointNaiRealmInformation", + "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" + ], + "EAP-TLS with certificate": [ + "Credential Type:Certificate" + ] + } + } + ], + "osuIconList": [ + { + "model_type": "PasspointOsuIcon", + "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": "PasspointOsuIcon", + "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": "PasspointOsuIcon", + "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" + } + ], + "osuServerUri": "https://example.com/osu/rogers", + "osuFriendlyName": [ + { + "model_type": "PasspointDuple", + "locale": "eng", + "dupleIso3Language": "eng", + "dupleName": "Example provider rogers", + "defaultDupleSeparator": ":", + "asDuple": "eng:Example provider rogers" + }, + { + "model_type": "PasspointDuple", + "locale": "fra", + "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": "PasspointDuple", + "locale": "eng", + "dupleIso3Language": "eng", + "dupleName": "Example services rogers", + "defaultDupleSeparator": ":", + "asDuple": "eng:Example services rogers" + }, + { + "model_type": "PasspointDuple", + "locale": "fra", + "dupleIso3Language": "fra", + "dupleName": "Exemples de services rogers", + "defaultDupleSeparator": ":", + "asDuple": "fra:Exemples de services rogers" + } + ], "roamingOi": [ "BAA2D00100", "BAA2D00000" ], - "profileType": "passpoint_osu_id_provider" - }, - "createdTimestamp": 1606778370345, - "lastModifiedTimestamp": 1606778370345, - "childProfileIds": [ - ] - }, - { - "model_type": "Profile", - "id": 20, - "customerId": 2, - "profileType": "passpoint_osu_id_provider", - "name": "TipWlan-Passpoint-OSU-Provider-2", - "details": { - "model_type": "PasspointOsuProviderProfile", - "mccMncList": [ - { - "model_type": "PasspointMccMnc", - "mcc": 302, - "mnc": 220, - "iso": "ca", - "country": "Canada", - "countryCode": 1, - "network": "Telus Mobility", - "mccMncPairing": "302,220" - } - ], - "naiRealmList": [ - { - "model_type": "PasspointNaiRealmInformation", - "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" - ], - "EAP-TLS with certificate": [ - "Credential Type:Certificate" - ] - } - } - ], - "osuIconList": [ - { - "model_type": "PasspointOsuIcon", - "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": "PasspointOsuIcon", - "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": "PasspointOsuIcon", - "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" - } - ], - "osuServerUri": "https://example.com/osu/telus", - "osuFriendlyName": [ - { - "model_type": "PasspointDuple", - "locale": "en_CA", - "dupleIso3Language": "eng", - "dupleName": "Example provider telus", - "defaultDupleSeparator": ":", - "asDuple": "eng:Example provider telus" - }, - { - "model_type": "PasspointDuple", - "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": "PasspointDuple", - "locale": "en_CA", - "dupleIso3Language": "eng", - "dupleName": "Example services telus", - "defaultDupleSeparator": ":", - "asDuple": "eng:Example services telus" - }, - { - "model_type": "PasspointDuple", - "locale": "fr_CA", - "dupleIso3Language": "fra", - "dupleName": "Exemples de services telus", - "defaultDupleSeparator": ":", - "asDuple": "fra:Exemples de services telus" - } - ], - "roamingOi": [ + "profileType": "passpoint_osu_id_provider" + }, + "createdTimestamp": 1611264539070, + "lastModifiedTimestamp": 1611264539070, + "childProfileIds": [] + }, + { + "model_type": "Profile", + "id": 36, + "customerId": 2, + "profileType": "passpoint_osu_id_provider", + "name": "provider2-profile-2021-01-21T21:28:59.118Z", + "details": { + "model_type": "PasspointOsuProviderProfile", + "mccMncList": [ + { + "model_type": "PasspointMccMnc", + "mcc": 302, + "mnc": 220, + "iso": "ca", + "country": "Canada", + "countryCode": 1, + "network": "Telus Mobility", + "mccMncPairing": "302,220" + } + ], + "naiRealmList": [ + { + "model_type": "PasspointNaiRealmInformation", + "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" + ], + "EAP-TLS with certificate": [ + "Credential Type:Certificate" + ] + } + } + ], + "osuIconList": [ + { + "model_type": "PasspointOsuIcon", + "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": "PasspointOsuIcon", + "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": "PasspointOsuIcon", + "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" + } + ], + "osuServerUri": "https://example.com/osu/telus", + "osuFriendlyName": [ + { + "model_type": "PasspointDuple", + "locale": "eng", + "dupleIso3Language": "eng", + "dupleName": "Example provider telus", + "defaultDupleSeparator": ":", + "asDuple": "eng:Example provider telus" + }, + { + "model_type": "PasspointDuple", + "locale": "fra", + "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": "PasspointDuple", + "locale": "eng", + "dupleIso3Language": "eng", + "dupleName": "Example services telus", + "defaultDupleSeparator": ":", + "asDuple": "eng:Example services telus" + }, + { + "model_type": "PasspointDuple", + "locale": "fra", + "dupleIso3Language": "fra", + "dupleName": "Exemples de services telus", + "defaultDupleSeparator": ":", + "asDuple": "fra:Exemples de services telus" + } + ], + "roamingOi": [ "004096", "005014", "F4F5E8F5F4" ], - "profileType": "passpoint_osu_id_provider" - }, - "createdTimestamp": 1606778370351, - "lastModifiedTimestamp": 1606778370351, - "childProfileIds": [ - ] - } -] + "profileType": "passpoint_osu_id_provider" + }, + "createdTimestamp": 1611264539131, + "lastModifiedTimestamp": 1611264539131, + "childProfileIds": [] + } +] \ No newline at end of file diff --git a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileOperator.json b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileOperator.json index 6554732..0d8df1d 100644 --- a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileOperator.json +++ b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileOperator.json @@ -1,42 +1,41 @@ [ - { - "model_type": "Profile", - "id": 17, - "customerId": 2, - "profileType": "passpoint_operator", - "name": "TipWlan-Passpoint-Operator", - "details": { - "model_type": "PasspointOperatorProfile", - "serverOnlyAuthenticatedL2EncryptionNetwork": false, - "x509CertificateLocation": "/etc/ca.pem", - "operatorFriendlyName": [ - { - "model_type": "PasspointDuple", - "locale": "en_CA", - "dupleIso3Language": "eng", - "dupleName": "Default friendly passpoint_operator name", - "defaultDupleSeparator": ":", - "asDuple": "eng:Default friendly passpoint_operator name" - }, - { - "model_type": "PasspointDuple", - "locale": "fr_CA", - "dupleIso3Language": "fra", - "dupleName": "Nom de l'opérateur convivial par défaut", - "defaultDupleSeparator": ":", - "asDuple": "fra:Nom de l'opérateur convivial par défaut" - } - ], - "domainNameList": [ - "telus.com", - "rogers.com", - "bell.ca" - ], - "profileType": "passpoint_operator" - }, - "createdTimestamp": 1606778369945, - "lastModifiedTimestamp": 1606778369945, - "childProfileIds": [ - ] - } -] +{ + "model_type": "Profile", + "id": 34, + "customerId": 2, + "profileType": "passpoint_operator", + "name": "operator-profile-2021-01-21T21:28:58.994Z", + "details": { + "model_type": "PasspointOperatorProfile", + "serverOnlyAuthenticatedL2EncryptionNetwork": false, + "x509CertificateLocation": "/etc/ca.pem", + "operatorFriendlyName": [ + { + "model_type": "PasspointDuple", + "locale": "fra", + "dupleIso3Language": "fra", + "dupleName": "Nom de l'opérateur convivial par défaut", + "defaultDupleSeparator": ":", + "asDuple": "fra:Nom de l'opérateur convivial par défaut" + }, + { + "model_type": "PasspointDuple", + "locale": "eng", + "dupleIso3Language": "eng", + "dupleName": "Default friendly passpoint_operator name", + "defaultDupleSeparator": ":", + "asDuple": "eng:Default friendly passpoint_operator name" + } + ], + "domainNameList": [ + "bell.ca", + "telus.com", + "rogers.com" + ], + "profileType": "passpoint_operator" + }, + "createdTimestamp": 1611264539004, + "lastModifiedTimestamp": 1611264539004, + "childProfileIds": [] +} +] \ No newline at end of file diff --git a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileRadius.json b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileRadius.json index d7390a1..0a49b4d 100644 --- a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileRadius.json +++ b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileRadius.json @@ -1,34 +1,32 @@ [ - { - "model_type": "Profile", - "id": 1, - "customerId": 2, - "profileType": "radius", - "name": "Radius-Profile", - "details": { - "model_type": "RadiusProfile", - "subnetConfiguration": null, - "serviceRegionMap": { - "Ottawa": { - "model_type": "RadiusServiceRegion", - "serverMap": { - "Radius-Profile": [ - { - "model_type": "RadiusServer", - "ipAddress": "192.168.0.1", - "secret": "testing123", - "authPort": 1812, - "timeout": null - } - ] - }, - "regionName": "Ottawa" - } - }, - "profileType": "radius" - }, - "createdTimestamp": 1601961451668, - "lastModifiedTimestamp": 1601961451668, - "childProfileIds": [] - } -] \ No newline at end of file + { + "model_type": "Profile", + "id": 1, + "customerId": 2, + "profileType": "radius", + "name": "Radius-Profile", + "details": { + "model_type": "RadiusProfile", + "primaryRadiusServer": { + "model_type": "RadiusServer", + "ipAddress": "192.168.0.1", + "secret": "testing123", + "authPort": 1812, + "timeout": null + }, + "secondaryRadiusServer": { + "model_type": "RadiusServer", + "ipAddress": "192.168.0.2", + "secret": "testing123", + "authPort": 1812, + "timeout": null + }, + "radiusSubnetConfiguration": null, + "profileType": "radius" + }, + "createdTimestamp": 1611262628767, + "lastModifiedTimestamp": 1611262628767, + "childProfileIds": [ + ] + } +] diff --git a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileRf.json b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileRf.json index 0a3a9cf..96330d1 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,6 +1,6 @@ { "model_type": "Profile", - "id": 11, + "id": 4, "customerId": 2, "profileType": "rf", "name": "TipWlan-rf", @@ -198,7 +198,7 @@ }, "profileType": "rf" }, - "createdTimestamp": 1606778369933, - "lastModifiedTimestamp": 1606778369933, + "createdTimestamp": 1611262628788, + "lastModifiedTimestamp": 1611262628788, "childProfileIds": [] } \ 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 75c0435..27f36f6 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 @@ -20,9 +20,9 @@ "broadcastSsid": "enabled", "keyRefresh": 0, "noLocalSubnets": false, - "radiusServiceName": null, - "radiusAccountingServiceName": null, - "radiusAcountingServiceInterval": null, + "radiusServiceId": 0, + "radiusAccountingServiceId": 0, + "radiusAcountingServiceInterval": 60, "captivePortalId": null, "bandwidthLimitDown": 0, "bandwidthLimitUp": 0, @@ -76,27 +76,27 @@ }, { "model_type": "Profile", - "id": 15, + "id": 32, "customerId": 2, "profileType": "ssid", - "name": "TipWlan-cloud-passpoint-access", + "name": "access-ssid-profile-2021-01-21T21:28:58.871Z", "details": { "model_type": "SsidConfiguration", - "ssid": "TipWlan-cloud-passpoint-access", + "ssid": "ssid-access-passpoint", "appliedRadios": [ - "is5GHzL", - "is5GHzU" + "is5GHzU", + "is5GHzL" ], "ssidAdminState": "enabled", - "secureMode": "wpa2PSK", + "secureMode": "wpa2EAP", "vlanId": 1, "keyStr": "testing123", "broadcastSsid": "enabled", "keyRefresh": 0, "noLocalSubnets": false, - "radiusServiceName": null, - "radiusAccountingServiceName": null, - "radiusAcountingServiceInterval": null, + "radiusServiceId": 1, + "radiusAccountingServiceId": 1, + "radiusAcountingServiceInterval": 60, "captivePortalId": null, "bandwidthLimitDown": 0, "bandwidthLimitUp": 0, @@ -104,18 +104,6 @@ "clientBandwidthLimitUp": 0, "videoTrafficOnly": false, "radioBasedConfigs": { - "is5GHzL": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is2dot4GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, "is5GHz": { "model_type": "RadioBasedSsidConfiguration", "enable80211r": null, @@ -127,13 +115,24 @@ "enable80211r": null, "enable80211k": null, "enable80211v": null + }, + "is2dot4GHz": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + }, + "is5GHzL": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null } }, "bonjourGatewayProfileId": null, "enable80211w": null, "wepConfig": null, "forwardMode": null, - "profileType": "ssid", "radiusClientConfiguration": { "model_type": "RadiusNasConfiguration", "nasClientId": "DEFAULT", @@ -141,23 +140,25 @@ "userDefinedNasId": null, "userDefinedNasIp": null, "operatorId": null - } + }, + "profileType": "ssid" }, - "createdTimestamp": 1606778369943, - "lastModifiedTimestamp": 1606778370811, + "createdTimestamp": 0, + "lastModifiedTimestamp": 1611264539281, "childProfileIds": [ - 24 + 37, + 1 ] }, { "model_type": "Profile", - "id": 16, + "id": 31, "customerId": 2, "profileType": "ssid", - "name": "TipWlan-cloud-passpoint-osu", + "name": "osu-ssid-profile-2021-01-21T21:28:58.798Z", "details": { "model_type": "SsidConfiguration", - "ssid": "TipWlan-cloud-passpoint-osu", + "ssid": "ssid-open-passpoint", "appliedRadios": [ "is2dot4GHz" ], @@ -168,9 +169,9 @@ "broadcastSsid": "enabled", "keyRefresh": 0, "noLocalSubnets": false, - "radiusServiceName": null, - "radiusAccountingServiceName": null, - "radiusAcountingServiceInterval": null, + "radiusServiceId": 0, + "radiusAccountingServiceId": 0, + "radiusAcountingServiceInterval": 60, "captivePortalId": null, "bandwidthLimitDown": 0, "bandwidthLimitUp": 0, @@ -178,18 +179,6 @@ "clientBandwidthLimitUp": 0, "videoTrafficOnly": false, "radioBasedConfigs": { - "is5GHzL": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is2dot4GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, "is5GHz": { "model_type": "RadioBasedSsidConfiguration", "enable80211r": null, @@ -201,13 +190,24 @@ "enable80211r": null, "enable80211k": null, "enable80211v": null + }, + "is2dot4GHz": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + }, + "is5GHzL": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null } }, "bonjourGatewayProfileId": null, "enable80211w": null, "wepConfig": null, "forwardMode": null, - "profileType": "ssid", "radiusClientConfiguration": { "model_type": "RadiusNasConfiguration", "nasClientId": "DEFAULT", @@ -215,13 +215,13 @@ "userDefinedNasId": null, "userDefinedNasIp": null, "operatorId": null - } + }, + "profileType": "ssid" }, - "createdTimestamp": 1606778369944, - "lastModifiedTimestamp": 1606778370352, + "createdTimestamp": 0, + "lastModifiedTimestamp": 1611264539231, "childProfileIds": [ - 19, - 20 + 37 ] } ] diff --git a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileVenue.json b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileVenue.json index 820929f..fd674e3 100644 --- a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileVenue.json +++ b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileVenue.json @@ -1,43 +1,42 @@ [ - { - "model_type": "Profile", - "id": 18, - "customerId": 2, - "profileType": "passpoint_venue", - "name": "TipWlan-Passpoint-Venue", - "details": { - "model_type": "PasspointVenueProfile", - "venueNameSet": [ - { - "model_type": "PasspointVenueName", - "locale": "fr_CA", - "dupleIso3Language": "fra", - "dupleName": "Exemple de lieu", - "defaultDupleSeparator": ":", - "venueUrl": "http://www.example.com/info-fra", - "asDuple": "fra:Exemple de lieu" - }, - { - "model_type": "PasspointVenueName", - "locale": "en_CA", - "dupleIso3Language": "eng", - "dupleName": "Example passpoint_venue", - "defaultDupleSeparator": ":", - "venueUrl": "http://www.example.com/info-eng", - "asDuple": "eng:Example passpoint_venue" - } - ], - "venueTypeAssignment": { - "model_type": "PasspointVenueTypeAssignment", - "venueDescription": "Research and Development Facility", - "venueGroupId": 2, - "venueTypeId": 8 - }, - "profileType": "passpoint_venue" - }, - "createdTimestamp": 1606778369950, - "lastModifiedTimestamp": 1606778369950, - "childProfileIds": [ - ] - } -] +{ + "model_type": "Profile", + "id": 33, + "customerId": 2, + "profileType": "passpoint_venue", + "name": "venue-profile-2021-01-21T21:28:58.934Z", + "details": { + "model_type": "PasspointVenueProfile", + "venueNameSet": [ + { + "model_type": "PasspointVenueName", + "locale": "fra", + "dupleIso3Language": "fra", + "dupleName": "Exemple de lieu", + "defaultDupleSeparator": ":", + "venueUrl": "http://www.example.com/info-fra", + "asDuple": "fra:Exemple de lieu" + }, + { + "model_type": "PasspointVenueName", + "locale": "eng", + "dupleIso3Language": "eng", + "dupleName": "Example passpoint_venue", + "defaultDupleSeparator": ":", + "venueUrl": "http://www.example.com/info-eng", + "asDuple": "eng:Example passpoint_venue" + } + ], + "venueTypeAssignment": { + "model_type": "PasspointVenueTypeAssignment", + "venueDescription": "Research and Development Facility", + "venueGroupId": 2, + "venueTypeId": 8 + }, + "profileType": "passpoint_venue" + }, + "createdTimestamp": 1611264538947, + "lastModifiedTimestamp": 1611264538947, + "childProfileIds": [] +} +] \ No newline at end of file diff --git a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/mqtt/OpensyncMqttClient.java b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/mqtt/OpensyncMqttClient.java index 4774b0a..37fa9cc 100644 --- a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/mqtt/OpensyncMqttClient.java +++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/mqtt/OpensyncMqttClient.java @@ -141,7 +141,7 @@ public class OpensyncMqttClient implements ApplicationListener 0) { getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security); } } else if (ssidSecurityMode.equals("wpa3OnlyEAP")) { security.put("mode", "3"); getRadiusConfiguration(opensyncApConfig, ssidConfig, security); - if (ssidConfig.getRadiusAccountingServiceName() != null) { + if (ssidConfig.getRadiusAccountingServiceId() > 0) { getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security); } } else if (ssidSecurityMode.equals("wpa2EAP") || ssidSecurityMode.equals("wpa2Radius") || ssidSecurityMode.equals("wpa3MixedEAP")) { security.put("mode", "mixed"); getRadiusConfiguration(opensyncApConfig, ssidConfig, security); - if (ssidConfig.getRadiusAccountingServiceName() != null) { + if (ssidConfig.getRadiusAccountingServiceId() > 0) { getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security); } } else if (ssidSecurityMode.equals("wpaEAP") || ssidSecurityMode.equals("wpaRadius")) { security.put("mode", "1"); getRadiusConfiguration(opensyncApConfig, ssidConfig, security); - if (ssidConfig.getRadiusAccountingServiceName() != null) { + if (ssidConfig.getRadiusAccountingServiceId() > 0) { getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security); } } else if (ssidSecurityMode.equals("wep")) { @@ -3742,62 +3734,49 @@ public class OvsdbDao { void getRadiusAccountingConfiguration(OpensyncAPConfig opensyncApConfig, SsidConfiguration ssidConfig, Map security) { - LOG.info("getRadiusAccountingConfiguration for ssidConfig {} from radiusProfiles {}", ssidConfig, + LOG.debug("getRadiusAccountingConfiguration for ssidConfig {} from radiusProfiles {}", ssidConfig, opensyncApConfig.getRadiusProfiles()); - List radiusServiceList = opensyncApConfig.getRadiusProfiles().stream() + LOG.debug("Radius Accounting Profiles {}", opensyncApConfig.getRadiusProfiles()); + + List radiusProfileList = opensyncApConfig.getRadiusProfiles().stream() .filter(new Predicate() { @Override - public boolean test(Profile p) { - return p.getName().equals((ssidConfig.getRadiusAccountingServiceName())); + public boolean test(Profile t) { + return t.getId() == ssidConfig.getRadiusAccountingServiceId(); } + }).collect(Collectors.toList()); - if (radiusServiceList != null && radiusServiceList.size() > 0) { - Profile profileRadius = radiusServiceList.get(0); - String region = opensyncApConfig.getEquipmentLocation().getName(); - List radiusServerList = new ArrayList<>(); - RadiusProfile radiusProfileDetails = ((RadiusProfile) profileRadius.getDetails()); - RadiusServiceRegion radiusServiceRegion = radiusProfileDetails.findServiceRegion(region); - if (radiusServiceRegion != null) { - radiusServerList = radiusServiceRegion - .findServerConfiguration(ssidConfig.getRadiusAccountingServiceName()); - if (radiusServerList != null && radiusServerList.size() > 0) { - RadiusServer rServer = radiusServerList.get(0); - if (rServer != null) { - security.put("radius_acct_ip", - rServer.getIpAddress() != null ? rServer.getIpAddress().getHostAddress() : null); - security.put("radius_acct_port", - rServer.getAuthPort() != null ? String.valueOf(rServer.getAuthPort()) : null); - security.put("radius_acct_secret", rServer.getSecret()); - if (ssidConfig.getRadiusAcountingServiceInterval() != null) { - // if the value is present, use the - // radius_acct_interval - security.put("radius_acct_interval", - ssidConfig.getRadiusAcountingServiceInterval().toString()); + if (radiusProfileList != null && radiusProfileList.size() > 0) { + Profile profileRadius = radiusProfileList.get(0); + RadiusProfile profileDetails = ((RadiusProfile) profileRadius.getDetails()); + RadiusServer rServer = profileDetails.getPrimaryRadiusServer(); + security.put("radius_acct_ip", + rServer.getIpAddress() != null ? rServer.getIpAddress().getHostAddress() : null); + security.put("radius_acct_port", + rServer.getAuthPort() != null ? String.valueOf(rServer.getAuthPort()) : null); + security.put("radius_acct_secret", rServer.getSecret()); + if (ssidConfig.getRadiusAcountingServiceInterval() != null) { + // if the value is present, use the + // radius_acct_interval + security.put("radius_acct_interval", + ssidConfig.getRadiusAcountingServiceInterval().toString()); - } else { - LOG.info("No radius_acct_interval defined for ssid {}, Setting radius_acct_interval to 0", - ssidConfig.getSsid(), rServer); - security.put("radius_acct_interval", "0"); - } - LOG.info( - "set Radius Accounting server attributes radius_acct_ip {} radius_acct_port {} radius_acct_secret {} radius_acct_interval {}", - security.get("radius_acct_ip"), security.get("radius_acct_port"), - security.get("radius_acct_secret"), security.get("radius_acct_interval")); - - } - - } else { - LOG.warn("Could not get RadiusServerConfiguration for {} from RadiusProfile {}", - ssidConfig.getRadiusAccountingServiceName(), profileRadius); - } } else { - LOG.warn("Could not get RadiusServiceRegion {} from RadiusProfile {}", region, profileRadius); + LOG.info("No radius_acct_interval defined for ssid {}, Setting radius_acct_interval to 0", + ssidConfig.getSsid(), rServer); + security.put("radius_acct_interval", "0"); } + LOG.info( + "set Radius Accounting server attributes radius_acct_ip {} radius_acct_port {} radius_acct_secret {} radius_acct_interval {}", + security.get("radius_acct_ip"), security.get("radius_acct_port"), + security.get("radius_acct_secret"), security.get("radius_acct_interval")); + + } else { - LOG.warn("Could not find radius profile {} in {}", ssidConfig.getRadiusAccountingServiceName(), + LOG.warn("Could not find radius profile {} in {}", ssidConfig.getRadiusServiceId(), opensyncApConfig.getRadiusProfiles()); } @@ -3809,45 +3788,33 @@ public class OvsdbDao { LOG.debug("getRadiusConfiguration for ssidConfig {} from radiusProfiles {}", ssidConfig, opensyncApConfig.getRadiusProfiles()); - List radiusServiceList = opensyncApConfig.getRadiusProfiles().stream() + LOG.debug("Radius Profiles {}", opensyncApConfig.getRadiusProfiles()); + + List radiusProfileList = opensyncApConfig.getRadiusProfiles().stream() .filter(new Predicate() { @Override - public boolean test(Profile p) { - return p.getName().equals((ssidConfig.getRadiusServiceName())); + public boolean test(Profile t) { + return t.getId() == ssidConfig.getRadiusServiceId(); } + }).collect(Collectors.toList()); - if (radiusServiceList != null && radiusServiceList.size() > 0) { - Profile profileRadius = radiusServiceList.get(0); - String region = opensyncApConfig.getEquipmentLocation().getName(); - List radiusServerList = new ArrayList<>(); - RadiusProfile radiusProfileDetails = ((RadiusProfile) profileRadius.getDetails()); - RadiusServiceRegion radiusServiceRegion = radiusProfileDetails.findServiceRegion(region); - if (radiusServiceRegion != null) { - radiusServerList = radiusServiceRegion.findServerConfiguration(ssidConfig.getRadiusServiceName()); - if (radiusServerList != null && radiusServerList.size() > 0) { - RadiusServer rServer = radiusServerList.get(0); - if (rServer != null) { - security.put("radius_server_ip", - rServer.getIpAddress() != null ? rServer.getIpAddress().getHostAddress() : null); - security.put("radius_server_port", - rServer.getAuthPort() != null ? String.valueOf(rServer.getAuthPort()) : null); - security.put("radius_server_secret", rServer.getSecret()); - LOG.info( - "set Radius server attributes radius_server_ip {} radius_server_port {} radius_server_secret {}", - security.get("radius_server_ip"), security.get("radius_server_port"), - security.get("radius_server_secret")); - } - } else { - LOG.warn("Could not get RadiusServerConfiguration for {} from RadiusProfile {}", - ssidConfig.getRadiusServiceName(), profileRadius); - } - } else { - LOG.warn("Could not get RadiusServiceRegion {} from RadiusProfile {}", region, profileRadius); - } + if (radiusProfileList != null && radiusProfileList.size() > 0) { + Profile profileRadius = radiusProfileList.get(0); + RadiusProfile profileDetails = ((RadiusProfile) profileRadius.getDetails()); + RadiusServer radiusServer = profileDetails.getPrimaryRadiusServer(); + security.put("radius_server_ip", + radiusServer.getIpAddress() != null ? radiusServer.getIpAddress().getHostAddress() : null); + security.put("radius_server_port", + radiusServer.getAuthPort() != null ? String.valueOf(radiusServer.getAuthPort()) : null); + security.put("radius_server_secret", radiusServer.getSecret()); + LOG.info("set Radius server attributes radius_server_ip {} radius_server_port {} radius_server_secret {}", + security.get("radius_server_ip"), security.get("radius_server_port"), + security.get("radius_server_secret")); + } else { - LOG.warn("Could not find radius profile {} in {}", ssidConfig.getRadiusServiceName(), + LOG.warn("Could not find radius profile {} in {}", ssidConfig.getRadiusServiceId(), opensyncApConfig.getRadiusProfiles()); } } @@ -4811,125 +4778,153 @@ public class OvsdbDao { } public void configureStatsFromProfile(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncApConfig) { + configureStats(ovsdbClient); - if (opensyncApConfig.getMetricsProfiles() == null || opensyncApConfig.getMetricsProfiles().isEmpty()) { - configureStats(ovsdbClient); - } else { - - List operations = new ArrayList<>(); - - for (Profile metricsProfile : opensyncApConfig.getMetricsProfiles()) { - - ServiceMetricsCollectionConfigProfile details = ((ServiceMetricsCollectionConfigProfile) metricsProfile - .getDetails()); - - for (ServiceMetricDataType dataType : details.getMetricConfigParameterMap().keySet()) { - - if (dataType.equals(ServiceMetricDataType.ApNode) - || dataType.equals(ServiceMetricDataType.Neighbour) - || dataType.equals(ServiceMetricDataType.Channel)) { - - details.getMetricConfigParameterMap().get(dataType).stream().forEach(c -> { - ServiceMetricSurveyConfigParameters parameters = (ServiceMetricSurveyConfigParameters) c; - - Map thresholdMap = new HashMap<>(); - thresholdMap.put("max_delay", parameters.getDelayMillisecondsThreshold()); - thresholdMap.put("util", parameters.getPercentUtilizationThreshold()); - - @SuppressWarnings("unchecked") - com.vmware.ovsdb.protocol.operation.notation.Map thresholds = com.vmware.ovsdb.protocol.operation.notation.Map - .of(thresholdMap); - - RadioType radioType = parameters.getRadioType(); - ServiceMetricsChannelUtilizationSurveyType channelType = parameters.getChannelSurveyType(); - int scanInterval = parameters.getScanIntervalMillis(); - ServiceMetricsStatsReportFormat format = parameters.getStatsReportFormat(); - int reportingInterval = parameters.getReportingIntervalSeconds(); - int samplingInterval = parameters.getSamplingInterval(); - - if (dataType.equals(ServiceMetricDataType.ApNode) - || dataType.equals(ServiceMetricDataType.Channel)) { - provisionWifiStatsConfigFromProfile("survey", getAllowedChannels(ovsdbClient), - radioType, channelType, scanInterval, format, reportingInterval, - samplingInterval, operations, thresholds); - if (dataType.equals(ServiceMetricDataType.ApNode)) { - // extra reports that are part of ApNode - // metric - if (channelType.equals(ServiceMetricsChannelUtilizationSurveyType.ON_CHANNEL)) { - provisionWifiStatsConfigFromProfile("device", reportingInterval, - samplingInterval, operations); - if (((ApNetworkConfiguration) opensyncApConfig.getApProfile().getDetails()) - .getSyntheticClientEnabled()) { - provisionWifiStatsConfigFromProfile("network_probe", reportingInterval, - samplingInterval, operations); - } - } - - } - } else if (dataType.equals(ServiceMetricDataType.Neighbour)) { - provisionWifiStatsConfigFromProfile("neighbor", getAllowedChannels(ovsdbClient), - radioType, channelType, scanInterval, format, reportingInterval, - samplingInterval, operations, thresholds); - } - - }); - - } else if (dataType.equals(ServiceMetricDataType.ApSsid) - || dataType.equals(ServiceMetricDataType.Client)) { - details.getMetricConfigParameterMap().get(dataType).stream().forEach(c -> { - ServiceMetricRadioConfigParameters parameters = (ServiceMetricRadioConfigParameters) c; - - RadioType radioType = parameters.getRadioType(); - int reportingInterval = parameters.getReportingIntervalSeconds(); - int samplingInterval = parameters.getSamplingInterval(); - - provisionWifiStatsConfigFromProfile("client", radioType, reportingInterval, - samplingInterval, operations); - - provisionWifiStatsConfigFromProfile("video_voice", reportingInterval, samplingInterval, - operations); - LOG.debug("{}", BaseJsonModel.toPrettyJsonString(parameters)); - }); - } else { - details.getMetricConfigParameterMap().get(dataType).stream().forEach(c -> { - ServiceMetricConfigParameters parameters = (ServiceMetricConfigParameters) c; - int reportingInterval = parameters.getReportingIntervalSeconds(); - int samplingInterval = parameters.getSamplingInterval(); - provisionWifiStatsConfigFromProfile("video_voice", reportingInterval, samplingInterval, - operations); - // TODO: add when schema supports - // provisionWifiStatsConfigFromProfile("event", - // reportingInterval, - // samplingInterval, operations); - - LOG.debug("{}", BaseJsonModel.toPrettyJsonString(parameters)); - }); - } - - } - - } - - if (!operations.isEmpty()) { - LOG.debug("Sending batch of operations : {} ", operations); - - try { - CompletableFuture fResult = ovsdbClient.transact(ovsdbName, operations); - OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS); - - if (LOG.isDebugEnabled()) { - LOG.debug("Updated {}:", wifiStatsConfigDbTable); - - for (OperationResult res : result) { - LOG.debug("Op Result {}", res); - } - } - } catch (OvsdbClientException | TimeoutException | ExecutionException | InterruptedException e) { - throw new RuntimeException(e); - } - } - - } + // if (opensyncApConfig.getMetricsProfiles() == null || + // opensyncApConfig.getMetricsProfiles().isEmpty()) { + // configureStats(ovsdbClient); + // } else { + // + // List operations = new ArrayList<>(); + // + // for (Profile metricsProfile : opensyncApConfig.getMetricsProfiles()) + // { + // + // ServiceMetricsCollectionConfigProfile details = + // ((ServiceMetricsCollectionConfigProfile) metricsProfile + // .getDetails()); + // + // for (ServiceMetricDataType dataType : + // details.getMetricConfigParameterMap().keySet()) { + // + // if (dataType.equals(ServiceMetricDataType.ApNode) + // || dataType.equals(ServiceMetricDataType.Neighbour) + // || dataType.equals(ServiceMetricDataType.Channel)) { + // + // details.getMetricConfigParameterMap().get(dataType).stream().forEach(c + // -> { + // ServiceMetricSurveyConfigParameters parameters = + // (ServiceMetricSurveyConfigParameters) c; + // + // Map thresholdMap = new HashMap<>(); + // thresholdMap.put("max_delay", + // parameters.getDelayMillisecondsThreshold()); + // thresholdMap.put("util", + // parameters.getPercentUtilizationThreshold()); + // + // @SuppressWarnings("unchecked") + // com.vmware.ovsdb.protocol.operation.notation.Map + // thresholds = com.vmware.ovsdb.protocol.operation.notation.Map + // .of(thresholdMap); + // + // RadioType radioType = parameters.getRadioType(); + // ServiceMetricsChannelUtilizationSurveyType channelType = + // parameters.getChannelSurveyType(); + // int scanInterval = parameters.getScanIntervalMillis(); + // ServiceMetricsStatsReportFormat format = + // parameters.getStatsReportFormat(); + // int reportingInterval = parameters.getReportingIntervalSeconds(); + // int samplingInterval = parameters.getSamplingInterval(); + // + // if (dataType.equals(ServiceMetricDataType.ApNode) + // || dataType.equals(ServiceMetricDataType.Channel)) { + // provisionWifiStatsConfigFromProfile("survey", + // getAllowedChannels(ovsdbClient), + // radioType, channelType, scanInterval, format, reportingInterval, + // samplingInterval, operations, thresholds); + // if (dataType.equals(ServiceMetricDataType.ApNode)) { + // // extra reports that are part of ApNode + // // metric + // if + // (channelType.equals(ServiceMetricsChannelUtilizationSurveyType.ON_CHANNEL)) + // { + // provisionWifiStatsConfigFromProfile("device", reportingInterval, + // samplingInterval, operations); + // if (((ApNetworkConfiguration) + // opensyncApConfig.getApProfile().getDetails()) + // .getSyntheticClientEnabled()) { + // provisionWifiStatsConfigFromProfile("network_probe", + // reportingInterval, + // samplingInterval, operations); + // } + // } + // + // } + // } else if (dataType.equals(ServiceMetricDataType.Neighbour)) { + // provisionWifiStatsConfigFromProfile("neighbor", + // getAllowedChannels(ovsdbClient), + // radioType, channelType, scanInterval, format, reportingInterval, + // samplingInterval, operations, thresholds); + // } + // + // }); + // + // } else if (dataType.equals(ServiceMetricDataType.ApSsid) + // || dataType.equals(ServiceMetricDataType.Client)) { + // details.getMetricConfigParameterMap().get(dataType).stream().forEach(c + // -> { + // ServiceMetricRadioConfigParameters parameters = + // (ServiceMetricRadioConfigParameters) c; + // + // RadioType radioType = parameters.getRadioType(); + // int reportingInterval = parameters.getReportingIntervalSeconds(); + // int samplingInterval = parameters.getSamplingInterval(); + // + // provisionWifiStatsConfigFromProfile("client", radioType, + // reportingInterval, + // samplingInterval, operations); + // + // provisionWifiStatsConfigFromProfile("video_voice", reportingInterval, + // samplingInterval, + // operations); + // LOG.debug("{}", BaseJsonModel.toPrettyJsonString(parameters)); + // }); + // } else { + // details.getMetricConfigParameterMap().get(dataType).stream().forEach(c + // -> { + // ServiceMetricConfigParameters parameters = + // (ServiceMetricConfigParameters) c; + // int reportingInterval = parameters.getReportingIntervalSeconds(); + // int samplingInterval = parameters.getSamplingInterval(); + // provisionWifiStatsConfigFromProfile("video_voice", reportingInterval, + // samplingInterval, + // operations); + // // TODO: add when schema supports + // // provisionWifiStatsConfigFromProfile("event", + // // reportingInterval, + // // samplingInterval, operations); + // + // LOG.debug("{}", BaseJsonModel.toPrettyJsonString(parameters)); + // }); + // } + // + // } + // + // } + // + // if (!operations.isEmpty()) { + // LOG.debug("Sending batch of operations : {} ", operations); + // + // try { + // CompletableFuture fResult = + // ovsdbClient.transact(ovsdbName, operations); + // OperationResult[] result = fResult.get(ovsdbTimeoutSec, + // TimeUnit.SECONDS); + // + // if (LOG.isDebugEnabled()) { + // LOG.debug("Updated {}:", wifiStatsConfigDbTable); + // + // for (OperationResult res : result) { + // LOG.debug("Op Result {}", res); + // } + // } + // } catch (OvsdbClientException | TimeoutException | ExecutionException + // | InterruptedException e) { + // throw new RuntimeException(e); + // } + // } + // + // } } @@ -5029,7 +5024,6 @@ public class OvsdbDao { } - @Deprecated public void configureStats(OvsdbClient ovsdbClient) { try { @@ -5143,7 +5137,7 @@ public class OvsdbDao { rowColumns.put("report_type", new Atom<>("raw")); rowColumns.put("sampling_interval", new Atom<>(10)); rowColumns.put("stats_type", new Atom<>("survey")); - rowColumns.put("survey_interval_ms", new Atom<>(65)); + rowColumns.put("survey_interval_ms", new Atom<>(0)); rowColumns.put("survey_type", new Atom<>("on-chan")); Row updateRow = new Row(rowColumns); @@ -5168,12 +5162,12 @@ public class OvsdbDao { rowColumns.put("channel_list", channels); rowColumns.put("radio_type", new Atom<>(rc.freqBand)); - rowColumns.put("reporting_interval", new Atom<>(300)); + rowColumns.put("reporting_interval", new Atom<>(120)); rowColumns.put("report_type", new Atom<>("raw")); rowColumns.put("stats_type", new Atom<>("survey")); rowColumns.put("survey_type", new Atom<>("off-chan")); - rowColumns.put("sampling_interval", new Atom<>(30)); - rowColumns.put("survey_interval_ms", new Atom<>(65)); + rowColumns.put("sampling_interval", new Atom<>(10)); + rowColumns.put("survey_interval_ms", new Atom<>(50)); rowColumns.put("threshold", thresholds); Row updateRow = new Row(rowColumns); operations.add(new Insert(wifiStatsConfigDbTable, updateRow)); @@ -5690,7 +5684,6 @@ public class OvsdbDao { throw new RuntimeException(e); } - } } diff --git a/opensync-gateway/src/test/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDaoTest.java b/opensync-gateway/src/test/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDaoTest.java index 20285d7..0e7a9bd 100644 --- a/opensync-gateway/src/test/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDaoTest.java +++ b/opensync-gateway/src/test/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDaoTest.java @@ -178,7 +178,7 @@ public class OvsdbDaoTest { Profile profileRadius = OvsdbDaoTestUtilities.createRadiusProfile(DEFAULT_CUSTOMER_ID); apConfig.setRadiusProfiles(List.of(profileRadius)); SsidConfiguration ssidConfig = SsidConfiguration.createWithDefaults(); - ssidConfig.setRadiusServiceName("Radius-Profile"); + ssidConfig.setRadiusServiceId(profileRadius.getId()); Map security = new HashMap<>(); Location location = new Location(); location.setName("Ottawa"); @@ -195,7 +195,7 @@ public class OvsdbDaoTest { Profile profileRadius = OvsdbDaoTestUtilities.createRadiusProfile(DEFAULT_CUSTOMER_ID); apConfig.setRadiusProfiles(List.of(profileRadius)); SsidConfiguration ssidConfig = SsidConfiguration.createWithDefaults(); - ssidConfig.setRadiusAccountingServiceName("Radius-Profile"); + ssidConfig.setRadiusAccountingServiceId(profileRadius.getId()); ssidConfig.setRadiusAcountingServiceInterval(60); Map security = new HashMap<>(); Location location = new Location(); @@ -215,13 +215,13 @@ public class OvsdbDaoTest { Profile profileRadius = OvsdbDaoTestUtilities.createRadiusProfile(DEFAULT_CUSTOMER_ID); apConfig.setRadiusProfiles(List.of(profileRadius)); SsidConfiguration ssidConfig = SsidConfiguration.createWithDefaults(); - ssidConfig.setRadiusAccountingServiceName("Radius-Profile"); + ssidConfig.setRadiusAccountingServiceId(profileRadius.getId()); Map security = new HashMap<>(); Location location = new Location(); location.setName("Ottawa"); apConfig.setEquipmentLocation(location); ovsdbDao.getRadiusAccountingConfiguration(apConfig, ssidConfig, security); - assert (security.get("radius_acct_interval").equals("0")); + assert (security.get("radius_acct_interval").equals("60")); assert (security.get("radius_acct_ip").equals("192.168.0.1")); assert (security.get("radius_acct_port").equals("1812")); assert (security.get("radius_acct_secret").equals("testing123")); diff --git a/opensync-gateway/src/test/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDaoTestUtilities.java b/opensync-gateway/src/test/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDaoTestUtilities.java index a2e9647..7aedc25 100644 --- a/opensync-gateway/src/test/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDaoTestUtilities.java +++ b/opensync-gateway/src/test/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDaoTestUtilities.java @@ -29,7 +29,6 @@ import com.telecominfraproject.wlan.profile.passpoint.models.provider.PasspointO import com.telecominfraproject.wlan.profile.passpoint.models.venue.PasspointVenueProfile; import com.telecominfraproject.wlan.profile.radius.models.RadiusProfile; import com.telecominfraproject.wlan.profile.radius.models.RadiusServer; -import com.telecominfraproject.wlan.profile.radius.models.RadiusServiceRegion; import com.telecominfraproject.wlan.profile.rf.models.RfConfiguration; import com.telecominfraproject.wlan.profile.ssid.models.SsidConfiguration; import com.telecominfraproject.wlan.profile.ssid.models.SsidConfiguration.SecureMode; @@ -43,6 +42,8 @@ import com.vmware.ovsdb.protocol.operation.result.SelectResult; import com.vmware.ovsdb.protocol.operation.result.UpdateResult; public class OvsdbDaoTestUtilities { + + public static long RADIUS_PROFILE_ID = 100L; // Static creation of Profiles and Results to use with the OvsdbDao JUnit // tests. @@ -557,19 +558,29 @@ public class OvsdbDaoTestUtilities { profileRadius.setName("Radius-Profile"); RadiusProfile radiusDetails = new RadiusProfile(); - RadiusServiceRegion radiusServiceRegion = new RadiusServiceRegion(); - RadiusServer radiusServer = new RadiusServer(); - radiusServer.setAuthPort(1812); + RadiusServer primaryRadiusServer = new RadiusServer(); + primaryRadiusServer.setAuthPort(1812); try { - radiusServer.setIpAddress(InetAddress.getByName("192.168.0.1")); + primaryRadiusServer.setIpAddress(InetAddress.getByName("192.168.0.1")); } catch (UnknownHostException e) { throw new IllegalArgumentException(e); } - radiusServer.setSecret("testing123"); - radiusServiceRegion.addRadiusServer("Radius-Profile", radiusServer); - radiusServiceRegion.setRegionName("Ottawa"); - radiusDetails.addRadiusServiceRegion(radiusServiceRegion); + primaryRadiusServer.setSecret("testing123"); + radiusDetails.setPrimaryRadiusServer(primaryRadiusServer); + + RadiusServer secondaryRadiusServer = new RadiusServer(); + secondaryRadiusServer.setAuthPort(1812); + try { + secondaryRadiusServer.setIpAddress(InetAddress.getByName("192.168.0.2")); + } catch (UnknownHostException e) { + throw new IllegalArgumentException(e); + } + secondaryRadiusServer.setSecret("testing123"); + radiusDetails.setSecondaryRadiusServer(secondaryRadiusServer); + profileRadius.setDetails(radiusDetails); + profileRadius.setId(RADIUS_PROFILE_ID); + return profileRadius; }