feat(#420): XSD update for CB GOOSE and SMV network configuration

Signed-off-by: JAFFRE Guillaume <guillaume.jaffre@rte-france.com>
com-pas · Sep 2, 2024 · 7b4a2ac · 7b4a2ac
1 parent 72617bc
commit 7b4a2ac
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/sct-commons/pom.xml b/sct-commons/pom.xml
@@ -223,7 +223,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>${project.basedir}/src/main/resources/xsd/GSE_SMV_CB_COM.xsd</source>
+                                <source>${project.basedir}/src/main/resources/xsd/GSE_SMV_CB_COM_V2.xsd</source>
                             </sources>
                             <xjbSources>
                                 <xjbSource>${project.basedir}/src/main/resources/binding_configuration.xjb</xjbSource>

diff --git a/...src/main/resources/xsd/GSE_SMV_CB_COM.xsd → .../main/resources/xsd/GSE_SMV_CB_COM_V2.xsd b/...src/main/resources/xsd/GSE_SMV_CB_COM.xsd → .../main/resources/xsd/GSE_SMV_CB_COM_V2.xsd
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- SPDX-FileCopyrightText: 2023 RTE FRANCE -->
-<!-- -->
-<!-- SPDX-License-Identifier: Apache-2.0 -->
-
 <xs:schema xmlns="http://www.rte-france.com/cbcom"
            xmlns:xs="http://www.w3.org/2001/XMLSchema"
            targetNamespace="http://www.rte-france.com/cbcom" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1">
@@ -12,9 +8,9 @@
             <xs:sequence>
                 <xs:element ref="History"/>
                 <xs:element ref="Version"/>
-                <xs:element ref="AppIdRanges"/>
-                <xs:element ref="MacRanges"/>
                 <xs:element ref="Vlans"/>
+                <xs:element ref="MacRanges"/>
+                <xs:element ref="AppIdRanges"/>
             </xs:sequence>
         </xs:complexType>
     </xs:element>
@@ -26,7 +22,6 @@
             </xs:sequence>
         </xs:complexType>
     </xs:element>
-
     <xs:complexType name="tHitem" mixed="true">
         <xs:attribute name="Version" type="xs:normalizedString" use="required"/>
         <xs:attribute name="When" type="xs:normalizedString" use="required"/>
@@ -141,9 +136,20 @@
             <xs:enumeration value="AUT"/>
             <xs:enumeration value="PDIF"/>
             <xs:enumeration value="GRP"/>
+            <xs:enumeration value="GRPR"/>
+            <xs:enumeration value="ASLD"/>
             <xs:enumeration value="GW"/>
             <xs:enumeration value="TG"/>
             <xs:enumeration value="TOPO"/>
+            <xs:enumeration value="SWC"/>
+            <xs:enumeration value="SWT"/>
+            <xs:enumeration value="SW"/>
+            <xs:enumeration value="OUT"/>
+            <xs:enumeration value="CLUS"/>
+            <xs:enumeration value="VIRT"/>
+            <xs:enumeration value="ICT"/>
+            <xs:enumeration value="SYN"/>
+            <xs:enumeration value="OND"/>
             <xs:enumeration value="ADEFINIR"/>
             <xs:enumeration value="IEDTEST"/>
         </xs:restriction>