Skip to content

Commit c4c1c2d

Browse files
AliouDIAITEAliouDIAITE
authored
Merge pull request #274 from com-pas/feat/update-compas-core-indice-for-new-xsd
feat(RSR-721): update compas-core indice for new compas xsd file
2 parents e98e619 + 5e52004 commit c4c1c2d

File tree

36 files changed

+465
-117
lines changed

36 files changed

+465
-117
lines changed

‎pom.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,13 @@
3030

3131
<properties>
3232
<java.version>17</java.version>
33-
<compas.core.version>local-SNAPSHOT</compas.core.version>
3433
<maven.compiler.target>${java.version}</maven.compiler.target>
3534
<maven.compiler.source>${java.version}</maven.compiler.source>
3635
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3736
<sonar.coverage.exclusions>sct-coverage/**</sonar.coverage.exclusions>
3837
<aggregate.report.dir>../sct-coverage/target/site/jacoco-aggregate/jacoco.xml</aggregate.report.dir>
3938
<sonar.coverage.jacoco.xmlReportPaths>${basedir}/${aggregate.report.dir}</sonar.coverage.jacoco.xmlReportPaths>
40-
<compas-core.version>0.13.0</compas-core.version>
39+
<compas-core.version>0.14.0</compas-core.version>
4140
<compas-scl-xsd.version>0.0.4</compas-scl-xsd.version>
4241
<maven.plugin.javadoc>3.4.1</maven.plugin.javadoc>
4342
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>

‎sct-app/src/test/resources/std_1.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,11 @@
3434
<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001"/>
3535
</Private>
3636
<Private type="COMPAS-ICDHeader">
37-
<compas:ICDHeader IEDType="SCU" ICDSystemVersionUUID="b4f8089e-4170-47f1-b6ad-dd1f50885518" VendorName="RTE" IEDredundancy="A" IEDmodel="ICDfromModeling" hwRev="01.00.00" swRev="01.00.00" headerId="f8dbc8c1-2db7-4652-a9d6-0b414bdeccfa" headerVersion="01.00.00" headerRevision="01.00.00"/>
37+
<compas:ICDHeader IEDType="SCU" ICDSystemVersionUUID="b4f8089e-4170-47f1-b6ad-dd1f50885518"
38+
IEDSystemVersioninstance="1" IEDSubstationinstance="1" VendorName="RTE" IEDredundancy="A"
39+
IEDmodel="ICDfromModeling" hwRev="01.00.00" swRev="01.00.00"
40+
headerId="f8dbc8c1-2db7-4652-a9d6-0b414bdeccfa" headerVersion="01.00.00"
41+
headerRevision="01.00.00"/>
3842
</Private>
3943
<Services nameLength="64">
4044
<ConfLNs fixPrefix="true" fixLnInst="true"/>

‎sct-app/src/test/resources/std_2.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,11 @@
3434
<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001"/>
3535
</Private>
3636
<Private type="COMPAS-ICDHeader">
37-
<compas:ICDHeader IEDType="PDB" ICDSystemVersionUUID="ad27d262-7c90-46df-b480-68088f9fe8a4" VendorName="RTE" IEDredundancy="A" IEDmodel="ICDfromModeling" hwRev="01.00.00" swRev="01.00.00" headerId="6b4d51eb-c391-4eef-b118-f516bc09f20c" headerVersion="01.00.00" headerRevision="01.00.00"/>
37+
<compas:ICDHeader IEDType="PDB" ICDSystemVersionUUID="ad27d262-7c90-46df-b480-68088f9fe8a4"
38+
IEDSubstationinstance="1" IEDSystemVersioninstance="1" VendorName="RTE" IEDredundancy="A"
39+
IEDmodel="ICDfromModeling" hwRev="01.00.00" swRev="01.00.00"
40+
headerId="6b4d51eb-c391-4eef-b118-f516bc09f20c" headerVersion="01.00.00"
41+
headerRevision="01.00.00"/>
3842
</Private>
3943
<Services nameLength="64">
4044
<ConfLNs fixPrefix="true" fixLnInst="true"/>

‎sct-app/src/test/resources/std_3.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,11 @@
3434
<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001"/>
3535
</Private>
3636
<Private type="COMPAS-ICDHeader">
37-
<compas:ICDHeader IEDType="BCU" ICDSystemVersionUUID="ed36220c-5577-4f0c-aaef-c6efa9f7d7c8" VendorName="RTE" IEDredundancy="A" IEDmodel="ICDfromModeling" hwRev="01.00.00" swRev="01.00.00" headerId="9aea4c6f-7ab8-4341-8d84-14c17d73a57d" headerVersion="01.00.00" headerRevision="01.00.00"/>
37+
<compas:ICDHeader IEDType="BCU" ICDSystemVersionUUID="ed36220c-5577-4f0c-aaef-c6efa9f7d7c8"
38+
IEDSubstationinstance="1" IEDSystemVersioninstance="1" VendorName="RTE" IEDredundancy="A"
39+
IEDmodel="ICDfromModeling" hwRev="01.00.00" swRev="01.00.00"
40+
headerId="9aea4c6f-7ab8-4341-8d84-14c17d73a57d" headerVersion="01.00.00"
41+
headerRevision="01.00.00"/>
3842
</Private>
3943
<Services nameLength="64">
4044
<ConfLNs fixPrefix="true" fixLnInst="true"/>

‎sct-commons/src/test/resources/scd-extref-create-dataset-and-controlblocks/scd_create_controlblock_network_configuration.xml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,14 @@
1212
</Communication>
1313
<IED name="IED_NAME1">
1414
<Private type="COMPAS-ICDHeader">
15-
<compas:ICDHeader ICDSystemVersionUUID="System_Version_IED_NAME1" IEDType="BCU" IEDSubstationinstance="11" IEDName="IED_NAME1" VendorName="SCLE SFE" IEDmodel="ARKENS-SV1120-HGAAA-EB5" IEDredundancy="A" BayLabel="3THEIX2" hwRev="0.0.2." swRev="1.0a" headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
15+
<compas:ICDHeader ICDSystemVersionUUID="System_Version_IED_NAME1" IEDType="BCU" IEDSubstationinstance="11"
16+
IEDSystemVersioninstance="1" IEDName="IED_NAME1" VendorName="SCLE SFE"
17+
IEDmodel="ARKENS-SV1120-HGAAA-EB5" IEDredundancy="A" BayLabel="3THEIX2" hwRev="0.0.2."
18+
swRev="1.0a" headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a"
19+
headerRevision="412995"/>
1620
</Private>
1721
<Private type="COMPAS-Bay">
18-
<compas:Bay UUID="UuidBay1"/>
22+
<compas:Bay UUID="UuidBay1" BayCodif="CB00001101" NumBay="1" BayCount="1" MainShortLabel="aa"/>
1923
</Private>
2024
<AccessPoint name="AP_NAME">
2125
<Server>
@@ -56,7 +60,7 @@
5660
<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001"/>
5761
</Private>
5862
<Private type="COMPAS-Bay">
59-
<compas:Bay UUID="UuidBay1"/>
63+
<compas:Bay UUID="UuidBay1" BayCodif="CB00001101" NumBay="1" BayCount="1" MainShortLabel="aa"/>
6064
</Private>
6165
<AccessPoint name="AP_NAME">
6266
<Server>
@@ -109,7 +113,7 @@
109113
<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001"/>
110114
</Private>
111115
<Private type="COMPAS-Bay">
112-
<compas:Bay UUID="UuidBay2"/>
116+
<compas:Bay UUID="UuidBay2" BayCodif="CB00001101" NumBay="1" BayCount="1" MainShortLabel="aa"/>
113117
</Private>
114118
<AccessPoint name="AP_NAME">
115119
<Server>

‎sct-commons/src/test/resources/scd-extref-create-dataset-and-controlblocks/scd_create_dataset_and_controlblocks_extref_errors.xml‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,13 @@
77
<Header id="hId" version="2007" revision="B" toolID="COMPAS"/>
88
<IED name="IED_NAME1">
99
<Private type="COMPAS-ICDHeader">
10-
<compas:ICDHeader IEDType="BCU" IEDSubstationinstance="11" BayLabel="3THEIX2" IEDName="IED_NAME1" ICDSystemVersionUUID="System_Version_IED_NAME1" VendorName="SCLE SFE" IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a" headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
10+
<compas:ICDHeader IEDType="BCU" IEDSubstationinstance="11" IEDSystemVersioninstance="1" BayLabel="3THEIX2"
11+
IEDName="IED_NAME1" ICDSystemVersionUUID="System_Version_IED_NAME1" VendorName="SCLE SFE"
12+
IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a"
13+
headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
1114
</Private>
1215
<Private type="COMPAS-Bay">
13-
<compas:Bay UUID="UuidBay1"/>
16+
<compas:Bay UUID="UuidBay1" BayCodif="CB00001101" NumBay="1" BayCount="1" MainShortLabel="aa"/>
1417
</Private>
1518
<AccessPoint name="AP_NAME">
1619
<Server>
@@ -39,10 +42,13 @@
3942
</IED>
4043
<IED name="IED_NAME2">
4144
<Private type="COMPAS-ICDHeader">
42-
<compas:ICDHeader IEDType="BCU" IEDSubstationinstance="22" BayLabel="3THEIX2" IEDName="IED_NAME2" ICDSystemVersionUUID="System_Version_IED_NAME2" VendorName="SCLE SFE" IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a" headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
45+
<compas:ICDHeader IEDType="BCU" IEDSubstationinstance="22" IEDSystemVersioninstance="1" BayLabel="3THEIX2"
46+
IEDName="IED_NAME2" ICDSystemVersionUUID="System_Version_IED_NAME2" VendorName="SCLE SFE"
47+
IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a"
48+
headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
4349
</Private>
4450
<Private type="COMPAS-Bay">
45-
<compas:Bay UUID="UuidBay1"/>
51+
<compas:Bay UUID="UuidBay1" BayCodif="CB00001101" NumBay="1" BayCount="1" MainShortLabel="aa"/>
4652
</Private>
4753
<AccessPoint name="AP_NAME">
4854
<Server>

‎sct-commons/src/test/resources/scd-extref-create-dataset-and-controlblocks/scd_create_dataset_and_controlblocks_ied_errors.xml‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@
88
<!-- target IED (IED_NAME1) is missing compas:Bay@UUID -->
99
<IED name="IED_NAME1">
1010
<Private type="COMPAS-ICDHeader">
11-
<compas:ICDHeader IEDType="BCU" IEDSubstationinstance="11" BayLabel="3THEIX2" IEDName="IED_NAME1" ICDSystemVersionUUID="System_Version_IED_NAME1" VendorName="SCLE SFE" IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a" headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
11+
<compas:ICDHeader IEDType="BCU" IEDSubstationinstance="11" IEDSystemVersioninstance="1" BayLabel="3THEIX2"
12+
IEDName="IED_NAME1" ICDSystemVersionUUID="System_Version_IED_NAME1" VendorName="SCLE SFE"
13+
IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a"
14+
headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
1215
</Private>
1316
<AccessPoint name="AP_NAME">
1417
<Server>
@@ -33,10 +36,13 @@
3336
</IED>
3437
<IED name="IED_NAME2">
3538
<Private type="COMPAS-ICDHeader">
36-
<compas:ICDHeader IEDType="BCU" IEDSubstationinstance="22" BayLabel="3THEIX2" IEDName="IED_NAME2" ICDSystemVersionUUID="System_Version_IED_NAME2" VendorName="SCLE SFE" IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a" headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
39+
<compas:ICDHeader IEDType="BCU" IEDSubstationinstance="22" IEDSystemVersioninstance="1" BayLabel="3THEIX2"
40+
IEDName="IED_NAME2" ICDSystemVersionUUID="System_Version_IED_NAME2" VendorName="SCLE SFE"
41+
IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a"
42+
headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
3743
</Private>
3844
<Private type="COMPAS-Bay">
39-
<compas:Bay UUID="UuidBay1"/>
45+
<compas:Bay UUID="UuidBay1" BayCodif="CB00001101" NumBay="1" BayCount="1" MainShortLabel="aa"/>
4046
</Private>
4147
<AccessPoint name="AP_NAME">
4248
<Server>
@@ -57,10 +63,13 @@
5763
<!-- source IED (IED_NAME4) missing compas:Bay@UUID -->
5864
<IED name="IED_NAME3">
5965
<Private type="COMPAS-ICDHeader">
60-
<compas:ICDHeader IEDType="BCU" IEDSubstationinstance="11" BayLabel="3THEIX2" IEDName="IED_NAME3" ICDSystemVersionUUID="System_Version_IED_NAME3" VendorName="SCLE SFE" IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a" headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
66+
<compas:ICDHeader IEDType="BCU" IEDSubstationinstance="11" IEDSystemVersioninstance="1" BayLabel="3THEIX2"
67+
IEDName="IED_NAME3" ICDSystemVersionUUID="System_Version_IED_NAME3" VendorName="SCLE SFE"
68+
IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a"
69+
headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
6170
</Private>
6271
<Private type="COMPAS-Bay">
63-
<compas:Bay UUID="UuidBay1"/>
72+
<compas:Bay UUID="UuidBay1" BayCodif="CB00001101" NumBay="1" BayCount="1" MainShortLabel="aa"/>
6473
</Private>
6574
<AccessPoint name="AP_NAME">
6675
<Server>
@@ -85,7 +94,10 @@
8594
</IED>
8695
<IED name="IED_NAME4">
8796
<Private type="COMPAS-ICDHeader">
88-
<compas:ICDHeader IEDType="BCU" IEDSubstationinstance="22" BayLabel="3THEIX2" IEDName="IED_NAME4" ICDSystemVersionUUID="System_Version_IED_NAME4" VendorName="SCLE SFE" IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a" headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
97+
<compas:ICDHeader IEDType="BCU" IEDSubstationinstance="22" IEDSystemVersioninstance="1" BayLabel="3THEIX2"
98+
IEDName="IED_NAME4" ICDSystemVersionUUID="System_Version_IED_NAME4" VendorName="SCLE SFE"
99+
IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a"
100+
headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
89101
</Private>
90102
<AccessPoint name="AP_NAME">
91103
<Server>

‎sct-commons/src/test/resources/scd-extref-create-dataset-and-controlblocks/scd_create_dataset_and_controlblocks_success.xml‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,13 @@
77
<Header id="hId" version="2007" revision="B" toolID="COMPAS"/>
88
<IED name="IED_NAME1">
99
<Private type="COMPAS-ICDHeader">
10-
<compas:ICDHeader IEDType="BCU" IEDSubstationinstance="11" BayLabel="3THEIX2" IEDName="IED_NAME1" ICDSystemVersionUUID="System_Version_IED_NAME1" VendorName="SCLE SFE" IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a" headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
10+
<compas:ICDHeader IEDType="BCU" IEDSubstationinstance="11" IEDSystemVersioninstance="1" BayLabel="3THEIX2"
11+
IEDName="IED_NAME1" ICDSystemVersionUUID="System_Version_IED_NAME1" VendorName="SCLE SFE"
12+
IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a"
13+
headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
1114
</Private>
1215
<Private type="COMPAS-Bay">
13-
<compas:Bay UUID="UuidBay1"/>
16+
<compas:Bay UUID="UuidBay1" BayCodif="CB00001101" NumBay="1" BayCount="1" MainShortLabel="aa"/>
1417
</Private>
1518
<AccessPoint name="AP_NAME">
1619
<Server>
@@ -91,10 +94,13 @@
9194
</IED>
9295
<IED name="IED_NAME2">
9396
<Private type="COMPAS-ICDHeader">
94-
<compas:ICDHeader IEDType="BCU" IEDSubstationinstance="22" BayLabel="3THEIX2" IEDName="IED_NAME2" ICDSystemVersionUUID="System_Version_IED_NAME2" VendorName="SCLE SFE" IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a" headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
97+
<compas:ICDHeader IEDType="BCU" IEDSubstationinstance="22" IEDSystemVersioninstance="1" BayLabel="3THEIX2"
98+
IEDName="IED_NAME2" ICDSystemVersionUUID="System_Version_IED_NAME2" VendorName="SCLE SFE"
99+
IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a"
100+
headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
95101
</Private>
96102
<Private type="COMPAS-Bay">
97-
<compas:Bay UUID="UuidBay1"/>
103+
<compas:Bay UUID="UuidBay1" BayCodif="CB00001101" NumBay="1" BayCount="1" MainShortLabel="aa"/>
98104
</Private>
99105
<AccessPoint name="AP_NAME">
100106
<Server>
@@ -122,10 +128,13 @@
122128
</IED>
123129
<IED name="IED_NAME3">
124130
<Private type="COMPAS-ICDHeader">
125-
<compas:ICDHeader IEDType="BCU" IEDSubstationinstance="22" BayLabel="3THEIX2" IEDName="IED_NAME3" ICDSystemVersionUUID="System_Version_IED_NAME3" VendorName="SCLE SFE" IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a" headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
131+
<compas:ICDHeader IEDType="BCU" IEDSubstationinstance="22" IEDSystemVersioninstance="1" BayLabel="3THEIX2"
132+
IEDName="IED_NAME3" ICDSystemVersionUUID="System_Version_IED_NAME3" VendorName="SCLE SFE"
133+
IEDredundancy="A" IEDmodel="ARKENS-SV1120-HGAAA-EB5" hwRev="0.0.2." swRev="1.0a"
134+
headerId="ARKENS-SV1120-HGAAA-EB5_SCU" headerVersion="1.2a" headerRevision="412995"/>
126135
</Private>
127136
<Private type="COMPAS-Bay">
128-
<compas:Bay UUID="UuidBay2"/>
137+
<compas:Bay UUID="UuidBay2" BayCodif="CB00001101" NumBay="1" BayCount="1" MainShortLabel="aa"/>
129138
</Private>
130139
<AccessPoint name="AP_NAME">
131140
<Server>

0 commit comments

Comments
 (0)