diff --git a/opensync-ext-static/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationSimple.java b/opensync-ext-static/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationSimple.java index 62513ed..0ae824e 100644 --- a/opensync-ext-static/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationSimple.java +++ b/opensync-ext-static/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationSimple.java @@ -2,7 +2,6 @@ package com.telecominfraproject.wlan.opensync.external.integration; import java.io.File; import java.io.IOException; -import java.util.HashSet; import java.util.List; import java.util.Map; @@ -18,7 +17,6 @@ import com.telecominfraproject.wlan.equipment.models.Equipment; import com.telecominfraproject.wlan.location.models.Location; import com.telecominfraproject.wlan.opensync.external.integration.models.ConnectNodeInfo; import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAPConfig; -import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAPHotspot20Config; import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAPInetState; import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAPRadioState; import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAPVIFState; @@ -46,31 +44,10 @@ public class OpensyncExternalIntegrationSimple implements OpensyncExternalIntegr @Value("${tip.wlan.ovsdb.ssidProfileFileName:/app/config/ProfileSsid.json}") private String ssidProfileFileName; - - @Value("${tip.wlan.ovsdb.metricsProfileFileName:/app/config/ProfileMetrics.json}") - private String metricsProfileFileName; - - @Value("${tip.wlan.ovsdb.venueProfileFileName:/app/config/ProfileVenue.json}") - private String venueProfileFileName; - - @Value("${tip.wlan.ovsdb.operatorProfileFileName:/app/config/ProfileOperator.json}") - private String operatorProfileFileName; - - @Value("${tip.wlan.ovsdb.hotspot20ProfileFileName:/app/config/ProfileHotspot20.json}") - private String hotspot20ProfileFileName; - - @Value("${tip.wlan.ovsdb.idProviderProfileFileName:/app/config/ProfileIdProvider.json}") - private String idProviderProfileFileName; - + @Value("${tip.wlan.ovsdb.radiusProfileFileName:/app/config/ProfileRadius.json}") private String radiusProfileFileName; - @Value("${tip.wlan.ovsdb.captiveProfileFileName:/app/config/ProfileCaptive.json}") - private String captiveProfileFileName; - - @Value("${tip.wlan.ovsdb.bonjourProfileFileName:/app/config/ProfileBonjour.json}") - private String bonjourProfileFileName; - @Value("${tip.wlan.ovsdb.locationFileName:/app/config/LocationBuildingExample.json}") private String locationFileName; @@ -85,7 +62,6 @@ public class OpensyncExternalIntegrationSimple implements OpensyncExternalIntegr serialNumber = connectNodeInfo.serialNumber; LOG.info("AP {} got connected to the gateway", apId); LOG.info("ConnectNodeInfo {}", connectNodeInfo); - } public void apDisconnected(String apId) { @@ -95,97 +71,42 @@ public class OpensyncExternalIntegrationSimple implements OpensyncExternalIntegr public OpensyncAPConfig getApConfig(String apId) { LOG.info("Retrieving config for AP {}", apId); OpensyncAPConfig ret = null; - try { - Equipment equipment = Equipment.fromFile(customerEquipmentFileName, Equipment.class); equipment.setInventoryId(apId); equipment.setName(apId); equipment.setSerial(serialNumber); - 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 ssidProfiles = com.telecominfraproject.wlan.profile.models.Profile .listFromFile(ssidProfileFileName, com.telecominfraproject.wlan.profile.models.Profile.class); - - List hotspot20Profiles = com.telecominfraproject.wlan.profile.models.Profile - .listFromFile(hotspot20ProfileFileName, com.telecominfraproject.wlan.profile.models.Profile.class); - List operatorProfiles = com.telecominfraproject.wlan.profile.models.Profile - .listFromFile(operatorProfileFileName, com.telecominfraproject.wlan.profile.models.Profile.class); - List venueProfiles = com.telecominfraproject.wlan.profile.models.Profile - .listFromFile(venueProfileFileName, com.telecominfraproject.wlan.profile.models.Profile.class); - List providerProfiles = com.telecominfraproject.wlan.profile.models.Profile - .listFromFile(idProviderProfileFileName, com.telecominfraproject.wlan.profile.models.Profile.class); - - ssidProfiles.stream().forEach(p -> apProfile.getChildProfileIds().add(p.getId())); - - List metricsProfiles = com.telecominfraproject.wlan.profile.models.Profile - .listFromFile(metricsProfileFileName, com.telecominfraproject.wlan.profile.models.Profile.class); - - List radiusProfiles = com.telecominfraproject.wlan.profile.models.Profile - .listFromFile(radiusProfileFileName, com.telecominfraproject.wlan.profile.models.Profile.class); - - - List captiveProfiles = null; - File captiveFile = new File(captiveProfileFileName); - if (captiveFile.exists()) { - captiveProfiles = com.telecominfraproject.wlan.profile.models.Profile.listFromFile( - captiveProfileFileName, com.telecominfraproject.wlan.profile.models.Profile.class); - } else { - LOG.info("Captive file is not provided"); - } - - List bonjourProfiles = null; - File bonjourFile = new File(bonjourProfileFileName); - if (bonjourFile.exists()) { - bonjourProfiles = com.telecominfraproject.wlan.profile.models.Profile.listFromFile( - bonjourProfileFileName, com.telecominfraproject.wlan.profile.models.Profile.class); - } else { - LOG.info("Bonjour file is not provided"); - } + equipment.setProfileId(apProfile.getId()); - Location location = Location.fromFile(locationFileName, Location.class); - equipment.setLocationId(location.getId()); - - OpensyncAPHotspot20Config hotspotConfig = new OpensyncAPHotspot20Config(); - - hotspotConfig.setHotspot20ProfileSet( - new HashSet(hotspot20Profiles)); - hotspotConfig.setHotspot20OperatorSet( - new HashSet(operatorProfiles)); - hotspotConfig.setHotspot20VenueSet( - new HashSet(venueProfiles)); - hotspotConfig.setHotspot20ProviderSet( - new HashSet(providerProfiles)); - ret = new OpensyncAPConfig(); ret.setCustomerEquipment(equipment); ret.setApProfile(apProfile); ret.setRfProfile(rfProfile); - ret.setMetricsProfiles(metricsProfiles); ret.setSsidProfile(ssidProfiles); - ret.setRadiusProfiles(radiusProfiles); + File radiusFile = new File(radiusProfileFileName); + if (radiusFile.exists()) { + List radiusProfiles = com.telecominfraproject.wlan.profile.models.Profile + .listFromFile(radiusProfileFileName, com.telecominfraproject.wlan.profile.models.Profile.class); + ret.setRadiusProfiles(radiusProfiles); + } else { + LOG.debug("No radius file present at {}", radiusFile.getAbsolutePath()); + } ret.setEquipmentLocation(location); - ret.setCaptiveProfiles(captiveProfiles); - ret.setBonjourGatewayProfiles(bonjourProfiles); - ret.setHotspotConfig(hotspotConfig); - } catch (IOException e) { LOG.error("Cannot read config file", e); } - LOG.debug("Config content : {}", ret); - return ret; } diff --git a/opensync-ext-static/src/main/resources/EquipmentExample.json b/opensync-ext-static/src/main/resources/EquipmentExample.json index 5b1a141..a5a3f9b 100644 --- a/opensync-ext-static/src/main/resources/EquipmentExample.json +++ b/opensync-ext-static/src/main/resources/EquipmentExample.json @@ -2,7 +2,7 @@ "model_type": "Equipment", "id": 1, "customerId": 2, - "profileId": 38, + "profileId": 8, "locationId": 8, "equipmentType": "AP", "inventoryId": "Open_AP_21P10C68818122", @@ -464,6 +464,6 @@ "addressAsString": "24:f5:a2:ef:2e:53" }, "serial": "21P10C68818122", - "createdTimestamp": 1611857503082, - "lastModifiedTimestamp": 1611857505529 + "createdTimestamp": 1612285288821, + "lastModifiedTimestamp": 1612285293922 } \ No newline at end of file diff --git a/opensync-ext-static/src/main/resources/LocationBuildingExample.json b/opensync-ext-static/src/main/resources/LocationBuildingExample.json index 5f236a3..dd4c748 100644 --- a/opensync-ext-static/src/main/resources/LocationBuildingExample.json +++ b/opensync-ext-static/src/main/resources/LocationBuildingExample.json @@ -1,60 +1,61 @@ { - "model_type" : "Location", - "id" : 8, - "parentId" : 0, - "locationType" : "SITE", - "customerId" : 2, - "name" : "Ottawa", - "details" : { - "model_type" : "LocationDetails", - "countryCode" : "ca", - "maintenanceWindow" : null, - "rrmEnabled" : true, - "dailyActivityDetails" : { - "SUNDAY" : { - "model_type" : "LocationActivityDetails", - "busyTime" : "13:30", - "quietTime" : "3:30", - "timezone" : "US/Eastern" - }, - "MONDAY" : { - "model_type" : "LocationActivityDetails", - "busyTime" : "13:30", - "quietTime" : "3:30", - "timezone" : "US/Eastern" - }, - "TUESDAY" : { - "model_type" : "LocationActivityDetails", - "busyTime" : "13:30", - "quietTime" : "3:30", - "timezone" : "US/Eastern" - }, - "WEDNESDAY" : { - "model_type" : "LocationActivityDetails", - "busyTime" : "13:30", - "quietTime" : "3:30", - "timezone" : "US/Eastern" - }, - "THURSDAY" : { - "model_type" : "LocationActivityDetails", - "busyTime" : "13:30", - "quietTime" : "3:30", - "timezone" : "US/Eastern" - }, - "FRIDAY" : { - "model_type" : "LocationActivityDetails", - "busyTime" : "13:30", - "quietTime" : "3:30", - "timezone" : "US/Eastern" - }, - "SATURDAY" : { - "model_type" : "LocationActivityDetails", - "busyTime" : "13:30", - "quietTime" : "3:30", - "timezone" : "US/Eastern" - } - } - }, - "createdTimestamp" : 1590607043540, - "lastModifiedTimestamp" : 1590607043540 + "model_type": "Location", + "id": 8, + "parentId": 0, + "locationType": "SITE", + "customerId": 2, + "name": "Ottawa", + "details": { + "model_type": "LocationDetails", + "countryCode": "CA", + "dailyActivityDetails": { + "SUNDAY": { + "model_type": "LocationActivityDetails", + "busyTime": "13:30", + "quietTime": "3:00", + "timezone": "US/Eastern" + }, + "MONDAY": { + "model_type": "LocationActivityDetails", + "busyTime": "13:30", + "quietTime": "3:00", + "timezone": "US/Eastern" + }, + "TUESDAY": { + "model_type": "LocationActivityDetails", + "busyTime": "13:30", + "quietTime": "3:00", + "timezone": "US/Eastern" + }, + "WEDNESDAY": { + "model_type": "LocationActivityDetails", + "busyTime": "13:30", + "quietTime": "3:00", + "timezone": "US/Eastern" + }, + "THURSDAY": { + "model_type": "LocationActivityDetails", + "busyTime": "13:30", + "quietTime": "3:00", + "timezone": "US/Eastern" + }, + "FRIDAY": { + "model_type": "LocationActivityDetails", + "busyTime": "13:30", + "quietTime": "3:00", + "timezone": "US/Eastern" + }, + "SATURDAY": { + "model_type": "LocationActivityDetails", + "busyTime": "13:30", + "quietTime": "3:00", + "timezone": "US/Eastern" + } + }, + "maintenanceWindow": null, + "rrmEnabled": true, + "timezone": "US/Eastern" + }, + "createdTimestamp": 1612285243534, + "lastModifiedTimestamp": 1612285243534 } \ No newline at end of file diff --git a/opensync-ext-static/src/main/resources/ProfileAPExample.json b/opensync-ext-static/src/main/resources/ProfileAPExample.json index d3ff906..37ee3e3 100644 --- a/opensync-ext-static/src/main/resources/ProfileAPExample.json +++ b/opensync-ext-static/src/main/resources/ProfileAPExample.json @@ -1,64 +1,58 @@ { - "model_type": "Profile", - "id": 38, - "customerId": 2, - "profileType": "equipment_ap", - "name": "ap-profile-2021-01-21T21:28:59.371Z", - "details": { - "model_type": "ApNetworkConfiguration", - "networkConfigVersion": "AP-1", - "equipmentType": "AP", - "vlanNative": true, - "vlan": 0, - "ntpServer": { - "model_type": "AutoOrManualString", - "auto": true, - "value": "pool.ntp.org" + "model_type": "Profile", + "id": 8, + "customerId": 2, + "profileType": "equipment_ap", + "name": "ApProfile-3-radios", + "details": { + "model_type": "ApNetworkConfiguration", + "networkConfigVersion": "AP-1", + "equipmentType": "AP", + "vlanNative": true, + "vlan": 0, + "ntpServer": { + "model_type": "AutoOrManualString", + "auto": true, + "value": "pool.ntp.org" + }, + "syslogRelay": null, + "rtlsSettings": null, + "syntheticClientEnabled": true, + "ledControlEnabled": true, + "equipmentDiscovery": false, + "radioMap": { + "is2dot4GHz": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + }, + "is5GHzU": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + }, + "is5GHzL": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + } + }, + "greTunnelConfigurations": [ + { + "model_type": "GreTunnelConfiguration", + "greTunnelName": "gre1", + "greRemoteInetAddr": "192.168.1.101", + "vlanIdsInGreTunnel": [ + 100 + ] + } + ], + "profileType": "equipment_ap" }, - "syslogRelay": null, - "rtlsSettings": null, - "syntheticClientEnabled": true, - "ledControlEnabled": true, - "equipmentDiscovery": false, - "radioMap": { - "is5GHz": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is2dot4GHz": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is5GHzU": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is5GHzL": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - } - }, - "greTunnelConfigurations": [ - { - "model_type": "GreTunnelConfiguration", - "greTunnelName": null, - "greRemoteInetAddr": null, - "vlanIdsInGreTunnel": [ - ] - } - ], - "profileType": "equipment_ap" - }, - "createdTimestamp": 1611264539383, - "lastModifiedTimestamp": 1611264539383, - "childProfileIds": [ - 4, - 5, - 31, - 32 - ] -} + "createdTimestamp": 1612285248925, + "lastModifiedTimestamp": 1612285628377, + "childProfileIds": [ + 2, + 4 + ] +} \ No newline at end of file diff --git a/opensync-ext-static/src/main/resources/ProfileBonjour.json b/opensync-ext-static/src/main/resources/ProfileBonjour.json deleted file mode 100644 index 117b1f7..0000000 --- a/opensync-ext-static/src/main/resources/ProfileBonjour.json +++ /dev/null @@ -1,29 +0,0 @@ -[ -{ - "model_type": "Profile", - "id": 100, - "customerId": 2, - "profileType": "bonjour", - "name": "Bonjour-gateway", - "details": { - "model_type": "BonjourGatewayProfile", - "profileDescription": "Bonjour Gateway Configuration for Design Testing", - "profileType": "bonjour", - "bonjourServices": [ - { - "model_type": "BonjourServiceSet", - "vlanId": 1, - "supportAllServices": false, - "serviceNames": [ - "AirPort", - "SFTP", - "SSH" - ] - } - ] - }, - "createdTimestamp": 1599234550774, - "lastModifiedTimestamp": 1599234550774, - "childProfileIds": [] -} -] \ No newline at end of file diff --git a/opensync-ext-static/src/main/resources/ProfileCaptive.json b/opensync-ext-static/src/main/resources/ProfileCaptive.json index 0337c36..e69e74f 100644 --- a/opensync-ext-static/src/main/resources/ProfileCaptive.json +++ b/opensync-ext-static/src/main/resources/ProfileCaptive.json @@ -1,52 +1,58 @@ -{ +[ + { "model_type": "Profile", "id": 5, "customerId": 2, "profileType": "captive_portal", "name": "Captive-portal", "details": { - "model_type": "CaptivePortalConfiguration", - "name": "Default", - "browserTitle": "Captive-portal", - "headerContent": "Captive Portal", - "userAcceptancePolicy": "Please agree to the following terms for using this network:", - "successPageMarkdownText": "You are now authorized and connected to the network.", - "redirectURL": "https://www.google.com", - "externalCaptivePortalURL": null, - "sessionTimeoutInMinutes": 10, - "logoFile": { - "model_type": "ManagedFileInfo", - "md5checksum": null, - "lastModifiedTimestamp": null, - "apExportUrl": "/filestore/tip-logo-mobile", - "fileCategory": "CaptivePortalLogo", - "fileType": "PNG", - "altSlot": false - }, - "backgroundFile": { - "model_type": "ManagedFileInfo", - "md5checksum": null, - "lastModifiedTimestamp": null, - "apExportUrl": "/filestore/tip-logo", - "fileCategory": "CaptivePortalBackground", - "fileType": "PNG", - "altSlot": false - }, - "walledGardenAllowlist": [], - "usernamePasswordFile": null, - "authenticationType": "guest", - "radiusAuthMethod": "CHAP", - "maxUsersWithSameCredentials": 3, - "externalPolicyFile": null, - "backgroundPosition": "left_top", - "backgroundRepeat": "no_repeat", - "radiusServiceId": 0, - "expiryType": "time_limited", - "userList": [], - "macAllowList": [], - "profileType": "captive_portal" + "model_type": "CaptivePortalConfiguration", + "name": "Default", + "browserTitle": "Captive-portal", + "headerContent": "Captive Portal", + "userAcceptancePolicy": "Please agree to the following terms for using this network:", + "successPageMarkdownText": "You are now authorized and connected to the network.", + "redirectURL": "https://www.google.com", + "externalCaptivePortalURL": null, + "sessionTimeoutInMinutes": 10, + "logoFile": { + "model_type": "ManagedFileInfo", + "md5checksum": null, + "lastModifiedTimestamp": null, + "apExportUrl": "/filestore/tip-logo-mobile", + "fileCategory": "CaptivePortalLogo", + "fileType": "PNG", + "altSlot": false + }, + "backgroundFile": { + "model_type": "ManagedFileInfo", + "md5checksum": null, + "lastModifiedTimestamp": null, + "apExportUrl": "/filestore/tip-logo", + "fileCategory": "CaptivePortalBackground", + "fileType": "PNG", + "altSlot": false + }, + "walledGardenAllowlist": [ + ], + "usernamePasswordFile": null, + "authenticationType": "guest", + "radiusAuthMethod": "CHAP", + "maxUsersWithSameCredentials": 3, + "externalPolicyFile": null, + "backgroundPosition": "left_top", + "backgroundRepeat": "no_repeat", + "radiusServiceId": 0, + "expiryType": "time_limited", + "userList": [ + ], + "macAllowList": [ + ], + "profileType": "captive_portal" }, "createdTimestamp": 1611857459118, "lastModifiedTimestamp": 1611857459118, - "childProfileIds": [] -} \ No newline at end of file + "childProfileIds": [ + ] + } +] diff --git a/opensync-ext-static/src/main/resources/ProfileHotspot20.json b/opensync-ext-static/src/main/resources/ProfileHotspot20.json deleted file mode 100644 index 7c0559e..0000000 --- a/opensync-ext-static/src/main/resources/ProfileHotspot20.json +++ /dev/null @@ -1,71 +0,0 @@ -[ -{ - "model_type": "Profile", - "id": 37, - "customerId": 2, - "profileType": "passpoint", - "name": "hotspot20-profile-2021-01-21T21:28:59.171Z", - "details": { - "model_type": "PasspointProfile", - "enableInterworkingAndHs20": true, - "hessid": null, - "passpointAccessNetworkType": "free_public_network", - "passpointNetworkAuthenticationType": "acceptance_of_terms_and_conditions", - "additionalStepsRequiredForAccess": 0, - "deauthRequestTimeout": 0, - "operatingClass": 0, - "termsAndConditionsFile": { - "model_type": "ManagedFileInfo", - "md5checksum": null, - "lastModifiedTimestamp": null, - "apExportUrl": "https://localhost:9091/filestore/termsAndConditions", - "fileCategory": "ExternalPolicyConfiguration", - "fileType": "TEXT", - "altSlot": false - }, - "whitelistDomain": null, - "emergencyServicesReachable": true, - "unauthenticatedEmergencyServiceAccessible": false, - "internetConnectivity": true, - "connectionCapabilitySet": [ - { - "model_type": "PasspointConnectionCapability", - "connectionCapabilitiesPortNumber": 8888, - "connectionCapabilitiesIpProtocol": "TCP", - "connectionCapabilitiesStatus": "open" - } - ], - "ipAddressTypeAvailability": "public_IPv4_address_available", - "qosMapSetConfiguration": null, - "apGeospatialLocation": null, - "apCivicLocation": null, - "apPublicLocationIdUri": null, - "gasAddr3Behaviour": "p2pSpecWorkaroundFromRequest", - "anqpDomainId": 1234, - "disableDownstreamGroupAddressedForwarding": false, - "enable2pt4GHz": true, - "enable5GHz": true, - "associatedAccessSsidProfileIds": [ - 32 - ], - "osuSsidProfileId": 31, - "passpointOperatorProfileId": 34, - "passpointVenueProfileId": 33, - "passpointOsuProviderProfileIds": [ - 35, - 36 - ], - "accessNetworkType": "free_public_network", - "networkAuthenticationType": "acceptance_of_terms_and_conditions", - "profileType": "passpoint" - }, - "createdTimestamp": 0, - "lastModifiedTimestamp": 1611264539331, - "childProfileIds": [ - 33, - 34, - 35, - 36 - ] -} -] diff --git a/opensync-ext-static/src/main/resources/ProfileIdProvider.json b/opensync-ext-static/src/main/resources/ProfileIdProvider.json deleted file mode 100644 index c9ee1e9..0000000 --- a/opensync-ext-static/src/main/resources/ProfileIdProvider.json +++ /dev/null @@ -1,263 +0,0 @@ -[ - { - "model_type": "Profile", - "id": 35, - "customerId": 2, - "profileType": "passpoint_osu_id_provider", - "name": "provider1-profile-2021-01-21T21:28:59.057Z", - "details": { - "model_type": "PasspointOsuProviderProfile", - "mccMncList": [ - { - "model_type": "PasspointMccMnc", - "mcc": 302, - "mnc": 720, - "iso": "ca", - "country": "Canada", - "countryCode": 1, - "network": "Rogers AT&T Wireless", - "mccMncPairing": "302,720" - } - ], - "naiRealmList": [ - { - "model_type": "PasspointNaiRealmInformation", - "naiRealms": [ - "rogers.com" - ], - "encoding": 0, - "eapMethods": [ - "EAP-TTLS with username/password", - "EAP-TLS with certificate" - ], - "eapMap": { - "EAP-TTLS with username/password": [ - "Credential Type:username/password", - "Non-EAP Inner Authentication Type:MSCHAPV2" - ], - "EAP-TLS with certificate": [ - "Credential Type:Certificate" - ] - } - } - ], - "osuIconList": [ - { - "model_type": "PasspointOsuIcon", - "iconWidth": 32, - "iconHeight": 32, - "languageCode": "eng", - "iconLocale": "en_CA", - "iconName": "icon32eng", - "filePath": "/tmp/icon32eng.png", - "imageUrl": "https://localhost:9096/icon32eng.png", - "hs20IconString": "32:32:eng:image/png:icon32eng:/tmp/icon32eng.png" - }, - { - "model_type": "PasspointOsuIcon", - "iconWidth": 32, - "iconHeight": 32, - "languageCode": "fra", - "iconLocale": "fr_CA", - "iconName": "icon32fra", - "filePath": "/tmp/icon32fra.png", - "imageUrl": "https://localhost:9096/icon32fra.png", - "hs20IconString": "32:32:fra:image/png:icon32fra:/tmp/icon32fra.png" - }, - { - "model_type": "PasspointOsuIcon", - "iconWidth": 32, - "iconHeight": 32, - "languageCode": "eng", - "iconLocale": "en_US", - "iconName": "icon32usa", - "filePath": "/tmp/icon32usa.png", - "imageUrl": "https://localhost:9096/icon32usa.png", - "hs20IconString": "32:32:eng:image/png:icon32usa:/tmp/icon32usa.png" - } - ], - "osuServerUri": "https://example.com/osu/rogers", - "osuFriendlyName": [ - { - "model_type": "PasspointDuple", - "locale": "eng", - "dupleIso3Language": "eng", - "dupleName": "Example provider rogers", - "defaultDupleSeparator": ":", - "asDuple": "eng:Example provider rogers" - }, - { - "model_type": "PasspointDuple", - "locale": "fra", - "dupleIso3Language": "fra", - "dupleName": "Exemple de fournisseur rogers", - "defaultDupleSeparator": ":", - "asDuple": "fra:Exemple de fournisseur rogers" - } - ], - "osuNaiStandalone": "anonymous@rogers.com", - "osuNaiShared": "anonymous@rogers.com", - "osuMethodList": [ - 1, - 0 - ], - "osuServiceDescription": [ - { - "model_type": "PasspointDuple", - "locale": "eng", - "dupleIso3Language": "eng", - "dupleName": "Example services rogers", - "defaultDupleSeparator": ":", - "asDuple": "eng:Example services rogers" - }, - { - "model_type": "PasspointDuple", - "locale": "fra", - "dupleIso3Language": "fra", - "dupleName": "Exemples de services rogers", - "defaultDupleSeparator": ":", - "asDuple": "fra:Exemples de services rogers" - } - ], - "roamingOi": [ - "BAA2D00100", - "BAA2D00000" - ], - "profileType": "passpoint_osu_id_provider" - }, - "createdTimestamp": 1611264539070, - "lastModifiedTimestamp": 1611264539070, - "childProfileIds": [] - }, - { - "model_type": "Profile", - "id": 36, - "customerId": 2, - "profileType": "passpoint_osu_id_provider", - "name": "provider2-profile-2021-01-21T21:28:59.118Z", - "details": { - "model_type": "PasspointOsuProviderProfile", - "mccMncList": [ - { - "model_type": "PasspointMccMnc", - "mcc": 302, - "mnc": 220, - "iso": "ca", - "country": "Canada", - "countryCode": 1, - "network": "Telus Mobility", - "mccMncPairing": "302,220" - } - ], - "naiRealmList": [ - { - "model_type": "PasspointNaiRealmInformation", - "naiRealms": [ - "telus.com" - ], - "encoding": 0, - "eapMethods": [ - "EAP-TTLS with username/password", - "EAP-TLS with certificate" - ], - "eapMap": { - "EAP-TTLS with username/password": [ - "Credential Type:username/password", - "Non-EAP Inner Authentication Type:MSCHAPV2" - ], - "EAP-TLS with certificate": [ - "Credential Type:Certificate" - ] - } - } - ], - "osuIconList": [ - { - "model_type": "PasspointOsuIcon", - "iconWidth": 32, - "iconHeight": 32, - "languageCode": "eng", - "iconLocale": "en_CA", - "iconName": "icon32eng", - "filePath": "/tmp/icon32eng.png", - "imageUrl": "https://localhost:9096/icon32eng.png", - "hs20IconString": "32:32:eng:image/png:icon32eng:/tmp/icon32eng.png" - }, - { - "model_type": "PasspointOsuIcon", - "iconWidth": 32, - "iconHeight": 32, - "languageCode": "fra", - "iconLocale": "fr_CA", - "iconName": "icon32fra", - "filePath": "/tmp/icon32fra.png", - "imageUrl": "https://localhost:9096/icon32fra.png", - "hs20IconString": "32:32:fra:image/png:icon32fra:/tmp/icon32fra.png" - }, - { - "model_type": "PasspointOsuIcon", - "iconWidth": 32, - "iconHeight": 32, - "languageCode": "eng", - "iconLocale": "en_US", - "iconName": "icon32usa", - "filePath": "/tmp/icon32usa.png", - "imageUrl": "https://localhost:9096/icon32usa.png", - "hs20IconString": "32:32:eng:image/png:icon32usa:/tmp/icon32usa.png" - } - ], - "osuServerUri": "https://example.com/osu/telus", - "osuFriendlyName": [ - { - "model_type": "PasspointDuple", - "locale": "eng", - "dupleIso3Language": "eng", - "dupleName": "Example provider telus", - "defaultDupleSeparator": ":", - "asDuple": "eng:Example provider telus" - }, - { - "model_type": "PasspointDuple", - "locale": "fra", - "dupleIso3Language": "fra", - "dupleName": "Exemple de fournisseur telus", - "defaultDupleSeparator": ":", - "asDuple": "fra:Exemple de fournisseur telus" - } - ], - "osuNaiStandalone": "anonymous@telus.com", - "osuNaiShared": "anonymous@telus.com", - "osuMethodList": [ - 1, - 0 - ], - "osuServiceDescription": [ - { - "model_type": "PasspointDuple", - "locale": "eng", - "dupleIso3Language": "eng", - "dupleName": "Example services telus", - "defaultDupleSeparator": ":", - "asDuple": "eng:Example services telus" - }, - { - "model_type": "PasspointDuple", - "locale": "fra", - "dupleIso3Language": "fra", - "dupleName": "Exemples de services telus", - "defaultDupleSeparator": ":", - "asDuple": "fra:Exemples de services telus" - } - ], - "roamingOi": [ - "004096", - "005014", - "F4F5E8F5F4" - ], - "profileType": "passpoint_osu_id_provider" - }, - "createdTimestamp": 1611264539131, - "lastModifiedTimestamp": 1611264539131, - "childProfileIds": [] - } -] \ No newline at end of file diff --git a/opensync-ext-static/src/main/resources/ProfileMetrics.json b/opensync-ext-static/src/main/resources/ProfileMetrics.json deleted file mode 100644 index 54d7d28..0000000 --- a/opensync-ext-static/src/main/resources/ProfileMetrics.json +++ /dev/null @@ -1,299 +0,0 @@ -[ - { - "model_type": "Profile", - "id": 10, - "customerId": 2, - "profileType": "service_metrics_collection_config", - "name": "Metrics-Profile-3-Radios", - "details": { - "model_type": "ServiceMetricsCollectionConfigProfile", - "radioTypes": [ - "is5GHzL", - "is2dot4GHz", - "is5GHzU" - ], - "serviceMetricDataTypes": [ - "ApNode", - "ApSsid", - "Client", - "Channel", - "Neighbour" - ], - "metricConfigParameterMap": { - "ApNode": [ - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 120, - "channelSurveyType": "OFF_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "radioType": "is5GHzL", - "serviceMetricDataType": "ApNode", - "statsReportFormat": "RAW" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 120, - "channelSurveyType": "OFF_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "radioType": "is5GHzU", - "serviceMetricDataType": "ApNode", - "statsReportFormat": "RAW" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 120, - "channelSurveyType": "OFF_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "radioType": "is2dot4GHz", - "serviceMetricDataType": "ApNode", - "statsReportFormat": "RAW" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "radioType": "is5GHzU", - "serviceMetricDataType": "ApNode", - "statsReportFormat": "RAW" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "radioType": "is2dot4GHz", - "serviceMetricDataType": "ApNode", - "statsReportFormat": "RAW" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "radioType": "is5GHzL", - "serviceMetricDataType": "ApNode", - "statsReportFormat": "RAW" - } - ], - "ApSsid": [ - { - "model_type": "ServiceMetricRadioConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "radioType": "is5GHzU", - "serviceMetricDataType": "ApSsid" - }, - { - "model_type": "ServiceMetricRadioConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "radioType": "is5GHzL", - "serviceMetricDataType": "ApSsid" - }, - { - "model_type": "ServiceMetricRadioConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "radioType": "is2dot4GHz", - "serviceMetricDataType": "ApSsid" - } - ], - "Client": [ - { - "model_type": "ServiceMetricRadioConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "radioType": "is5GHzU", - "serviceMetricDataType": "Client" - }, - { - "model_type": "ServiceMetricRadioConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "radioType": "is5GHzL", - "serviceMetricDataType": "Client" - }, - { - "model_type": "ServiceMetricRadioConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "radioType": "is2dot4GHz", - "serviceMetricDataType": "Client" - } - ], - "Channel": [ - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 120, - "channelSurveyType": "OFF_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "radioType": "is5GHzL", - "serviceMetricDataType": "Channel", - "statsReportFormat": "RAW" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 120, - "channelSurveyType": "OFF_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "radioType": "is5GHzU", - "serviceMetricDataType": "Channel", - "statsReportFormat": "RAW" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 120, - "channelSurveyType": "OFF_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "radioType": "is2dot4GHz", - "serviceMetricDataType": "Channel", - "statsReportFormat": "RAW" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "radioType": "is5GHzU", - "serviceMetricDataType": "Channel", - "statsReportFormat": "RAW" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "radioType": "is2dot4GHz", - "serviceMetricDataType": "Channel", - "statsReportFormat": "RAW" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "radioType": "is5GHzL", - "serviceMetricDataType": "Channel", - "statsReportFormat": "RAW" - } - ], - "Neighbour": [ - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 120, - "channelSurveyType": "OFF_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "radioType": "is5GHzU", - "serviceMetricDataType": "Neighbour", - "statsReportFormat": "RAW" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "radioType": "is5GHzL", - "serviceMetricDataType": "Neighbour", - "statsReportFormat": "RAW" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 120, - "channelSurveyType": "OFF_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "radioType": "is2dot4GHz", - "serviceMetricDataType": "Neighbour", - "statsReportFormat": "RAW" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "radioType": "is5GHzU", - "serviceMetricDataType": "Neighbour", - "statsReportFormat": "RAW" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 120, - "channelSurveyType": "OFF_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "radioType": "is5GHzL", - "serviceMetricDataType": "Neighbour", - "statsReportFormat": "RAW" - }, - { - "model_type": "ServiceMetricSurveyConfigParameters", - "samplingInterval": 30, - "reportingIntervalSeconds": 60, - "channelSurveyType": "ON_CHANNEL", - "scanIntervalMillis": 0, - "percentUtilizationThreshold": 10, - "delayMillisecondsThreshold": 600, - "radioType": "is2dot4GHz", - "serviceMetricDataType": "Neighbour", - "statsReportFormat": "RAW" - } - ] - }, - "profileType": "service_metrics_collection_config" - }, - "createdTimestamp": 1606778369931, - "lastModifiedTimestamp": 1606778369931, - "childProfileIds": [ - ] - } -] diff --git a/opensync-ext-static/src/main/resources/ProfileOperator.json b/opensync-ext-static/src/main/resources/ProfileOperator.json deleted file mode 100644 index 0d8df1d..0000000 --- a/opensync-ext-static/src/main/resources/ProfileOperator.json +++ /dev/null @@ -1,41 +0,0 @@ -[ -{ - "model_type": "Profile", - "id": 34, - "customerId": 2, - "profileType": "passpoint_operator", - "name": "operator-profile-2021-01-21T21:28:58.994Z", - "details": { - "model_type": "PasspointOperatorProfile", - "serverOnlyAuthenticatedL2EncryptionNetwork": false, - "x509CertificateLocation": "/etc/ca.pem", - "operatorFriendlyName": [ - { - "model_type": "PasspointDuple", - "locale": "fra", - "dupleIso3Language": "fra", - "dupleName": "Nom de l'opérateur convivial par défaut", - "defaultDupleSeparator": ":", - "asDuple": "fra:Nom de l'opérateur convivial par défaut" - }, - { - "model_type": "PasspointDuple", - "locale": "eng", - "dupleIso3Language": "eng", - "dupleName": "Default friendly passpoint_operator name", - "defaultDupleSeparator": ":", - "asDuple": "eng:Default friendly passpoint_operator name" - } - ], - "domainNameList": [ - "bell.ca", - "telus.com", - "rogers.com" - ], - "profileType": "passpoint_operator" - }, - "createdTimestamp": 1611264539004, - "lastModifiedTimestamp": 1611264539004, - "childProfileIds": [] -} -] \ No newline at end of file diff --git a/opensync-ext-static/src/main/resources/ProfileRadius.json b/opensync-ext-static/src/main/resources/ProfileRadius.json deleted file mode 100644 index 9846495..0000000 --- a/opensync-ext-static/src/main/resources/ProfileRadius.json +++ /dev/null @@ -1,24 +0,0 @@ -[ - { - "model_type": "Profile", - "id": 1, - "customerId": 2, - "profileType": "radius", - "name": "Radius-Profile", - "details": { - "model_type": "RadiusProfile", - "primaryRadiusAuthServer": { - "model_type": "RadiusServer", - "ipAddress": "192.168.0.1", - "secret": "testing123", - "port": 1812, - "timeout": null - }, - "profileType": "radius" - }, - "createdTimestamp": 1611262628767, - "lastModifiedTimestamp": 1611262628767, - "childProfileIds": [ - ] - } -] diff --git a/opensync-ext-static/src/main/resources/ProfileRf.json b/opensync-ext-static/src/main/resources/ProfileRf.json index 96330d1..07213de 100644 --- a/opensync-ext-static/src/main/resources/ProfileRf.json +++ b/opensync-ext-static/src/main/resources/ProfileRf.json @@ -198,7 +198,7 @@ }, "profileType": "rf" }, - "createdTimestamp": 1611262628788, - "lastModifiedTimestamp": 1611262628788, + "createdTimestamp": 1612285248650, + "lastModifiedTimestamp": 1612285248650, "childProfileIds": [] } \ No newline at end of file diff --git a/opensync-ext-static/src/main/resources/ProfileSsid.json b/opensync-ext-static/src/main/resources/ProfileSsid.json index 7ddccf3..07408fe 100644 --- a/opensync-ext-static/src/main/resources/ProfileSsid.json +++ b/opensync-ext-static/src/main/resources/ProfileSsid.json @@ -1,226 +1,76 @@ [ - { +{ "model_type": "Profile", - "id": 5, + "id": 2, "customerId": 2, "profileType": "ssid", "name": "TipWlan-cloud-3-radios", "details": { - "model_type": "SsidConfiguration", - "ssid": "TipWlan-cloud-3-radios", - "appliedRadios": [ - "is5GHzL", - "is2dot4GHz", - "is5GHzU" - ], - "ssidAdminState": "enabled", - "secureMode": "wpa2OnlyPSK", - "vlanId": 1, - "keyStr": "openwifi", - "broadcastSsid": "enabled", - "keyRefresh": 0, - "noLocalSubnets": false, - "radiusServiceId": 0, - "radiusAcountingServiceInterval": 60, - "captivePortalId": null, - "bandwidthLimitDown": 0, - "bandwidthLimitUp": 0, - "clientBandwidthLimitDown": 0, - "clientBandwidthLimitUp": 0, - "videoTrafficOnly": false, - "radioBasedConfigs": { - "is5GHzL": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null + "model_type": "SsidConfiguration", + "ssid": "TipWlan-cloud-3-radios", + "appliedRadios": [ + "is5GHzU", + "is2dot4GHz", + "is5GHzL" + ], + "ssidAdminState": "enabled", + "secureMode": "wpa2OnlyPSK", + "vlanId": 1, + "keyStr": "openwifi", + "broadcastSsid": "enabled", + "keyRefresh": 0, + "noLocalSubnets": false, + "radiusServiceId": 0, + "radiusAcountingServiceInterval": 60, + "captivePortalId": null, + "bandwidthLimitDown": 0, + "bandwidthLimitUp": 0, + "clientBandwidthLimitDown": 0, + "clientBandwidthLimitUp": 0, + "videoTrafficOnly": false, + "radioBasedConfigs": { + "is5GHzU": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + }, + "is2dot4GHz": { + "model_type": "RadioBasedSsidConfiguration2g", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null, + "enable80211b": false + }, + "is5GHz": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + }, + "is5GHzL": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + } }, - "is2dot4GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzU": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null + "bonjourGatewayProfileId": null, + "enable80211w": null, + "wepConfig": null, + "forwardMode": "BRIDGE", + "profileType": "ssid", + "radiusClientConfiguration": { + "model_type": "RadiusNasConfiguration", + "nasClientId": "DEFAULT", + "nasClientIp": "WAN_IP", + "userDefinedNasId": null, + "userDefinedNasIp": null, + "operatorId": null } - }, - "bonjourGatewayProfileId": null, - "enable80211w": null, - "wepConfig": null, - "forwardMode": "BRIDGE", - "profileType": "ssid", - "radiusClientConfiguration": { - "model_type": "RadiusNasConfiguration", - "nasClientId": "DEFAULT", - "nasClientIp": "WAN_IP", - "userDefinedNasId": null, - "userDefinedNasIp": null, - "operatorId": null - } }, - "createdTimestamp": 1606778369598, - "lastModifiedTimestamp": 1606778369598, - "childProfileIds": [ - ] - }, - { - "model_type": "Profile", - "id": 32, - "customerId": 2, - "profileType": "ssid", - "name": "access-ssid-profile-2021-01-21T21:28:58.871Z", - "details": { - "model_type": "SsidConfiguration", - "ssid": "ssid-access-passpoint", - "appliedRadios": [ - "is5GHzU", - "is5GHzL" - ], - "ssidAdminState": "enabled", - "secureMode": "wpa2EAP", - "vlanId": 1, - "keyStr": "testing123", - "broadcastSsid": "enabled", - "keyRefresh": 0, - "noLocalSubnets": false, - "radiusServiceId": 1, - "radiusAccountingServiceId": 1, - "radiusAcountingServiceInterval": 60, - "captivePortalId": null, - "bandwidthLimitDown": 0, - "bandwidthLimitUp": 0, - "clientBandwidthLimitDown": 0, - "clientBandwidthLimitUp": 0, - "videoTrafficOnly": false, - "radioBasedConfigs": { - "is5GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzU": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is2dot4GHz": { - "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, - "radiusClientConfiguration": { - "model_type": "RadiusNasConfiguration", - "nasClientId": "DEFAULT", - "nasClientIp": "WAN_IP", - "userDefinedNasId": null, - "userDefinedNasIp": null, - "operatorId": null - }, - "profileType": "ssid" - }, - "createdTimestamp": 0, - "lastModifiedTimestamp": 1611264539281, - "childProfileIds": [ - 37, - 1 - ] - }, - { - "model_type": "Profile", - "id": 31, - "customerId": 2, - "profileType": "ssid", - "name": "osu-ssid-profile-2021-01-21T21:28:58.798Z", - "details": { - "model_type": "SsidConfiguration", - "ssid": "ssid-open-passpoint", - "appliedRadios": [ - "is2dot4GHz" - ], - "ssidAdminState": "enabled", - "secureMode": "open", - "vlanId": 1, - "keyStr": null, - "broadcastSsid": "enabled", - "keyRefresh": 0, - "noLocalSubnets": false, - "radiusServiceId": 0, - "radiusAccountingServiceId": 0, - "radiusAcountingServiceInterval": 60, - "captivePortalId": null, - "bandwidthLimitDown": 0, - "bandwidthLimitUp": 0, - "clientBandwidthLimitDown": 0, - "clientBandwidthLimitUp": 0, - "videoTrafficOnly": false, - "radioBasedConfigs": { - "is5GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzU": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is2dot4GHz": { - "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, - "radiusClientConfiguration": { - "model_type": "RadiusNasConfiguration", - "nasClientId": "DEFAULT", - "nasClientIp": "WAN_IP", - "userDefinedNasId": null, - "userDefinedNasIp": null, - "operatorId": null - }, - "profileType": "ssid" - }, - "createdTimestamp": 0, - "lastModifiedTimestamp": 1611264539231, - "childProfileIds": [ - 37 - ] - } + "createdTimestamp": 1612285248638, + "lastModifiedTimestamp": 1612285248638, + "childProfileIds": [] +} ] diff --git a/opensync-ext-static/src/main/resources/ProfileVenue.json b/opensync-ext-static/src/main/resources/ProfileVenue.json deleted file mode 100644 index fd674e3..0000000 --- a/opensync-ext-static/src/main/resources/ProfileVenue.json +++ /dev/null @@ -1,42 +0,0 @@ -[ -{ - "model_type": "Profile", - "id": 33, - "customerId": 2, - "profileType": "passpoint_venue", - "name": "venue-profile-2021-01-21T21:28:58.934Z", - "details": { - "model_type": "PasspointVenueProfile", - "venueNameSet": [ - { - "model_type": "PasspointVenueName", - "locale": "fra", - "dupleIso3Language": "fra", - "dupleName": "Exemple de lieu", - "defaultDupleSeparator": ":", - "venueUrl": "http://www.example.com/info-fra", - "asDuple": "fra:Exemple de lieu" - }, - { - "model_type": "PasspointVenueName", - "locale": "eng", - "dupleIso3Language": "eng", - "dupleName": "Example passpoint_venue", - "defaultDupleSeparator": ":", - "venueUrl": "http://www.example.com/info-eng", - "asDuple": "eng:Example passpoint_venue" - } - ], - "venueTypeAssignment": { - "model_type": "PasspointVenueTypeAssignment", - "venueDescription": "Research and Development Facility", - "venueGroupId": 2, - "venueTypeId": 8 - }, - "profileType": "passpoint_venue" - }, - "createdTimestamp": 1611264538947, - "lastModifiedTimestamp": 1611264538947, - "childProfileIds": [] -} -] \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/EquipmentExample.json b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/EquipmentExample.json index 5b1a141..a5a3f9b 100644 --- a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/EquipmentExample.json +++ b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/EquipmentExample.json @@ -2,7 +2,7 @@ "model_type": "Equipment", "id": 1, "customerId": 2, - "profileId": 38, + "profileId": 8, "locationId": 8, "equipmentType": "AP", "inventoryId": "Open_AP_21P10C68818122", @@ -464,6 +464,6 @@ "addressAsString": "24:f5:a2:ef:2e:53" }, "serial": "21P10C68818122", - "createdTimestamp": 1611857503082, - "lastModifiedTimestamp": 1611857505529 + "createdTimestamp": 1612285288821, + "lastModifiedTimestamp": 1612285293922 } \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/LocationBuildingExample.json b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/LocationBuildingExample.json index 5f236a3..dd4c748 100644 --- a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/LocationBuildingExample.json +++ b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/LocationBuildingExample.json @@ -1,60 +1,61 @@ { - "model_type" : "Location", - "id" : 8, - "parentId" : 0, - "locationType" : "SITE", - "customerId" : 2, - "name" : "Ottawa", - "details" : { - "model_type" : "LocationDetails", - "countryCode" : "ca", - "maintenanceWindow" : null, - "rrmEnabled" : true, - "dailyActivityDetails" : { - "SUNDAY" : { - "model_type" : "LocationActivityDetails", - "busyTime" : "13:30", - "quietTime" : "3:30", - "timezone" : "US/Eastern" - }, - "MONDAY" : { - "model_type" : "LocationActivityDetails", - "busyTime" : "13:30", - "quietTime" : "3:30", - "timezone" : "US/Eastern" - }, - "TUESDAY" : { - "model_type" : "LocationActivityDetails", - "busyTime" : "13:30", - "quietTime" : "3:30", - "timezone" : "US/Eastern" - }, - "WEDNESDAY" : { - "model_type" : "LocationActivityDetails", - "busyTime" : "13:30", - "quietTime" : "3:30", - "timezone" : "US/Eastern" - }, - "THURSDAY" : { - "model_type" : "LocationActivityDetails", - "busyTime" : "13:30", - "quietTime" : "3:30", - "timezone" : "US/Eastern" - }, - "FRIDAY" : { - "model_type" : "LocationActivityDetails", - "busyTime" : "13:30", - "quietTime" : "3:30", - "timezone" : "US/Eastern" - }, - "SATURDAY" : { - "model_type" : "LocationActivityDetails", - "busyTime" : "13:30", - "quietTime" : "3:30", - "timezone" : "US/Eastern" - } - } - }, - "createdTimestamp" : 1590607043540, - "lastModifiedTimestamp" : 1590607043540 + "model_type": "Location", + "id": 8, + "parentId": 0, + "locationType": "SITE", + "customerId": 2, + "name": "Ottawa", + "details": { + "model_type": "LocationDetails", + "countryCode": "CA", + "dailyActivityDetails": { + "SUNDAY": { + "model_type": "LocationActivityDetails", + "busyTime": "13:30", + "quietTime": "3:00", + "timezone": "US/Eastern" + }, + "MONDAY": { + "model_type": "LocationActivityDetails", + "busyTime": "13:30", + "quietTime": "3:00", + "timezone": "US/Eastern" + }, + "TUESDAY": { + "model_type": "LocationActivityDetails", + "busyTime": "13:30", + "quietTime": "3:00", + "timezone": "US/Eastern" + }, + "WEDNESDAY": { + "model_type": "LocationActivityDetails", + "busyTime": "13:30", + "quietTime": "3:00", + "timezone": "US/Eastern" + }, + "THURSDAY": { + "model_type": "LocationActivityDetails", + "busyTime": "13:30", + "quietTime": "3:00", + "timezone": "US/Eastern" + }, + "FRIDAY": { + "model_type": "LocationActivityDetails", + "busyTime": "13:30", + "quietTime": "3:00", + "timezone": "US/Eastern" + }, + "SATURDAY": { + "model_type": "LocationActivityDetails", + "busyTime": "13:30", + "quietTime": "3:00", + "timezone": "US/Eastern" + } + }, + "maintenanceWindow": null, + "rrmEnabled": true, + "timezone": "US/Eastern" + }, + "createdTimestamp": 1612285243534, + "lastModifiedTimestamp": 1612285243534 } \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileAPExample.json b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileAPExample.json index d3ff906..37ee3e3 100644 --- a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileAPExample.json +++ b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileAPExample.json @@ -1,64 +1,58 @@ { - "model_type": "Profile", - "id": 38, - "customerId": 2, - "profileType": "equipment_ap", - "name": "ap-profile-2021-01-21T21:28:59.371Z", - "details": { - "model_type": "ApNetworkConfiguration", - "networkConfigVersion": "AP-1", - "equipmentType": "AP", - "vlanNative": true, - "vlan": 0, - "ntpServer": { - "model_type": "AutoOrManualString", - "auto": true, - "value": "pool.ntp.org" + "model_type": "Profile", + "id": 8, + "customerId": 2, + "profileType": "equipment_ap", + "name": "ApProfile-3-radios", + "details": { + "model_type": "ApNetworkConfiguration", + "networkConfigVersion": "AP-1", + "equipmentType": "AP", + "vlanNative": true, + "vlan": 0, + "ntpServer": { + "model_type": "AutoOrManualString", + "auto": true, + "value": "pool.ntp.org" + }, + "syslogRelay": null, + "rtlsSettings": null, + "syntheticClientEnabled": true, + "ledControlEnabled": true, + "equipmentDiscovery": false, + "radioMap": { + "is2dot4GHz": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + }, + "is5GHzU": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + }, + "is5GHzL": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + } + }, + "greTunnelConfigurations": [ + { + "model_type": "GreTunnelConfiguration", + "greTunnelName": "gre1", + "greRemoteInetAddr": "192.168.1.101", + "vlanIdsInGreTunnel": [ + 100 + ] + } + ], + "profileType": "equipment_ap" }, - "syslogRelay": null, - "rtlsSettings": null, - "syntheticClientEnabled": true, - "ledControlEnabled": true, - "equipmentDiscovery": false, - "radioMap": { - "is5GHz": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is2dot4GHz": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is5GHzU": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is5GHzL": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - } - }, - "greTunnelConfigurations": [ - { - "model_type": "GreTunnelConfiguration", - "greTunnelName": null, - "greRemoteInetAddr": null, - "vlanIdsInGreTunnel": [ - ] - } - ], - "profileType": "equipment_ap" - }, - "createdTimestamp": 1611264539383, - "lastModifiedTimestamp": 1611264539383, - "childProfileIds": [ - 4, - 5, - 31, - 32 - ] -} + "createdTimestamp": 1612285248925, + "lastModifiedTimestamp": 1612285628377, + "childProfileIds": [ + 2, + 4 + ] +} \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileCaptive.json b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileCaptive.json index 0337c36..e69e74f 100644 --- a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileCaptive.json +++ b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileCaptive.json @@ -1,52 +1,58 @@ -{ +[ + { "model_type": "Profile", "id": 5, "customerId": 2, "profileType": "captive_portal", "name": "Captive-portal", "details": { - "model_type": "CaptivePortalConfiguration", - "name": "Default", - "browserTitle": "Captive-portal", - "headerContent": "Captive Portal", - "userAcceptancePolicy": "Please agree to the following terms for using this network:", - "successPageMarkdownText": "You are now authorized and connected to the network.", - "redirectURL": "https://www.google.com", - "externalCaptivePortalURL": null, - "sessionTimeoutInMinutes": 10, - "logoFile": { - "model_type": "ManagedFileInfo", - "md5checksum": null, - "lastModifiedTimestamp": null, - "apExportUrl": "/filestore/tip-logo-mobile", - "fileCategory": "CaptivePortalLogo", - "fileType": "PNG", - "altSlot": false - }, - "backgroundFile": { - "model_type": "ManagedFileInfo", - "md5checksum": null, - "lastModifiedTimestamp": null, - "apExportUrl": "/filestore/tip-logo", - "fileCategory": "CaptivePortalBackground", - "fileType": "PNG", - "altSlot": false - }, - "walledGardenAllowlist": [], - "usernamePasswordFile": null, - "authenticationType": "guest", - "radiusAuthMethod": "CHAP", - "maxUsersWithSameCredentials": 3, - "externalPolicyFile": null, - "backgroundPosition": "left_top", - "backgroundRepeat": "no_repeat", - "radiusServiceId": 0, - "expiryType": "time_limited", - "userList": [], - "macAllowList": [], - "profileType": "captive_portal" + "model_type": "CaptivePortalConfiguration", + "name": "Default", + "browserTitle": "Captive-portal", + "headerContent": "Captive Portal", + "userAcceptancePolicy": "Please agree to the following terms for using this network:", + "successPageMarkdownText": "You are now authorized and connected to the network.", + "redirectURL": "https://www.google.com", + "externalCaptivePortalURL": null, + "sessionTimeoutInMinutes": 10, + "logoFile": { + "model_type": "ManagedFileInfo", + "md5checksum": null, + "lastModifiedTimestamp": null, + "apExportUrl": "/filestore/tip-logo-mobile", + "fileCategory": "CaptivePortalLogo", + "fileType": "PNG", + "altSlot": false + }, + "backgroundFile": { + "model_type": "ManagedFileInfo", + "md5checksum": null, + "lastModifiedTimestamp": null, + "apExportUrl": "/filestore/tip-logo", + "fileCategory": "CaptivePortalBackground", + "fileType": "PNG", + "altSlot": false + }, + "walledGardenAllowlist": [ + ], + "usernamePasswordFile": null, + "authenticationType": "guest", + "radiusAuthMethod": "CHAP", + "maxUsersWithSameCredentials": 3, + "externalPolicyFile": null, + "backgroundPosition": "left_top", + "backgroundRepeat": "no_repeat", + "radiusServiceId": 0, + "expiryType": "time_limited", + "userList": [ + ], + "macAllowList": [ + ], + "profileType": "captive_portal" }, "createdTimestamp": 1611857459118, "lastModifiedTimestamp": 1611857459118, - "childProfileIds": [] -} \ No newline at end of file + "childProfileIds": [ + ] + } +] diff --git a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileRf.json b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileRf.json index 96330d1..07213de 100644 --- a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileRf.json +++ b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileRf.json @@ -198,7 +198,7 @@ }, "profileType": "rf" }, - "createdTimestamp": 1611262628788, - "lastModifiedTimestamp": 1611262628788, + "createdTimestamp": 1612285248650, + "lastModifiedTimestamp": 1612285248650, "childProfileIds": [] } \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileSsid.json b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileSsid.json index 7ddccf3..07408fe 100644 --- a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileSsid.json +++ b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileSsid.json @@ -1,226 +1,76 @@ [ - { +{ "model_type": "Profile", - "id": 5, + "id": 2, "customerId": 2, "profileType": "ssid", "name": "TipWlan-cloud-3-radios", "details": { - "model_type": "SsidConfiguration", - "ssid": "TipWlan-cloud-3-radios", - "appliedRadios": [ - "is5GHzL", - "is2dot4GHz", - "is5GHzU" - ], - "ssidAdminState": "enabled", - "secureMode": "wpa2OnlyPSK", - "vlanId": 1, - "keyStr": "openwifi", - "broadcastSsid": "enabled", - "keyRefresh": 0, - "noLocalSubnets": false, - "radiusServiceId": 0, - "radiusAcountingServiceInterval": 60, - "captivePortalId": null, - "bandwidthLimitDown": 0, - "bandwidthLimitUp": 0, - "clientBandwidthLimitDown": 0, - "clientBandwidthLimitUp": 0, - "videoTrafficOnly": false, - "radioBasedConfigs": { - "is5GHzL": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null + "model_type": "SsidConfiguration", + "ssid": "TipWlan-cloud-3-radios", + "appliedRadios": [ + "is5GHzU", + "is2dot4GHz", + "is5GHzL" + ], + "ssidAdminState": "enabled", + "secureMode": "wpa2OnlyPSK", + "vlanId": 1, + "keyStr": "openwifi", + "broadcastSsid": "enabled", + "keyRefresh": 0, + "noLocalSubnets": false, + "radiusServiceId": 0, + "radiusAcountingServiceInterval": 60, + "captivePortalId": null, + "bandwidthLimitDown": 0, + "bandwidthLimitUp": 0, + "clientBandwidthLimitDown": 0, + "clientBandwidthLimitUp": 0, + "videoTrafficOnly": false, + "radioBasedConfigs": { + "is5GHzU": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + }, + "is2dot4GHz": { + "model_type": "RadioBasedSsidConfiguration2g", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null, + "enable80211b": false + }, + "is5GHz": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + }, + "is5GHzL": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + } }, - "is2dot4GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzU": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null + "bonjourGatewayProfileId": null, + "enable80211w": null, + "wepConfig": null, + "forwardMode": "BRIDGE", + "profileType": "ssid", + "radiusClientConfiguration": { + "model_type": "RadiusNasConfiguration", + "nasClientId": "DEFAULT", + "nasClientIp": "WAN_IP", + "userDefinedNasId": null, + "userDefinedNasIp": null, + "operatorId": null } - }, - "bonjourGatewayProfileId": null, - "enable80211w": null, - "wepConfig": null, - "forwardMode": "BRIDGE", - "profileType": "ssid", - "radiusClientConfiguration": { - "model_type": "RadiusNasConfiguration", - "nasClientId": "DEFAULT", - "nasClientIp": "WAN_IP", - "userDefinedNasId": null, - "userDefinedNasIp": null, - "operatorId": null - } }, - "createdTimestamp": 1606778369598, - "lastModifiedTimestamp": 1606778369598, - "childProfileIds": [ - ] - }, - { - "model_type": "Profile", - "id": 32, - "customerId": 2, - "profileType": "ssid", - "name": "access-ssid-profile-2021-01-21T21:28:58.871Z", - "details": { - "model_type": "SsidConfiguration", - "ssid": "ssid-access-passpoint", - "appliedRadios": [ - "is5GHzU", - "is5GHzL" - ], - "ssidAdminState": "enabled", - "secureMode": "wpa2EAP", - "vlanId": 1, - "keyStr": "testing123", - "broadcastSsid": "enabled", - "keyRefresh": 0, - "noLocalSubnets": false, - "radiusServiceId": 1, - "radiusAccountingServiceId": 1, - "radiusAcountingServiceInterval": 60, - "captivePortalId": null, - "bandwidthLimitDown": 0, - "bandwidthLimitUp": 0, - "clientBandwidthLimitDown": 0, - "clientBandwidthLimitUp": 0, - "videoTrafficOnly": false, - "radioBasedConfigs": { - "is5GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzU": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is2dot4GHz": { - "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, - "radiusClientConfiguration": { - "model_type": "RadiusNasConfiguration", - "nasClientId": "DEFAULT", - "nasClientIp": "WAN_IP", - "userDefinedNasId": null, - "userDefinedNasIp": null, - "operatorId": null - }, - "profileType": "ssid" - }, - "createdTimestamp": 0, - "lastModifiedTimestamp": 1611264539281, - "childProfileIds": [ - 37, - 1 - ] - }, - { - "model_type": "Profile", - "id": 31, - "customerId": 2, - "profileType": "ssid", - "name": "osu-ssid-profile-2021-01-21T21:28:58.798Z", - "details": { - "model_type": "SsidConfiguration", - "ssid": "ssid-open-passpoint", - "appliedRadios": [ - "is2dot4GHz" - ], - "ssidAdminState": "enabled", - "secureMode": "open", - "vlanId": 1, - "keyStr": null, - "broadcastSsid": "enabled", - "keyRefresh": 0, - "noLocalSubnets": false, - "radiusServiceId": 0, - "radiusAccountingServiceId": 0, - "radiusAcountingServiceInterval": 60, - "captivePortalId": null, - "bandwidthLimitDown": 0, - "bandwidthLimitUp": 0, - "clientBandwidthLimitDown": 0, - "clientBandwidthLimitUp": 0, - "videoTrafficOnly": false, - "radioBasedConfigs": { - "is5GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzU": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is2dot4GHz": { - "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, - "radiusClientConfiguration": { - "model_type": "RadiusNasConfiguration", - "nasClientId": "DEFAULT", - "nasClientIp": "WAN_IP", - "userDefinedNasId": null, - "userDefinedNasIp": null, - "operatorId": null - }, - "profileType": "ssid" - }, - "createdTimestamp": 0, - "lastModifiedTimestamp": 1611264539231, - "childProfileIds": [ - 37 - ] - } + "createdTimestamp": 1612285248638, + "lastModifiedTimestamp": 1612285248638, + "childProfileIds": [] +} ] diff --git a/opensync-gateway-static-docker/src/main/docker/app/opensync/EquipmentExample.json b/opensync-gateway-static-docker/src/main/docker/app/opensync/EquipmentExample.json index 5b1a141..a5a3f9b 100644 --- a/opensync-gateway-static-docker/src/main/docker/app/opensync/EquipmentExample.json +++ b/opensync-gateway-static-docker/src/main/docker/app/opensync/EquipmentExample.json @@ -2,7 +2,7 @@ "model_type": "Equipment", "id": 1, "customerId": 2, - "profileId": 38, + "profileId": 8, "locationId": 8, "equipmentType": "AP", "inventoryId": "Open_AP_21P10C68818122", @@ -464,6 +464,6 @@ "addressAsString": "24:f5:a2:ef:2e:53" }, "serial": "21P10C68818122", - "createdTimestamp": 1611857503082, - "lastModifiedTimestamp": 1611857505529 + "createdTimestamp": 1612285288821, + "lastModifiedTimestamp": 1612285293922 } \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker/app/opensync/LocationBuildingExample.json b/opensync-gateway-static-docker/src/main/docker/app/opensync/LocationBuildingExample.json index 5f236a3..dd4c748 100644 --- a/opensync-gateway-static-docker/src/main/docker/app/opensync/LocationBuildingExample.json +++ b/opensync-gateway-static-docker/src/main/docker/app/opensync/LocationBuildingExample.json @@ -1,60 +1,61 @@ { - "model_type" : "Location", - "id" : 8, - "parentId" : 0, - "locationType" : "SITE", - "customerId" : 2, - "name" : "Ottawa", - "details" : { - "model_type" : "LocationDetails", - "countryCode" : "ca", - "maintenanceWindow" : null, - "rrmEnabled" : true, - "dailyActivityDetails" : { - "SUNDAY" : { - "model_type" : "LocationActivityDetails", - "busyTime" : "13:30", - "quietTime" : "3:30", - "timezone" : "US/Eastern" - }, - "MONDAY" : { - "model_type" : "LocationActivityDetails", - "busyTime" : "13:30", - "quietTime" : "3:30", - "timezone" : "US/Eastern" - }, - "TUESDAY" : { - "model_type" : "LocationActivityDetails", - "busyTime" : "13:30", - "quietTime" : "3:30", - "timezone" : "US/Eastern" - }, - "WEDNESDAY" : { - "model_type" : "LocationActivityDetails", - "busyTime" : "13:30", - "quietTime" : "3:30", - "timezone" : "US/Eastern" - }, - "THURSDAY" : { - "model_type" : "LocationActivityDetails", - "busyTime" : "13:30", - "quietTime" : "3:30", - "timezone" : "US/Eastern" - }, - "FRIDAY" : { - "model_type" : "LocationActivityDetails", - "busyTime" : "13:30", - "quietTime" : "3:30", - "timezone" : "US/Eastern" - }, - "SATURDAY" : { - "model_type" : "LocationActivityDetails", - "busyTime" : "13:30", - "quietTime" : "3:30", - "timezone" : "US/Eastern" - } - } - }, - "createdTimestamp" : 1590607043540, - "lastModifiedTimestamp" : 1590607043540 + "model_type": "Location", + "id": 8, + "parentId": 0, + "locationType": "SITE", + "customerId": 2, + "name": "Ottawa", + "details": { + "model_type": "LocationDetails", + "countryCode": "CA", + "dailyActivityDetails": { + "SUNDAY": { + "model_type": "LocationActivityDetails", + "busyTime": "13:30", + "quietTime": "3:00", + "timezone": "US/Eastern" + }, + "MONDAY": { + "model_type": "LocationActivityDetails", + "busyTime": "13:30", + "quietTime": "3:00", + "timezone": "US/Eastern" + }, + "TUESDAY": { + "model_type": "LocationActivityDetails", + "busyTime": "13:30", + "quietTime": "3:00", + "timezone": "US/Eastern" + }, + "WEDNESDAY": { + "model_type": "LocationActivityDetails", + "busyTime": "13:30", + "quietTime": "3:00", + "timezone": "US/Eastern" + }, + "THURSDAY": { + "model_type": "LocationActivityDetails", + "busyTime": "13:30", + "quietTime": "3:00", + "timezone": "US/Eastern" + }, + "FRIDAY": { + "model_type": "LocationActivityDetails", + "busyTime": "13:30", + "quietTime": "3:00", + "timezone": "US/Eastern" + }, + "SATURDAY": { + "model_type": "LocationActivityDetails", + "busyTime": "13:30", + "quietTime": "3:00", + "timezone": "US/Eastern" + } + }, + "maintenanceWindow": null, + "rrmEnabled": true, + "timezone": "US/Eastern" + }, + "createdTimestamp": 1612285243534, + "lastModifiedTimestamp": 1612285243534 } \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileAPExample.json b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileAPExample.json index 1165a84..37ee3e3 100644 --- a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileAPExample.json +++ b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileAPExample.json @@ -1,64 +1,58 @@ { - "model_type": "Profile", - "id": 38, - "customerId": 2, - "profileType": "equipment_ap", - "name": "ap-profile-2021-01-21T21:28:59.371Z", - "details": { - "model_type": "ApNetworkConfiguration", - "networkConfigVersion": "AP-1", - "equipmentType": "AP", - "vlanNative": true, - "vlan": 0, - "ntpServer": { - "model_type": "AutoOrManualString", - "auto": true, - "value": "pool.ntp.org" + "model_type": "Profile", + "id": 8, + "customerId": 2, + "profileType": "equipment_ap", + "name": "ApProfile-3-radios", + "details": { + "model_type": "ApNetworkConfiguration", + "networkConfigVersion": "AP-1", + "equipmentType": "AP", + "vlanNative": true, + "vlan": 0, + "ntpServer": { + "model_type": "AutoOrManualString", + "auto": true, + "value": "pool.ntp.org" + }, + "syslogRelay": null, + "rtlsSettings": null, + "syntheticClientEnabled": true, + "ledControlEnabled": true, + "equipmentDiscovery": false, + "radioMap": { + "is2dot4GHz": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + }, + "is5GHzU": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + }, + "is5GHzL": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + } + }, + "greTunnelConfigurations": [ + { + "model_type": "GreTunnelConfiguration", + "greTunnelName": "gre1", + "greRemoteInetAddr": "192.168.1.101", + "vlanIdsInGreTunnel": [ + 100 + ] + } + ], + "profileType": "equipment_ap" }, - "syslogRelay": null, - "rtlsSettings": null, - "syntheticClientEnabled": true, - "ledControlEnabled": true, - "equipmentDiscovery": false, - "radioMap": { - "is5GHz": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is2dot4GHz": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is5GHzU": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is5GHzL": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - } - }, - "greTunnelConfigurations": [ - { - "model_type": "GreTunnelConfiguration", - "greTunnelName": null, - "greRemoteInetAddr": null, - "vlanIdsInGreTunnel": [ - ] - } - ], - "profileType": "equipment_ap" - }, - "createdTimestamp": 1611264539383, - "lastModifiedTimestamp": 1611264539383, - "childProfileIds": [ - 4, - 5, - 31, - 32 - ] -} + "createdTimestamp": 1612285248925, + "lastModifiedTimestamp": 1612285628377, + "childProfileIds": [ + 2, + 4 + ] +} \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileCaptive.json b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileCaptive.json index 0337c36..e69e74f 100644 --- a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileCaptive.json +++ b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileCaptive.json @@ -1,52 +1,58 @@ -{ +[ + { "model_type": "Profile", "id": 5, "customerId": 2, "profileType": "captive_portal", "name": "Captive-portal", "details": { - "model_type": "CaptivePortalConfiguration", - "name": "Default", - "browserTitle": "Captive-portal", - "headerContent": "Captive Portal", - "userAcceptancePolicy": "Please agree to the following terms for using this network:", - "successPageMarkdownText": "You are now authorized and connected to the network.", - "redirectURL": "https://www.google.com", - "externalCaptivePortalURL": null, - "sessionTimeoutInMinutes": 10, - "logoFile": { - "model_type": "ManagedFileInfo", - "md5checksum": null, - "lastModifiedTimestamp": null, - "apExportUrl": "/filestore/tip-logo-mobile", - "fileCategory": "CaptivePortalLogo", - "fileType": "PNG", - "altSlot": false - }, - "backgroundFile": { - "model_type": "ManagedFileInfo", - "md5checksum": null, - "lastModifiedTimestamp": null, - "apExportUrl": "/filestore/tip-logo", - "fileCategory": "CaptivePortalBackground", - "fileType": "PNG", - "altSlot": false - }, - "walledGardenAllowlist": [], - "usernamePasswordFile": null, - "authenticationType": "guest", - "radiusAuthMethod": "CHAP", - "maxUsersWithSameCredentials": 3, - "externalPolicyFile": null, - "backgroundPosition": "left_top", - "backgroundRepeat": "no_repeat", - "radiusServiceId": 0, - "expiryType": "time_limited", - "userList": [], - "macAllowList": [], - "profileType": "captive_portal" + "model_type": "CaptivePortalConfiguration", + "name": "Default", + "browserTitle": "Captive-portal", + "headerContent": "Captive Portal", + "userAcceptancePolicy": "Please agree to the following terms for using this network:", + "successPageMarkdownText": "You are now authorized and connected to the network.", + "redirectURL": "https://www.google.com", + "externalCaptivePortalURL": null, + "sessionTimeoutInMinutes": 10, + "logoFile": { + "model_type": "ManagedFileInfo", + "md5checksum": null, + "lastModifiedTimestamp": null, + "apExportUrl": "/filestore/tip-logo-mobile", + "fileCategory": "CaptivePortalLogo", + "fileType": "PNG", + "altSlot": false + }, + "backgroundFile": { + "model_type": "ManagedFileInfo", + "md5checksum": null, + "lastModifiedTimestamp": null, + "apExportUrl": "/filestore/tip-logo", + "fileCategory": "CaptivePortalBackground", + "fileType": "PNG", + "altSlot": false + }, + "walledGardenAllowlist": [ + ], + "usernamePasswordFile": null, + "authenticationType": "guest", + "radiusAuthMethod": "CHAP", + "maxUsersWithSameCredentials": 3, + "externalPolicyFile": null, + "backgroundPosition": "left_top", + "backgroundRepeat": "no_repeat", + "radiusServiceId": 0, + "expiryType": "time_limited", + "userList": [ + ], + "macAllowList": [ + ], + "profileType": "captive_portal" }, "createdTimestamp": 1611857459118, "lastModifiedTimestamp": 1611857459118, - "childProfileIds": [] -} \ No newline at end of file + "childProfileIds": [ + ] + } +] diff --git a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileRf.json b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileRf.json index 96330d1..07213de 100644 --- a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileRf.json +++ b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileRf.json @@ -198,7 +198,7 @@ }, "profileType": "rf" }, - "createdTimestamp": 1611262628788, - "lastModifiedTimestamp": 1611262628788, + "createdTimestamp": 1612285248650, + "lastModifiedTimestamp": 1612285248650, "childProfileIds": [] } \ No newline at end of file diff --git a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileSsid.json b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileSsid.json index 7ddccf3..07408fe 100644 --- a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileSsid.json +++ b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileSsid.json @@ -1,226 +1,76 @@ [ - { +{ "model_type": "Profile", - "id": 5, + "id": 2, "customerId": 2, "profileType": "ssid", "name": "TipWlan-cloud-3-radios", "details": { - "model_type": "SsidConfiguration", - "ssid": "TipWlan-cloud-3-radios", - "appliedRadios": [ - "is5GHzL", - "is2dot4GHz", - "is5GHzU" - ], - "ssidAdminState": "enabled", - "secureMode": "wpa2OnlyPSK", - "vlanId": 1, - "keyStr": "openwifi", - "broadcastSsid": "enabled", - "keyRefresh": 0, - "noLocalSubnets": false, - "radiusServiceId": 0, - "radiusAcountingServiceInterval": 60, - "captivePortalId": null, - "bandwidthLimitDown": 0, - "bandwidthLimitUp": 0, - "clientBandwidthLimitDown": 0, - "clientBandwidthLimitUp": 0, - "videoTrafficOnly": false, - "radioBasedConfigs": { - "is5GHzL": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null + "model_type": "SsidConfiguration", + "ssid": "TipWlan-cloud-3-radios", + "appliedRadios": [ + "is5GHzU", + "is2dot4GHz", + "is5GHzL" + ], + "ssidAdminState": "enabled", + "secureMode": "wpa2OnlyPSK", + "vlanId": 1, + "keyStr": "openwifi", + "broadcastSsid": "enabled", + "keyRefresh": 0, + "noLocalSubnets": false, + "radiusServiceId": 0, + "radiusAcountingServiceInterval": 60, + "captivePortalId": null, + "bandwidthLimitDown": 0, + "bandwidthLimitUp": 0, + "clientBandwidthLimitDown": 0, + "clientBandwidthLimitUp": 0, + "videoTrafficOnly": false, + "radioBasedConfigs": { + "is5GHzU": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + }, + "is2dot4GHz": { + "model_type": "RadioBasedSsidConfiguration2g", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null, + "enable80211b": false + }, + "is5GHz": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + }, + "is5GHzL": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + } }, - "is2dot4GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzU": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null + "bonjourGatewayProfileId": null, + "enable80211w": null, + "wepConfig": null, + "forwardMode": "BRIDGE", + "profileType": "ssid", + "radiusClientConfiguration": { + "model_type": "RadiusNasConfiguration", + "nasClientId": "DEFAULT", + "nasClientIp": "WAN_IP", + "userDefinedNasId": null, + "userDefinedNasIp": null, + "operatorId": null } - }, - "bonjourGatewayProfileId": null, - "enable80211w": null, - "wepConfig": null, - "forwardMode": "BRIDGE", - "profileType": "ssid", - "radiusClientConfiguration": { - "model_type": "RadiusNasConfiguration", - "nasClientId": "DEFAULT", - "nasClientIp": "WAN_IP", - "userDefinedNasId": null, - "userDefinedNasIp": null, - "operatorId": null - } }, - "createdTimestamp": 1606778369598, - "lastModifiedTimestamp": 1606778369598, - "childProfileIds": [ - ] - }, - { - "model_type": "Profile", - "id": 32, - "customerId": 2, - "profileType": "ssid", - "name": "access-ssid-profile-2021-01-21T21:28:58.871Z", - "details": { - "model_type": "SsidConfiguration", - "ssid": "ssid-access-passpoint", - "appliedRadios": [ - "is5GHzU", - "is5GHzL" - ], - "ssidAdminState": "enabled", - "secureMode": "wpa2EAP", - "vlanId": 1, - "keyStr": "testing123", - "broadcastSsid": "enabled", - "keyRefresh": 0, - "noLocalSubnets": false, - "radiusServiceId": 1, - "radiusAccountingServiceId": 1, - "radiusAcountingServiceInterval": 60, - "captivePortalId": null, - "bandwidthLimitDown": 0, - "bandwidthLimitUp": 0, - "clientBandwidthLimitDown": 0, - "clientBandwidthLimitUp": 0, - "videoTrafficOnly": false, - "radioBasedConfigs": { - "is5GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzU": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is2dot4GHz": { - "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, - "radiusClientConfiguration": { - "model_type": "RadiusNasConfiguration", - "nasClientId": "DEFAULT", - "nasClientIp": "WAN_IP", - "userDefinedNasId": null, - "userDefinedNasIp": null, - "operatorId": null - }, - "profileType": "ssid" - }, - "createdTimestamp": 0, - "lastModifiedTimestamp": 1611264539281, - "childProfileIds": [ - 37, - 1 - ] - }, - { - "model_type": "Profile", - "id": 31, - "customerId": 2, - "profileType": "ssid", - "name": "osu-ssid-profile-2021-01-21T21:28:58.798Z", - "details": { - "model_type": "SsidConfiguration", - "ssid": "ssid-open-passpoint", - "appliedRadios": [ - "is2dot4GHz" - ], - "ssidAdminState": "enabled", - "secureMode": "open", - "vlanId": 1, - "keyStr": null, - "broadcastSsid": "enabled", - "keyRefresh": 0, - "noLocalSubnets": false, - "radiusServiceId": 0, - "radiusAccountingServiceId": 0, - "radiusAcountingServiceInterval": 60, - "captivePortalId": null, - "bandwidthLimitDown": 0, - "bandwidthLimitUp": 0, - "clientBandwidthLimitDown": 0, - "clientBandwidthLimitUp": 0, - "videoTrafficOnly": false, - "radioBasedConfigs": { - "is5GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzU": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is2dot4GHz": { - "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, - "radiusClientConfiguration": { - "model_type": "RadiusNasConfiguration", - "nasClientId": "DEFAULT", - "nasClientIp": "WAN_IP", - "userDefinedNasId": null, - "userDefinedNasIp": null, - "operatorId": null - }, - "profileType": "ssid" - }, - "createdTimestamp": 0, - "lastModifiedTimestamp": 1611264539231, - "childProfileIds": [ - 37 - ] - } + "createdTimestamp": 1612285248638, + "lastModifiedTimestamp": 1612285248638, + "childProfileIds": [] +} ] diff --git a/opensync-gateway-static-process/src/main/resources/app/opensync/EquipmentExample.json b/opensync-gateway-static-process/src/main/resources/app/opensync/EquipmentExample.json index 5b1a141..a5a3f9b 100644 --- a/opensync-gateway-static-process/src/main/resources/app/opensync/EquipmentExample.json +++ b/opensync-gateway-static-process/src/main/resources/app/opensync/EquipmentExample.json @@ -2,7 +2,7 @@ "model_type": "Equipment", "id": 1, "customerId": 2, - "profileId": 38, + "profileId": 8, "locationId": 8, "equipmentType": "AP", "inventoryId": "Open_AP_21P10C68818122", @@ -464,6 +464,6 @@ "addressAsString": "24:f5:a2:ef:2e:53" }, "serial": "21P10C68818122", - "createdTimestamp": 1611857503082, - "lastModifiedTimestamp": 1611857505529 + "createdTimestamp": 1612285288821, + "lastModifiedTimestamp": 1612285293922 } \ No newline at end of file diff --git a/opensync-gateway-static-process/src/main/resources/app/opensync/LocationBuildingExample.json b/opensync-gateway-static-process/src/main/resources/app/opensync/LocationBuildingExample.json index 5f236a3..dd4c748 100644 --- a/opensync-gateway-static-process/src/main/resources/app/opensync/LocationBuildingExample.json +++ b/opensync-gateway-static-process/src/main/resources/app/opensync/LocationBuildingExample.json @@ -1,60 +1,61 @@ { - "model_type" : "Location", - "id" : 8, - "parentId" : 0, - "locationType" : "SITE", - "customerId" : 2, - "name" : "Ottawa", - "details" : { - "model_type" : "LocationDetails", - "countryCode" : "ca", - "maintenanceWindow" : null, - "rrmEnabled" : true, - "dailyActivityDetails" : { - "SUNDAY" : { - "model_type" : "LocationActivityDetails", - "busyTime" : "13:30", - "quietTime" : "3:30", - "timezone" : "US/Eastern" - }, - "MONDAY" : { - "model_type" : "LocationActivityDetails", - "busyTime" : "13:30", - "quietTime" : "3:30", - "timezone" : "US/Eastern" - }, - "TUESDAY" : { - "model_type" : "LocationActivityDetails", - "busyTime" : "13:30", - "quietTime" : "3:30", - "timezone" : "US/Eastern" - }, - "WEDNESDAY" : { - "model_type" : "LocationActivityDetails", - "busyTime" : "13:30", - "quietTime" : "3:30", - "timezone" : "US/Eastern" - }, - "THURSDAY" : { - "model_type" : "LocationActivityDetails", - "busyTime" : "13:30", - "quietTime" : "3:30", - "timezone" : "US/Eastern" - }, - "FRIDAY" : { - "model_type" : "LocationActivityDetails", - "busyTime" : "13:30", - "quietTime" : "3:30", - "timezone" : "US/Eastern" - }, - "SATURDAY" : { - "model_type" : "LocationActivityDetails", - "busyTime" : "13:30", - "quietTime" : "3:30", - "timezone" : "US/Eastern" - } - } - }, - "createdTimestamp" : 1590607043540, - "lastModifiedTimestamp" : 1590607043540 + "model_type": "Location", + "id": 8, + "parentId": 0, + "locationType": "SITE", + "customerId": 2, + "name": "Ottawa", + "details": { + "model_type": "LocationDetails", + "countryCode": "CA", + "dailyActivityDetails": { + "SUNDAY": { + "model_type": "LocationActivityDetails", + "busyTime": "13:30", + "quietTime": "3:00", + "timezone": "US/Eastern" + }, + "MONDAY": { + "model_type": "LocationActivityDetails", + "busyTime": "13:30", + "quietTime": "3:00", + "timezone": "US/Eastern" + }, + "TUESDAY": { + "model_type": "LocationActivityDetails", + "busyTime": "13:30", + "quietTime": "3:00", + "timezone": "US/Eastern" + }, + "WEDNESDAY": { + "model_type": "LocationActivityDetails", + "busyTime": "13:30", + "quietTime": "3:00", + "timezone": "US/Eastern" + }, + "THURSDAY": { + "model_type": "LocationActivityDetails", + "busyTime": "13:30", + "quietTime": "3:00", + "timezone": "US/Eastern" + }, + "FRIDAY": { + "model_type": "LocationActivityDetails", + "busyTime": "13:30", + "quietTime": "3:00", + "timezone": "US/Eastern" + }, + "SATURDAY": { + "model_type": "LocationActivityDetails", + "busyTime": "13:30", + "quietTime": "3:00", + "timezone": "US/Eastern" + } + }, + "maintenanceWindow": null, + "rrmEnabled": true, + "timezone": "US/Eastern" + }, + "createdTimestamp": 1612285243534, + "lastModifiedTimestamp": 1612285243534 } \ No newline at end of file diff --git a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileAPExample.json b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileAPExample.json index 0aaf60e..37ee3e3 100644 --- a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileAPExample.json +++ b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileAPExample.json @@ -1,64 +1,58 @@ { - "model_type": "Profile", - "id": 38, - "customerId": 2, - "profileType": "equipment_ap", - "name": "ap-profile-2021-01-21T21:28:59.371Z", - "details": { - "model_type": "ApNetworkConfiguration", - "networkConfigVersion": "AP-1", - "equipmentType": "AP", - "vlanNative": true, - "vlan": 0, - "ntpServer": { - "model_type": "AutoOrManualString", - "auto": true, - "value": "pool.ntp.org" + "model_type": "Profile", + "id": 8, + "customerId": 2, + "profileType": "equipment_ap", + "name": "ApProfile-3-radios", + "details": { + "model_type": "ApNetworkConfiguration", + "networkConfigVersion": "AP-1", + "equipmentType": "AP", + "vlanNative": true, + "vlan": 0, + "ntpServer": { + "model_type": "AutoOrManualString", + "auto": true, + "value": "pool.ntp.org" + }, + "syslogRelay": null, + "rtlsSettings": null, + "syntheticClientEnabled": true, + "ledControlEnabled": true, + "equipmentDiscovery": false, + "radioMap": { + "is2dot4GHz": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + }, + "is5GHzU": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + }, + "is5GHzL": { + "model_type": "RadioProfileConfiguration", + "bestApEnabled": true, + "bestAPSteerType": "both" + } + }, + "greTunnelConfigurations": [ + { + "model_type": "GreTunnelConfiguration", + "greTunnelName": "gre1", + "greRemoteInetAddr": "192.168.1.101", + "vlanIdsInGreTunnel": [ + 100 + ] + } + ], + "profileType": "equipment_ap" }, - "syslogRelay": null, - "rtlsSettings": null, - "syntheticClientEnabled": true, - "ledControlEnabled": true, - "equipmentDiscovery": false, - "radioMap": { - "is5GHz": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is2dot4GHz": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is5GHzU": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - }, - "is5GHzL": { - "model_type": "RadioProfileConfiguration", - "bestApEnabled": true, - "bestAPSteerType": "both" - } - }, - "greTunnelConfigurations": [ - { - "model_type": "GreTunnelConfiguration", - "greTunnelName": null, - "greRemoteInetAddr": null, - "vlanIdsInGreTunnel": [ - ] - } - ], - "profileType": "equipment_ap" - }, - "createdTimestamp": 1611264539383, - "lastModifiedTimestamp": 1611264539383, - "childProfileIds": [ - 4, - 5, - 31, - 32 - ] -} + "createdTimestamp": 1612285248925, + "lastModifiedTimestamp": 1612285628377, + "childProfileIds": [ + 2, + 4 + ] +} \ No newline at end of file diff --git a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileCaptive.json b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileCaptive.json index 0337c36..e69e74f 100644 --- a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileCaptive.json +++ b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileCaptive.json @@ -1,52 +1,58 @@ -{ +[ + { "model_type": "Profile", "id": 5, "customerId": 2, "profileType": "captive_portal", "name": "Captive-portal", "details": { - "model_type": "CaptivePortalConfiguration", - "name": "Default", - "browserTitle": "Captive-portal", - "headerContent": "Captive Portal", - "userAcceptancePolicy": "Please agree to the following terms for using this network:", - "successPageMarkdownText": "You are now authorized and connected to the network.", - "redirectURL": "https://www.google.com", - "externalCaptivePortalURL": null, - "sessionTimeoutInMinutes": 10, - "logoFile": { - "model_type": "ManagedFileInfo", - "md5checksum": null, - "lastModifiedTimestamp": null, - "apExportUrl": "/filestore/tip-logo-mobile", - "fileCategory": "CaptivePortalLogo", - "fileType": "PNG", - "altSlot": false - }, - "backgroundFile": { - "model_type": "ManagedFileInfo", - "md5checksum": null, - "lastModifiedTimestamp": null, - "apExportUrl": "/filestore/tip-logo", - "fileCategory": "CaptivePortalBackground", - "fileType": "PNG", - "altSlot": false - }, - "walledGardenAllowlist": [], - "usernamePasswordFile": null, - "authenticationType": "guest", - "radiusAuthMethod": "CHAP", - "maxUsersWithSameCredentials": 3, - "externalPolicyFile": null, - "backgroundPosition": "left_top", - "backgroundRepeat": "no_repeat", - "radiusServiceId": 0, - "expiryType": "time_limited", - "userList": [], - "macAllowList": [], - "profileType": "captive_portal" + "model_type": "CaptivePortalConfiguration", + "name": "Default", + "browserTitle": "Captive-portal", + "headerContent": "Captive Portal", + "userAcceptancePolicy": "Please agree to the following terms for using this network:", + "successPageMarkdownText": "You are now authorized and connected to the network.", + "redirectURL": "https://www.google.com", + "externalCaptivePortalURL": null, + "sessionTimeoutInMinutes": 10, + "logoFile": { + "model_type": "ManagedFileInfo", + "md5checksum": null, + "lastModifiedTimestamp": null, + "apExportUrl": "/filestore/tip-logo-mobile", + "fileCategory": "CaptivePortalLogo", + "fileType": "PNG", + "altSlot": false + }, + "backgroundFile": { + "model_type": "ManagedFileInfo", + "md5checksum": null, + "lastModifiedTimestamp": null, + "apExportUrl": "/filestore/tip-logo", + "fileCategory": "CaptivePortalBackground", + "fileType": "PNG", + "altSlot": false + }, + "walledGardenAllowlist": [ + ], + "usernamePasswordFile": null, + "authenticationType": "guest", + "radiusAuthMethod": "CHAP", + "maxUsersWithSameCredentials": 3, + "externalPolicyFile": null, + "backgroundPosition": "left_top", + "backgroundRepeat": "no_repeat", + "radiusServiceId": 0, + "expiryType": "time_limited", + "userList": [ + ], + "macAllowList": [ + ], + "profileType": "captive_portal" }, "createdTimestamp": 1611857459118, "lastModifiedTimestamp": 1611857459118, - "childProfileIds": [] -} \ No newline at end of file + "childProfileIds": [ + ] + } +] diff --git a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileRf.json b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileRf.json index 96330d1..07213de 100644 --- a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileRf.json +++ b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileRf.json @@ -198,7 +198,7 @@ }, "profileType": "rf" }, - "createdTimestamp": 1611262628788, - "lastModifiedTimestamp": 1611262628788, + "createdTimestamp": 1612285248650, + "lastModifiedTimestamp": 1612285248650, "childProfileIds": [] } \ No newline at end of file diff --git a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileSsid.json b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileSsid.json index 7ddccf3..07408fe 100644 --- a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileSsid.json +++ b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileSsid.json @@ -1,226 +1,76 @@ [ - { +{ "model_type": "Profile", - "id": 5, + "id": 2, "customerId": 2, "profileType": "ssid", "name": "TipWlan-cloud-3-radios", "details": { - "model_type": "SsidConfiguration", - "ssid": "TipWlan-cloud-3-radios", - "appliedRadios": [ - "is5GHzL", - "is2dot4GHz", - "is5GHzU" - ], - "ssidAdminState": "enabled", - "secureMode": "wpa2OnlyPSK", - "vlanId": 1, - "keyStr": "openwifi", - "broadcastSsid": "enabled", - "keyRefresh": 0, - "noLocalSubnets": false, - "radiusServiceId": 0, - "radiusAcountingServiceInterval": 60, - "captivePortalId": null, - "bandwidthLimitDown": 0, - "bandwidthLimitUp": 0, - "clientBandwidthLimitDown": 0, - "clientBandwidthLimitUp": 0, - "videoTrafficOnly": false, - "radioBasedConfigs": { - "is5GHzL": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null + "model_type": "SsidConfiguration", + "ssid": "TipWlan-cloud-3-radios", + "appliedRadios": [ + "is5GHzU", + "is2dot4GHz", + "is5GHzL" + ], + "ssidAdminState": "enabled", + "secureMode": "wpa2OnlyPSK", + "vlanId": 1, + "keyStr": "openwifi", + "broadcastSsid": "enabled", + "keyRefresh": 0, + "noLocalSubnets": false, + "radiusServiceId": 0, + "radiusAcountingServiceInterval": 60, + "captivePortalId": null, + "bandwidthLimitDown": 0, + "bandwidthLimitUp": 0, + "clientBandwidthLimitDown": 0, + "clientBandwidthLimitUp": 0, + "videoTrafficOnly": false, + "radioBasedConfigs": { + "is5GHzU": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + }, + "is2dot4GHz": { + "model_type": "RadioBasedSsidConfiguration2g", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null, + "enable80211b": false + }, + "is5GHz": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + }, + "is5GHzL": { + "model_type": "RadioBasedSsidConfiguration", + "enable80211r": null, + "enable80211k": null, + "enable80211v": null + } }, - "is2dot4GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzU": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null + "bonjourGatewayProfileId": null, + "enable80211w": null, + "wepConfig": null, + "forwardMode": "BRIDGE", + "profileType": "ssid", + "radiusClientConfiguration": { + "model_type": "RadiusNasConfiguration", + "nasClientId": "DEFAULT", + "nasClientIp": "WAN_IP", + "userDefinedNasId": null, + "userDefinedNasIp": null, + "operatorId": null } - }, - "bonjourGatewayProfileId": null, - "enable80211w": null, - "wepConfig": null, - "forwardMode": "BRIDGE", - "profileType": "ssid", - "radiusClientConfiguration": { - "model_type": "RadiusNasConfiguration", - "nasClientId": "DEFAULT", - "nasClientIp": "WAN_IP", - "userDefinedNasId": null, - "userDefinedNasIp": null, - "operatorId": null - } }, - "createdTimestamp": 1606778369598, - "lastModifiedTimestamp": 1606778369598, - "childProfileIds": [ - ] - }, - { - "model_type": "Profile", - "id": 32, - "customerId": 2, - "profileType": "ssid", - "name": "access-ssid-profile-2021-01-21T21:28:58.871Z", - "details": { - "model_type": "SsidConfiguration", - "ssid": "ssid-access-passpoint", - "appliedRadios": [ - "is5GHzU", - "is5GHzL" - ], - "ssidAdminState": "enabled", - "secureMode": "wpa2EAP", - "vlanId": 1, - "keyStr": "testing123", - "broadcastSsid": "enabled", - "keyRefresh": 0, - "noLocalSubnets": false, - "radiusServiceId": 1, - "radiusAccountingServiceId": 1, - "radiusAcountingServiceInterval": 60, - "captivePortalId": null, - "bandwidthLimitDown": 0, - "bandwidthLimitUp": 0, - "clientBandwidthLimitDown": 0, - "clientBandwidthLimitUp": 0, - "videoTrafficOnly": false, - "radioBasedConfigs": { - "is5GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzU": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is2dot4GHz": { - "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, - "radiusClientConfiguration": { - "model_type": "RadiusNasConfiguration", - "nasClientId": "DEFAULT", - "nasClientIp": "WAN_IP", - "userDefinedNasId": null, - "userDefinedNasIp": null, - "operatorId": null - }, - "profileType": "ssid" - }, - "createdTimestamp": 0, - "lastModifiedTimestamp": 1611264539281, - "childProfileIds": [ - 37, - 1 - ] - }, - { - "model_type": "Profile", - "id": 31, - "customerId": 2, - "profileType": "ssid", - "name": "osu-ssid-profile-2021-01-21T21:28:58.798Z", - "details": { - "model_type": "SsidConfiguration", - "ssid": "ssid-open-passpoint", - "appliedRadios": [ - "is2dot4GHz" - ], - "ssidAdminState": "enabled", - "secureMode": "open", - "vlanId": 1, - "keyStr": null, - "broadcastSsid": "enabled", - "keyRefresh": 0, - "noLocalSubnets": false, - "radiusServiceId": 0, - "radiusAccountingServiceId": 0, - "radiusAcountingServiceInterval": 60, - "captivePortalId": null, - "bandwidthLimitDown": 0, - "bandwidthLimitUp": 0, - "clientBandwidthLimitDown": 0, - "clientBandwidthLimitUp": 0, - "videoTrafficOnly": false, - "radioBasedConfigs": { - "is5GHz": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is5GHzU": { - "model_type": "RadioBasedSsidConfiguration", - "enable80211r": null, - "enable80211k": null, - "enable80211v": null - }, - "is2dot4GHz": { - "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, - "radiusClientConfiguration": { - "model_type": "RadiusNasConfiguration", - "nasClientId": "DEFAULT", - "nasClientIp": "WAN_IP", - "userDefinedNasId": null, - "userDefinedNasIp": null, - "operatorId": null - }, - "profileType": "ssid" - }, - "createdTimestamp": 0, - "lastModifiedTimestamp": 1611264539231, - "childProfileIds": [ - 37 - ] - } + "createdTimestamp": 1612285248638, + "lastModifiedTimestamp": 1612285248638, + "childProfileIds": [] +} ] diff --git a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java index 7038c22..48d3f8f 100644 --- a/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java +++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java @@ -92,6 +92,7 @@ import com.telecominfraproject.wlan.profile.rf.models.RfConfiguration; import com.telecominfraproject.wlan.profile.rf.models.RfElementConfiguration; import com.telecominfraproject.wlan.profile.ssid.models.NasIdType; import com.telecominfraproject.wlan.profile.ssid.models.NasIpType; +import com.telecominfraproject.wlan.profile.ssid.models.RadioBasedSsidConfiguration2g; import com.telecominfraproject.wlan.profile.ssid.models.SsidConfiguration; import com.vmware.ovsdb.exception.OvsdbClientException; import com.vmware.ovsdb.protocol.methods.RowUpdate; @@ -2643,7 +2644,7 @@ public class OvsdbDao { int ssidUlLimit, int clientDlLimit, int clientUlLimit, int rtsCtsThreshold, int fragThresholdBytes, int dtimPeriod, Map captiveMap, List walledGardenAllowlist, Map> bonjourServiceMap, String radiusNasId, String radiusNasIp, - String radiusOperatorName, String greTunnelName) { + String radiusOperatorName, String greTunnelName, Boolean enable80211b) { List operations = new ArrayList<>(); Map updateColumns = new HashMap<>(); @@ -2720,7 +2721,7 @@ public class OvsdbDao { configureCustomOptionsForSsid(ovsdbClient, enable80211k, rateLimitEnable, ssidDlLimit, ssidUlLimit, clientDlLimit, clientUlLimit, rtsCtsThreshold, fragThresholdBytes, dtimPeriod, radiusNasId, - radiusNasIp, radiusOperatorName, updateColumns); + radiusNasIp, radiusOperatorName, updateColumns, enable80211b); updateBlockList(updateColumns, macBlockList); Row row = new Row(updateColumns); @@ -2780,11 +2781,12 @@ public class OvsdbDao { * @param radiusNasIp * @param radiusOperatorName * @param updateColumns + * @param enable80211b TODO */ void configureCustomOptionsForSsid(OvsdbClient ovsdbClient, boolean enable80211k, boolean rateLimitEnable, int ssidDlLimit, int ssidUlLimit, int clientDlLimit, int clientUlLimit, int rtsCtsThreshold, int fragThresholdBytes, int dtimPeriod, String radiusNasId, String radiusNasIp, String radiusOperatorName, - Map updateColumns) { + Map updateColumns, Boolean enable80211b) { Map customOptions = new HashMap<>(); configureCustomOptionsForRatesAndLimits(rateLimitEnable, ssidDlLimit, ssidUlLimit, clientDlLimit, clientUlLimit, rtsCtsThreshold, customOptions); @@ -2792,13 +2794,21 @@ public class OvsdbDao { configureCustomOptionsForRadiusNas(ovsdbClient, radiusNasId, radiusNasIp, radiusOperatorName, customOptions); configureCustomOptionsForDtimFragAnd80211k(enable80211k, dtimPeriod, fragThresholdBytes, customOptions); - + + toggle80211bModulationRates(enable80211b, customOptions); + @SuppressWarnings("unchecked") com.vmware.ovsdb.protocol.operation.notation.Map customMap = com.vmware.ovsdb.protocol.operation.notation.Map .of(customOptions); updateColumns.put("custom_options", customMap); } + protected void toggle80211bModulationRates(Boolean enable80211b, Map customOptions) { + if (enable80211b != null) { + customOptions.put("disable_b_rates", enable80211b ? "0" : "1"); + } + } + /** * * @param enable80211k @@ -3187,7 +3197,8 @@ public class OvsdbDao { boolean enable80211v = true; // on by default boolean enable80211k = true; - + // off by default, only applicable for is2do4GHz + Boolean enable80211b = null; if (ssidConfig.getRadioBasedConfigs() != null) { if (ssidConfig.getRadioBasedConfigs().containsKey(radioType) && (ssidConfig.getRadioBasedConfigs().get(radioType) != null)) { @@ -3209,6 +3220,9 @@ public class OvsdbDao { if (ssidConfig.getRadioBasedConfigs().get(radioType).getEnable80211k() != null) { enable80211k = ssidConfig.getRadioBasedConfigs().get(radioType).getEnable80211k(); } + if (radioType.equals(RadioType.is2dot4GHz)) { + enable80211b = ((RadioBasedSsidConfiguration2g)ssidConfig.getRadioBasedConfigs().get(radioType)).getEnable80211b(); + } } } @@ -3274,7 +3288,7 @@ public class OvsdbDao { uapsdEnabled, apBridge, ssidConfig.getForwardMode(), gateway, inet, dns, ipAssignScheme, macBlockList, rateLimitEnable, ssidDlLimit, ssidUlLimit, clientDlLimit, clientUlLimit, rtsCtsThreshold, fragThresholdBytes, dtimPeriod, captiveMap, walledGardenAllowlist, - bonjourServiceMap, radiusNasId, radiusNasIp, radiusOperName, greTunnelName); + bonjourServiceMap, radiusNasId, radiusNasIp, radiusOperName, greTunnelName, enable80211b); updateVifConfigsSetForRadio(ovsdbClient, ssidConfig.getSsid(), freqBand, vifConfigUuid);