diff --git a/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java b/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java index 07a752b..19ac902 100644 --- a/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java +++ b/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java @@ -540,7 +540,12 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra LOG.error("Cannot read config for AP {}", apId, e); } - LOG.debug("Config content : {}", ret); + LOG.debug("Config content : Equipment {}", ret.getCustomerEquipment().toPrettyString()); + LOG.debug("Config content : APProfile {}", ret.getApProfile().toPrettyString()); + + ret.getSsidProfile().stream().forEach(ssid -> LOG.debug("Config content : SSIDProfile {}", ssid.toPrettyString())); + LOG.debug("Config content : Location {}", ret.getEquipmentLocation().toPrettyString()); + return ret; } diff --git a/opensync-ext-static/src/main/resources/EquipmentExample.json b/opensync-ext-static/src/main/resources/EquipmentExample.json index 2a7028f..fc1ee97 100644 --- a/opensync-ext-static/src/main/resources/EquipmentExample.json +++ b/opensync-ext-static/src/main/resources/EquipmentExample.json @@ -1,12 +1,12 @@ { "model_type" : "Equipment", - "id" : 50, + "id" : 51, "customerId" : 2, - "profileId" : null, + "profileId" : 3, "locationId" : 8, "equipmentType" : "AP", - "inventoryId" : "ap-50", - "name" : "AP 50", + "inventoryId" : "Test_Client_21P10C68818122", + "name" : "Test_Client_21P10C68818122", "details" : { "model_type" : "ApElementConfiguration", "sampleDetailsStr" : null, @@ -21,7 +21,7 @@ "staticDnsIp1" : null, "staticDnsIp2" : null, "peerInfoList" : [ ], - "deviceName" : "Default Device Name", + "deviceName" : "Test_Client_21P10C68818122", "locationData" : null, "locallyConfiguredMgmtVlan" : 0, "locallyConfigured" : false, @@ -100,8 +100,8 @@ }, "eirpTxPower" : { "model_type" : "AutoOrManualValue", - "auto" : false, - "value" : 10 + "auto" : true, + "value" : 18 }, "bestApEnabled" : null, "neighbouringListApConfig" : { @@ -121,7 +121,7 @@ "radioType" : "is5GHzU", "channelNumber" : 149, "manualChannelNumber" : 149, - "backupChannelNumber" : 116, + "backupChannelNumber" : 154, "autoChannelSelection" : true, "channelBandwidth" : "is80MHz", "bannedChannels" : [ ], @@ -203,7 +203,7 @@ "is5GHzU" : { "model_type" : "RadioConfiguration", "radioType" : "is5GHzU", - "radioAdminState" : "disabled", + "radioAdminState" : "enabled", "fragmentationThresholdBytes" : 2346, "rtsCtsThreshold" : 65535, "autoChannelSelection" : "disabled", @@ -284,7 +284,7 @@ }, "latitude" : null, "longitude" : null, - "serial" : "serial-ap-50", - "createdTimestamp" : 1589915837067, - "lastModifiedTimestamp" : 1589915837067 -} \ No newline at end of file + "serial" : "21P10C68818122", + "createdTimestamp" : 1590607072871, + "lastModifiedTimestamp" : 1590607073116 +} diff --git a/opensync-ext-static/src/main/resources/LocationBuildingExample.json b/opensync-ext-static/src/main/resources/LocationBuildingExample.json index 5bf6747..fa4b2c0 100644 --- a/opensync-ext-static/src/main/resources/LocationBuildingExample.json +++ b/opensync-ext-static/src/main/resources/LocationBuildingExample.json @@ -1,13 +1,13 @@ { "model_type" : "Location", - "id" : 7, - "parentId" : 2, - "locationType" : "BUILDING", + "id" : 8, + "parentId" : 0, + "locationType" : "SITE", "customerId" : 2, - "name" : "Building 2", + "name" : "Ottawa", "details" : { "model_type" : "LocationDetails", - "countryCode" : "usa", + "countryCode" : "ca", "maintenanceWindow" : null, "rrmEnabled" : true, "dailyRebalancingDetails" : { @@ -62,6 +62,6 @@ } } }, - "createdTimestamp" : 1589567347442, - "lastModifiedTimestamp" : 1589567347442 + "createdTimestamp" : 1590607043540, + "lastModifiedTimestamp" : 1590607043540 } \ No newline at end of file diff --git a/opensync-ext-static/src/main/resources/LocationBuildingParentExample.json b/opensync-ext-static/src/main/resources/LocationBuildingParentExample.json deleted file mode 100644 index 559ca51..0000000 --- a/opensync-ext-static/src/main/resources/LocationBuildingParentExample.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "model_type" : "Location", - "id" : 2, - "parentId" : 0, - "locationType" : "SITE", - "customerId" : 2, - "name" : "Menlo Park", - "details" : { - "model_type" : "LocationDetails", - "countryCode" : "usa", - "maintenanceWindow" : null, - "rrmEnabled" : true, - "dailyRebalancingDetails" : { - "SUNDAY" : { - "model_type" : "LocationActivityDetails", - "busyTime" : "13:30", - "quietTime" : "3:30", - "timezone" : "US/Eastern", - "lastBusySnapshot" : 0 - }, - "MONDAY" : { - "model_type" : "LocationActivityDetails", - "busyTime" : "13:30", - "quietTime" : "3:30", - "timezone" : "US/Eastern", - "lastBusySnapshot" : 0 - }, - "TUESDAY" : { - "model_type" : "LocationActivityDetails", - "busyTime" : "13:30", - "quietTime" : "3:30", - "timezone" : "US/Eastern", - "lastBusySnapshot" : 0 - }, - "WEDNESDAY" : { - "model_type" : "LocationActivityDetails", - "busyTime" : "13:30", - "quietTime" : "3:30", - "timezone" : "US/Eastern", - "lastBusySnapshot" : 0 - }, - "THURSDAY" : { - "model_type" : "LocationActivityDetails", - "busyTime" : "13:30", - "quietTime" : "3:30", - "timezone" : "US/Eastern", - "lastBusySnapshot" : 0 - }, - "FRIDAY" : { - "model_type" : "LocationActivityDetails", - "busyTime" : "13:30", - "quietTime" : "3:30", - "timezone" : "US/Eastern", - "lastBusySnapshot" : 0 - }, - "SATURDAY" : { - "model_type" : "LocationActivityDetails", - "busyTime" : "13:30", - "quietTime" : "3:30", - "timezone" : "US/Eastern", - "lastBusySnapshot" : 0 - } - } - }, - "createdTimestamp" : 1589567474314, - "lastModifiedTimestamp" : 1589567474314 -} \ 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 04f8556..31bf667 100644 --- a/opensync-ext-static/src/main/resources/ProfileAPExample.json +++ b/opensync-ext-static/src/main/resources/ProfileAPExample.json @@ -1,12 +1,11 @@ { "model_type" : "Profile", - "id" : 2, + "id" : 3, "customerId" : 2, "profileType" : "equipment_ap", - "name" : "ApProfile", + "name" : "autoprovisionedApProfile", "details" : { "model_type" : "ApNetworkConfiguration", - "sampleDetailsStr" : null, "networkConfigVersion" : "AP-1", "equipmentType" : "AP", "vlanNative" : true, @@ -42,9 +41,10 @@ "bestApEnabled" : true, "bestAPSteerType" : "both" } - } + }, + "profileType" : "equipment_ap" }, - "createdTimestamp" : 1589567037365, - "lastModifiedTimestamp" : 1589567037365, - "childProfileIds" : [ ] + "createdTimestamp" : 1590607072994, + "lastModifiedTimestamp" : 1590607073083, + "childProfileIds" : [ 4, 5, 6 ] } \ 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 24bdf27..6648bc7 100644 --- a/opensync-ext-static/src/main/resources/ProfileSsid.json +++ b/opensync-ext-static/src/main/resources/ProfileSsid.json @@ -1,190 +1,71 @@ [ -{ - "model_type" : "Profile", - "id" : 1, - "customerId" : 2, - "profileType" : "ssid", - "name" : "Connectus-local", - "details" : { - "model_type" : "SsidConfiguration", - "sampleDetailsStr" : null, - "ssid" : "Connectus-local", - "appliedRadios" : [ "is5GHzL", "is5GHzU", "is2dot4GHz" ], - "ssidAdminState" : "enabled", - "secureMode" : "wpa2PSK", - "vlanId" : 1, - "keyStr" : "12345678", - "broadcastSsid" : "enabled", - "keyRefresh" : 0, - "noLocalSubnets" : false, - "radiusServiceName" : null, - "captivePortalId" : null, - "bandwidthLimitDown" : 0, - "bandwidthLimitUp" : 0, - "videoTrafficOnly" : false, - "radioBasedConfigs" : { - "is5GHz" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - }, - "is2dot4GHz" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - }, - "is5GHzU" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - }, - "is5GHzL" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - } - }, - "bonjourGatewayProfileId" : null, - "enable80211w" : null, - "wepConfig" : null, - "forwardMode" : null - }, - "createdTimestamp" : 1589567130432, - "lastModifiedTimestamp" : 1589567130432, - "childProfileIds" : [ ] -}, -{ - "model_type" : "Profile", - "id" : 2, - "customerId" : 2, - "profileType" : "ssid", - "name" : "Connectus-local-2", - "details" : { - "model_type" : "SsidConfiguration", - "sampleDetailsStr" : null, - "ssid" : "Connectus-local-2", - "appliedRadios" : [ "is5GHzL", "is5GHzU"], - "ssidAdminState" : "enabled", - "secureMode" : "wpa2PSK", - "vlanId" : 1, - "keyStr" : "12345678", - "broadcastSsid" : "enabled", - "keyRefresh" : 0, - "noLocalSubnets" : false, - "radiusServiceName" : null, - "captivePortalId" : null, - "bandwidthLimitDown" : 0, - "bandwidthLimitUp" : 0, - "videoTrafficOnly" : false, - "radioBasedConfigs" : { - "is5GHz" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - }, - "is2dot4GHz" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - }, - "is5GHzU" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - }, - "is5GHzL" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - } - }, - "bonjourGatewayProfileId" : null, - "enable80211w" : null, - "wepConfig" : null, - "forwardMode" : null - }, - "createdTimestamp" : 1589567130432, - "lastModifiedTimestamp" : 1589567130432, - "childProfileIds" : [ ] -} -, -{ - "model_type" : "Profile", - "id" : 3, - "customerId" : 2, - "profileType" : "ssid", - "name" : "Connectus-local-3u", - "details" : { - "model_type" : "SsidConfiguration", - "sampleDetailsStr" : null, - "ssid" : "Connectus-local-3u", - "appliedRadios" : [ "is5GHzU" ], - "ssidAdminState" : "enabled", - "secureMode" : "wpa2PSK", - "vlanId" : 1, - "keyStr" : "12345678", - "broadcastSsid" : "enabled", - "keyRefresh" : 0, - "noLocalSubnets" : false, - "radiusServiceName" : null, - "captivePortalId" : null, - "bandwidthLimitDown" : 0, - "bandwidthLimitUp" : 0, - "videoTrafficOnly" : false, - "radioBasedConfigs" : { - "is5GHz" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - }, - "is2dot4GHz" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - }, - "is5GHzU" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - }, - "is5GHzL" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - } - }, - "bonjourGatewayProfileId" : null, - "enable80211w" : null, - "wepConfig" : null, - "forwardMode" : null - }, - "createdTimestamp" : 1589567130432, - "lastModifiedTimestamp" : 1589567130432, - "childProfileIds" : [ ] -} -, { "model_type" : "Profile", "id" : 4, "customerId" : 2, "profileType" : "ssid", - "name" : "Connectus-local-4l", + "name" : "autoProvisionedSsid", "details" : { "model_type" : "SsidConfiguration", - "sampleDetailsStr" : null, - "ssid" : "Connectus-local-4l", + "ssid" : "autoProvisionedSsid", + "appliedRadios" : [ "is2dot4GHz" ], + "ssidAdminState" : "enabled", + "secureMode" : "wpa2PSK", + "vlanId" : 1, + "keyStr" : "12345678", + "broadcastSsid" : "enabled", + "keyRefresh" : 0, + "noLocalSubnets" : false, + "radiusServiceName" : null, + "captivePortalId" : null, + "bandwidthLimitDown" : 0, + "bandwidthLimitUp" : 0, + "videoTrafficOnly" : false, + "radioBasedConfigs" : { + "is5GHz" : { + "model_type" : "RadioBasedSsidConfiguration", + "enable80211r" : null, + "enable80211k" : null, + "enable80211v" : null + }, + "is2dot4GHz" : { + "model_type" : "RadioBasedSsidConfiguration", + "enable80211r" : null, + "enable80211k" : null, + "enable80211v" : null + }, + "is5GHzU" : { + "model_type" : "RadioBasedSsidConfiguration", + "enable80211r" : null, + "enable80211k" : null, + "enable80211v" : null + }, + "is5GHzL" : { + "model_type" : "RadioBasedSsidConfiguration", + "enable80211r" : null, + "enable80211k" : null, + "enable80211v" : null + } + }, + "bonjourGatewayProfileId" : null, + "enable80211w" : null, + "wepConfig" : null, + "forwardMode" : null, + "profileType" : "ssid" + }, + "createdTimestamp" : 1590607073026, + "lastModifiedTimestamp" : 1590607073026, + "childProfileIds" : [ ] +}, +{ + "model_type" : "Profile", + "id" : 5, + "customerId" : 2, + "profileType" : "ssid", + "name" : "autoProvisionedSsid-5l", + "details" : { + "model_type" : "SsidConfiguration", + "ssid" : "autoProvisionedSsid-5l", "appliedRadios" : [ "is5GHzL" ], "ssidAdminState" : "enabled", "secureMode" : "wpa2PSK", @@ -227,10 +108,69 @@ "bonjourGatewayProfileId" : null, "enable80211w" : null, "wepConfig" : null, - "forwardMode" : null + "forwardMode" : null, + "profileType" : "ssid" }, - "createdTimestamp" : 1589567130432, - "lastModifiedTimestamp" : 1589567130432, + "createdTimestamp" : 1590607073044, + "lastModifiedTimestamp" : 1590607073044, + "childProfileIds" : [ ] +}, +{ + "model_type" : "Profile", + "id" : 6, + "customerId" : 2, + "profileType" : "ssid", + "name" : "autoProvisionedSsid-5u", + "details" : { + "model_type" : "SsidConfiguration", + "ssid" : "autoProvisionedSsid-5u", + "appliedRadios" : [ "is5GHzU" ], + "ssidAdminState" : "enabled", + "secureMode" : "wpa2PSK", + "vlanId" : 1, + "keyStr" : "12345678", + "broadcastSsid" : "enabled", + "keyRefresh" : 0, + "noLocalSubnets" : false, + "radiusServiceName" : null, + "captivePortalId" : null, + "bandwidthLimitDown" : 0, + "bandwidthLimitUp" : 0, + "videoTrafficOnly" : false, + "radioBasedConfigs" : { + "is5GHz" : { + "model_type" : "RadioBasedSsidConfiguration", + "enable80211r" : null, + "enable80211k" : null, + "enable80211v" : null + }, + "is2dot4GHz" : { + "model_type" : "RadioBasedSsidConfiguration", + "enable80211r" : null, + "enable80211k" : null, + "enable80211v" : null + }, + "is5GHzU" : { + "model_type" : "RadioBasedSsidConfiguration", + "enable80211r" : null, + "enable80211k" : null, + "enable80211v" : null + }, + "is5GHzL" : { + "model_type" : "RadioBasedSsidConfiguration", + "enable80211r" : null, + "enable80211k" : null, + "enable80211v" : null + } + }, + "bonjourGatewayProfileId" : null, + "enable80211w" : null, + "wepConfig" : null, + "forwardMode" : null, + "profileType" : "ssid" + }, + "createdTimestamp" : 1590607073065, + "lastModifiedTimestamp" : 1590607073065, "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 2a7028f..fc1ee97 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 @@ -1,12 +1,12 @@ { "model_type" : "Equipment", - "id" : 50, + "id" : 51, "customerId" : 2, - "profileId" : null, + "profileId" : 3, "locationId" : 8, "equipmentType" : "AP", - "inventoryId" : "ap-50", - "name" : "AP 50", + "inventoryId" : "Test_Client_21P10C68818122", + "name" : "Test_Client_21P10C68818122", "details" : { "model_type" : "ApElementConfiguration", "sampleDetailsStr" : null, @@ -21,7 +21,7 @@ "staticDnsIp1" : null, "staticDnsIp2" : null, "peerInfoList" : [ ], - "deviceName" : "Default Device Name", + "deviceName" : "Test_Client_21P10C68818122", "locationData" : null, "locallyConfiguredMgmtVlan" : 0, "locallyConfigured" : false, @@ -100,8 +100,8 @@ }, "eirpTxPower" : { "model_type" : "AutoOrManualValue", - "auto" : false, - "value" : 10 + "auto" : true, + "value" : 18 }, "bestApEnabled" : null, "neighbouringListApConfig" : { @@ -121,7 +121,7 @@ "radioType" : "is5GHzU", "channelNumber" : 149, "manualChannelNumber" : 149, - "backupChannelNumber" : 116, + "backupChannelNumber" : 154, "autoChannelSelection" : true, "channelBandwidth" : "is80MHz", "bannedChannels" : [ ], @@ -203,7 +203,7 @@ "is5GHzU" : { "model_type" : "RadioConfiguration", "radioType" : "is5GHzU", - "radioAdminState" : "disabled", + "radioAdminState" : "enabled", "fragmentationThresholdBytes" : 2346, "rtsCtsThreshold" : 65535, "autoChannelSelection" : "disabled", @@ -284,7 +284,7 @@ }, "latitude" : null, "longitude" : null, - "serial" : "serial-ap-50", - "createdTimestamp" : 1589915837067, - "lastModifiedTimestamp" : 1589915837067 -} \ No newline at end of file + "serial" : "21P10C68818122", + "createdTimestamp" : 1590607072871, + "lastModifiedTimestamp" : 1590607073116 +} 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 5bf6747..fa4b2c0 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,13 +1,13 @@ { "model_type" : "Location", - "id" : 7, - "parentId" : 2, - "locationType" : "BUILDING", + "id" : 8, + "parentId" : 0, + "locationType" : "SITE", "customerId" : 2, - "name" : "Building 2", + "name" : "Ottawa", "details" : { "model_type" : "LocationDetails", - "countryCode" : "usa", + "countryCode" : "ca", "maintenanceWindow" : null, "rrmEnabled" : true, "dailyRebalancingDetails" : { @@ -62,6 +62,6 @@ } } }, - "createdTimestamp" : 1589567347442, - "lastModifiedTimestamp" : 1589567347442 + "createdTimestamp" : 1590607043540, + "lastModifiedTimestamp" : 1590607043540 } \ 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 04f8556..31bf667 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,12 +1,11 @@ { "model_type" : "Profile", - "id" : 2, + "id" : 3, "customerId" : 2, "profileType" : "equipment_ap", - "name" : "ApProfile", + "name" : "autoprovisionedApProfile", "details" : { "model_type" : "ApNetworkConfiguration", - "sampleDetailsStr" : null, "networkConfigVersion" : "AP-1", "equipmentType" : "AP", "vlanNative" : true, @@ -42,9 +41,10 @@ "bestApEnabled" : true, "bestAPSteerType" : "both" } - } + }, + "profileType" : "equipment_ap" }, - "createdTimestamp" : 1589567037365, - "lastModifiedTimestamp" : 1589567037365, - "childProfileIds" : [ ] + "createdTimestamp" : 1590607072994, + "lastModifiedTimestamp" : 1590607073083, + "childProfileIds" : [ 4, 5, 6 ] } \ 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 24bdf27..6648bc7 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,190 +1,71 @@ [ -{ - "model_type" : "Profile", - "id" : 1, - "customerId" : 2, - "profileType" : "ssid", - "name" : "Connectus-local", - "details" : { - "model_type" : "SsidConfiguration", - "sampleDetailsStr" : null, - "ssid" : "Connectus-local", - "appliedRadios" : [ "is5GHzL", "is5GHzU", "is2dot4GHz" ], - "ssidAdminState" : "enabled", - "secureMode" : "wpa2PSK", - "vlanId" : 1, - "keyStr" : "12345678", - "broadcastSsid" : "enabled", - "keyRefresh" : 0, - "noLocalSubnets" : false, - "radiusServiceName" : null, - "captivePortalId" : null, - "bandwidthLimitDown" : 0, - "bandwidthLimitUp" : 0, - "videoTrafficOnly" : false, - "radioBasedConfigs" : { - "is5GHz" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - }, - "is2dot4GHz" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - }, - "is5GHzU" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - }, - "is5GHzL" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - } - }, - "bonjourGatewayProfileId" : null, - "enable80211w" : null, - "wepConfig" : null, - "forwardMode" : null - }, - "createdTimestamp" : 1589567130432, - "lastModifiedTimestamp" : 1589567130432, - "childProfileIds" : [ ] -}, -{ - "model_type" : "Profile", - "id" : 2, - "customerId" : 2, - "profileType" : "ssid", - "name" : "Connectus-local-2", - "details" : { - "model_type" : "SsidConfiguration", - "sampleDetailsStr" : null, - "ssid" : "Connectus-local-2", - "appliedRadios" : [ "is5GHzL", "is5GHzU"], - "ssidAdminState" : "enabled", - "secureMode" : "wpa2PSK", - "vlanId" : 1, - "keyStr" : "12345678", - "broadcastSsid" : "enabled", - "keyRefresh" : 0, - "noLocalSubnets" : false, - "radiusServiceName" : null, - "captivePortalId" : null, - "bandwidthLimitDown" : 0, - "bandwidthLimitUp" : 0, - "videoTrafficOnly" : false, - "radioBasedConfigs" : { - "is5GHz" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - }, - "is2dot4GHz" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - }, - "is5GHzU" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - }, - "is5GHzL" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - } - }, - "bonjourGatewayProfileId" : null, - "enable80211w" : null, - "wepConfig" : null, - "forwardMode" : null - }, - "createdTimestamp" : 1589567130432, - "lastModifiedTimestamp" : 1589567130432, - "childProfileIds" : [ ] -} -, -{ - "model_type" : "Profile", - "id" : 3, - "customerId" : 2, - "profileType" : "ssid", - "name" : "Connectus-local-3u", - "details" : { - "model_type" : "SsidConfiguration", - "sampleDetailsStr" : null, - "ssid" : "Connectus-local-3u", - "appliedRadios" : [ "is5GHzU" ], - "ssidAdminState" : "enabled", - "secureMode" : "wpa2PSK", - "vlanId" : 1, - "keyStr" : "12345678", - "broadcastSsid" : "enabled", - "keyRefresh" : 0, - "noLocalSubnets" : false, - "radiusServiceName" : null, - "captivePortalId" : null, - "bandwidthLimitDown" : 0, - "bandwidthLimitUp" : 0, - "videoTrafficOnly" : false, - "radioBasedConfigs" : { - "is5GHz" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - }, - "is2dot4GHz" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - }, - "is5GHzU" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - }, - "is5GHzL" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - } - }, - "bonjourGatewayProfileId" : null, - "enable80211w" : null, - "wepConfig" : null, - "forwardMode" : null - }, - "createdTimestamp" : 1589567130432, - "lastModifiedTimestamp" : 1589567130432, - "childProfileIds" : [ ] -} -, { "model_type" : "Profile", "id" : 4, "customerId" : 2, "profileType" : "ssid", - "name" : "Connectus-local-4l", + "name" : "autoProvisionedSsid", "details" : { "model_type" : "SsidConfiguration", - "sampleDetailsStr" : null, - "ssid" : "Connectus-local-4l", + "ssid" : "autoProvisionedSsid", + "appliedRadios" : [ "is2dot4GHz" ], + "ssidAdminState" : "enabled", + "secureMode" : "wpa2PSK", + "vlanId" : 1, + "keyStr" : "12345678", + "broadcastSsid" : "enabled", + "keyRefresh" : 0, + "noLocalSubnets" : false, + "radiusServiceName" : null, + "captivePortalId" : null, + "bandwidthLimitDown" : 0, + "bandwidthLimitUp" : 0, + "videoTrafficOnly" : false, + "radioBasedConfigs" : { + "is5GHz" : { + "model_type" : "RadioBasedSsidConfiguration", + "enable80211r" : null, + "enable80211k" : null, + "enable80211v" : null + }, + "is2dot4GHz" : { + "model_type" : "RadioBasedSsidConfiguration", + "enable80211r" : null, + "enable80211k" : null, + "enable80211v" : null + }, + "is5GHzU" : { + "model_type" : "RadioBasedSsidConfiguration", + "enable80211r" : null, + "enable80211k" : null, + "enable80211v" : null + }, + "is5GHzL" : { + "model_type" : "RadioBasedSsidConfiguration", + "enable80211r" : null, + "enable80211k" : null, + "enable80211v" : null + } + }, + "bonjourGatewayProfileId" : null, + "enable80211w" : null, + "wepConfig" : null, + "forwardMode" : null, + "profileType" : "ssid" + }, + "createdTimestamp" : 1590607073026, + "lastModifiedTimestamp" : 1590607073026, + "childProfileIds" : [ ] +}, +{ + "model_type" : "Profile", + "id" : 5, + "customerId" : 2, + "profileType" : "ssid", + "name" : "autoProvisionedSsid-5l", + "details" : { + "model_type" : "SsidConfiguration", + "ssid" : "autoProvisionedSsid-5l", "appliedRadios" : [ "is5GHzL" ], "ssidAdminState" : "enabled", "secureMode" : "wpa2PSK", @@ -227,10 +108,69 @@ "bonjourGatewayProfileId" : null, "enable80211w" : null, "wepConfig" : null, - "forwardMode" : null + "forwardMode" : null, + "profileType" : "ssid" }, - "createdTimestamp" : 1589567130432, - "lastModifiedTimestamp" : 1589567130432, + "createdTimestamp" : 1590607073044, + "lastModifiedTimestamp" : 1590607073044, + "childProfileIds" : [ ] +}, +{ + "model_type" : "Profile", + "id" : 6, + "customerId" : 2, + "profileType" : "ssid", + "name" : "autoProvisionedSsid-5u", + "details" : { + "model_type" : "SsidConfiguration", + "ssid" : "autoProvisionedSsid-5u", + "appliedRadios" : [ "is5GHzU" ], + "ssidAdminState" : "enabled", + "secureMode" : "wpa2PSK", + "vlanId" : 1, + "keyStr" : "12345678", + "broadcastSsid" : "enabled", + "keyRefresh" : 0, + "noLocalSubnets" : false, + "radiusServiceName" : null, + "captivePortalId" : null, + "bandwidthLimitDown" : 0, + "bandwidthLimitUp" : 0, + "videoTrafficOnly" : false, + "radioBasedConfigs" : { + "is5GHz" : { + "model_type" : "RadioBasedSsidConfiguration", + "enable80211r" : null, + "enable80211k" : null, + "enable80211v" : null + }, + "is2dot4GHz" : { + "model_type" : "RadioBasedSsidConfiguration", + "enable80211r" : null, + "enable80211k" : null, + "enable80211v" : null + }, + "is5GHzU" : { + "model_type" : "RadioBasedSsidConfiguration", + "enable80211r" : null, + "enable80211k" : null, + "enable80211v" : null + }, + "is5GHzL" : { + "model_type" : "RadioBasedSsidConfiguration", + "enable80211r" : null, + "enable80211k" : null, + "enable80211v" : null + } + }, + "bonjourGatewayProfileId" : null, + "enable80211w" : null, + "wepConfig" : null, + "forwardMode" : null, + "profileType" : "ssid" + }, + "createdTimestamp" : 1590607073065, + "lastModifiedTimestamp" : 1590607073065, "childProfileIds" : [ ] } ] \ No newline at end of file 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 2a7028f..fc1ee97 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 @@ -1,12 +1,12 @@ { "model_type" : "Equipment", - "id" : 50, + "id" : 51, "customerId" : 2, - "profileId" : null, + "profileId" : 3, "locationId" : 8, "equipmentType" : "AP", - "inventoryId" : "ap-50", - "name" : "AP 50", + "inventoryId" : "Test_Client_21P10C68818122", + "name" : "Test_Client_21P10C68818122", "details" : { "model_type" : "ApElementConfiguration", "sampleDetailsStr" : null, @@ -21,7 +21,7 @@ "staticDnsIp1" : null, "staticDnsIp2" : null, "peerInfoList" : [ ], - "deviceName" : "Default Device Name", + "deviceName" : "Test_Client_21P10C68818122", "locationData" : null, "locallyConfiguredMgmtVlan" : 0, "locallyConfigured" : false, @@ -100,8 +100,8 @@ }, "eirpTxPower" : { "model_type" : "AutoOrManualValue", - "auto" : false, - "value" : 10 + "auto" : true, + "value" : 18 }, "bestApEnabled" : null, "neighbouringListApConfig" : { @@ -121,7 +121,7 @@ "radioType" : "is5GHzU", "channelNumber" : 149, "manualChannelNumber" : 149, - "backupChannelNumber" : 116, + "backupChannelNumber" : 154, "autoChannelSelection" : true, "channelBandwidth" : "is80MHz", "bannedChannels" : [ ], @@ -203,7 +203,7 @@ "is5GHzU" : { "model_type" : "RadioConfiguration", "radioType" : "is5GHzU", - "radioAdminState" : "disabled", + "radioAdminState" : "enabled", "fragmentationThresholdBytes" : 2346, "rtsCtsThreshold" : 65535, "autoChannelSelection" : "disabled", @@ -284,7 +284,7 @@ }, "latitude" : null, "longitude" : null, - "serial" : "serial-ap-50", - "createdTimestamp" : 1589915837067, - "lastModifiedTimestamp" : 1589915837067 -} \ No newline at end of file + "serial" : "21P10C68818122", + "createdTimestamp" : 1590607072871, + "lastModifiedTimestamp" : 1590607073116 +} 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 5bf6747..fa4b2c0 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,13 +1,13 @@ { "model_type" : "Location", - "id" : 7, - "parentId" : 2, - "locationType" : "BUILDING", + "id" : 8, + "parentId" : 0, + "locationType" : "SITE", "customerId" : 2, - "name" : "Building 2", + "name" : "Ottawa", "details" : { "model_type" : "LocationDetails", - "countryCode" : "usa", + "countryCode" : "ca", "maintenanceWindow" : null, "rrmEnabled" : true, "dailyRebalancingDetails" : { @@ -62,6 +62,6 @@ } } }, - "createdTimestamp" : 1589567347442, - "lastModifiedTimestamp" : 1589567347442 + "createdTimestamp" : 1590607043540, + "lastModifiedTimestamp" : 1590607043540 } \ 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 04f8556..31bf667 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,12 +1,11 @@ { "model_type" : "Profile", - "id" : 2, + "id" : 3, "customerId" : 2, "profileType" : "equipment_ap", - "name" : "ApProfile", + "name" : "autoprovisionedApProfile", "details" : { "model_type" : "ApNetworkConfiguration", - "sampleDetailsStr" : null, "networkConfigVersion" : "AP-1", "equipmentType" : "AP", "vlanNative" : true, @@ -42,9 +41,10 @@ "bestApEnabled" : true, "bestAPSteerType" : "both" } - } + }, + "profileType" : "equipment_ap" }, - "createdTimestamp" : 1589567037365, - "lastModifiedTimestamp" : 1589567037365, - "childProfileIds" : [ ] + "createdTimestamp" : 1590607072994, + "lastModifiedTimestamp" : 1590607073083, + "childProfileIds" : [ 4, 5, 6 ] } \ 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 24bdf27..6648bc7 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,190 +1,71 @@ [ -{ - "model_type" : "Profile", - "id" : 1, - "customerId" : 2, - "profileType" : "ssid", - "name" : "Connectus-local", - "details" : { - "model_type" : "SsidConfiguration", - "sampleDetailsStr" : null, - "ssid" : "Connectus-local", - "appliedRadios" : [ "is5GHzL", "is5GHzU", "is2dot4GHz" ], - "ssidAdminState" : "enabled", - "secureMode" : "wpa2PSK", - "vlanId" : 1, - "keyStr" : "12345678", - "broadcastSsid" : "enabled", - "keyRefresh" : 0, - "noLocalSubnets" : false, - "radiusServiceName" : null, - "captivePortalId" : null, - "bandwidthLimitDown" : 0, - "bandwidthLimitUp" : 0, - "videoTrafficOnly" : false, - "radioBasedConfigs" : { - "is5GHz" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - }, - "is2dot4GHz" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - }, - "is5GHzU" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - }, - "is5GHzL" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - } - }, - "bonjourGatewayProfileId" : null, - "enable80211w" : null, - "wepConfig" : null, - "forwardMode" : null - }, - "createdTimestamp" : 1589567130432, - "lastModifiedTimestamp" : 1589567130432, - "childProfileIds" : [ ] -}, -{ - "model_type" : "Profile", - "id" : 2, - "customerId" : 2, - "profileType" : "ssid", - "name" : "Connectus-local-2", - "details" : { - "model_type" : "SsidConfiguration", - "sampleDetailsStr" : null, - "ssid" : "Connectus-local-2", - "appliedRadios" : [ "is5GHzL", "is5GHzU"], - "ssidAdminState" : "enabled", - "secureMode" : "wpa2PSK", - "vlanId" : 1, - "keyStr" : "12345678", - "broadcastSsid" : "enabled", - "keyRefresh" : 0, - "noLocalSubnets" : false, - "radiusServiceName" : null, - "captivePortalId" : null, - "bandwidthLimitDown" : 0, - "bandwidthLimitUp" : 0, - "videoTrafficOnly" : false, - "radioBasedConfigs" : { - "is5GHz" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - }, - "is2dot4GHz" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - }, - "is5GHzU" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - }, - "is5GHzL" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - } - }, - "bonjourGatewayProfileId" : null, - "enable80211w" : null, - "wepConfig" : null, - "forwardMode" : null - }, - "createdTimestamp" : 1589567130432, - "lastModifiedTimestamp" : 1589567130432, - "childProfileIds" : [ ] -} -, -{ - "model_type" : "Profile", - "id" : 3, - "customerId" : 2, - "profileType" : "ssid", - "name" : "Connectus-local-3u", - "details" : { - "model_type" : "SsidConfiguration", - "sampleDetailsStr" : null, - "ssid" : "Connectus-local-3u", - "appliedRadios" : [ "is5GHzU" ], - "ssidAdminState" : "enabled", - "secureMode" : "wpa2PSK", - "vlanId" : 1, - "keyStr" : "12345678", - "broadcastSsid" : "enabled", - "keyRefresh" : 0, - "noLocalSubnets" : false, - "radiusServiceName" : null, - "captivePortalId" : null, - "bandwidthLimitDown" : 0, - "bandwidthLimitUp" : 0, - "videoTrafficOnly" : false, - "radioBasedConfigs" : { - "is5GHz" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - }, - "is2dot4GHz" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - }, - "is5GHzU" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - }, - "is5GHzL" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - } - }, - "bonjourGatewayProfileId" : null, - "enable80211w" : null, - "wepConfig" : null, - "forwardMode" : null - }, - "createdTimestamp" : 1589567130432, - "lastModifiedTimestamp" : 1589567130432, - "childProfileIds" : [ ] -} -, { "model_type" : "Profile", "id" : 4, "customerId" : 2, "profileType" : "ssid", - "name" : "Connectus-local-4l", + "name" : "autoProvisionedSsid", "details" : { "model_type" : "SsidConfiguration", - "sampleDetailsStr" : null, - "ssid" : "Connectus-local-4l", + "ssid" : "autoProvisionedSsid", + "appliedRadios" : [ "is2dot4GHz" ], + "ssidAdminState" : "enabled", + "secureMode" : "wpa2PSK", + "vlanId" : 1, + "keyStr" : "12345678", + "broadcastSsid" : "enabled", + "keyRefresh" : 0, + "noLocalSubnets" : false, + "radiusServiceName" : null, + "captivePortalId" : null, + "bandwidthLimitDown" : 0, + "bandwidthLimitUp" : 0, + "videoTrafficOnly" : false, + "radioBasedConfigs" : { + "is5GHz" : { + "model_type" : "RadioBasedSsidConfiguration", + "enable80211r" : null, + "enable80211k" : null, + "enable80211v" : null + }, + "is2dot4GHz" : { + "model_type" : "RadioBasedSsidConfiguration", + "enable80211r" : null, + "enable80211k" : null, + "enable80211v" : null + }, + "is5GHzU" : { + "model_type" : "RadioBasedSsidConfiguration", + "enable80211r" : null, + "enable80211k" : null, + "enable80211v" : null + }, + "is5GHzL" : { + "model_type" : "RadioBasedSsidConfiguration", + "enable80211r" : null, + "enable80211k" : null, + "enable80211v" : null + } + }, + "bonjourGatewayProfileId" : null, + "enable80211w" : null, + "wepConfig" : null, + "forwardMode" : null, + "profileType" : "ssid" + }, + "createdTimestamp" : 1590607073026, + "lastModifiedTimestamp" : 1590607073026, + "childProfileIds" : [ ] +}, +{ + "model_type" : "Profile", + "id" : 5, + "customerId" : 2, + "profileType" : "ssid", + "name" : "autoProvisionedSsid-5l", + "details" : { + "model_type" : "SsidConfiguration", + "ssid" : "autoProvisionedSsid-5l", "appliedRadios" : [ "is5GHzL" ], "ssidAdminState" : "enabled", "secureMode" : "wpa2PSK", @@ -227,10 +108,69 @@ "bonjourGatewayProfileId" : null, "enable80211w" : null, "wepConfig" : null, - "forwardMode" : null + "forwardMode" : null, + "profileType" : "ssid" }, - "createdTimestamp" : 1589567130432, - "lastModifiedTimestamp" : 1589567130432, + "createdTimestamp" : 1590607073044, + "lastModifiedTimestamp" : 1590607073044, + "childProfileIds" : [ ] +}, +{ + "model_type" : "Profile", + "id" : 6, + "customerId" : 2, + "profileType" : "ssid", + "name" : "autoProvisionedSsid-5u", + "details" : { + "model_type" : "SsidConfiguration", + "ssid" : "autoProvisionedSsid-5u", + "appliedRadios" : [ "is5GHzU" ], + "ssidAdminState" : "enabled", + "secureMode" : "wpa2PSK", + "vlanId" : 1, + "keyStr" : "12345678", + "broadcastSsid" : "enabled", + "keyRefresh" : 0, + "noLocalSubnets" : false, + "radiusServiceName" : null, + "captivePortalId" : null, + "bandwidthLimitDown" : 0, + "bandwidthLimitUp" : 0, + "videoTrafficOnly" : false, + "radioBasedConfigs" : { + "is5GHz" : { + "model_type" : "RadioBasedSsidConfiguration", + "enable80211r" : null, + "enable80211k" : null, + "enable80211v" : null + }, + "is2dot4GHz" : { + "model_type" : "RadioBasedSsidConfiguration", + "enable80211r" : null, + "enable80211k" : null, + "enable80211v" : null + }, + "is5GHzU" : { + "model_type" : "RadioBasedSsidConfiguration", + "enable80211r" : null, + "enable80211k" : null, + "enable80211v" : null + }, + "is5GHzL" : { + "model_type" : "RadioBasedSsidConfiguration", + "enable80211r" : null, + "enable80211k" : null, + "enable80211v" : null + } + }, + "bonjourGatewayProfileId" : null, + "enable80211w" : null, + "wepConfig" : null, + "forwardMode" : null, + "profileType" : "ssid" + }, + "createdTimestamp" : 1590607073065, + "lastModifiedTimestamp" : 1590607073065, "childProfileIds" : [ ] } ] \ No newline at end of file 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 2a7028f..fc1ee97 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 @@ -1,12 +1,12 @@ { "model_type" : "Equipment", - "id" : 50, + "id" : 51, "customerId" : 2, - "profileId" : null, + "profileId" : 3, "locationId" : 8, "equipmentType" : "AP", - "inventoryId" : "ap-50", - "name" : "AP 50", + "inventoryId" : "Test_Client_21P10C68818122", + "name" : "Test_Client_21P10C68818122", "details" : { "model_type" : "ApElementConfiguration", "sampleDetailsStr" : null, @@ -21,7 +21,7 @@ "staticDnsIp1" : null, "staticDnsIp2" : null, "peerInfoList" : [ ], - "deviceName" : "Default Device Name", + "deviceName" : "Test_Client_21P10C68818122", "locationData" : null, "locallyConfiguredMgmtVlan" : 0, "locallyConfigured" : false, @@ -100,8 +100,8 @@ }, "eirpTxPower" : { "model_type" : "AutoOrManualValue", - "auto" : false, - "value" : 10 + "auto" : true, + "value" : 18 }, "bestApEnabled" : null, "neighbouringListApConfig" : { @@ -121,7 +121,7 @@ "radioType" : "is5GHzU", "channelNumber" : 149, "manualChannelNumber" : 149, - "backupChannelNumber" : 116, + "backupChannelNumber" : 154, "autoChannelSelection" : true, "channelBandwidth" : "is80MHz", "bannedChannels" : [ ], @@ -203,7 +203,7 @@ "is5GHzU" : { "model_type" : "RadioConfiguration", "radioType" : "is5GHzU", - "radioAdminState" : "disabled", + "radioAdminState" : "enabled", "fragmentationThresholdBytes" : 2346, "rtsCtsThreshold" : 65535, "autoChannelSelection" : "disabled", @@ -284,7 +284,7 @@ }, "latitude" : null, "longitude" : null, - "serial" : "serial-ap-50", - "createdTimestamp" : 1589915837067, - "lastModifiedTimestamp" : 1589915837067 -} \ No newline at end of file + "serial" : "21P10C68818122", + "createdTimestamp" : 1590607072871, + "lastModifiedTimestamp" : 1590607073116 +} 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 5bf6747..fa4b2c0 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,13 +1,13 @@ { "model_type" : "Location", - "id" : 7, - "parentId" : 2, - "locationType" : "BUILDING", + "id" : 8, + "parentId" : 0, + "locationType" : "SITE", "customerId" : 2, - "name" : "Building 2", + "name" : "Ottawa", "details" : { "model_type" : "LocationDetails", - "countryCode" : "usa", + "countryCode" : "ca", "maintenanceWindow" : null, "rrmEnabled" : true, "dailyRebalancingDetails" : { @@ -62,6 +62,6 @@ } } }, - "createdTimestamp" : 1589567347442, - "lastModifiedTimestamp" : 1589567347442 + "createdTimestamp" : 1590607043540, + "lastModifiedTimestamp" : 1590607043540 } \ 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 04f8556..31bf667 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,12 +1,11 @@ { "model_type" : "Profile", - "id" : 2, + "id" : 3, "customerId" : 2, "profileType" : "equipment_ap", - "name" : "ApProfile", + "name" : "autoprovisionedApProfile", "details" : { "model_type" : "ApNetworkConfiguration", - "sampleDetailsStr" : null, "networkConfigVersion" : "AP-1", "equipmentType" : "AP", "vlanNative" : true, @@ -42,9 +41,10 @@ "bestApEnabled" : true, "bestAPSteerType" : "both" } - } + }, + "profileType" : "equipment_ap" }, - "createdTimestamp" : 1589567037365, - "lastModifiedTimestamp" : 1589567037365, - "childProfileIds" : [ ] + "createdTimestamp" : 1590607072994, + "lastModifiedTimestamp" : 1590607073083, + "childProfileIds" : [ 4, 5, 6 ] } \ 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 24bdf27..6648bc7 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,190 +1,71 @@ [ -{ - "model_type" : "Profile", - "id" : 1, - "customerId" : 2, - "profileType" : "ssid", - "name" : "Connectus-local", - "details" : { - "model_type" : "SsidConfiguration", - "sampleDetailsStr" : null, - "ssid" : "Connectus-local", - "appliedRadios" : [ "is5GHzL", "is5GHzU", "is2dot4GHz" ], - "ssidAdminState" : "enabled", - "secureMode" : "wpa2PSK", - "vlanId" : 1, - "keyStr" : "12345678", - "broadcastSsid" : "enabled", - "keyRefresh" : 0, - "noLocalSubnets" : false, - "radiusServiceName" : null, - "captivePortalId" : null, - "bandwidthLimitDown" : 0, - "bandwidthLimitUp" : 0, - "videoTrafficOnly" : false, - "radioBasedConfigs" : { - "is5GHz" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - }, - "is2dot4GHz" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - }, - "is5GHzU" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - }, - "is5GHzL" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - } - }, - "bonjourGatewayProfileId" : null, - "enable80211w" : null, - "wepConfig" : null, - "forwardMode" : null - }, - "createdTimestamp" : 1589567130432, - "lastModifiedTimestamp" : 1589567130432, - "childProfileIds" : [ ] -}, -{ - "model_type" : "Profile", - "id" : 2, - "customerId" : 2, - "profileType" : "ssid", - "name" : "Connectus-local-2", - "details" : { - "model_type" : "SsidConfiguration", - "sampleDetailsStr" : null, - "ssid" : "Connectus-local-2", - "appliedRadios" : [ "is5GHzL", "is5GHzU"], - "ssidAdminState" : "enabled", - "secureMode" : "wpa2PSK", - "vlanId" : 1, - "keyStr" : "12345678", - "broadcastSsid" : "enabled", - "keyRefresh" : 0, - "noLocalSubnets" : false, - "radiusServiceName" : null, - "captivePortalId" : null, - "bandwidthLimitDown" : 0, - "bandwidthLimitUp" : 0, - "videoTrafficOnly" : false, - "radioBasedConfigs" : { - "is5GHz" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - }, - "is2dot4GHz" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - }, - "is5GHzU" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - }, - "is5GHzL" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - } - }, - "bonjourGatewayProfileId" : null, - "enable80211w" : null, - "wepConfig" : null, - "forwardMode" : null - }, - "createdTimestamp" : 1589567130432, - "lastModifiedTimestamp" : 1589567130432, - "childProfileIds" : [ ] -} -, -{ - "model_type" : "Profile", - "id" : 3, - "customerId" : 2, - "profileType" : "ssid", - "name" : "Connectus-local-3u", - "details" : { - "model_type" : "SsidConfiguration", - "sampleDetailsStr" : null, - "ssid" : "Connectus-local-3u", - "appliedRadios" : [ "is5GHzU" ], - "ssidAdminState" : "enabled", - "secureMode" : "wpa2PSK", - "vlanId" : 1, - "keyStr" : "12345678", - "broadcastSsid" : "enabled", - "keyRefresh" : 0, - "noLocalSubnets" : false, - "radiusServiceName" : null, - "captivePortalId" : null, - "bandwidthLimitDown" : 0, - "bandwidthLimitUp" : 0, - "videoTrafficOnly" : false, - "radioBasedConfigs" : { - "is5GHz" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - }, - "is2dot4GHz" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - }, - "is5GHzU" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - }, - "is5GHzL" : { - "model_type" : "RadioBasedSsidConfiguration", - "enable80211r" : null, - "enable80211k" : null, - "enable80211v" : null - } - }, - "bonjourGatewayProfileId" : null, - "enable80211w" : null, - "wepConfig" : null, - "forwardMode" : null - }, - "createdTimestamp" : 1589567130432, - "lastModifiedTimestamp" : 1589567130432, - "childProfileIds" : [ ] -} -, { "model_type" : "Profile", "id" : 4, "customerId" : 2, "profileType" : "ssid", - "name" : "Connectus-local-4l", + "name" : "autoProvisionedSsid", "details" : { "model_type" : "SsidConfiguration", - "sampleDetailsStr" : null, - "ssid" : "Connectus-local-4l", + "ssid" : "autoProvisionedSsid", + "appliedRadios" : [ "is2dot4GHz" ], + "ssidAdminState" : "enabled", + "secureMode" : "wpa2PSK", + "vlanId" : 1, + "keyStr" : "12345678", + "broadcastSsid" : "enabled", + "keyRefresh" : 0, + "noLocalSubnets" : false, + "radiusServiceName" : null, + "captivePortalId" : null, + "bandwidthLimitDown" : 0, + "bandwidthLimitUp" : 0, + "videoTrafficOnly" : false, + "radioBasedConfigs" : { + "is5GHz" : { + "model_type" : "RadioBasedSsidConfiguration", + "enable80211r" : null, + "enable80211k" : null, + "enable80211v" : null + }, + "is2dot4GHz" : { + "model_type" : "RadioBasedSsidConfiguration", + "enable80211r" : null, + "enable80211k" : null, + "enable80211v" : null + }, + "is5GHzU" : { + "model_type" : "RadioBasedSsidConfiguration", + "enable80211r" : null, + "enable80211k" : null, + "enable80211v" : null + }, + "is5GHzL" : { + "model_type" : "RadioBasedSsidConfiguration", + "enable80211r" : null, + "enable80211k" : null, + "enable80211v" : null + } + }, + "bonjourGatewayProfileId" : null, + "enable80211w" : null, + "wepConfig" : null, + "forwardMode" : null, + "profileType" : "ssid" + }, + "createdTimestamp" : 1590607073026, + "lastModifiedTimestamp" : 1590607073026, + "childProfileIds" : [ ] +}, +{ + "model_type" : "Profile", + "id" : 5, + "customerId" : 2, + "profileType" : "ssid", + "name" : "autoProvisionedSsid-5l", + "details" : { + "model_type" : "SsidConfiguration", + "ssid" : "autoProvisionedSsid-5l", "appliedRadios" : [ "is5GHzL" ], "ssidAdminState" : "enabled", "secureMode" : "wpa2PSK", @@ -227,10 +108,69 @@ "bonjourGatewayProfileId" : null, "enable80211w" : null, "wepConfig" : null, - "forwardMode" : null + "forwardMode" : null, + "profileType" : "ssid" }, - "createdTimestamp" : 1589567130432, - "lastModifiedTimestamp" : 1589567130432, + "createdTimestamp" : 1590607073044, + "lastModifiedTimestamp" : 1590607073044, + "childProfileIds" : [ ] +}, +{ + "model_type" : "Profile", + "id" : 6, + "customerId" : 2, + "profileType" : "ssid", + "name" : "autoProvisionedSsid-5u", + "details" : { + "model_type" : "SsidConfiguration", + "ssid" : "autoProvisionedSsid-5u", + "appliedRadios" : [ "is5GHzU" ], + "ssidAdminState" : "enabled", + "secureMode" : "wpa2PSK", + "vlanId" : 1, + "keyStr" : "12345678", + "broadcastSsid" : "enabled", + "keyRefresh" : 0, + "noLocalSubnets" : false, + "radiusServiceName" : null, + "captivePortalId" : null, + "bandwidthLimitDown" : 0, + "bandwidthLimitUp" : 0, + "videoTrafficOnly" : false, + "radioBasedConfigs" : { + "is5GHz" : { + "model_type" : "RadioBasedSsidConfiguration", + "enable80211r" : null, + "enable80211k" : null, + "enable80211v" : null + }, + "is2dot4GHz" : { + "model_type" : "RadioBasedSsidConfiguration", + "enable80211r" : null, + "enable80211k" : null, + "enable80211v" : null + }, + "is5GHzU" : { + "model_type" : "RadioBasedSsidConfiguration", + "enable80211r" : null, + "enable80211k" : null, + "enable80211v" : null + }, + "is5GHzL" : { + "model_type" : "RadioBasedSsidConfiguration", + "enable80211r" : null, + "enable80211k" : null, + "enable80211v" : null + } + }, + "bonjourGatewayProfileId" : null, + "enable80211w" : null, + "wepConfig" : null, + "forwardMode" : null, + "profileType" : "ssid" + }, + "createdTimestamp" : 1590607073065, + "lastModifiedTimestamp" : 1590607073065, "childProfileIds" : [ ] } ] \ No newline at end of file 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 748586e..ff00ee1 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 @@ -1810,14 +1810,14 @@ public class OvsdbDao { String ssidSecurityMode = ssidConfig.getSecureMode().name(); String opensyncSecurityMode = "OPEN"; - RadioMode radioMode = ((ApElementConfiguration) opensyncApConfig.getCustomerEquipment().getDetails()) - .getAdvancedRadioMap().get(radioType).getRadioMode(); + RadioConfiguration radioConfiguration = ((ApElementConfiguration) opensyncApConfig.getCustomerEquipment().getDetails()) + .getAdvancedRadioMap().get(radioType); + if (radioConfiguration == null) continue; // don't have a radio of this kind in the map + RadioMode radioMode = radioConfiguration.getRadioMode(); - boolean uapsdEnabled = (((ApElementConfiguration) opensyncApConfig.getCustomerEquipment().getDetails()) - .getAdvancedRadioMap().get(radioType).getUapsdState() == StateSetting.enabled); + boolean uapsdEnabled = (radioConfiguration.getUapsdState() == StateSetting.enabled); - boolean apBridge = (((ApElementConfiguration) opensyncApConfig.getCustomerEquipment().getDetails()) - .getAdvancedRadioMap().get(radioType).getStationIsolation() == StateSetting.enabled); //stationIsolation + boolean apBridge = (radioConfiguration.getStationIsolation() == StateSetting.enabled); //stationIsolation String minHwMode = "11n"; // min_hw_mode is 11ac, wifi 5, we can also take ++ (11ax) but 2.4GHz only // Wifi4 --