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

WIFI-1175: Passpoint Operator Domain In ID Provider Config Object

Browse Source
This commit is contained in:
Mike Hansen
2020-12-09 19:58:21 -05:00
parent 1d6c356a1a
commit 66035a22ad
8 changed files with 137 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,6 @@
"name": "TipWlan-Passpoint-OSU-Provider", "name": "TipWlan-Passpoint-OSU-Provider",
"details": { "details": {
"model_type": "PasspointOsuProviderProfile", "model_type": "PasspointOsuProviderProfile",
"domainName": "rogers.com",
"mccMncList": [ "mccMncList": [
{ {
"model_type": "PasspointMccMnc", "model_type": "PasspointMccMnc",
@@ -139,7 +138,6 @@
"name": "TipWlan-Passpoint-OSU-Provider-2", "name": "TipWlan-Passpoint-OSU-Provider-2",
"details": { "details": {
"model_type": "PasspointOsuProviderProfile", "model_type": "PasspointOsuProviderProfile",
"domainName": "telus.com",
"mccMncList": [ "mccMncList": [
{ {
"model_type": "PasspointMccMnc", "model_type": "PasspointMccMnc",

75
opensync-ext-static/src/main/resources/ProfileOperator.json
View File

@@ -1,37 +1,42 @@
[ [
{ {
"model_type": "Profile", "model_type": "Profile",
"id": 17, "id": 17,
"customerId": 2, "customerId": 2,
"profileType": "passpoint_operator", "profileType": "passpoint_operator",
"name": "TipWlan-Passpoint-Operator", "name": "TipWlan-Passpoint-Operator",
"details": { "details": {
"model_type": "PasspointOperatorProfile", "model_type": "PasspointOperatorProfile",
"serverOnlyAuthenticatedL2EncryptionNetwork": false, "serverOnlyAuthenticatedL2EncryptionNetwork": false,
"x509CertificateLocation": "/etc/ca.pem", "x509CertificateLocation": "/etc/ca.pem",
"operatorFriendlyName": [ "operatorFriendlyName": [
{ {
"model_type": "PasspointDuple", "model_type": "PasspointDuple",
"locale": "en_CA", "locale": "en_CA",
"dupleIso3Language": "eng", "dupleIso3Language": "eng",
"dupleName": "Default friendly passpoint_operator name", "dupleName": "Default friendly passpoint_operator name",
"defaultDupleSeparator": ":", "defaultDupleSeparator": ":",
"asDuple": "eng:Default friendly passpoint_operator name" "asDuple": "eng:Default friendly passpoint_operator name"
}, },
{ {
"model_type": "PasspointDuple", "model_type": "PasspointDuple",
"locale": "fr_CA", "locale": "fr_CA",
"dupleIso3Language": "fra", "dupleIso3Language": "fra",
"dupleName": "Nom de l'opérateur convivial par défaut", "dupleName": "Nom de l'opérateur convivial par défaut",
"defaultDupleSeparator": ":", "defaultDupleSeparator": ":",
"asDuple": "fra:Nom de l'opérateur convivial par défaut" "asDuple": "fra:Nom de l'opérateur convivial par défaut"
} }
], ],
"profileType": "passpoint_operator" "domainNameList": [
}, "telus.com",
"createdTimestamp": 1606778369945, "rogers.com",
"lastModifiedTimestamp": 1606778369945, "bell.ca"
"childProfileIds": [ ],
] "profileType": "passpoint_operator"
} },
"createdTimestamp": 1606778369945,
"lastModifiedTimestamp": 1606778369945,
"childProfileIds": [
]
}
] ]

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

@@ -7,7 +7,6 @@
"name": "TipWlan-Passpoint-OSU-Provider", "name": "TipWlan-Passpoint-OSU-Provider",
"details": { "details": {
"model_type": "PasspointOsuProviderProfile", "model_type": "PasspointOsuProviderProfile",
"domainName": "rogers.com",
"mccMncList": [ "mccMncList": [
{ {
"model_type": "PasspointMccMnc", "model_type": "PasspointMccMnc",
@@ -139,7 +138,6 @@
"name": "TipWlan-Passpoint-OSU-Provider-2", "name": "TipWlan-Passpoint-OSU-Provider-2",
"details": { "details": {
"model_type": "PasspointOsuProviderProfile", "model_type": "PasspointOsuProviderProfile",
"domainName": "telus.com",
"mccMncList": [ "mccMncList": [
{ {
"model_type": "PasspointMccMnc", "model_type": "PasspointMccMnc",

75
opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileOperator.json
View File

@@ -1,37 +1,42 @@
[ [
{ {
"model_type": "Profile", "model_type": "Profile",
"id": 17, "id": 17,
"customerId": 2, "customerId": 2,
"profileType": "passpoint_operator", "profileType": "passpoint_operator",
"name": "TipWlan-Passpoint-Operator", "name": "TipWlan-Passpoint-Operator",
"details": { "details": {
"model_type": "PasspointOperatorProfile", "model_type": "PasspointOperatorProfile",
"serverOnlyAuthenticatedL2EncryptionNetwork": false, "serverOnlyAuthenticatedL2EncryptionNetwork": false,
"x509CertificateLocation": "/etc/ca.pem", "x509CertificateLocation": "/etc/ca.pem",
"operatorFriendlyName": [ "operatorFriendlyName": [
{ {
"model_type": "PasspointDuple", "model_type": "PasspointDuple",
"locale": "en_CA", "locale": "en_CA",
"dupleIso3Language": "eng", "dupleIso3Language": "eng",
"dupleName": "Default friendly passpoint_operator name", "dupleName": "Default friendly passpoint_operator name",
"defaultDupleSeparator": ":", "defaultDupleSeparator": ":",
"asDuple": "eng:Default friendly passpoint_operator name" "asDuple": "eng:Default friendly passpoint_operator name"
}, },
{ {
"model_type": "PasspointDuple", "model_type": "PasspointDuple",
"locale": "fr_CA", "locale": "fr_CA",
"dupleIso3Language": "fra", "dupleIso3Language": "fra",
"dupleName": "Nom de l'opérateur convivial par défaut", "dupleName": "Nom de l'opérateur convivial par défaut",
"defaultDupleSeparator": ":", "defaultDupleSeparator": ":",
"asDuple": "fra:Nom de l'opérateur convivial par défaut" "asDuple": "fra:Nom de l'opérateur convivial par défaut"
} }
], ],
"profileType": "passpoint_operator" "domainNameList": [
}, "telus.com",
"createdTimestamp": 1606778369945, "rogers.com",
"lastModifiedTimestamp": 1606778369945, "bell.ca"
"childProfileIds": [ ],
] "profileType": "passpoint_operator"
} },
"createdTimestamp": 1606778369945,
"lastModifiedTimestamp": 1606778369945,
"childProfileIds": [
]
}
] ]

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

@@ -7,7 +7,6 @@
"name": "TipWlan-Passpoint-OSU-Provider", "name": "TipWlan-Passpoint-OSU-Provider",
"details": { "details": {
"model_type": "PasspointOsuProviderProfile", "model_type": "PasspointOsuProviderProfile",
"domainName": "rogers.com",
"mccMncList": [ "mccMncList": [
{ {
"model_type": "PasspointMccMnc", "model_type": "PasspointMccMnc",
@@ -139,7 +138,6 @@
"name": "TipWlan-Passpoint-OSU-Provider-2", "name": "TipWlan-Passpoint-OSU-Provider-2",
"details": { "details": {
"model_type": "PasspointOsuProviderProfile", "model_type": "PasspointOsuProviderProfile",
"domainName": "telus.com",
"mccMncList": [ "mccMncList": [
{ {
"model_type": "PasspointMccMnc", "model_type": "PasspointMccMnc",

75
opensync-gateway-static-process/src/main/resources/app/opensync/ProfileOperator.json
View File

@@ -1,37 +1,42 @@
[ [
{ {
"model_type": "Profile", "model_type": "Profile",
"id": 17, "id": 17,
"customerId": 2, "customerId": 2,
"profileType": "passpoint_operator", "profileType": "passpoint_operator",
"name": "TipWlan-Passpoint-Operator", "name": "TipWlan-Passpoint-Operator",
"details": { "details": {
"model_type": "PasspointOperatorProfile", "model_type": "PasspointOperatorProfile",
"serverOnlyAuthenticatedL2EncryptionNetwork": false, "serverOnlyAuthenticatedL2EncryptionNetwork": false,
"x509CertificateLocation": "/etc/ca.pem", "x509CertificateLocation": "/etc/ca.pem",
"operatorFriendlyName": [ "operatorFriendlyName": [
{ {
"model_type": "PasspointDuple", "model_type": "PasspointDuple",
"locale": "en_CA", "locale": "en_CA",
"dupleIso3Language": "eng", "dupleIso3Language": "eng",
"dupleName": "Default friendly passpoint_operator name", "dupleName": "Default friendly passpoint_operator name",
"defaultDupleSeparator": ":", "defaultDupleSeparator": ":",
"asDuple": "eng:Default friendly passpoint_operator name" "asDuple": "eng:Default friendly passpoint_operator name"
}, },
{ {
"model_type": "PasspointDuple", "model_type": "PasspointDuple",
"locale": "fr_CA", "locale": "fr_CA",
"dupleIso3Language": "fra", "dupleIso3Language": "fra",
"dupleName": "Nom de l'opérateur convivial par défaut", "dupleName": "Nom de l'opérateur convivial par défaut",
"defaultDupleSeparator": ":", "defaultDupleSeparator": ":",
"asDuple": "fra:Nom de l'opérateur convivial par défaut" "asDuple": "fra:Nom de l'opérateur convivial par défaut"
} }
], ],
"profileType": "passpoint_operator" "domainNameList": [
}, "telus.com",
"createdTimestamp": 1606778369945, "rogers.com",
"lastModifiedTimestamp": 1606778369945, "bell.ca"
"childProfileIds": [ ],
] "profileType": "passpoint_operator"
} },
"createdTimestamp": 1606778369945,
"lastModifiedTimestamp": 1606778369945,
"childProfileIds": [
]
}
] ]

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

@@ -3680,12 +3680,23 @@ public class OvsdbDao {
return t.getId() == hs2Profile.getPasspointVenueProfileId(); return t.getId() == hs2Profile.getPasspointVenueProfileId();
} }
}).findFirst().get(); }).findFirst().get();
PasspointVenueProfile passpointVenueProfile = (PasspointVenueProfile) venue.getDetails(); PasspointVenueProfile passpointVenueProfile = (PasspointVenueProfile) venue.getDetails();
Map<String, Value> rowColumns = new HashMap<>(); Map<String, Value> rowColumns = new HashMap<>();
Set<Atom<String>> domainNames = new HashSet<>();
for (String domainName : passpointOperatorProfile.getDomainNameList()) {
domainNames.add(new Atom<>(domainName));
}
if (domainNames.size() > 0) {
com.vmware.ovsdb.protocol.operation.notation.Set domainNameSet = com.vmware.ovsdb.protocol.operation.notation.Set
.of(domainNames);
rowColumns.put("domain_name", domainNameSet);
}
Map<String, Hotspot20OsuProviders> osuProviders = getProvisionedHotspot20OsuProviders( Map<String, Hotspot20OsuProviders> osuProviders = getProvisionedHotspot20OsuProviders(
ovsdbClient); ovsdbClient);
List<Profile> providerList = new ArrayList<>(); List<Profile> providerList = new ArrayList<>();
@@ -3702,7 +3713,7 @@ public class OvsdbDao {
Set<Uuid> osuProvidersUuids = new HashSet<>(); Set<Uuid> osuProvidersUuids = new HashSet<>();
Set<Uuid> osuIconUuids = new HashSet<>(); Set<Uuid> osuIconUuids = new HashSet<>();
Set<Atom<String>> domainNames = new HashSet<>();
StringBuffer mccMncBuffer = new StringBuffer(); StringBuffer mccMncBuffer = new StringBuffer();
Set<Atom<String>> naiRealms = new HashSet<>(); Set<Atom<String>> naiRealms = new HashSet<>();
Set<Atom<String>> roamingOis = new HashSet<>(); Set<Atom<String>> roamingOis = new HashSet<>();
@@ -3718,7 +3729,6 @@ public class OvsdbDao {
}); });
osuProvidersUuids.add(hotspot2OsuProviders.uuid); osuProvidersUuids.add(hotspot2OsuProviders.uuid);
osuIconUuids.addAll(hotspot2OsuProviders.osuIcons); osuIconUuids.addAll(hotspot2OsuProviders.osuIcons);
domainNames.add(new Atom<>(providerProfile.getDomainName()));
getNaiRealms(providerProfile, naiRealms); getNaiRealms(providerProfile, naiRealms);
for (PasspointMccMnc passpointMccMnc : providerProfile.getMccMncList()) { for (PasspointMccMnc passpointMccMnc : providerProfile.getMccMncList()) {
@@ -3756,11 +3766,7 @@ public class OvsdbDao {
rowColumns.put("operator_icons", iconUuids); rowColumns.put("operator_icons", iconUuids);
} }
if (domainNames.size() > 0) {
com.vmware.ovsdb.protocol.operation.notation.Set domainNameSet = com.vmware.ovsdb.protocol.operation.notation.Set
.of(domainNames);
rowColumns.put("domain_name", domainNameSet);
}
hs2Profile.getIpAddressTypeAvailability(); hs2Profile.getIpAddressTypeAvailability();
rowColumns.put("deauth_request_timeout", new Atom<>(hs2Profile.getDeauthRequestTimeout())); rowColumns.put("deauth_request_timeout", new Atom<>(hs2Profile.getDeauthRequestTimeout()));

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

@@ -150,6 +150,8 @@ public class OvsdbDaoTestUtilities {
passpointOperatorProfile.setName("TipWlan-Hotspot20-Operator"); passpointOperatorProfile.setName("TipWlan-Hotspot20-Operator");
passpointOperatorProfile.setProfileType(ProfileType.passpoint_operator); passpointOperatorProfile.setProfileType(ProfileType.passpoint_operator);
passpointOperatorProfile.setDetails(PasspointOperatorProfile.createWithDefaults()); passpointOperatorProfile.setDetails(PasspointOperatorProfile.createWithDefaults());
((PasspointOperatorProfile)passpointOperatorProfile.getDetails()).setDomainNameList(Set.of("rogers.com","telus.com","bell.ca"));
return passpointOperatorProfile; return passpointOperatorProfile;
} }
@@ -255,7 +257,6 @@ public class OvsdbDaoTestUtilities {
naiRealmList.add(naiRealmInfo); naiRealmList.add(naiRealmInfo);
passpointIdProviderProfile.setNaiRealmList(naiRealmList); passpointIdProviderProfile.setNaiRealmList(naiRealmList);
passpointIdProviderProfile.setDomainName(domainName);
passpointIdProviderProfile.setOsuNaiStandalone("anonymous@" + domainName); passpointIdProviderProfile.setOsuNaiStandalone("anonymous@" + domainName);
passpointIdProviderProfile.setOsuNaiShared("anonymous@" + domainName); passpointIdProviderProfile.setOsuNaiShared("anonymous@" + domainName);
List<Integer> methodList = new ArrayList<>(); List<Integer> methodList = new ArrayList<>();