diff --git a/cgmes/cgmes-conformity/src/main/java/com/powsybl/cgmes/conformity/CgmesConformity1ModifiedCatalog.java b/cgmes/cgmes-conformity/src/main/java/com/powsybl/cgmes/conformity/CgmesConformity1ModifiedCatalog.java
index 4093f1dd9be..7458e27fe15 100644
--- a/cgmes/cgmes-conformity/src/main/java/com/powsybl/cgmes/conformity/CgmesConformity1ModifiedCatalog.java
+++ b/cgmes/cgmes-conformity/src/main/java/com/powsybl/cgmes/conformity/CgmesConformity1ModifiedCatalog.java
@@ -1356,20 +1356,6 @@ public static GridModelReference microGridBaseCaseNLShuntCompensatorGP() {
microGridBaseCaseBoundaries());
}
- public static GridModelReference microGridBaseCaseNLSwitchWithoutName() {
- String base = ENTSOE_CONFORMITY_1_MODIFIED
- + "/MicroGrid/BaseCase/BC_NL_v2_switch_without_name/";
- String baseOriginal = ENTSOE_CONFORMITY_1
- + MICROGRID_CONFIGURATION;
- return new GridModelReferenceResources(
- "MicroGrid-BaseCase-NL-switch-no-name",
- null,
- new ResourceSet(base, MICRO_GRID_NL_EQ),
- new ResourceSet(baseOriginal, MICRO_GRID_NL_SSH,
- MICRO_GRID_NL_TP),
- microGridBaseCaseBoundaries());
- }
-
public static GridModelReference microGridBaseCaseNLSwitchTypePreserved() {
String base = ENTSOE_CONFORMITY_1_MODIFIED
+ "/MicroGrid/BaseCase/BC_NL_v2_switch_type_preserved/";
diff --git a/cgmes/cgmes-conformity/src/main/resources/conformity-modified/cas-1.1.3-data-4.0.3/MicroGrid/BaseCase/BC_NL_v2_switch_without_name/MicroGridTestConfiguration_BC_NL_EQ_V2.xml b/cgmes/cgmes-conformity/src/main/resources/conformity-modified/cas-1.1.3-data-4.0.3/MicroGrid/BaseCase/BC_NL_v2_switch_without_name/MicroGridTestConfiguration_BC_NL_EQ_V2.xml
deleted file mode 100644
index 767dc38e689..00000000000
--- a/cgmes/cgmes-conformity/src/main/resources/conformity-modified/cas-1.1.3-data-4.0.3/MicroGrid/BaseCase/BC_NL_v2_switch_without_name/MicroGridTestConfiguration_BC_NL_EQ_V2.xml
+++ /dev/null
@@ -1,1618 +0,0 @@
-
-
-
-
- 2014-10-24T11:51:49
- 2014-06-01T10:30:00
- 2
-
- CGMES Conformity Assessment: 'MicroGridTestConfiguration....BC (MAS NL) Test Configuration. The model is owned by ENTSO-E and is provided by ENTSO-E “as it is”. To the fullest extent permitted by law, ENTSO-E shall not be liable for any damages of any kind arising out of the use of the model (including any of its subsequent modifications). ENTSO-E neither warrants, nor represents that the use of the model will not infringe the rights of third parties. Any use of the model shall include a reference to ENTSO-E. ENTSO-E web site is the only official source of information related to the model.
- http://tennet.nl/CGMES/2.4.15
- http://entsoe.eu/CIM/EquipmentCore/3/1
- http://entsoe.eu/CIM/EquipmentShortCircuit/3/1
-
-
- NL-Line_1
- NL-L_1
- 10T-AT-DE-000118
- 10T-AT-DE-000118
-
- 1.020000
- 12.000000
- 0.0001413717
- 30.000000
- 0.0000300000
- false
-
- 3.060000
- 36.000000
- 0.0001500000
- 0.0000300000
- 160.0000000000
-
-
- NL-Line_2
- NL-L_2
- tie line BE-NL
-
- 2.320000
- 20.240000
- 0.0000251327
- 40.000000
- 0.0000400000
- false
-
- 0.696000
- 6.072000
- 0.0
- 0.0000400000
- 160.0000000000
-
-
- NL-Line_3
- NL-L_3
- 10T-AT-DE-00009W
- 10T-AT-DE-00009W
-
- 5.060000
- 69.000000
- 0.0000202319
- 23.000000
- 0.0000230000
- false
-
- 15.180000
- 207.000000
- 0.0000455217
- 0.0000230000
- 160.0000000000
-
-
- NL-Line_4
- NL-L_4
- 10T-AT-DE-00009W
- 10T-AT-DE-00009W
-
- 2.200000
- 66.000000
- 0.0000898495
- 22.000000
- 0.0000242000
- false
-
- 6.600000
- 198.000000
- 0.0000435425
- 0.0000242000
- 160.0000000000
-
-
- NL-Line_5
- NL-L_5
- 10T-AT-DE-000118
- 10T-AT-DE-000118
-
- 0.420000
- 6.300000
- 0.0000648739
- 35.000000
- 0.0000350000
- false
-
- 1.260000
- 18.900000
- 0.0109955743
- 0.0000350000
- 160.0000000000
-
-
- 15.75
- Base Voltage Level
- 15.75
- 15.75 kV
-
-
-
- B1
- false
- false
- true
-
-
-
- N1230822396
-
- 0e+000
-
-
- NL-Busbar_2
-
- 0e+000
-
-
- NL-Busbar_3
-
- 0e+000
-
-
- NL-Busbar_5
-
- 0e+000
-
-
- 90
- CL-2
- Ratings for element NL-Line_5 - Limit
- 1623.600000
-
-
-
-
- 90
- CL-2
- Ratings for element NL-Line_5 - Limit
- 1623.600000
-
-
-
-
- 90
- CL-2
- Ratings for element NL-Line_4 - Limit
- 1298.700000
-
-
-
-
- 90
- CL-2
- Ratings for element NL-Line_4 - Limit
- 1298.700000
-
-
-
-
- 90
- CL-2
- Ratings for element NL-Line_3 - Limit
- 1062.000000
-
-
-
-
- 90
- CL-3
- Ratings for element NL-Line_3 - Limit
- 1800.000000
-
-
-
-
- 90
- CL-2
- Ratings for element NL-Line_3 - Limit
- 1062.000000
-
-
-
-
- 90
- CL-3
- Ratings for element NL-Line_3 - Limit
- 1800.000000
-
-
-
-
- 90
- CL-2
- Ratings for element NL-Line_2 - Limit
- 1103.400000
-
-
-
-
- 90
- CL-2
- Ratings for element NL-Line_2 - Limit
- 1103.400000
-
-
-
-
- 90
- CL-2
- Ratings for element NL-Line_1 - Limit
- 1233.900000
-
-
-
-
- 90
- CL-2
- Ratings for element NL-Line_1 - Limit
- 1233.900000
-
-
-
-
- 90
- CL-2
- Ratings for element NL-TR2_1 - Limit
- 415.710000
-
-
-
-
- 90
- CL-2
- Ratings for element NL-TR2_1 - Limit
- 755.820000
-
-
-
-
- 90
- CL-2
- Ratings for element NL_TR2_2 - Limit
- 2975.940000
-
-
-
-
- 90
- CL-2
- Ratings for element NL_TR2_2 - Limit
- 41569.200000
-
-
-
-
- 90
- CL-2
- Ratings for element NL_TR2_3 - Limit
- 2975.940000
-
-
-
-
- 90
- CL-2
- Ratings for element NL_TR2_3 - Limit
- 41569.200000
-
-
-
-
- NL-Line_1 - CL-0
- CL-0
- Ratings for element NL-Line_1 - Limit
- 1443.000000
-
-
-
-
- NL-Line_1 - CL-0
- CL-0
- Ratings for element NL-Line_1 - Limit
- 1443.000000
-
-
-
-
- NL-Line_1 - CL-1
- CL-1
- Ratings for element NL-Line_1 - Limit
- 1515.000000
-
-
-
-
- NL-Line_1 - CL-1
- CL-1
- Ratings for element NL-Line_1 - Limit
- 1515.000000
-
-
-
-
- NL-Line_1 - CL-2
- CL-2
- Ratings for element NL-Line_1 - Limit
- 1371.000000
-
-
-
-
- NL-Line_1 - CL-2
- CL-2
- Ratings for element NL-Line_1 - Limit
- 1371.000000
-
-
-
-
- NL-Line_2 - CL-0
- CL-0
- Ratings for element NL-Line_2 - Limit
- 1299.000000
-
-
-
-
- NL-Line_2 - CL-0
- CL-0
- Ratings for element NL-Line_2 - Limit
- 1299.000000
-
-
-
-
- NL-Line_2 - CL-1
- CL-1
- Ratings for element NL-Line_2 - Limit
- 1371.000000
-
-
-
-
- NL-Line_2 - CL-1
- CL-1
- Ratings for element NL-Line_2 - Limit
- 1371.000000
-
-
-
-
- NL-Line_2 - CL-2
- CL-2
- Ratings for element NL-Line_2 - Limit
- 1226.000000
-
-
-
-
- NL-Line_2 - CL-2
- CL-2
- Ratings for element NL-Line_2 - Limit
- 1226.000000
-
-
-
-
- NL-Line_3 - CL-0
- CL-0
- Ratings for element NL-Line_3 - Limit
- 1312.000000
-
-
-
-
- NL-Line_3 - CL-0
- CL-0
- Ratings for element NL-Line_3 - Limit
- 1312.000000
-
-
-
-
- NL-Line_3 - CL-1
- CL-1
- Ratings for element NL-Line_3 - Limit
- 1443.000000
-
-
-
-
- NL-Line_3 - CL-1
- CL-1
- Ratings for element NL-Line_3 - Limit
- 1443.000000
-
-
-
-
- NL-Line_3 - CL-2
- CL-2
- Ratings for element NL-Line_3 - Limit
- 1180.000000
-
-
-
-
- NL-Line_3 - CL-2
- CL-2
- Ratings for element NL-Line_3 - Limit
- 1180.000000
-
-
-
-
- NL-Line_3 - CL-3
- CL-3
- Ratings for element NL-Line_3 - Limit
- 2000.000000
-
-
-
-
- NL-Line_3 - CL-3
- CL-3
- Ratings for element NL-Line_3 - Limit
- 2000.000000
-
-
-
-
- NL-Line_4 - CL-0
- CL-0
- Ratings for element NL-Line_4 - Limit
- 1574.000000
-
-
-
-
- NL-Line_4 - CL-0
- CL-0
- Ratings for element NL-Line_4 - Limit
- 1574.000000
-
-
-
-
- NL-Line_4 - CL-1
- CL-1
- Ratings for element NL-Line_4 - Limit
- 1705.000000
-
-
-
-
- NL-Line_4 - CL-1
- CL-1
- Ratings for element NL-Line_4 - Limit
- 1705.000000
-
-
-
-
- NL-Line_4 - CL-2
- CL-2
- Ratings for element NL-Line_4 - Limit
- 1443.000000
-
-
-
-
- NL-Line_4 - CL-2
- CL-2
- Ratings for element NL-Line_4 - Limit
- 1443.000000
-
-
-
-
- NL-Line_5 - CL-0
- CL-0
- Ratings for element NL-Line_5 - Limit
- 1876.000000
-
-
-
-
- NL-Line_5 - CL-0
- CL-0
- Ratings for element NL-Line_5 - Limit
- 1876.000000
-
-
-
-
- NL-Line_5 - CL-1
- CL-1
- Ratings for element NL-Line_5 - Limit
- 1948.000000
-
-
-
-
- NL-Line_5 - CL-1
- CL-1
- Ratings for element NL-Line_5 - Limit
- 1948.000000
-
-
-
-
- NL-Line_5 - CL-2
- CL-2
- Ratings for element NL-Line_5 - Limit
- 1804.000000
-
-
-
-
- NL-Line_5 - CL-2
- CL-2
- Ratings for element NL-Line_5 - Limit
- 1804.000000
-
-
-
-
- NL-TR2_1 - CL-0
- CL-0
- Ratings for element NL-TR2_1 - Limit
- 481.900000
-
-
-
-
- NL-TR2_1 - CL-0
- CL-0
- Ratings for element NL-TR2_1 - Limit
- 849.800000
-
-
-
-
- NL-TR2_1 - CL-1
- CL-1
- Ratings for element NL-TR2_1 - Limit
- 491.900000
-
-
-
-
- NL-TR2_1 - CL-1
- CL-1
- Ratings for element NL-TR2_1 - Limit
- 859.800000
-
-
-
-
- NL-TR2_1 - CL-2
- CL-2
- Ratings for element NL-TR2_1 - Limit
- 461.900000
-
-
-
-
- NL-TR2_1 - CL-2
- CL-2
- Ratings for element NL-TR2_1 - Limit
- 839.800000
-
-
-
-
- NL_TR2_2 - CL-0
- CL-0
- Ratings for element NL_TR2_2 - Limit
- 3406.600000
-
-
-
-
- NL_TR2_2 - CL-0
- CL-0
- Ratings for element NL_TR2_2 - Limit
- 47188.000000
-
-
-
-
- NL_TR2_2 - CL-1
- CL-1
- Ratings for element NL_TR2_2 - Limit
- 3506.600000
-
-
-
-
- NL_TR2_2 - CL-1
- CL-1
- Ratings for element NL_TR2_2 - Limit
- 48188.000000
-
-
-
-
- NL_TR2_2 - CL-2
- CL-2
- Ratings for element NL_TR2_2 - Limit
- 3306.600000
-
-
-
-
- NL_TR2_2 - CL-2
- CL-2
- Ratings for element NL_TR2_2 - Limit
- 46188.000000
-
-
-
-
- NL_TR2_3 - CL-0
- CL-0
- Ratings for element NL_TR2_3 - Limit
- 3506.600000
-
-
-
-
- NL_TR2_3 - CL-0
- CL-0
- Ratings for element NL_TR2_3 - Limit
- 47188.000000
-
-
-
-
- NL_TR2_3 - CL-1
- CL-1
- Ratings for element NL_TR2_3 - Limit
- 3706.600000
-
-
-
-
- NL_TR2_3 - CL-1
- CL-1
- Ratings for element NL_TR2_3 - Limit
- 49188.000000
-
-
-
-
- NL_TR2_3 - CL-2
- CL-2
- Ratings for element NL_TR2_3 - Limit
- 3306.600000
-
-
-
-
- NL_TR2_3 - CL-2
- CL-2
- Ratings for element NL_TR2_3 - Limit
- 46188.000000
-
-
-
-
- NL-Load_1
- NL-L_1
- Apple
- false
-
-
-
- NL-Load_2
- NL-L_2
- Electrabel
- true
-
-
-
- NL-Load_3
- NL-L_3
- Siemens
- false
-
-
-
-
- NL-Inj-XCA_AL11
- NL-I-XCA_AL1
- Eq_Injection
- false
- 0e+000
- 0e+000
- 0e+000
- 0e+000
- 0e+000
- 0e+000
-
-
-
- NL-Inj-XKA_MA11
- NL-I-XKA_MA1
- Eq_Injection
- false
- 0e+000
- 0e+000
- 0e+000
- 0e+000
- 0e+000
- 0e+000
-
-
-
- NL-Inj-XWI_GY11
- NL-I-XWI_GY1
- Eq_Injection
- false
- 0e+000
- 0e+000
- 0e+000
- 0e+000
- 0e+000
- 0e+000
-
-
-
- NL-Inj-XZE_ST23
- NL-I-XZE_ST2
- Eq_Injection
- false
- 0e+000
- 0e+000
- 0e+000
- 0e+000
- 0e+000
- 0e+000
-
-
-
- NL-Inj-XZE_ST24
- NL-I-XZE_ST2
- Eq_Injection
- false
- 0e+000
- 0e+000
- 0e+000
- 0e+000
- 0e+000
- 0e+000
-
-
-
- Gen-12908
- Machine
- 150.000000
- 225.000000
- 250.000000
- 130.000000
-
- false
-
-
-
- Gen-12910
- Machine
- 140.000000
- 225.000000
- 250.000000
- 130.000000
-
- false
-
-
-
- Gen-12923
- Machine
- 600.492701
- 990.000000
- 1000.000000
- 300.000000
-
- false
-
-
-
- NL
-
-
- container of NL-Line_1
-
-
-
- container of NL-Line_2
-
-
-
- container of NL-Line_3
-
-
-
- container of NL-Line_4
-
-
-
- container of NL-Line_5
-
-
-
- NL-S1
- NL-S1
- shunt
- 1
- 1
- 0.000313
- 0e+000
- -0e+000
- 0e+000
- 400.000000
-
- false
-
-
-
- NL-Load_3
- NL-L_3
- false
- 0.200000
- 0e+000
- 0.800000
- 0e+000
- 0.300000
- 0e+000
- 0.700000
- 0e+000
- 0e+000
- 0e+000
-
-
- Limits at Port 1
- Limit-Ratings for branch NL-Line_5 at Port 1
-
-
-
- Limits at Port 1
- Limit-Ratings for branch NL-Line_4 at Port 1
-
-
-
- Limits at Port 1
- Limit-Ratings for branch NL-Line_3 at Port 1
-
-
-
- Limits at Port 1
- Limit-Ratings for branch NL-Line_2 at Port 1
-
-
-
- Limits at Port 1
- Limit-Ratings for branch NL-Line_1 at Port 1
-
-
-
- Limits at Port 1
- Limit-Ratings for branch NL-TR2_1 at Port 1
-
-
-
- Limits at Port 1
- Limit-Ratings for branch NL_TR2_2 at Port 1
-
-
-
- Limits at Port 1
- Limit-Ratings for branch NL_TR2_3 at Port 1
-
-
-
- Limits at Port 2
- Limit-Ratings for branch NL-Line_5 at Port 2
-
-
-
- Limits at Port 2
- Limit-Ratings for branch NL-Line_4 at Port 2
-
-
-
- Limits at Port 2
- Limit-Ratings for branch NL-Line_3 at Port 2
-
-
-
- Limits at Port 2
- Limit-Ratings for branch NL-Line_2 at Port 2
-
-
-
- Limits at Port 2
- Limit-Ratings for branch NL-Line_1 at Port 2
-
-
-
- Limits at Port 2
- Limit-Ratings for branch NL-TR2_1 at Port 2
-
-
-
- Limits at Port 2
- Limit-Ratings for branch NL_TR2_2 at Port 2
-
-
-
- Limits at Port 2
- Limit-Ratings for branch NL_TR2_3 at Port 2
-
-
-
- PATL
- patl
-
-
-
-
- PATLT
- patlt
-
-
-
-
- TATL10
- tatl
-
-
- 10.000000
-
-
- TATL20
- tatl
-
-
- 20.000000
-
-
- TC
- tc
-
-
-
-
- TCT
- tct
-
-
-
-
- NL-TR2_1
- NL-T_1
- new transformer in 2015
- false
-
- 0e+000
- 0e+000
- 0e+000
- 0e+000
- false
- false
-
-
- NL_TR2_2
- NL_T_2
- trafo
- false
-
- 0e+000
- 0e+000
- 0e+000
- 0e+000
- false
- false
-
-
- NL_TR2_3
- NL_T_3
- out of service in 2020
- false
-
- 0e+000
- 0e+000
- 0e+000
- 0e+000
- false
- false
-
-
- NL-TR2_1
- NL-T_1
- 1.350000
- 27.967436
- -0.0000044445
- 0.0000005625
- 1.350000
- 27.967436
- 0.0
- 0.0
- 0e+000
- 0.0
- 320.000000
- 400.000000
- 1
- 0
- true
-
-
-
-
-
-
- NL-TR2_1
- NL-T_1
- 0e+000
- 0e+000
- 0.0
- 0.0
- 0e+000
- 0e+000
- 0.0
- 0.0
- 0e+000
- 0.0
- 320.000000
- 220.000000
- 2
- 0
- true
-
-
-
-
-
-
- NL_TR2_2
- NL_T_2
- 0.069143
- 5.377333
- -0.0001420227
- 0.0000181818
- 0.069143
- 5.377333
- 0.0
- 0.0
- 0e+000
- 0.0
- 1260.000000
- 220.000000
- 1
- 0
- true
-
-
-
-
-
-
- NL_TR2_2
- NL_T_2
- 0e+000
- 0e+000
- 0.0
- 0.0
- 0e+000
- 0e+000
- 0.0
- 0.0
- 0e+000
- 0.0
- 1260.000000
- 15.750000
- 2
- 0
- true
-
-
-
-
-
-
- NL_TR2_3
- NL_T_3
- 0.065302
- 5.377381
- -0.0001420227
- 0.0000181818
- 0.069143
- 5.377333
- 0.0
- 0.0
- 0e+000
- 0.0
- 1260.000000
- 220.000000
- 1
- 0
- true
-
-
-
-
-
-
- NL_TR2_3
- NL_T_3
- 0e+000
- 0e+000
- 0.0
- 0.0
- 0e+000
- 0e+000
- 0.0
- 0.0
- 0e+000
- 0.0
- 1260.000000
- 15.750000
- 2
- 0
- true
-
-
-
-
-
-
- NL-TR2_1
- NL-T_1
- 400.000000
- -20
- 20
- 0
- -2
- 0.800000
- true
-
-
-
-
-
- NL_TR2_2
- NL_T_2
- 220.000000
- 0
- 33
- 17
- 17
- 0.625000
- true
-
-
-
-
-
- NL_TR2_3
- NL_T_3
- 220.000000
- -15
- 15
- 0
- 5
- 0.625000
- true
-
-
-
-
-
- NL-G1
- NL-G1
-
-
-
-
- NL-G2
- NL-G2
-
-
-
-
- NL-G3
- NL-G3
-
-
-
-
- NL-S1
- NL-S1
-
-
-
-
- TENNET TSO B.V.
-
-
-
- PP_Amsterdam
- PP_Amsterdam
-
-
-
- NL-G1
- NL-G1
- Machine
- false
-
- 100.000000
- 600.000000
- 0e+000
- 1100.000000
-
-
-
- 15.750000
- 0.900000
-
- 0e+000
- 0e+000
- 0.110000
- 0.180000
- 0e+000
- 0e+000
- 0e+000
- 0.210000
- 1.900000
- 0e+000
- 0e+000
- 0e+000
- 0e+000
- true
-
-
- NL-G2
- NL-G2
- Machine
- false
-
- 100.000000
- 200.000000
- 0e+000
- 250.000000
-
-
-
- 15.750000
- 0.900000
-
- 0e+000
- 0e+000
- 0.100000
- 0.160000
- 0e+000
- 0e+000
- 0e+000
- 0.180000
- 1.800000
- 0e+000
- 0e+000
- 0e+000
- 0e+000
- true
-
-
- NL-G3
- NL-G3
- Machine
- false
-
- 100.000000
- 200.000000
- 0e+000
- 250.000000
-
-
-
- 15.750000
- 0.900000
-
- 0e+000
- 0e+000
- 0.130000
- 0.170000
- 0e+000
- 0e+000
- 0e+000
- 0.200000
- 1.900000
- 0e+000
- 0e+000
- 0e+000
- 0e+000
- true
-
-
- NL-TR2_1
- NL-T_1
-
-
-
-
- NL_TR2_2
- NL_T_2
-
-
-
-
- NL_TR2_3
- NL_T_3
-
-
-
-
- B1 - T1
- B1
- 1
-
-
-
-
- B1 - T2
- B1
- 2
-
-
-
-
- N1230822396_Busbar_Section
- BB
- 1
-
-
- Busbar Section
-
-
- NL-Busbar_2_Busbar_Section
- BB
- 1
-
-
- Busbar Section
-
-
- NL-Busbar_3_Busbar_Section
- BB
- 1
-
-
- Busbar Section
-
-
- NL-Busbar_5_Busbar_Section
- BB
- 1
-
-
- Busbar Section
-
-
- NL-G1 - T1
- NL-G1
- 1
-
-
-
-
- NL-G2 - T1
- NL-G2
- 1
-
-
-
-
- NL-G3 - T1
- NL-G3
- 1
-
-
-
-
- NL-Inj-XCA_AL11 - T1
- NL-I-XCA_AL1
- 1
-
-
-
-
- NL-Inj-XKA_MA11 - T1
- NL-I-XKA_MA1
- 1
-
-
-
-
- NL-Inj-XWI_GY11 - T1
- NL-I-XWI_GY1
- 1
-
-
-
-
- NL-Inj-XZE_ST23 - T1
- NL-I-XZE_ST2
- 1
-
-
-
-
- NL-Inj-XZE_ST24 - T1
- NL-I-XZE_ST2
- 1
-
-
-
-
- NL-Line_1 - T1
- NL-L_1
- 1
-
-
- 10T-AT-DE-000118
-
-
- NL-Line_1 - T2
- NL-L_1
- 2
-
-
- 10T-AT-DE-000118
-
-
- NL-Line_2 - T1
- NL-L_2
- 1
-
-
-
-
- NL-Line_2 - T2
- NL-L_2
- 2
-
-
-
-
- NL-Line_3 - T1
- NL-L_3
- 1
-
-
- 10T-AT-DE-00009W
-
-
- NL-Line_3 - T2
- NL-L_3
- 2
-
-
- 10T-AT-DE-00009W
-
-
- NL-Line_4 - T1
- NL-L_4
- 1
-
-
- 10T-AT-DE-00009W
-
-
- NL-Line_4 - T2
- NL-L_4
- 2
-
-
- 10T-AT-DE-00009W
-
-
- NL-Line_5 - T1
- NL-L_5
- 1
-
-
- 10T-AT-DE-000118
-
-
- NL-Line_5 - T2
- NL-L_5
- 2
-
-
- 10T-AT-DE-000118
-
-
- NL-Load_1 - T1
- NL-L_1
- 1
-
-
-
-
- NL-Load_2 - T1
- NL-L_2
- 1
-
-
-
-
- NL-Load_3 - T1
- NL-L_3
- 1
-
-
-
-
- NL-S1 - T1
- NL-S1
- 1
-
-
-
-
- NL-TR2_1 - T1
- NL-T_1
- 1
-
-
-
-
- NL-TR2_1 - T2
- NL-T_1
- 2
-
-
-
-
- NL_TR2_2 - T1
- NL_T_2
- 1
-
-
-
-
- NL_TR2_2 - T2
- NL_T_2
- 2
-
-
-
-
- NL_TR2_3 - T1
- NL_T_3
- 1
-
-
-
-
- NL_TR2_3 - T2
- NL_T_3
- 2
-
-
-
-
- 15.8
- 14.175000
- 17.325000
-
-
-
-
- 15.8
- 14.175000
- 17.325000
-
-
-
-
- 220.0
- 198.000000
- 242.000000
-
-
-
-
- 400.0
- 360.000000
- 440.000000
-
-
-
-
diff --git a/cgmes/cgmes-conversion/src/test/java/com/powsybl/cgmes/conversion/test/SwitchConversionTest.java b/cgmes/cgmes-conversion/src/test/java/com/powsybl/cgmes/conversion/test/SwitchConversionTest.java
index 1a38f439015..0ee60f1ae1d 100644
--- a/cgmes/cgmes-conversion/src/test/java/com/powsybl/cgmes/conversion/test/SwitchConversionTest.java
+++ b/cgmes/cgmes-conversion/src/test/java/com/powsybl/cgmes/conversion/test/SwitchConversionTest.java
@@ -41,16 +41,18 @@ void lineWithZeroImpedanceTest() {
@Test
void switchKindTest() {
// CGMES network:
- // One LoadBreakSwitch and one generic Switch.
+ // A LoadBreakSwitch, a generic Switch, and a Disconnector without name.
// IIDM network:
// The switch kind is preserved. A generic CGMES switch is considered of kind breaker.
Network network = readCgmesResources(DIR, "switch_kind.xml");
assertNotNull(network);
// Check that the switch kind has been preserved.
- assertNotNull(network.getSwitch("LBS"));
assertEquals(SwitchKind.LOAD_BREAK_SWITCH, network.getSwitch("LBS").getKind());
- assertNotNull(network.getSwitch("SW"));
assertEquals(SwitchKind.BREAKER, network.getSwitch("SW").getKind());
+ assertEquals(SwitchKind.DISCONNECTOR, network.getSwitch("DIS").getKind());
+
+ // Disconnector has no name, so getNameOrId() returns its id
+ assertEquals("DIS", network.getSwitch("DIS").getNameOrId());
}
}
diff --git a/cgmes/cgmes-conversion/src/test/java/com/powsybl/cgmes/conversion/test/conformity/modified/CgmesConformity1ModifiedConversionTest.java b/cgmes/cgmes-conversion/src/test/java/com/powsybl/cgmes/conversion/test/conformity/modified/CgmesConformity1ModifiedConversionTest.java
index 774ff151b28..42801c1a760 100644
--- a/cgmes/cgmes-conversion/src/test/java/com/powsybl/cgmes/conversion/test/conformity/modified/CgmesConformity1ModifiedConversionTest.java
+++ b/cgmes/cgmes-conversion/src/test/java/com/powsybl/cgmes/conversion/test/conformity/modified/CgmesConformity1ModifiedConversionTest.java
@@ -914,12 +914,6 @@ void microGridBaseCaseNLShuntCompensatorGP() {
assertEquals(0.123, network.getShuntCompensator("fbfed7e3-3dec-4829-a286-029e73535685").getTerminal().getP(), 0.0);
}
- @Test
- void microGridBaseCaseNLSwitchWithoutName() {
- Network network = Importers.importData("CGMES", CgmesConformity1ModifiedCatalog.microGridBaseCaseNLSwitchWithoutName().dataSource(), importParams);
- assertNotNull(network.getSwitch("5f5d40ae-d52d-4631-9285-b3ceefff784c"));
- }
-
@Test
void microGridBaseCaseBESingleFile() {
Network network = Importers.importData("CGMES", CgmesConformity1ModifiedCatalog.microGridBaseCaseBESingleFile().dataSource(), importParams);
diff --git a/cgmes/cgmes-conversion/src/test/resources/issues/switches/switch_kind.xml b/cgmes/cgmes-conversion/src/test/resources/issues/switches/switch_kind.xml
index 22d7880148d..d700e61de7e 100644
--- a/cgmes/cgmes-conversion/src/test/resources/issues/switches/switch_kind.xml
+++ b/cgmes/cgmes-conversion/src/test/resources/issues/switches/switch_kind.xml
@@ -70,6 +70,25 @@
+
+
+
+
+ false
+ false
+
+
+ Terminal DIS 1
+ 1
+
+
+
+
+ Terminal DIS 2
+ 2
+
+
+
110 kV
110