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

WIFI-908: Provision Hotspot20_Config in opensync database via opensync gateway, using new Hotspot/passpoint profiles

Browse Source 
NAI realms lineup with changes in profile models, from WIFI-872.
This commit is contained in:
Mike Hansen
2020-10-14 10:09:37 -04:00
parent e9553ae54f
commit 764fb8caf7
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,11 +82,11 @@ import com.telecominfraproject.wlan.profile.passpoint.models.IPv4PasspointAddres
import com.telecominfraproject.wlan.profile.passpoint.models.IPv6PasspointAddressType;
import com.telecominfraproject.wlan.profile.passpoint.models.MccMnc;
import com.telecominfraproject.wlan.profile.passpoint.operator.models.OperatorProfile;
import com.telecominfraproject.wlan.profile.passpoint.provider.models.AuthenticationParameterTypes;
import com.telecominfraproject.wlan.profile.passpoint.provider.models.CredentialType;
import com.telecominfraproject.wlan.profile.passpoint.provider.models.EapMethods;
import com.telecominfraproject.wlan.profile.passpoint.provider.models.Hotspot20IdProviderProfile;
import com.telecominfraproject.wlan.profile.passpoint.provider.models.NonEapInnerAuthenticationTypes;
import com.telecominfraproject.wlan.profile.passpoint.provider.models.NaiRealmEapAuthInnerNonEap;
import com.telecominfraproject.wlan.profile.passpoint.provider.models.NaiRealmEapAuthParam;
import com.telecominfraproject.wlan.profile.passpoint.provider.models.NaiRealmEapCredType;
import com.telecominfraproject.wlan.profile.passpoint.provider.models.OsuIcon;
import com.telecominfraproject.wlan.profile.passpoint.venue.models.VenueName;
import com.telecominfraproject.wlan.profile.passpoint.venue.models.VenueProfile;
@@ -3859,12 +3859,12 @@ public class OvsdbDao {
for (String credential : e.getValue()) {
String[] keyValue = credential.split(":");
String keyId = String.valueOf(AuthenticationParameterTypes.getByName(keyValue[0]).getId());
String keyId = String.valueOf(NaiRealmEapAuthParam.getByName(keyValue[0]).getId());
if (keyValue[0]
.equals(AuthenticationParameterTypes.non_eap_inner_authentication_type.getName())) {
.equals(NaiRealmEapAuthParam.NAI_REALM_EAP_AUTH_NON_EAP_INNER_AUTH.getName())) {
String valueId = String
.valueOf(NonEapInnerAuthenticationTypes.getByName(keyValue[1]).getId());
.valueOf(NaiRealmEapAuthInnerNonEap.getByName(keyValue[1]).getId());
naiBuffer.append("[");
naiBuffer.append(keyId);
@@ -3872,11 +3872,11 @@ public class OvsdbDao {
naiBuffer.append(valueId);
naiBuffer.append("]");
} else if (keyValue[0].equals(AuthenticationParameterTypes.credential_type.getName())
} else if (keyValue[0].equals(NaiRealmEapAuthParam.NAI_REALM_EAP_AUTH_CRED_TYPE.getName())
|| keyValue[0].equals(
AuthenticationParameterTypes.tunneled_eap_method_credential_type.getName())) {
NaiRealmEapAuthParam.NAI_REALM_EAP_AUTH_TUNNELED_CRED_TYPE.getName())) {
String valueId = String.valueOf(CredentialType.getByName(keyValue[1]).getId());
String valueId = String.valueOf(NaiRealmEapCredType.getByName(keyValue[1]).getId());
naiBuffer.append("[");
naiBuffer.append(keyId);