From ea340cdd4f09d274760039a36dae1f33421a4fda Mon Sep 17 00:00:00 2001 From: Romain Courtier Date: Thu, 17 Oct 2024 17:50:17 +0200 Subject: [PATCH] Merge 2 tests of switch kind using a modified conformity file with a test using a simple network file. Signed-off-by: Romain Courtier --- .../CgmesConformity1ModifiedCatalog.java | 27 - ...MicroGridTestConfiguration_BC_NL_EQ_V2.xml | 1619 ------ ...icroGridTestConfiguration_BC_NL_SSH_V2.xml | 255 - ...MiniGridTestConfiguration_BC_EQ_v3.0.0.xml | 4479 ----------------- ...iniGridTestConfiguration_BC_SSH_v3.0.0.xml | 1077 ---- .../conversion/test/SwitchConversionTest.java | 21 +- .../test/export/issues/SwitchExportTest.java | 63 - 7 files changed, 12 insertions(+), 7529 deletions(-) delete mode 100644 cgmes/cgmes-conformity/src/main/resources/conformity-modified/cas-1.1.3-data-4.0.3/MicroGrid/BaseCase/BC_NL_v2_switch_type_preserved/MicroGridTestConfiguration_BC_NL_EQ_V2.xml delete mode 100644 cgmes/cgmes-conformity/src/main/resources/conformity-modified/cas-1.1.3-data-4.0.3/MicroGrid/BaseCase/BC_NL_v2_switch_type_preserved/MicroGridTestConfiguration_BC_NL_SSH_V2.xml delete mode 100644 cgmes/cgmes-conformity/src/main/resources/conformity-modified/cas-1.1.3-data-4.0.3/MiniGrid/NodeBreaker/BaseCase_Complete_v3_switch_type_preserved/MiniGridTestConfiguration_BC_EQ_v3.0.0.xml delete mode 100644 cgmes/cgmes-conformity/src/main/resources/conformity-modified/cas-1.1.3-data-4.0.3/MiniGrid/NodeBreaker/BaseCase_Complete_v3_switch_type_preserved/MiniGridTestConfiguration_BC_SSH_v3.0.0.xml 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 53375fe5002..29cd485ef44 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 @@ -1343,19 +1343,6 @@ public static GridModelReference microGridBaseCaseNLShuntCompensatorGP() { microGridBaseCaseBoundaries()); } - public static GridModelReference microGridBaseCaseNLSwitchTypePreserved() { - String base = ENTSOE_CONFORMITY_1_MODIFIED - + "/MicroGrid/BaseCase/BC_NL_v2_switch_type_preserved/"; - String baseOriginal = ENTSOE_CONFORMITY_1 - + MICROGRID_CONFIGURATION; - return new GridModelReferenceResources( - "MicroGrid-BaseCase-NL-switch-type-preserved", - null, - new ResourceSet(base, MICRO_GRID_NL_EQ, MICRO_GRID_NL_SSH), - new ResourceSet(baseOriginal, MICRO_GRID_NL_TP), - microGridBaseCaseBoundaries()); - } - public static GridModelReference microGridBaseCaseBESingleFile() { String base = ENTSOE_CONFORMITY_1_MODIFIED + "/MicroGrid/BaseCase/BC_BE_v2_single_file/"; @@ -1467,20 +1454,6 @@ public static GridModelReference miniGridNodeBreakerMissingVoltageLevel() { MINI_GRID_BD_TP)); } - public static GridModelReferenceResources miniGridNodeBreakerSwitchTypePreserved() { - String base = ENTSOE_CONFORMITY_1_MODIFIED - + "/MiniGrid/NodeBreaker/BaseCase_Complete_v3_switch_type_preserved/"; - return new GridModelReferenceResources( - "MiniGrid-NodeBreaker-BaseCase-Complete-v3-switch-type-preserved", - null, - new ResourceSet(base, MINI_GRID_EQ, MINI_GRID_SSH), - new ResourceSet(MINI_GRID_NODE_BREAKER_BASE, - MINI_GRID_SV, - MINI_GRID_TP), - new ResourceSet(MINI_GRID_NODE_BREAKER_BD_BASE, MINI_GRID_BD_EQ, - MINI_GRID_BD_TP)); - } - public static GridModelReferenceResources microGridBaseCaseAssembledSvWithMas() { String base = ENTSOE_CONFORMITY_1_MODIFIED + "/MicroGrid/BaseCase/BC_Assembled_v2_sv_with_mas/"; 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_type_preserved/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_type_preserved/MicroGridTestConfiguration_BC_NL_EQ_V2.xml deleted file mode 100644 index 9b2ec49d336..00000000000 --- a/cgmes/cgmes-conformity/src/main/resources/conformity-modified/cas-1.1.3-data-4.0.3/MicroGrid/BaseCase/BC_NL_v2_switch_type_preserved/MicroGridTestConfiguration_BC_NL_EQ_V2.xml +++ /dev/null @@ -1,1619 +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 - 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-conformity/src/main/resources/conformity-modified/cas-1.1.3-data-4.0.3/MicroGrid/BaseCase/BC_NL_v2_switch_type_preserved/MicroGridTestConfiguration_BC_NL_SSH_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_type_preserved/MicroGridTestConfiguration_BC_NL_SSH_V2.xml deleted file mode 100644 index 21980f16b68..00000000000 --- a/cgmes/cgmes-conformity/src/main/resources/conformity-modified/cas-1.1.3-data-4.0.3/MicroGrid/BaseCase/BC_NL_v2_switch_type_preserved/MicroGridTestConfiguration_BC_NL_SSH_V2.xml +++ /dev/null @@ -1,255 +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/SteadyStateHypothesis/1/1 - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - 486.000000 - 230.000000 - - - 10.000000 - 10.000000 - - - 90.000000 - 280.000000 - - - 0e+000 - - - -140.000000 - -77.743000 - - 0 - true - - - 0e+000 - - - -150.000000 - -83.296000 - - 0 - true - - - 1.000000 - - - -600.492701 - -386.922556 - - 1 - true - - - -2 - false - - - 17 - false - - - 5 - false - - - 1 - false - - - - false - - - 43.687227 - -84.876604 - false - 0.0 - - - 27.365225 - -0.425626 - false - 0.0 - - - 26.805006 - -1.489867 - false - 0.0 - - - 90.037005 - -148.603743 - false - 0.0 - - - 46.816625 - -79.193778 - false - 0.0 - - - true - 0.500000 - - false - 0e+000 - - - true - 0.500000 - - false - 0e+000 - - - true - 0.500000 - - false - 0e+000 - - - false - 0.500000 - - true - 16.017750 - - - false - 0.500000 - - true - 16.017750 - - - false - 0.500000 - - true - 16.033500 - - - true - 0.500000 - - false - 400.000000 - - diff --git a/cgmes/cgmes-conformity/src/main/resources/conformity-modified/cas-1.1.3-data-4.0.3/MiniGrid/NodeBreaker/BaseCase_Complete_v3_switch_type_preserved/MiniGridTestConfiguration_BC_EQ_v3.0.0.xml b/cgmes/cgmes-conformity/src/main/resources/conformity-modified/cas-1.1.3-data-4.0.3/MiniGrid/NodeBreaker/BaseCase_Complete_v3_switch_type_preserved/MiniGridTestConfiguration_BC_EQ_v3.0.0.xml deleted file mode 100644 index a11aabd509e..00000000000 --- a/cgmes/cgmes-conformity/src/main/resources/conformity-modified/cas-1.1.3-data-4.0.3/MiniGrid/NodeBreaker/BaseCase_Complete_v3_switch_type_preserved/MiniGridTestConfiguration_BC_EQ_v3.0.0.xml +++ /dev/null @@ -1,4479 +0,0 @@ - - - - 2030-01-02T09:00:00 - 2015-02-05T12:20:50.830 - CGMES Conformity Assessment: Mini Grid Base Case 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. - 4 - http://entsoe.eu/CIM/EquipmentCore/3/1 - http://entsoe.eu/CIM/EquipmentOperation/3/1 - http://entsoe.eu/CIM/EquipmentShortCircuit/3/1 - http://A1.de/Planning/ENTSOE/2 - - - - - L5_0 - 1 - - - - - - L5_1 - 2 - - - - - - L6_0 - 1 - - - - - - L6_1 - 2 - - - - - - L4_0 - 1 - - - - - - L4_1 - 2 - - - - - - L1_0 - 1 - - - - - - L1_1 - 2 - - - - - - L2_0 - 1 - - - - - - L2_1 - 2 - - - - - - L3_a_0 - 1 - - - - - - L3_a_1 - 2 - - - - - - L3_b_0 - 1 - - - - - - L3_b_1 - 2 - - - - - - T5_0 - 1 - - - - - - T5_1 - 2 - - - - - - T6_0 - 1 - - - - - - T6_1 - 2 - - - - - - T2_0 - 1 - - - - - - T2_1 - 2 - - - - - - T1_0 - 1 - - - - - - T1_1 - 2 - - - - - - T4_0 - 1 - - - - - - T4_1 - 2 - - - - - - T4_2 - 3 - - - - - - T3_0 - 1 - - - - - - T3_1 - 2 - - - - - - T3_2 - 3 - - - - - - G2_0 - 1 - - - - - - G1_0 - 1 - - - - - - G3_0 - 1 - - - - - - M1_0 - 1 - - - - - - M2_0 - 1 - - - - - - ASM-1229750300_0 - 1 - - - - - - Q1_0 - 1 - - - - - - Q2_0 - 1 - - - - - - 380kV - 380 - - - 21kV - 21 - - - 10kV - 10 - - - 110kV - 110 - - - 30kV - 30 - - - S2 10kV - - - - - S5 10kV - - - - - S4 10kV - - - - - S3 21kV - - - - - S2 110kV - - - - - S3 110kV - - - - - S1 380kV - - - - - S1 30kV - - - - - S4 110kV - - - - - S1 110kV - - - - - Sub1 - - - - Sub2 - - - - Sub3 - - - - Sub4 - - - - Sub5 - - - - AA - - - Z1 - - - - PATL - 45000 - - - - - TATL - 900 - - - - - TATL - 60 - - - - - Gen-1 - G2 - false - - 0 - 127.5 - 0 - - - G2 - - - 0.9 - 100 - 10.5 - - false - 43.6 - -43.6 - 100 - 0 - 0.004535 - 0.16 - 2 - 2 - - - 7.5 - 0.005 - 0.1 - 0.16 - - - Gen-2 - G1 - false - - 0 - 90 - 0 - - - G1 - - 0.85 - 150 - 21 - - false - 79 - -79 - 100 - 0 - 0.00068 - 0.14 - 1.8 - 1.8 - - - 0.002 - 0.1 - 0.14 - - - Gen-3 - G3 - false - - 0 - 8 - 0 - - - G3 - - 0.8 - 10 - 10.5 - - false - 6 - -6 - 100 - 0 - 0.00163 - 0.1 - 1.8 - 1.8 - - - 0.018 - 0.08 - 0.1 - - - M3 - false - - 0.88 - 5.828 - 10 - false - 97.5 - 5 - 1 - 5 - false - 0.1 - - - M2a - false - - 0.89 - 2.321 - 10 - false - 96.8 - 5.2 - 2 - 2 - false - 0.1 - - - M2b - false - - 0.89 - 2.321 - 10 - false - 96.8 - 5.2 - 2 - 2 - false - 0.1 - - - Q1 - - 0 - true - 38000 - 800 - 600 - 0.15 - 0.1 - 3.029 - 0 - -800 - -600 - 0.1 - 0.1 - 1 - 1.1 - - - Q2 - - 0 - true - 16000 - 88 - 66 - 0.2 - 0.1 - 3.34865 - 0 - -88 - -66 - 0 - 0 - 0 - 1.1 - - - Line-7 - L5 - false - - - 15 - 0 - 0 - 0 - 0 - 1.8 - 3.3 - 80 - 5.79 - 16.5 - - - Ratings - - - - Normal - - - 525 - - - ShortTerm - - - 604 - - - Emergency - - - 735 - - - Line-4 - L6 - false - - - 1 - 0 - 0 - 0 - 0 - 0.082 - 0.082 - 80 - 0.086 - 0.086 - - - Ratings - - - - Normal - - - 1155 - - - ShortTerm - - - 1328 - - - Emergency - - - 1617 - - - Line-5 - L4 - false - - - 10 - 0 - 0 - 0 - 0 - 0.96 - 2.2 - 80 - 3.88 - 11 - - - Ratings - - - - Normal - - - 525 - - - ShortTerm - - - 604 - - - Emergency - - - 735 - - - Line-1 - L1 - false - - - 20 - 0 - 0 - 0 - 0 - 2.4 - 6.4 - 80 - 7.8 - 25.2 - - - Ratings - - - - Normal - - - 525 - - - ShortTerm - - - 604 - - - Emergency - - - 735 - - - Line-6 - L2 - false - - - 10 - 0 - 0 - 0 - 0 - 1.2 - 3.2 - 80 - 3.9 - 12.6 - - - Ratings - - - - Normal - - - 525 - - - ShortTerm - - - 604 - - - Emergency - - - 735 - - - Line-2 - L3_a - false - - - 5 - 0 - 0 - 0 - 0 - 0.6 - 2.6 - 80 - 1.95 - 9.3 - - - Ratings - - - - Normal - - - 525 - - - ShortTerm - - - 604 - - - Emergency - - - 735 - - - Line-3 - L3_b - false - - - 5 - 0 - 0 - 0 - 0 - 0.6 - 2.6 - 80 - 1.95 - 9.3 - - - Ratings - - - - Normal - - - 525 - - - ShortTerm - - - 604 - - - Emergency - - - 735 - - - Trafo-1 - T5 - false - - 158.14 - 121.095 - 36.86 - false - false - - - T5 - 0 - 1 - false - 0 - - - 0 - - 0 - 0 - 31.5 - 0 - 115 - 0 - 2.099206 - 2.099206 - 50.3372 - 50.3372 - - - - Ratings - - - - Normal - - - 158 - - - ShortTerm - - - 182 - - - Emergency - - - 222 - - - T5 - 0 - 2 - false - 0 - - - 0 - - 0 - 0 - 31.5 - 0 - 10.5 - 0 - 0 - 0 - 0 - 0 - - - - Ratings - - - - Normal - - - 1732 - - - ShortTerm - - - 1992 - - - Emergency - - - 2425 - - - Trafo-2 - T6 - false - - 158.14 - 121.095 - 36.86 - false - false - - - T6 - 0 - 1 - false - 0 - - - 0 - - 0 - 0 - 31.5 - 0 - 115 - 0 - 2.099206 - 2.099206 - 50.3372 - 50.3372 - - - - Ratings - - - - Normal - - - 158 - - - ShortTerm - - - 182 - - - Emergency - - - 222 - - - T6 - 0 - 2 - true - 100 - - - 0 - - 0 - 0 - 31.5 - 0 - 10.5 - 0 - 0 - 0 - 0 - 0 - - - - Ratings - - - - Normal - - - 1732 - - - ShortTerm - - - 1992 - - - Emergency - - - 2425 - - - Trafo-3 - T2 - false - - 115 - true - false - - - T2 - 0 - 1 - false - 0 - - - 0 - - 0 - 0 - 100 - 0 - 120 - 0 - 0.72 - 0.72 - 17.2649937 - 17.2649937 - - - - Ratings - - - - Normal - - - 481 - - - ShortTerm - - - 553 - - - Emergency - - - 673 - - - T2 - 2 - false - - - 0 - - 0 - 5 - 100 - 0 - 10.5 - 0 - 0 - 0 - 0 - 0 - - - - Ratings - - - - Normal - - - 5498 - - - ShortTerm - - - 6323 - - - Emergency - - - 7698 - - - Trafo-4 - T1 - false - - 115 - true - false - - - T1 - 2 - false - - - 0 - - 0 - 5 - 150 - 0 - 21 - 0 - 0.0147 - 0.0147 - 0.47017 - 0.446662 - - - - Ratings - - - - Normal - - - 4123 - - - ShortTerm - - - 4742 - - - Emergency - - - 5773 - - - T1 - 25 - 1 - true - 13 - 21 - 13 - - 1 - - - - T1 - 0 - 1 - true - 22 - - - 0 - - 0 - 0 - 150 - 0 - 115 - 0 - 0 - 0 - 0 - 0 - - - - Ratings - - - - Normal - - - 753 - - - ShortTerm - - - 866 - - - Emergency - - - 1054 - - - T4 - false - - false - - - T4 - 3 - false - - - 0 - - 0 - 5 - 50 - 0 - 30 - 0 - 0.0254571438 - 0.0254571438 - 1.259741 - 1.176919 - - - - Ratings - - - - Normal - - - 962 - - - ShortTerm - - - 1106 - - - Emergency - - - 1347 - - - T4 - 0 - 2 - true - 0 - - - 0 - - 0 - 0 - 350 - 0 - 120 - 0 - 0.05348571429 - 0.05348571429 - -0.001121283618 - -0.6881 - - - - Ratings - - - - Normal - - - 1683 - - - ShortTerm - - - 1936 - - - Emergency - - - 2357 - - - T4 - 0 - 1 - false - 0 - - - 0 - - 0 - 0 - 350 - 0 - 400 - 0 - 0.5942857143 - 0.5942857143 - 96.0051006 - 95.05666 - - - - Ratings - - - - Normal - - - 505 - - - ShortTerm - - - 580 - - - Emergency - - - 707 - - - Trafo-5 - T3 - false - - false - - - T3 - 0 - 1 - true - 0 - - - 0 - - 0 - 0 - 350 - 0 - 400 - 0 - 0.5942857143 - 0.5942857143 - 96.0051006 - 95.05666 - - - - Ratings - - - - Normal - - - 505 - - - ShortTerm - - - 580 - - - Emergency - - - 707 - - - T3 - 33 - 1 - true - 17 - 400 - 17 - - 1 - - - - T3 - 0 - 2 - false - 0 - - - 0 - - 0 - 0 - 350 - 0 - 120 - 0 - 0.05348571429 - 0.05348571429 - -0.001121283618 - -0.6881 - - - - Ratings - - - - Normal - - - 1683 - - - ShortTerm - - - 1936 - - - Emergency - - - 2357 - - - T3 - 3 - false - - - 0 - - 0 - 5 - 50 - 0 - 30 - 0 - 0.02545714286 - 0.02545714286 - 1.259740894 - 1.176919 - - - - Ratings - - - - Normal - - - 962 - - - ShortTerm - - - 1106 - - - Emergency - - - 1347 - - - T4 - 33 - 1 - true - 17 - 400 - 17 - - 1 - - - - 68-116_0 - 1 - - - - - - 68-116_1 - 2 - - - - - - Injection_0 - 1 - - - - - - 71-73_0 - 1 - - - - - - 71-73_1 - 2 - - - - - - Injection_0 - 1 - - - - - - XQ1-N1 - false - - - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 80 - 0.05 - 0 - - - Ratings - - - - Normal - - - 1000 - - - ShortTerm - - - 1150 - - - Emergency - - - 1400 - - - XQ2-N5 - false - - - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 80 - 0.05 - 0 - - - Ratings - - - - Normal - - - 1000 - - - ShortTerm - - - 1150 - - - Emergency - - - 1400 - - - Injection1 - - - 0.63185 - 2.85315 - 0.63185 - false - 6.3185 - 19.021 - 6.3185 - - - Injection2 - - - 0.43445 - 2.86738 - 0.43445 - false - 4.3445 - 14.3369 - 4.3445 - - - CONNECTIVITY_NODE1 - - - - BUSBAR1 - - - - - L5_0_BUSBAR - 1 - - - - - - BAY_L5_0 - - - - L5_0_ADD_DSC11 - 1 - - - - - - - DISCONNECTOR1 - - - false - false - - - L5_0_ADD_DSC12 - 2 - - - - - - CONNECTIVITY_NODE2 - - - - L5_0_ADDB1 - 1 - - - - - - - PROTECTEDSWITCH1 - - - false - false - - - L5_0_ADDB2 - 2 - - - - - - CONNECTIVITY_NODE3 - - - - L5_0_ADD_DSC21 - 1 - - - - - - DISCONNECTOR2 - - - false - false - - - L5_0_ADD_DSC22 - 2 - - - - - - CONNECTIVITY_NODE4 - - - - CONNECTIVITY_NODE5 - - - - BUSBAR2 - - - - - L5_1_BUSBAR - 2 - - - - - - BAY_L5_1 - - - - L5_1_ADD_DSC11 - 1 - - - - - - - DISCONNECTOR3 - - - false - false - - - L5_1_ADD_DSC12 - 2 - - - - - - CONNECTIVITY_NODE6 - - - - L5_1_ADDB1 - 1 - - - - - - BREAKER2 - - - false - false - - - L5_1_ADDB2 - 2 - - - - - - CONNECTIVITY_NODE7 - - - - L5_1_ADD_DSC21 - 1 - - - - - - DISCONNECTOR4 - - - false - false - - - L5_1_ADD_DSC22 - 2 - - - - - - CONNECTIVITY_NODE8 - - - - CONNECTIVITY_NODE9 - - - - BUSBAR3 - - - - - L6_0_BUSBAR - 1 - - - - - - BAY_L6_0 - - - - L6_0_ADD_DSC11 - 1 - - - - - - - DISCONNECTOR5 - - - false - false - - - L6_0_ADD_DSC12 - 2 - - - - - - CONNECTIVITY_NODE10 - - - - L6_0_ADDB1 - 1 - - - - - - BREAKER3 - - - false - false - - - L6_0_ADDB2 - 2 - - - - - - CONNECTIVITY_NODE11 - - - - L6_0_ADD_DSC21 - 1 - - - - - - DISCONNECTOR6 - - - false - false - - - L6_0_ADD_DSC22 - 2 - - - - - - CONNECTIVITY_NODE12 - - - - CONNECTIVITY_NODE13 - - - - BUSBAR4 - - - - - L6_1_BUSBAR - 2 - - - - - - BAY_L6_1 - - - - L6_1_ADD_DSC11 - 1 - - - - - - - DISCONNECTOR7 - - - false - false - - - L6_1_ADD_DSC12 - 2 - - - - - - CONNECTIVITY_NODE14 - - - - L6_1_ADDB1 - 1 - - - - - - BREAKER4 - - - false - false - - - L6_1_ADDB2 - 2 - - - - - - CONNECTIVITY_NODE15 - - - - L6_1_ADD_DSC21 - 1 - - - - - - DISCONNECTOR8 - - - false - false - - - L6_1_ADD_DSC22 - 2 - - - - - - CONNECTIVITY_NODE16 - - - - BAY_L4_0 - - - - L4_0_ADD_DSC11 - 1 - - - - - - - DISCONNECTOR9 - - - false - false - - - L4_0_ADD_DSC12 - 2 - - - - - - CONNECTIVITY_NODE17 - - - - L4_0_ADDB1 - 1 - - - - - - BREAKER5 - - - false - false - - - L4_0_ADDB2 - 2 - - - - - - CONNECTIVITY_NODE18 - - - - L4_0_ADD_DSC21 - 1 - - - - - - DISCONNECTOR10 - - - false - false - - - L4_0_ADD_DSC22 - 2 - - - - - - CONNECTIVITY_NODE19 - - - - CONNECTIVITY_NODE20 - - - - BUSBAR5 - - - - - L4_1_BUSBAR - 2 - - - - - - BAY_L4_1 - - - - L4_1_ADD_DSC11 - 1 - - - - - - - DISCONNECTOR11 - - - false - false - - - L4_1_ADD_DSC12 - 2 - - - - - - CONNECTIVITY_NODE21 - - - - L4_1_ADDB1 - 1 - - - - - - BREAKER6 - - - false - false - - - L4_1_ADDB2 - 2 - - - - - - CONNECTIVITY_NODE22 - - - - L4_1_ADD_DSC21 - 1 - - - - - - DISCONNECTOR12 - - - false - false - - - L4_1_ADD_DSC22 - 2 - - - - - - CONNECTIVITY_NODE23 - - - - CONNECTIVITY_NODE24 - - - - BUSBAR6 - - - - - L1_0_BUSBAR - 1 - - - - - - BAY_L1_0 - - - - L1_0_ADD_DSC11 - 1 - - - - - - - DISCONNECTOR13 - - - false - false - - - L1_0_ADD_DSC12 - 2 - - - - - - CONNECTIVITY_NODE25 - - - - L1_0_ADDB1 - 1 - - - - - - BREAKER7 - - - false - false - - - L1_0_ADDB2 - 2 - - - - - - CONNECTIVITY_NODE26 - - - - L1_0_ADD_DSC21 - 1 - - - - - - DISCONNECTOR14 - - - false - false - - - L1_0_ADD_DSC22 - 2 - - - - - - CONNECTIVITY_NODE27 - - - - BAY_L1_1 - - - - L1_1_ADD_DSC11 - 1 - - - - - - - DISCONNECTOR15 - - - false - false - - - L1_1_ADD_DSC12 - 2 - - - - - - CONNECTIVITY_NODE28 - - - - L1_1_ADDB1 - 1 - - - - - - BREAKER8 - - - false - false - - - L1_1_ADDB2 - 2 - - - - - - CONNECTIVITY_NODE29 - - - - L1_1_ADD_DSC21 - 1 - - - - - - DISCONNECTOR16 - - - false - false - - - L1_1_ADD_DSC22 - 2 - - - - - - CONNECTIVITY_NODE30 - - - - BAY_L2_0 - - - - L2_0_ADD_DSC11 - 1 - - - - - - - DISCONNECTOR17 - - - false - false - - - L2_0_ADD_DSC12 - 2 - - - - - - CONNECTIVITY_NODE31 - - - - L2_0_ADDB1 - 1 - - - - - - BREAKER9 - - - false - false - - - L2_0_ADDB2 - 2 - - - - - - CONNECTIVITY_NODE32 - - - - L2_0_ADD_DSC21 - 1 - - - - - - DISCONNECTOR18 - - - false - false - - - L2_0_ADD_DSC22 - 2 - - - - - - CONNECTIVITY_NODE33 - - - - BAY_L2_1 - - - - L2_1_ADD_DSC11 - 1 - - - - - - - DISCONNECTOR19 - - - false - false - - - L2_1_ADD_DSC12 - 2 - - - - - - CONNECTIVITY_NODE34 - - - - L2_1_ADDB1 - 1 - - - - - - BREAKER10 - - - false - false - - - L2_1_ADDB2 - 2 - - - - - - CONNECTIVITY_NODE35 - - - - L2_1_ADD_DSC21 - 1 - - - - - - DISCONNECTOR20 - - - false - false - - - L2_1_ADD_DSC22 - 2 - - - - - - CONNECTIVITY_NODE36 - - - - BAY_L3_a_0 - - - - L3_a_0_ADD_DSC11 - 1 - - - - - - - DISCONNECTOR21 - - - false - false - - - L3_a_0_ADD_DSC12 - 2 - - - - - - CONNECTIVITY_NODE37 - - - - L3_a_0_ADDB1 - 1 - - - - - - BREAKER11 - - - false - false - - - L3_a_0_ADDB2 - 2 - - - - - - CONNECTIVITY_NODE38 - - - - L3_a_0_ADD_DSC21 - 1 - - - - - - DISCONNECTOR22 - - - false - false - - - L3_a_0_ADD_DSC22 - 2 - - - - - - CONNECTIVITY_NODE39 - - - - BAY_L3_a_1 - - - - L3_a_1_ADD_DSC11 - 1 - - - - - - - DISCONNECTOR23 - - - false - false - - - L3_a_1_ADD_DSC12 - 2 - - - - - - CONNECTIVITY_NODE40 - - - - L3_a_1_ADDB1 - 1 - - - - - - BREAKER12 - - - false - false - - - L3_a_1_ADDB2 - 2 - - - - - - CONNECTIVITY_NODE41 - - - - L3_a_1_ADD_DSC21 - 1 - - - - - - DISCONNECTOR24 - - - false - false - - - L3_a_1_ADD_DSC22 - 2 - - - - - - CONNECTIVITY_NODE42 - - - - BAY_L3_b_0 - - - - L3_b_0_ADD_DSC11 - 1 - - - - - - - DISCONNECTOR25 - - - false - false - - - L3_b_0_ADD_DSC12 - 2 - - - - - - CONNECTIVITY_NODE43 - - - - L3_b_0_ADDB1 - 1 - - - - - - BREAKER13 - - - false - false - - - L3_b_0_ADDB2 - 2 - - - - - - CONNECTIVITY_NODE44 - - - - L3_b_0_ADD_DSC21 - 1 - - - - - - DISCONNECTOR26 - - - false - false - - - L3_b_0_ADD_DSC22 - 2 - - - - - - CONNECTIVITY_NODE45 - - - - BAY_L3_b_1 - - - - L3_b_1_ADD_DSC11 - 1 - - - - - - - DISCONNECTOR27 - - - false - false - - - L3_b_1_ADD_DSC12 - 2 - - - - - - CONNECTIVITY_NODE46 - - - - L3_b_1_ADDB1 - 1 - - - - - - BREAKER14 - - - false - false - - - L3_b_1_ADDB2 - 2 - - - - - - CONNECTIVITY_NODE47 - - - - L3_b_1_ADD_DSC21 - 1 - - - - - - DISCONNECTOR28 - - - false - false - - - L3_b_1_ADD_DSC22 - 2 - - - - - - CONNECTIVITY_NODE48 - - - - BAY_T5_0 - - - - T5_0_ADD_DSC11 - 1 - - - - - - - DISCONNECTOR29 - - - false - false - - - T5_0_ADD_DSC12 - 2 - - - - - - CONNECTIVITY_NODE49 - - - - T5_0_ADDB1 - 1 - - - - - - BREAKER15 - - - false - false - - - T5_0_ADDB2 - 2 - - - - - - CONNECTIVITY_NODE50 - - - - T5_0_ADD_DSC21 - 1 - - - - - - DISCONNECTOR30 - - - false - false - - - T5_0_ADD_DSC22 - 2 - - - - - - CONNECTIVITY_NODE51 - - - - BAY_T5_1 - - - - T5_1_ADD_DSC11 - 1 - - - - - - - DISCONNECTOR31 - - - false - false - - - T5_1_ADD_DSC12 - 2 - - - - - - CONNECTIVITY_NODE52 - - - - T5_1_ADDB1 - 1 - - - - - - BREAKER16 - - - false - false - - - T5_1_ADDB2 - 2 - - - - - - CONNECTIVITY_NODE53 - - - - T5_1_ADD_DSC21 - 1 - - - - - - DISCONNECTOR32 - - - false - false - - - T5_1_ADD_DSC22 - 2 - - - - - - CONNECTIVITY_NODE54 - - - - BAY_T6_0 - - - - T6_0_ADD_DSC11 - 1 - - - - - - - DISCONNECTOR33 - - - false - false - - - T6_0_ADD_DSC12 - 2 - - - - - - CONNECTIVITY_NODE55 - - - - T6_0_ADDB1 - 1 - - - - - - BREAKER17 - - - false - false - - - T6_0_ADDB2 - 2 - - - - - - CONNECTIVITY_NODE56 - - - - T6_0_ADD_DSC21 - 1 - - - - - - DISCONNECTOR34 - - - false - false - - - T6_0_ADD_DSC22 - 2 - - - - - - CONNECTIVITY_NODE57 - - - - BAY_T6_1 - - - - T6_1_ADD_DSC11 - 1 - - - - - - - DISCONNECTOR35 - - - false - false - - - T6_1_ADD_DSC12 - 2 - - - - - - CONNECTIVITY_NODE58 - - - - T6_1_ADDB1 - 1 - - - - - - BREAKER18 - - - false - false - - - T6_1_ADDB2 - 2 - - - - - - CONNECTIVITY_NODE59 - - - - T6_1_ADD_DSC21 - 1 - - - - - - DISCONNECTOR36 - - - false - false - - - T6_1_ADD_DSC22 - 2 - - - - - - CONNECTIVITY_NODE60 - - - - BAY_T2_0 - - - - T2_0_ADD_DSC11 - 1 - - - - - - - DISCONNECTOR37 - - - false - false - - - T2_0_ADD_DSC12 - 2 - - - - - - CONNECTIVITY_NODE61 - - - - T2_0_ADDB1 - 1 - - - - - - BREAKER19 - - - false - false - - - T2_0_ADDB2 - 2 - - - - - - CONNECTIVITY_NODE62 - - - - T2_0_ADD_DSC21 - 1 - - - - - - DISCONNECTOR38 - - - false - false - - - T2_0_ADD_DSC22 - 2 - - - - - - CONNECTIVITY_NODE63 - - - - CONNECTIVITY_NODE64 - - - - BUSBAR7 - - - - - T2_1_BUSBAR - 2 - - - - - - BAY_T2_1 - - - - T2_1_ADD_DSC11 - 1 - - - - - - - DISCONNECTOR39 - - - false - false - - - T2_1_ADD_DSC12 - 2 - - - - - - CONNECTIVITY_NODE65 - - - - T2_1_ADDB1 - 1 - - - - - - BREAKER20 - - - false - false - - - T2_1_ADDB2 - 2 - - - - - - CONNECTIVITY_NODE66 - - - - T2_1_ADD_DSC21 - 1 - - - - - - DISCONNECTOR40 - - - false - false - - - T2_1_ADD_DSC22 - 2 - - - - - - CONNECTIVITY_NODE67 - - - - CONNECTIVITY_NODE68 - - - - BUSBAR8 - - - - - T1_0_BUSBAR - 1 - - - - - - BAY_T1_0 - - - - T1_0_ADD_DSC11 - 1 - - - - - - - DISCONNECTOR41 - - - false - false - - - T1_0_ADD_DSC12 - 2 - - - - - - CONNECTIVITY_NODE69 - - - - T1_0_ADDB1 - 1 - - - - - - BREAKER21 - - - false - false - - - T1_0_ADDB2 - 2 - - - - - - CONNECTIVITY_NODE70 - - - - T1_0_ADD_DSC21 - 1 - - - - - - DISCONNECTOR42 - - - false - false - - - T1_0_ADD_DSC22 - 2 - - - - - - CONNECTIVITY_NODE71 - - - - BAY_T1_1 - - - - T1_1_ADD_DSC11 - 1 - - - - - - - DISCONNECTOR43 - - - false - false - - - T1_1_ADD_DSC12 - 2 - - - - - - CONNECTIVITY_NODE72 - - - - T1_1_ADDB1 - 1 - - - - - - BREAKER22 - - - false - false - - - T1_1_ADDB2 - 2 - - - - - - CONNECTIVITY_NODE73 - - - - T1_1_ADD_DSC21 - 1 - - - - - - DISCONNECTOR44 - - - false - false - - - T1_1_ADD_DSC22 - 2 - - - - - - CONNECTIVITY_NODE74 - - - - CONNECTIVITY_NODE75 - - - - BUSBAR9 - - - - - T4_0_BUSBAR - 1 - - - - - - BAY_T4_0 - - - - T4_0_ADD_DSC11 - 1 - - - - - - - DISCONNECTOR45 - - - false - false - - - T4_0_ADD_DSC12 - 2 - - - - - - CONNECTIVITY_NODE76 - - - - T4_0_ADDB1 - 1 - - - - - - BREAKER23 - - - false - false - - - T4_0_ADDB2 - 2 - - - - - - CONNECTIVITY_NODE77 - - - - T4_0_ADD_DSC21 - 1 - - - - - - DISCONNECTOR46 - - - false - false - - - T4_0_ADD_DSC22 - 2 - - - - - - CONNECTIVITY_NODE78 - - - - BAY_T4_1 - - - - T4_1_ADD_DSC11 - 1 - - - - - - - DISCONNECTOR47 - - - false - false - - - T4_1_ADD_DSC12 - 2 - - - - - - CONNECTIVITY_NODE79 - - - - T4_1_ADDB1 - 1 - - - - - - BREAKER24 - - - false - false - - - T4_1_ADDB2 - 2 - - - - - - CONNECTIVITY_NODE80 - - - - T4_1_ADD_DSC21 - 1 - - - - - - DISCONNECTOR48 - - - false - false - - - T4_1_ADD_DSC22 - 2 - - - - - - CONNECTIVITY_NODE81 - - - - CONNECTIVITY_NODE82 - - - - BUSBAR10 - - - - - T4_2_BUSBAR - 3 - - - - - - BAY_T4_2 - - - - T4_2_ADD_DSC11 - 1 - - - - - - - DISCONNECTOR49 - - - false - false - - - T4_2_ADD_DSC12 - 2 - - - - - - CONNECTIVITY_NODE83 - - - - T4_2_ADDB1 - 1 - - - - - - BREAKER25 - - - false - false - - - T4_2_ADDB2 - 2 - - - - - - CONNECTIVITY_NODE84 - - - - T4_2_ADD_DSC21 - 1 - - - - - - DISCONNECTOR50 - - - false - false - - - T4_2_ADD_DSC22 - 2 - - - - - - CONNECTIVITY_NODE85 - - - - BAY_T3_0 - - - - T3_0_ADD_DSC11 - 1 - - - - - - - DISCONNECTOR51 - - - false - false - - - T3_0_ADD_DSC12 - 2 - - - - - - CONNECTIVITY_NODE86 - - - - T3_0_ADDB1 - 1 - - - - - - BREAKER26 - - - false - false - - - T3_0_ADDB2 - 2 - - - - - - CONNECTIVITY_NODE87 - - - - T3_0_ADD_DSC21 - 1 - - - - - - DISCONNECTOR52 - - - false - false - - - T3_0_ADD_DSC22 - 2 - - - - - - CONNECTIVITY_NODE88 - - - - BAY_T3_1 - - - - T3_1_ADD_DSC11 - 1 - - - - - - - DISCONNECTOR53 - - - false - false - - - T3_1_ADD_DSC12 - 2 - - - - - - CONNECTIVITY_NODE89 - - - - T3_1_ADDB1 - 1 - - - - - - BREAKER27 - - - false - false - - - T3_1_ADDB2 - 2 - - - - - - CONNECTIVITY_NODE90 - - - - T3_1_ADD_DSC21 - 1 - - - - - - DISCONNECTOR54 - - - false - false - - - T3_1_ADD_DSC22 - 2 - - - - - - CONNECTIVITY_NODE91 - - - - CONNECTIVITY_NODE92 - - - - BUSBAR11 - - - - - T3_2_BUSBAR - 3 - - - - - - BAY_T3_2 - - - - T3_2_ADD_DSC11 - 1 - - - - - - - DISCONNECTOR55 - - - false - false - - - T3_2_ADD_DSC12 - 2 - - - - - - CONNECTIVITY_NODE93 - - - - T3_2_ADDB1 - 1 - - - - - - BREAKER28 - - - false - false - - - T3_2_ADDB2 - 2 - - - - - - CONNECTIVITY_NODE94 - - - - T3_2_ADD_DSC21 - 1 - - - - - - DISCONNECTOR56 - - - false - false - - - T3_2_ADD_DSC22 - 2 - - - - - - CONNECTIVITY_NODE95 - - - - BAY_68-116_0 - - - - 68-116_0_ADD_DSC11 - 1 - - - - - - - DISCONNECTOR57 - - - false - false - - - 68-116_0_ADD_DSC12 - 2 - - - - - - CONNECTIVITY_NODE96 - - - - 68-116_0_ADDB1 - 1 - - - - - - BREAKER29 - - - false - false - - - 68-116_0_ADDB2 - 2 - - - - - - CONNECTIVITY_NODE97 - - - - 68-116_0_ADD_DSC21 - 1 - - - - - - DISCONNECTOR58 - - - false - false - - - 68-116_0_ADD_DSC22 - 2 - - - - - - CONNECTIVITY_NODE98 - - - - BAY_71-73_0 - - - - 71-73_0_ADD_DSC11 - 1 - - - - - - - DISCONNECTOR59 - - - false - false - - - 71-73_0_ADD_DSC12 - 2 - - - - - - CONNECTIVITY_NODE100 - - - - 71-73_0_ADDB1 - 1 - - - - - - BREAKER30 - - - false - false - - - 71-73_0_ADDB2 - 2 - - - - - - CONNECTIVITY_NODE101 - - - - 71-73_0_ADD_DSC21 - 1 - - - - - - DISCONNECTOR60 - - - false - false - - - 71-73_0_ADD_DSC22 - 2 - - - - - - CONNECTIVITY_NODE102 - - - - GEN_A1 - - - - - _CA_A1 - - - - 5 - 1 - - - 4 - 1 - - - 6 - 1 - - - 7 - 1 - - - 3 - 1 - - - 2 - 1 - - - HG2 - 1 - - - HG1 - 1 - - - H - 1 - - - 1 - 1 - - - 8 - 1 - - - Container for Line-7 - - - - Container for Line-4 - - - - Container for Line-5 - - - - Container for Line-1 - - - - Container for Line-6 - - - - Container for Line-2 - - - - Container for Line-3 - - - - TwinBrch SM - - - - - PATLT - 4000 - - - - - Normal - - - 525 - - - Normal - - - 1155 - - - Normal - - - 525 - - - Normal - - - 525 - - - Normal - - - 525 - - - Normal - - - 525 - - - Normal - - - 525 - - - Normal - - - 158 - - - Normal - - - 1732 - - - Normal - - - 158 - - - Normal - - - 1732 - - - Normal - - - 481 - - - Normal - - - 5498 - - - Normal - - - 4123 - - - Normal - - - 753 - - - Normal - - - 962 - - - Normal - - - 1683 - - - Normal - - - 505 - - - Normal - - - 505 - - - Normal - - - 1683 - - - Normal - - - 962 - - - Normal - - - 1000 - - - Normal - - - 1000 - - diff --git a/cgmes/cgmes-conformity/src/main/resources/conformity-modified/cas-1.1.3-data-4.0.3/MiniGrid/NodeBreaker/BaseCase_Complete_v3_switch_type_preserved/MiniGridTestConfiguration_BC_SSH_v3.0.0.xml b/cgmes/cgmes-conformity/src/main/resources/conformity-modified/cas-1.1.3-data-4.0.3/MiniGrid/NodeBreaker/BaseCase_Complete_v3_switch_type_preserved/MiniGridTestConfiguration_BC_SSH_v3.0.0.xml deleted file mode 100644 index 31f728d587a..00000000000 --- a/cgmes/cgmes-conformity/src/main/resources/conformity-modified/cas-1.1.3-data-4.0.3/MiniGrid/NodeBreaker/BaseCase_Complete_v3_switch_type_preserved/MiniGridTestConfiguration_BC_SSH_v3.0.0.xml +++ /dev/null @@ -1,1077 +0,0 @@ - - - - 2030-01-02T09:00:00 - 2014-10-22T09:01:25.830 - CGMES Conformity Assessment: Mini Grid Base Case 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. - 4 - http://entsoe.eu/CIM/SteadyStateHypothesis/1/1 - http://A1.de/Planning/ENTSOE/2 - - - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - true - - - 1 - - - false - -0 - -0 - 1 - - - - 0 - - - false - -5 - -2 - 0 - - - - 0 - - - false - -4 - -3 - 0 - - - - false - 5 - 3 - - - - false - 2 - 1 - - - - false - 2 - 1 - - - - false - 0 - 0 - 0 - - - false - 0 - 0 - 0 - - - false - 13 - - - false - 17 - - - false - 17 - - - false - - - true - - - true - - - false - - - false - - - true - - - false - 0 - 0 - 0 - - - false - 0 - 0 - 0 - - - true - - - true - - - false - - - true - - - true - - - - false - - - true - - - true - - - false - - - true - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - true - - - false - - - true - - - 0 - - - false - true - 0 - 10.0 - - - 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 856676ca6c2..1155f93272a 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 @@ -8,16 +8,12 @@ package com.powsybl.cgmes.conversion.test; -import com.powsybl.cgmes.conversion.CgmesExport; import com.powsybl.cgmes.conversion.Conversion; import com.powsybl.commons.test.AbstractSerDeTest; import com.powsybl.iidm.network.*; import org.junit.jupiter.api.Test; import java.io.IOException; -import java.nio.file.Files; -import java.util.List; -import java.util.Properties; import java.util.regex.Pattern; import static com.powsybl.cgmes.conversion.test.ConversionUtil.*; @@ -47,7 +43,7 @@ void lineWithZeroImpedanceTest() { } @Test - void switchKindTest() { + void switchKindTest() throws IOException { // CGMES network: // A LoadBreakSwitch, a generic Switch, and a Disconnector without name. // IIDM network: @@ -55,13 +51,20 @@ void switchKindTest() { Network network = readCgmesResources(DIR, "switch_kind.xml"); assertNotNull(network); - // Check that the switch kind has been preserved. + // Disconnector has been imported even though it has no name. Method getNameOrId() returns its id. + assertNotNull(network.getSwitch("DIS")); + assertEquals("DIS", network.getSwitch("DIS").getNameOrId()); + + // The switch kind has been preserved if supported, or replaced by breaker otherwise. + assertEquals(SwitchKind.DISCONNECTOR, network.getSwitch("DIS").getKind()); assertEquals(SwitchKind.LOAD_BREAK_SWITCH, network.getSwitch("LBS").getKind()); assertEquals(SwitchKind.BREAKER, network.getSwitch("SW").getKind()); - assertEquals(SwitchKind.DISCONNECTOR, network.getSwitch("DIS").getKind()); + assertEquals("Switch", network.getSwitch("SW").getProperty("CGMES.switchType")); - // Disconnector has no name, so getNameOrId() returns its id - assertEquals("DIS", network.getSwitch("DIS").getNameOrId()); + // The original switch kind is restored in CGMES export. + String eqExport = writeCgmesProfile(network, "EQ", tmpDir); + Pattern switchPattern = Pattern.compile(""); + assertEquals("SW", getFirstMatch(eqExport, switchPattern)); } @Test diff --git a/cgmes/cgmes-conversion/src/test/java/com/powsybl/cgmes/conversion/test/export/issues/SwitchExportTest.java b/cgmes/cgmes-conversion/src/test/java/com/powsybl/cgmes/conversion/test/export/issues/SwitchExportTest.java index 5d538228907..b16f3aa2e38 100644 --- a/cgmes/cgmes-conversion/src/test/java/com/powsybl/cgmes/conversion/test/export/issues/SwitchExportTest.java +++ b/cgmes/cgmes-conversion/src/test/java/com/powsybl/cgmes/conversion/test/export/issues/SwitchExportTest.java @@ -7,9 +7,7 @@ */ package com.powsybl.cgmes.conversion.test.export.issues; -import com.powsybl.cgmes.conformity.CgmesConformity1ModifiedCatalog; import com.powsybl.cgmes.conversion.CgmesImport; -import com.powsybl.cgmes.model.CgmesNamespace; import com.powsybl.commons.datasource.DirectoryDataSource; import com.powsybl.commons.test.AbstractSerDeTest; import com.powsybl.iidm.network.Network; @@ -19,13 +17,9 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import javax.xml.stream.*; import java.io.*; -import java.nio.file.Files; -import java.nio.file.Path; import java.util.Properties; -import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; /** @@ -42,42 +36,6 @@ public void setUp() throws IOException { importParams.put(CgmesImport.IMPORT_CGM_WITH_SUBNETWORKS, "false"); } - @Test - void testSwitchTypePreservedBusBranch() { - // Load a bus/branch network containing a generic "Switch", not a breaker - Network network = Network.read(CgmesConformity1ModifiedCatalog.microGridBaseCaseNLSwitchTypePreserved().dataSource(), importParams); - String basename = "micro-nl"; - network.write("CGMES", null, tmpDir.resolve(basename)); - - // In IIDM the switch has been created of kind "Breaker" - String switchId = "5f5d40ae-d52d-4631-9285-b3ceefff784c"; - assertEquals(SwitchKind.BREAKER, network.getSwitch(switchId).getKind()); - - // Check that the "Switch" type has been preserved in EQ and SSH when we export - String switchIdEq = readId("Switch", "ID", tmpDir.resolve(basename + "_EQ.xml")); - String switchIdSsh = readId("Switch", "about", tmpDir.resolve(basename + "_SSH.xml")); - assertEquals("_" + switchId, switchIdEq); - assertEquals("#_" + switchId, switchIdSsh); - } - - @Test - void testSwitchTypePreservedNodeBreaker() { - // Load a node/branch network containing a "ProtectedSwitch" - Network network = Network.read(CgmesConformity1ModifiedCatalog.miniGridNodeBreakerSwitchTypePreserved().dataSource(), importParams); - String basename = "mini"; - network.write("CGMES", null, tmpDir.resolve(basename)); - - // In IIDM the switch has been created of kind "Breaker", the default when the type read is not supported - String switchId = "5e9f0079-647e-46da-b0ee-f5f24e127602"; - assertEquals(SwitchKind.BREAKER, network.getSwitch(switchId).getKind()); - - // Check that the "ProtectedSwitch" type has been preserved in EQ and SSH when we export - String switchIdEq = readId("ProtectedSwitch", "ID", tmpDir.resolve(basename + "_EQ.xml")); - String switchIdSsh = readId("ProtectedSwitch", "about", tmpDir.resolve(basename + "_SSH.xml")); - assertEquals("_" + switchId, switchIdEq); - assertEquals("#_" + switchId, switchIdSsh); - } - @Test void testExportRetainedSwitchWithSameBusBreakerBusAtBothEnds() { // We create a network where a retained breaker has the same bus-breaker buses at both ends @@ -108,25 +66,4 @@ void testExportRetainedSwitchWithSameBusBreakerBusAtBothEnds() { assertNotNull(n1.getSwitch("coupler")); } - private static String readId(String elementName, String rdfIdAttrName, Path ssh) { - String id; - try (InputStream is = Files.newInputStream(ssh)) { - XMLStreamReader reader = XMLInputFactory.newInstance().createXMLStreamReader(is); - while (reader.hasNext()) { - int next = reader.next(); - if (next == XMLStreamConstants.START_ELEMENT) { - if (reader.getLocalName().equals(elementName)) { - id = reader.getAttributeValue(CgmesNamespace.RDF_NAMESPACE, rdfIdAttrName); - reader.close(); - return id; - } - } - } - reader.close(); - } catch (XMLStreamException | IOException e) { - throw new RuntimeException(e); - } - return null; - } - }