WIFI-3285 Use base channel as default value on 5G for backupChannelNumber and manualBackupChannelNumber in Equipment Config

equipment-models/src/main/java/com/telecominfraproject/wlan/equipment/models/ElementRadioConfiguration.java

@@ -62,7 +62,7 @@ public class ElementRadioConfiguration extends BaseJsonModel
 
         if (radioType == RadioType.is5GHz) {
             returnValue.setChannelNumber(36);
-            returnValue.setBackupChannelNumber(153);
+            returnValue.setBackupChannelNumber(149);
         } else if (radioType == RadioType.is5GHzL) {
             returnValue.setChannelNumber(36);
             returnValue.setBackupChannelNumber(44);

equipment-service-remote/src/test/java/com/telecominfraproject/wlan/equipment/EquipmentServiceRemoteTest.java

@@ -932,9 +932,9 @@ public class EquipmentServiceRemoteTest extends BaseRemoteTest {
         assertEquals(11, radioMap.get(RadioType.is2dot4GHz).getManualBackupChannelNumber().intValue());
         
         assertEquals(36, radioMap.get(RadioType.is5GHz).getChannelNumber().intValue());
-        assertEquals(153, radioMap.get(RadioType.is5GHz).getBackupChannelNumber().intValue());
+        assertEquals(149, radioMap.get(RadioType.is5GHz).getBackupChannelNumber().intValue());
         assertEquals(36, radioMap.get(RadioType.is5GHz).getManualChannelNumber().intValue());
-        assertEquals(153, radioMap.get(RadioType.is5GHz).getManualBackupChannelNumber().intValue());
+        assertEquals(149, radioMap.get(RadioType.is5GHz).getManualBackupChannelNumber().intValue());
             
         Map<RadioType, Integer> primaryChannels =  new EnumMap<>(RadioType.class);
         Map<RadioType, Integer> backupChannels =  new EnumMap<>(RadioType.class);
@@ -970,7 +970,7 @@ public class EquipmentServiceRemoteTest extends BaseRemoteTest {
         assertEquals(6, radioMap.get(RadioType.is2dot4GHz).getManualBackupChannelNumber().intValue());
         
         assertEquals(36, radioMap.get(RadioType.is5GHz).getChannelNumber().intValue());
-        assertEquals(153, radioMap.get(RadioType.is5GHz).getBackupChannelNumber().intValue());
+        assertEquals(149, radioMap.get(RadioType.is5GHz).getBackupChannelNumber().intValue());
         assertEquals(40, radioMap.get(RadioType.is5GHz).getManualChannelNumber().intValue());
         assertEquals(48, radioMap.get(RadioType.is5GHz).getManualBackupChannelNumber().intValue());
         

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

@@ -15,9 +15,6 @@ import org.springframework.stereotype.Component;
 
 import com.telecominfraproject.wlan.alarm.AlarmServiceInterface;
 import com.telecominfraproject.wlan.alarm.models.Alarm;
-import com.telecominfraproject.wlan.client.ClientServiceInterface;
-import com.telecominfraproject.wlan.client.session.models.AssociationState;
-import com.telecominfraproject.wlan.client.session.models.ClientSession;
 import com.telecominfraproject.wlan.core.model.json.BaseJsonModel;
 import com.telecominfraproject.wlan.core.model.pagination.PaginationContext;
 import com.telecominfraproject.wlan.core.model.pagination.PaginationResponse;
@@ -78,8 +75,6 @@ public class EquipmentConfigPushTrigger extends StreamProcessor {
     private StatusServiceInterface statusServiceInterface;
     @Autowired
     private AlarmServiceInterface alarmServiceInterface;
-    @Autowired
-    private ClientServiceInterface clientServiceInterface;
 
     @Override
     protected boolean acceptMessage(QueuedStreamMessage message) {
@@ -280,49 +275,10 @@ public class EquipmentConfigPushTrigger extends StreamProcessor {
             });
         }
         alarmServiceInterface.delete(existingEquipment.getCustomerId(), existingEquipment.getId());
-        
-        // Disconnect all associated client devices from existing equipment
-        disconnectClients(existingEquipment);
-        
     }
 
     private void process(BaseJsonModel model) {
         LOG.warn("Unprocessed model: {}", model);
     }
-    
-    private void disconnectClients(Equipment ce) {
 
-        LOG.info("EquipmentConfigPushTrigger::disconnectClients for Equipment {}", ce);
-        PaginationResponse<ClientSession> clientSessions = clientServiceInterface.getSessionsForCustomer(
-                ce.getCustomerId(), Set.of(ce.getId()), Set.of(ce.getLocationId()), null, null,
-                new PaginationContext<ClientSession>(100));
-
-        if (clientSessions == null) {
-            LOG.info("There are no existing client sessions to disconnect.");
-            return;
-        }
-
-        List<ClientSession> toBeDisconnected = new ArrayList<>();
-
-        clientSessions.getItems().stream().forEach(c -> {
-            if (c.getDetails().getAssociationState() != null
-                    && !c.getDetails().getAssociationState().equals(AssociationState.Disconnected)) {
-                LOG.info("Change association state for client {} from {} to {}", c.getMacAddress(),
-                        c.getDetails().getAssociationState(), AssociationState.Disconnected);
-
-                c.getDetails().setAssociationState(AssociationState.Disconnected);
-                toBeDisconnected.add(c);
-
-            }
-        });
-
-        if (!toBeDisconnected.isEmpty()) {
-            LOG.info("Sending disconnect for client sessions {}", toBeDisconnected);
-            List<ClientSession> disconnectedSessions = clientServiceInterface.updateSessions(toBeDisconnected);
-            LOG.info("Result of client disconnect {}", disconnectedSessions);
-        } else {
-            LOG.info("There are no existing client sessions that are not already in Disconnected state.");
-        }
-
-    }
 }