From 72ae8871d1d4a84449b62e80820847493f2ab6ee Mon Sep 17 00:00:00 2001 From: Dmitry Toptygin Date: Thu, 25 Jun 2020 17:48:49 -0400 Subject: [PATCH] configure SSID on AP only if corresponding WifiRadio is enabled --- .../wlan/opensync/ovsdb/dao/OvsdbDao.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) 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 8a20227..cdabba3 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 @@ -2165,11 +2165,18 @@ public class OvsdbDao { if (!provisionedWifiVifConfigs.containsKey(ifName + "_" + ssidConfig.getSsid())) { try { - configureSingleSsid(ovsdbClient, bridgeNameVifInterfaces, ifName, ssidConfig.getSsid(), - ssidBroadcast, security, freqBand, - ssidConfig.getVlanId(), rrmEnabled, enable80211r, minHwMode, enabled, keyRefresh, - uapsdEnabled, apBridge, ssidConfig.getForwardMode(), gateway, inet, dns, - ipAssignScheme); + WifiRadioConfigInfo wci = provisionedWifiRadioConfigs.get(ifName); + if(wci!=null && wci.enabled) { + configureSingleSsid(ovsdbClient, bridgeNameVifInterfaces, ifName, ssidConfig.getSsid(), + ssidBroadcast, security, freqBand, + ssidConfig.getVlanId(), rrmEnabled, enable80211r, minHwMode, enabled, keyRefresh, + uapsdEnabled, apBridge, ssidConfig.getForwardMode(), gateway, inet, dns, + ipAssignScheme); + } else if(wci!=null) { + LOG.warn("SSID {} wants to be on interface {} but that radio is disabled, will not configure ssid", ssidConfig.getSsid(), ifName); + } else { + LOG.warn("SSID {} wants to be on interface {} but there is no radio for that interface, will not configure ssid", ssidConfig.getSsid(), ifName); + } } catch (IllegalStateException e) { // could not provision this SSID, but still can go on