Skip to content

Voltage level creation with naming strategy #127

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

Open
etiennehomer wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Voltage level creation with naming strategy #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion src/main/java/org/gridsuite/modification/modifications/VoltageLevelCreation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
package org.gridsuite.modification.modifications;

import com.powsybl.commons.report.ReportNode;
import com.powsybl.iidm.modification.topology.DefaultNamingStrategy;
import com.powsybl.iidm.modification.topology.NamingStrategy;
import com.powsybl.iidm.network.Network;
import com.powsybl.iidm.network.VoltageLevel;
import org.gridsuite.modification.NetworkModificationException;
Expand Down Expand Up @@ -39,7 +41,12 @@ public void check(Network network) throws NetworkModificationException {

@Override
public void apply(Network network, ReportNode subReportNode) {
ModificationUtils.getInstance().createVoltageLevel(modificationInfos, subReportNode, network);
apply(network, new DefaultNamingStrategy(), subReportNode);
}

@Override
public void apply(Network network, NamingStrategy namingStrategy, ReportNode subReportNode) {
ModificationUtils.getInstance().createVoltageLevel(modificationInfos, subReportNode, network, namingStrategy);
// properties
VoltageLevel voltageLevel = network.getVoltageLevel(modificationInfos.getEquipmentId());
PropertiesUtils.applyProperties(voltageLevel, subReportNode, modificationInfos.getProperties(), "network.modification.VlProperties");
Expand Down
9 changes: 7 additions & 2 deletions src/main/java/org/gridsuite/modification/utils/ModificationUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,11 @@ public void createSubstation(SubstationCreationInfos substationCreationInfos,

public void createVoltageLevel(VoltageLevelCreationInfos voltageLevelCreationInfos,
ReportNode subReportNode, Network network) {
createVoltageLevel(voltageLevelCreationInfos, subReportNode, network, new DefaultNamingStrategy());
}

public void createVoltageLevel(VoltageLevelCreationInfos voltageLevelCreationInfos,
ReportNode subReportNode, Network network, NamingStrategy namingStrategy) {
String substationId = voltageLevelCreationInfos.getSubstationId();
SubstationCreationInfos substationCreation = voltageLevelCreationInfos.getSubstationCreation();
Substation substation;
Expand Down Expand Up @@ -423,7 +428,7 @@ public void createVoltageLevel(VoltageLevelCreationInfos voltageLevelCreationInf
.withAlignedBusesOrBusbarCount(voltageLevelCreationInfos.getBusbarCount())
.withSectionCount(voltageLevelCreationInfos.getSectionCount())
.withSwitchKinds(voltageLevelCreationInfos.getSwitchKinds())
.build().apply(network);
.build().apply(network, namingStrategy);

voltageLevelCreationInfos.getCouplingDevices().forEach(couplingDevice -> {
if (!checkBbs(network, couplingDevice.getBusbarSectionId1(), couplingDevice.getBusbarSectionId2(), subReportNode)) {
Expand All @@ -433,7 +438,7 @@ public void createVoltageLevel(VoltageLevelCreationInfos voltageLevelCreationInf
couplingDeviceBuilder.withBusOrBusbarSectionId1(couplingDevice.getBusbarSectionId1())
.withBusOrBusbarSectionId2(couplingDevice.getBusbarSectionId2())
.withSwitchPrefixId(voltageLevelCreationInfos.getEquipmentId() + "_COUPL")
.build().apply(network, subReportNode);
.build().apply(network, namingStrategy, subReportNode);
});

subReportNode.newReportNode()
Expand Down
20 changes: 16 additions & 4 deletions src/test/java/org/gridsuite/modification/modifications/VoltageLevelCreationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
package org.gridsuite.modification.modifications;

import com.fasterxml.jackson.core.type.TypeReference;
import com.powsybl.commons.report.ReportNode;
import com.powsybl.iidm.network.Country;
import com.powsybl.iidm.network.Network;
import org.gridsuite.modification.NetworkModificationException;
import org.gridsuite.modification.dto.FreePropertyInfos;
import org.gridsuite.modification.dto.ModificationInfos;
import org.gridsuite.modification.dto.SubstationCreationInfos;
import org.gridsuite.modification.dto.VoltageLevelCreationInfos;
import org.gridsuite.modification.dto.*;
import org.gridsuite.modification.utils.DummyNamingStrategy;
import org.gridsuite.modification.utils.ModificationCreation;
import org.gridsuite.modification.utils.NetworkCreation;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

import java.util.List;
Expand Down Expand Up @@ -207,4 +207,16 @@ protected void testCreationModificationMessage(ModificationInfos modificationInf
Map<String, String> createdValues = mapper.readValue(modificationInfos.getMessageValues(), new TypeReference<>() { });
assertEquals("vlId", createdValues.get("equipmentId"));
}

@Test
void testApplyWithNamingStrategy() {
Network network = getNetwork();
ReportNode report = ReportNode.newRootReportNode()
.withMessageTemplate("test")
.build();
ModificationCreation.getCreationVoltageLevel("s2", "vlId", "vlName")
.toModification().apply(network, new DummyNamingStrategy(), report);
Assertions.assertNotNull(network.getBusbarSection("BUSBAR_1_1"));
Assertions.assertNotNull(network.getSwitch("DISCONNECTOR_1_5"));
}
}