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

opensync-ext-static/src/main/resources/ProfileIdProvider.json

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

opensync-ext-static/src/main/resources/ProfileOperator.json

@@ -27,6 +27,11 @@
                     "asDuple": "fra:Nom de l'opérateur convivial par défaut"
                 }
             ],
+            "domainNameList": [
+                "telus.com",
+                "rogers.com",
+                "bell.ca"
+            ],
             "profileType": "passpoint_operator"
         },
         "createdTimestamp": 1606778369945,

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

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

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

@@ -27,6 +27,11 @@
                     "asDuple": "fra:Nom de l'opérateur convivial par défaut"
                 }
             ],
+            "domainNameList": [
+                "telus.com",
+                "rogers.com",
+                "bell.ca"
+            ],
             "profileType": "passpoint_operator"
         },
         "createdTimestamp": 1606778369945,

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

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

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

@@ -27,6 +27,11 @@
                     "asDuple": "fra:Nom de l'opérateur convivial par défaut"
                 }
             ],
+            "domainNameList": [
+                "telus.com",
+                "rogers.com",
+                "bell.ca"
+            ],
             "profileType": "passpoint_operator"
         },
         "createdTimestamp": 1606778369945,

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

@@ -3686,6 +3686,17 @@ public class OvsdbDao {
 
                         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(
                                 ovsdbClient);
                         List<Profile> providerList = new ArrayList<>();
@@ -3702,7 +3713,7 @@ public class OvsdbDao {
 
                         Set<Uuid> osuProvidersUuids = new HashSet<>();
                         Set<Uuid> osuIconUuids = new HashSet<>();
-                        Set<Atom<String>> domainNames = new HashSet<>();
+                       
                         StringBuffer mccMncBuffer = new StringBuffer();
                         Set<Atom<String>> naiRealms = new HashSet<>();
                         Set<Atom<String>> roamingOis = new HashSet<>();
@@ -3718,7 +3729,6 @@ public class OvsdbDao {
                                 });
                                 osuProvidersUuids.add(hotspot2OsuProviders.uuid);
                                 osuIconUuids.addAll(hotspot2OsuProviders.osuIcons);
-                                domainNames.add(new Atom<>(providerProfile.getDomainName()));
                                 getNaiRealms(providerProfile, naiRealms);
 
                                 for (PasspointMccMnc passpointMccMnc : providerProfile.getMccMncList()) {
@@ -3756,11 +3766,7 @@ public class OvsdbDao {
                             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();
                         rowColumns.put("deauth_request_timeout", new Atom<>(hs2Profile.getDeauthRequestTimeout()));

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

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