Skip to content

Update Docker Image for OpenSCD + Added Robot Test for XSD Validation #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 5, 2022
Merged

Update Docker Image for OpenSCD + Added Robot Test for XSD Validation #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
26a74f1
Updated OpenSCD version.
Apr 4, 2022
afd4aec
Updated OpenSCD version.
Apr 4, 2022
ac4ec46
Added Robot Integration Test for XSD Validation.
Apr 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions RELEASE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ For information about CoMPAS go to this [site](https://com-pas.github.io/).

## Release notes

### Release 0.7.0

Next release for testing the CoMPAS System with all components.
- [OpenSCD CoMPAS Edition](https://github.com/com-pas/compas-open-scd) (Version 0.13.0.0):
- Small fixes and improvements in editors and wizards;

### Release 0.6.0

Next release for testing the CoMPAS System with all components.
Expand Down
2 changes: 1 addition & 1 deletion compas/docker-compose-basex.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ services:
open-scd:
labels:
compas: true
image: "lfenergy/compas-open-scd:v0.12.0.2"
image: "lfenergy/compas-open-scd:v0.13.0.0"
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost/"]
interval: 30s
Expand Down
2 changes: 1 addition & 1 deletion compas/docker-compose-postgresql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ services:
open-scd:
labels:
compas: true
image: "lfenergy/compas-open-scd:v0.12.0.2"
image: "lfenergy/compas-open-scd:v0.13.0.0"
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost/"]
interval: 30s
Expand Down
21 changes: 18 additions & 3 deletions integration-testing/TestSuite005-validator.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,21 @@ TestCase005-01
Execute SCL Validator

Open Menu View diagnostics
Get Text mwc-dialog#diagnostic mwc-list-item:nth-child(4) == Validate using OCL
Get Attribute mwc-dialog#diagnostic abbr:nth-child(6) title *= [SCD File] DataTypeTemplates section is mandatory (line 1)
Get Element Count mwc-dialog#diagnostic abbr == 333
Get Text mwc-dialog#diagnostic > filtered-list > mwc-list-item:nth-child(4) == Validate using OCL
Get Attribute mwc-dialog#diagnostic > filtered-list > abbr:nth-child(6) title *= [SCD File] DataTypeTemplates section is mandatory (line 1)
Get Element Count mwc-dialog#diagnostic > filtered-list > abbr == 332

TestCase005-02
[Documentation] Execute the SCL Validator for XSD Errors.
Set Test Variable ${sclname} XsdValidationErrors
Set Test Variable ${scltype} SCD

Open Menu Open project
Open local file ${sclname} ${scltype}

Execute SCL Validator

Open Menu View diagnostics
Get Text mwc-dialog#diagnostic > filtered-list > mwc-list-item:nth-child(12) == Validate using OCL
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'.
Get Element Count mwc-dialog#diagnostic > filtered-list > abbr == 11
98 changes: 98 additions & 0 deletions integration-testing/test-files/XsdValidationErrors.scd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- SPDX-FileCopyrightText: 2020 RTE FRANCE -->
<!-- -->
<!-- SPDX-License-Identifier: Apache-2.0 -->

<SCL xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.iec.ch/61850/2003/SCL" version="2007" revision="B" release="4">
<Header id="f9283708-bf4f-412c-a1d6-f947b9ac3000" version="1.0.0" revision="Revision" toolID="toolID" nameStructure="IEDName"/>
<IED name="IED_NAME">
<AccessPoint name="AP_NAME">
<Server>
<Authentication/>
<LDevice inst="LDPO">
<LN0 lnType="LN2" lnClass="LLN0" inst="">
<Inputs>
<ExtRef intAddr="INTADDR" pDO="DO1" desc="DESC1"/>
<ExtRef intAddr="INTADDR" pDO="DO2" desc="DESC2"/>
</Inputs>
</LN0>
<LN lnType="LN1" lnClass="PIOC" inst="1">
<Inputs>
<ExtRef intAddr="INTADDR" pDO="DO1" desc="DESC1"/>
<ExtRef intAddr="INTADDR" pDO="DO2" desc="DESC2"/>
</Inputs>
</LN>
<LN lnType="LN1" lnClass="PIOC" inst="2">
<Inputs>
<ExtRef intAddr="INTADDR" pDO="DO1" desc="DESC1"/>
<ExtRef intAddr="INTADDR" pDO="DO2" desc="DESC2"/>
</Inputs>
</LN>
</LDevice>
</Server>
</AccessPoint>
</IED>
<DataTypeTemplates>
<LNodeType lnClass="LLN0" id="LN2">
<DO name="Beh" transient="false"/>
<DO name="FACntRs" type="DO2" transient="true"/>
<DO name="StrVal" type="DO3" transient="false"/>
</LNodeType>
<LNodeType lnClass="PIOC" id="LN1">
<DO name="Beh" type="DO1" transient="false"/>
<DO type="DO2" transient="true"/>
<DO name="StrVal" type="DO3" transient="false"/>
</LNodeType>
<DOType cdc="WYE" id="DO1">
<DA fc="DC" dchg="false" qchg="false" dupd="false" name="dataNs" bType="VisString255">
<Val>IEC 61850-7-3:2007B</Val>
</DA>
<DA fc="CF" dchg="true" qchg="false" dupd="false" name="smpRate" bType="INT32U"/>
</DOType>
<DOType cdc="WYE" id="DO2">
<SDO name="phsBHar" type="DO4"/>
<DA fc="CF" dchg="true" qchg="false" dupd="true" name="angRef" bType="Enum" type="PhaseAngleReferenceKind"/>
</DOType>
<DOType cdc="WYE" id="DO3">
<SDO name="neutHar" type="DO4"/>
<DA fc="CF" dchg="true" qchg="false" dupd="false" name="smpRate" bType="INT32U"/>
<DA fc="ST" dchg="false" qchg="false" dupd="false" name="origin" bType="Struct" type="DA3"/>
</DOType>
<DOType cdc="WYE" id="DO4">
<DA fc="DC" dchg="false" qchg="false" dupd="false" name="configRev" bType="VisString255" valKind="RO" valImport="false"/>
</DOType>
<DAType id="DA1">
<BDA name="operTm" bType="Timestamp"/>
<BDA bType="Struct" type="DA3"/>
<ProtNs type="8-MMS">IEC 61850-8-1:2003</ProtNs>
</DAType>
<DAType id="DA2">
<BDA name="T" bType="Timestamp"/>
<BDA name="ctlVal" bType="Enum" type="RecCycModKind"/>
<ProtNs type="8-MMS">IEC 61850-8-1:2003</ProtNs>
</DAType>
<DAType id="DA3">
<BDA bType="Check"/>
<BDA name="Test" bType="BOOLEAN"/>
<ProtNs type="8-MMS">IEC 61850-8-1:2003</ProtNs>
</DAType>
<EnumType id="RecCycModKind">
<EnumVal ord="1">Completed</EnumVal>
<EnumVal ord="2">Cancelled</EnumVal>
<EnumVal ord="3">New adjustments</EnumVal>
<EnumVal ord="4">AnotherValue</EnumVal>
</EnumType>
<EnumType id="PhaseAngleReferenceKind">
<EnumVal ord="0">Va</EnumVal>
<EnumVal ord="1">Vb</EnumVal>
<EnumVal ord="2">Vc</EnumVal>
<EnumVal ord="3">Aa</EnumVal>
<EnumVal ord="4">Ab</EnumVal>
<EnumVal ord="5">Ac</EnumVal>
<EnumVal ord="6">Vab</EnumVal>
<EnumVal ord="7">Vbc</EnumVal>
<EnumVal ord="8">Vca</EnumVal>
<EnumVal ord="9">AnotherValue</EnumVal>
</EnumType>
</DataTypeTemplates>
</SCL>