Skip to content

GitLab

Commit f4d22750 authored by canterburym's avatar canterburym
Browse files

Merge branch 'meeting/LI#55e' into 'master' 

Meeting/li#55e

See merge request trial!18
parents e59e10af 762d8239
Pipeline #7350 failed with stage
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 21 deletions
103120/portal/examples/response1.xml
View file @ f4d22750
<?xml version="1.0" encoding="utf-8"?>
<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:task="http://uri.etsi.org/03120/common/2019/10/Task" xmlns:auth="http://uri.etsi.org/03120/common/2016/02/Authorisation">
<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:task="http://uri.etsi.org/03120/common/2020/09/Task" xmlns:auth="http://uri.etsi.org/03120/common/2020/09/Authorisation">
<Header>
<SenderIdentifier>
<CountryCode>XX</CountryCode>
......@@ -12,7 +12,7 @@
<TransactionIdentifier>c02358b2-76cf-4ba4-a8eb-f6436ccaea2e</TransactionIdentifier>
<Timestamp>2015-09-01T12:00:01.000000Z</Timestamp>
<Version>
<ETSIVersion>V1.5.1</ETSIVersion>
<ETSIVersion>V1.6.1</ETSIVersion>
<NationalProfileOwner>XX</NationalProfileOwner>
<NationalProfileVersion>v1.0</NationalProfileVersion>
</Version>
......
103120/portal/examples/response2.xml
View file @ f4d22750
<?xml version="1.0" encoding="utf-8"?>
<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:task="http://uri.etsi.org/03120/common/2019/10/Task" xmlns:auth="http://uri.etsi.org/03120/common/2016/02/Authorisation">
<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:task="http://uri.etsi.org/03120/common/2020/09/Task" xmlns:auth="http://uri.etsi.org/03120/common/2020/09/Authorisation">
<Header>
<SenderIdentifier>
<CountryCode>XX</CountryCode>
......@@ -12,7 +12,7 @@
<TransactionIdentifier>45002c1e-dc4a-470a-9152-8e752638c86c</TransactionIdentifier>
<Timestamp>2015-09-01T12:01:00.000000Z</Timestamp>
<Version>
<ETSIVersion>V1.5.1</ETSIVersion>
<ETSIVersion>V1.6.1</ETSIVersion>
<NationalProfileOwner>XX</NationalProfileOwner>
<NationalProfileVersion>v1.0</NationalProfileVersion>
</Version>
......
103120/portal/examples/response3.xml
View file @ f4d22750
<?xml version="1.0" encoding="utf-8"?>
<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:task="http://uri.etsi.org/03120/common/2019/10/Task" xmlns:auth="http://uri.etsi.org/03120/common/2016/02/Authorisation" xmlns:doc="http://uri.etsi.org/03120/common/2016/02/Document">
<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:task="http://uri.etsi.org/03120/common/2020/09/Task" xmlns:auth="http://uri.etsi.org/03120/common/2020/09/Authorisation" xmlns:doc="http://uri.etsi.org/03120/common/2020/09/Document">
<Header>
<SenderIdentifier>
<CountryCode>XX</CountryCode>
......@@ -12,7 +12,7 @@
<TransactionIdentifier>69353ac0-9582-4c71-b162-86259c99de20</TransactionIdentifier>
<Timestamp>2015-09-01T12:02:00.000000Z</Timestamp>
<Version>
<ETSIVersion>V1.5.1</ETSIVersion>
<ETSIVersion>V1.6.1</ETSIVersion>
<NationalProfileOwner>XX</NationalProfileOwner>
<NationalProfileVersion>v1.0</NationalProfileVersion>
</Version>
......
103120/portal/examples/response4.xml
View file @ f4d22750
<?xml version="1.0" encoding="utf-8"?>
<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:task="http://uri.etsi.org/03120/common/2019/10/Task" xmlns:auth="http://uri.etsi.org/03120/common/2016/02/Authorisation">
<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:task="http://uri.etsi.org/03120/common/2020/09/Task" xmlns:auth="http://uri.etsi.org/03120/common/2020/09/Authorisation">
<Header>
<SenderIdentifier>
<CountryCode>XX</CountryCode>
......@@ -12,7 +12,7 @@
<TransactionIdentifier>c02358b2-76cf-4ba4-a8eb-f6436ccaea2e</TransactionIdentifier>
<Timestamp>2019-09-30T13:37:01.000000Z</Timestamp>
<Version>
<ETSIVersion>V1.5.1</ETSIVersion>
<ETSIVersion>V1.6.1</ETSIVersion>
<NationalProfileOwner>XX</NationalProfileOwner>
<NationalProfileVersion>v1.0</NationalProfileVersion>
</Version>
......
103120/portal/examples/response5.xml
View file @ f4d22750
......@@ -2,7 +2,7 @@
<HI1Message xmlns="http://uri.etsi.org/03120/common/2019/10/Core"
xmlns:xs="xmlns:xs=http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:task="http://uri.etsi.org/03120/common/2019/10/Task"
xmlns:task="http://uri.etsi.org/03120/common/2020/09/Task"
xmlns:delivery="http://uri.etsi.org/03120/common/2019/10/Delivery"
xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common">
<Header>
......@@ -17,7 +17,7 @@
<TransactionIdentifier>8854cfad-44ac-43b8-99ae-530b690b43da</TransactionIdentifier>
<Timestamp>2019-09-30T13:37:37.000000Z</Timestamp>
<Version>
<ETSIVersion>V1.5.1</ETSIVersion>
<ETSIVersion>V1.6.1</ETSIVersion>
<NationalProfileOwner>XX</NationalProfileOwner>
<NationalProfileVersion>v1.0</NationalProfileVersion>
</Version>
......
103120/schema/ts_103120_Authorisation.xsd
View file @ f4d22750
......@@ -3,8 +3,8 @@
xmlns:etsi="http://uri.etsi.org/03280/common/2017/07"
xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common"
xmlns:core="http://uri.etsi.org/03120/common/2019/10/Core"
xmlns="http://uri.etsi.org/03120/common/2016/02/Authorisation"
targetNamespace="http://uri.etsi.org/03120/common/2016/02/Authorisation"
xmlns="http://uri.etsi.org/03120/common/2020/09/Authorisation"
targetNamespace="http://uri.etsi.org/03120/common/2020/09/Authorisation"
elementFormDefault="qualified"
attributeFormDefault="unqualified">
......@@ -26,7 +26,7 @@
<xs:element name="AuthorisationCreationTimestamp" type="etsi:QualifiedDateTime" minOccurs="0"></xs:element>
<xs:element name="AuthorisationServedTimestamp" type="etsi:QualifiedDateTime" minOccurs="0"></xs:element>
<xs:element name="AuthorisationTerminationTimestamp" type="etsi:QualifiedDateTime" minOccurs="0"></xs:element>
<xs:element name="AuthorisationApprovalDetails" type="common:ApprovalDetails" minOccurs="0"></xs:element>
<xs:element name="AuthorisationApprovalDetails" type="common:ApprovalDetails" minOccurs="0" maxOccurs="unbounded"></xs:element>
<xs:element name="AuthorisationInvalidReason" type="core:ActionUnsuccesfulInformation" minOccurs="0"></xs:element>
<xs:element name="AuthorisationFlags" type="AuthorisationFlags" minOccurs="0"></xs:element>
<xs:element name="AuthorisationManualInformation" type="etsi:LongString" minOccurs="0"></xs:element>
......
103120/schema/ts_103120_Document.xsd
View file @ f4d22750
......@@ -3,8 +3,8 @@
xmlns:etsi="http://uri.etsi.org/03280/common/2017/07"
xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common"
xmlns:core="http://uri.etsi.org/03120/common/2019/10/Core"
xmlns="http://uri.etsi.org/03120/common/2016/02/Document"
targetNamespace="http://uri.etsi.org/03120/common/2016/02/Document"
xmlns="http://uri.etsi.org/03120/common/2020/09/Document"
targetNamespace="http://uri.etsi.org/03120/common/2020/09/Document"
elementFormDefault="qualified"
attributeFormDefault="unqualified">
......@@ -24,7 +24,7 @@
<xs:element name="DocumentType" type="common:DictionaryEntry" minOccurs="0"></xs:element>
<xs:element name="DocumentProperties" type="DocumentProperties" minOccurs="0"></xs:element>
<xs:element name="DocumentBody" type="DocumentBody" minOccurs="0"></xs:element>
<xs:element name="DocumentSignature" type="common:ApprovalDetails" minOccurs="0"></xs:element>
<xs:element name="DocumentSignature" type="common:ApprovalDetails" minOccurs="0" maxOccurs="unbounded"></xs:element>
<xs:element name="DocumentInvalidReason" type="core:ActionUnsuccesfulInformation" minOccurs="0"/>
<xs:element name="NationalDocumentParameters" type="NationalDocumentParameters" minOccurs="0"></xs:element>
</xs:sequence>
......
103120/schema/ts_103120_Task.xsd
View file @ f4d22750
......@@ -3,8 +3,8 @@
xmlns:etsi="http://uri.etsi.org/03280/common/2017/07"
xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common"
xmlns:core="http://uri.etsi.org/03120/common/2019/10/Core"
xmlns="http://uri.etsi.org/03120/common/2019/10/Task"
targetNamespace="http://uri.etsi.org/03120/common/2019/10/Task"
xmlns="http://uri.etsi.org/03120/common/2020/09/Task"
targetNamespace="http://uri.etsi.org/03120/common/2020/09/Task"
elementFormDefault="qualified"
attributeFormDefault="unqualified">
......@@ -23,7 +23,7 @@
<xs:element name="TargetIdentifier" type="TargetIdentifier" minOccurs="0"/>
<xs:element name="DeliveryType" type="common:DictionaryEntry" minOccurs="0"/>
<xs:element name="DeliveryDetails" type="TaskDeliveryDetails" minOccurs="0"/>
<xs:element name="ApprovalDetails" type="common:ApprovalDetails" minOccurs="0"/>
<xs:element name="ApprovalDetails" type="common:ApprovalDetails" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="CSPID" type="core:EndpointID" minOccurs="0"/>
<xs:element name="HandlingProfile" type="common:DictionaryEntry" minOccurs="0"/>
<xs:element name="InvalidReason" type="core:ActionUnsuccesfulInformation" minOccurs="0"/>
......@@ -123,7 +123,7 @@
<xs:element name="DesiredStatus" type="common:DictionaryEntry" minOccurs="0"/>
<xs:element name="RequestDetails" type="RequestDetails" minOccurs="0"/>
<xs:element name="DeliveryDetails" type="LDDeliveryDetails" minOccurs="0"/>
<xs:element name="ApprovalDetails" type="common:ApprovalDetails" minOccurs="0"/>
<xs:element name="ApprovalDetails" type="common:ApprovalDetails" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="CSPID" type="core:EndpointID" minOccurs="0"/>
<xs:element name="HandlingProfile" type="common:DictionaryEntry" minOccurs="0"/>
<xs:element name="Flags" type="LDTaskFlags" minOccurs="0" />
......
103120/validate_examples.py
View file @ f4d22750
......@@ -25,7 +25,14 @@ if __name__ == '__main__':
xs = xmlschema.XMLSchema(schemaFile, validation='skip')
locations.append((xs.default_namespace, str(Path(schemaFile))[7:]))
coreSchema = xmlschema.XMLSchema('schema/ts_103120v010601p0_Core.xsd', locations=locations)
etsiSchema = str(Path('../103280/TS_103_280.xsd'))
xs = xmlschema.XMLSchema(etsiSchema, validation='skip')
locations.append((xs.default_namespace, str(Path("../" + etsiSchema))))
for location in locations:
print (location)
coreSchema = xmlschema.XMLSchema('schema/ts_103120_Core.xsd', locations=locations)
for schema in schemaFiles:
newSchema = xmlschema.XMLSchema(schema, locations=locations)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment