From 67c0ae9ffcdfcaab7b0b06bacca40ccfb284f2af Mon Sep 17 00:00:00 2001 From: Mike Hansen Date: Fri, 11 Dec 2020 14:28:44 -0500 Subject: [PATCH] WIFI-1182: Cloud Backend Services and API - Support for NAS-ID RADIUS Attribute to be configurable via CloudSDK WIFI-1185: Cloud Backend Services and API - Support for NAS-IP RADIUS Attribute to be configurable via CloudSDK WIFI-1188: Support for Operator-Name RADIUS Attribute to be configurable via CloudSDK Also add registration for events per RadioBand vs. at device level. Support for static tools --- .../src/main/resources/ProfileSsid.json | 411 +++++++++--------- .../app/opensync/ProfileSsid.json | 411 +++++++++--------- .../main/docker/app/opensync/ProfileSsid.json | 411 +++++++++--------- .../resources/app/opensync/ProfileSsid.json | 411 +++++++++--------- .../wlan/opensync/ovsdb/dao/OvsdbDao.java | 62 ++- 5 files changed, 885 insertions(+), 821 deletions(-) diff --git a/opensync-ext-static/src/main/resources/ProfileSsid.json b/opensync-ext-static/src/main/resources/ProfileSsid.json index 4b9e61c..396b9df 100644 --- a/opensync-ext-static/src/main/resources/ProfileSsid.json +++ b/opensync-ext-static/src/main/resources/ProfileSsid.json @@ -1,203 +1,212 @@ [ - { - "model_type": "Profile", - "id": 5, - "customerId": 2, - "profileType": "ssid", - "name": "TipWlan-cloud-3-radios", - "details": { - "model_type": "SsidConfiguration", - "ssid": "TipWlan-cloud-3-radios", - "appliedRadios": [ - "is5GHzL", - "is2dot4GHz", - "is5GHzU" - ], - "ssidAdminState": "enabled", - "secureMode": "wpa2OnlyPSK", - "vlanId": 1, - "keyStr": "openwifi", - "broadcastSsid": "enabled", - "keyRefresh": 0, - "noLocalSubnets": false, - "radiusServiceName": null, - "radiusAccountingServiceName": null, - "radiusAcountingServiceInterval": null, - "captivePortalId": null, - "bandwidthLimitDown": 0, - "bandwidthLimitUp": 0, - "clientBandwidthLimitDown": 0, - "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, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzU": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - } - }, - "bonjourGatewayProfileId": null, - "enable80211w": null, - "wepConfig": null, - "forwardMode": "BRIDGE", - "profileType": "ssid" - }, - "createdTimestamp": 1606778369598, - "lastModifiedTimestamp": 1606778369598, - "childProfileIds": [ - ] - }, - { - "model_type": "Profile", - "id": 15, - "customerId": 2, - "profileType": "ssid", - "name": "TipWlan-cloud-passpoint-access", - "details": { - "model_type": "SsidConfiguration", - "ssid": "TipWlan-cloud-passpoint-access", - "appliedRadios": [ - "is5GHzL", - "is5GHzU" - ], - "ssidAdminState": "enabled", - "secureMode": "wpa2PSK", - "vlanId": 1, - "keyStr": "testing123", - "broadcastSsid": "enabled", - "keyRefresh": 0, - "noLocalSubnets": false, - "radiusServiceName": null, - "radiusAccountingServiceName": null, - "radiusAcountingServiceInterval": null, - "captivePortalId": null, - "bandwidthLimitDown": 0, - "bandwidthLimitUp": 0, - "clientBandwidthLimitDown": 0, - "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, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzU": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - } - }, - "bonjourGatewayProfileId": null, - "enable80211w": null, - "wepConfig": null, - "forwardMode": null, - "profileType": "ssid" - }, - "createdTimestamp": 1606778369943, - "lastModifiedTimestamp": 1606778370811, - "childProfileIds": [ - 24 - ] - }, - { - "model_type": "Profile", - "id": 16, - "customerId": 2, - "profileType": "ssid", - "name": "TipWlan-cloud-passpoint-osu", - "details": { - "model_type": "SsidConfiguration", - "ssid": "TipWlan-cloud-passpoint-osu", - "appliedRadios": [ - "is2dot4GHz" - ], - "ssidAdminState": "enabled", - "secureMode": "open", - "vlanId": 1, - "keyStr": null, - "broadcastSsid": "enabled", - "keyRefresh": 0, - "noLocalSubnets": false, - "radiusServiceName": null, - "radiusAccountingServiceName": null, - "radiusAcountingServiceInterval": null, - "captivePortalId": null, - "bandwidthLimitDown": 0, - "bandwidthLimitUp": 0, - "clientBandwidthLimitDown": 0, - "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, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzU": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - } - }, - "bonjourGatewayProfileId": null, - "enable80211w": null, - "wepConfig": null, - "forwardMode": null, - "profileType": "ssid" - }, - "createdTimestamp": 1606778369944, - "lastModifiedTimestamp": 1606778370352, - "childProfileIds": [ - 19, - 20 - ] - } + { + "model_type": "Profile", + "id": 5, + "customerId": 2, + "profileType": "ssid", + "name": "TipWlan-cloud-3-radios", + "details": { + "model_type": "SsidConfiguration", + "ssid": "TipWlan-cloud-3-radios", + "appliedRadios": [ + "is5GHzL", + "is2dot4GHz", + "is5GHzU" + ], + "ssidAdminState": "enabled", + "secureMode": "wpa2OnlyPSK", + "vlanId": 1, + "keyStr": "openwifi", + "broadcastSsid": "enabled", + "keyRefresh": 0, + "noLocalSubnets": false, + "radiusServiceName": null, + "radiusAccountingServiceName": null, + "radiusAcountingServiceInterval": null, + "radiusNasId": null, + "radiusNasIp": null, + "radiusOperName": null, + "captivePortalId": null, + "bandwidthLimitDown": 0, + "bandwidthLimitUp": 0, + "clientBandwidthLimitDown": 0, + "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, + "enable80211k": null, + "enable80211v": null + }, + "is5GHzU": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + } + }, + "bonjourGatewayProfileId": null, + "enable80211w": null, + "wepConfig": null, + "forwardMode": "BRIDGE", + "profileType": "ssid" + }, + "createdTimestamp": 1606778369598, + "lastModifiedTimestamp": 1606778369598, + "childProfileIds": [ + ] + }, + { + "model_type": "Profile", + "id": 15, + "customerId": 2, + "profileType": "ssid", + "name": "TipWlan-cloud-passpoint-access", + "details": { + "model_type": "SsidConfiguration", + "ssid": "TipWlan-cloud-passpoint-access", + "appliedRadios": [ + "is5GHzL", + "is5GHzU" + ], + "ssidAdminState": "enabled", + "secureMode": "wpa2PSK", + "vlanId": 1, + "keyStr": "testing123", + "broadcastSsid": "enabled", + "keyRefresh": 0, + "noLocalSubnets": false, + "radiusServiceName": null, + "radiusAccountingServiceName": null, + "radiusAcountingServiceInterval": null, + "radiusNasId": null, + "radiusNasIp": null, + "radiusOperName": null, + "captivePortalId": null, + "bandwidthLimitDown": 0, + "bandwidthLimitUp": 0, + "clientBandwidthLimitDown": 0, + "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, + "enable80211k": null, + "enable80211v": null + }, + "is5GHzU": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + } + }, + "bonjourGatewayProfileId": null, + "enable80211w": null, + "wepConfig": null, + "forwardMode": null, + "profileType": "ssid" + }, + "createdTimestamp": 1606778369943, + "lastModifiedTimestamp": 1606778370811, + "childProfileIds": [ + 24 + ] + }, + { + "model_type": "Profile", + "id": 16, + "customerId": 2, + "profileType": "ssid", + "name": "TipWlan-cloud-passpoint-osu", + "details": { + "model_type": "SsidConfiguration", + "ssid": "TipWlan-cloud-passpoint-osu", + "appliedRadios": [ + "is2dot4GHz" + ], + "ssidAdminState": "enabled", + "secureMode": "open", + "vlanId": 1, + "keyStr": null, + "broadcastSsid": "enabled", + "keyRefresh": 0, + "noLocalSubnets": false, + "radiusServiceName": null, + "radiusAccountingServiceName": null, + "radiusAcountingServiceInterval": null, + "radiusNasId": null, + "radiusNasIp": null, + "radiusOperName": null, + "captivePortalId": null, + "bandwidthLimitDown": 0, + "bandwidthLimitUp": 0, + "clientBandwidthLimitDown": 0, + "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, + "enable80211k": null, + "enable80211v": null + }, + "is5GHzU": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + } + }, + "bonjourGatewayProfileId": null, + "enable80211w": null, + "wepConfig": null, + "forwardMode": null, + "profileType": "ssid" + }, + "createdTimestamp": 1606778369944, + "lastModifiedTimestamp": 1606778370352, + "childProfileIds": [ + 19, + 20 + ] + } ] 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 4b9e61c..396b9df 100644 --- a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileSsid.json +++ b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileSsid.json @@ -1,203 +1,212 @@ [ - { - "model_type": "Profile", - "id": 5, - "customerId": 2, - "profileType": "ssid", - "name": "TipWlan-cloud-3-radios", - "details": { - "model_type": "SsidConfiguration", - "ssid": "TipWlan-cloud-3-radios", - "appliedRadios": [ - "is5GHzL", - "is2dot4GHz", - "is5GHzU" - ], - "ssidAdminState": "enabled", - "secureMode": "wpa2OnlyPSK", - "vlanId": 1, - "keyStr": "openwifi", - "broadcastSsid": "enabled", - "keyRefresh": 0, - "noLocalSubnets": false, - "radiusServiceName": null, - "radiusAccountingServiceName": null, - "radiusAcountingServiceInterval": null, - "captivePortalId": null, - "bandwidthLimitDown": 0, - "bandwidthLimitUp": 0, - "clientBandwidthLimitDown": 0, - "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, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzU": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - } - }, - "bonjourGatewayProfileId": null, - "enable80211w": null, - "wepConfig": null, - "forwardMode": "BRIDGE", - "profileType": "ssid" - }, - "createdTimestamp": 1606778369598, - "lastModifiedTimestamp": 1606778369598, - "childProfileIds": [ - ] - }, - { - "model_type": "Profile", - "id": 15, - "customerId": 2, - "profileType": "ssid", - "name": "TipWlan-cloud-passpoint-access", - "details": { - "model_type": "SsidConfiguration", - "ssid": "TipWlan-cloud-passpoint-access", - "appliedRadios": [ - "is5GHzL", - "is5GHzU" - ], - "ssidAdminState": "enabled", - "secureMode": "wpa2PSK", - "vlanId": 1, - "keyStr": "testing123", - "broadcastSsid": "enabled", - "keyRefresh": 0, - "noLocalSubnets": false, - "radiusServiceName": null, - "radiusAccountingServiceName": null, - "radiusAcountingServiceInterval": null, - "captivePortalId": null, - "bandwidthLimitDown": 0, - "bandwidthLimitUp": 0, - "clientBandwidthLimitDown": 0, - "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, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzU": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - } - }, - "bonjourGatewayProfileId": null, - "enable80211w": null, - "wepConfig": null, - "forwardMode": null, - "profileType": "ssid" - }, - "createdTimestamp": 1606778369943, - "lastModifiedTimestamp": 1606778370811, - "childProfileIds": [ - 24 - ] - }, - { - "model_type": "Profile", - "id": 16, - "customerId": 2, - "profileType": "ssid", - "name": "TipWlan-cloud-passpoint-osu", - "details": { - "model_type": "SsidConfiguration", - "ssid": "TipWlan-cloud-passpoint-osu", - "appliedRadios": [ - "is2dot4GHz" - ], - "ssidAdminState": "enabled", - "secureMode": "open", - "vlanId": 1, - "keyStr": null, - "broadcastSsid": "enabled", - "keyRefresh": 0, - "noLocalSubnets": false, - "radiusServiceName": null, - "radiusAccountingServiceName": null, - "radiusAcountingServiceInterval": null, - "captivePortalId": null, - "bandwidthLimitDown": 0, - "bandwidthLimitUp": 0, - "clientBandwidthLimitDown": 0, - "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, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzU": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - } - }, - "bonjourGatewayProfileId": null, - "enable80211w": null, - "wepConfig": null, - "forwardMode": null, - "profileType": "ssid" - }, - "createdTimestamp": 1606778369944, - "lastModifiedTimestamp": 1606778370352, - "childProfileIds": [ - 19, - 20 - ] - } + { + "model_type": "Profile", + "id": 5, + "customerId": 2, + "profileType": "ssid", + "name": "TipWlan-cloud-3-radios", + "details": { + "model_type": "SsidConfiguration", + "ssid": "TipWlan-cloud-3-radios", + "appliedRadios": [ + "is5GHzL", + "is2dot4GHz", + "is5GHzU" + ], + "ssidAdminState": "enabled", + "secureMode": "wpa2OnlyPSK", + "vlanId": 1, + "keyStr": "openwifi", + "broadcastSsid": "enabled", + "keyRefresh": 0, + "noLocalSubnets": false, + "radiusServiceName": null, + "radiusAccountingServiceName": null, + "radiusAcountingServiceInterval": null, + "radiusNasId": null, + "radiusNasIp": null, + "radiusOperName": null, + "captivePortalId": null, + "bandwidthLimitDown": 0, + "bandwidthLimitUp": 0, + "clientBandwidthLimitDown": 0, + "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, + "enable80211k": null, + "enable80211v": null + }, + "is5GHzU": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + } + }, + "bonjourGatewayProfileId": null, + "enable80211w": null, + "wepConfig": null, + "forwardMode": "BRIDGE", + "profileType": "ssid" + }, + "createdTimestamp": 1606778369598, + "lastModifiedTimestamp": 1606778369598, + "childProfileIds": [ + ] + }, + { + "model_type": "Profile", + "id": 15, + "customerId": 2, + "profileType": "ssid", + "name": "TipWlan-cloud-passpoint-access", + "details": { + "model_type": "SsidConfiguration", + "ssid": "TipWlan-cloud-passpoint-access", + "appliedRadios": [ + "is5GHzL", + "is5GHzU" + ], + "ssidAdminState": "enabled", + "secureMode": "wpa2PSK", + "vlanId": 1, + "keyStr": "testing123", + "broadcastSsid": "enabled", + "keyRefresh": 0, + "noLocalSubnets": false, + "radiusServiceName": null, + "radiusAccountingServiceName": null, + "radiusAcountingServiceInterval": null, + "radiusNasId": null, + "radiusNasIp": null, + "radiusOperName": null, + "captivePortalId": null, + "bandwidthLimitDown": 0, + "bandwidthLimitUp": 0, + "clientBandwidthLimitDown": 0, + "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, + "enable80211k": null, + "enable80211v": null + }, + "is5GHzU": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + } + }, + "bonjourGatewayProfileId": null, + "enable80211w": null, + "wepConfig": null, + "forwardMode": null, + "profileType": "ssid" + }, + "createdTimestamp": 1606778369943, + "lastModifiedTimestamp": 1606778370811, + "childProfileIds": [ + 24 + ] + }, + { + "model_type": "Profile", + "id": 16, + "customerId": 2, + "profileType": "ssid", + "name": "TipWlan-cloud-passpoint-osu", + "details": { + "model_type": "SsidConfiguration", + "ssid": "TipWlan-cloud-passpoint-osu", + "appliedRadios": [ + "is2dot4GHz" + ], + "ssidAdminState": "enabled", + "secureMode": "open", + "vlanId": 1, + "keyStr": null, + "broadcastSsid": "enabled", + "keyRefresh": 0, + "noLocalSubnets": false, + "radiusServiceName": null, + "radiusAccountingServiceName": null, + "radiusAcountingServiceInterval": null, + "radiusNasId": null, + "radiusNasIp": null, + "radiusOperName": null, + "captivePortalId": null, + "bandwidthLimitDown": 0, + "bandwidthLimitUp": 0, + "clientBandwidthLimitDown": 0, + "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, + "enable80211k": null, + "enable80211v": null + }, + "is5GHzU": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + } + }, + "bonjourGatewayProfileId": null, + "enable80211w": null, + "wepConfig": null, + "forwardMode": null, + "profileType": "ssid" + }, + "createdTimestamp": 1606778369944, + "lastModifiedTimestamp": 1606778370352, + "childProfileIds": [ + 19, + 20 + ] + } ] 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 4b9e61c..396b9df 100644 --- a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileSsid.json +++ b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileSsid.json @@ -1,203 +1,212 @@ [ - { - "model_type": "Profile", - "id": 5, - "customerId": 2, - "profileType": "ssid", - "name": "TipWlan-cloud-3-radios", - "details": { - "model_type": "SsidConfiguration", - "ssid": "TipWlan-cloud-3-radios", - "appliedRadios": [ - "is5GHzL", - "is2dot4GHz", - "is5GHzU" - ], - "ssidAdminState": "enabled", - "secureMode": "wpa2OnlyPSK", - "vlanId": 1, - "keyStr": "openwifi", - "broadcastSsid": "enabled", - "keyRefresh": 0, - "noLocalSubnets": false, - "radiusServiceName": null, - "radiusAccountingServiceName": null, - "radiusAcountingServiceInterval": null, - "captivePortalId": null, - "bandwidthLimitDown": 0, - "bandwidthLimitUp": 0, - "clientBandwidthLimitDown": 0, - "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, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzU": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - } - }, - "bonjourGatewayProfileId": null, - "enable80211w": null, - "wepConfig": null, - "forwardMode": "BRIDGE", - "profileType": "ssid" - }, - "createdTimestamp": 1606778369598, - "lastModifiedTimestamp": 1606778369598, - "childProfileIds": [ - ] - }, - { - "model_type": "Profile", - "id": 15, - "customerId": 2, - "profileType": "ssid", - "name": "TipWlan-cloud-passpoint-access", - "details": { - "model_type": "SsidConfiguration", - "ssid": "TipWlan-cloud-passpoint-access", - "appliedRadios": [ - "is5GHzL", - "is5GHzU" - ], - "ssidAdminState": "enabled", - "secureMode": "wpa2PSK", - "vlanId": 1, - "keyStr": "testing123", - "broadcastSsid": "enabled", - "keyRefresh": 0, - "noLocalSubnets": false, - "radiusServiceName": null, - "radiusAccountingServiceName": null, - "radiusAcountingServiceInterval": null, - "captivePortalId": null, - "bandwidthLimitDown": 0, - "bandwidthLimitUp": 0, - "clientBandwidthLimitDown": 0, - "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, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzU": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - } - }, - "bonjourGatewayProfileId": null, - "enable80211w": null, - "wepConfig": null, - "forwardMode": null, - "profileType": "ssid" - }, - "createdTimestamp": 1606778369943, - "lastModifiedTimestamp": 1606778370811, - "childProfileIds": [ - 24 - ] - }, - { - "model_type": "Profile", - "id": 16, - "customerId": 2, - "profileType": "ssid", - "name": "TipWlan-cloud-passpoint-osu", - "details": { - "model_type": "SsidConfiguration", - "ssid": "TipWlan-cloud-passpoint-osu", - "appliedRadios": [ - "is2dot4GHz" - ], - "ssidAdminState": "enabled", - "secureMode": "open", - "vlanId": 1, - "keyStr": null, - "broadcastSsid": "enabled", - "keyRefresh": 0, - "noLocalSubnets": false, - "radiusServiceName": null, - "radiusAccountingServiceName": null, - "radiusAcountingServiceInterval": null, - "captivePortalId": null, - "bandwidthLimitDown": 0, - "bandwidthLimitUp": 0, - "clientBandwidthLimitDown": 0, - "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, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzU": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - } - }, - "bonjourGatewayProfileId": null, - "enable80211w": null, - "wepConfig": null, - "forwardMode": null, - "profileType": "ssid" - }, - "createdTimestamp": 1606778369944, - "lastModifiedTimestamp": 1606778370352, - "childProfileIds": [ - 19, - 20 - ] - } + { + "model_type": "Profile", + "id": 5, + "customerId": 2, + "profileType": "ssid", + "name": "TipWlan-cloud-3-radios", + "details": { + "model_type": "SsidConfiguration", + "ssid": "TipWlan-cloud-3-radios", + "appliedRadios": [ + "is5GHzL", + "is2dot4GHz", + "is5GHzU" + ], + "ssidAdminState": "enabled", + "secureMode": "wpa2OnlyPSK", + "vlanId": 1, + "keyStr": "openwifi", + "broadcastSsid": "enabled", + "keyRefresh": 0, + "noLocalSubnets": false, + "radiusServiceName": null, + "radiusAccountingServiceName": null, + "radiusAcountingServiceInterval": null, + "radiusNasId": null, + "radiusNasIp": null, + "radiusOperName": null, + "captivePortalId": null, + "bandwidthLimitDown": 0, + "bandwidthLimitUp": 0, + "clientBandwidthLimitDown": 0, + "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, + "enable80211k": null, + "enable80211v": null + }, + "is5GHzU": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + } + }, + "bonjourGatewayProfileId": null, + "enable80211w": null, + "wepConfig": null, + "forwardMode": "BRIDGE", + "profileType": "ssid" + }, + "createdTimestamp": 1606778369598, + "lastModifiedTimestamp": 1606778369598, + "childProfileIds": [ + ] + }, + { + "model_type": "Profile", + "id": 15, + "customerId": 2, + "profileType": "ssid", + "name": "TipWlan-cloud-passpoint-access", + "details": { + "model_type": "SsidConfiguration", + "ssid": "TipWlan-cloud-passpoint-access", + "appliedRadios": [ + "is5GHzL", + "is5GHzU" + ], + "ssidAdminState": "enabled", + "secureMode": "wpa2PSK", + "vlanId": 1, + "keyStr": "testing123", + "broadcastSsid": "enabled", + "keyRefresh": 0, + "noLocalSubnets": false, + "radiusServiceName": null, + "radiusAccountingServiceName": null, + "radiusAcountingServiceInterval": null, + "radiusNasId": null, + "radiusNasIp": null, + "radiusOperName": null, + "captivePortalId": null, + "bandwidthLimitDown": 0, + "bandwidthLimitUp": 0, + "clientBandwidthLimitDown": 0, + "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, + "enable80211k": null, + "enable80211v": null + }, + "is5GHzU": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + } + }, + "bonjourGatewayProfileId": null, + "enable80211w": null, + "wepConfig": null, + "forwardMode": null, + "profileType": "ssid" + }, + "createdTimestamp": 1606778369943, + "lastModifiedTimestamp": 1606778370811, + "childProfileIds": [ + 24 + ] + }, + { + "model_type": "Profile", + "id": 16, + "customerId": 2, + "profileType": "ssid", + "name": "TipWlan-cloud-passpoint-osu", + "details": { + "model_type": "SsidConfiguration", + "ssid": "TipWlan-cloud-passpoint-osu", + "appliedRadios": [ + "is2dot4GHz" + ], + "ssidAdminState": "enabled", + "secureMode": "open", + "vlanId": 1, + "keyStr": null, + "broadcastSsid": "enabled", + "keyRefresh": 0, + "noLocalSubnets": false, + "radiusServiceName": null, + "radiusAccountingServiceName": null, + "radiusAcountingServiceInterval": null, + "radiusNasId": null, + "radiusNasIp": null, + "radiusOperName": null, + "captivePortalId": null, + "bandwidthLimitDown": 0, + "bandwidthLimitUp": 0, + "clientBandwidthLimitDown": 0, + "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, + "enable80211k": null, + "enable80211v": null + }, + "is5GHzU": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + } + }, + "bonjourGatewayProfileId": null, + "enable80211w": null, + "wepConfig": null, + "forwardMode": null, + "profileType": "ssid" + }, + "createdTimestamp": 1606778369944, + "lastModifiedTimestamp": 1606778370352, + "childProfileIds": [ + 19, + 20 + ] + } ] 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 4b9e61c..396b9df 100644 --- a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileSsid.json +++ b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileSsid.json @@ -1,203 +1,212 @@ [ - { - "model_type": "Profile", - "id": 5, - "customerId": 2, - "profileType": "ssid", - "name": "TipWlan-cloud-3-radios", - "details": { - "model_type": "SsidConfiguration", - "ssid": "TipWlan-cloud-3-radios", - "appliedRadios": [ - "is5GHzL", - "is2dot4GHz", - "is5GHzU" - ], - "ssidAdminState": "enabled", - "secureMode": "wpa2OnlyPSK", - "vlanId": 1, - "keyStr": "openwifi", - "broadcastSsid": "enabled", - "keyRefresh": 0, - "noLocalSubnets": false, - "radiusServiceName": null, - "radiusAccountingServiceName": null, - "radiusAcountingServiceInterval": null, - "captivePortalId": null, - "bandwidthLimitDown": 0, - "bandwidthLimitUp": 0, - "clientBandwidthLimitDown": 0, - "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, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzU": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - } - }, - "bonjourGatewayProfileId": null, - "enable80211w": null, - "wepConfig": null, - "forwardMode": "BRIDGE", - "profileType": "ssid" - }, - "createdTimestamp": 1606778369598, - "lastModifiedTimestamp": 1606778369598, - "childProfileIds": [ - ] - }, - { - "model_type": "Profile", - "id": 15, - "customerId": 2, - "profileType": "ssid", - "name": "TipWlan-cloud-passpoint-access", - "details": { - "model_type": "SsidConfiguration", - "ssid": "TipWlan-cloud-passpoint-access", - "appliedRadios": [ - "is5GHzL", - "is5GHzU" - ], - "ssidAdminState": "enabled", - "secureMode": "wpa2PSK", - "vlanId": 1, - "keyStr": "testing123", - "broadcastSsid": "enabled", - "keyRefresh": 0, - "noLocalSubnets": false, - "radiusServiceName": null, - "radiusAccountingServiceName": null, - "radiusAcountingServiceInterval": null, - "captivePortalId": null, - "bandwidthLimitDown": 0, - "bandwidthLimitUp": 0, - "clientBandwidthLimitDown": 0, - "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, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzU": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - } - }, - "bonjourGatewayProfileId": null, - "enable80211w": null, - "wepConfig": null, - "forwardMode": null, - "profileType": "ssid" - }, - "createdTimestamp": 1606778369943, - "lastModifiedTimestamp": 1606778370811, - "childProfileIds": [ - 24 - ] - }, - { - "model_type": "Profile", - "id": 16, - "customerId": 2, - "profileType": "ssid", - "name": "TipWlan-cloud-passpoint-osu", - "details": { - "model_type": "SsidConfiguration", - "ssid": "TipWlan-cloud-passpoint-osu", - "appliedRadios": [ - "is2dot4GHz" - ], - "ssidAdminState": "enabled", - "secureMode": "open", - "vlanId": 1, - "keyStr": null, - "broadcastSsid": "enabled", - "keyRefresh": 0, - "noLocalSubnets": false, - "radiusServiceName": null, - "radiusAccountingServiceName": null, - "radiusAcountingServiceInterval": null, - "captivePortalId": null, - "bandwidthLimitDown": 0, - "bandwidthLimitUp": 0, - "clientBandwidthLimitDown": 0, - "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, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzU": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - } - }, - "bonjourGatewayProfileId": null, - "enable80211w": null, - "wepConfig": null, - "forwardMode": null, - "profileType": "ssid" - }, - "createdTimestamp": 1606778369944, - "lastModifiedTimestamp": 1606778370352, - "childProfileIds": [ - 19, - 20 - ] - } + { + "model_type": "Profile", + "id": 5, + "customerId": 2, + "profileType": "ssid", + "name": "TipWlan-cloud-3-radios", + "details": { + "model_type": "SsidConfiguration", + "ssid": "TipWlan-cloud-3-radios", + "appliedRadios": [ + "is5GHzL", + "is2dot4GHz", + "is5GHzU" + ], + "ssidAdminState": "enabled", + "secureMode": "wpa2OnlyPSK", + "vlanId": 1, + "keyStr": "openwifi", + "broadcastSsid": "enabled", + "keyRefresh": 0, + "noLocalSubnets": false, + "radiusServiceName": null, + "radiusAccountingServiceName": null, + "radiusAcountingServiceInterval": null, + "radiusNasId": null, + "radiusNasIp": null, + "radiusOperName": null, + "captivePortalId": null, + "bandwidthLimitDown": 0, + "bandwidthLimitUp": 0, + "clientBandwidthLimitDown": 0, + "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, + "enable80211k": null, + "enable80211v": null + }, + "is5GHzU": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + } + }, + "bonjourGatewayProfileId": null, + "enable80211w": null, + "wepConfig": null, + "forwardMode": "BRIDGE", + "profileType": "ssid" + }, + "createdTimestamp": 1606778369598, + "lastModifiedTimestamp": 1606778369598, + "childProfileIds": [ + ] + }, + { + "model_type": "Profile", + "id": 15, + "customerId": 2, + "profileType": "ssid", + "name": "TipWlan-cloud-passpoint-access", + "details": { + "model_type": "SsidConfiguration", + "ssid": "TipWlan-cloud-passpoint-access", + "appliedRadios": [ + "is5GHzL", + "is5GHzU" + ], + "ssidAdminState": "enabled", + "secureMode": "wpa2PSK", + "vlanId": 1, + "keyStr": "testing123", + "broadcastSsid": "enabled", + "keyRefresh": 0, + "noLocalSubnets": false, + "radiusServiceName": null, + "radiusAccountingServiceName": null, + "radiusAcountingServiceInterval": null, + "radiusNasId": null, + "radiusNasIp": null, + "radiusOperName": null, + "captivePortalId": null, + "bandwidthLimitDown": 0, + "bandwidthLimitUp": 0, + "clientBandwidthLimitDown": 0, + "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, + "enable80211k": null, + "enable80211v": null + }, + "is5GHzU": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + } + }, + "bonjourGatewayProfileId": null, + "enable80211w": null, + "wepConfig": null, + "forwardMode": null, + "profileType": "ssid" + }, + "createdTimestamp": 1606778369943, + "lastModifiedTimestamp": 1606778370811, + "childProfileIds": [ + 24 + ] + }, + { + "model_type": "Profile", + "id": 16, + "customerId": 2, + "profileType": "ssid", + "name": "TipWlan-cloud-passpoint-osu", + "details": { + "model_type": "SsidConfiguration", + "ssid": "TipWlan-cloud-passpoint-osu", + "appliedRadios": [ + "is2dot4GHz" + ], + "ssidAdminState": "enabled", + "secureMode": "open", + "vlanId": 1, + "keyStr": null, + "broadcastSsid": "enabled", + "keyRefresh": 0, + "noLocalSubnets": false, + "radiusServiceName": null, + "radiusAccountingServiceName": null, + "radiusAcountingServiceInterval": null, + "radiusNasId": null, + "radiusNasIp": null, + "radiusOperName": null, + "captivePortalId": null, + "bandwidthLimitDown": 0, + "bandwidthLimitUp": 0, + "clientBandwidthLimitDown": 0, + "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, + "enable80211k": null, + "enable80211v": null + }, + "is5GHzU": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + } + }, + "bonjourGatewayProfileId": null, + "enable80211w": null, + "wepConfig": null, + "forwardMode": null, + "profileType": "ssid" + }, + "createdTimestamp": 1606778369944, + "lastModifiedTimestamp": 1606778370352, + "childProfileIds": [ + 19, + 20 + ] + } ] diff --git a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java index a2f8f8f..5f5a05b 100644 --- a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java +++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java @@ -2587,7 +2587,7 @@ public class OvsdbDao { String ipAssignScheme, List macBlockList, boolean rateLimitEnable, int ssidDlLimit, int ssidUlLimit, int clientDlLimit, int clientUlLimit, int rtsCtsThreshold, int fragThresholdBytes, int dtimPeriod, Map captiveMap, List walledGardenAllowlist, - Map> bonjourServiceMap) { + Map> bonjourServiceMap, String radiusNasId, String radiusNasIp, String radiusOperatorName) { List operations = new ArrayList<>(); Map updateColumns = new HashMap<>(); @@ -2674,6 +2674,15 @@ public class OvsdbDao { customOptions.put("client_dl_limit", String.valueOf(clientDlLimit * 1000)); customOptions.put("client_ul_limit", String.valueOf(clientUlLimit * 1000)); customOptions.put("rts_threshold", String.valueOf(rtsCtsThreshold)); + if (radiusNasId != null) { + customOptions.put("radius_nas_id", radiusNasId); + } + if (radiusNasIp != null) { + customOptions.put("radius_nas_ip", radiusNasIp); + } + if (radiusOperatorName != null) { + customOptions.put("radius_oper_name", radiusOperatorName); + } // TODO: the frag_threshold is not supported on the AP // customOptions.put("frag_threshold", // String.valueOf(fragThresholdBytes)); @@ -3035,8 +3044,18 @@ public class OvsdbDao { String ssidSecurityMode = ssidConfig.getSecureMode().name(); String opensyncSecurityMode = "OPEN"; + String radiusNasId = null; + String radiusNasIp = null; + String radiusOperName = null; + opensyncSecurityMode = getOpensyncSecurityMode(ssidSecurityMode, opensyncSecurityMode); populateSecurityMap(opensyncApConfig, ssidConfig, security, ssidSecurityMode, opensyncSecurityMode); + + if (opensyncSecurityMode.endsWith("EAP")) { + radiusNasId = ssidConfig.getRadiusNasId(); + radiusNasIp = ssidConfig.getRadiusNasIp() != null ? ssidConfig.getRadiusNasIp().getHostAddress() : null; + radiusOperName = ssidConfig.getRadiusOperName(); + } // TODO put into AP captive parameter Map captiveMap = new HashMap<>(); @@ -3084,7 +3103,7 @@ public class OvsdbDao { uapsdEnabled, apBridge, ssidConfig.getForwardMode(), gateway, inet, dns, ipAssignScheme, macBlockList, rateLimitEnable, ssidDlLimit, ssidUlLimit, clientDlLimit, clientUlLimit, rtsCtsThreshold, fragThresholdBytes, dtimPeriod, captiveMap, walledGardenAllowlist, - bonjourServiceMap); + bonjourServiceMap, radiusNasId, radiusNasIp, radiusOperName); updateVifConfigsSetForRadio(ovsdbClient, ssidConfig.getSsid(), freqBand, vifConfigUuid); @@ -4439,7 +4458,7 @@ public class OvsdbDao { provisionWifiStatsConfigFromProfile("client", radioType, reportingInterval, samplingInterval, operations); - provisionWifiStatsConfigFromProfile("event", reportingInterval, samplingInterval, + provisionWifiStatsConfigFromProfile("event", radioType, reportingInterval, samplingInterval, operations); provisionWifiStatsConfigFromProfile("video_voice", reportingInterval, samplingInterval, @@ -4626,7 +4645,7 @@ public class OvsdbDao { // TODO: when schema support is added, these should be part of the // bulk provisioning operation above. provisionVideoVoiceStats(ovsdbClient); - provisionEventReporting(ovsdbClient); + provisionEventReporting(radioConfigs, ovsdbClient); } catch (OvsdbClientException | TimeoutException | ExecutionException | InterruptedException e) { throw new RuntimeException(e); @@ -4818,21 +4837,27 @@ public class OvsdbDao { * @param ovsdbClient * */ - public void provisionEventReporting(OvsdbClient ovsdbClient) { - - LOG.debug("Enable event reporting from AP"); - + public void provisionEventReporting(Map radioConfigs, OvsdbClient ovsdbClient) { try { - List operations = new ArrayList<>(); - Map rowColumns = new HashMap<>(); - rowColumns.put("radio_type", new Atom<>("2.4G")); - rowColumns.put("reporting_interval", new Atom<>(30)); - rowColumns.put("sampling_interval", new Atom<>(0)); - rowColumns.put("stats_type", new Atom<>("event")); - rowColumns.put("reporting_interval", new Atom<>(0)); - Row row = new Row(rowColumns); - operations.add(new Insert(wifiStatsConfigDbTable, row)); + List operations = new ArrayList<>(); + + radioConfigs.values().stream().forEach(new Consumer() { + + @Override + public void accept(WifiRadioConfigInfo rc) { + + // + Map rowColumns = new HashMap<>(); + rowColumns.put("radio_type", new Atom<>(rc.freqBand)); + rowColumns.put("reporting_interval", new Atom<>(5)); + rowColumns.put("report_type", new Atom<>("raw")); + rowColumns.put("stats_type", new Atom<>("event")); + Row updateRow = new Row(rowColumns); + operations.add(new Insert(wifiStatsConfigDbTable, updateRow)); + + } + }); CompletableFuture fResult = ovsdbClient.transact(ovsdbName, operations); OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS); @@ -4857,6 +4882,9 @@ public class OvsdbDao { } } + + + } catch (OvsdbClientException | TimeoutException | ExecutionException | InterruptedException e) { throw new RuntimeException(e); }