Fix VoltageAngleLimit retrieval by id from a subnetwork (#2743)

Signed-off-by: Olivier Perrin <[email protected]> (cherry picked from commit 965a415)
powsybl · Oct 6, 2023 · d015bf4 · d015bf4
1 parent f851a55
commit d015bf4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/SubnetworkImpl.java b/iidm/iidm-impl/src/main/java/com/powsybl/iidm/network/impl/SubnetworkImpl.java
@@ -236,8 +236,8 @@ public Stream<VoltageAngleLimit> getVoltageAngleLimitsStream() {
     public VoltageAngleLimit getVoltageAngleLimit(String id) {
         VoltageAngleLimitImpl val = (VoltageAngleLimitImpl) getNetwork().getVoltageAngleLimit(id);
         boolean valInSubnetwork = val != null
-                && id.equals(val.getTerminalFrom().getVoltageLevel().getParentNetwork().getId())
-                && id.equals(val.getTerminalTo().getVoltageLevel().getParentNetwork().getId());
+                && contains(val.getTerminalFrom().getVoltageLevel())
+                && contains(val.getTerminalTo().getVoltageLevel());
         return valInSubnetwork ? val : null;
     }
 

diff --git a/.../iidm-tck/src/test/java/com/powsybl/iidm/network/tck/AbstractSubnetworksCreationTest.java b/.../iidm-tck/src/test/java/com/powsybl/iidm/network/tck/AbstractSubnetworksCreationTest.java
@@ -364,6 +364,17 @@ public void testAngleVoltageLimitCreation() {
         vla3.remove();
         vla4.remove();
 
+        // Test VoltageAngleLimit retrieval
+        assertEquals(vla0, network.getVoltageAngleLimit("vla0"));
+        assertEquals(vla1, network.getVoltageAngleLimit("vla1"));
+        assertEquals(vla2, network.getVoltageAngleLimit("vla2"));
+        assertNull(subnetwork1.getVoltageAngleLimit("vla0"));
+        assertEquals(vla1, subnetwork1.getVoltageAngleLimit("vla1"));
+        assertNull(subnetwork1.getVoltageAngleLimit("vla2"));
+        assertNull(subnetwork2.getVoltageAngleLimit("vla0"));
+        assertNull(subnetwork2.getVoltageAngleLimit("vla1"));
+        assertEquals(vla2, subnetwork2.getVoltageAngleLimit("vla2"));
+
         // Detach all
         assertTrue(subnetwork1.isDetachable());
         assertTrue(subnetwork2.isDetachable());