From 9b83f28ab3476dc35b8a9dc9cbc4ef1747d88d71 Mon Sep 17 00:00:00 2001 From: Mike Hansen Date: Fri, 18 Dec 2020 14:25:47 -0500 Subject: [PATCH] WIFI-1219: Cloud Backend Services - Enhance Radius NAS modelling -- remove deprecated attributes -- update static profiles --- .../src/main/resources/ProfileSsid.json | 39 +++++++++++++------ .../app/opensync/ProfileSsid.json | 39 +++++++++++++------ .../main/docker/app/opensync/ProfileSsid.json | 39 +++++++++++++------ .../resources/app/opensync/ProfileSsid.json | 39 +++++++++++++------ 4 files changed, 108 insertions(+), 48 deletions(-) diff --git a/opensync-ext-static/src/main/resources/ProfileSsid.json b/opensync-ext-static/src/main/resources/ProfileSsid.json index 396b9df..5f4cdaa 100644 --- a/opensync-ext-static/src/main/resources/ProfileSsid.json +++ b/opensync-ext-static/src/main/resources/ProfileSsid.json @@ -23,9 +23,6 @@ "radiusServiceName": null, "radiusAccountingServiceName": null, "radiusAcountingServiceInterval": null, - "radiusNasId": null, - "radiusNasIp": null, - "radiusOperName": null, "captivePortalId": null, "bandwidthLimitDown": 0, "bandwidthLimitUp": 0, @@ -62,7 +59,15 @@ "enable80211w": null, "wepConfig": null, "forwardMode": "BRIDGE", - "profileType": "ssid" + "profileType": "ssid", + "radiusClientConfiguration": { + "model_type": "RadiusNasConfiguration", + "nasClientId": "DEFAULT", + "nasClientIp": "WAN_IP", + "userDefinedNasId": null, + "userDefinedNasIp": null, + "nasOperatorId": null + } }, "createdTimestamp": 1606778369598, "lastModifiedTimestamp": 1606778369598, @@ -92,9 +97,6 @@ "radiusServiceName": null, "radiusAccountingServiceName": null, "radiusAcountingServiceInterval": null, - "radiusNasId": null, - "radiusNasIp": null, - "radiusOperName": null, "captivePortalId": null, "bandwidthLimitDown": 0, "bandwidthLimitUp": 0, @@ -131,7 +133,15 @@ "enable80211w": null, "wepConfig": null, "forwardMode": null, - "profileType": "ssid" + "profileType": "ssid", + "radiusClientConfiguration": { + "model_type": "RadiusNasConfiguration", + "nasClientId": "DEFAULT", + "nasClientIp": "WAN_IP", + "userDefinedNasId": null, + "userDefinedNasIp": null, + "nasOperatorId": null + } }, "createdTimestamp": 1606778369943, "lastModifiedTimestamp": 1606778370811, @@ -161,9 +171,6 @@ "radiusServiceName": null, "radiusAccountingServiceName": null, "radiusAcountingServiceInterval": null, - "radiusNasId": null, - "radiusNasIp": null, - "radiusOperName": null, "captivePortalId": null, "bandwidthLimitDown": 0, "bandwidthLimitUp": 0, @@ -200,7 +207,15 @@ "enable80211w": null, "wepConfig": null, "forwardMode": null, - "profileType": "ssid" + "profileType": "ssid", + "radiusClientConfiguration": { + "model_type": "RadiusNasConfiguration", + "nasClientId": "DEFAULT", + "nasClientIp": "WAN_IP", + "userDefinedNasId": null, + "userDefinedNasIp": null, + "nasOperatorId": null + } }, "createdTimestamp": 1606778369944, "lastModifiedTimestamp": 1606778370352, 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 396b9df..5f4cdaa 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 @@ -23,9 +23,6 @@ "radiusServiceName": null, "radiusAccountingServiceName": null, "radiusAcountingServiceInterval": null, - "radiusNasId": null, - "radiusNasIp": null, - "radiusOperName": null, "captivePortalId": null, "bandwidthLimitDown": 0, "bandwidthLimitUp": 0, @@ -62,7 +59,15 @@ "enable80211w": null, "wepConfig": null, "forwardMode": "BRIDGE", - "profileType": "ssid" + "profileType": "ssid", + "radiusClientConfiguration": { + "model_type": "RadiusNasConfiguration", + "nasClientId": "DEFAULT", + "nasClientIp": "WAN_IP", + "userDefinedNasId": null, + "userDefinedNasIp": null, + "nasOperatorId": null + } }, "createdTimestamp": 1606778369598, "lastModifiedTimestamp": 1606778369598, @@ -92,9 +97,6 @@ "radiusServiceName": null, "radiusAccountingServiceName": null, "radiusAcountingServiceInterval": null, - "radiusNasId": null, - "radiusNasIp": null, - "radiusOperName": null, "captivePortalId": null, "bandwidthLimitDown": 0, "bandwidthLimitUp": 0, @@ -131,7 +133,15 @@ "enable80211w": null, "wepConfig": null, "forwardMode": null, - "profileType": "ssid" + "profileType": "ssid", + "radiusClientConfiguration": { + "model_type": "RadiusNasConfiguration", + "nasClientId": "DEFAULT", + "nasClientIp": "WAN_IP", + "userDefinedNasId": null, + "userDefinedNasIp": null, + "nasOperatorId": null + } }, "createdTimestamp": 1606778369943, "lastModifiedTimestamp": 1606778370811, @@ -161,9 +171,6 @@ "radiusServiceName": null, "radiusAccountingServiceName": null, "radiusAcountingServiceInterval": null, - "radiusNasId": null, - "radiusNasIp": null, - "radiusOperName": null, "captivePortalId": null, "bandwidthLimitDown": 0, "bandwidthLimitUp": 0, @@ -200,7 +207,15 @@ "enable80211w": null, "wepConfig": null, "forwardMode": null, - "profileType": "ssid" + "profileType": "ssid", + "radiusClientConfiguration": { + "model_type": "RadiusNasConfiguration", + "nasClientId": "DEFAULT", + "nasClientIp": "WAN_IP", + "userDefinedNasId": null, + "userDefinedNasIp": null, + "nasOperatorId": null + } }, "createdTimestamp": 1606778369944, "lastModifiedTimestamp": 1606778370352, 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 396b9df..5f4cdaa 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 @@ -23,9 +23,6 @@ "radiusServiceName": null, "radiusAccountingServiceName": null, "radiusAcountingServiceInterval": null, - "radiusNasId": null, - "radiusNasIp": null, - "radiusOperName": null, "captivePortalId": null, "bandwidthLimitDown": 0, "bandwidthLimitUp": 0, @@ -62,7 +59,15 @@ "enable80211w": null, "wepConfig": null, "forwardMode": "BRIDGE", - "profileType": "ssid" + "profileType": "ssid", + "radiusClientConfiguration": { + "model_type": "RadiusNasConfiguration", + "nasClientId": "DEFAULT", + "nasClientIp": "WAN_IP", + "userDefinedNasId": null, + "userDefinedNasIp": null, + "nasOperatorId": null + } }, "createdTimestamp": 1606778369598, "lastModifiedTimestamp": 1606778369598, @@ -92,9 +97,6 @@ "radiusServiceName": null, "radiusAccountingServiceName": null, "radiusAcountingServiceInterval": null, - "radiusNasId": null, - "radiusNasIp": null, - "radiusOperName": null, "captivePortalId": null, "bandwidthLimitDown": 0, "bandwidthLimitUp": 0, @@ -131,7 +133,15 @@ "enable80211w": null, "wepConfig": null, "forwardMode": null, - "profileType": "ssid" + "profileType": "ssid", + "radiusClientConfiguration": { + "model_type": "RadiusNasConfiguration", + "nasClientId": "DEFAULT", + "nasClientIp": "WAN_IP", + "userDefinedNasId": null, + "userDefinedNasIp": null, + "nasOperatorId": null + } }, "createdTimestamp": 1606778369943, "lastModifiedTimestamp": 1606778370811, @@ -161,9 +171,6 @@ "radiusServiceName": null, "radiusAccountingServiceName": null, "radiusAcountingServiceInterval": null, - "radiusNasId": null, - "radiusNasIp": null, - "radiusOperName": null, "captivePortalId": null, "bandwidthLimitDown": 0, "bandwidthLimitUp": 0, @@ -200,7 +207,15 @@ "enable80211w": null, "wepConfig": null, "forwardMode": null, - "profileType": "ssid" + "profileType": "ssid", + "radiusClientConfiguration": { + "model_type": "RadiusNasConfiguration", + "nasClientId": "DEFAULT", + "nasClientIp": "WAN_IP", + "userDefinedNasId": null, + "userDefinedNasIp": null, + "nasOperatorId": null + } }, "createdTimestamp": 1606778369944, "lastModifiedTimestamp": 1606778370352, 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 396b9df..5f4cdaa 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 @@ -23,9 +23,6 @@ "radiusServiceName": null, "radiusAccountingServiceName": null, "radiusAcountingServiceInterval": null, - "radiusNasId": null, - "radiusNasIp": null, - "radiusOperName": null, "captivePortalId": null, "bandwidthLimitDown": 0, "bandwidthLimitUp": 0, @@ -62,7 +59,15 @@ "enable80211w": null, "wepConfig": null, "forwardMode": "BRIDGE", - "profileType": "ssid" + "profileType": "ssid", + "radiusClientConfiguration": { + "model_type": "RadiusNasConfiguration", + "nasClientId": "DEFAULT", + "nasClientIp": "WAN_IP", + "userDefinedNasId": null, + "userDefinedNasIp": null, + "nasOperatorId": null + } }, "createdTimestamp": 1606778369598, "lastModifiedTimestamp": 1606778369598, @@ -92,9 +97,6 @@ "radiusServiceName": null, "radiusAccountingServiceName": null, "radiusAcountingServiceInterval": null, - "radiusNasId": null, - "radiusNasIp": null, - "radiusOperName": null, "captivePortalId": null, "bandwidthLimitDown": 0, "bandwidthLimitUp": 0, @@ -131,7 +133,15 @@ "enable80211w": null, "wepConfig": null, "forwardMode": null, - "profileType": "ssid" + "profileType": "ssid", + "radiusClientConfiguration": { + "model_type": "RadiusNasConfiguration", + "nasClientId": "DEFAULT", + "nasClientIp": "WAN_IP", + "userDefinedNasId": null, + "userDefinedNasIp": null, + "nasOperatorId": null + } }, "createdTimestamp": 1606778369943, "lastModifiedTimestamp": 1606778370811, @@ -161,9 +171,6 @@ "radiusServiceName": null, "radiusAccountingServiceName": null, "radiusAcountingServiceInterval": null, - "radiusNasId": null, - "radiusNasIp": null, - "radiusOperName": null, "captivePortalId": null, "bandwidthLimitDown": 0, "bandwidthLimitUp": 0, @@ -200,7 +207,15 @@ "enable80211w": null, "wepConfig": null, "forwardMode": null, - "profileType": "ssid" + "profileType": "ssid", + "radiusClientConfiguration": { + "model_type": "RadiusNasConfiguration", + "nasClientId": "DEFAULT", + "nasClientIp": "WAN_IP", + "userDefinedNasId": null, + "userDefinedNasIp": null, + "nasOperatorId": null + } }, "createdTimestamp": 1606778369944, "lastModifiedTimestamp": 1606778370352,