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

Adding support for multiple SSIDs per Radio, and multiple SSID Profiles in single SSID json file

Browse Source
This commit is contained in:
Mike Hansen
2020-05-22 15:20:40 -04:00
parent 055fe42346
commit 591629f90b
14 changed files with 769 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,16 +71,20 @@ 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 ssidProfile = com.telecominfraproject.wlan.profile.models.Profile
.fromFile(ssidProfileFileName, com.telecominfraproject.wlan.profile.models.Profile.class);
List<com.telecominfraproject.wlan.profile.models.Profile> ssidProfiles = com.telecominfraproject.wlan.profile.models.Profile
.listFromFile(ssidProfileFileName, com.telecominfraproject.wlan.profile.models.Profile.class);
ssidProfiles.stream().forEach(p -> apProfile.getChildProfileIds().add(p.getId()));
equipment.setProfileId(apProfile.getId());
Location location = Location.fromFile(locationFileName, Location.class);
equipment.setLocationId(location.getId());
ret = new OpensyncAPConfig();
ret.setCustomerEquipment(equipment);
ret.setApProfile(apProfile);
List<com.telecominfraproject.wlan.profile.models.Profile> ssidProfiles = new ArrayList<com.telecominfraproject.wlan.profile.models.Profile>();
ssidProfiles.add(ssidProfile);
ret.setSsidProfile(ssidProfiles);
ret.setEquipmentLocation(location);

8
opensync-ext-static/src/main/resources/EquipmentExample.json
View File

@@ -2,7 +2,7 @@
"model_type" : "Equipment",
"id" : 50,
"customerId" : 2,
"profileId" : 2,
"profileId" : null,
"locationId" : 8,
"equipmentType" : "AP",
"inventoryId" : "ap-50",
@@ -100,8 +100,8 @@
},
"eirpTxPower" : {
"model_type" : "AutoOrManualValue",
"auto" : true,
"value" : 18
"auto" : false,
"value" : 10
},
"bestApEnabled" : null,
"neighbouringListApConfig" : {
@@ -203,7 +203,7 @@
"is5GHzU" : {
"model_type" : "RadioConfiguration",
"radioType" : "is5GHzU",
"radioAdminState" : "enabled",
"radioAdminState" : "disabled",
"fragmentationThresholdBytes" : 2346,
"rtsCtsThreshold" : 65535,
"autoChannelSelection" : "disabled",

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

@@ -46,5 +46,5 @@
},
"createdTimestamp" : 1589567037365,
"lastModifiedTimestamp" : 1589567037365,
"childProfileIds" : [ 1 ]
"childProfileIds" : [ ]
}

180
opensync-ext-static/src/main/resources/ProfileSsid.json
View File

@@ -1,3 +1,4 @@
[
{
"model_type" : "Profile",
"id" : 1,
@@ -55,4 +56,181 @@
"createdTimestamp" : 1589567130432,
"lastModifiedTimestamp" : 1589567130432,
"childProfileIds" : [ ]
}
},
{
"model_type" : "Profile",
"id" : 2,
"customerId" : 2,
"profileType" : "ssid",
"name" : "Connectus-local-2",
"details" : {
"model_type" : "SsidConfiguration",
"sampleDetailsStr" : null,
"ssid" : "Connectus-local-2",
"appliedRadios" : [ "is5GHzL", "is5GHzU"],
"ssidAdminState" : "enabled",
"secureMode" : "wpa2PSK",
"vlanId" : 1,
"keyStr" : "12345678",
"broadcastSsid" : "enabled",
"keyRefresh" : 0,
"noLocalSubnets" : false,
"radiusServiceName" : null,
"captivePortalId" : null,
"bandwidthLimitDown" : 0,
"bandwidthLimitUp" : 0,
"videoTrafficOnly" : false,
"radioBasedConfigs" : {
"is5GHz" : {
"model_type" : "RadioBasedSsidConfiguration",
"enable80211r" : null,
"enable80211k" : null,
"enable80211v" : null
},
"is2dot4GHz" : {
"model_type" : "RadioBasedSsidConfiguration",
"enable80211r" : null,
"enable80211k" : null,
"enable80211v" : null
},
"is5GHzU" : {
"model_type" : "RadioBasedSsidConfiguration",
"enable80211r" : null,
"enable80211k" : null,
"enable80211v" : null
},
"is5GHzL" : {
"model_type" : "RadioBasedSsidConfiguration",
"enable80211r" : null,
"enable80211k" : null,
"enable80211v" : null
}
},
"bonjourGatewayProfileId" : null,
"enable80211w" : null,
"wepConfig" : null,
"forwardMode" : null
},
"createdTimestamp" : 1589567130432,
"lastModifiedTimestamp" : 1589567130432,
"childProfileIds" : [ ]
}
,
{
"model_type" : "Profile",
"id" : 3,
"customerId" : 2,
"profileType" : "ssid",
"name" : "Connectus-local-3u",
"details" : {
"model_type" : "SsidConfiguration",
"sampleDetailsStr" : null,
"ssid" : "Connectus-local-3u",
"appliedRadios" : [ "is5GHzU" ],
"ssidAdminState" : "enabled",
"secureMode" : "wpa2PSK",
"vlanId" : 1,
"keyStr" : "12345678",
"broadcastSsid" : "enabled",
"keyRefresh" : 0,
"noLocalSubnets" : false,
"radiusServiceName" : null,
"captivePortalId" : null,
"bandwidthLimitDown" : 0,
"bandwidthLimitUp" : 0,
"videoTrafficOnly" : false,
"radioBasedConfigs" : {
"is5GHz" : {
"model_type" : "RadioBasedSsidConfiguration",
"enable80211r" : null,
"enable80211k" : null,
"enable80211v" : null
},
"is2dot4GHz" : {
"model_type" : "RadioBasedSsidConfiguration",
"enable80211r" : null,
"enable80211k" : null,
"enable80211v" : null
},
"is5GHzU" : {
"model_type" : "RadioBasedSsidConfiguration",
"enable80211r" : null,
"enable80211k" : null,
"enable80211v" : null
},
"is5GHzL" : {
"model_type" : "RadioBasedSsidConfiguration",
"enable80211r" : null,
"enable80211k" : null,
"enable80211v" : null
}
},
"bonjourGatewayProfileId" : null,
"enable80211w" : null,
"wepConfig" : null,
"forwardMode" : null
},
"createdTimestamp" : 1589567130432,
"lastModifiedTimestamp" : 1589567130432,
"childProfileIds" : [ ]
}
,
{
"model_type" : "Profile",
"id" : 4,
"customerId" : 2,
"profileType" : "ssid",
"name" : "Connectus-local-4l",
"details" : {
"model_type" : "SsidConfiguration",
"sampleDetailsStr" : null,
"ssid" : "Connectus-local-4l",
"appliedRadios" : [ "is5GHzL" ],
"ssidAdminState" : "enabled",
"secureMode" : "wpa2PSK",
"vlanId" : 1,
"keyStr" : "12345678",
"broadcastSsid" : "enabled",
"keyRefresh" : 0,
"noLocalSubnets" : false,
"radiusServiceName" : null,
"captivePortalId" : null,
"bandwidthLimitDown" : 0,
"bandwidthLimitUp" : 0,
"videoTrafficOnly" : false,
"radioBasedConfigs" : {
"is5GHz" : {
"model_type" : "RadioBasedSsidConfiguration",
"enable80211r" : null,
"enable80211k" : null,
"enable80211v" : null
},
"is2dot4GHz" : {
"model_type" : "RadioBasedSsidConfiguration",
"enable80211r" : null,
"enable80211k" : null,
"enable80211v" : null
},
"is5GHzU" : {
"model_type" : "RadioBasedSsidConfiguration",
"enable80211r" : null,
"enable80211k" : null,
"enable80211v" : null
},
"is5GHzL" : {
"model_type" : "RadioBasedSsidConfiguration",
"enable80211r" : null,
"enable80211k" : null,
"enable80211v" : null
}
},
"bonjourGatewayProfileId" : null,
"enable80211w" : null,
"wepConfig" : null,
"forwardMode" : null
},
"createdTimestamp" : 1589567130432,
"lastModifiedTimestamp" : 1589567130432,
"childProfileIds" : [ ]
}
]