From e1f84648c8d0f52618d53c460b545e84566043c3 Mon Sep 17 00:00:00 2001 From: Mike Hansen Date: Wed, 3 Feb 2021 13:51:39 -0500 Subject: [PATCH] Revert WIFI-831: Cloud BE: support enable or disable 802.11b modulation rates until downstream ready --- .../src/main/resources/ProfileSsid.json | 5 ++--- .../app/opensync/ProfileSsid.json | 5 ++--- .../main/docker/app/opensync/ProfileSsid.json | 5 ++--- .../resources/app/opensync/ProfileSsid.json | 5 ++--- .../wlan/opensync/ovsdb/dao/OvsdbDao.java | 22 ++++--------------- 5 files changed, 12 insertions(+), 30 deletions(-) diff --git a/opensync-ext-static/src/main/resources/ProfileSsid.json b/opensync-ext-static/src/main/resources/ProfileSsid.json index 07408fe..e861c39 100644 --- a/opensync-ext-static/src/main/resources/ProfileSsid.json +++ b/opensync-ext-static/src/main/resources/ProfileSsid.json @@ -36,11 +36,10 @@ "enable80211v": null }, "is2dot4GHz": { - "model_type": "RadioBasedSsidConfiguration2g", + "model_type": "RadioBasedSsidConfiguration", "enable80211r": null, "enable80211k": null, - "enable80211v": null, - "enable80211b": false + "enable80211v": null }, "is5GHz": { "model_type": "RadioBasedSsidConfiguration", 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 07408fe..e861c39 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 @@ -36,11 +36,10 @@ "enable80211v": null }, "is2dot4GHz": { - "model_type": "RadioBasedSsidConfiguration2g", + "model_type": "RadioBasedSsidConfiguration", "enable80211r": null, "enable80211k": null, - "enable80211v": null, - "enable80211b": false + "enable80211v": null }, "is5GHz": { "model_type": "RadioBasedSsidConfiguration", 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 07408fe..e861c39 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 @@ -36,11 +36,10 @@ "enable80211v": null }, "is2dot4GHz": { - "model_type": "RadioBasedSsidConfiguration2g", + "model_type": "RadioBasedSsidConfiguration", "enable80211r": null, "enable80211k": null, - "enable80211v": null, - "enable80211b": false + "enable80211v": null }, "is5GHz": { "model_type": "RadioBasedSsidConfiguration", 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 07408fe..e861c39 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 @@ -36,11 +36,10 @@ "enable80211v": null }, "is2dot4GHz": { - "model_type": "RadioBasedSsidConfiguration2g", + "model_type": "RadioBasedSsidConfiguration", "enable80211r": null, "enable80211k": null, - "enable80211v": null, - "enable80211b": false + "enable80211v": null }, "is5GHz": { "model_type": "RadioBasedSsidConfiguration", 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 8ec7d27..314a1fc 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 @@ -93,7 +93,6 @@ import com.telecominfraproject.wlan.profile.rf.models.RfConfiguration; import com.telecominfraproject.wlan.profile.rf.models.RfElementConfiguration; import com.telecominfraproject.wlan.profile.ssid.models.NasIdType; import com.telecominfraproject.wlan.profile.ssid.models.NasIpType; -import com.telecominfraproject.wlan.profile.ssid.models.RadioBasedSsidConfiguration2g; import com.telecominfraproject.wlan.profile.ssid.models.SsidConfiguration; import com.vmware.ovsdb.exception.OvsdbClientException; import com.vmware.ovsdb.protocol.methods.RowUpdate; @@ -2654,7 +2653,7 @@ public class OvsdbDao { int ssidUlLimit, int clientDlLimit, int clientUlLimit, int rtsCtsThreshold, int fragThresholdBytes, int dtimPeriod, Map captiveMap, List walledGardenAllowlist, Map> bonjourServiceMap, String radiusNasId, String radiusNasIp, - String radiusOperatorName, String greTunnelName, Boolean enable80211b) { + String radiusOperatorName, String greTunnelName) { List operations = new ArrayList<>(); Map updateColumns = new HashMap<>(); @@ -2731,7 +2730,7 @@ public class OvsdbDao { configureCustomOptionsForSsid(ovsdbClient, enable80211k, rateLimitEnable, ssidDlLimit, ssidUlLimit, clientDlLimit, clientUlLimit, rtsCtsThreshold, fragThresholdBytes, dtimPeriod, radiusNasId, - radiusNasIp, radiusOperatorName, updateColumns, enable80211b); + radiusNasIp, radiusOperatorName, updateColumns); updateBlockList(updateColumns, macBlockList); Row row = new Row(updateColumns); @@ -2791,12 +2790,11 @@ public class OvsdbDao { * @param radiusNasIp * @param radiusOperatorName * @param updateColumns - * @param enable80211b TODO */ void configureCustomOptionsForSsid(OvsdbClient ovsdbClient, boolean enable80211k, boolean rateLimitEnable, int ssidDlLimit, int ssidUlLimit, int clientDlLimit, int clientUlLimit, int rtsCtsThreshold, int fragThresholdBytes, int dtimPeriod, String radiusNasId, String radiusNasIp, String radiusOperatorName, - Map updateColumns, Boolean enable80211b) { + Map updateColumns) { Map customOptions = new HashMap<>(); configureCustomOptionsForRatesAndLimits(rateLimitEnable, ssidDlLimit, ssidUlLimit, clientDlLimit, clientUlLimit, rtsCtsThreshold, customOptions); @@ -2805,20 +2803,12 @@ public class OvsdbDao { configureCustomOptionsForDtimFragAnd80211k(enable80211k, dtimPeriod, fragThresholdBytes, customOptions); - toggle80211bModulationRates(enable80211b, customOptions); - @SuppressWarnings("unchecked") com.vmware.ovsdb.protocol.operation.notation.Map customMap = com.vmware.ovsdb.protocol.operation.notation.Map .of(customOptions); updateColumns.put("custom_options", customMap); } - protected void toggle80211bModulationRates(Boolean enable80211b, Map customOptions) { - if (enable80211b != null) { - customOptions.put("disable_b_rates", enable80211b ? "0" : "1"); - } - } - /** * * @param enable80211k @@ -3208,7 +3198,6 @@ public class OvsdbDao { // on by default boolean enable80211k = true; // off by default, only applicable for is2do4GHz - Boolean enable80211b = null; if (ssidConfig.getRadioBasedConfigs() != null) { if (ssidConfig.getRadioBasedConfigs().containsKey(radioType) && (ssidConfig.getRadioBasedConfigs().get(radioType) != null)) { @@ -3230,9 +3219,6 @@ public class OvsdbDao { if (ssidConfig.getRadioBasedConfigs().get(radioType).getEnable80211k() != null) { enable80211k = ssidConfig.getRadioBasedConfigs().get(radioType).getEnable80211k(); } - if (radioType.equals(RadioType.is2dot4GHz)) { - enable80211b = ((RadioBasedSsidConfiguration2g)ssidConfig.getRadioBasedConfigs().get(radioType)).getEnable80211b(); - } } } @@ -3298,7 +3284,7 @@ public class OvsdbDao { uapsdEnabled, apBridge, ssidConfig.getForwardMode(), gateway, inet, dns, ipAssignScheme, macBlockList, rateLimitEnable, ssidDlLimit, ssidUlLimit, clientDlLimit, clientUlLimit, rtsCtsThreshold, fragThresholdBytes, dtimPeriod, captiveMap, walledGardenAllowlist, - bonjourServiceMap, radiusNasId, radiusNasIp, radiusOperName, greTunnelName, enable80211b); + bonjourServiceMap, radiusNasId, radiusNasIp, radiusOperName, greTunnelName ); updateVifConfigsSetForRadio(ovsdbClient, ssidConfig.getSsid(), freqBand, vifConfigUuid);