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

WIFI-908: Provision Hotspot20_Config in opensync database via opensync gateway. Set the roaming_oi values as hex strings

Browse Source
This commit is contained in:
Mike Hansen
2020-11-12 18:31:55 -05:00
parent e31b8ebd12
commit a7af164bb1
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1733,7 +1733,7 @@ public class OvsdbDao {
operations.clear(); operations.clear();
for (Row row : ((SelectResult) result[0]).getRows()) { for (Row row : ((SelectResult) result[0]).getRows()) {
String ifName = row.getStringColumn("if_name"); String ifName = row.getStringColumn("if_name");
if (!greTunnelName.equals(ifName)) { if (greTunnelName != null && !greTunnelName.equals(ifName)) {
List<Condition> deleteCondition = new ArrayList<>(); List<Condition> deleteCondition = new ArrayList<>();
deleteCondition.add(new Condition("if_name", Function.EQUALS, new Atom<>(ifName))); deleteCondition.add(new Condition("if_name", Function.EQUALS, new Atom<>(ifName)));
operations.add(new Delete(wifiInetConfigDbTable, deleteCondition)); operations.add(new Delete(wifiInetConfigDbTable, deleteCondition));
@@ -3227,9 +3227,9 @@ public class OvsdbDao {
} }
configureSingleSsid(ovsdbClient, ifName, ssidConfig.getSsid(), ssidBroadcast, security, freqBand, configureSingleSsid(ovsdbClient, ifName, ssidConfig.getSsid(), ssidBroadcast, security, freqBand,
ssidConfig.getVlanId() != null ? ssidConfig.getVlanId() : 1, rrmEnabled, enable80211r, mobilityDomain, enable80211v, ssidConfig.getVlanId() != null ? ssidConfig.getVlanId() : 1, rrmEnabled, enable80211r,
enable80211k, minHwMode, enabled, keyRefresh, uapsdEnabled, apBridge, mobilityDomain, enable80211v, enable80211k, minHwMode, enabled, keyRefresh, uapsdEnabled,
ssidConfig.getForwardMode(), gateway, inet, dns, ipAssignScheme, macBlockList, apBridge, ssidConfig.getForwardMode(), gateway, inet, dns, ipAssignScheme, macBlockList,
rateLimitEnable, ssidDlLimit, ssidUlLimit, clientDlLimit, clientUlLimit, rtsCtsThreshold, rateLimitEnable, ssidDlLimit, ssidUlLimit, clientDlLimit, clientUlLimit, rtsCtsThreshold,
fragThresholdBytes, dtimPeriod, captiveMap, walledGardenAllowlist, bonjourServiceMap, fragThresholdBytes, dtimPeriod, captiveMap, walledGardenAllowlist, bonjourServiceMap,
isUpdate); isUpdate);
@@ -3439,7 +3439,8 @@ public class OvsdbDao {
RadiusProfile radiusProfileDetails = ((RadiusProfile) profileRadius.getDetails()); RadiusProfile radiusProfileDetails = ((RadiusProfile) profileRadius.getDetails());
RadiusServiceRegion radiusServiceRegion = radiusProfileDetails.findServiceRegion(region); RadiusServiceRegion radiusServiceRegion = radiusProfileDetails.findServiceRegion(region);
if (radiusServiceRegion != null) { if (radiusServiceRegion != null) {
radiusServerList = radiusServiceRegion.findServerConfiguration(ssidConfig.getRadiusAccountingServiceName()); radiusServerList = radiusServiceRegion
.findServerConfiguration(ssidConfig.getRadiusAccountingServiceName());
if (radiusServerList != null && radiusServerList.size() > 0) { if (radiusServerList != null && radiusServerList.size() > 0) {
RadiusServer rServer = radiusServerList.get(0); RadiusServer rServer = radiusServerList.get(0);
if (rServer != null) { if (rServer != null) {
@@ -3720,7 +3721,7 @@ public class OvsdbDao {
StringBuffer roamingOiOctets = new StringBuffer(); StringBuffer roamingOiOctets = new StringBuffer();
providerProfile.getRoamingOi().stream().forEach(o -> { providerProfile.getRoamingOi().stream().forEach(o -> {
roamingOiOctets.append(Byte.toString(o)); roamingOiOctets.append(Integer.toHexString(Byte.toUnsignedInt(o)));
}); });
roamingOis.add(new Atom<>(roamingOiOctets.toString())); roamingOis.add(new Atom<>(roamingOiOctets.toString()));
osuProvidersUuids.add(hotspot2OsuProviders.uuid); osuProvidersUuids.add(hotspot2OsuProviders.uuid);