Skip to content

Commit e8b19b1

Browse files
massifbenmassifben
authored
Merge pull request #254 from com-pas/253-rsr-678-update-xsd-file
feat(#253): RSR-678 Update compas-core to 0.13.0 to use latest Compas XSD
2 parents 26564f3 + d39f8f0 commit e8b19b1

30 files changed

+88
-87
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<sonar.coverage.exclusions>sct-coverage/**</sonar.coverage.exclusions>
3838
<aggregate.report.dir>../sct-coverage/target/site/jacoco-aggregate/jacoco.xml</aggregate.report.dir>
3939
<sonar.coverage.jacoco.xmlReportPaths>${basedir}/${aggregate.report.dir}</sonar.coverage.jacoco.xmlReportPaths>
40-
<compas-core.version>0.12.0</compas-core.version>
40+
<compas-core.version>0.13.0</compas-core.version>
4141
<compas-scl-xsd.version>0.0.4</compas-scl-xsd.version>
4242
<maven.plugin.javadoc>3.4.1</maven.plugin.javadoc>
4343
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>

‎sct-commons/src/test/java/org/lfenergy/compas/sct/commons/scl/PrivateServiceTest.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import java.lang.reflect.Constructor;
1818
import java.lang.reflect.InvocationTargetException;
1919
import java.lang.reflect.Method;
20+
import java.math.BigInteger;
2021
import java.util.*;
2122
import java.util.stream.Stream;
2223

@@ -479,7 +480,7 @@ void comparePrivateCompasICDHeaders_should_return_true_equality_not_check_for_IE
479480
TCompasICDHeader compasICDHeader1 = new TCompasICDHeader();
480481
compasICDHeader1.setIEDName("IED-1");
481482
compasICDHeader1.setBayLabel("BAY-1");
482-
compasICDHeader1.setIEDinstance("1");
483+
compasICDHeader1.setIEDSubstationinstance(BigInteger.ONE);
483484
TCompasICDHeader compasICDHeader2 = new TCompasICDHeader();
484485
TPrivate tPrivate1 = PrivateService.createPrivate(compasICDHeader1);
485486
TPrivate tPrivate2 = PrivateService.createPrivate(compasICDHeader2);
@@ -496,7 +497,7 @@ void comparePrivateCompasICDHeaders_should_return_false_equality_not_check_for_I
496497
TCompasICDHeader compasICDHeader1 = new TCompasICDHeader();
497498
compasICDHeader1.setIEDName("IED-1");
498499
compasICDHeader1.setBayLabel("BAY-1");
499-
compasICDHeader1.setIEDinstance("1");
500+
compasICDHeader1.setIEDSubstationinstance(BigInteger.ONE);
500501
compasICDHeader1.setICDSystemVersionUUID("UUID-1");
501502
TCompasICDHeader compasICDHeader2 = new TCompasICDHeader();
502503
compasICDHeader2.setICDSystemVersionUUID("UUID-2");
@@ -515,7 +516,7 @@ void comparePrivateCompasICDHeaders_should_return_true() {
515516
TCompasICDHeader compasICDHeader1 = new TCompasICDHeader();
516517
compasICDHeader1.setIEDName("IED-1");
517518
compasICDHeader1.setBayLabel("BAY-1");
518-
compasICDHeader1.setIEDinstance("1");
519+
compasICDHeader1.setIEDSubstationinstance(BigInteger.ONE);
519520
compasICDHeader1.setICDSystemVersionUUID("UUID-1");
520521
TCompasICDHeader compasICDHeader2 = new TCompasICDHeader();
521522
compasICDHeader2.setICDSystemVersionUUID("UUID-1");
@@ -537,17 +538,17 @@ void copyCompasICDHeaderFromLNodePrivateIntoSTDPrivate() {
537538
lNodeCompasICDHeader.setICDSystemVersionUUID("UUID-2");
538539
lNodeCompasICDHeader.setIEDName("IED-1");
539540
lNodeCompasICDHeader.setBayLabel("BAY-1");
540-
lNodeCompasICDHeader.setIEDinstance("1");
541+
lNodeCompasICDHeader.setIEDSubstationinstance(BigInteger.ONE);
541542
TPrivate stdTPrivate = PrivateService.createPrivate(stdCompasICDHeader);
542543
TPrivate lNodePrivate = PrivateService.createPrivate(lNodeCompasICDHeader);
544+
assertThat(stdTPrivate).isNotEqualTo(lNodePrivate);
543545

544546
// When
545-
assertThat(stdTPrivate).isNotEqualTo(lNodePrivate);
546547
PrivateService.copyCompasICDHeaderFromLNodePrivateIntoSTDPrivate(stdTPrivate,lNodePrivate);
547548
// Then
548549
TCompasICDHeader result = PrivateService.extractCompasICDHeader(stdTPrivate).get();
549550
assertThat(result).extracting(TCompasICDHeader::getICDSystemVersionUUID, TCompasICDHeader::getIEDName,
550-
TCompasICDHeader::getIEDinstance, TCompasICDHeader::getBayLabel)
551-
.containsExactlyInAnyOrder("UUID-2", "IED-1", "1", "BAY-1");
551+
TCompasICDHeader::getIEDSubstationinstance, TCompasICDHeader::getBayLabel)
552+
.containsExactlyInAnyOrder("UUID-2", "IED-1", BigInteger.ONE, "BAY-1");
552553
}
553554
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</Communication>
1313
<IED name="IED_NAME1">
1414
<Private type="COMPAS-ICDHeader">
15-
<compas:ICDHeader ICDSystemVersionUUID="System_Version_IED_NAME1" IEDType="BCU" IEDinstance="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" 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"/>
1616
</Private>
1717
<Private type="COMPAS-Bay">
1818
<compas:Bay UUID="UuidBay1"/>
@@ -50,7 +50,7 @@
5050
</IED>
5151
<IED name="IED_NAME2">
5252
<Private type="COMPAS-ICDHeader">
53-
<compas:ICDHeader ICDSystemVersionUUID="System_Version_IED_NAME2" IEDType="BCU" IEDinstance="22" IEDName="IED_NAME2" 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"/>
53+
<compas:ICDHeader ICDSystemVersionUUID="System_Version_IED_NAME2" IEDType="BCU" IEDSubstationinstance="22" IEDName="IED_NAME2" 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"/>
5454
</Private>
5555
<Private type="COMPAS-SystemVersion">
5656
<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001"/>
@@ -103,7 +103,7 @@
103103
</IED>
104104
<IED name="IED_NAME3">
105105
<Private type="COMPAS-ICDHeader">
106-
<compas:ICDHeader ICDSystemVersionUUID="System_Version_IED_NAME3" IEDType="BCU" IEDinstance="22" IEDName="IED_NAME3" 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"/>
106+
<compas:ICDHeader ICDSystemVersionUUID="System_Version_IED_NAME3" IEDType="BCU" IEDSubstationinstance="22" IEDName="IED_NAME3" 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"/>
107107
</Private>
108108
<Private type="COMPAS-SystemVersion">
109109
<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
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" IEDinstance="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" 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"/>
1111
</Private>
1212
<Private type="COMPAS-Bay">
1313
<compas:Bay UUID="UuidBay1"/>
@@ -39,7 +39,7 @@
3939
</IED>
4040
<IED name="IED_NAME2">
4141
<Private type="COMPAS-ICDHeader">
42-
<compas:ICDHeader IEDType="BCU" IEDinstance="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"/>
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"/>
4343
</Private>
4444
<Private type="COMPAS-Bay">
4545
<compas:Bay UUID="UuidBay1"/>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
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" IEDinstance="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" 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"/>
1212
</Private>
1313
<AccessPoint name="AP_NAME">
1414
<Server>
@@ -33,7 +33,7 @@
3333
</IED>
3434
<IED name="IED_NAME2">
3535
<Private type="COMPAS-ICDHeader">
36-
<compas:ICDHeader IEDType="BCU" IEDinstance="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"/>
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"/>
3737
</Private>
3838
<Private type="COMPAS-Bay">
3939
<compas:Bay UUID="UuidBay1"/>
@@ -57,7 +57,7 @@
5757
<!-- source IED (IED_NAME4) missing compas:Bay@UUID -->
5858
<IED name="IED_NAME3">
5959
<Private type="COMPAS-ICDHeader">
60-
<compas:ICDHeader IEDType="BCU" IEDinstance="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"/>
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"/>
6161
</Private>
6262
<Private type="COMPAS-Bay">
6363
<compas:Bay UUID="UuidBay1"/>
@@ -85,7 +85,7 @@
8585
</IED>
8686
<IED name="IED_NAME4">
8787
<Private type="COMPAS-ICDHeader">
88-
<compas:ICDHeader IEDType="BCU" IEDinstance="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"/>
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"/>
8989
</Private>
9090
<AccessPoint name="AP_NAME">
9191
<Server>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
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" IEDinstance="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" 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"/>
1111
</Private>
1212
<Private type="COMPAS-Bay">
1313
<compas:Bay UUID="UuidBay1"/>
@@ -91,7 +91,7 @@
9191
</IED>
9292
<IED name="IED_NAME2">
9393
<Private type="COMPAS-ICDHeader">
94-
<compas:ICDHeader IEDType="BCU" IEDinstance="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"/>
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"/>
9595
</Private>
9696
<Private type="COMPAS-Bay">
9797
<compas:Bay UUID="UuidBay1"/>
@@ -122,7 +122,7 @@
122122
</IED>
123123
<IED name="IED_NAME3">
124124
<Private type="COMPAS-ICDHeader">
125-
<compas:ICDHeader IEDType="BCU" IEDinstance="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"/>
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"/>
126126
</Private>
127127
<Private type="COMPAS-Bay">
128128
<compas:Bay UUID="UuidBay2"/>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
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" IEDinstance="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" 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"/>
1111
</Private>
1212
<Private type="COMPAS-Bay">
1313
<compas:Bay UUID="UuidBay1"/>
@@ -41,7 +41,7 @@
4141
</IED>
4242
<IED name="IED_NAME2">
4343
<Private type="COMPAS-ICDHeader">
44-
<compas:ICDHeader IEDType="BCU" IEDinstance="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"/>
44+
<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"/>
4545
</Private>
4646
<Private type="COMPAS-Bay">
4747
<compas:Bay UUID="UuidBay1"/>
@@ -75,7 +75,7 @@
7575
</IED>
7676
<IED name="IED_NAME3">
7777
<Private type="COMPAS-ICDHeader">
78-
<compas:ICDHeader IEDType="BCU" IEDinstance="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"/>
78+
<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"/>
7979
</Private>
8080
<Private type="COMPAS-Bay">
8181
<compas:Bay UUID="UuidBay1"/>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
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" IEDinstance="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" 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"/>
1111
</Private>
1212
<Private type="COMPAS-Bay">
1313
<compas:Bay UUID="UuidBay1"/>
@@ -41,7 +41,7 @@
4141
</IED>
4242
<IED name="IED_NAME2">
4343
<Private type="COMPAS-ICDHeader">
44-
<compas:ICDHeader IEDType="BCU" IEDinstance="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"/>
44+
<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"/>
4545
</Private>
4646
<Private type="COMPAS-Bay">
4747
<compas:Bay UUID="UuidBay1"/>
@@ -75,7 +75,7 @@
7575
</IED>
7676
<IED name="IED_NAME3">
7777
<Private type="COMPAS-ICDHeader">
78-
<compas:ICDHeader IEDType="BCU" IEDinstance="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"/>
78+
<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"/>
7979
</Private>
8080
<Private type="COMPAS-Bay">
8181
<compas:Bay UUID="UuidBay1"/>

0 commit comments

Comments
 (0)