[WIFI-7579] Bugfixes on updating status API for auto-upgrade

* [WIFI-7514] Adding init for DHCP lease ip table when ap connects

* [WIFI-7514] Fix enum handling for DHCP Lease IP table

opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java

@@ -47,6 +47,7 @@ import com.telecominfraproject.wlan.client.session.models.ClientDhcpDetails;
 import com.telecominfraproject.wlan.client.session.models.ClientSession;
 import com.telecominfraproject.wlan.client.session.models.ClientSessionDetails;
 import com.telecominfraproject.wlan.core.model.entity.CountryCode;
+import com.telecominfraproject.wlan.core.model.equipment.ChannelBandwidth;
 import com.telecominfraproject.wlan.core.model.equipment.EquipmentType;
 import com.telecominfraproject.wlan.core.model.equipment.LedStatus;
 import com.telecominfraproject.wlan.core.model.equipment.MacAddress;
@@ -581,7 +582,8 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
             protocolStatusData.setBandPlan("FCC");
             protocolStatusData.setBaseMacAddress(MacAddress.valueOf(connectNodeInfo.macAddress));
             protocolStatusData.setCloudCfgDataVersion(42L);
-            protocolStatusData.setReportedCfgDataVersion(42L);
+            //this will be set later in the flow - after the config is successfully pushed to the AP
+            //protocolStatusData.setReportedCfgDataVersion(42L);
             CountryCode countryCode = Location.getCountryCode(locationServiceInterface.getOrNull(ce.getLocationId()));
             if (countryCode != null)
                 protocolStatusData.setCountryCode(countryCode.getName());
@@ -765,7 +767,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
             String firmwareVersion) {
 
         LOG.debug("reconcileFwVersionToTrack for AP {} with active firmware version {} model {}", ce.getInventoryId(), activeFirmwareImageAp, model);
-        Status statusRecord = statusServiceInterface.getOrNull(autoProvisionedCustomerId, autoProvisionedCustomerId, StatusDataType.FIRMWARE);
+        Status statusRecord = statusServiceInterface.getOrNull(ce.getCustomerId(), ce.getId(), StatusDataType.FIRMWARE);
         if (statusRecord == null) {
             statusRecord = new Status();
             statusRecord.setCreatedTimestamp(System.currentTimeMillis());
@@ -775,7 +777,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
             statusRecord.setDetails(new EquipmentUpgradeStatusData());
             ((EquipmentUpgradeStatusData) statusRecord.getDetails()).setActiveSwVersion(activeFirmwareImageAp);
             if (inactiveFirmwareImageAp != null) {
-                ((EquipmentUpgradeStatusData) statusRecord.getDetails()).setActiveSwVersion(inactiveFirmwareImageAp);
+                ((EquipmentUpgradeStatusData) statusRecord.getDetails()).setAlternateSwVersion(inactiveFirmwareImageAp);
             }
         }
         EquipmentUpgradeStatusData fwUpgradeStatusData = (EquipmentUpgradeStatusData) statusRecord.getDetails();
@@ -793,8 +795,8 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
         // determine if AP requires FW upgrade before cloud
         // connection/provision
         if (trackSettings.getAutoUpgradeDeprecatedOnBind().equals(TrackFlag.ALWAYS) || trackSettings.getAutoUpgradeUnknownOnBind().equals(TrackFlag.ALWAYS)) {
-            LOG.debug("reconcileFwVersionToTrack for AP {} track flag for auto-upgrade {}", ce.getInventoryId(),
-                    trackSettings.getAutoUpgradeDeprecatedOnBind());
+            LOG.debug("reconcileFwVersionToTrack for AP {} track flag for auto-upgrade; deprecated flag {} ; unknown flag {} ", ce.getInventoryId(),
+                    trackSettings.getAutoUpgradeDeprecatedOnBind(), trackSettings.getAutoUpgradeUnknownOnBind());
             // check the reported fw version for the AP, if it is < than
             // the default version for the cloud, then download and
             // flash the firmware before proceeding.
@@ -1352,10 +1354,33 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
             channelStatus.setDetails(channelStatusData);
         }
         ((EquipmentChannelStatusData) channelStatus.getDetails()).getChannelNumberStatusDataMap().put(radioState.getFreqBand(), radioState.getChannel());
+        ChannelBandwidth channelBandwidth = convertHtModeToChannelBandwidth(radioState.getHtMode());
+        ((EquipmentChannelStatusData) channelStatus.getDetails()).getChannelBandwidthStatusDataMap().put(radioState.getFreqBand(), channelBandwidth);
         ((EquipmentChannelStatusData) channelStatus.getDetails()).getTxPowerDataMap().put(radioState.getFreqBand(), radioState.getTxPower());
         return channelStatus;
     }
-
+    
+    private ChannelBandwidth convertHtModeToChannelBandwidth(String htMode) {
+        if (htMode == null) {
+            return null;
+        }
+        switch (htMode) {
+            case "HT20":
+                return ChannelBandwidth.is20MHz;
+            case "HT40":
+            case "HT40-":
+            case "HT40+":
+                return ChannelBandwidth.is40MHz;
+            case "HT80":
+                return ChannelBandwidth.is80MHz;
+            case "HT160":
+                return ChannelBandwidth.is160MHz;
+            default:
+                LOG.warn("Unrecognized channel HtMode {}", htMode);
+                return ChannelBandwidth.UNSUPPORTED;
+        }
+    }
+    
     private boolean updateChannelPowerLevels(String apId, ApElementConfiguration apElementConfiguration, OpensyncAPRadioState radioState) {
 
         boolean configStateMismatch = false;
@@ -2408,6 +2433,83 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
         // TODO: will handle changes from Command_State table
     }
 
+    @Override
+    public long getConfigVersionFromStatus(String apId) {
+        long ret = 0;
+        
+        OvsdbSession ovsdbSession = ovsdbSessionMapInterface.getSession(apId);
+
+        if (ovsdbSession == null) {
+            LOG.debug("getConfigVersionFromStatus::Cannot get Session for AP {}", apId);
+            return ret;
+        }
+
+        long equipmentId = ovsdbSession.getEquipmentId();
+        Equipment ce = equipmentServiceInterface.getOrNull(equipmentId);
+        if (ce == null) {
+            LOG.debug("getConfigVersionFromStatus Cannot get customer Equipment for {}", apId);
+            return ret;
+        }
+        int customerId = ce.getCustomerId();
+        if ((customerId < 0) || (equipmentId < 0)) {
+            LOG.debug("getConfigVersionFromStatus::Cannot get valid CustomerId {} or EquipmentId {} for AP {}", customerId, equipmentId, apId);
+            return ret;
+        }
+        
+        Status protocolStatus = statusServiceInterface.getOrNull(customerId, equipmentId, StatusDataType.PROTOCOL);
+        if(protocolStatus != null) {
+            EquipmentProtocolStatusData epsd = (EquipmentProtocolStatusData) protocolStatus.getDetails();
+            if(epsd!=null && epsd.getReportedCfgDataVersion()!=null) {
+                ret = epsd.getReportedCfgDataVersion();
+            }
+        }
+
+        return ret;
+    }
+    
+    @Override
+    public void updateConfigVersionInStatus(String apId, long configVersionFromProfiles) {
+        OvsdbSession ovsdbSession = ovsdbSessionMapInterface.getSession(apId);
+
+        if (ovsdbSession == null) {
+            LOG.debug("updateConfigVersionInStatus::Cannot get Session for AP {}", apId);
+            return;
+        }
+
+        long equipmentId = ovsdbSession.getEquipmentId();
+        Equipment ce = equipmentServiceInterface.getOrNull(equipmentId);
+        if (ce == null) {
+            LOG.debug("updateConfigVersionInStatus Cannot get customer Equipment for {}", apId);
+            return;
+        }
+        int customerId = ce.getCustomerId();
+        if ((customerId < 0) || (equipmentId < 0)) {
+            LOG.debug("updateConfigVersionInStatus::Cannot get valid CustomerId {} or EquipmentId {} for AP {}", customerId, equipmentId, apId);
+            return;
+        }
+        
+        Status protocolStatus = statusServiceInterface.getOrNull(customerId, equipmentId, StatusDataType.PROTOCOL);
+        if(protocolStatus == null) {
+            protocolStatus = new Status();
+            protocolStatus.setCustomerId(customerId);
+            protocolStatus.setEquipmentId(equipmentId);
+            protocolStatus.setCreatedTimestamp(System.currentTimeMillis());
+            protocolStatus.setLastModifiedTimestamp(protocolStatus.getCreatedTimestamp());
+            protocolStatus.setDetails(new EquipmentProtocolStatusData());
+        }
+
+        EquipmentProtocolStatusData epsd = (EquipmentProtocolStatusData) protocolStatus.getDetails();
+        if(epsd==null) {
+            epsd = new EquipmentProtocolStatusData();
+            protocolStatus.setDetails(epsd);
+        }
+        
+        epsd.setReportedCfgDataVersion(configVersionFromProfiles);
+
+        statusServiceInterface.update(protocolStatus);
+        
+    }
+    
     /**
      * Clear the EquipmentStatus for this AP, and set all client sessions to
      * disconnected. Done as part of a reconfiguration/configuration change

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

@@ -520,15 +520,18 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
                     if (apNodeMetrics.getSourceTimestampMs() < survey.getTimestampMs())
                         apNodeMetrics.setSourceTimestampMs(survey.getTimestampMs());
 
-                    int pctBusyTx = busyTx / totalDurationMs;
+                    float pctBusyTx = (float)busyTx / totalDurationMs;
                     checkIfOutOfBound("pctBusyTx", pctBusyTx, survey, totalDurationMs, busyTx, busyRx, busy, busySelf);
-
-                    radioUtil.setAssocClientTx(pctBusyTx);
-                    int pctBusyRx = busySelf / totalDurationMs;
+                    radioUtil.setAssocClientTx(Math.round(pctBusyTx));
+                    
+                    float pctBusyRx = (float) busyRx / totalDurationMs;
                     checkIfOutOfBound("pctBusyRx", pctBusyRx, survey, totalDurationMs, busyTx, busyRx, busy, busySelf);
-                    radioUtil.setAssocClientRx(pctBusyRx);
+                    
+                    float pctBusySelf = (float) busySelf / totalDurationMs;
+                    checkIfOutOfBound("pctBusySelf", pctBusySelf, survey, totalDurationMs, busyTx, busyRx, busy, busySelf);
+                    radioUtil.setAssocClientRx(Math.round(pctBusySelf));
 
-                    double pctIBSS = (busyTx + busySelf) / totalDurationMs;
+                    double pctIBSS = (double) (busyTx + busySelf) / totalDurationMs;
                     if (pctIBSS > 100D || pctIBSS < 0D) {
                         LOG.warn(
                                 "Calculated value for {} {} is out of bounds on totalDurationMs {} for survey.getBand {}. busyTx {} busyRx {} busy {} busySelf {} "
@@ -538,13 +541,13 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
                     }
                     radioUtil.setIbss(pctIBSS);
 
-                    int nonWifi = (busy - (busyTx + busyRx)) / totalDurationMs;
+                    float nonWifi = (float) (busy - (busyTx + busyRx)) / totalDurationMs;
                     checkIfOutOfBound("nonWifi", nonWifi, survey, totalDurationMs, busyTx, busyRx, busy, busySelf);
-                    radioUtil.setNonWifi(nonWifi);
+                    radioUtil.setNonWifi(Math.round(nonWifi));
 
-                    int pctOBSSAndSelfErrors = (busyRx - busySelf) / totalDurationMs;
+                    float pctOBSSAndSelfErrors = (float) (busyRx - busySelf) / totalDurationMs;
                     checkIfOutOfBound("OBSSAndSelfErrors", pctOBSSAndSelfErrors, survey, totalDurationMs, busyTx, busyRx, busy, busySelf);
-                    radioUtil.setUnassocClientRx(pctOBSSAndSelfErrors);
+                    radioUtil.setUnassocClientRx(Math.round(pctOBSSAndSelfErrors));
 
                     radioType = OvsdbToWlanCloudTypeMappingUtility.getRadioTypeFromOpensyncStatsRadioBandType(survey.getBand());
                     if (radioType != RadioType.UNSUPPORTED) {
@@ -559,7 +562,7 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
                         }
 
                         Long totalUtilization = Math.round((double) busy / totalDurationMs);
-                        Long totalNonWifi = totalUtilization - ((busyTx + busyRx) / totalDurationMs);
+                        Long totalNonWifi = Math.round((double) (busy - (busyTx + busyRx)) / totalDurationMs);
 
                         EquipmentCapacityDetails cap = new EquipmentCapacityDetails();
                         cap.setUnavailableCapacity(totalNonWifi.intValue());
@@ -623,8 +626,8 @@ public class MqttStatsPublisher implements StatsPublisherInterface {
         alarm = alarmServiceInterface.create(alarm);
     }
 
-    private void checkIfOutOfBound(String checkedType, int checkedValue, Survey survey, int totalDurationMs, int busyTx, int busyRx, int busy, int busySelf) {
-        if (checkedValue > 100 || checkedValue < 0) {
+    private void checkIfOutOfBound(String checkedType, float checkedValue, Survey survey, int totalDurationMs, int busyTx, int busyRx, int busy, int busySelf) {
+        if (checkedValue > 100F || checkedValue < 0F) {
             LOG.warn(
                     "Calculated value for {} {} is out of bounds on totalDurationMs {} for survey.getBand {}. busyTx {} busyRx {} busy {} busySelf {} "
                             + " survey.getTimestampMs {}, survey.getSurveyListList {}",

opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationInterface.java

@@ -56,4 +56,8 @@ public interface OpensyncExternalIntegrationInterface {
     void clearEquipmentStatus(String apId);
     
     void processMqttMessage(String topic, Report report);
+
+    long getConfigVersionFromStatus(String apId);
+
+    void updateConfigVersionInStatus(String apId, long configVersionFromProfiles);
 }

opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/ConnectNodeInfo.java

@@ -7,6 +7,8 @@ import java.util.Objects;
 
 public class ConnectNodeInfo implements Cloneable {
 
+    public static String CONFIG_VERSION_PROPERTY_NAME = "tip/reportedCfgDataVersion";
+    
     public Map<String, String> mqttSettings = new HashMap<>();
     public Map<String, String> versionMatrix = new HashMap<>();
     public Map<String, String> wifiRadioStates = new HashMap<>();
@@ -35,6 +37,18 @@ public class ConnectNodeInfo implements Cloneable {
     public String manufacturerDate;
     public String certificationRegion;
 
+    public long getConfigVersion() {
+        
+        long ret = 0;
+        try {
+            ret = Long.parseLong(versionMatrix.get(CONFIG_VERSION_PROPERTY_NAME));
+        } catch(Exception e) {
+            //do nothing
+        }
+
+        return ret;
+    }
+    
     @Override
     public ConnectNodeInfo clone() {
         try {

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

@@ -1,6 +1,7 @@
 package com.telecominfraproject.wlan.opensync.external.integration.models;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
@@ -44,9 +45,67 @@ public class OpensyncAPConfig extends OpensyncAPBase {
     private EquipmentGatewayRecord equipmentGateway;
     private List<Profile> captiveProfiles;
     private List<Profile> bonjourGatewayProfiles;
+    
+    private long configVersion;
 
     private List<MacAddress> blockedClients;
 
+    public long getConfigVersion() {
+        //go through all child objects and get the most recent lastModifiedTimestamp from them
+        configVersion = 0;
+        
+        if(customerEquipment!=null && customerEquipment.getLastModifiedTimestamp()> configVersion) {
+            configVersion = customerEquipment.getLastModifiedTimestamp();
+        }
+        
+        if(hotspotConfig!=null) {
+            configVersion = getLatestLastMod(configVersion, hotspotConfig.getHotspot20OperatorSet());
+            configVersion = getLatestLastMod(configVersion, hotspotConfig.getHotspot20ProfileSet());
+            configVersion = getLatestLastMod(configVersion, hotspotConfig.getHotspot20ProviderSet());
+            configVersion = getLatestLastMod(configVersion, hotspotConfig.getHotspot20VenueSet());
+        }
+
+        configVersion = getLatestLastMod(configVersion, apProfile);
+        configVersion = getLatestLastMod(configVersion, rfProfile);
+        configVersion = getLatestLastMod(configVersion, ssidProfile);
+        configVersion = getLatestLastMod(configVersion, metricsProfile);
+        configVersion = getLatestLastMod(configVersion, radiusProfiles);
+        configVersion = getLatestLastMod(configVersion, wiredEthernetPortProfile);
+
+        if(equipmentLocation!=null && equipmentLocation.getLastModifiedTimestamp()> configVersion) {
+            configVersion = equipmentLocation.getLastModifiedTimestamp();
+        }
+
+        configVersion = getLatestLastMod(configVersion, captiveProfiles);
+        configVersion = getLatestLastMod(configVersion, bonjourGatewayProfiles);
+        
+        return configVersion;
+    }
+    
+    private long getLatestLastMod(long incomingLastMod, Collection<Profile> profiles) {
+        
+        if(profiles!=null) {
+            for(Profile p: profiles) {
+                if(incomingLastMod < p.getLastModifiedTimestamp()) {
+                    incomingLastMod = p.getLastModifiedTimestamp();
+                }
+            }
+        }
+        
+        return incomingLastMod;
+    }
+
+    private long getLatestLastMod(long incomingLastMod, Profile profile) {
+        
+        if(profile!=null) {
+            if(incomingLastMod < profile.getLastModifiedTimestamp()) {
+                incomingLastMod = profile.getLastModifiedTimestamp();
+            }
+        }
+        
+        return incomingLastMod;
+    }
+
     @Override
     public OpensyncAPConfig clone() {
         OpensyncAPConfig ret = (OpensyncAPConfig) super.clone();

opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/OpensyncAPRadioState.java

@@ -42,7 +42,7 @@ public class OpensyncAPRadioState extends OpensyncAPBase {
     public Map<String, String> hwConfig;
     public int channel;
     public int txPower;
-    public String htMode;
+    public String htMode; // used in channel bandwidth
     public int thermalDowngradeTemp;
     public String hwMode;
     public boolean enabled;

opensync-ext-static/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationSimple.java

@@ -212,4 +212,14 @@ public class OpensyncExternalIntegrationSimple implements OpensyncExternalIntegr
         LOG.info("nodeStateDbTableUpdate for AP {}", apId);
     }
 
+    @Override
+    public long getConfigVersionFromStatus(String inventoryId) {
+        //0 means always push config to ap, do not do the version check for the configuration before pushing it
+        return 0;
+    }
+    
+    @Override
+    public void updateConfigVersionInStatus(String apId, long configVersionFromProfiles) {
+        // do nothing here
+    }
 }

opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/TipWlanOvsdbClient.java

@@ -72,6 +72,12 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
     @org.springframework.beans.factory.annotation.Value("${tip.wlan.defaultCommandDurationSec:3600}")
     private long defaultCommandDurationSec;
 
+    @org.springframework.beans.factory.annotation.Value("${tip.wlan.checkConfigVersionFromStatus:true}")
+    private boolean checkBeforePushConfigVersionFromStatus;
+
+    @org.springframework.beans.factory.annotation.Value("${tip.wlan.checkConfigVersionFromAp:true}")
+    private boolean checkBeforePushConfigVersionFromAp;
+    
     @Autowired
     private SslContext sslContext;
 
@@ -242,15 +248,69 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
         
         OpensyncAPConfig opensyncAPConfig = extIntegrationInterface.getApConfig(apId);
 
+        //get last known configVersion from the AP
+        long configVersionFromAp = checkBeforePushConfigVersionFromAp ? connectNodeInfo.getConfigVersion() : 0;
+        
+        //get last known configVersion from the EquipmentProtocolStatusData        
+        long configVersionFromStatus = checkBeforePushConfigVersionFromStatus ? extIntegrationInterface.getConfigVersionFromStatus(apId) : 0;
+        
+        //get current configVersion from the profiles and equipment
+        long configVersionFromProfiles = opensyncAPConfig.getConfigVersion();
+        
+        boolean needToPushConfigToAP = needToPushToAp(configVersionFromAp, configVersionFromStatus, configVersionFromProfiles);
+        
+        if(needToPushConfigToAP) {
+            pushConfigToAp(ovsdbClient, opensyncAPConfig, apId, configVersionFromProfiles);
+        }
+        
+        LOG.debug("Client connect Done");
+    }
+
+    private boolean needToPushToAp(long configVersionFromAp, long configVersionFromStatus, long configVersionFromProfiles) {
+
+        boolean ret = false;
+
+        if(configVersionFromAp == 0) {
+            LOG.debug("do not know what is on AP, let's push new config");
+            ret = true;
+        }
+        
+        if(checkBeforePushConfigVersionFromAp && configVersionFromAp < configVersionFromProfiles ) {
+            LOG.debug("our profiles are more recent than what was pushed  to AP previously, let's push new config");
+            ret = true;
+        }
+
+        if(checkBeforePushConfigVersionFromStatus && configVersionFromStatus < configVersionFromProfiles) {
+           LOG.debug("our profiles are more recent than the version stored in the protocol status, let's push new config");
+           ret = true;
+       }
+        
+       if(!checkBeforePushConfigVersionFromAp && !checkBeforePushConfigVersionFromStatus) {
+           LOG.debug("we do not do any checks for config versions - let's push new config");
+           ret = true;
+       }
+       
+       if(!ret) {
+           LOG.debug("no need to push new config to AP");
+       }
+       
+       return ret;
+
+    }
+    
+    private void pushConfigToAp(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncAPConfig, String apInventoryId, long configVersionFromProfiles) {
+
         ovsdbDao.removeAllPasspointConfigs(ovsdbClient);
         ovsdbDao.removeAllSsids(ovsdbClient); // always
         ovsdbDao.removeAllInetConfigs(ovsdbClient);
-        ovsdbDao.resetWiredPorts(ovsdbClient, opensyncAPConfig); 
+        if(opensyncAPConfig!=null) {
+            ovsdbDao.resetWiredPorts(ovsdbClient, opensyncAPConfig); // need to run this first before remove Status
+        }
         ovsdbDao.removeWifiRrm(ovsdbClient);
         ovsdbDao.removeRadsecRadiusAndRealmConfigs(ovsdbClient);
         ovsdbDao.removeAllStatsConfigs(ovsdbClient); // always
 
-        extIntegrationInterface.clearEquipmentStatus(apId);
+        extIntegrationInterface.clearEquipmentStatus(apInventoryId);
 
         if (opensyncAPConfig != null) {
             ovsdbDao.configureNode(ovsdbClient, opensyncAPConfig);
@@ -275,12 +335,17 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
             ovsdbDao.updateEventReportingInterval(ovsdbClient, collectionIntervalSecEvent);
 
         } else {
-            LOG.info("No Configuration available for {}", apId);
+            LOG.info("No Configuration available for {}", apInventoryId);
         }
+        
+        //after a successful config push let's update the configVersion on the AP and in the EquipmentProtocolStatusData
+        if(checkBeforePushConfigVersionFromStatus) {
+            extIntegrationInterface.updateConfigVersionInStatus(apInventoryId, configVersionFromProfiles);
+        }
+        ovsdbDao.updateConfigVersionInNode(ovsdbClient, configVersionFromProfiles);
 
-        LOG.debug("Client connect Done");
     }
-
+    
     @Override
     public Set<String> getConnectedClientIds() {
         return ovsdbSessionMapInterface.getConnectedClientIds();
@@ -327,36 +392,20 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
             return;
         }
 
-        ovsdbDao.removeAllPasspointConfigs(ovsdbClient);
-        ovsdbDao.removeAllSsids(ovsdbClient); // always
-        ovsdbDao.removeAllInetConfigs(ovsdbClient);
-        ovsdbDao.resetWiredPorts(ovsdbClient, opensyncAPConfig); // need to run this first before remove Status
-        ovsdbDao.removeWifiRrm(ovsdbClient);
-        ovsdbDao.removeRadsecRadiusAndRealmConfigs(ovsdbClient);
-        ovsdbDao.removeAllStatsConfigs(ovsdbClient);
-
-        extIntegrationInterface.clearEquipmentStatus(apId);
-
-        ovsdbDao.configureNode(ovsdbClient, opensyncAPConfig);
-        ovsdbDao.configureWifiRrm(ovsdbClient, opensyncAPConfig);
-        ovsdbDao.configureGreTunnels(ovsdbClient, opensyncAPConfig);
-        ovsdbDao.createVlanNetworkInterfaces(ovsdbClient, opensyncAPConfig);
-        ovsdbDao.configureWiredPort(ovsdbClient, opensyncAPConfig);
-        ovsdbDao.configureRadsecRadiusAndRealm(ovsdbClient, opensyncAPConfig);
-        ovsdbDao.configureSsids(ovsdbClient, opensyncAPConfig);
-        if (opensyncAPConfig.getHotspotConfig() != null) {
-            ovsdbDao.configureHotspots(ovsdbClient, opensyncAPConfig);
-        }
-
-        ovsdbDao.configureInterfaces(ovsdbClient);
-        ovsdbDao.configureWifiRadios(ovsdbClient, opensyncAPConfig);
+        //get last known configVersion from the AP
+        long configVersionFromAp = checkBeforePushConfigVersionFromAp ? ovsdbDao.getConfigVersionFromNode(ovsdbClient) : 0;
         
-        ovsdbDao.configureStatsFromProfile(ovsdbClient, opensyncAPConfig);
-        if (ovsdbDao.getDeviceStatsReportingInterval(ovsdbClient) != collectionIntervalSecDeviceStats) {
-            ovsdbDao.updateDeviceStatsReportingInterval(ovsdbClient, collectionIntervalSecDeviceStats);
+        //get last known configVersion from the EquipmentProtocolStatusData        
+        long configVersionFromStatus = checkBeforePushConfigVersionFromStatus ? extIntegrationInterface.getConfigVersionFromStatus(apId) : 0;
+        
+        //get current configVersion from the profiles and equipment
+        long configVersionFromProfiles = opensyncAPConfig.getConfigVersion();
+        
+        boolean needToPushConfigToAP = needToPushToAp(configVersionFromAp, configVersionFromStatus, configVersionFromProfiles);
+
+        if(needToPushConfigToAP) {
+            pushConfigToAp(ovsdbClient, opensyncAPConfig, apId, configVersionFromProfiles);
         }
-        ovsdbDao.enableNetworkProbeForSyntheticClient(ovsdbClient);
-        ovsdbDao.updateEventReportingInterval(ovsdbClient, collectionIntervalSecEvent);
         
         LOG.debug("Finished processConfigChanged for {}", apId);
     }
@@ -465,12 +514,12 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                             for (RowUpdate rowUpdate : tableUpdate.getRowUpdates().values()) {
 
                                 if (rowUpdate.getNew() == null) {
+                                    // delete
                                     Map<String, String> rowMap = new HashMap<>();
 
                                     rowUpdate.getOld().getColumns().entrySet().forEach(c -> OvsdbDao.translateDhcpFpValueToString(c, rowMap));
 
                                     delete.add(rowMap);
-                                    // delete
                                 } else if (rowUpdate.getOld() == null) {
                                     // insert
                                     Map<String, String> rowMap = new HashMap<>();
@@ -479,15 +528,13 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
 
                                     insert.add(rowMap);
                                 } else {
-
-                                    // insert
+                                    // update
                                     Map<String, String> rowMap = new HashMap<>();
 
                                     rowUpdate.getOld().getColumns().putAll(rowUpdate.getNew().getColumns());
                                     rowUpdate.getOld().getColumns().entrySet().forEach(c -> OvsdbDao.translateDhcpFpValueToString(c, rowMap));
 
                                     update.add(rowMap);
-
                                 }
                             }
                         }
@@ -511,7 +558,7 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
 
                 });
 
-        awCf.join();
+        extIntegrationInterface.dhcpLeasedIpDbTableUpdate(ovsdbDao.getInitialOpensyncDhcpLeasedIp(awCf.join(), key, ovsdbClient), key, RowUpdateOperation.INIT);
 
     }
 
@@ -631,7 +678,7 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                     }
 
                 });
-
+        
         extIntegrationInterface.wifiAssociatedClientsDbTableUpdate(ovsdbDao.getInitialOpensyncWifiAssociatedClients(acCf.join(), key, ovsdbClient), key);
 
     }
@@ -693,7 +740,7 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
     private void monitorWifiVifStateDbTable(OvsdbClient ovsdbClient, String key) throws OvsdbClientException {
 
         CompletableFuture<TableUpdates> vsCf = ovsdbClient.monitor(OvsdbDao.ovsdbName, OvsdbDao.wifiVifStateDbTable + "_" + key,
-                new MonitorRequests(ImmutableMap.of(OvsdbDao.wifiVifStateDbTable, new MonitorRequest(new MonitorSelect(false, true, true, true)))),
+                new MonitorRequests(ImmutableMap.of(OvsdbDao.wifiVifStateDbTable, new MonitorRequest(new MonitorSelect(true, true, true, true)))),
                 tableUpdates -> {
                     try {
                         LOG.info(OvsdbDao.wifiVifStateDbTable + "_" + key + " monitor callback received {}", tableUpdates);
@@ -731,7 +778,19 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
                     }
 
                 });
-        vsCf.join();
+
+        try {
+            List<OpensyncAPVIFState> vifsToInsert = new ArrayList<>();
+            TableUpdates initialTableUpdates = vsCf.join();
+            for (TableUpdate tableUpdate : initialTableUpdates.getTableUpdates().values()) {
+                for (RowUpdate rowUpdate : tableUpdate.getRowUpdates().values()) {
+                    vifsToInsert.addAll(ovsdbDao.getOpensyncApVifStateForRowUpdate(rowUpdate, key, ovsdbClient));
+                }
+            }
+            extIntegrationInterface.wifiVIFStateDbTableUpdate(vifsToInsert, key);
+        } catch (Exception e) {
+            LOG.error("initial wifiVIFStateDbTableUpdate failed", e);
+        }
 
     }
 

opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java

@@ -96,6 +96,7 @@ public class OvsdbDao extends OvsdbDaoBase {
         processBlinkRequest(ovsdbClient, opensyncAPConfig.getCustomerEquipment().getInventoryId(),
                 ((ApElementConfiguration) opensyncAPConfig.getCustomerEquipment().getDetails()).isBlinkAllLEDs());
         ovsdbNodeConfig.processLedControlEnabled(ovsdbClient, opensyncAPConfig);
+        processApcConfig(ovsdbClient, opensyncAPConfig);
     }
     
     void configureNtpServer(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncAPConfig) {
@@ -151,6 +152,11 @@ public class OvsdbDao extends OvsdbDaoBase {
             OvsdbClient ovsdbClient) {
         return ovsdbMonitor.getInitialOpensyncWifiAssociatedClients(join, key, ovsdbClient);
     }
+    
+    public List<Map<String, String>> getInitialOpensyncDhcpLeasedIp(TableUpdates join, String key,
+            OvsdbClient ovsdbClient) {
+        return ovsdbMonitor.getInitialOpensyncDhcpLeasedIp(join, key, ovsdbClient);
+    }
 
     public Collection<? extends OpensyncAPInetState> getOpensyncApInetStateForRowUpdate(RowUpdate rowUpdate, String key,
             OvsdbClient ovsdbClient) {
@@ -253,5 +259,17 @@ public class OvsdbDao extends OvsdbDaoBase {
     public String processBlinkRequest(OvsdbClient ovsdbClient, String apId, boolean blinkAllLEDs) {
         return ovsdbNodeConfig.processBlinkRequest(ovsdbClient, apId, blinkAllLEDs);
     }
+    
+    public void processApcConfig(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncAPConfig) {
+        ovsdbNodeConfig.configureDynamicRadiusProxyToAPC(ovsdbClient, opensyncAPConfig);
+    }
+
+    public long getConfigVersionFromNode(OvsdbClient ovsdbClient) {
+        return ovsdbNode.getConfigVersionFromNode(ovsdbClient);
+    }
+
+    public void updateConfigVersionInNode(OvsdbClient ovsdbClient, long configVersionFromProfiles) {
+        ovsdbNode.updateConfigVersionInNode(ovsdbClient, configVersionFromProfiles);
+    }
 
 }

opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbMonitor.java

@@ -83,6 +83,33 @@ public class OvsdbMonitor extends OvsdbDaoBase {
         }
         return ret;
     }
+    
+    List<Map<String, String>> getInitialOpensyncDhcpLeasedIp(TableUpdates tableUpdates, String apId,
+            OvsdbClient ovsdbClient) {
+        LOG.debug("getInitialOpensyncDhcpLeasedIp:");
+        List<Map<String, String>> ret = new ArrayList<>();
+        try {
+            LOG.debug(dhcpLeasedIpDbTable + "_" + apId + " initial monitor table state received {}",
+                    tableUpdates);
+
+            for (TableUpdate tableUpdate : tableUpdates.getTableUpdates().values()) {
+                for (RowUpdate rowUpdate : tableUpdate.getRowUpdates().values()) {
+
+                    if (rowUpdate.getNew() != null) {
+                        
+                        Map<String, String> rowMap = new HashMap<>();
+
+                        rowUpdate.getNew().getColumns().entrySet().forEach(c -> OvsdbDao.translateDhcpFpValueToString(c, rowMap));
+
+                        ret.add(rowMap);
+                    }
+                }
+            }
+        } catch (Exception e) {
+            throw (e);
+        }
+        return ret;
+    }
 
     List<OpensyncAPInetState> getOpensyncApInetStateForRowUpdate(RowUpdate rowUpdate, String apId,
             OvsdbClient ovsdbClient) {

opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbNode.java

@@ -417,4 +417,96 @@ public class OvsdbNode extends OvsdbDaoBase {
         return ret;
     }
 
+    public long getConfigVersionFromNode(OvsdbClient ovsdbClient) {
+        
+        long ret = 0;
+        
+        Map<String, String> versionMatrix = getVersionMatrixFromNode(ovsdbClient);
+
+        try {
+            ret = Long.parseLong(versionMatrix.get(ConnectNodeInfo.CONFIG_VERSION_PROPERTY_NAME));
+        } catch(Exception e) {
+            //do nothing
+        }
+        
+        LOG.debug("getConfigVersionFromNode {}", ret);
+        
+        return ret;
+    }
+
+    public Map<String, String> getVersionMatrixFromNode(OvsdbClient ovsdbClient) {
+        
+        Map<String, String> ret = new HashMap<>();
+        
+        try {
+            List<Operation> operations = new ArrayList<>();
+            List<Condition> conditions = new ArrayList<>();
+            List<String> columns = new ArrayList<>();
+            columns.add("version_matrix");
+            columns.add("id");
+
+            operations.add(new Select(awlanNodeDbTable, conditions, columns));
+            CompletableFuture<OperationResult[]> fResult = ovsdbClient.transact(ovsdbName, operations);
+            OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
+
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("Select from {}:", awlanNodeDbTable);
+
+                for (OperationResult res : result) {
+                    LOG.debug("Op Result {}", res);
+                }
+            }
+
+            Row row = null;
+            if ((result != null) && (result.length > 0) && (result[0] instanceof SelectResult) && !((SelectResult) result[0]).getRows().isEmpty()) {
+                row = ((SelectResult) result[0]).getRows().iterator().next();
+            }
+
+            if( row != null ) {
+                ret = row.getMapColumn("version_matrix");
+            }
+
+        } catch (OvsdbClientException | TimeoutException | ExecutionException | InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+        
+        LOG.debug("getVersionMatrixFromNode {}", ret);
+        
+        return ret;
+    }
+    public void updateConfigVersionInNode(OvsdbClient ovsdbClient, long configVersionFromProfiles) {
+
+        try {
+            //get original version_matrix map value
+            Map<String, String> versionMatrix = getVersionMatrixFromNode(ovsdbClient);
+
+            //update our config version in version_matrix map
+            versionMatrix.put(ConnectNodeInfo.CONFIG_VERSION_PROPERTY_NAME, Long.toString(configVersionFromProfiles));
+            
+            //update the version_matrix column
+            List<Operation> operations = new ArrayList<>();
+            Map<String, Value> updateColumns = new HashMap<>();
+            
+            @SuppressWarnings("unchecked")
+            com.vmware.ovsdb.protocol.operation.notation.Map<String, String> ovsdbVersionMatrix =
+                    com.vmware.ovsdb.protocol.operation.notation.Map.of(versionMatrix);
+            updateColumns.put("version_matrix", ovsdbVersionMatrix);
+            
+            Row row = new Row(updateColumns);
+            operations.add(new Update(awlanNodeDbTable, row));
+            CompletableFuture<OperationResult[]> fResult = ovsdbClient.transact(ovsdbName, operations);
+            OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
+
+            for (OperationResult r : result) {
+                LOG.debug("Op Result {}", r);
+            }
+    
+            LOG.debug("updateConfigVersionInNode {}", configVersionFromProfiles);
+
+        } catch (OvsdbClientException | TimeoutException | ExecutionException | InterruptedException  e) {
+            throw new RuntimeException(e);
+        }
+
+    }
+
 }

opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbNodeConfig.java

@@ -2,6 +2,7 @@
 package com.telecominfraproject.wlan.opensync.ovsdb.dao;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -14,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAPConfig;
+import com.telecominfraproject.wlan.opensync.ovsdb.dao.models.WifiVifConfigInfo;
 import com.telecominfraproject.wlan.profile.network.models.ApNetworkConfiguration;
 import com.vmware.ovsdb.exception.OvsdbClientException;
 import com.vmware.ovsdb.protocol.operation.Delete;
@@ -25,6 +27,7 @@ import com.vmware.ovsdb.protocol.operation.notation.Condition;
 import com.vmware.ovsdb.protocol.operation.notation.Function;
 import com.vmware.ovsdb.protocol.operation.notation.Row;
 import com.vmware.ovsdb.protocol.operation.notation.Value;
+import com.vmware.ovsdb.protocol.operation.result.ErrorResult;
 import com.vmware.ovsdb.protocol.operation.result.InsertResult;
 import com.vmware.ovsdb.protocol.operation.result.OperationResult;
 import com.vmware.ovsdb.protocol.operation.result.UpdateResult;
@@ -167,51 +170,78 @@ public class OvsdbNodeConfig extends OvsdbDaoBase {
 			throw new RuntimeException(e);
 		}
 	}
-
+	
 	public String processBlinkRequest(OvsdbClient ovsdbClient, String apId, boolean blinkAllLEDs) {
 
-		String ret = null;
-		try {
+        String ret = null;
+        try {
 
-			LOG.debug("processLEDRequest set LEDs status to {}", blinkAllLEDs ? "led_blink" : "led_state");
-			Map<String, Value> columns = new HashMap<>();
-			if (blinkAllLEDs) {
-				columns.put("module", new Atom<>("led"));
-				columns.put("key", new Atom<>("led_blink"));
-			} else {
-				columns.put("module", new Atom<>("led"));
-				columns.put("key", new Atom<>("led_state"));
-			}
-			List<Operation> operations = new ArrayList<>();
-			operations.add(new Update(nodeConfigTable,
-					List.of(new Condition("module", Function.EQUALS, new Atom<>("led"))), new Row(columns)));
-			CompletableFuture<OperationResult[]> fResult = ovsdbClient.transact(ovsdbName, operations);
-			OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
-			long numUpdates = 0;
-			for (OperationResult res : result) {
-				if (res instanceof UpdateResult) {
-					numUpdates += ((UpdateResult) res).getCount();
-					LOG.debug("processBlinkRequest update result {}", res);
-					ret = "processBlinkRequest update result " + res;
-				}
-			}
-			if (numUpdates == 0) {
-				// no records existed, insert the row instead
-				operations.clear();
-				operations.add(new Insert(nodeConfigTable, new Row(columns)));
-				fResult = ovsdbClient.transact(ovsdbName, operations);
-				result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
-				for (OperationResult res : result) {
-					if (res instanceof InsertResult) {
-						LOG.debug("processBlinkRequest insert result {}", res);
-						ret = "processBlinkRequest insert result " + res;
-					}
-				}
-			}
+            LOG.debug("processLEDRequest set LEDs status to {}", blinkAllLEDs ? "led_blink" : "led_state");
+            Map<String, Value> columns = new HashMap<>();
+            if (blinkAllLEDs) {
+                columns.put("module", new Atom<>("led"));
+                columns.put("key", new Atom<>("led_blink"));
+            } else {
+                columns.put("module", new Atom<>("led"));
+                columns.put("key", new Atom<>("led_state"));
+            }
+            List<Operation> operations = new ArrayList<>();
+            operations.add(new Update(nodeConfigTable,
+                    List.of(new Condition("module", Function.EQUALS, new Atom<>("led"))), new Row(columns)));
+            CompletableFuture<OperationResult[]> fResult = ovsdbClient.transact(ovsdbName, operations);
+            OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
+            long numUpdates = 0;
+            for (OperationResult res : result) {
+                if (res instanceof UpdateResult) {
+                    numUpdates += ((UpdateResult) res).getCount();
+                    LOG.debug("processBlinkRequest update result {}", res);
+                    ret = "processBlinkRequest update result " + res;
+                }
+            }
+            if (numUpdates == 0) {
+                // no records existed, insert the row instead
+                operations.clear();
+                operations.add(new Insert(nodeConfigTable, new Row(columns)));
+                fResult = ovsdbClient.transact(ovsdbName, operations);
+                result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
+                for (OperationResult res : result) {
+                    if (res instanceof InsertResult) {
+                        LOG.debug("processBlinkRequest insert result {}", res);
+                        ret = "processBlinkRequest insert result " + res;
+                    }
+                }
+            }
 
-			return ret;
-		} catch (OvsdbClientException | InterruptedException | ExecutionException | TimeoutException e) {
-			throw new RuntimeException(e);
-		}
-	}
+            return ret;
+        } catch (OvsdbClientException | InterruptedException | ExecutionException | TimeoutException e) {
+            throw new RuntimeException(e);
+        }
+    }
+	   
+    public void configureDynamicRadiusProxyToAPC(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncAPConfig) {
+        
+        ApNetworkConfiguration apNetworkConfig = (ApNetworkConfiguration) opensyncAPConfig.getApProfile()
+                .getDetails();
+        if (apNetworkConfig.isDynamicRadiusProxyEnabled() == null) {
+            LOG.info("Cannot configure isDynamicRadiusProxyEnabled to null value. {}", apNetworkConfig);
+            return;
+        }
+        Boolean isApcEnabled = apNetworkConfig.isDynamicRadiusProxyEnabled();
+        
+        try {
+            if (ovsdbClient.getSchema(ovsdbName).get().getTables().containsKey(apcConfigDbTable)) {
+                Map<String, Value> columns = new HashMap<>();
+                columns.put("enabled", new Atom<>(isApcEnabled));
+                
+                List<Operation> operations = new ArrayList<>();
+                operations.add(new Update(apcConfigDbTable, new Row(columns)));
+                CompletableFuture<OperationResult[]> fResult = ovsdbClient.transact(ovsdbName, operations);
+                OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
+                LOG.debug("configureDynamicRadiusProxyToAPC result {} ", Arrays.toString(result));
+            }
+        } catch (InterruptedException | ExecutionException | OvsdbClientException | TimeoutException e) {
+            LOG.error("Unable to configureDynamicRadiusProxyToAPC on AP.", e);
+            throw new RuntimeException(e);
+        }
+    }
 }

opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbRadiusProxyConfig.java

@@ -20,7 +20,6 @@ import com.vmware.ovsdb.exception.OvsdbClientException;
 import com.vmware.ovsdb.protocol.operation.Delete;
 import com.vmware.ovsdb.protocol.operation.Insert;
 import com.vmware.ovsdb.protocol.operation.Operation;
-import com.vmware.ovsdb.protocol.operation.Update;
 import com.vmware.ovsdb.protocol.operation.notation.Atom;
 import com.vmware.ovsdb.protocol.operation.notation.Row;
 import com.vmware.ovsdb.protocol.operation.notation.Set;
@@ -37,24 +36,6 @@ public class OvsdbRadiusProxyConfig extends OvsdbDaoBase {
     @Autowired
     OvsdbGet getProvisionedData;
 
-    void configureApc(OvsdbClient ovsdbClient, Boolean enable, List<Operation> operations) {
-        try {
-            if (ovsdbClient.getSchema(ovsdbName).get().getTables().containsKey(apcConfigDbTable)) {
-                Map<String, Value> updateColumns = new HashMap<>();
-                updateColumns.put("enabled", new Atom<>(enable));
-                Row row = new Row(updateColumns);
-                Update update = new Update(apcConfigDbTable, row);
-                if (!operations.contains(update)) {
-                    // only need to do 1 update of this kind
-                    operations.add(new Update(apcConfigDbTable, row));
-                }
-            }
-        } catch (InterruptedException | ExecutionException | OvsdbClientException e) {
-            LOG.error("Exception getting schema for ovsdb.", e);
-            throw new RuntimeException(e);
-        }
-    }
-
     void configureRadius(OvsdbClient ovsdbClient, OpensyncAPConfig apConfig) {
         List<Operation> operations = new ArrayList<>();
         try {
@@ -118,11 +99,14 @@ public class OvsdbRadiusProxyConfig extends OvsdbDaoBase {
                 updateColumns.put("acct_server", new Atom<>(rsc.getAcctServer().getHostAddress()));
             }
             if (rsc.getSharedSecret() != null) {
-                updateColumns.put("acct_secret", new Atom<>(rsc.getSharedSecret()));
+                updateColumns.put("acct_secret", new Atom<>(rsc.getAcctSharedSecret()));
             }
             if (rsc.getAcctPort() != null) {
                 updateColumns.put("acct_port", new Atom<>(rsc.getAcctPort()));
             }
+            if (rsc.getRadiusProxySecret() != null) {
+                updateColumns.put("proxy_secret", new Atom<>(rsc.getRadiusProxySecret()));
+            }
             if (databaseSchema.getTables().get(radiusConfigDbTable).getColumns().containsKey("auto_discover")) {
                 if (rsc.getUseRadSec() != null && rsc.getUseRadSec() && rsc.getDynamicDiscovery() != null &&  rsc.getDynamicDiscovery()) {
                     // if useRadSec && dynamicDiscovery enabled, do not send server information

opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbSsidConfig.java

@@ -19,6 +19,7 @@ import com.telecominfraproject.wlan.profile.models.common.FileType;
 import com.telecominfraproject.wlan.profile.models.common.ManagedFileInfo;
 import com.telecominfraproject.wlan.profile.network.models.ApNetworkConfiguration;
 import com.telecominfraproject.wlan.profile.network.models.GreTunnelConfiguration;
+import com.telecominfraproject.wlan.profile.network.models.RadiusProxyConfiguration;
 import com.telecominfraproject.wlan.profile.radius.models.RadiusProfile;
 import com.telecominfraproject.wlan.profile.radius.models.RadiusServer;
 import com.telecominfraproject.wlan.profile.rf.models.RfConfiguration;
@@ -59,8 +60,6 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
     OvsdbNetworkConfig networkConfig;
     @Autowired
     OvsdbNode ovsdbNode;
-    @Autowired
-    OvsdbRadiusProxyConfig radsecConfig;
 
     protected void getEnabledRadios(OvsdbClient ovsdbClient, List<RadioType> radios) {
         try {
@@ -490,6 +489,11 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
                         enable80211k = ssidConfig.getRadioBasedConfigs().get(radioType).getEnable80211k();
                     }
                 }
+                
+                boolean useRadiusProxy = false;
+                if (ssidConfig.getUseRadiusProxy() != null) {
+                    useRadiusProxy = ssidConfig.getUseRadiusProxy();
+                }
 
                 Map<String, String> security = new HashMap<>();
                 String ssidSecurityMode = ssidConfig.getSecureMode().name();
@@ -500,7 +504,7 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
                 String radiusOperName = null;
 
                 opensyncSecurityMode = getOpensyncSecurityMode(ssidSecurityMode, opensyncSecurityMode);
-                populateSecurityMap(opensyncApConfig, ssidConfig, security, ssidSecurityMode, opensyncSecurityMode);
+                populateSecurityMap(opensyncApConfig, ssidConfig, useRadiusProxy, security, ssidSecurityMode, opensyncSecurityMode);
 
                 int dynamicVlan = 0;
                 if (opensyncSecurityMode.endsWith("EAP")) {
@@ -548,10 +552,16 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
                     interfacesPerFreqBand.put(freqBand, 1);
                 }
 
-                boolean useRadiusProxy = false;
-                if (ssidConfig.getUseRadiusProxy() != null) {
-                    useRadiusProxy = ssidConfig.getUseRadiusProxy();
+                if (useRadiusProxy) {
+                    // AP requires proxy secret in security during auto radius proxy
+                    for (RadiusProxyConfiguration rsc : ((ApNetworkConfiguration) opensyncApConfig.getApProfile().getDetails()).getRadiusProxyConfigurations()) {
+                        if (rsc.getRadiusProxySecret() != null) {
+                            security.put("radius_server_secret", rsc.getRadiusProxySecret());
+                            security.put("radius_acct_secret", rsc.getRadiusProxySecret());
+                        }
+                    }
                 }
+                
                 boolean enableProxyArpForHotspot = false;
                 if (ssidConfig.getEnableProxyArpForHotspot() != null) {
                     enableProxyArpForHotspot = ssidConfig.getEnableProxyArpForHotspot();
@@ -564,11 +574,6 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
 
                     networkConfig.configureInetVifInterface(ovsdbClient, ifName, enabled, ssidConfig.getForwardMode(), operations);
 
-                    if (useRadiusProxy) {
-                        // make sure it's enabled if we are going to use it
-                        radsecConfig.configureApc(ovsdbClient, useRadiusProxy, operations);
-                    }
-
                 } catch (IllegalStateException e) {
                     // could not provision this SSID, but still can go on
                     LOG.warn("could not provision SSID {} on {}", ssidConfig.getSsid(), freqBand);
@@ -780,11 +785,11 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
         if (radiusProfileList.size() > 0) {
             Profile profileRadius = radiusProfileList.get(0);
             RadiusProfile profileDetails = ((RadiusProfile) profileRadius.getDetails());
-            RadiusServer rServer = profileDetails.getPrimaryRadiusAccountingServer();
-            if (rServer != null) {
-                security.put("radius_acct_ip", rServer.getIpAddress() != null ? rServer.getIpAddress().getHostAddress() : null);
-                security.put("radius_acct_port", rServer.getPort() != null ? String.valueOf(rServer.getPort()) : null);
-                security.put("radius_acct_secret", rServer.getSecret());
+            RadiusServer radiusAcctServerPrimary = profileDetails.getPrimaryRadiusAccountingServer();
+            if (radiusAcctServerPrimary != null) {
+                security.put("radius_acct_ip", radiusAcctServerPrimary.getIpAddress() != null ? radiusAcctServerPrimary.getIpAddress().getHostAddress() : null);
+                security.put("radius_acct_port", radiusAcctServerPrimary.getPort() != null ? String.valueOf(radiusAcctServerPrimary.getPort()) : null);
+                security.put("radius_acct_secret", radiusAcctServerPrimary.getSecret());
 
                 if (ssidConfig.getRadiusAcountingServiceInterval() != null && ssidConfig.getRadiusAcountingServiceInterval() > 0) {
                     // if the value is present, use the
@@ -792,11 +797,23 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
                     security.put("radius_acct_interval", ssidConfig.getRadiusAcountingServiceInterval().toString());
 
                 }
-                LOG.info("set Radius Accounting server attributes radius_acct_ip {} radius_acct_port {} radius_acct_secret {} radius_acct_interval {}",
+                LOG.info("Set Primary Radius Accounting server attributes radius_acct_ip {} radius_acct_port {} radius_acct_secret {} radius_acct_interval {}",
                         security.get("radius_acct_ip"), security.get("radius_acct_port"), security.get("radius_acct_secret"),
                         security.get("radius_acct_interval"));
             } else {
-                LOG.info("No Radius Accounting Server defined in Radius Profile");
+                LOG.info("No Primary Radius Accounting Server defined in Radius Profile");
+            }
+            
+            RadiusServer radiusAcctServerSecondary = profileDetails.getSecondaryRadiusAccountingServer();
+            if (radiusAcctServerSecondary != null) {
+                security.put("radius_acct_ip_secondary", radiusAcctServerSecondary.getIpAddress() != null ? radiusAcctServerSecondary.getIpAddress().getHostAddress() : null);
+                security.put("radius_acct_port_secondary", radiusAcctServerSecondary.getPort() != null ? String.valueOf(radiusAcctServerSecondary.getPort()) : null);
+                security.put("radius_acct_secret_secondary", radiusAcctServerSecondary.getSecret());
+
+                LOG.info("Set Secondary Radius Accounting server attributes radius_acct_ip_secondary {} radius_acct_port_secondary {} radius_acct_secret_secondary {}",
+                        security.get("radius_acct_ip_secondary"), security.get("radius_acct_port_secondary"), security.get("radius_acct_secret_secondary"));
+            } else {
+                LOG.info("No Secondary Radius Accounting Server defined in Radius Profile");
             }
 
         } else {
@@ -821,8 +838,19 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
             security.put("radius_server_ip", radiusServer.getIpAddress() != null ? radiusServer.getIpAddress().getHostAddress() : null);
             security.put("radius_server_port", radiusServer.getPort() != null ? String.valueOf(radiusServer.getPort()) : null);
             security.put("radius_server_secret", radiusServer.getSecret());           
-            LOG.info("set Radius server attributes radius_server_ip {} radius_server_port {} radius_server_secret {}", security.get("radius_server_ip"),
+            LOG.info("Set Primary Radius server attributes radius_server_ip {} radius_server_port {} radius_server_secret {}", security.get("radius_server_ip"),
                     security.get("radius_server_port"), security.get("radius_server_secret"));
+            
+            RadiusServer radiusServerSecondary = profileDetails.getSecondaryRadiusAuthServer();
+            if (radiusServerSecondary != null) {
+                security.put("radius_server_ip_secondary", radiusServerSecondary.getIpAddress() != null ? radiusServerSecondary.getIpAddress().getHostAddress() : null);
+                security.put("radius_server_port_secondary", radiusServerSecondary.getPort() != null ? String.valueOf(radiusServerSecondary.getPort()) : null);
+                security.put("radius_server_secret_secondary", radiusServerSecondary.getSecret());           
+                LOG.info("Set Secondary Radius server attributes radius_server_ip_secondary {} radius_server_port_secondary {} radius_server_secret_secondary {}", 
+                        security.get("radius_server_ip_secondary"), security.get("radius_server_port_secondary"), security.get("radius_server_secret_secondary"));
+            } else {
+                LOG.info("No Secondary Radius Authentication Server defined in Radius Profile");
+            }
         } else {
             LOG.warn("Could not find radius profile {} in {}", ssidConfig.getRadiusServiceId(), opensyncApConfig.getRadiusProfiles());
         }
@@ -838,7 +866,7 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
      * @param ssidSecurityMode
      * @param opensyncSecurityMode
      */
-    void populateSecurityMap(OpensyncAPConfig opensyncApConfig, SsidConfiguration ssidConfig, Map<String, String> security, String ssidSecurityMode,
+    void populateSecurityMap(OpensyncAPConfig opensyncApConfig, SsidConfiguration ssidConfig, Boolean useRadiusProxy, Map<String, String> security, String ssidSecurityMode,
             String opensyncSecurityMode) {
         security.put("encryption", opensyncSecurityMode);
         // key and mode is N/A for OPEN security
@@ -865,21 +893,21 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
                 case "wpa2OnlyEAP":
                 case "wpa2OnlyRadius":
                     security.put("mode", "2");
-                    if (!ssidConfig.getUseRadiusProxy()) {
+                    if (!useRadiusProxy) {
                         getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
                         getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
                     }
                     break;
                 case "wpa3OnlyEAP":
                     security.put("mode", "3");
-                    if (!ssidConfig.getUseRadiusProxy()) {
+                    if (!useRadiusProxy) {
                         getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
                         getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
                     }
                     break;
                 case "wpa3OnlyEAP192":
                     security.put("mode", "3");
-                    if (!ssidConfig.getUseRadiusProxy()) {
+                    if (!useRadiusProxy) {
                         getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
                         getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
                     }
@@ -888,7 +916,7 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
                 case "wpa2Radius":
                 case "wpa3MixedEAP":
                     security.put("mode", "mixed");
-                    if (!ssidConfig.getUseRadiusProxy()) {
+                    if (!useRadiusProxy) {
                         getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
                         getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
                     }
@@ -896,7 +924,7 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
                 case "wpaEAP":
                 case "wpaRadius":
                     security.put("mode", "1");
-                    if (!ssidConfig.getUseRadiusProxy()) {
+                    if (!useRadiusProxy) {
                         getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
                         getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
                     }

opensync-gateway/src/test/java/com/telecominfraproject/wlan/opensync/ovsdb/OpensyncGatewayTipWlanOvsdbClientTest.java

@@ -123,7 +123,6 @@ public class OpensyncGatewayTipWlanOvsdbClientTest {
         Mockito.when(ovsdbSessionMapInterface.getSession("Test_Client_21P10C68818122")).thenReturn(ovsdbSession);
 
         OpensyncAPConfig apConfig = Mockito.mock(OpensyncAPConfig.class, Mockito.RETURNS_DEEP_STUBS);
-
         Mockito.when(apConfig.getApProfile().getDetails()).thenReturn(Mockito.mock(ApNetworkConfiguration.class));
 
         Mockito.when(opensyncExternalIntegrationInterface.getApConfig(Mockito.anyString())).thenReturn(apConfig);

opensync-gateway/src/test/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDaoTestUtilities.java

@@ -104,7 +104,7 @@ public class OvsdbDaoTestUtilities {
         ((PasspointProfile) passpointHotspotConfig.getDetails()).setOsuSsidProfileId(profileSsidOpen.getId());
         profileSsidPsk.getChildProfileIds().add(passpointHotspotConfig.getId());
         ((PasspointProfile) passpointHotspotConfig.getDetails())
-                .setAssociatedAccessSsidProfileIds(List.of(profileSsidPsk.getId()));
+                .setAssociatedAccessSsidProfileIds(Set.of(profileSsidPsk.getId()));
         return passpointHotspotConfig;
     }