WIFI-4339 Moving the AP from one location to another with different Country code does not trigger reg domain changes on AP

equipment-service/src/main/java/com/telecominfraproject/wlan/equipment/controller/EquipmentController.java

@@ -283,7 +283,9 @@ public class EquipmentController {
         if (ret.getCustomerId() != existingEquipment.getCustomerId()) {
             publishEvent(new EquipmentCustomerChangedEvent(existingEquipment, ret));
         }
-        if ((ret.getProfileId() != existingEquipment.getProfileId()) ||  (existingApElementConfig != null && updatedApElementConfig != null &&
+        if ((ret.getProfileId() != existingEquipment.getProfileId()) ||
+                ret.getLocationId() != existingEquipment.getLocationId() ||
+                (existingApElementConfig != null && updatedApElementConfig != null &&
                 updatedApElementConfig.needsToBeUpdatedOnDevice(existingApElementConfig))) {
             event = new EquipmentApImpactingChangedEvent(ret);
         } else if (existingApElementConfig != null && existingApElementConfig.isBlinkAllLEDs() != updatedApElementConfig.isBlinkAllLEDs()) {

profile-models/src/main/java/com/telecominfraproject/wlan/profile/rf/models/RfElementConfiguration.java

@@ -4,8 +4,6 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Set;
-import java.util.TreeSet;
 
 import com.telecominfraproject.wlan.core.model.equipment.ChannelBandwidth;
 import com.telecominfraproject.wlan.core.model.equipment.ChannelHopSettings;
@@ -82,8 +80,6 @@ public class RfElementConfiguration extends BaseJsonModel {
     private Boolean useMaxTxPower;
     private Integer eirpTxPower;
     private RadioBestApSettings bestApSettings;
-    
-    private Set<Integer> autoExclusionChannels = new TreeSet<Integer>();
 
     private RfElementConfiguration() {
         long timestamp = System.currentTimeMillis();
@@ -366,25 +362,9 @@ public class RfElementConfiguration extends BaseJsonModel {
         this.bestApSettings = bestApSettings;
     }
 
-    public Set<Integer> getAutoExclusionChannels() {
-        return autoExclusionChannels;
-    }
-
-    public void setAutoExclusionChannels(Set<Integer> autoExclusionChannels) {
-        if (autoExclusionChannels != null) {
-            this.autoExclusionChannels.clear();
-            this.autoExclusionChannels.addAll(autoExclusionChannels);
-        }
-    }
-
     @Override
     public RfElementConfiguration clone() {
-        RfElementConfiguration ret = (RfElementConfiguration) super.clone();
-
-        if (autoExclusionChannels != null) {
-            ret.autoExclusionChannels = new TreeSet<>(autoExclusionChannels);
-        }
-        return ret;
+        return (RfElementConfiguration) super.clone();
     }
 
     @Override
@@ -429,7 +409,7 @@ public class RfElementConfiguration extends BaseJsonModel {
                 channelBandwidth, channelHopSettings, clientDisconnectThresholdDb, eirpTxPower, forceScanDuringVoice,
                 managementRate, maxNumClients, mimoMode, minAutoCellSize, multicastRate, neighbouringListApConfig,
                 perimeterDetectionEnabled, probeResponseThresholdDb, radioMode, radioType, rf, rtsCtsThreshold,
-                rxCellSizeDb, autoCellSizeSelection, maxAutoCellSize, autoExclusionChannels);
+                rxCellSizeDb, autoCellSizeSelection, maxAutoCellSize);
     }
 
     @Override
@@ -459,8 +439,7 @@ public class RfElementConfiguration extends BaseJsonModel {
                 && Objects.equals(probeResponseThresholdDb, other.probeResponseThresholdDb)
                 && radioMode == other.radioMode && radioType == other.radioType && Objects.equals(rf, other.rf)
                 && Objects.equals(rtsCtsThreshold, other.rtsCtsThreshold)
-                && Objects.equals(rxCellSizeDb, other.rxCellSizeDb)
-                && Objects.equals(autoExclusionChannels, other.autoExclusionChannels);
+                && Objects.equals(rxCellSizeDb, other.rxCellSizeDb);
     }
 
 }

profile-models/src/test/java/com/telecominfraproject/wlan/profile/rf/models/RfConfigurationTests.java

@@ -1,16 +1,8 @@
 package com.telecominfraproject.wlan.profile.rf.models;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
 import org.junit.Test;
 
 import com.telecominfraproject.wlan.core.model.equipment.RadioType;
@@ -64,33 +56,4 @@ public class RfConfigurationTests {
        rfConfig2_4.setRadioMode(RadioMode.modeGN);
        rfConfig5.setRadioMode(RadioMode.modeGN);
     }
-    
-    @Test
-    public void testAutoExclusionChannels() {
-        RfElementConfiguration rfConfig = RfElementConfiguration.createWithDefaults(RadioType.is5GHz);
-        assertNotNull(rfConfig.getAutoExclusionChannels());
-        assertTrue(rfConfig.getAutoExclusionChannels().isEmpty());
-        
-        Set<Integer> unsortedSet = new HashSet<Integer>(Arrays.asList(1, 23, 45, 12));
-        rfConfig.setAutoExclusionChannels(unsortedSet);
-        
-        Set<Integer> sortedSet = rfConfig.getAutoExclusionChannels();
-        List<Integer> list = new ArrayList<Integer>(sortedSet);
-        
-        assertEquals(Integer.valueOf(1), list.get(0));
-        assertEquals(Integer.valueOf(12), list.get(1));
-        assertEquals(Integer.valueOf(23), list.get(2));
-        assertEquals(Integer.valueOf(45), list.get(3));
-        
-        Set<Integer> unsortedSet2 = new HashSet<Integer>(Arrays.asList(10, 45, 23, 12));
-        rfConfig.setAutoExclusionChannels(unsortedSet2);
-        
-        Set<Integer> sortedSet2 = rfConfig.getAutoExclusionChannels();
-        List<Integer> list2 = new ArrayList<Integer>(sortedSet2);
-        
-        assertEquals(Integer.valueOf(10), list2.get(0));
-        assertEquals(Integer.valueOf(12), list2.get(1));
-        assertEquals(Integer.valueOf(23), list2.get(2));
-        assertEquals(Integer.valueOf(45), list2.get(3));
-    }
 }