From c2bcb77b5470647f03c4c5e224bc5bcd2c42a9b7 Mon Sep 17 00:00:00 2001 From: Dennis Labordus Date: Tue, 8 Feb 2022 07:28:59 +0100 Subject: [PATCH 1/3] Renamed type for 2 compas extensions Signed-off-by: Dennis Labordus --- .../src/main/bindings/scl-extensions.xjb | 2 +- .../commons/CompasExtensionsField.java | 17 ++++---- .../scl/extensions/model/SclFileType.java | 4 +- .../src/main/resources/xsd/SCL_CoMPAS.xsd | 39 ++++++++++++------- 4 files changed, 38 insertions(+), 24 deletions(-) diff --git a/scl-extension/src/main/bindings/scl-extensions.xjb b/scl-extension/src/main/bindings/scl-extensions.xjb index c19ff84..374006f 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/java/org/lfenergy/compas/scl/extensions/commons/CompasExtensionsField.java b/scl-extension/src/main/java/org/lfenergy/compas/scl/extensions/commons/CompasExtensionsField.java index 008d97c..ae8366d 100644 --- a/scl-extension/src/main/java/org/lfenergy/compas/scl/extensions/commons/CompasExtensionsField.java +++ b/scl-extension/src/main/java/org/lfenergy/compas/scl/extensions/commons/CompasExtensionsField.java @@ -5,16 +5,19 @@ /** * The CoMPAS Extension fields that exists. The fieldName is the name how the element is used in the XML. + * For a description of the fields, see the XSD. */ public enum CompasExtensionsField { - /** - * The name of the SCL XML File, will be used in the search and when SCL XML File is saved to the filesystem. - */ SCL_NAME_EXTENSION("SclName"), - /** - * The type of SCL XML File it is, like IID, SCD and more. TSclFileType indicates which values are allowed. - */ - SCL_FILETYPE_EXTENSION("SclFileType"); + SCL_FILETYPE_EXTENSION("SclFileType"), + FLOW("Flow"), + CONNECTIVITY_NODE("ConnectivityNode"), + BAY("Bay"), + L_DEVICE("LDevice"), + CRITERIA("Criteria"), + ICD_HEADER("ICDHeader"), + SYSTEM_VERSION("SystemVersion"), + FUNCTION("Function"); private final String fieldName; diff --git a/scl-extension/src/main/java/org/lfenergy/compas/scl/extensions/model/SclFileType.java b/scl-extension/src/main/java/org/lfenergy/compas/scl/extensions/model/SclFileType.java index 220140d..99300e9 100644 --- a/scl-extension/src/main/java/org/lfenergy/compas/scl/extensions/model/SclFileType.java +++ b/scl-extension/src/main/java/org/lfenergy/compas/scl/extensions/model/SclFileType.java @@ -6,7 +6,9 @@ import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlType; -@XmlType(name = "tSclFileType", namespace = "https://www.lfenergy.org/compas/extension/v1") +import static org.lfenergy.compas.scl.extensions.commons.CompasExtensionsConstants.COMPAS_EXTENSION_NS_URI; + +@XmlType(name = "tCompasSclFileType", namespace = COMPAS_EXTENSION_NS_URI) @XmlEnum public enum SclFileType { SSD("Substation Specification Description"), diff --git a/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd b/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd index d12bc27..181fd59 100644 --- a/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd +++ b/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd @@ -19,7 +19,7 @@ SPDX-License-Identifier: Apache-2.0 - + Name of the SCL configuration, extension excluded @@ -29,7 +29,7 @@ SPDX-License-Identifier: Apache-2.0 - + File type of the SCL configuration file @@ -106,7 +106,8 @@ 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 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) @@ -119,7 +120,8 @@ SPDX-License-Identifier: Apache-2.0 - 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 LDevice belonging to one ICD with-in one System Version are qualified (ACTIVE), not + working (INACTIVE) or untested (UNTESTED) @@ -146,7 +148,8 @@ SPDX-License-Identifier: Apache-2.0 - 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 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) @@ -159,9 +162,12 @@ SPDX-License-Identifier: Apache-2.0 - Define the link between specific Compas attributes and one ExtRef within the STD file. The dataStreamKey is the key with the ExtRef.desc. The ExtRef attributes are directly linked to the attributes of the ExRef. + Define the link between specific Compas attributes and one ExtRef within the STD file. The dataStreamKey + is the key with the ExtRef.desc. The ExtRef attributes are directly linked to the attributes of the + ExRef. The FlowID is used to link additional informations to the flow as the criteria. - 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 + 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 @@ -178,7 +184,8 @@ SPDX-License-Identifier: Apache-2.0 - 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 + 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. @@ -204,7 +211,8 @@ SPDX-License-Identifier: Apache-2.0 - 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. + 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) @@ -226,7 +234,8 @@ SPDX-License-Identifier: Apache-2.0 - 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. + 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. @@ -256,15 +265,16 @@ SPDX-License-Identifier: Apache-2.0 - Identifies the Criteria linked to a Flow or LDevice or Function from the user specific catalog of criteria + Identifies the Criteria linked to a Flow or LDevice or Function from the user specific catalog of + criteria - - + + @@ -273,5 +283,4 @@ SPDX-License-Identifier: Apache-2.0 - - \ No newline at end of file + From d252a7407cfd4c02612eb9d6da24c79727bb3870 Mon Sep 17 00:00:00 2001 From: Dennis Labordus Date: Tue, 8 Feb 2022 07:35:14 +0100 Subject: [PATCH 2/3] Renamed type for 2 compas extensions Signed-off-by: Dennis Labordus --- .../src/main/resources/xsd/SCL_CoMPAS.xsd | 22 ++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd b/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd index 181fd59..7a15fd0 100644 --- a/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd +++ b/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd @@ -106,8 +106,7 @@ 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 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) @@ -120,8 +119,7 @@ SPDX-License-Identifier: Apache-2.0 - 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 LDevice belonging to one ICD with-in one System Version are qualified (ACTIVE), not working (INACTIVE) or untested (UNTESTED) @@ -148,8 +146,7 @@ SPDX-License-Identifier: Apache-2.0 - 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 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) @@ -162,12 +159,9 @@ SPDX-License-Identifier: Apache-2.0 - Define the link between specific Compas attributes and one ExtRef within the STD file. The dataStreamKey - is the key with the ExtRef.desc. The ExtRef attributes are directly linked to the attributes of the - ExRef. + Define the link between specific Compas attributes and one ExtRef within the STD file. The dataStreamKey is the key with the ExtRef.desc. The ExtRef attributes are directly linked to the attributes of the ExRef. The FlowID is used to link additional informations to the flow as the criteria. - 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 + 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 @@ -184,8 +178,7 @@ SPDX-License-Identifier: Apache-2.0 - 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 + 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. @@ -211,8 +204,7 @@ SPDX-License-Identifier: Apache-2.0 - 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. + 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) From 54695fe85a06b45a16c7cd155fe5cd3ee53b4124 Mon Sep 17 00:00:00 2001 From: Dennis Labordus Date: Tue, 8 Feb 2022 07:36:10 +0100 Subject: [PATCH 3/3] Renamed type for 2 compas extensions Signed-off-by: Dennis Labordus --- scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd b/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd index 7a15fd0..42f88ab 100644 --- a/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd +++ b/scl-extension/src/main/resources/xsd/SCL_CoMPAS.xsd @@ -226,8 +226,7 @@ SPDX-License-Identifier: Apache-2.0 - 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. + 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. @@ -257,8 +256,7 @@ SPDX-License-Identifier: Apache-2.0 - Identifies the Criteria linked to a Flow or LDevice or Function from the user specific catalog of - criteria + Identifies the Criteria linked to a Flow or LDevice or Function from the user specific catalog of criteria