diff --git a/opensync-ext-static/src/main/resources/EquipmentExample.json b/opensync-ext-static/src/main/resources/EquipmentExample.json index 232b2b3..5b1a141 100644 --- a/opensync-ext-static/src/main/resources/EquipmentExample.json +++ b/opensync-ext-static/src/main/resources/EquipmentExample.json @@ -32,63 +32,12 @@ "costSavingEventsEnabled": true, "forwardMode": "BRIDGE", "radioMap": { - "is2dot4GHz": { - "model_type": "ElementRadioConfiguration", - "radioType": "is2dot4GHz", - "channelNumber": 6, - "manualChannelNumber": 6, - "backupChannelNumber": 11, - "allowedChannels": [ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11 - ], - "rxCellSizeDb": { - "model_type": "SourceSelectionValue", - "source": "profile", - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "SourceSelectionValue", - "source": "profile", - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "SourceSelectionValue", - "source": "profile", - "value": -90 - }, - "eirpTxPower": { - "model_type": "SourceSelectionValue", - "source": "profile", - "value": 18 - }, - "perimeterDetectionEnabled": true, - "bestAPSteerType": "both", - "deauthAttackDetection": null, - "allowedChannelsPowerLevels": [] - }, "is5GHzU": { "model_type": "ElementRadioConfiguration", "radioType": "is5GHzU", "channelNumber": 149, "manualChannelNumber": 149, "backupChannelNumber": 154, - "allowedChannels": [ - 161, - 149, - 165, - 153, - 157 - ], "rxCellSizeDb": { "model_type": "SourceSelectionValue", "source": "profile", @@ -112,7 +61,215 @@ "perimeterDetectionEnabled": true, "bestAPSteerType": "both", "deauthAttackDetection": null, - "allowedChannelsPowerLevels": [] + "allowedChannelsPowerLevels": [ + { + "model_type": "ChannelPowerLevel", + "channelNumber": 161, + "powerLevel": 18, + "dfs": false, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 100, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 132, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 165, + "powerLevel": 18, + "dfs": false, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 104, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 136, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 108, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 140, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 112, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 144, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 116, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 149, + "powerLevel": 18, + "dfs": false, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 153, + "powerLevel": 18, + "dfs": false, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 157, + "powerLevel": 18, + "dfs": false, + "channelWidth": 80 + } + ] + }, + "is2dot4GHz": { + "model_type": "ElementRadioConfiguration", + "radioType": "is2dot4GHz", + "channelNumber": 6, + "manualChannelNumber": 6, + "backupChannelNumber": 11, + "rxCellSizeDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "eirpTxPower": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": 18 + }, + "perimeterDetectionEnabled": true, + "bestAPSteerType": "both", + "deauthAttackDetection": null, + "allowedChannelsPowerLevels": [ + { + "model_type": "ChannelPowerLevel", + "channelNumber": 1, + "powerLevel": 18, + "dfs": false, + "channelWidth": 20 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 2, + "powerLevel": 18, + "dfs": false, + "channelWidth": 20 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 3, + "powerLevel": 18, + "dfs": false, + "channelWidth": 20 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 4, + "powerLevel": 18, + "dfs": false, + "channelWidth": 20 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 5, + "powerLevel": 18, + "dfs": false, + "channelWidth": 20 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 6, + "powerLevel": 18, + "dfs": false, + "channelWidth": 20 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 7, + "powerLevel": 18, + "dfs": false, + "channelWidth": 20 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 8, + "powerLevel": 18, + "dfs": false, + "channelWidth": 20 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 9, + "powerLevel": 18, + "dfs": false, + "channelWidth": 20 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 10, + "powerLevel": 18, + "dfs": false, + "channelWidth": 20 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 11, + "powerLevel": 18, + "dfs": false, + "channelWidth": 20 + } + ] }, "is5GHzL": { "model_type": "ElementRadioConfiguration", @@ -120,12 +277,6 @@ "channelNumber": 36, "manualChannelNumber": 36, "backupChannelNumber": 44, - "allowedChannels": [ - 48, - 36, - 40, - 44 - ], "rxCellSizeDb": { "model_type": "SourceSelectionValue", "source": "profile", @@ -149,7 +300,64 @@ "perimeterDetectionEnabled": true, "bestAPSteerType": "both", "deauthAttackDetection": null, - "allowedChannelsPowerLevels": [] + "allowedChannelsPowerLevels": [ + { + "model_type": "ChannelPowerLevel", + "channelNumber": 52, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 36, + "powerLevel": 18, + "dfs": false, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 56, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 40, + "powerLevel": 18, + "dfs": false, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 60, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 44, + "powerLevel": 18, + "dfs": false, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 64, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 48, + "powerLevel": 18, + "dfs": false, + "channelWidth": 80 + } + ] } }, "advancedRadioMap": { @@ -256,6 +464,6 @@ "addressAsString": "24:f5:a2:ef:2e:53" }, "serial": "21P10C68818122", - "createdTimestamp": 0, - "lastModifiedTimestamp": 1611264546193 + "createdTimestamp": 1611857503082, + "lastModifiedTimestamp": 1611857505529 } \ No newline at end of file diff --git a/opensync-ext-static/src/main/resources/ProfileCaptive.json b/opensync-ext-static/src/main/resources/ProfileCaptive.json index eaecedd..0337c36 100644 --- a/opensync-ext-static/src/main/resources/ProfileCaptive.json +++ b/opensync-ext-static/src/main/resources/ProfileCaptive.json @@ -18,7 +18,7 @@ "model_type": "ManagedFileInfo", "md5checksum": null, "lastModifiedTimestamp": null, - "apExportUrl": "tip-logo-mobile.png", + "apExportUrl": "/filestore/tip-logo-mobile", "fileCategory": "CaptivePortalLogo", "fileType": "PNG", "altSlot": false @@ -27,7 +27,7 @@ "model_type": "ManagedFileInfo", "md5checksum": null, "lastModifiedTimestamp": null, - "apExportUrl": "tip-logo.png", + "apExportUrl": "/filestore/tip-logo", "fileCategory": "CaptivePortalBackground", "fileType": "PNG", "altSlot": false @@ -46,7 +46,7 @@ "macAllowList": [], "profileType": "captive_portal" }, - "createdTimestamp": 1611779680397, - "lastModifiedTimestamp": 1611779680397, + "createdTimestamp": 1611857459118, + "lastModifiedTimestamp": 1611857459118, "childProfileIds": [] } \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/EquipmentExample.json b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/EquipmentExample.json index 232b2b3..5b1a141 100644 --- a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/EquipmentExample.json +++ b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/EquipmentExample.json @@ -32,63 +32,12 @@ "costSavingEventsEnabled": true, "forwardMode": "BRIDGE", "radioMap": { - "is2dot4GHz": { - "model_type": "ElementRadioConfiguration", - "radioType": "is2dot4GHz", - "channelNumber": 6, - "manualChannelNumber": 6, - "backupChannelNumber": 11, - "allowedChannels": [ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11 - ], - "rxCellSizeDb": { - "model_type": "SourceSelectionValue", - "source": "profile", - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "SourceSelectionValue", - "source": "profile", - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "SourceSelectionValue", - "source": "profile", - "value": -90 - }, - "eirpTxPower": { - "model_type": "SourceSelectionValue", - "source": "profile", - "value": 18 - }, - "perimeterDetectionEnabled": true, - "bestAPSteerType": "both", - "deauthAttackDetection": null, - "allowedChannelsPowerLevels": [] - }, "is5GHzU": { "model_type": "ElementRadioConfiguration", "radioType": "is5GHzU", "channelNumber": 149, "manualChannelNumber": 149, "backupChannelNumber": 154, - "allowedChannels": [ - 161, - 149, - 165, - 153, - 157 - ], "rxCellSizeDb": { "model_type": "SourceSelectionValue", "source": "profile", @@ -112,7 +61,215 @@ "perimeterDetectionEnabled": true, "bestAPSteerType": "both", "deauthAttackDetection": null, - "allowedChannelsPowerLevels": [] + "allowedChannelsPowerLevels": [ + { + "model_type": "ChannelPowerLevel", + "channelNumber": 161, + "powerLevel": 18, + "dfs": false, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 100, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 132, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 165, + "powerLevel": 18, + "dfs": false, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 104, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 136, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 108, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 140, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 112, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 144, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 116, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 149, + "powerLevel": 18, + "dfs": false, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 153, + "powerLevel": 18, + "dfs": false, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 157, + "powerLevel": 18, + "dfs": false, + "channelWidth": 80 + } + ] + }, + "is2dot4GHz": { + "model_type": "ElementRadioConfiguration", + "radioType": "is2dot4GHz", + "channelNumber": 6, + "manualChannelNumber": 6, + "backupChannelNumber": 11, + "rxCellSizeDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "eirpTxPower": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": 18 + }, + "perimeterDetectionEnabled": true, + "bestAPSteerType": "both", + "deauthAttackDetection": null, + "allowedChannelsPowerLevels": [ + { + "model_type": "ChannelPowerLevel", + "channelNumber": 1, + "powerLevel": 18, + "dfs": false, + "channelWidth": 20 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 2, + "powerLevel": 18, + "dfs": false, + "channelWidth": 20 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 3, + "powerLevel": 18, + "dfs": false, + "channelWidth": 20 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 4, + "powerLevel": 18, + "dfs": false, + "channelWidth": 20 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 5, + "powerLevel": 18, + "dfs": false, + "channelWidth": 20 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 6, + "powerLevel": 18, + "dfs": false, + "channelWidth": 20 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 7, + "powerLevel": 18, + "dfs": false, + "channelWidth": 20 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 8, + "powerLevel": 18, + "dfs": false, + "channelWidth": 20 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 9, + "powerLevel": 18, + "dfs": false, + "channelWidth": 20 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 10, + "powerLevel": 18, + "dfs": false, + "channelWidth": 20 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 11, + "powerLevel": 18, + "dfs": false, + "channelWidth": 20 + } + ] }, "is5GHzL": { "model_type": "ElementRadioConfiguration", @@ -120,12 +277,6 @@ "channelNumber": 36, "manualChannelNumber": 36, "backupChannelNumber": 44, - "allowedChannels": [ - 48, - 36, - 40, - 44 - ], "rxCellSizeDb": { "model_type": "SourceSelectionValue", "source": "profile", @@ -149,7 +300,64 @@ "perimeterDetectionEnabled": true, "bestAPSteerType": "both", "deauthAttackDetection": null, - "allowedChannelsPowerLevels": [] + "allowedChannelsPowerLevels": [ + { + "model_type": "ChannelPowerLevel", + "channelNumber": 52, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 36, + "powerLevel": 18, + "dfs": false, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 56, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 40, + "powerLevel": 18, + "dfs": false, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 60, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 44, + "powerLevel": 18, + "dfs": false, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 64, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 48, + "powerLevel": 18, + "dfs": false, + "channelWidth": 80 + } + ] } }, "advancedRadioMap": { @@ -256,6 +464,6 @@ "addressAsString": "24:f5:a2:ef:2e:53" }, "serial": "21P10C68818122", - "createdTimestamp": 0, - "lastModifiedTimestamp": 1611264546193 + "createdTimestamp": 1611857503082, + "lastModifiedTimestamp": 1611857505529 } \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileCaptive.json b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileCaptive.json index eaecedd..0337c36 100644 --- a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileCaptive.json +++ b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileCaptive.json @@ -18,7 +18,7 @@ "model_type": "ManagedFileInfo", "md5checksum": null, "lastModifiedTimestamp": null, - "apExportUrl": "tip-logo-mobile.png", + "apExportUrl": "/filestore/tip-logo-mobile", "fileCategory": "CaptivePortalLogo", "fileType": "PNG", "altSlot": false @@ -27,7 +27,7 @@ "model_type": "ManagedFileInfo", "md5checksum": null, "lastModifiedTimestamp": null, - "apExportUrl": "tip-logo.png", + "apExportUrl": "/filestore/tip-logo", "fileCategory": "CaptivePortalBackground", "fileType": "PNG", "altSlot": false @@ -46,7 +46,7 @@ "macAllowList": [], "profileType": "captive_portal" }, - "createdTimestamp": 1611779680397, - "lastModifiedTimestamp": 1611779680397, + "createdTimestamp": 1611857459118, + "lastModifiedTimestamp": 1611857459118, "childProfileIds": [] } \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker/app/opensync/EquipmentExample.json b/opensync-gateway-static-docker/src/main/docker/app/opensync/EquipmentExample.json index 232b2b3..5b1a141 100644 --- a/opensync-gateway-static-docker/src/main/docker/app/opensync/EquipmentExample.json +++ b/opensync-gateway-static-docker/src/main/docker/app/opensync/EquipmentExample.json @@ -32,63 +32,12 @@ "costSavingEventsEnabled": true, "forwardMode": "BRIDGE", "radioMap": { - "is2dot4GHz": { - "model_type": "ElementRadioConfiguration", - "radioType": "is2dot4GHz", - "channelNumber": 6, - "manualChannelNumber": 6, - "backupChannelNumber": 11, - "allowedChannels": [ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11 - ], - "rxCellSizeDb": { - "model_type": "SourceSelectionValue", - "source": "profile", - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "SourceSelectionValue", - "source": "profile", - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "SourceSelectionValue", - "source": "profile", - "value": -90 - }, - "eirpTxPower": { - "model_type": "SourceSelectionValue", - "source": "profile", - "value": 18 - }, - "perimeterDetectionEnabled": true, - "bestAPSteerType": "both", - "deauthAttackDetection": null, - "allowedChannelsPowerLevels": [] - }, "is5GHzU": { "model_type": "ElementRadioConfiguration", "radioType": "is5GHzU", "channelNumber": 149, "manualChannelNumber": 149, "backupChannelNumber": 154, - "allowedChannels": [ - 161, - 149, - 165, - 153, - 157 - ], "rxCellSizeDb": { "model_type": "SourceSelectionValue", "source": "profile", @@ -112,7 +61,215 @@ "perimeterDetectionEnabled": true, "bestAPSteerType": "both", "deauthAttackDetection": null, - "allowedChannelsPowerLevels": [] + "allowedChannelsPowerLevels": [ + { + "model_type": "ChannelPowerLevel", + "channelNumber": 161, + "powerLevel": 18, + "dfs": false, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 100, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 132, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 165, + "powerLevel": 18, + "dfs": false, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 104, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 136, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 108, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 140, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 112, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 144, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 116, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 149, + "powerLevel": 18, + "dfs": false, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 153, + "powerLevel": 18, + "dfs": false, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 157, + "powerLevel": 18, + "dfs": false, + "channelWidth": 80 + } + ] + }, + "is2dot4GHz": { + "model_type": "ElementRadioConfiguration", + "radioType": "is2dot4GHz", + "channelNumber": 6, + "manualChannelNumber": 6, + "backupChannelNumber": 11, + "rxCellSizeDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "eirpTxPower": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": 18 + }, + "perimeterDetectionEnabled": true, + "bestAPSteerType": "both", + "deauthAttackDetection": null, + "allowedChannelsPowerLevels": [ + { + "model_type": "ChannelPowerLevel", + "channelNumber": 1, + "powerLevel": 18, + "dfs": false, + "channelWidth": 20 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 2, + "powerLevel": 18, + "dfs": false, + "channelWidth": 20 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 3, + "powerLevel": 18, + "dfs": false, + "channelWidth": 20 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 4, + "powerLevel": 18, + "dfs": false, + "channelWidth": 20 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 5, + "powerLevel": 18, + "dfs": false, + "channelWidth": 20 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 6, + "powerLevel": 18, + "dfs": false, + "channelWidth": 20 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 7, + "powerLevel": 18, + "dfs": false, + "channelWidth": 20 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 8, + "powerLevel": 18, + "dfs": false, + "channelWidth": 20 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 9, + "powerLevel": 18, + "dfs": false, + "channelWidth": 20 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 10, + "powerLevel": 18, + "dfs": false, + "channelWidth": 20 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 11, + "powerLevel": 18, + "dfs": false, + "channelWidth": 20 + } + ] }, "is5GHzL": { "model_type": "ElementRadioConfiguration", @@ -120,12 +277,6 @@ "channelNumber": 36, "manualChannelNumber": 36, "backupChannelNumber": 44, - "allowedChannels": [ - 48, - 36, - 40, - 44 - ], "rxCellSizeDb": { "model_type": "SourceSelectionValue", "source": "profile", @@ -149,7 +300,64 @@ "perimeterDetectionEnabled": true, "bestAPSteerType": "both", "deauthAttackDetection": null, - "allowedChannelsPowerLevels": [] + "allowedChannelsPowerLevels": [ + { + "model_type": "ChannelPowerLevel", + "channelNumber": 52, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 36, + "powerLevel": 18, + "dfs": false, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 56, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 40, + "powerLevel": 18, + "dfs": false, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 60, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 44, + "powerLevel": 18, + "dfs": false, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 64, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 48, + "powerLevel": 18, + "dfs": false, + "channelWidth": 80 + } + ] } }, "advancedRadioMap": { @@ -256,6 +464,6 @@ "addressAsString": "24:f5:a2:ef:2e:53" }, "serial": "21P10C68818122", - "createdTimestamp": 0, - "lastModifiedTimestamp": 1611264546193 + "createdTimestamp": 1611857503082, + "lastModifiedTimestamp": 1611857505529 } \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileCaptive.json b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileCaptive.json index eaecedd..0337c36 100644 --- a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileCaptive.json +++ b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileCaptive.json @@ -18,7 +18,7 @@ "model_type": "ManagedFileInfo", "md5checksum": null, "lastModifiedTimestamp": null, - "apExportUrl": "tip-logo-mobile.png", + "apExportUrl": "/filestore/tip-logo-mobile", "fileCategory": "CaptivePortalLogo", "fileType": "PNG", "altSlot": false @@ -27,7 +27,7 @@ "model_type": "ManagedFileInfo", "md5checksum": null, "lastModifiedTimestamp": null, - "apExportUrl": "tip-logo.png", + "apExportUrl": "/filestore/tip-logo", "fileCategory": "CaptivePortalBackground", "fileType": "PNG", "altSlot": false @@ -46,7 +46,7 @@ "macAllowList": [], "profileType": "captive_portal" }, - "createdTimestamp": 1611779680397, - "lastModifiedTimestamp": 1611779680397, + "createdTimestamp": 1611857459118, + "lastModifiedTimestamp": 1611857459118, "childProfileIds": [] } \ No newline at end of file diff --git a/opensync-gateway-static-process/src/main/resources/app/opensync/EquipmentExample.json b/opensync-gateway-static-process/src/main/resources/app/opensync/EquipmentExample.json index 232b2b3..5b1a141 100644 --- a/opensync-gateway-static-process/src/main/resources/app/opensync/EquipmentExample.json +++ b/opensync-gateway-static-process/src/main/resources/app/opensync/EquipmentExample.json @@ -32,63 +32,12 @@ "costSavingEventsEnabled": true, "forwardMode": "BRIDGE", "radioMap": { - "is2dot4GHz": { - "model_type": "ElementRadioConfiguration", - "radioType": "is2dot4GHz", - "channelNumber": 6, - "manualChannelNumber": 6, - "backupChannelNumber": 11, - "allowedChannels": [ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11 - ], - "rxCellSizeDb": { - "model_type": "SourceSelectionValue", - "source": "profile", - "value": -90 - }, - "probeResponseThresholdDb": { - "model_type": "SourceSelectionValue", - "source": "profile", - "value": -90 - }, - "clientDisconnectThresholdDb": { - "model_type": "SourceSelectionValue", - "source": "profile", - "value": -90 - }, - "eirpTxPower": { - "model_type": "SourceSelectionValue", - "source": "profile", - "value": 18 - }, - "perimeterDetectionEnabled": true, - "bestAPSteerType": "both", - "deauthAttackDetection": null, - "allowedChannelsPowerLevels": [] - }, "is5GHzU": { "model_type": "ElementRadioConfiguration", "radioType": "is5GHzU", "channelNumber": 149, "manualChannelNumber": 149, "backupChannelNumber": 154, - "allowedChannels": [ - 161, - 149, - 165, - 153, - 157 - ], "rxCellSizeDb": { "model_type": "SourceSelectionValue", "source": "profile", @@ -112,7 +61,215 @@ "perimeterDetectionEnabled": true, "bestAPSteerType": "both", "deauthAttackDetection": null, - "allowedChannelsPowerLevels": [] + "allowedChannelsPowerLevels": [ + { + "model_type": "ChannelPowerLevel", + "channelNumber": 161, + "powerLevel": 18, + "dfs": false, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 100, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 132, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 165, + "powerLevel": 18, + "dfs": false, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 104, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 136, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 108, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 140, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 112, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 144, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 116, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 149, + "powerLevel": 18, + "dfs": false, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 153, + "powerLevel": 18, + "dfs": false, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 157, + "powerLevel": 18, + "dfs": false, + "channelWidth": 80 + } + ] + }, + "is2dot4GHz": { + "model_type": "ElementRadioConfiguration", + "radioType": "is2dot4GHz", + "channelNumber": 6, + "manualChannelNumber": 6, + "backupChannelNumber": 11, + "rxCellSizeDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "probeResponseThresholdDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "clientDisconnectThresholdDb": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": -90 + }, + "eirpTxPower": { + "model_type": "SourceSelectionValue", + "source": "profile", + "value": 18 + }, + "perimeterDetectionEnabled": true, + "bestAPSteerType": "both", + "deauthAttackDetection": null, + "allowedChannelsPowerLevels": [ + { + "model_type": "ChannelPowerLevel", + "channelNumber": 1, + "powerLevel": 18, + "dfs": false, + "channelWidth": 20 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 2, + "powerLevel": 18, + "dfs": false, + "channelWidth": 20 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 3, + "powerLevel": 18, + "dfs": false, + "channelWidth": 20 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 4, + "powerLevel": 18, + "dfs": false, + "channelWidth": 20 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 5, + "powerLevel": 18, + "dfs": false, + "channelWidth": 20 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 6, + "powerLevel": 18, + "dfs": false, + "channelWidth": 20 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 7, + "powerLevel": 18, + "dfs": false, + "channelWidth": 20 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 8, + "powerLevel": 18, + "dfs": false, + "channelWidth": 20 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 9, + "powerLevel": 18, + "dfs": false, + "channelWidth": 20 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 10, + "powerLevel": 18, + "dfs": false, + "channelWidth": 20 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 11, + "powerLevel": 18, + "dfs": false, + "channelWidth": 20 + } + ] }, "is5GHzL": { "model_type": "ElementRadioConfiguration", @@ -120,12 +277,6 @@ "channelNumber": 36, "manualChannelNumber": 36, "backupChannelNumber": 44, - "allowedChannels": [ - 48, - 36, - 40, - 44 - ], "rxCellSizeDb": { "model_type": "SourceSelectionValue", "source": "profile", @@ -149,7 +300,64 @@ "perimeterDetectionEnabled": true, "bestAPSteerType": "both", "deauthAttackDetection": null, - "allowedChannelsPowerLevels": [] + "allowedChannelsPowerLevels": [ + { + "model_type": "ChannelPowerLevel", + "channelNumber": 52, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 36, + "powerLevel": 18, + "dfs": false, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 56, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 40, + "powerLevel": 18, + "dfs": false, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 60, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 44, + "powerLevel": 18, + "dfs": false, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 64, + "powerLevel": 18, + "dfs": true, + "channelWidth": 80 + }, + { + "model_type": "ChannelPowerLevel", + "channelNumber": 48, + "powerLevel": 18, + "dfs": false, + "channelWidth": 80 + } + ] } }, "advancedRadioMap": { @@ -256,6 +464,6 @@ "addressAsString": "24:f5:a2:ef:2e:53" }, "serial": "21P10C68818122", - "createdTimestamp": 0, - "lastModifiedTimestamp": 1611264546193 + "createdTimestamp": 1611857503082, + "lastModifiedTimestamp": 1611857505529 } \ No newline at end of file diff --git a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileCaptive.json b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileCaptive.json index eaecedd..0337c36 100644 --- a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileCaptive.json +++ b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileCaptive.json @@ -18,7 +18,7 @@ "model_type": "ManagedFileInfo", "md5checksum": null, "lastModifiedTimestamp": null, - "apExportUrl": "tip-logo-mobile.png", + "apExportUrl": "/filestore/tip-logo-mobile", "fileCategory": "CaptivePortalLogo", "fileType": "PNG", "altSlot": false @@ -27,7 +27,7 @@ "model_type": "ManagedFileInfo", "md5checksum": null, "lastModifiedTimestamp": null, - "apExportUrl": "tip-logo.png", + "apExportUrl": "/filestore/tip-logo", "fileCategory": "CaptivePortalBackground", "fileType": "PNG", "altSlot": false @@ -46,7 +46,7 @@ "macAllowList": [], "profileType": "captive_portal" }, - "createdTimestamp": 1611779680397, - "lastModifiedTimestamp": 1611779680397, + "createdTimestamp": 1611857459118, + "lastModifiedTimestamp": 1611857459118, "childProfileIds": [] } \ No newline at end of file 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 c8cca05..4c949e5 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 @@ -195,7 +195,6 @@ public class OvsdbDao { @org.springframework.beans.factory.annotation.Value("${tip.wlan.externalFileStoreURL:https://localhost:9096}") private String externalFileStoreURL; - public static final String FILESTORE = "filestore/"; public static final String HTTP = "http"; public static final String ovsdbName = "Open_vSwitch"; @@ -3861,18 +3860,18 @@ public class OvsdbDao { .put("username_password_file", ManagedFileInfo .resolveWithPopulatedHostname( - captiveProfileDetails.getUsernamePasswordFile(), FILESTORE) + captiveProfileDetails.getUsernamePasswordFile(), externalFileStoreURL) .getApExportUrl()); } if (captiveProfileDetails.getLogoFile() != null) { captiveMap.put("splash_page_logo", ManagedFileInfo - .resolveWithPopulatedHostname(captiveProfileDetails.getLogoFile(), FILESTORE) + .resolveWithPopulatedHostname(captiveProfileDetails.getLogoFile(), externalFileStoreURL) .getApExportUrl()); } if (captiveProfileDetails.getBackgroundFile() != null) { captiveMap.put("splash_page_background_logo", ManagedFileInfo - .resolveWithPopulatedHostname(captiveProfileDetails.getBackgroundFile(), FILESTORE) + .resolveWithPopulatedHostname(captiveProfileDetails.getBackgroundFile(), externalFileStoreURL) .getApExportUrl()); } LOG.debug("captiveMap {}", captiveMap);