-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: remove LD LDevice Status verification
Signed-off-by: Samir Romdhani <[email protected]> add test , LDevice present and not present in Substation Signed-off-by: Samir Romdhani <[email protected]>
- Loading branch information
1 parent
4dc58ba
commit 3f9604f
Showing
23 changed files
with
615 additions
and
1,888 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
116 changes: 3 additions & 113 deletions
116
sct-commons/src/main/java/org/lfenergy/compas/sct/commons/scl/ldevice/LDeviceActivation.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,122 +1,12 @@ | ||
| // SPDX-FileCopyrightText: 2022 RTE FRANCE | ||
| // SPDX-FileCopyrightText: 2025 RTE FRANCE | ||
| // | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| package org.lfenergy.compas.sct.commons.scl.ldevice; | ||
|
|
||
| import lombok.Getter; | ||
| import lombok.Setter; | ||
| import org.apache.commons.lang3.tuple.Pair; | ||
| import org.lfenergy.compas.scl2007b4.model.TCompasLDeviceStatus; | ||
| import org.lfenergy.compas.sct.commons.util.ActiveStatus; | ||
| import org.lfenergy.compas.scl2007b4.model.TAnyLN; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Set; | ||
|
|
||
| /** | ||
| * Common class for all states that define if LDevice should be activated or not | ||
| * regardless of the CompasLDeviceStatus Private, Enum Values of DO 'Beh' and if it's referenced in Substation...LNode or not | ||
| */ | ||
| @Getter | ||
| @Setter | ||
| public class LDeviceActivation { | ||
|
|
||
| private final List<Pair<String, String>> iedNameLdInstList; | ||
| private boolean isUpdatable; | ||
| private String newVal; | ||
| private String errorMessage; | ||
|
|
||
| public LDeviceActivation(List<Pair<String, String>> iedNameLdInstList) { | ||
| this.iedNameLdInstList = iedNameLdInstList; | ||
| } | ||
|
|
||
| /** | ||
| * checks whether LDevice status is authorized to be activated or Not | ||
| * @param iedName Ied name value which LDevice appear | ||
| * @param ldInst LDevice inst value | ||
| * @param compasLDeviceStatus Private value | ||
| * @param enumValues enum values | ||
| */ | ||
| public void checkLDeviceActivationStatus(String iedName, String ldInst, TCompasLDeviceStatus compasLDeviceStatus, Set<String> enumValues) { | ||
| if (!enumValues.contains(ActiveStatus.ON.getValue()) && !enumValues.contains(ActiveStatus.OFF.getValue())) { | ||
| errorMessage = "The LDevice cannot be activated or desactivated because its BehaviourKind Enum contains NOT 'on' AND NOT 'off'."; | ||
| } | ||
| if (!enumValues.contains(ActiveStatus.ON.getValue()) && enumValues.contains(ActiveStatus.OFF.getValue())) { | ||
| if (isDeclaredInSubstation(iedName, ldInst)) { | ||
| errorMessage = "The LDevice cannot be set to 'on' but has been selected into SSD."; | ||
| } else { | ||
| isUpdatable = true; | ||
| newVal = ActiveStatus.OFF.getValue(); | ||
| } | ||
| } | ||
| if(compasLDeviceStatus.equals(TCompasLDeviceStatus.ACTIVE) || | ||
| compasLDeviceStatus.equals(TCompasLDeviceStatus.UNTESTED)){ | ||
| checkAuthorisationToActivateLDevice(iedName, ldInst, enumValues); | ||
| } | ||
| if(compasLDeviceStatus.equals(TCompasLDeviceStatus.INACTIVE)){ | ||
| checkAuthorisationToDeactivateLDevice(iedName, ldInst, enumValues); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * checks whether LDevice status is authorized to be activated when CompasLDeviceStatus Private is ACTIVE or UNTESTED | ||
| * @param iedName Ied name value which contains LDevice | ||
| * @param ldInst LDevice inst value | ||
| * @param enumValues enum values | ||
| */ | ||
| private void checkAuthorisationToActivateLDevice(String iedName, String ldInst, Set<String> enumValues) { | ||
| if (!enumValues.contains(ActiveStatus.OFF.getValue()) && enumValues.contains(ActiveStatus.ON.getValue())) { | ||
| if (isDeclaredInSubstation(iedName, ldInst)) { | ||
| isUpdatable = true; | ||
| newVal = ActiveStatus.ON.getValue(); | ||
| } else { | ||
| errorMessage = "The LDevice cannot be set to 'off' but has not been selected into SSD."; | ||
| } | ||
| } | ||
| if (enumValues.contains(ActiveStatus.ON.getValue()) && enumValues.contains(ActiveStatus.OFF.getValue())) { | ||
| isUpdatable = true; | ||
| if (isDeclaredInSubstation(iedName, ldInst)) { | ||
| newVal = ActiveStatus.ON.getValue(); | ||
| } else { | ||
| newVal = ActiveStatus.OFF.getValue(); | ||
| } | ||
| } | ||
|
|
||
| } | ||
|
|
||
| /** | ||
| * checks whether LDevice Status is authorized to be deactivated when CompasLDeviceStatus Private is INACTIVE | ||
| * @param iedName Ied name value which contains LDevice | ||
| * @param ldInst LDevice inst value | ||
| * @param enumValues enum values | ||
| */ | ||
| private void checkAuthorisationToDeactivateLDevice(String iedName, String ldInst, Set<String> enumValues) { | ||
| if (!enumValues.contains(ActiveStatus.OFF.getValue()) && enumValues.contains(ActiveStatus.ON.getValue())) { | ||
| if (isDeclaredInSubstation(iedName, ldInst)) { | ||
| errorMessage = "The LDevice is not qualified into STD but has been selected into SSD."; | ||
| } else { | ||
| errorMessage = "The LDevice cannot be set to 'off' but has not been selected into SSD."; | ||
| } | ||
| } | ||
| if (enumValues.contains(ActiveStatus.ON.getValue()) && enumValues.contains(ActiveStatus.OFF.getValue())) { | ||
| if (isDeclaredInSubstation(iedName, ldInst)) { | ||
| errorMessage = "The LDevice is not qualified into STD but has been selected into SSD."; | ||
| } else { | ||
| isUpdatable = true; | ||
| newVal = ActiveStatus.OFF.getValue(); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * checks whether a pair of IED name and LDevice inst are referenced in Substation...LNode list | ||
| * @param iedName Ied name value | ||
| * @param ldInst LDevice inst value | ||
| * @return Returns whether a pair of IED name and LDevice inst are referenced in Substation...LNode list | ||
| */ | ||
| private boolean isDeclaredInSubstation(String iedName, String ldInst){ | ||
| return iedNameLdInstList.contains(Pair.of(iedName, ldInst)); | ||
| } | ||
|
|
||
|
|
||
| public record LDeviceActivation(String modStValCurrentValue, boolean isPresentInSubstation, Set<String> enumValues, TAnyLN tln) { | ||
| } |
Oops, something went wrong.