Skip to content

Commit d167e90

Browse files
author
Rob Tjalma
authored
Merge pull request #65 from com-pas/update-docker-image-4apr
Update Docker Image for OpenSCD + Added Robot Test for XSD Validation
2 parents 379cb52 + ac4ec46 commit d167e90

File tree

5 files changed

+124
-5
lines changed

5 files changed

+124
-5
lines changed

‎RELEASE.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ For information about CoMPAS go to this [site](https://com-pas.github.io/).
1010

1111
## Release notes
1212

13+
### Release 0.7.0
14+
15+
Next release for testing the CoMPAS System with all components.
16+
- [OpenSCD CoMPAS Edition](https://github.com/com-pas/compas-open-scd) (Version 0.13.0.0):
17+
- Small fixes and improvements in editors and wizards;
18+
1319
### Release 0.6.0
1420

1521
Next release for testing the CoMPAS System with all components.

‎compas/docker-compose-basex.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ services:
138138
open-scd:
139139
labels:
140140
compas: true
141-
image: "lfenergy/compas-open-scd:v0.12.0.2"
141+
image: "lfenergy/compas-open-scd:v0.13.0.0"
142142
healthcheck:
143143
test: ["CMD", "curl", "-f", "http://localhost/"]
144144
interval: 30s

‎compas/docker-compose-postgresql.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ services:
145145
open-scd:
146146
labels:
147147
compas: true
148-
image: "lfenergy/compas-open-scd:v0.12.0.2"
148+
image: "lfenergy/compas-open-scd:v0.13.0.0"
149149
healthcheck:
150150
test: ["CMD", "curl", "-f", "http://localhost/"]
151151
interval: 30s

‎integration-testing/TestSuite005-validator.robot‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,21 @@ TestCase005-01
2727
Execute SCL Validator
2828

2929
Open Menu View diagnostics
30-
Get Text mwc-dialog#diagnostic mwc-list-item:nth-child(4) == Validate using OCL
31-
Get Attribute mwc-dialog#diagnostic abbr:nth-child(6) title *= [SCD File] DataTypeTemplates section is mandatory (line 1)
32-
Get Element Count mwc-dialog#diagnostic abbr == 333
30+
Get Text mwc-dialog#diagnostic > filtered-list > mwc-list-item:nth-child(4) == Validate using OCL
31+
Get Attribute mwc-dialog#diagnostic > filtered-list > abbr:nth-child(6) title *= [SCD File] DataTypeTemplates section is mandatory (line 1)
32+
Get Element Count mwc-dialog#diagnostic > filtered-list > abbr == 332
33+
34+
TestCase005-02
35+
[Documentation] Execute the SCL Validator for XSD Errors.
36+
Set Test Variable ${sclname} XsdValidationErrors
37+
Set Test Variable ${scltype} SCD
38+
39+
Open Menu Open project
40+
Open local file ${sclname} ${scltype}
41+
42+
Execute SCL Validator
43+
44+
Open Menu View diagnostics
45+
Get Text mwc-dialog#diagnostic > filtered-list > mwc-list-item:nth-child(12) == Validate using OCL
46+
Get Attribute mwc-dialog#diagnostic > filtered-list > abbr:nth-child(14) title *= [XSD validation] (line: 32, column: 47): cvc-complex-type.4: Attribute 'type' must appear on element 'DO'.
47+
Get Element Count mwc-dialog#diagnostic > filtered-list > abbr == 11

‎integration-testing/test-files/XsdValidationErrors.scd‎

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- SPDX-FileCopyrightText: 2020 RTE FRANCE -->
3+
<!-- -->
4+
<!-- SPDX-License-Identifier: Apache-2.0 -->
5+
6+
<SCL xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.iec.ch/61850/2003/SCL" version="2007" revision="B" release="4">
7+
<Header id="f9283708-bf4f-412c-a1d6-f947b9ac3000" version="1.0.0" revision="Revision" toolID="toolID" nameStructure="IEDName"/>
8+
<IED name="IED_NAME">
9+
<AccessPoint name="AP_NAME">
10+
<Server>
11+
<Authentication/>
12+
<LDevice inst="LDPO">
13+
<LN0 lnType="LN2" lnClass="LLN0" inst="">
14+
<Inputs>
15+
<ExtRef intAddr="INTADDR" pDO="DO1" desc="DESC1"/>
16+
<ExtRef intAddr="INTADDR" pDO="DO2" desc="DESC2"/>
17+
</Inputs>
18+
</LN0>
19+
<LN lnType="LN1" lnClass="PIOC" inst="1">
20+
<Inputs>
21+
<ExtRef intAddr="INTADDR" pDO="DO1" desc="DESC1"/>
22+
<ExtRef intAddr="INTADDR" pDO="DO2" desc="DESC2"/>
23+
</Inputs>
24+
</LN>
25+
<LN lnType="LN1" lnClass="PIOC" inst="2">
26+
<Inputs>
27+
<ExtRef intAddr="INTADDR" pDO="DO1" desc="DESC1"/>
28+
<ExtRef intAddr="INTADDR" pDO="DO2" desc="DESC2"/>
29+
</Inputs>
30+
</LN>
31+
</LDevice>
32+
</Server>
33+
</AccessPoint>
34+
</IED>
35+
<DataTypeTemplates>
36+
<LNodeType lnClass="LLN0" id="LN2">
37+
<DO name="Beh" transient="false"/>
38+
<DO name="FACntRs" type="DO2" transient="true"/>
39+
<DO name="StrVal" type="DO3" transient="false"/>
40+
</LNodeType>
41+
<LNodeType lnClass="PIOC" id="LN1">
42+
<DO name="Beh" type="DO1" transient="false"/>
43+
<DO type="DO2" transient="true"/>
44+
<DO name="StrVal" type="DO3" transient="false"/>
45+
</LNodeType>
46+
<DOType cdc="WYE" id="DO1">
47+
<DA fc="DC" dchg="false" qchg="false" dupd="false" name="dataNs" bType="VisString255">
48+
<Val>IEC 61850-7-3:2007B</Val>
49+
</DA>
50+
<DA fc="CF" dchg="true" qchg="false" dupd="false" name="smpRate" bType="INT32U"/>
51+
</DOType>
52+
<DOType cdc="WYE" id="DO2">
53+
<SDO name="phsBHar" type="DO4"/>
54+
<DA fc="CF" dchg="true" qchg="false" dupd="true" name="angRef" bType="Enum" type="PhaseAngleReferenceKind"/>
55+
</DOType>
56+
<DOType cdc="WYE" id="DO3">
57+
<SDO name="neutHar" type="DO4"/>
58+
<DA fc="CF" dchg="true" qchg="false" dupd="false" name="smpRate" bType="INT32U"/>
59+
<DA fc="ST" dchg="false" qchg="false" dupd="false" name="origin" bType="Struct" type="DA3"/>
60+
</DOType>
61+
<DOType cdc="WYE" id="DO4">
62+
<DA fc="DC" dchg="false" qchg="false" dupd="false" name="configRev" bType="VisString255" valKind="RO" valImport="false"/>
63+
</DOType>
64+
<DAType id="DA1">
65+
<BDA name="operTm" bType="Timestamp"/>
66+
<BDA bType="Struct" type="DA3"/>
67+
<ProtNs type="8-MMS">IEC 61850-8-1:2003</ProtNs>
68+
</DAType>
69+
<DAType id="DA2">
70+
<BDA name="T" bType="Timestamp"/>
71+
<BDA name="ctlVal" bType="Enum" type="RecCycModKind"/>
72+
<ProtNs type="8-MMS">IEC 61850-8-1:2003</ProtNs>
73+
</DAType>
74+
<DAType id="DA3">
75+
<BDA bType="Check"/>
76+
<BDA name="Test" bType="BOOLEAN"/>
77+
<ProtNs type="8-MMS">IEC 61850-8-1:2003</ProtNs>
78+
</DAType>
79+
<EnumType id="RecCycModKind">
80+
<EnumVal ord="1">Completed</EnumVal>
81+
<EnumVal ord="2">Cancelled</EnumVal>
82+
<EnumVal ord="3">New adjustments</EnumVal>
83+
<EnumVal ord="4">AnotherValue</EnumVal>
84+
</EnumType>
85+
<EnumType id="PhaseAngleReferenceKind">
86+
<EnumVal ord="0">Va</EnumVal>
87+
<EnumVal ord="1">Vb</EnumVal>
88+
<EnumVal ord="2">Vc</EnumVal>
89+
<EnumVal ord="3">Aa</EnumVal>
90+
<EnumVal ord="4">Ab</EnumVal>
91+
<EnumVal ord="5">Ac</EnumVal>
92+
<EnumVal ord="6">Vab</EnumVal>
93+
<EnumVal ord="7">Vbc</EnumVal>
94+
<EnumVal ord="8">Vca</EnumVal>
95+
<EnumVal ord="9">AnotherValue</EnumVal>
96+
</EnumType>
97+
</DataTypeTemplates>
98+
</SCL>

0 commit comments

Comments
 (0)