scottk/wlan-cloud-opensync-controller
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-opensync-controller.git synced 2025-11-20 11:54:58 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Revert "Adding RF Profile changes and updating static"

Browse Source 
This reverts commit 71c41bb892.
This commit is contained in:
ralphlee
2020-09-22 17:01:32 -04:00
parent 6ea19d9cbf
commit 9cc3b96436
8 changed files with 52 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java
View File

@@ -22,6 +22,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import com.telecominfraproject.wlan.client.models.ClientType;
import com.telecominfraproject.wlan.core.model.equipment.AutoOrManualValue;
import com.telecominfraproject.wlan.core.model.equipment.ChannelBandwidth;
import com.telecominfraproject.wlan.core.model.equipment.MacAddress;
@@ -60,8 +61,6 @@ import com.telecominfraproject.wlan.profile.captiveportal.models.CaptivePortalAu
import com.telecominfraproject.wlan.profile.captiveportal.models.CaptivePortalConfiguration;
import com.telecominfraproject.wlan.profile.captiveportal.models.ManagedFileInfo;
import com.telecominfraproject.wlan.profile.models.Profile;
import com.telecominfraproject.wlan.profile.network.models.RfConfiguration;
import com.telecominfraproject.wlan.profile.network.models.RfElementConfiguration;
import com.telecominfraproject.wlan.profile.radius.models.RadiusProfile;
import com.telecominfraproject.wlan.profile.radius.models.RadiusServer;
import com.telecominfraproject.wlan.profile.radius.models.RadiusServiceRegion;
@@ -1710,18 +1709,15 @@ public class OvsdbDao {
// radios on this AP
// ;-)
RfConfiguration rfConfig = (RfConfiguration) opensyncAPConfig.getRfProfile().getDetails();
ApElementConfiguration apElementConfiguration = (ApElementConfiguration) opensyncAPConfig.getCustomerEquipment()
.getDetails();
for (RadioType radioType : apElementConfiguration.getRadioMap().keySet()) {
Map<String, String> hwConfig = new HashMap<>();
RfElementConfiguration rfElementConfig = rfConfig.getRfConfig(radioType);
ElementRadioConfiguration elementRadioConfig = apElementConfiguration.getRadioMap().get(radioType);
int channel = elementRadioConfig.getChannelNumber();
ChannelBandwidth bandwidth = rfElementConfig.getChannelBandwidth();
ChannelBandwidth bandwidth = elementRadioConfig.getChannelBandwidth();
String ht_mode = null;
switch (bandwidth) {
case is20MHz:
@@ -1742,10 +1738,10 @@ public class OvsdbDao {
default:
ht_mode = null;
}
rfElementConfig.getAutoChannelSelection();
elementRadioConfig.getAutoChannelSelection();
RadioConfiguration radioConfig = apElementConfiguration.getAdvancedRadioMap().get(radioType);
int beaconInterval = rfElementConfig.getBeaconInterval();
int beaconInterval = radioConfig.getBeaconInterval();
boolean enabled = radioConfig.getRadioAdminState().equals(StateSetting.enabled);
int txPower = 0;