[WIFI-7323] do not automatically delete PROTOCOL status on AP disconnect

[WIFI-6721] Add support for manual radproxy, radproxy secret

all-cloud-in-one-process/src/main/java/com/telecominfraproject/wlan/startuptasks/AllInOneStartListener.java

@@ -634,7 +634,7 @@ public class AllInOneStartListener implements ApplicationRunner {
         ((PasspointProfile) passpointHotspotConfig.getDetails()).setPasspointVenueProfileId(passpointVenueProfileId);
         ((PasspointProfile) passpointHotspotConfig.getDetails()).setOsuSsidProfileId(profileSsidOpenId);
         ((PasspointProfile) passpointHotspotConfig.getDetails())
-                .setAssociatedAccessSsidProfileIds(List.of(profileSsidPskId));
+                .setAssociatedAccessSsidProfileIds(Set.of(profileSsidPskId));
 
         return profileServiceInterface.create(passpointHotspotConfig);
     }

cloud-event-dispatcher/src/main/resources/cloud-event-dispatcher-service-openapi.yaml

@@ -3422,6 +3422,16 @@ components:
           type: integer
           format: int64
     
+    ChannelBandwidthPerRadioTypeMap:
+      properties:
+        is5GHz:
+          $ref: '#/components/schemas/ChannelBandwidth'
+        is5GHzU:
+          $ref: '#/components/schemas/ChannelBandwidth'
+        is5GHzL:
+          $ref: '#/components/schemas/ChannelBandwidth'
+        is2dot4GHz:
+          $ref: '#/components/schemas/ChannelBandwidth'
  
     EquipmentAdminStatusData:
       type: object
@@ -4381,6 +4391,8 @@ components:
           - RADIO_CHANNEL
         channelNumberStatusDataMap:
           $ref: '#/components/schemas/IntegerPerRadioTypeMap'
+        channelBandwidthStatusDataMap:
+          $ref: '#/components/schemas/ChannelBandwidthPerRadioTypeMap'
         txPowerDataMap:
           $ref: '#/components/schemas/IntegerPerRadioTypeMap'
                           
@@ -5675,28 +5687,5 @@ paths:
                 items:
                   $ref: '#/components/schemas/GenericResponse'
         500: 
-          $ref: '#/components/responses/GenericApiError'        
- 
+          $ref: '#/components/responses/GenericApiError'
           
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
-

equipment-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/equipment/datastore/rdbms/EquipmentDAO.java

@@ -263,7 +263,8 @@ public class EquipmentDAO extends BaseJdbcDao {
                 },
                 keyHolder);
         }catch (DuplicateKeyException e) {
-            throw new DsDuplicateEntityException(e);
+            LOG.error("Duplicate equipment found", e);
+            throw new DsDuplicateEntityException("Equipment with the assetId " + equipment.getInventoryId() + " already exists!");
         }
         
         // keyHolder.getKey() now contains the generated key   

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

@@ -88,12 +88,7 @@ public class EquipmentController {
             throw new DsDataValidationException("Equipment contains unsupported value");
         }
 
-        long ts = System.currentTimeMillis();
-        if (equipment.getCreatedTimestamp() == 0) {
-        	equipment.setCreatedTimestamp(ts);
-        }
-        equipment.setLastModifiedTimestamp(ts);
-
+        updateValuesIfNeeded(equipment);
         Equipment ret = equipmentDatastore.create(equipment);
 
         LOG.debug("Created Equipment {}", ret);
@@ -104,7 +99,24 @@ public class EquipmentController {
 
         return ret;
     }
-    
+
+    private void updateValuesIfNeeded(Equipment equipment) {
+        // strip out whitespaces from user entered inventoryId and name strings
+        if (equipment.getName() != null) {
+            equipment.setName(equipment.getName().strip());
+        }
+        if (equipment.getInventoryId() != null) {
+            equipment.setInventoryId(equipment.getInventoryId().strip());
+        }
+
+        // Update timestamp
+        long ts = System.currentTimeMillis();
+        if (equipment.getCreatedTimestamp() == 0) {
+            equipment.setCreatedTimestamp(ts);
+        }
+        equipment.setLastModifiedTimestamp(ts);
+    }
+
     /**
      * Retrieves Equipment by id
      * @param equipmentId

equipment-service/src/test/java/com/telecominfraproject/wlan/equipment/controller/EquipmentControllerTest.java

@@ -71,11 +71,33 @@ public class EquipmentControllerTest {
         equipmentController.delete(ret.getId());
         
     }
-        
-    private void assertEqualEquipments(
-            Equipment expected,
-            Equipment actual) {
-        
+
+    @Test
+    public void testEquipmentCRUD_ValidateSpaceInInputString() {
+
+        //Create new Equipment - success
+        Equipment equipment = new Equipment();
+        equipment.setName("    nameAndInventoryIdWithTrailingSpaces   ");
+        equipment.setInventoryId("   C4411EAA31F5   ");
+        equipment.setEquipmentType(EquipmentType.AP);
+
+        Equipment ret = equipmentController.create(equipment);
+        assertNotNull(ret);
+
+        ret = equipmentController.get(ret.getId());
+        assertEqualEquipments(equipment, ret);
+
+        ret = equipmentController.getOrNull(ret.getId());
+        assertEqualEquipments(equipment, ret);
+
+        assertNull(equipmentController.getOrNull(-1));
+
+        //Delete - success
+        equipmentController.delete(ret.getId());
+
+    }
+
+    private void assertEqualEquipments(Equipment expected, Equipment actual) {
         assertEquals(expected.getName(), actual.getName());
         //TODO: add more fields to check here
     }

location-models/src/main/java/com/telecominfraproject/wlan/location/models/events/LocationChangedApImpactingEvent.java

@@ -1,30 +0,0 @@
-package com.telecominfraproject.wlan.location.models.events;
-
-import com.telecominfraproject.wlan.core.model.json.interfaces.HasLocationId;
-import com.telecominfraproject.wlan.location.models.Location;
-import com.telecominfraproject.wlan.systemevent.models.CustomerEventWithPayload;
-
-public class LocationChangedApImpactingEvent extends CustomerEventWithPayload<Location> implements HasLocationId {
-	private static final long serialVersionUID = -8369849230866347412L;
-
-	public LocationChangedApImpactingEvent(Location location){
-		super(location.getCustomerId(), location);
-    }
-    
-    @Override
-    public long getLocationId() {
-        if (getPayload() != null) {
-            return getPayload().getId();
-        }
-        
-        return 0;
-    }
-    
-    /**
-     * Constructor used by JSON
-     */
-    public LocationChangedApImpactingEvent() {
-    	super(0, 0, null);
-    }
-    
-}

location-service-remote/src/test/java/com/telecominfraproject/wlan/location/service/LocationServiceRemoteTest.java

@@ -80,7 +80,7 @@ public class LocationServiceRemoteTest extends BaseRemoteTest {
         location.setLocationType(LocationType.FLOOR);
         location.setCustomerId(getNextCustomerId());
         location.setName("testName_updated");
-        location.setDetails(generateDetails(CountryCode.US));
+        location.setDetails(generateDetails(CountryCode.CA));
 
         Location retFromUpdate = testInterface.update(location);
         assertFieldEquals(location, retFromUpdate);
@@ -95,6 +95,14 @@ public class LocationServiceRemoteTest extends BaseRemoteTest {
         	// expected it
         }
 
+        //UPDATE test - fail because country code cannot be modified once created
+        try {
+            location.setDetails(generateDetails(CountryCode.US));
+            testInterface.update(location);
+            fail("failed to detect country code update");
+        } catch (IllegalStateException e) {
+            // expected it
+        }
         
         //DELETE Test
         testInterface.delete(ret.getId());

location-service/src/main/java/com/telecominfraproject/wlan/location/service/LocationServiceController.java

@@ -25,7 +25,6 @@ import com.telecominfraproject.wlan.datastore.exceptions.DsEntityNotFoundExcepti
 import com.telecominfraproject.wlan.location.datastore.LocationDatastore;
 import com.telecominfraproject.wlan.location.models.Location;
 import com.telecominfraproject.wlan.location.models.events.LocationAddedEvent;
-import com.telecominfraproject.wlan.location.models.events.LocationChangedApImpactingEvent;
 import com.telecominfraproject.wlan.location.models.events.LocationChangedEvent;
 import com.telecominfraproject.wlan.location.models.events.LocationRemovedEvent;
 import com.telecominfraproject.wlan.systemevent.models.SystemEvent;
@@ -97,14 +96,15 @@ public class LocationServiceController {
         }
         
         Location existingLocation = locationDatastore.get(location.getId());
+        
+        if (location.needsToBeUpdatedOnDevice(existingLocation)) {
+        	throw new IllegalStateException("Cannot update location. Country code is not allow to modify once created.");
+        }
 
         Location ret = locationDatastore.update(location);
         
         List<SystemEvent> events = new ArrayList<>();
         
-        if (ret.needsToBeUpdatedOnDevice(existingLocation)) {
-        	events.add(new LocationChangedApImpactingEvent(ret));
-        }
         events.add(new LocationChangedEvent(ret));
         
         publishEvents(events);

portal-services/src/main/resources/portal-services-openapi.yaml

@@ -1804,6 +1804,8 @@ components:
             type: boolean
           equipmentDiscovery:
             type: boolean
+          dynamicRadiusProxyEnabled:
+            type: boolean
           greTunnelConfigurations:
             type: array
             items:
@@ -1867,6 +1869,9 @@ components:
         sharedSecret:
           type: string
           format: password
+        radiusProxySecret:
+          type: string
+          format: password
         dynamicDiscovery:
           description: Dynamic discovery of HSP and IdPs (home service and identity providers). Regardless of configured value, this will only be set 'true' on the AP if useRadSec is also true.      
           type: boolean
@@ -3330,7 +3335,17 @@ components:
           type: integer
           format: int64
     
-
+    ChannelBandwidthPerRadioTypeMap:
+      properties:
+        is5GHz:
+          $ref: '#/components/schemas/ChannelBandwidth'
+        is5GHzU:
+          $ref: '#/components/schemas/ChannelBandwidth'
+        is5GHzL:
+          $ref: '#/components/schemas/ChannelBandwidth'
+        is2dot4GHz:
+          $ref: '#/components/schemas/ChannelBandwidth'
+    
     EquipmentAdminStatusData:
       type: object
       properties:
@@ -4318,6 +4333,8 @@ components:
           - RADIO_CHANNEL
         channelNumberStatusDataMap:
           $ref: '#/components/schemas/IntegerPerRadioTypeMap'
+        channelBandwidthStatusDataMap:
+          $ref: '#/components/schemas/ChannelBandwidthPerRadioTypeMap'
         txPowerDataMap:
           $ref: '#/components/schemas/IntegerPerRadioTypeMap'
           

profile-models/src/main/java/com/telecominfraproject/wlan/profile/network/models/ApNetworkConfiguration.java

@@ -28,6 +28,7 @@ public class ApNetworkConfiguration extends CommonNetworkConfiguration
     public static final Boolean DEFAULT_SYNTHETIC_CLIENT_ENABLED = Boolean.TRUE;
     public static final Boolean DEFAULT_LED_CONTROL_ENABLED = Boolean.TRUE;
     public static final Boolean DEFAULT_EQUIPMENT_DISCOVERY_ENABLED = Boolean.FALSE;
+    public static final Boolean DEFAULT_DYNAMIC_RADIUS_PROXY_ENABLED = Boolean.FALSE;
 
     /**
      * Added as a profile level setting that can be used to provide
@@ -59,6 +60,7 @@ public class ApNetworkConfiguration extends CommonNetworkConfiguration
         setSyntheticClientEnabled(DEFAULT_SYNTHETIC_CLIENT_ENABLED);
         setLedControlEnabled(DEFAULT_LED_CONTROL_ENABLED);
         setEquipmentDiscovery(DEFAULT_EQUIPMENT_DISCOVERY_ENABLED);
+        setDynamicRadiusProxyEnabled(DEFAULT_DYNAMIC_RADIUS_PROXY_ENABLED);
 
         // initialize the profile level radio map settings parameter
         radioMap = new EnumMap<>(RadioType.class);

profile-models/src/main/java/com/telecominfraproject/wlan/profile/network/models/CommonNetworkConfiguration.java

@@ -23,6 +23,7 @@ public abstract class CommonNetworkConfiguration extends ProfileDetails {
     private Boolean syntheticClientEnabled;
     private Boolean ledControlEnabled;
     private Boolean equipmentDiscovery;
+    private Boolean dynamicRadiusProxyEnabled;
 
     public CommonNetworkConfiguration() {
     }
@@ -67,7 +68,6 @@ public abstract class CommonNetworkConfiguration extends ProfileDetails {
         this.vlanNative = bool;
     }
 
-
     public AutoOrManualString getNtpServer() {
         return ntpServer;
     }
@@ -92,7 +92,6 @@ public abstract class CommonNetworkConfiguration extends ProfileDetails {
         this.syntheticClientEnabled = syntheticClientEnabled;
     }
 
-
     public Boolean isLedControlEnabled() {
         return ledControlEnabled;
     }
@@ -108,6 +107,23 @@ public abstract class CommonNetworkConfiguration extends ProfileDetails {
     public void setRtlsSettings(RtlsSettings rtlsSettings) {
         this.rtlsSettings = rtlsSettings;
     }
+    
+    public Boolean isDynamicRadiusProxyEnabled() {
+        return dynamicRadiusProxyEnabled;
+    }
+
+    public void setDynamicRadiusProxyEnabled(Boolean dynamicRadiusProxyEnabled) {
+        this.dynamicRadiusProxyEnabled = dynamicRadiusProxyEnabled;
+    }
+    
+    public Boolean getEquipmentDiscovery() {
+        return equipmentDiscovery;
+    }
+
+    public void setEquipmentDiscovery(Boolean equipmentDiscovery) {
+        this.equipmentDiscovery = equipmentDiscovery;
+    }
+
 
     @Override
     public CommonNetworkConfiguration clone() {
@@ -124,7 +140,9 @@ public abstract class CommonNetworkConfiguration extends ProfileDetails {
         ret.setVlan(getVlan());
         ret.setVlanNative(isVlanNative());
         ret.setSyntheticClientEnabled(getSyntheticClientEnabled());
-
+        ret.setLedControlEnabled(isLedControlEnabled());
+        ret.setEquipmentDiscovery(getEquipmentDiscovery());
+        ret.setDynamicRadiusProxyEnabled(isDynamicRadiusProxyEnabled());
 
         return ret;
     }
@@ -145,26 +163,10 @@ public abstract class CommonNetworkConfiguration extends ProfileDetails {
         return false;
     }
 
-    public Boolean getEquipmentDiscovery() {
-        return equipmentDiscovery;
-    }
-
-    public void setEquipmentDiscovery(Boolean equipmentDiscovery) {
-        this.equipmentDiscovery = equipmentDiscovery;
-    }
-
-    
-    
-
-    
-    public Boolean getVlanNative() {
-        return vlanNative;
-    }
-
     @Override
     public int hashCode() {
         return Objects.hash(equipmentDiscovery, equipmentType, ledControlEnabled, networkConfigVersion, ntpServer, rtlsSettings,
-                syntheticClientEnabled, syslogRelay, vlan, vlanNative);
+                syntheticClientEnabled, syslogRelay, vlan, vlanNative, dynamicRadiusProxyEnabled);
     }
 
     @Override
@@ -183,7 +185,8 @@ public abstract class CommonNetworkConfiguration extends ProfileDetails {
                 && Objects.equals(ntpServer, other.ntpServer) && Objects.equals(rtlsSettings, other.rtlsSettings)
                 && Objects.equals(syntheticClientEnabled, other.syntheticClientEnabled)
                 && Objects.equals(syslogRelay, other.syslogRelay) && vlan == other.vlan
-                && Objects.equals(vlanNative, other.vlanNative);
+                && Objects.equals(vlanNative, other.vlanNative)
+                && Objects.equals(dynamicRadiusProxyEnabled, other.dynamicRadiusProxyEnabled);
     }
     
     

profile-models/src/main/java/com/telecominfraproject/wlan/profile/network/models/RadiusProxyConfiguration.java

@@ -28,6 +28,7 @@ public class RadiusProxyConfiguration extends BaseJsonModel implements PushableC
     private Boolean useRadSec;
     private String sharedSecret; // if useRadSec is false
     private String acctSharedSecret; // if useRadSec is false
+    private String radiusProxySecret;
     private Boolean dynamicDiscovery; // dynamic discovery of HSP and IdPs (home service and identity providers).
                                       // regardless of configured value, this will only be set 'true' on the AP if useRadSec is also true.
 
@@ -145,6 +146,14 @@ public class RadiusProxyConfiguration extends BaseJsonModel implements PushableC
     public void setAcctSharedSecret(String acctSharedSecret) {
         this.acctSharedSecret = acctSharedSecret;
     }
+    
+    public String getRadiusProxySecret() {
+        return radiusProxySecret;
+    }
+
+    public void setRadiusProxySecret(String radiusProxySecret) {
+        this.radiusProxySecret = radiusProxySecret;
+    }
 
     /**
      * @return the dynamicDiscovery
@@ -174,7 +183,7 @@ public class RadiusProxyConfiguration extends BaseJsonModel implements PushableC
     @Override
     public int hashCode() {
         return Objects.hash(acctPort, acctServer, acctSharedSecret, caCert, clientCert, clientKey, dynamicDiscovery, name, passphrase, port, realm, server,
-                sharedSecret, useRadSec);
+                sharedSecret, useRadSec, radiusProxySecret);
     }
 
     @Override
@@ -191,7 +200,8 @@ public class RadiusProxyConfiguration extends BaseJsonModel implements PushableC
                 && Objects.equals(clientCert, other.clientCert) && Objects.equals(clientKey, other.clientKey)
                 && Objects.equals(dynamicDiscovery, other.dynamicDiscovery) && Objects.equals(name, other.name) && Objects.equals(passphrase, other.passphrase)
                 && Objects.equals(port, other.port) && Objects.equals(realm, other.realm) && Objects.equals(server, other.server)
-                && Objects.equals(sharedSecret, other.sharedSecret) && Objects.equals(useRadSec, other.useRadSec);
+                && Objects.equals(sharedSecret, other.sharedSecret) && Objects.equals(useRadSec, other.useRadSec)
+                && Objects.equals(radiusProxySecret, other.radiusProxySecret);
     }
 
 

profile-models/src/main/java/com/telecominfraproject/wlan/profile/passpoint/models/PasspointProfile.java

@@ -63,7 +63,7 @@ public class PasspointProfile extends ProfileDetails implements PushableConfigur
     private boolean enable2pt4GHz;
     private boolean enable5GHz;
    
-    private List<Long> associatedAccessSsidProfileIds;
+    private Set<Long> associatedAccessSsidProfileIds;
 
     private Long osuSsidProfileId;
 
@@ -321,11 +321,11 @@ public class PasspointProfile extends ProfileDetails implements PushableConfigur
         this.passpointNetworkAuthenticationType = passpointNetworkAuthenticationType;
     }
 
-    public List<Long> getAssociatedAccessSsidProfileIds() {
+    public Set<Long> getAssociatedAccessSsidProfileIds() {
         return associatedAccessSsidProfileIds;
     }
 
-    public void setAssociatedAccessSsidProfileIds(List<Long> associatedAccessSsidProfileIds) {
+    public void setAssociatedAccessSsidProfileIds(Set<Long> associatedAccessSsidProfileIds) {
         this.associatedAccessSsidProfileIds = associatedAccessSsidProfileIds;
     }
 

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

@@ -327,17 +327,16 @@ public class RfElementConfiguration extends BaseJsonModel {
         this.minAutoCellSize = minAutoCellSize;
     }
 
+    //Always return default value
     public Integer getMaxAutoCellSize() {
-        if (maxAutoCellSize == null) {
-            if (MAX_CELL_SIZE_MAP.containsKey(this.radioType)) {
-                return MAX_CELL_SIZE_MAP.get(this.radioType);
-            } else {
-                return MAX_CELL_SIZE_MAP.get(RadioType.is2dot4GHz);
-            }
+        if (MAX_CELL_SIZE_MAP.containsKey(this.radioType)) {
+            return MAX_CELL_SIZE_MAP.get(this.radioType);
+        } else {
+            return MAX_CELL_SIZE_MAP.get(RadioType.is2dot4GHz);
         }
-        return maxAutoCellSize;
     }
 
+    // not allow user to configure
     public void setMaxAutoCellSize(Integer maxAutoCellSize) {
         this.maxAutoCellSize = maxAutoCellSize;
     }

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

@@ -93,4 +93,16 @@ public class RfConfigurationTests {
         assertEquals(Integer.valueOf(23), list2.get(2));
         assertEquals(Integer.valueOf(45), list2.get(3));
     }
+    
+    @Test
+    public void testMaxAutoCellSize() {
+        RfElementConfiguration rfConfig = RfElementConfiguration.createWithDefaults(RadioType.is5GHz);
+        assertNotNull(rfConfig.getMaxAutoCellSize());
+        
+        assertEquals(RfElementConfiguration.DEFAULT_MAX_CELL_SIZE_DB, rfConfig.getMaxAutoCellSize().intValue());
+        
+        rfConfig.setMaxAutoCellSize(-93);
+        //getMaxAutoCellSize always return default MaxAutoCellSize
+        assertEquals(RfElementConfiguration.DEFAULT_MAX_CELL_SIZE_DB, rfConfig.getMaxAutoCellSize().intValue());
+    }
 }

profile-service/src/main/java/com/telecominfraproject/wlan/profile/controller/ProfileController.java

@@ -31,6 +31,7 @@ import com.telecominfraproject.wlan.profile.models.ProfileType;
 import com.telecominfraproject.wlan.profile.models.events.ProfileAddedEvent;
 import com.telecominfraproject.wlan.profile.models.events.ProfileChangedEvent;
 import com.telecominfraproject.wlan.profile.models.events.ProfileRemovedEvent;
+import com.telecominfraproject.wlan.profile.passpoint.models.PasspointProfile;
 
 
 /**
@@ -209,6 +210,20 @@ public class ProfileController {
             LOG.error("Failed to update Profile, request contains unsupported value: {}", profile);
             throw new DsDataValidationException("Profile contains unsupported value");
         }
+        
+        // WIFI-6855: To handle SSID-Passpoint association update when SSID profiles are updated
+        // If the passpoint profile update is requested, but no change is made to the details, then skip the update
+        if (profile.getProfileType().equals(ProfileType.passpoint)) {
+            Profile existingProfile = profileDatastore.getOrNull(profile.getId());
+            if (existingProfile != null) {
+                PasspointProfile existingDetails = (PasspointProfile) existingProfile.getDetails();
+                PasspointProfile newDetails = (PasspointProfile) profile.getDetails();
+                if (existingDetails.equals(newDetails)) {
+                    LOG.info("No change was made to this profile, skip update on profile {}", profile.getId());
+                    return profile;
+                }
+            }
+        }
 
         Profile ret = profileDatastore.update(profile);
 

provisioning-sp/src/main/java/com/telecominfraproject/wlan/streams/provisioning/EquipmentConfigPushTrigger.java

@@ -39,7 +39,6 @@ import com.telecominfraproject.wlan.equipmentgateway.models.CEGWConfigChangeNoti
 import com.telecominfraproject.wlan.equipmentgateway.models.CEGWNewChannelRequest;
 import com.telecominfraproject.wlan.equipmentgateway.models.CEGWCellSizeAttributesRequest;
 import com.telecominfraproject.wlan.equipmentgateway.service.EquipmentGatewayServiceInterface;
-import com.telecominfraproject.wlan.location.models.events.LocationChangedApImpactingEvent;
 import com.telecominfraproject.wlan.profile.ProfileServiceInterface;
 import com.telecominfraproject.wlan.profile.models.Profile;
 import com.telecominfraproject.wlan.profile.models.events.ProfileAddedEvent;
@@ -92,7 +91,7 @@ public class EquipmentConfigPushTrigger extends StreamProcessor {
                     || ser.getDetails() instanceof EquipmentChannelsChangedEvent || ser.getDetails() instanceof EquipmentCellSizeAttributesChangedEvent
                     || ser.getDetails() instanceof EquipmentRemovedEvent || ser.getDetails() instanceof ProfileAddedEvent
                     || ser.getDetails() instanceof ProfileChangedEvent || ser.getDetails() instanceof ProfileRemovedEvent
-                    || ser.getDetails() instanceof LocationChangedApImpactingEvent || ser.getDetails() instanceof EquipmentCustomerChangedEvent);
+                    || ser.getDetails() instanceof EquipmentCustomerChangedEvent);
         } else {
             ret = false;
         }
@@ -133,9 +132,6 @@ public class EquipmentConfigPushTrigger extends StreamProcessor {
             case "ProfileRemovedEvent":
                 process((ProfileRemovedEvent) se);
                 break;
-            case "LocationChangedApImpactingEvent":
-                process((LocationChangedApImpactingEvent) se);
-                break;
             case "EquipmentCustomerChangedEvent":
                 process((EquipmentCustomerChangedEvent) se);
             default:
@@ -222,36 +218,6 @@ public class EquipmentConfigPushTrigger extends StreamProcessor {
         LOG.debug("Finished processing profile {}", profile.getId());
     }
 
-    private void process(LocationChangedApImpactingEvent model) {
-        LOG.debug("Processing LocationChangedApImpactingEvent {}", model.getPayload().getId());
-
-        Set<Long> locationIds = new HashSet<>(Arrays.asList(model.getPayload().getId()));
-
-        // go through all equipmentIds that reside in the specified location and trigger change config notification on
-        // them
-        PaginationContext<PairLongLong> context = new PaginationContext<>(100);
-
-        while (!context.isLastPage()) {
-            PaginationResponse<PairLongLong> page = equipmentServiceInterface.getEquipmentIdsByLocationIds(locationIds, context);
-            context = page.getContext();
-
-            Set<Long> equipmentIds = new HashSet<>();
-            page.getItems().forEach(p -> equipmentIds.add(p.getValue2()));
-
-            // retrieve full equipment objects to get the inventory id
-            List<Equipment> equipmentForPage = equipmentServiceInterface.get(equipmentIds);
-
-            List<CEGWBaseCommand> commands = new ArrayList<>(equipmentForPage.size());
-            equipmentForPage.forEach(eq -> commands.add(new CEGWConfigChangeNotification(eq.getInventoryId(), eq.getId())));
-
-            equipmentGatewayInterface.sendCommands(commands);
-            LOG.debug("Page {} - sent {} commands to equipment gateway", context.getLastReturnedPageNumber(), commands.size());
-        }
-
-        LOG.debug("Finished processing LocationChangedApImpactingEvent {}", model.getPayload().getId());
-
-    }
-
     private void process(EquipmentCustomerChangedEvent model) {
         LOG.info("Processing EquipmentCustomerChangedEvent {}", model.getPayload().getId());
         

status-models/src/main/java/com/telecominfraproject/wlan/status/equipment/models/EquipmentChannelStatusData.java

@@ -4,6 +4,7 @@ import java.util.EnumMap;
 import java.util.Map;
 import java.util.Objects;
 
+import com.telecominfraproject.wlan.core.model.equipment.ChannelBandwidth;
 import com.telecominfraproject.wlan.core.model.equipment.RadioType;
 import com.telecominfraproject.wlan.status.models.StatusDataType;
 import com.telecominfraproject.wlan.status.models.StatusDetails;
@@ -12,6 +13,7 @@ public class EquipmentChannelStatusData extends StatusDetails {
     private static final long serialVersionUID = 470569467119609438L;
 
     private Map<RadioType, Integer> channelNumberStatusDataMap = new EnumMap<>(RadioType.class);
+    private Map<RadioType, ChannelBandwidth> channelBandwidthStatusDataMap = new EnumMap<>(RadioType.class);
     private Map<RadioType, Integer> txPowerDataMap = new EnumMap<>(RadioType.class);
 
 
@@ -29,6 +31,7 @@ public class EquipmentChannelStatusData extends StatusDetails {
     {
         if (data !=null) {
             this.channelNumberStatusDataMap.putAll(data.channelNumberStatusDataMap);
+            this.channelBandwidthStatusDataMap.putAll(data.channelBandwidthStatusDataMap);
         }
     }
     
@@ -36,6 +39,10 @@ public class EquipmentChannelStatusData extends StatusDetails {
         return channelNumberStatusDataMap;
     }
     
+    public Map<RadioType, ChannelBandwidth> getChannelBandwidthStatusDataMap() {
+        return channelBandwidthStatusDataMap;
+    }
+    
     public Map<RadioType, Integer> getTxPowerDataMap() {
         return txPowerDataMap;
     }
@@ -44,6 +51,10 @@ public class EquipmentChannelStatusData extends StatusDetails {
         this.channelNumberStatusDataMap = channelNumberStatusDataMap;
     }
     
+    public void setChannelBandwidthStatusDataMap(Map<RadioType, ChannelBandwidth> channelBandwidthStatusDataMap) {
+        this.channelBandwidthStatusDataMap = channelBandwidthStatusDataMap;
+    }
+    
     public void setTxPowerDataMap(Map<RadioType, Integer> txPowerDataMap) {
         this.txPowerDataMap = txPowerDataMap;
     }
@@ -59,6 +70,14 @@ public class EquipmentChannelStatusData extends StatusDetails {
             });
         }
         
+        if (getChannelBandwidthStatusDataMap() != null) {
+            result.setChannelBandwidthStatusDataMap(new EnumMap<>(RadioType.class));
+            
+            this.channelBandwidthStatusDataMap.forEach((k, v) -> {
+                result.channelBandwidthStatusDataMap.put(k, v);
+            });
+        }
+        
         if (getTxPowerDataMap() != null) {
             result.setTxPowerDataMap(new EnumMap<>(RadioType.class));
             
@@ -71,7 +90,7 @@ public class EquipmentChannelStatusData extends StatusDetails {
 
     @Override
     public int hashCode() {
-        return Objects.hash(channelNumberStatusDataMap, txPowerDataMap);
+        return Objects.hash(channelNumberStatusDataMap, channelBandwidthStatusDataMap, txPowerDataMap);
     }
 
     @Override
@@ -84,6 +103,7 @@ public class EquipmentChannelStatusData extends StatusDetails {
             return false;
         EquipmentChannelStatusData other = (EquipmentChannelStatusData) obj;
         return Objects.equals(channelNumberStatusDataMap, other.channelNumberStatusDataMap)
+                && Objects.equals(channelBandwidthStatusDataMap, other.channelBandwidthStatusDataMap)
                 && Objects.equals(txPowerDataMap, other.txPowerDataMap);
     }
 

status-models/src/main/java/com/telecominfraproject/wlan/status/models/StatusDataType.java

@@ -64,7 +64,11 @@ public class StatusDataType implements EnumWithId {
     /**
      * Protocol status
      */
-    PROTOCOL = new StatusDataType(4, "PROTOCOL", Set.of(StatusTrait.DeleteOnEquipmentDisconnect)) ,
+    PROTOCOL = new StatusDataType(4, "PROTOCOL"
+            // some of the properties of this status need to be preserved across equipment connections
+            // example - reportedCfgDataVersion 
+            //, Set.of(StatusTrait.DeleteOnEquipmentDisconnect)
+            ) ,
     /**
      * Firmware upgrade status
      */

system-event-service/src/main/resources/system-event-service-openapi.yaml

@@ -3435,7 +3435,17 @@ components:
           type: integer
           format: int64
     
- 
+    ChannelBandwidthPerRadioTypeMap:
+      properties:
+        is5GHz:
+          $ref: '#/components/schemas/ChannelBandwidth'
+        is5GHzU:
+          $ref: '#/components/schemas/ChannelBandwidth'
+        is5GHzL:
+          $ref: '#/components/schemas/ChannelBandwidth'
+        is2dot4GHz:
+          $ref: '#/components/schemas/ChannelBandwidth'
+    
     EquipmentAdminStatusData:
       type: object
       properties:
@@ -4395,6 +4405,8 @@ components:
           - RADIO_CHANNEL
         channelNumberStatusDataMap:
           $ref: '#/components/schemas/IntegerPerRadioTypeMap'
+        channelBandwidthStatusDataMap:
+          $ref: '#/components/schemas/ChannelBandwidthPerRadioTypeMap'
         txPowerDataMap:
           $ref: '#/components/schemas/IntegerPerRadioTypeMap'