From fcae0a48af350d779f094e533109ebc55bc08bad Mon Sep 17 00:00:00 2001 From: SAINTIER FRANCOIS Date: Mon, 13 Jun 2022 10:53:36 +0200 Subject: [PATCH 1/3] Issue #142: Update SCL_CoMPAS.xsd file and its consequencies (tSclFileType type in scl-extensions.xjb file) Signed-off-by: SAINTIER FRANCOIS --- .../src/main/bindings/scl-extensions.xjb | 2 +- .../src/main/resources/xsd/SCL_CoMPAS.xsd | 175 +++++++++--------- 2 files changed, 89 insertions(+), 88 deletions(-) diff --git a/scl-extension/src/main/bindings/scl-extensions.xjb b/scl-extension/src/main/bindings/scl-extensions.xjb index 374006f3..c19ff849 100644 --- a/scl-extension/src/main/bindings/scl-extensions.xjb +++ b/scl-extension/src/main/bindings/scl-extensions.xjb @@ -8,7 +8,7 @@ SPDX-License-Identifier: Apache-2.0 xmlns:jxb="http://java.sun.com/xml/ns/jaxb" version="2.1"> - + diff --git a/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd b/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd index 42f88aba..21fe21b4 100644 --- a/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd +++ b/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd @@ -12,14 +12,15 @@ SPDX-License-Identifier: Apache-2.0 Version 1.0 Release 2021/06/16 - Version 1.1 Release 2022/01/21 + Version 1.1 Release 2022/01/21 + Version 2.1 Release 2022/06/08 - - - + Name of the SCL configuration, extension excluded @@ -29,7 +30,7 @@ SPDX-License-Identifier: Apache-2.0 - + File type of the SCL configuration file @@ -93,69 +94,68 @@ SPDX-License-Identifier: Apache-2.0 - - - - - - - + + + + + + + - + Define whether the Flow between two LDevice belonging to two ICDs with-in two System Version (identical or different) are qualified (ACTIVE), not working (INACTIVE) or untested (UNTESTED) - - - - - - + + + + + + - + Define whether the LDevice belonging to one ICD with-in one System Version are qualified (ACTIVE), not working (INACTIVE) or untested (UNTESTED) - - - - - - + + + + + + - + Define whether the IED with-in one System Version is used as NOMINAL or BACKUP IED - - - - - - - + + + + + + + - + Define whether the Flow is limited to the Bay(refering to the physical one or cubicles) to which belong the IED (BAY_INTERNAL) or only going outside the BAY (BAY_EXTERNAL) or both (BAY_INTERNAL_EXTERNAL) - - - - - - - + + + + + + @@ -164,18 +164,18 @@ SPDX-License-Identifier: Apache-2.0 The FlowStatus define whether if the flow is qualified, non qualified or untested accordingly to the source IED which is bellonging to a define SystemVersion - - - - - - - - - + + + + + + + + + - - + + Define the specific Compas attributes linked to the Bay. The Main and Second Labels are label of the bay specific to each user. MainLabel and Version identify uniquely the instanciated Bay as the UUID @@ -183,64 +183,64 @@ SPDX-License-Identifier: Apache-2.0 - - - - - - + + + + + + - - + + Define the specific busbarsection or zone of the connectivity node - + - - + + Define specific Compas attributes to identify uniquely one ICD file with-in a SystemVersion for a given IEDredundancy. The UUID of this combinaison is defined by the ICDSystemVersionUUID. This private is intended to be used in the STD file (/IED level) and SSD (/LNode level) - + - - + + - - + + - - + + Identify the SystemVersion to which the functional Bay and IED belongs to. This Private can be used in /Bay in substation and in the /IED. - + - - + + Identifies the Function from the user specific catalog of function - + @@ -250,7 +250,7 @@ SPDX-License-Identifier: Apache-2.0 - + @@ -260,17 +260,18 @@ SPDX-License-Identifier: Apache-2.0 - + - - + + - - - - - - - - + + + + + + + + + \ No newline at end of file From ae32a24c2b8088d6f65e29dba38fe54c7f977171 Mon Sep 17 00:00:00 2001 From: SAINTIER FRANCOIS Date: Tue, 14 Jun 2022 17:09:52 +0200 Subject: [PATCH 2/3] Issue #142: Second update of SCL_CoMPAS.xsd file Signed-off-by: SAINTIER FRANCOIS --- .../src/main/resources/xsd/SCL_CoMPAS.xsd | 192 ++++++++++-------- 1 file changed, 104 insertions(+), 88 deletions(-) diff --git a/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd b/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd index 21fe21b4..a3dd0fec 100644 --- a/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd +++ b/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd @@ -12,12 +12,12 @@ SPDX-License-Identifier: Apache-2.0 Version 1.0 Release 2021/06/16 - Version 1.1 Release 2022/01/21 + Version 1.1 Release 2022/01/21 Version 2.1 Release 2022/06/08 - - @@ -94,68 +94,81 @@ SPDX-License-Identifier: Apache-2.0 - - - - - - - + + + + + + + - + Define whether the Flow between two LDevice belonging to two ICDs with-in two System Version (identical or different) are qualified (ACTIVE), not working (INACTIVE) or untested (UNTESTED) - - - - - - + + + + + + - + Define whether the LDevice belonging to one ICD with-in one System Version are qualified (ACTIVE), not working (INACTIVE) or untested (UNTESTED) - - - - - - + + + + + + - + Define whether the IED with-in one System Version is used as NOMINAL or BACKUP IED - - - - - - - + + + + + + + - + Define whether the Flow is limited to the Bay(refering to the physical one or cubicles) to which belong the IED (BAY_INTERNAL) or only going outside the BAY (BAY_EXTERNAL) or both (BAY_INTERNAL_EXTERNAL) - - - - - - + + + + + + + + + + Define if a Node Direction is Up or Down + + + + + + + + + @@ -164,83 +177,74 @@ SPDX-License-Identifier: Apache-2.0 The FlowStatus define whether if the flow is qualified, non qualified or untested accordingly to the source IED which is bellonging to a define SystemVersion - - - - - - - - - + + + + + + + + + - - + + Define the specific Compas attributes linked to the Bay. The Main and Second Labels are label of the bay specific to each user. MainLabel and Version identify uniquely the instanciated Bay as the UUID The BayCodif is specific to each user to identify the bay kind. - - - - - - - - - - - - - Define the specific busbarsection or zone of the connectivity node - - - + + + + + + + - - + + Define specific Compas attributes to identify uniquely one ICD file with-in a SystemVersion for a given IEDredundancy. The UUID of this combinaison is defined by the ICDSystemVersionUUID. This private is intended to be used in the STD file (/IED level) and SSD (/LNode level) - + - - + + - - + + - - + + Identify the SystemVersion to which the functional Bay and IED belongs to. This Private can be used in /Bay in substation and in the /IED. - + - - + + Identifies the Function from the user specific catalog of function - + @@ -250,7 +254,7 @@ SPDX-License-Identifier: Apache-2.0 - + @@ -260,18 +264,30 @@ SPDX-License-Identifier: Apache-2.0 - + + + + + + + Describe the connectivity node and layout order for a given Bay;can be multiple instanciated in case of bay which is connected to multiple nodes + + + + + + - - - - - - - + + + + + + + \ No newline at end of file From 9105195301d0bd69ea04ea666a7bf84488f261f4 Mon Sep 17 00:00:00 2001 From: SAINTIER FRANCOIS Date: Wed, 15 Jun 2022 10:33:24 +0200 Subject: [PATCH 3/3] Issue #142: Third update of SCL_CoMPAS.xsd file (correction of the mistakes in sclName and SclFileType). Revert the modification done in scl-extensions.xjb Signed-off-by: SAINTIER FRANCOIS --- scl-extension/src/main/bindings/scl-extensions.xjb | 2 +- scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scl-extension/src/main/bindings/scl-extensions.xjb b/scl-extension/src/main/bindings/scl-extensions.xjb index c19ff849..374006f3 100644 --- a/scl-extension/src/main/bindings/scl-extensions.xjb +++ b/scl-extension/src/main/bindings/scl-extensions.xjb @@ -8,7 +8,7 @@ SPDX-License-Identifier: Apache-2.0 xmlns:jxb="http://java.sun.com/xml/ns/jaxb" version="2.1"> - + diff --git a/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd b/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd index a3dd0fec..140c067c 100644 --- a/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd +++ b/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd @@ -13,14 +13,14 @@ SPDX-License-Identifier: Apache-2.0 Version 1.0 Release 2021/06/16 Version 1.1 Release 2022/01/21 - Version 2.1 Release 2022/06/08 + Version 1.2 Release 2022/06/08 - + Name of the SCL configuration, extension excluded @@ -30,7 +30,7 @@ SPDX-License-Identifier: Apache-2.0 - + File type of the SCL configuration file @@ -279,8 +279,8 @@ SPDX-License-Identifier: Apache-2.0 - - + +