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-1171: Organization ID or RCOI config failure

Browse Source
This commit is contained in:
Mike Hansen
2020-12-09 16:46:38 -05:00
parent 08b9b62f81
commit 40c283ba89
6 changed files with 40 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
opensync-ext-static/src/main/resources/ProfileIdProvider.json
View File

@@ -120,12 +120,10 @@
"asDuple": "fra:Exemples de services rogers"
}
],
"roamingOi": [
1,
2,
3,
4
],
"roamingOi": [
"BAA2D00100",
"BAA2D00000"
],
"profileType": "passpoint_osu_id_provider"
},
"createdTimestamp": 1606778370345,
@@ -255,11 +253,10 @@
}
],
"roamingOi": [
1,
2,
3,
4
],
"004096",
"005014",
"F4F5E8F5F4"
],
"profileType": "passpoint_osu_id_provider"
},
"createdTimestamp": 1606778370351,

19
opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileIdProvider.json
View File

@@ -120,12 +120,10 @@
"asDuple": "fra:Exemples de services rogers"
}
],
"roamingOi": [
1,
2,
3,
4
],
"roamingOi": [
"BAA2D00100",
"BAA2D00000"
],
"profileType": "passpoint_osu_id_provider"
},
"createdTimestamp": 1606778370345,
@@ -255,11 +253,10 @@
}
],
"roamingOi": [
1,
2,
3,
4
],
"004096",
"005014",
"F4F5E8F5F4"
],
"profileType": "passpoint_osu_id_provider"
},
"createdTimestamp": 1606778370351,

19
opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileIdProvider.json
View File

@@ -120,12 +120,10 @@
"asDuple": "fra:Exemples de services rogers"
}
],
"roamingOi": [
1,
2,
3,
4
],
"roamingOi": [
"BAA2D00100",
"BAA2D00000"
],
"profileType": "passpoint_osu_id_provider"
},
"createdTimestamp": 1606778370345,
@@ -255,11 +253,10 @@
}
],
"roamingOi": [
1,
2,
3,
4
],
"004096",
"005014",
"F4F5E8F5F4"
],
"profileType": "passpoint_osu_id_provider"
},
"createdTimestamp": 1606778370351,

19
opensync-gateway-static-process/src/main/resources/app/opensync/ProfileIdProvider.json
View File

@@ -120,12 +120,10 @@
"asDuple": "fra:Exemples de services rogers"
}
],
"roamingOi": [
1,
2,
3,
4
],
"roamingOi": [
"BAA2D00100",
"BAA2D00000"
],
"profileType": "passpoint_osu_id_provider"
},
"createdTimestamp": 1606778370345,
@@ -255,11 +253,10 @@
}
],
"roamingOi": [
1,
2,
3,
4
],
"004096",
"005014",
"F4F5E8F5F4"
],
"profileType": "passpoint_osu_id_provider"
},
"createdTimestamp": 1606778370351,

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

@@ -3713,11 +3713,9 @@ public class OvsdbDao {
Hotspot20OsuProviders hotspot2OsuProviders = osuProviders
.get(providerProfile.getOsuServerUri());
StringBuffer roamingOiOctets = new StringBuffer();
providerProfile.getRoamingOi().stream().forEach(o -> {
roamingOiOctets.append(Byte.toString(o));
roamingOis.add(new Atom<>(o));
});
roamingOis.add(new Atom<>(roamingOiOctets.toString()));
osuProvidersUuids.add(hotspot2OsuProviders.uuid);
osuIconUuids.addAll(hotspot2OsuProviders.osuIcons);
domainNames.add(new Atom<>(providerProfile.getDomainName()));

13
opensync-gateway/src/test/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDaoTestUtilities.java
View File

@@ -121,11 +121,12 @@ public class OvsdbDaoTestUtilities {
mccMncList.add(passpointMccMnc);
Set<String> naiRealms = new HashSet<>();
naiRealms.add(naiRealm);
List<Byte> roamingOi = new ArrayList<>();
roamingOi.add(Byte.valueOf("1"));
roamingOi.add(Byte.valueOf("2"));
roamingOi.add(Byte.valueOf("3"));
roamingOi.add(Byte.valueOf("4"));
List<String> roamingOi = new ArrayList<>();
roamingOi.add("BAA2D00100");
roamingOi.add("BAA2D00000");
roamingOi.add("F4F5E8F5F4");
roamingOi.add("005014");
roamingOi.add("004096");
hotspot20IdProviderProfile = createOsuProviderProfile(customerId, hotspot20IdProviderProfile, mccMncList,
naiRealms, "https://example.com/osu/" + naiRealm.split("/.com")[0], naiRealm.split(".com")[0], naiRealm,
roamingOi);
@@ -211,7 +212,7 @@ public class OvsdbDaoTestUtilities {
static Profile createOsuProviderProfile(int customerId, Profile hotspot20IdProviderProfile,
List<PasspointMccMnc> mccMncList, Set<String> realms, String serverUri, String suffix, String domainName,
List<Byte> roamingOi) {
List<String> roamingOi) {
PasspointOsuProviderProfile passpointIdProviderProfile = PasspointOsuProviderProfile.createWithDefaults();