Skip to content

Commit 8dc94ba

Browse files
committed
feat(#595): change IEDType to string
Signed-off-by: ecoquilleau <234364519+ecoquilleau@users.noreply.github.com>
1 parent c85edb0 commit 8dc94ba

3 files changed

Lines changed: 4 additions & 49 deletions

File tree

sct-commons/src/main/java/org/lfenergy/compas/sct/commons/ControlBlockEditorService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ public CriteriaOrError getCriteria(TIED tied, TCBType cbType, String cbName) {
395395
return new CriteriaOrError(
396396
new Criteria(cbType,
397397
systemVersionWithoutV,
398-
TIEDType.fromValue(compasICDHeader.get().getIEDType()),
398+
compasICDHeader.get().getIEDType(),
399399
TIEDRedundancy.fromValue(compasICDHeader.get().getIEDredundancy().value()),
400400
compasICDHeader.get().getIEDSystemVersioninstance(),
401401
bayIntOrExt), null);
@@ -504,7 +504,7 @@ private TDurationInMilliSec toDurationInMilliSec(String strDuration) {
504504
/**
505505
* Key to search for a control block communication setting
506506
*/
507-
public record Criteria(TCBType cbType, String systemVersionWithoutV, TIEDType iedType, TIEDRedundancy iedRedundancy, BigInteger iedSystemVersionInstance, TBayIntOrExt bayIntOrExt) {
507+
public record Criteria(TCBType cbType, String systemVersionWithoutV, String iedType, TIEDRedundancy iedRedundancy, BigInteger iedSystemVersionInstance, TBayIntOrExt bayIntOrExt) {
508508
}
509509

510510
/**

sct-commons/src/main/resources/xsd/GSE_SMV_CB_COM.xsd

Lines changed: 1 addition & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<xs:attribute name="CBType" type="tCBType" use="required"/>
5858
<xs:attribute name="XY" type="xs:string" use="required"/>
5959
<xs:attribute name="ZW" type="xs:string" use="required"/>
60-
<xs:attribute name="IEDType" type="tIEDType" use="required"/>
60+
<xs:attribute name="IEDType" type="xs:string" use="required"/>
6161
<xs:attribute name="IEDRedundancy" type="tIEDRedundancy" use="required"/>
6262
<xs:attribute name="IEDSystemVersionInstance" type="xs:string" use="required"/>
6363
<xs:attribute name="BayIntOrExt" type="tBayIntOrExt" use="required"/>
@@ -114,49 +114,4 @@
114114
</xs:complexType>
115115
</xs:element>
116116

117-
<xs:simpleType name="tIEDType">
118-
<xs:annotation>
119-
<xs:documentation xml:lang="en">
120-
IED type to be used to identity the set of LDevice.inst handled by the IED
121-
</xs:documentation>
122-
</xs:annotation>
123-
<xs:restriction base="xs:string">
124-
<xs:enumeration value="SCU"/>
125-
<xs:enumeration value="SCU-MCB"/>
126-
<xs:enumeration value="SCU-TG"/>
127-
<xs:enumeration value="SCU-ORG"/>
128-
<xs:enumeration value="STD"/>
129-
<xs:enumeration value="BCU"/>
130-
<xs:enumeration value="BCU-LIGNE"/>
131-
<xs:enumeration value="BCU-CBO"/>
132-
<xs:enumeration value="BPU"/>
133-
<xs:enumeration value="MU"/>
134-
<xs:enumeration value="SAMU"/>
135-
<xs:enumeration value="PROT"/>
136-
<xs:enumeration value="TAC"/>
137-
<xs:enumeration value="PX"/>
138-
<xs:enumeration value="PDIS"/>
139-
<xs:enumeration value="PDB"/>
140-
<xs:enumeration value="AUT"/>
141-
<xs:enumeration value="PDIF"/>
142-
<xs:enumeration value="GRP"/>
143-
<xs:enumeration value="GRPR"/>
144-
<xs:enumeration value="ASLD"/>
145-
<xs:enumeration value="GW"/>
146-
<xs:enumeration value="TG"/>
147-
<xs:enumeration value="TOPO"/>
148-
<xs:enumeration value="SWC"/>
149-
<xs:enumeration value="SWT"/>
150-
<xs:enumeration value="SW"/>
151-
<xs:enumeration value="OUT"/>
152-
<xs:enumeration value="CLUS"/>
153-
<xs:enumeration value="VIRT"/>
154-
<xs:enumeration value="ICT"/>
155-
<xs:enumeration value="SYN"/>
156-
<xs:enumeration value="OND"/>
157-
<xs:enumeration value="ADEFINIR"/>
158-
<xs:enumeration value="IEDTEST"/>
159-
</xs:restriction>
160-
</xs:simpleType>
161-
162117
</xs:schema>

sct-commons/src/test/java/org/lfenergy/compas/sct/commons/ControlBlockEditorServiceTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -916,7 +916,7 @@ private static TVlan newVlan(TCBType tcbType, TBayIntOrExt tBayIntOrExt, String
916916
gseVlan.setCBType(tcbType);
917917
gseVlan.setXY("01.00");
918918
gseVlan.setZW("009.001");
919-
gseVlan.setIEDType(TIEDType.BCU);
919+
gseVlan.setIEDType("BCU");
920920
gseVlan.setIEDRedundancy(TIEDRedundancy.A);
921921
gseVlan.setIEDSystemVersionInstance("1");
922922
gseVlan.setBayIntOrExt(tBayIntOrExt);

0 commit comments

Comments
 (0)