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

Radius Profile Provisioning

Browse Source
This commit is contained in:
Mike Hansen
2021-01-21 18:28:25 -05:00
parent cdc29b6b32
commit 095c611b8a
46 changed files with 3999 additions and 3869 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java vendored
View File

@@ -471,7 +471,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
ssidProfile.setName(autoProvisionedSsid + radioType.name() + " for " + ce.getName());
SsidConfiguration ssidConfig = SsidConfiguration.createWithDefaults();
ssidConfig.setSsid(ssidProfile.getName());
ssidConfig.setSsid(autoProvisionedSsid);
ssidConfig.setSsidAdminState(StateSetting.enabled);
ssidConfig.setBroadcastSsid(StateSetting.enabled);
ssidConfig.setSecureMode(SecureMode.wpa2PSK);
@@ -975,7 +975,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
hotspot20ProfileSet
.addAll(profileContainer.getChildrenOfType(ssidProfile.getId(), ProfileType.passpoint));
radiusSet.addAll(profileContainer.getChildrenOfType(ret.getApProfile().getId(), ProfileType.radius));
radiusSet.addAll(profileContainer.getChildrenOfType(ssidProfile.getId(), ProfileType.radius));
if (ssidProfile.getDetails() != null) {
Long captivePortId = ((SsidConfiguration) ssidProfile.getDetails()).getCaptivePortalId();
if (captivePortId != null) {

25
opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/utils/MqttStatsPublisher.java vendored
View File

@@ -190,22 +190,21 @@ public class MqttStatsPublisher {
long locationId = ce.getLocationId();
long profileId = ce.getProfileId();
if (LOG.isTraceEnabled()) {
// prepare a JSONPrinter to format protobuf messages as
// json
List<Descriptors.Descriptor> protobufDescriptors = new ArrayList<>();
protobufDescriptors.addAll(OpensyncStats.getDescriptor().getMessageTypes());
TypeRegistry oldRegistry = TypeRegistry.newBuilder().add(protobufDescriptors).build();
JsonFormat.Printer jsonPrinter = JsonFormat.printer().preservingProtoFieldNames()
.includingDefaultValueFields().usingTypeRegistry(oldRegistry);
// prepare a JSONPrinter to format protobuf messages as
// json
List<Descriptors.Descriptor> protobufDescriptors = new ArrayList<>();
protobufDescriptors.addAll(OpensyncStats.getDescriptor().getMessageTypes());
TypeRegistry oldRegistry = TypeRegistry.newBuilder().add(protobufDescriptors).build();
JsonFormat.Printer jsonPrinter = JsonFormat.printer().preservingProtoFieldNames()
.includingDefaultValueFields().usingTypeRegistry(oldRegistry);
try {
LOG.trace("MQTT OpensyncStats.report = {}", jsonPrinter.print(report));
try {
LOG.info(jsonPrinter.print(report));
} catch (InvalidProtocolBufferException e1) {
LOG.error("Couldn't parse OpensyncStats.report.", e1);
}
} catch (InvalidProtocolBufferException e1) {
LOG.error("Couldn't parse OpensyncStats.report.", e1);
}
List<ServiceMetric> metricRecordList = new ArrayList<>();