Telecominfraproject/wlan-cloud-opensync-controller
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-opensync-controller.git synced 2026-03-22 04:39:24 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

GW supports captive portal profile

Browse Source
This commit is contained in:
Lynn Shi
2020-07-21 21:55:02 -04:00
parent c2fbf95c32
commit d0c6a81191
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java vendored
View File

@@ -626,7 +626,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
fwImageName = connectNodeInfo.versionMatrix.get("FW_IMAGE_NAME");
}
if (fwVersionName != null && !fwVersionName.equals(fwImageName)) {
if (fwImageName != null && fwVersionName != null && !fwVersionName.equals(fwImageName)) {
fwUpgradeStatusData.setTargetSwVersion(fwImageName);
fwUpgradeStatusData.setUpgradeState(EquipmentUpgradeState.out_of_date);
statusRecord.setDetails(fwUpgradeStatusData);
@@ -739,12 +739,19 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
profileContainer.getChildrenOfType(equipmentConfig.getProfileId(), ProfileType.ssid));
Set<Profile> radiusSet = new HashSet<>();
Set<Long> captiveProfileIds = new HashSet<>();
for (Profile ssidProfile : ret.getSsidProfile()) {
radiusSet.addAll(profileContainer.getChildrenOfType(ssidProfile.getId(), ProfileType.radius));
if (ssidProfile.getDetails() != null) {
Long captivePortId = ((SsidConfiguration)ssidProfile.getDetails()).getCaptivePortalId();
if (captivePortId != null) {
captiveProfileIds.add(captivePortId);
}
}
}
ret.setRadiusProfiles(new ArrayList<>(radiusSet));
ret.setCaptiveProfiles(profileServiceInterface.get(captiveProfileIds));
LOG.debug("ApConfig {}", ret.toString());
} else {