Adding RF profile structure

opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/OpensyncAPConfig.java

@@ -29,6 +29,7 @@ public class OpensyncAPConfig extends BaseJsonModel {
 
     private Equipment customerEquipment;
     private Profile apProfile;
+    private Profile rfProfile;
     private List<Profile> ssidProfile;
     private List<Profile> radiusProfiles;
     private Location equipmentLocation;
@@ -139,6 +140,14 @@ public class OpensyncAPConfig extends BaseJsonModel {
         this.apProfile = apProfile;
     }
     
+    public Profile getRfProfile() {
+    	return rfProfile;
+    }
+    
+    public void setRfProfile(Profile rfProfile) {
+    	this.rfProfile = rfProfile;
+    }
+
     public List<Profile> getSsidProfile() {
         return ssidProfile;
     }
@@ -195,6 +204,8 @@ public class OpensyncAPConfig extends BaseJsonModel {
         }
         if (apProfile != null)
             ret.apProfile = apProfile.clone();
+        if (rfProfile != null)
+        	ret.rfProfile = rfProfile.clone();
         if (equipmentRouting != null)
             ret.equipmentRouting = equipmentRouting.clone();
         if (equipmentGateway != null)

opensync-ext-static/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationSimple.java

@@ -39,6 +39,9 @@ public class OpensyncExternalIntegrationSimple implements OpensyncExternalIntegr
 	@Value("${tip.wlan.ovsdb.apProfileFileName:/app/config/ProfileAPExample.json}")
 	private String apProfileFileName;
 	
+	@Value("${tip.wlan.ovsdb.apProfileFileName:/app/config/ProfileRf.json}")
+	private String rfProfileFileName;
+
 	@Value("${tip.wlan.ovsdb.ssidProfileFileName:/app/config/ProfileSsid.json}")
 	private String ssidProfileFileName;
 
@@ -87,6 +90,11 @@ public class OpensyncExternalIntegrationSimple implements OpensyncExternalIntegr
 			com.telecominfraproject.wlan.profile.models.Profile apProfile = com.telecominfraproject.wlan.profile.models.Profile
 					.fromFile(apProfileFileName, com.telecominfraproject.wlan.profile.models.Profile.class);
 			
+			com.telecominfraproject.wlan.profile.models.Profile rfProfile = com.telecominfraproject.wlan.profile.models.Profile
+					.fromFile(rfProfileFileName, com.telecominfraproject.wlan.profile.models.Profile.class);
+			
+			apProfile.getChildProfileIds().add(rfProfile.getId());
+
 			List<com.telecominfraproject.wlan.profile.models.Profile> ssidProfiles = com.telecominfraproject.wlan.profile.models.Profile
 					.listFromFile(ssidProfileFileName, com.telecominfraproject.wlan.profile.models.Profile.class);
 
@@ -123,6 +131,7 @@ public class OpensyncExternalIntegrationSimple implements OpensyncExternalIntegr
 			ret = new OpensyncAPConfig();
 			ret.setCustomerEquipment(equipment);
 			ret.setApProfile(apProfile);
+			ret.setRfProfile(rfProfile);
 			ret.setSsidProfile(ssidProfiles);
 			ret.setRadiusProfiles(radiusProfiles);
 			ret.setEquipmentLocation(location);

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

@@ -49,6 +49,7 @@
   "childProfileIds": [
     6,
     7,
-    8
+    8,
+    9
   ]
 }

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

@@ -0,0 +1,86 @@
+{
+	"model_type": "Profile",
+	"id": 9,
+	"customerId": 2,
+	"profileType": "rf",
+	"name": "DefaultRf-2g",
+	"details": {
+		"model_type": "RfConfiguration",
+		"rf": "Default-RF-2g",
+		"profileType": "rf",
+		"rfConfigMap": {
+			"is2dot4GHz": {
+				"model_type": "RfElementConfiguration",
+				"beaconInterval": 100,
+				"forceScanDuringVoice": "disabled",
+				"rtsCtsThreshold": 65535,
+				"channelBandwidth": "is20MHz",
+				"mimoMode": "twoBytwo",
+				"maxNumClients": 100,
+				"multicastRate": "auto",
+				"autoChannelSelection": "disabled",
+				"activeScanSettings": {
+					"model_type": "ActiveScanSettings",
+					"enabled": true,
+					"scanFrequencySeconds": 10,
+					"scanDurationMillis": 65
+				}
+			},
+			"is5GHz": {
+				"model_type": "RfElementConfiguration",
+				"beaconInterval": 100,
+				"forceScanDuringVoice": "disabled",
+				"rtsCtsThreshold": 65535,
+				"channelBandwidth": "is80MHz",
+				"mimoMode": "twoBytwo",
+				"maxNumClients": 100,
+				"multicastRate": "auto",
+				"autoChannelSelection": "disabled",
+				"activeScanSettings": {
+					"model_type": "ActiveScanSettings",
+					"enabled": true,
+					"scanFrequencySeconds": 10,
+					"scanDurationMillis": 65
+				}
+			},
+			"is5GHzL": {
+				"model_type": "RfElementConfiguration",
+				"beaconInterval": 100,
+				"forceScanDuringVoice": "disabled",
+				"rtsCtsThreshold": 65535,
+				"channelBandwidth": "is80MHz",
+				"mimoMode": "twoBytwo",
+				"maxNumClients": 100,
+				"multicastRate": "auto",
+				"autoChannelSelection": "disabled",
+				"activeScanSettings": {
+					"model_type": "ActiveScanSettings",
+					"enabled": true,
+					"scanFrequencySeconds": 10,
+					"scanDurationMillis": 65
+				}
+			},
+			"is5GHzU": {
+				"model_type": "RfElementConfiguration",
+				"beaconInterval": 100,
+				"forceScanDuringVoice": "disabled",
+				"rtsCtsThreshold": 65535,
+				"channelBandwidth": "is80MHz",
+				"mimoMode": "twoBytwo",
+				"maxNumClients": 100,
+				"multicastRate": "auto",
+				"autoChannelSelection": "disabled",
+				"activeScanSettings": {
+					"model_type": "ActiveScanSettings",
+					"enabled": true,
+					"scanFrequencySeconds": 10,
+					"scanDurationMillis": 65
+				}
+			}
+		},
+		"createdTimestamp": 1591653239983,
+		"lastModifiedTimestamp": 1591653239983,
+		"childProfileIds": [
+		]
+	}
+}