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
This commit is contained in:
Mike Hansen
2020-12-11 14:28:44 -05:00
parent 8ff3010190
commit 67c0ae9ffc
5 changed files with 885 additions and 821 deletions

View File

@@ -1,203 +1,212 @@
[ [
{ {
"model_type": "Profile", "model_type": "Profile",
"id": 5, "id": 5,
"customerId": 2, "customerId": 2,
"profileType": "ssid", "profileType": "ssid",
"name": "TipWlan-cloud-3-radios", "name": "TipWlan-cloud-3-radios",
"details": { "details": {
"model_type": "SsidConfiguration", "model_type": "SsidConfiguration",
"ssid": "TipWlan-cloud-3-radios", "ssid": "TipWlan-cloud-3-radios",
"appliedRadios": [ "appliedRadios": [
"is5GHzL", "is5GHzL",
"is2dot4GHz", "is2dot4GHz",
"is5GHzU" "is5GHzU"
], ],
"ssidAdminState": "enabled", "ssidAdminState": "enabled",
"secureMode": "wpa2OnlyPSK", "secureMode": "wpa2OnlyPSK",
"vlanId": 1, "vlanId": 1,
"keyStr": "openwifi", "keyStr": "openwifi",
"broadcastSsid": "enabled", "broadcastSsid": "enabled",
"keyRefresh": 0, "keyRefresh": 0,
"noLocalSubnets": false, "noLocalSubnets": false,
"radiusServiceName": null, "radiusServiceName": null,
"radiusAccountingServiceName": null, "radiusAccountingServiceName": null,
"radiusAcountingServiceInterval": null, "radiusAcountingServiceInterval": null,
"captivePortalId": null, "radiusNasId": null,
"bandwidthLimitDown": 0, "radiusNasIp": null,
"bandwidthLimitUp": 0, "radiusOperName": null,
"clientBandwidthLimitDown": 0, "captivePortalId": null,
"clientBandwidthLimitUp": 0, "bandwidthLimitDown": 0,
"videoTrafficOnly": false, "bandwidthLimitUp": 0,
"radioBasedConfigs": { "clientBandwidthLimitDown": 0,
"is5GHzL": { "clientBandwidthLimitUp": 0,
"model_type": "RadioBasedSsidConfiguration", "videoTrafficOnly": false,
"enable80211r": null, "radioBasedConfigs": {
"enable80211k": null, "is5GHzL": {
"enable80211v": null "model_type": "RadioBasedSsidConfiguration",
}, "enable80211r": null,
"is2dot4GHz": { "enable80211k": null,
"model_type": "RadioBasedSsidConfiguration", "enable80211v": null
"enable80211r": null, },
"enable80211k": null, "is2dot4GHz": {
"enable80211v": null "model_type": "RadioBasedSsidConfiguration",
}, "enable80211r": null,
"is5GHz": { "enable80211k": null,
"model_type": "RadioBasedSsidConfiguration", "enable80211v": null
"enable80211r": null, },
"enable80211k": null, "is5GHz": {
"enable80211v": null "model_type": "RadioBasedSsidConfiguration",
}, "enable80211r": null,
"is5GHzU": { "enable80211k": null,
"model_type": "RadioBasedSsidConfiguration", "enable80211v": null
"enable80211r": null, },
"enable80211k": null, "is5GHzU": {
"enable80211v": null "model_type": "RadioBasedSsidConfiguration",
} "enable80211r": null,
}, "enable80211k": null,
"bonjourGatewayProfileId": null, "enable80211v": null
"enable80211w": null, }
"wepConfig": null, },
"forwardMode": "BRIDGE", "bonjourGatewayProfileId": null,
"profileType": "ssid" "enable80211w": null,
}, "wepConfig": null,
"createdTimestamp": 1606778369598, "forwardMode": "BRIDGE",
"lastModifiedTimestamp": 1606778369598, "profileType": "ssid"
"childProfileIds": [ },
] "createdTimestamp": 1606778369598,
}, "lastModifiedTimestamp": 1606778369598,
{ "childProfileIds": [
"model_type": "Profile", ]
"id": 15, },
"customerId": 2, {
"profileType": "ssid", "model_type": "Profile",
"name": "TipWlan-cloud-passpoint-access", "id": 15,
"details": { "customerId": 2,
"model_type": "SsidConfiguration", "profileType": "ssid",
"ssid": "TipWlan-cloud-passpoint-access", "name": "TipWlan-cloud-passpoint-access",
"appliedRadios": [ "details": {
"is5GHzL", "model_type": "SsidConfiguration",
"is5GHzU" "ssid": "TipWlan-cloud-passpoint-access",
], "appliedRadios": [
"ssidAdminState": "enabled", "is5GHzL",
"secureMode": "wpa2PSK", "is5GHzU"
"vlanId": 1, ],
"keyStr": "testing123", "ssidAdminState": "enabled",
"broadcastSsid": "enabled", "secureMode": "wpa2PSK",
"keyRefresh": 0, "vlanId": 1,
"noLocalSubnets": false, "keyStr": "testing123",
"radiusServiceName": null, "broadcastSsid": "enabled",
"radiusAccountingServiceName": null, "keyRefresh": 0,
"radiusAcountingServiceInterval": null, "noLocalSubnets": false,
"captivePortalId": null, "radiusServiceName": null,
"bandwidthLimitDown": 0, "radiusAccountingServiceName": null,
"bandwidthLimitUp": 0, "radiusAcountingServiceInterval": null,
"clientBandwidthLimitDown": 0, "radiusNasId": null,
"clientBandwidthLimitUp": 0, "radiusNasIp": null,
"videoTrafficOnly": false, "radiusOperName": null,
"radioBasedConfigs": { "captivePortalId": null,
"is5GHzL": { "bandwidthLimitDown": 0,
"model_type": "RadioBasedSsidConfiguration", "bandwidthLimitUp": 0,
"enable80211r": null, "clientBandwidthLimitDown": 0,
"enable80211k": null, "clientBandwidthLimitUp": 0,
"enable80211v": null "videoTrafficOnly": false,
}, "radioBasedConfigs": {
"is2dot4GHz": { "is5GHzL": {
"model_type": "RadioBasedSsidConfiguration", "model_type": "RadioBasedSsidConfiguration",
"enable80211r": null, "enable80211r": null,
"enable80211k": null, "enable80211k": null,
"enable80211v": null "enable80211v": null
}, },
"is5GHz": { "is2dot4GHz": {
"model_type": "RadioBasedSsidConfiguration", "model_type": "RadioBasedSsidConfiguration",
"enable80211r": null, "enable80211r": null,
"enable80211k": null, "enable80211k": null,
"enable80211v": null "enable80211v": null
}, },
"is5GHzU": { "is5GHz": {
"model_type": "RadioBasedSsidConfiguration", "model_type": "RadioBasedSsidConfiguration",
"enable80211r": null, "enable80211r": null,
"enable80211k": null, "enable80211k": null,
"enable80211v": null "enable80211v": null
} },
}, "is5GHzU": {
"bonjourGatewayProfileId": null, "model_type": "RadioBasedSsidConfiguration",
"enable80211w": null, "enable80211r": null,
"wepConfig": null, "enable80211k": null,
"forwardMode": null, "enable80211v": null
"profileType": "ssid" }
}, },
"createdTimestamp": 1606778369943, "bonjourGatewayProfileId": null,
"lastModifiedTimestamp": 1606778370811, "enable80211w": null,
"childProfileIds": [ "wepConfig": null,
24 "forwardMode": null,
] "profileType": "ssid"
}, },
{ "createdTimestamp": 1606778369943,
"model_type": "Profile", "lastModifiedTimestamp": 1606778370811,
"id": 16, "childProfileIds": [
"customerId": 2, 24
"profileType": "ssid", ]
"name": "TipWlan-cloud-passpoint-osu", },
"details": { {
"model_type": "SsidConfiguration", "model_type": "Profile",
"ssid": "TipWlan-cloud-passpoint-osu", "id": 16,
"appliedRadios": [ "customerId": 2,
"is2dot4GHz" "profileType": "ssid",
], "name": "TipWlan-cloud-passpoint-osu",
"ssidAdminState": "enabled", "details": {
"secureMode": "open", "model_type": "SsidConfiguration",
"vlanId": 1, "ssid": "TipWlan-cloud-passpoint-osu",
"keyStr": null, "appliedRadios": [
"broadcastSsid": "enabled", "is2dot4GHz"
"keyRefresh": 0, ],
"noLocalSubnets": false, "ssidAdminState": "enabled",
"radiusServiceName": null, "secureMode": "open",
"radiusAccountingServiceName": null, "vlanId": 1,
"radiusAcountingServiceInterval": null, "keyStr": null,
"captivePortalId": null, "broadcastSsid": "enabled",
"bandwidthLimitDown": 0, "keyRefresh": 0,
"bandwidthLimitUp": 0, "noLocalSubnets": false,
"clientBandwidthLimitDown": 0, "radiusServiceName": null,
"clientBandwidthLimitUp": 0, "radiusAccountingServiceName": null,
"videoTrafficOnly": false, "radiusAcountingServiceInterval": null,
"radioBasedConfigs": { "radiusNasId": null,
"is5GHzL": { "radiusNasIp": null,
"model_type": "RadioBasedSsidConfiguration", "radiusOperName": null,
"enable80211r": null, "captivePortalId": null,
"enable80211k": null, "bandwidthLimitDown": 0,
"enable80211v": null "bandwidthLimitUp": 0,
}, "clientBandwidthLimitDown": 0,
"is2dot4GHz": { "clientBandwidthLimitUp": 0,
"model_type": "RadioBasedSsidConfiguration", "videoTrafficOnly": false,
"enable80211r": null, "radioBasedConfigs": {
"enable80211k": null, "is5GHzL": {
"enable80211v": null "model_type": "RadioBasedSsidConfiguration",
}, "enable80211r": null,
"is5GHz": { "enable80211k": null,
"model_type": "RadioBasedSsidConfiguration", "enable80211v": null
"enable80211r": null, },
"enable80211k": null, "is2dot4GHz": {
"enable80211v": null "model_type": "RadioBasedSsidConfiguration",
}, "enable80211r": null,
"is5GHzU": { "enable80211k": null,
"model_type": "RadioBasedSsidConfiguration", "enable80211v": null
"enable80211r": null, },
"enable80211k": null, "is5GHz": {
"enable80211v": null "model_type": "RadioBasedSsidConfiguration",
} "enable80211r": null,
}, "enable80211k": null,
"bonjourGatewayProfileId": null, "enable80211v": null
"enable80211w": null, },
"wepConfig": null, "is5GHzU": {
"forwardMode": null, "model_type": "RadioBasedSsidConfiguration",
"profileType": "ssid" "enable80211r": null,
}, "enable80211k": null,
"createdTimestamp": 1606778369944, "enable80211v": null
"lastModifiedTimestamp": 1606778370352, }
"childProfileIds": [ },
19, "bonjourGatewayProfileId": null,
20 "enable80211w": null,
] "wepConfig": null,
} "forwardMode": null,
"profileType": "ssid"
},
"createdTimestamp": 1606778369944,
"lastModifiedTimestamp": 1606778370352,
"childProfileIds": [
19,
20
]
}
] ]

View File

@@ -1,203 +1,212 @@
[ [
{ {
"model_type": "Profile", "model_type": "Profile",
"id": 5, "id": 5,
"customerId": 2, "customerId": 2,
"profileType": "ssid", "profileType": "ssid",
"name": "TipWlan-cloud-3-radios", "name": "TipWlan-cloud-3-radios",
"details": { "details": {
"model_type": "SsidConfiguration", "model_type": "SsidConfiguration",
"ssid": "TipWlan-cloud-3-radios", "ssid": "TipWlan-cloud-3-radios",
"appliedRadios": [ "appliedRadios": [
"is5GHzL", "is5GHzL",
"is2dot4GHz", "is2dot4GHz",
"is5GHzU" "is5GHzU"
], ],
"ssidAdminState": "enabled", "ssidAdminState": "enabled",
"secureMode": "wpa2OnlyPSK", "secureMode": "wpa2OnlyPSK",
"vlanId": 1, "vlanId": 1,
"keyStr": "openwifi", "keyStr": "openwifi",
"broadcastSsid": "enabled", "broadcastSsid": "enabled",
"keyRefresh": 0, "keyRefresh": 0,
"noLocalSubnets": false, "noLocalSubnets": false,
"radiusServiceName": null, "radiusServiceName": null,
"radiusAccountingServiceName": null, "radiusAccountingServiceName": null,
"radiusAcountingServiceInterval": null, "radiusAcountingServiceInterval": null,
"captivePortalId": null, "radiusNasId": null,
"bandwidthLimitDown": 0, "radiusNasIp": null,
"bandwidthLimitUp": 0, "radiusOperName": null,
"clientBandwidthLimitDown": 0, "captivePortalId": null,
"clientBandwidthLimitUp": 0, "bandwidthLimitDown": 0,
"videoTrafficOnly": false, "bandwidthLimitUp": 0,
"radioBasedConfigs": { "clientBandwidthLimitDown": 0,
"is5GHzL": { "clientBandwidthLimitUp": 0,
"model_type": "RadioBasedSsidConfiguration", "videoTrafficOnly": false,
"enable80211r": null, "radioBasedConfigs": {
"enable80211k": null, "is5GHzL": {
"enable80211v": null "model_type": "RadioBasedSsidConfiguration",
}, "enable80211r": null,
"is2dot4GHz": { "enable80211k": null,
"model_type": "RadioBasedSsidConfiguration", "enable80211v": null
"enable80211r": null, },
"enable80211k": null, "is2dot4GHz": {
"enable80211v": null "model_type": "RadioBasedSsidConfiguration",
}, "enable80211r": null,
"is5GHz": { "enable80211k": null,
"model_type": "RadioBasedSsidConfiguration", "enable80211v": null
"enable80211r": null, },
"enable80211k": null, "is5GHz": {
"enable80211v": null "model_type": "RadioBasedSsidConfiguration",
}, "enable80211r": null,
"is5GHzU": { "enable80211k": null,
"model_type": "RadioBasedSsidConfiguration", "enable80211v": null
"enable80211r": null, },
"enable80211k": null, "is5GHzU": {
"enable80211v": null "model_type": "RadioBasedSsidConfiguration",
} "enable80211r": null,
}, "enable80211k": null,
"bonjourGatewayProfileId": null, "enable80211v": null
"enable80211w": null, }
"wepConfig": null, },
"forwardMode": "BRIDGE", "bonjourGatewayProfileId": null,
"profileType": "ssid" "enable80211w": null,
}, "wepConfig": null,
"createdTimestamp": 1606778369598, "forwardMode": "BRIDGE",
"lastModifiedTimestamp": 1606778369598, "profileType": "ssid"
"childProfileIds": [ },
] "createdTimestamp": 1606778369598,
}, "lastModifiedTimestamp": 1606778369598,
{ "childProfileIds": [
"model_type": "Profile", ]
"id": 15, },
"customerId": 2, {
"profileType": "ssid", "model_type": "Profile",
"name": "TipWlan-cloud-passpoint-access", "id": 15,
"details": { "customerId": 2,
"model_type": "SsidConfiguration", "profileType": "ssid",
"ssid": "TipWlan-cloud-passpoint-access", "name": "TipWlan-cloud-passpoint-access",
"appliedRadios": [ "details": {
"is5GHzL", "model_type": "SsidConfiguration",
"is5GHzU" "ssid": "TipWlan-cloud-passpoint-access",
], "appliedRadios": [
"ssidAdminState": "enabled", "is5GHzL",
"secureMode": "wpa2PSK", "is5GHzU"
"vlanId": 1, ],
"keyStr": "testing123", "ssidAdminState": "enabled",
"broadcastSsid": "enabled", "secureMode": "wpa2PSK",
"keyRefresh": 0, "vlanId": 1,
"noLocalSubnets": false, "keyStr": "testing123",
"radiusServiceName": null, "broadcastSsid": "enabled",
"radiusAccountingServiceName": null, "keyRefresh": 0,
"radiusAcountingServiceInterval": null, "noLocalSubnets": false,
"captivePortalId": null, "radiusServiceName": null,
"bandwidthLimitDown": 0, "radiusAccountingServiceName": null,
"bandwidthLimitUp": 0, "radiusAcountingServiceInterval": null,
"clientBandwidthLimitDown": 0, "radiusNasId": null,
"clientBandwidthLimitUp": 0, "radiusNasIp": null,
"videoTrafficOnly": false, "radiusOperName": null,
"radioBasedConfigs": { "captivePortalId": null,
"is5GHzL": { "bandwidthLimitDown": 0,
"model_type": "RadioBasedSsidConfiguration", "bandwidthLimitUp": 0,
"enable80211r": null, "clientBandwidthLimitDown": 0,
"enable80211k": null, "clientBandwidthLimitUp": 0,
"enable80211v": null "videoTrafficOnly": false,
}, "radioBasedConfigs": {
"is2dot4GHz": { "is5GHzL": {
"model_type": "RadioBasedSsidConfiguration", "model_type": "RadioBasedSsidConfiguration",
"enable80211r": null, "enable80211r": null,
"enable80211k": null, "enable80211k": null,
"enable80211v": null "enable80211v": null
}, },
"is5GHz": { "is2dot4GHz": {
"model_type": "RadioBasedSsidConfiguration", "model_type": "RadioBasedSsidConfiguration",
"enable80211r": null, "enable80211r": null,
"enable80211k": null, "enable80211k": null,
"enable80211v": null "enable80211v": null
}, },
"is5GHzU": { "is5GHz": {
"model_type": "RadioBasedSsidConfiguration", "model_type": "RadioBasedSsidConfiguration",
"enable80211r": null, "enable80211r": null,
"enable80211k": null, "enable80211k": null,
"enable80211v": null "enable80211v": null
} },
}, "is5GHzU": {
"bonjourGatewayProfileId": null, "model_type": "RadioBasedSsidConfiguration",
"enable80211w": null, "enable80211r": null,
"wepConfig": null, "enable80211k": null,
"forwardMode": null, "enable80211v": null
"profileType": "ssid" }
}, },
"createdTimestamp": 1606778369943, "bonjourGatewayProfileId": null,
"lastModifiedTimestamp": 1606778370811, "enable80211w": null,
"childProfileIds": [ "wepConfig": null,
24 "forwardMode": null,
] "profileType": "ssid"
}, },
{ "createdTimestamp": 1606778369943,
"model_type": "Profile", "lastModifiedTimestamp": 1606778370811,
"id": 16, "childProfileIds": [
"customerId": 2, 24
"profileType": "ssid", ]
"name": "TipWlan-cloud-passpoint-osu", },
"details": { {
"model_type": "SsidConfiguration", "model_type": "Profile",
"ssid": "TipWlan-cloud-passpoint-osu", "id": 16,
"appliedRadios": [ "customerId": 2,
"is2dot4GHz" "profileType": "ssid",
], "name": "TipWlan-cloud-passpoint-osu",
"ssidAdminState": "enabled", "details": {
"secureMode": "open", "model_type": "SsidConfiguration",
"vlanId": 1, "ssid": "TipWlan-cloud-passpoint-osu",
"keyStr": null, "appliedRadios": [
"broadcastSsid": "enabled", "is2dot4GHz"
"keyRefresh": 0, ],
"noLocalSubnets": false, "ssidAdminState": "enabled",
"radiusServiceName": null, "secureMode": "open",
"radiusAccountingServiceName": null, "vlanId": 1,
"radiusAcountingServiceInterval": null, "keyStr": null,
"captivePortalId": null, "broadcastSsid": "enabled",
"bandwidthLimitDown": 0, "keyRefresh": 0,
"bandwidthLimitUp": 0, "noLocalSubnets": false,
"clientBandwidthLimitDown": 0, "radiusServiceName": null,
"clientBandwidthLimitUp": 0, "radiusAccountingServiceName": null,
"videoTrafficOnly": false, "radiusAcountingServiceInterval": null,
"radioBasedConfigs": { "radiusNasId": null,
"is5GHzL": { "radiusNasIp": null,
"model_type": "RadioBasedSsidConfiguration", "radiusOperName": null,
"enable80211r": null, "captivePortalId": null,
"enable80211k": null, "bandwidthLimitDown": 0,
"enable80211v": null "bandwidthLimitUp": 0,
}, "clientBandwidthLimitDown": 0,
"is2dot4GHz": { "clientBandwidthLimitUp": 0,
"model_type": "RadioBasedSsidConfiguration", "videoTrafficOnly": false,
"enable80211r": null, "radioBasedConfigs": {
"enable80211k": null, "is5GHzL": {
"enable80211v": null "model_type": "RadioBasedSsidConfiguration",
}, "enable80211r": null,
"is5GHz": { "enable80211k": null,
"model_type": "RadioBasedSsidConfiguration", "enable80211v": null
"enable80211r": null, },
"enable80211k": null, "is2dot4GHz": {
"enable80211v": null "model_type": "RadioBasedSsidConfiguration",
}, "enable80211r": null,
"is5GHzU": { "enable80211k": null,
"model_type": "RadioBasedSsidConfiguration", "enable80211v": null
"enable80211r": null, },
"enable80211k": null, "is5GHz": {
"enable80211v": null "model_type": "RadioBasedSsidConfiguration",
} "enable80211r": null,
}, "enable80211k": null,
"bonjourGatewayProfileId": null, "enable80211v": null
"enable80211w": null, },
"wepConfig": null, "is5GHzU": {
"forwardMode": null, "model_type": "RadioBasedSsidConfiguration",
"profileType": "ssid" "enable80211r": null,
}, "enable80211k": null,
"createdTimestamp": 1606778369944, "enable80211v": null
"lastModifiedTimestamp": 1606778370352, }
"childProfileIds": [ },
19, "bonjourGatewayProfileId": null,
20 "enable80211w": null,
] "wepConfig": null,
} "forwardMode": null,
"profileType": "ssid"
},
"createdTimestamp": 1606778369944,
"lastModifiedTimestamp": 1606778370352,
"childProfileIds": [
19,
20
]
}
] ]

View File

@@ -1,203 +1,212 @@
[ [
{ {
"model_type": "Profile", "model_type": "Profile",
"id": 5, "id": 5,
"customerId": 2, "customerId": 2,
"profileType": "ssid", "profileType": "ssid",
"name": "TipWlan-cloud-3-radios", "name": "TipWlan-cloud-3-radios",
"details": { "details": {
"model_type": "SsidConfiguration", "model_type": "SsidConfiguration",
"ssid": "TipWlan-cloud-3-radios", "ssid": "TipWlan-cloud-3-radios",
"appliedRadios": [ "appliedRadios": [
"is5GHzL", "is5GHzL",
"is2dot4GHz", "is2dot4GHz",
"is5GHzU" "is5GHzU"
], ],
"ssidAdminState": "enabled", "ssidAdminState": "enabled",
"secureMode": "wpa2OnlyPSK", "secureMode": "wpa2OnlyPSK",
"vlanId": 1, "vlanId": 1,
"keyStr": "openwifi", "keyStr": "openwifi",
"broadcastSsid": "enabled", "broadcastSsid": "enabled",
"keyRefresh": 0, "keyRefresh": 0,
"noLocalSubnets": false, "noLocalSubnets": false,
"radiusServiceName": null, "radiusServiceName": null,
"radiusAccountingServiceName": null, "radiusAccountingServiceName": null,
"radiusAcountingServiceInterval": null, "radiusAcountingServiceInterval": null,
"captivePortalId": null, "radiusNasId": null,
"bandwidthLimitDown": 0, "radiusNasIp": null,
"bandwidthLimitUp": 0, "radiusOperName": null,
"clientBandwidthLimitDown": 0, "captivePortalId": null,
"clientBandwidthLimitUp": 0, "bandwidthLimitDown": 0,
"videoTrafficOnly": false, "bandwidthLimitUp": 0,
"radioBasedConfigs": { "clientBandwidthLimitDown": 0,
"is5GHzL": { "clientBandwidthLimitUp": 0,
"model_type": "RadioBasedSsidConfiguration", "videoTrafficOnly": false,
"enable80211r": null, "radioBasedConfigs": {
"enable80211k": null, "is5GHzL": {
"enable80211v": null "model_type": "RadioBasedSsidConfiguration",
}, "enable80211r": null,
"is2dot4GHz": { "enable80211k": null,
"model_type": "RadioBasedSsidConfiguration", "enable80211v": null
"enable80211r": null, },
"enable80211k": null, "is2dot4GHz": {
"enable80211v": null "model_type": "RadioBasedSsidConfiguration",
}, "enable80211r": null,
"is5GHz": { "enable80211k": null,
"model_type": "RadioBasedSsidConfiguration", "enable80211v": null
"enable80211r": null, },
"enable80211k": null, "is5GHz": {
"enable80211v": null "model_type": "RadioBasedSsidConfiguration",
}, "enable80211r": null,
"is5GHzU": { "enable80211k": null,
"model_type": "RadioBasedSsidConfiguration", "enable80211v": null
"enable80211r": null, },
"enable80211k": null, "is5GHzU": {
"enable80211v": null "model_type": "RadioBasedSsidConfiguration",
} "enable80211r": null,
}, "enable80211k": null,
"bonjourGatewayProfileId": null, "enable80211v": null
"enable80211w": null, }
"wepConfig": null, },
"forwardMode": "BRIDGE", "bonjourGatewayProfileId": null,
"profileType": "ssid" "enable80211w": null,
}, "wepConfig": null,
"createdTimestamp": 1606778369598, "forwardMode": "BRIDGE",
"lastModifiedTimestamp": 1606778369598, "profileType": "ssid"
"childProfileIds": [ },
] "createdTimestamp": 1606778369598,
}, "lastModifiedTimestamp": 1606778369598,
{ "childProfileIds": [
"model_type": "Profile", ]
"id": 15, },
"customerId": 2, {
"profileType": "ssid", "model_type": "Profile",
"name": "TipWlan-cloud-passpoint-access", "id": 15,
"details": { "customerId": 2,
"model_type": "SsidConfiguration", "profileType": "ssid",
"ssid": "TipWlan-cloud-passpoint-access", "name": "TipWlan-cloud-passpoint-access",
"appliedRadios": [ "details": {
"is5GHzL", "model_type": "SsidConfiguration",
"is5GHzU" "ssid": "TipWlan-cloud-passpoint-access",
], "appliedRadios": [
"ssidAdminState": "enabled", "is5GHzL",
"secureMode": "wpa2PSK", "is5GHzU"
"vlanId": 1, ],
"keyStr": "testing123", "ssidAdminState": "enabled",
"broadcastSsid": "enabled", "secureMode": "wpa2PSK",
"keyRefresh": 0, "vlanId": 1,
"noLocalSubnets": false, "keyStr": "testing123",
"radiusServiceName": null, "broadcastSsid": "enabled",
"radiusAccountingServiceName": null, "keyRefresh": 0,
"radiusAcountingServiceInterval": null, "noLocalSubnets": false,
"captivePortalId": null, "radiusServiceName": null,
"bandwidthLimitDown": 0, "radiusAccountingServiceName": null,
"bandwidthLimitUp": 0, "radiusAcountingServiceInterval": null,
"clientBandwidthLimitDown": 0, "radiusNasId": null,
"clientBandwidthLimitUp": 0, "radiusNasIp": null,
"videoTrafficOnly": false, "radiusOperName": null,
"radioBasedConfigs": { "captivePortalId": null,
"is5GHzL": { "bandwidthLimitDown": 0,
"model_type": "RadioBasedSsidConfiguration", "bandwidthLimitUp": 0,
"enable80211r": null, "clientBandwidthLimitDown": 0,
"enable80211k": null, "clientBandwidthLimitUp": 0,
"enable80211v": null "videoTrafficOnly": false,
}, "radioBasedConfigs": {
"is2dot4GHz": { "is5GHzL": {
"model_type": "RadioBasedSsidConfiguration", "model_type": "RadioBasedSsidConfiguration",
"enable80211r": null, "enable80211r": null,
"enable80211k": null, "enable80211k": null,
"enable80211v": null "enable80211v": null
}, },
"is5GHz": { "is2dot4GHz": {
"model_type": "RadioBasedSsidConfiguration", "model_type": "RadioBasedSsidConfiguration",
"enable80211r": null, "enable80211r": null,
"enable80211k": null, "enable80211k": null,
"enable80211v": null "enable80211v": null
}, },
"is5GHzU": { "is5GHz": {
"model_type": "RadioBasedSsidConfiguration", "model_type": "RadioBasedSsidConfiguration",
"enable80211r": null, "enable80211r": null,
"enable80211k": null, "enable80211k": null,
"enable80211v": null "enable80211v": null
} },
}, "is5GHzU": {
"bonjourGatewayProfileId": null, "model_type": "RadioBasedSsidConfiguration",
"enable80211w": null, "enable80211r": null,
"wepConfig": null, "enable80211k": null,
"forwardMode": null, "enable80211v": null
"profileType": "ssid" }
}, },
"createdTimestamp": 1606778369943, "bonjourGatewayProfileId": null,
"lastModifiedTimestamp": 1606778370811, "enable80211w": null,
"childProfileIds": [ "wepConfig": null,
24 "forwardMode": null,
] "profileType": "ssid"
}, },
{ "createdTimestamp": 1606778369943,
"model_type": "Profile", "lastModifiedTimestamp": 1606778370811,
"id": 16, "childProfileIds": [
"customerId": 2, 24
"profileType": "ssid", ]
"name": "TipWlan-cloud-passpoint-osu", },
"details": { {
"model_type": "SsidConfiguration", "model_type": "Profile",
"ssid": "TipWlan-cloud-passpoint-osu", "id": 16,
"appliedRadios": [ "customerId": 2,
"is2dot4GHz" "profileType": "ssid",
], "name": "TipWlan-cloud-passpoint-osu",
"ssidAdminState": "enabled", "details": {
"secureMode": "open", "model_type": "SsidConfiguration",
"vlanId": 1, "ssid": "TipWlan-cloud-passpoint-osu",
"keyStr": null, "appliedRadios": [
"broadcastSsid": "enabled", "is2dot4GHz"
"keyRefresh": 0, ],
"noLocalSubnets": false, "ssidAdminState": "enabled",
"radiusServiceName": null, "secureMode": "open",
"radiusAccountingServiceName": null, "vlanId": 1,
"radiusAcountingServiceInterval": null, "keyStr": null,
"captivePortalId": null, "broadcastSsid": "enabled",
"bandwidthLimitDown": 0, "keyRefresh": 0,
"bandwidthLimitUp": 0, "noLocalSubnets": false,
"clientBandwidthLimitDown": 0, "radiusServiceName": null,
"clientBandwidthLimitUp": 0, "radiusAccountingServiceName": null,
"videoTrafficOnly": false, "radiusAcountingServiceInterval": null,
"radioBasedConfigs": { "radiusNasId": null,
"is5GHzL": { "radiusNasIp": null,
"model_type": "RadioBasedSsidConfiguration", "radiusOperName": null,
"enable80211r": null, "captivePortalId": null,
"enable80211k": null, "bandwidthLimitDown": 0,
"enable80211v": null "bandwidthLimitUp": 0,
}, "clientBandwidthLimitDown": 0,
"is2dot4GHz": { "clientBandwidthLimitUp": 0,
"model_type": "RadioBasedSsidConfiguration", "videoTrafficOnly": false,
"enable80211r": null, "radioBasedConfigs": {
"enable80211k": null, "is5GHzL": {
"enable80211v": null "model_type": "RadioBasedSsidConfiguration",
}, "enable80211r": null,
"is5GHz": { "enable80211k": null,
"model_type": "RadioBasedSsidConfiguration", "enable80211v": null
"enable80211r": null, },
"enable80211k": null, "is2dot4GHz": {
"enable80211v": null "model_type": "RadioBasedSsidConfiguration",
}, "enable80211r": null,
"is5GHzU": { "enable80211k": null,
"model_type": "RadioBasedSsidConfiguration", "enable80211v": null
"enable80211r": null, },
"enable80211k": null, "is5GHz": {
"enable80211v": null "model_type": "RadioBasedSsidConfiguration",
} "enable80211r": null,
}, "enable80211k": null,
"bonjourGatewayProfileId": null, "enable80211v": null
"enable80211w": null, },
"wepConfig": null, "is5GHzU": {
"forwardMode": null, "model_type": "RadioBasedSsidConfiguration",
"profileType": "ssid" "enable80211r": null,
}, "enable80211k": null,
"createdTimestamp": 1606778369944, "enable80211v": null
"lastModifiedTimestamp": 1606778370352, }
"childProfileIds": [ },
19, "bonjourGatewayProfileId": null,
20 "enable80211w": null,
] "wepConfig": null,
} "forwardMode": null,
"profileType": "ssid"
},
"createdTimestamp": 1606778369944,
"lastModifiedTimestamp": 1606778370352,
"childProfileIds": [
19,
20
]
}
] ]

View File

@@ -1,203 +1,212 @@
[ [
{ {
"model_type": "Profile", "model_type": "Profile",
"id": 5, "id": 5,
"customerId": 2, "customerId": 2,
"profileType": "ssid", "profileType": "ssid",
"name": "TipWlan-cloud-3-radios", "name": "TipWlan-cloud-3-radios",
"details": { "details": {
"model_type": "SsidConfiguration", "model_type": "SsidConfiguration",
"ssid": "TipWlan-cloud-3-radios", "ssid": "TipWlan-cloud-3-radios",
"appliedRadios": [ "appliedRadios": [
"is5GHzL", "is5GHzL",
"is2dot4GHz", "is2dot4GHz",
"is5GHzU" "is5GHzU"
], ],
"ssidAdminState": "enabled", "ssidAdminState": "enabled",
"secureMode": "wpa2OnlyPSK", "secureMode": "wpa2OnlyPSK",
"vlanId": 1, "vlanId": 1,
"keyStr": "openwifi", "keyStr": "openwifi",
"broadcastSsid": "enabled", "broadcastSsid": "enabled",
"keyRefresh": 0, "keyRefresh": 0,
"noLocalSubnets": false, "noLocalSubnets": false,
"radiusServiceName": null, "radiusServiceName": null,
"radiusAccountingServiceName": null, "radiusAccountingServiceName": null,
"radiusAcountingServiceInterval": null, "radiusAcountingServiceInterval": null,
"captivePortalId": null, "radiusNasId": null,
"bandwidthLimitDown": 0, "radiusNasIp": null,
"bandwidthLimitUp": 0, "radiusOperName": null,
"clientBandwidthLimitDown": 0, "captivePortalId": null,
"clientBandwidthLimitUp": 0, "bandwidthLimitDown": 0,
"videoTrafficOnly": false, "bandwidthLimitUp": 0,
"radioBasedConfigs": { "clientBandwidthLimitDown": 0,
"is5GHzL": { "clientBandwidthLimitUp": 0,
"model_type": "RadioBasedSsidConfiguration", "videoTrafficOnly": false,
"enable80211r": null, "radioBasedConfigs": {
"enable80211k": null, "is5GHzL": {
"enable80211v": null "model_type": "RadioBasedSsidConfiguration",
}, "enable80211r": null,
"is2dot4GHz": { "enable80211k": null,
"model_type": "RadioBasedSsidConfiguration", "enable80211v": null
"enable80211r": null, },
"enable80211k": null, "is2dot4GHz": {
"enable80211v": null "model_type": "RadioBasedSsidConfiguration",
}, "enable80211r": null,
"is5GHz": { "enable80211k": null,
"model_type": "RadioBasedSsidConfiguration", "enable80211v": null
"enable80211r": null, },
"enable80211k": null, "is5GHz": {
"enable80211v": null "model_type": "RadioBasedSsidConfiguration",
}, "enable80211r": null,
"is5GHzU": { "enable80211k": null,
"model_type": "RadioBasedSsidConfiguration", "enable80211v": null
"enable80211r": null, },
"enable80211k": null, "is5GHzU": {
"enable80211v": null "model_type": "RadioBasedSsidConfiguration",
} "enable80211r": null,
}, "enable80211k": null,
"bonjourGatewayProfileId": null, "enable80211v": null
"enable80211w": null, }
"wepConfig": null, },
"forwardMode": "BRIDGE", "bonjourGatewayProfileId": null,
"profileType": "ssid" "enable80211w": null,
}, "wepConfig": null,
"createdTimestamp": 1606778369598, "forwardMode": "BRIDGE",
"lastModifiedTimestamp": 1606778369598, "profileType": "ssid"
"childProfileIds": [ },
] "createdTimestamp": 1606778369598,
}, "lastModifiedTimestamp": 1606778369598,
{ "childProfileIds": [
"model_type": "Profile", ]
"id": 15, },
"customerId": 2, {
"profileType": "ssid", "model_type": "Profile",
"name": "TipWlan-cloud-passpoint-access", "id": 15,
"details": { "customerId": 2,
"model_type": "SsidConfiguration", "profileType": "ssid",
"ssid": "TipWlan-cloud-passpoint-access", "name": "TipWlan-cloud-passpoint-access",
"appliedRadios": [ "details": {
"is5GHzL", "model_type": "SsidConfiguration",
"is5GHzU" "ssid": "TipWlan-cloud-passpoint-access",
], "appliedRadios": [
"ssidAdminState": "enabled", "is5GHzL",
"secureMode": "wpa2PSK", "is5GHzU"
"vlanId": 1, ],
"keyStr": "testing123", "ssidAdminState": "enabled",
"broadcastSsid": "enabled", "secureMode": "wpa2PSK",
"keyRefresh": 0, "vlanId": 1,
"noLocalSubnets": false, "keyStr": "testing123",
"radiusServiceName": null, "broadcastSsid": "enabled",
"radiusAccountingServiceName": null, "keyRefresh": 0,
"radiusAcountingServiceInterval": null, "noLocalSubnets": false,
"captivePortalId": null, "radiusServiceName": null,
"bandwidthLimitDown": 0, "radiusAccountingServiceName": null,
"bandwidthLimitUp": 0, "radiusAcountingServiceInterval": null,
"clientBandwidthLimitDown": 0, "radiusNasId": null,
"clientBandwidthLimitUp": 0, "radiusNasIp": null,
"videoTrafficOnly": false, "radiusOperName": null,
"radioBasedConfigs": { "captivePortalId": null,
"is5GHzL": { "bandwidthLimitDown": 0,
"model_type": "RadioBasedSsidConfiguration", "bandwidthLimitUp": 0,
"enable80211r": null, "clientBandwidthLimitDown": 0,
"enable80211k": null, "clientBandwidthLimitUp": 0,
"enable80211v": null "videoTrafficOnly": false,
}, "radioBasedConfigs": {
"is2dot4GHz": { "is5GHzL": {
"model_type": "RadioBasedSsidConfiguration", "model_type": "RadioBasedSsidConfiguration",
"enable80211r": null, "enable80211r": null,
"enable80211k": null, "enable80211k": null,
"enable80211v": null "enable80211v": null
}, },
"is5GHz": { "is2dot4GHz": {
"model_type": "RadioBasedSsidConfiguration", "model_type": "RadioBasedSsidConfiguration",
"enable80211r": null, "enable80211r": null,
"enable80211k": null, "enable80211k": null,
"enable80211v": null "enable80211v": null
}, },
"is5GHzU": { "is5GHz": {
"model_type": "RadioBasedSsidConfiguration", "model_type": "RadioBasedSsidConfiguration",
"enable80211r": null, "enable80211r": null,
"enable80211k": null, "enable80211k": null,
"enable80211v": null "enable80211v": null
} },
}, "is5GHzU": {
"bonjourGatewayProfileId": null, "model_type": "RadioBasedSsidConfiguration",
"enable80211w": null, "enable80211r": null,
"wepConfig": null, "enable80211k": null,
"forwardMode": null, "enable80211v": null
"profileType": "ssid" }
}, },
"createdTimestamp": 1606778369943, "bonjourGatewayProfileId": null,
"lastModifiedTimestamp": 1606778370811, "enable80211w": null,
"childProfileIds": [ "wepConfig": null,
24 "forwardMode": null,
] "profileType": "ssid"
}, },
{ "createdTimestamp": 1606778369943,
"model_type": "Profile", "lastModifiedTimestamp": 1606778370811,
"id": 16, "childProfileIds": [
"customerId": 2, 24
"profileType": "ssid", ]
"name": "TipWlan-cloud-passpoint-osu", },
"details": { {
"model_type": "SsidConfiguration", "model_type": "Profile",
"ssid": "TipWlan-cloud-passpoint-osu", "id": 16,
"appliedRadios": [ "customerId": 2,
"is2dot4GHz" "profileType": "ssid",
], "name": "TipWlan-cloud-passpoint-osu",
"ssidAdminState": "enabled", "details": {
"secureMode": "open", "model_type": "SsidConfiguration",
"vlanId": 1, "ssid": "TipWlan-cloud-passpoint-osu",
"keyStr": null, "appliedRadios": [
"broadcastSsid": "enabled", "is2dot4GHz"
"keyRefresh": 0, ],
"noLocalSubnets": false, "ssidAdminState": "enabled",
"radiusServiceName": null, "secureMode": "open",
"radiusAccountingServiceName": null, "vlanId": 1,
"radiusAcountingServiceInterval": null, "keyStr": null,
"captivePortalId": null, "broadcastSsid": "enabled",
"bandwidthLimitDown": 0, "keyRefresh": 0,
"bandwidthLimitUp": 0, "noLocalSubnets": false,
"clientBandwidthLimitDown": 0, "radiusServiceName": null,
"clientBandwidthLimitUp": 0, "radiusAccountingServiceName": null,
"videoTrafficOnly": false, "radiusAcountingServiceInterval": null,
"radioBasedConfigs": { "radiusNasId": null,
"is5GHzL": { "radiusNasIp": null,
"model_type": "RadioBasedSsidConfiguration", "radiusOperName": null,
"enable80211r": null, "captivePortalId": null,
"enable80211k": null, "bandwidthLimitDown": 0,
"enable80211v": null "bandwidthLimitUp": 0,
}, "clientBandwidthLimitDown": 0,
"is2dot4GHz": { "clientBandwidthLimitUp": 0,
"model_type": "RadioBasedSsidConfiguration", "videoTrafficOnly": false,
"enable80211r": null, "radioBasedConfigs": {
"enable80211k": null, "is5GHzL": {
"enable80211v": null "model_type": "RadioBasedSsidConfiguration",
}, "enable80211r": null,
"is5GHz": { "enable80211k": null,
"model_type": "RadioBasedSsidConfiguration", "enable80211v": null
"enable80211r": null, },
"enable80211k": null, "is2dot4GHz": {
"enable80211v": null "model_type": "RadioBasedSsidConfiguration",
}, "enable80211r": null,
"is5GHzU": { "enable80211k": null,
"model_type": "RadioBasedSsidConfiguration", "enable80211v": null
"enable80211r": null, },
"enable80211k": null, "is5GHz": {
"enable80211v": null "model_type": "RadioBasedSsidConfiguration",
} "enable80211r": null,
}, "enable80211k": null,
"bonjourGatewayProfileId": null, "enable80211v": null
"enable80211w": null, },
"wepConfig": null, "is5GHzU": {
"forwardMode": null, "model_type": "RadioBasedSsidConfiguration",
"profileType": "ssid" "enable80211r": null,
}, "enable80211k": null,
"createdTimestamp": 1606778369944, "enable80211v": null
"lastModifiedTimestamp": 1606778370352, }
"childProfileIds": [ },
19, "bonjourGatewayProfileId": null,
20 "enable80211w": null,
] "wepConfig": null,
} "forwardMode": null,
"profileType": "ssid"
},
"createdTimestamp": 1606778369944,
"lastModifiedTimestamp": 1606778370352,
"childProfileIds": [
19,
20
]
}
] ]

View File

@@ -2587,7 +2587,7 @@ public class OvsdbDao {
String ipAssignScheme, List<MacAddress> macBlockList, boolean rateLimitEnable, int ssidDlLimit, String ipAssignScheme, List<MacAddress> macBlockList, boolean rateLimitEnable, int ssidDlLimit,
int ssidUlLimit, int clientDlLimit, int clientUlLimit, int rtsCtsThreshold, int fragThresholdBytes, int ssidUlLimit, int clientDlLimit, int clientUlLimit, int rtsCtsThreshold, int fragThresholdBytes,
int dtimPeriod, Map<String, String> captiveMap, List<String> walledGardenAllowlist, int dtimPeriod, Map<String, String> captiveMap, List<String> walledGardenAllowlist,
Map<Short, Set<String>> bonjourServiceMap) { Map<Short, Set<String>> bonjourServiceMap, String radiusNasId, String radiusNasIp, String radiusOperatorName) {
List<Operation> operations = new ArrayList<>(); List<Operation> operations = new ArrayList<>();
Map<String, Value> updateColumns = new HashMap<>(); Map<String, Value> updateColumns = new HashMap<>();
@@ -2674,6 +2674,15 @@ public class OvsdbDao {
customOptions.put("client_dl_limit", String.valueOf(clientDlLimit * 1000)); customOptions.put("client_dl_limit", String.valueOf(clientDlLimit * 1000));
customOptions.put("client_ul_limit", String.valueOf(clientUlLimit * 1000)); customOptions.put("client_ul_limit", String.valueOf(clientUlLimit * 1000));
customOptions.put("rts_threshold", String.valueOf(rtsCtsThreshold)); 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 // TODO: the frag_threshold is not supported on the AP
// customOptions.put("frag_threshold", // customOptions.put("frag_threshold",
// String.valueOf(fragThresholdBytes)); // String.valueOf(fragThresholdBytes));
@@ -3035,8 +3044,18 @@ public class OvsdbDao {
String ssidSecurityMode = ssidConfig.getSecureMode().name(); String ssidSecurityMode = ssidConfig.getSecureMode().name();
String opensyncSecurityMode = "OPEN"; String opensyncSecurityMode = "OPEN";
String radiusNasId = null;
String radiusNasIp = null;
String radiusOperName = null;
opensyncSecurityMode = getOpensyncSecurityMode(ssidSecurityMode, opensyncSecurityMode); opensyncSecurityMode = getOpensyncSecurityMode(ssidSecurityMode, opensyncSecurityMode);
populateSecurityMap(opensyncApConfig, ssidConfig, security, 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 // TODO put into AP captive parameter
Map<String, String> captiveMap = new HashMap<>(); Map<String, String> captiveMap = new HashMap<>();
@@ -3084,7 +3103,7 @@ public class OvsdbDao {
uapsdEnabled, apBridge, ssidConfig.getForwardMode(), gateway, inet, dns, ipAssignScheme, uapsdEnabled, apBridge, ssidConfig.getForwardMode(), gateway, inet, dns, ipAssignScheme,
macBlockList, rateLimitEnable, ssidDlLimit, ssidUlLimit, clientDlLimit, clientUlLimit, macBlockList, rateLimitEnable, ssidDlLimit, ssidUlLimit, clientDlLimit, clientUlLimit,
rtsCtsThreshold, fragThresholdBytes, dtimPeriod, captiveMap, walledGardenAllowlist, rtsCtsThreshold, fragThresholdBytes, dtimPeriod, captiveMap, walledGardenAllowlist,
bonjourServiceMap); bonjourServiceMap, radiusNasId, radiusNasIp, radiusOperName);
updateVifConfigsSetForRadio(ovsdbClient, ssidConfig.getSsid(), freqBand, vifConfigUuid); updateVifConfigsSetForRadio(ovsdbClient, ssidConfig.getSsid(), freqBand, vifConfigUuid);
@@ -4439,7 +4458,7 @@ public class OvsdbDao {
provisionWifiStatsConfigFromProfile("client", radioType, reportingInterval, provisionWifiStatsConfigFromProfile("client", radioType, reportingInterval,
samplingInterval, operations); samplingInterval, operations);
provisionWifiStatsConfigFromProfile("event", reportingInterval, samplingInterval, provisionWifiStatsConfigFromProfile("event", radioType, reportingInterval, samplingInterval,
operations); operations);
provisionWifiStatsConfigFromProfile("video_voice", reportingInterval, samplingInterval, provisionWifiStatsConfigFromProfile("video_voice", reportingInterval, samplingInterval,
@@ -4626,7 +4645,7 @@ public class OvsdbDao {
// TODO: when schema support is added, these should be part of the // TODO: when schema support is added, these should be part of the
// bulk provisioning operation above. // bulk provisioning operation above.
provisionVideoVoiceStats(ovsdbClient); provisionVideoVoiceStats(ovsdbClient);
provisionEventReporting(ovsdbClient); provisionEventReporting(radioConfigs, ovsdbClient);
} catch (OvsdbClientException | TimeoutException | ExecutionException | InterruptedException e) { } catch (OvsdbClientException | TimeoutException | ExecutionException | InterruptedException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
@@ -4818,21 +4837,27 @@ public class OvsdbDao {
* @param ovsdbClient * @param ovsdbClient
* *
*/ */
public void provisionEventReporting(OvsdbClient ovsdbClient) { public void provisionEventReporting(Map<String, WifiRadioConfigInfo> radioConfigs, OvsdbClient ovsdbClient) {
LOG.debug("Enable event reporting from AP");
try { try {
List<Operation> operations = new ArrayList<>();
Map<String, Value> 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<Operation> operations = new ArrayList<>();
radioConfigs.values().stream().forEach(new Consumer<WifiRadioConfigInfo>() {
@Override
public void accept(WifiRadioConfigInfo rc) {
//
Map<String, Value> 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<OperationResult[]> fResult = ovsdbClient.transact(ovsdbName, operations); CompletableFuture<OperationResult[]> fResult = ovsdbClient.transact(ovsdbName, operations);
OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS); OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
@@ -4857,6 +4882,9 @@ public class OvsdbDao {
} }
} }
} catch (OvsdbClientException | TimeoutException | ExecutionException | InterruptedException e) { } catch (OvsdbClientException | TimeoutException | ExecutionException | InterruptedException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }