Skip to content

add netmod description #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mathieu-Deharbe merged 7 commits into from
Dec 12, 2025
Merged

add netmod description #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
417a84a
add netmod description
Mathieu-Deharbe Dec 4, 2025
2a06306
Merge branch 'main' into add-netmod-description
Mathieu-Deharbe Dec 9, 2025
66828d2
Merge branch 'main' into add-netmod-description
Mathieu-Deharbe Dec 10, 2025
9e784d7
Merge branch 'main' into add-netmod-description
Mathieu-Deharbe Dec 12, 2025
275c7ac
TU on description value
Mathieu-Deharbe Dec 12, 2025
041ec9d
remove sonar warnings
Mathieu-Deharbe Dec 12, 2025
ca6b00c
Merge branch 'main' into add-netmod-description
Mathieu-Deharbe Dec 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/main/java/org/gridsuite/modification/dto/ModificationInfos.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,9 @@ public class ModificationInfos {
@Builder.Default
private Boolean activated = true;

@Schema(description = "User description")
private String description;

@JsonIgnore
public ReportNode createSubReportNode(ReportNode reportNode) {
throw new UnsupportedOperationException("Method createSubReportNode must be implemented in subclass " + this.getClass().getSimpleName());
Expand Down
9 changes: 5 additions & 4 deletions ...g/gridsuite/modification/modifications/TwoWindingsTransformerCreationNodeBreakerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ protected void assertAfterNetworkModificationApplication() {
}

@Test
void testCreateTwoWindingsTransformerWithRatioTapChangerInNodeBreaker() throws Exception {
void testCreateTwoWindingsTransformerWithRatioTapChangerInNodeBreaker() {
// create new 2wt in voltage level with Node/breaker topology, having a RatioTapChanger
RatioTapChangerCreationInfos ratioTapChangerCreationInfos = RatioTapChangerCreationInfos.builder()
.lowTapPosition(0)
Expand Down Expand Up @@ -223,6 +223,7 @@ void testCreateTwoWindingsTransformerWithRatioTapChangerInNodeBreaker() throws E
TwoWindingsTransformerCreationInfos twoWindingsTransformerCreationInfos2 = TwoWindingsTransformerCreationInfos.builder()
.equipmentId("id2wt1WithRatioTapChanger2")
.equipmentName("2wtName")
.description("a dummy description")
.voltageLevelId1("v1")
.busOrBusbarSectionId1("1.1")
.connected1(true)
Expand All @@ -241,7 +242,7 @@ void testCreateTwoWindingsTransformerWithRatioTapChangerInNodeBreaker() throws E
.build();
testCreateTwoWindingsTransformerInNodeBreaker(twoWindingsTransformerCreationInfos2);
assertEquals(
"TwoWindingsTransformerCreationInfos(super=BranchCreationInfos(super=EquipmentCreationInfos(super=EquipmentModificationInfos(super=ModificationInfos(uuid=null, type=TWO_WINDINGS_TRANSFORMER_CREATION, date=null, stashed=false, messageType=null, messageValues=null, activated=true), equipmentId=id2wt1WithRatioTapChanger2, properties=null), equipmentName=2wtName), r=400.0, x=300.0, voltageLevelId1=v1, voltageLevelId2=v4, busOrBusbarSectionId1=1.1, busOrBusbarSectionId2=1.A, operationalLimitsGroups=null, selectedOperationalLimitsGroup1=null, selectedOperationalLimitsGroup2=null, connectionName1=null, connectionDirection1=TOP, connectionName2=null, connectionDirection2=TOP, connectionPosition1=null, connectionPosition2=null, connected1=true, connected2=true), g=100.0, b=200.0, ratedU1=1000.0, ratedU2=1010.0, ratedS=null, ratioTapChanger=RatioTapChangerCreationInfos(super=TapChangerCreationInfos(lowTapPosition=0, tapPosition=1, regulating=true, targetDeadband=null, terminalRefConnectableId=v1load, terminalRefConnectableType=LOAD, terminalRefConnectableVlId=v1, steps=[TapChangerStepCreationInfos(index=0, rho=1.0, r=39.78473, x=39.784725, g=0.0, b=0.0, alpha=0.0), TapChangerStepCreationInfos(index=0, rho=1.0, r=39.78474, x=39.784726, g=0.0, b=0.0, alpha=0.0), TapChangerStepCreationInfos(index=0, rho=1.0, r=39.78475, x=39.784727, g=0.0, b=0.0, alpha=0.0)], loadTapChangingCapabilities=true), targetV=220.0), phaseTapChanger=null)",
"TwoWindingsTransformerCreationInfos(super=BranchCreationInfos(super=EquipmentCreationInfos(super=EquipmentModificationInfos(super=ModificationInfos(uuid=null, type=TWO_WINDINGS_TRANSFORMER_CREATION, date=null, stashed=false, messageType=null, messageValues=null, activated=true, description=a dummy description), equipmentId=id2wt1WithRatioTapChanger2, properties=null), equipmentName=2wtName), r=400.0, x=300.0, voltageLevelId1=v1, voltageLevelId2=v4, busOrBusbarSectionId1=1.1, busOrBusbarSectionId2=1.A, operationalLimitsGroups=null, selectedOperationalLimitsGroup1=null, selectedOperationalLimitsGroup2=null, connectionName1=null, connectionDirection1=TOP, connectionName2=null, connectionDirection2=TOP, connectionPosition1=null, connectionPosition2=null, connected1=true, connected2=true), g=100.0, b=200.0, ratedU1=1000.0, ratedU2=1010.0, ratedS=null, ratioTapChanger=RatioTapChangerCreationInfos(super=TapChangerCreationInfos(lowTapPosition=0, tapPosition=1, regulating=true, targetDeadband=null, terminalRefConnectableId=v1load, terminalRefConnectableType=LOAD, terminalRefConnectableVlId=v1, steps=[TapChangerStepCreationInfos(index=0, rho=1.0, r=39.78473, x=39.784725, g=0.0, b=0.0, alpha=0.0), TapChangerStepCreationInfos(index=0, rho=1.0, r=39.78474, x=39.784726, g=0.0, b=0.0, alpha=0.0), TapChangerStepCreationInfos(index=0, rho=1.0, r=39.78475, x=39.784727, g=0.0, b=0.0, alpha=0.0)], loadTapChangingCapabilities=true), targetV=220.0), phaseTapChanger=null)",
twoWindingsTransformerCreationInfos2.toString()
);

Expand Down Expand Up @@ -291,7 +292,7 @@ void testApplySelectedLimitsGroupsNotExist() {
}

@Test
void testCreateTwoWindingsTransformerWithPhaseTapChangerInNodeBreaker() throws Exception {
void testCreateTwoWindingsTransformerWithPhaseTapChangerInNodeBreaker() {
// create new 2wt in voltage level with Node/breaker topology, having a PhaseTapChanger with Load regulating
PhaseTapChangerCreationInfos phaseTapChangerLoadRegulatingCreationInfos = PhaseTapChangerCreationInfos.builder()
.lowTapPosition(0)
Expand Down Expand Up @@ -410,7 +411,7 @@ protected void checkModification() {
assertEquals("TWO_WINDINGS_TRANSFORMER_ALREADY_EXISTS : trf1", exception.getMessage());
}

private void testCreateTwoWindingsTransformerInNodeBreaker(TwoWindingsTransformerCreationInfos twoWindingsTransformerCreationInfos) throws Exception {
private void testCreateTwoWindingsTransformerInNodeBreaker(TwoWindingsTransformerCreationInfos twoWindingsTransformerCreationInfos) {
final String transformerId = twoWindingsTransformerCreationInfos.getEquipmentId();
twoWindingsTransformerCreationInfos.toModification().apply(getNetwork());
TwoWindingsTransformer twoWindingsTransformer = getNetwork().getTwoWindingsTransformer(transformerId);
Expand Down