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

Adding RF profile structure

Browse Source
This commit is contained in:
ralphlee
2020-09-24 12:15:33 -04:00
parent 2b60dd8b57
commit ac521191d6
4 changed files with 108 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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)

9
opensync-ext-static/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationSimple.java vendored
View File

@@ -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);

3
opensync-ext-static/src/main/resources/ProfileAPExample.json
View File

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

86
opensync-ext-static/src/main/resources/ProfileRf.json Normal file
View File

@@ -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": [
]
}
}