From dfdd6a61254344a86b8bbfa4e359bc5201f8b302 Mon Sep 17 00:00:00 2001 From: mark Date: Fri, 23 Jul 2021 11:00:48 +0100 Subject: [PATCH 01/18] Generic object mechanism and examples --- 103221-1/TS_103_221_01.xsd | 153 +++++++++++++++++- 103221-1/examples/CreateObject_example.xml | 14 ++ .../examples/GetObjectResponse_example.xml | 13 ++ 103221-1/examples/GetObject_example.xml | 11 ++ .../examples/ListObjectResponse_example.xml | 13 ++ 103221-1/examples/ListObject_example.xml | 11 ++ 6 files changed, 214 insertions(+), 1 deletion(-) create mode 100644 103221-1/examples/CreateObject_example.xml create mode 100644 103221-1/examples/GetObjectResponse_example.xml create mode 100644 103221-1/examples/GetObject_example.xml create mode 100644 103221-1/examples/ListObjectResponse_example.xml create mode 100644 103221-1/examples/ListObject_example.xml diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd index 2cf5206..76ca9c6 100644 --- a/103221-1/TS_103_221_01.xsd +++ b/103221-1/TS_103_221_01.xsd @@ -101,7 +101,12 @@ - + + + + + + @@ -787,4 +792,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/103221-1/examples/CreateObject_example.xml b/103221-1/examples/CreateObject_example.xml new file mode 100644 index 0000000..2544ee1 --- /dev/null +++ b/103221-1/examples/CreateObject_example.xml @@ -0,0 +1,14 @@ + + + + admfID + neID + 2017-10-06T18:46:21.247432Z + v1.6.1 + 3741800e-971b-4aa9-85f4-466d2b1adc7f + + 3741800e-971b-4aa9-85f4-466d2b1adc7e + 1 + + + diff --git a/103221-1/examples/GetObjectResponse_example.xml b/103221-1/examples/GetObjectResponse_example.xml new file mode 100644 index 0000000..e51badd --- /dev/null +++ b/103221-1/examples/GetObjectResponse_example.xml @@ -0,0 +1,13 @@ + + + + admfID + neID + 2017-10-06T18:46:21.247432Z + v1.6.1 + 3741800e-971b-4aa9-85f4-466d2b1adc7f + + 3741800e-971b-4aa9-85f4-466d2b1adc7e + + + diff --git a/103221-1/examples/GetObject_example.xml b/103221-1/examples/GetObject_example.xml new file mode 100644 index 0000000..fa1b356 --- /dev/null +++ b/103221-1/examples/GetObject_example.xml @@ -0,0 +1,11 @@ + + + + admfID + neID + 2017-10-06T18:46:21.247432Z + v1.6.1 + 3741800e-971b-4aa9-85f4-466d2b1adc7f + 3741800e-971b-4aa9-85f4-466d2b1adc7e + + diff --git a/103221-1/examples/ListObjectResponse_example.xml b/103221-1/examples/ListObjectResponse_example.xml new file mode 100644 index 0000000..8b79d9f --- /dev/null +++ b/103221-1/examples/ListObjectResponse_example.xml @@ -0,0 +1,13 @@ + + + + admfID + neID + 2017-10-06T18:46:21.247432Z + v1.6.1 + 3741800e-971b-4aa9-85f4-466d2b1adc7f + + 3741800e-971b-4aa9-85f4-466d2b1adc7e + + + diff --git a/103221-1/examples/ListObject_example.xml b/103221-1/examples/ListObject_example.xml new file mode 100644 index 0000000..8876a1f --- /dev/null +++ b/103221-1/examples/ListObject_example.xml @@ -0,0 +1,11 @@ + + + + admfID + neID + 2017-10-06T18:46:21.247432Z + v1.6.1 + 3741800e-971b-4aa9-85f4-466d2b1adc7f + FooObject + + -- GitLab From e6fc58ea3edaf92ecfac5e02ae0d5ffd02a23d7c Mon Sep 17 00:00:00 2001 From: mark Date: Wed, 28 Jul 2021 11:30:12 +0100 Subject: [PATCH 02/18] Updating to match first draft of CR --- 103221-1/TS_103_221_01.xsd | 16 +++++++++------- 103221-1/examples/CreateObject_example.xml | 2 +- 103221-1/examples/GetObjectResponse_example.xml | 1 + 103221-1/examples/ListObject_example.xml | 4 ++-- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd index 76ca9c6..0dab420 100644 --- a/103221-1/TS_103_221_01.xsd +++ b/103221-1/TS_103_221_01.xsd @@ -798,7 +798,9 @@ - + + + @@ -828,7 +830,7 @@ - + @@ -849,11 +851,11 @@ - + - + @@ -870,7 +872,7 @@ - + @@ -891,7 +893,7 @@ - + @@ -912,7 +914,7 @@ - + diff --git a/103221-1/examples/CreateObject_example.xml b/103221-1/examples/CreateObject_example.xml index 2544ee1..d64190e 100644 --- a/103221-1/examples/CreateObject_example.xml +++ b/103221-1/examples/CreateObject_example.xml @@ -1,6 +1,6 @@ - + admfID neID 2017-10-06T18:46:21.247432Z diff --git a/103221-1/examples/GetObjectResponse_example.xml b/103221-1/examples/GetObjectResponse_example.xml index e51badd..a39e67b 100644 --- a/103221-1/examples/GetObjectResponse_example.xml +++ b/103221-1/examples/GetObjectResponse_example.xml @@ -8,6 +8,7 @@ 3741800e-971b-4aa9-85f4-466d2b1adc7f 3741800e-971b-4aa9-85f4-466d2b1adc7e + 1 diff --git a/103221-1/examples/ListObject_example.xml b/103221-1/examples/ListObject_example.xml index 8876a1f..6e6187b 100644 --- a/103221-1/examples/ListObject_example.xml +++ b/103221-1/examples/ListObject_example.xml @@ -1,11 +1,11 @@ - + admfID neID 2017-10-06T18:46:21.247432Z v1.6.1 3741800e-971b-4aa9-85f4-466d2b1adc7f - FooObject + Q{http://uri.etsi.org/03221/X1/2017/10}Foo -- GitLab From 4ab6bd4e70c5621e88a37c5851b6152dd81c2ecf Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 16 Sep 2021 08:44:27 +0100 Subject: [PATCH 03/18] Updating after rap meeting --- 103221-1/TS_103_221_01.xsd | 72 +++++++++---------- 103221-1/examples/CreateObject_example.xml | 10 +-- 103221-1/examples/ExampleGenericObjects.xsd | 38 ++++++++++ .../GetAllDetailsResponse_example2.xml | 67 +++++++++++++++++ .../examples/GetObjectResponse_example.xml | 12 ++-- 103221-1/examples/GetObject_example.xml | 2 +- .../ListAllDetailsResponse_example2.xml | 19 +++++ 7 files changed, 171 insertions(+), 49 deletions(-) create mode 100644 103221-1/examples/ExampleGenericObjects.xsd create mode 100644 103221-1/examples/GetAllDetailsResponse_example2.xml create mode 100644 103221-1/examples/ListAllDetailsResponse_example2.xml diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd index 0dab420..5ea96ac 100644 --- a/103221-1/TS_103_221_01.xsd +++ b/103221-1/TS_103_221_01.xsd @@ -631,6 +631,7 @@ + @@ -660,6 +661,7 @@ + @@ -793,48 +795,27 @@ - + - - + + - + - + - - - - - - - - - - - - - - - - - - - - - - + @@ -850,12 +831,11 @@ - - + @@ -870,13 +850,12 @@ - - + @@ -886,18 +865,34 @@ - + - + + + + + + + + + + + + + + + + + - + @@ -912,13 +907,12 @@ - - + @@ -928,15 +922,15 @@ - + - + - + diff --git a/103221-1/examples/CreateObject_example.xml b/103221-1/examples/CreateObject_example.xml index d64190e..514a182 100644 --- a/103221-1/examples/CreateObject_example.xml +++ b/103221-1/examples/CreateObject_example.xml @@ -1,14 +1,16 @@ - + admfID neID 2017-10-06T18:46:21.247432Z - v1.6.1 + v1.9.1 3741800e-971b-4aa9-85f4-466d2b1adc7f - + 3741800e-971b-4aa9-85f4-466d2b1adc7e - 1 + 1 diff --git a/103221-1/examples/ExampleGenericObjects.xsd b/103221-1/examples/ExampleGenericObjects.xsd new file mode 100644 index 0000000..8b20e5f --- /dev/null +++ b/103221-1/examples/ExampleGenericObjects.xsd @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/103221-1/examples/GetAllDetailsResponse_example2.xml b/103221-1/examples/GetAllDetailsResponse_example2.xml new file mode 100644 index 0000000..0810429 --- /dev/null +++ b/103221-1/examples/GetAllDetailsResponse_example2.xml @@ -0,0 +1,67 @@ + + + + admfID + neID + 2017-10-06T18:46:21.496743Z + v1.9.1 + bfd0c982-b7d6-4a8e-80a0-89dab964aafd + + OK + + + + + + 29f28e1c-f230-486a-a860-f5a784ab9172 + + + 447700900000 + + + X2andX3 + + 1eb4406a-8b28-41fd-8f0f-e1a0a3eb5ff9 + + + + complete + + + + + + + + b0ce308c-aa17-42bd-a27b-287bcb5b3468 + X2andX3 + + + + 192.0.2.2 + + + 12345 + + + + + + activeAndWorking + + + + + + + + 3741800e-971b-4aa9-85f4-466d2b1adc7e + 1 + + + OK + + + + + diff --git a/103221-1/examples/GetObjectResponse_example.xml b/103221-1/examples/GetObjectResponse_example.xml index a39e67b..4892d37 100644 --- a/103221-1/examples/GetObjectResponse_example.xml +++ b/103221-1/examples/GetObjectResponse_example.xml @@ -1,14 +1,16 @@ - + admfID neID 2017-10-06T18:46:21.247432Z v1.6.1 3741800e-971b-4aa9-85f4-466d2b1adc7f - - 3741800e-971b-4aa9-85f4-466d2b1adc7e - 1 - + + + 3741800e-971b-4aa9-85f4-466d2b1adc7e + 1 + + diff --git a/103221-1/examples/GetObject_example.xml b/103221-1/examples/GetObject_example.xml index fa1b356..8a47ff2 100644 --- a/103221-1/examples/GetObject_example.xml +++ b/103221-1/examples/GetObject_example.xml @@ -1,6 +1,6 @@ - + admfID neID 2017-10-06T18:46:21.247432Z diff --git a/103221-1/examples/ListAllDetailsResponse_example2.xml b/103221-1/examples/ListAllDetailsResponse_example2.xml new file mode 100644 index 0000000..d694b12 --- /dev/null +++ b/103221-1/examples/ListAllDetailsResponse_example2.xml @@ -0,0 +1,19 @@ + + + + admfID + neID + 2017-10-06T18:46:21.508330Z + v1.6.1 + 09529160-2e44-49c6-bf54-204ca5edcfab + + 29f28e1c-f230-486a-a860-f5a784ab9172 + + + b0ce308c-aa17-42bd-a27b-287bcb5b3468 + + + 3741800e-971b-4aa9-85f4-466d2b1adc7e + + + -- GitLab From 0e1835b9f53e329aff71d55856888570581553c4 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 11 Oct 2021 08:02:16 +0100 Subject: [PATCH 04/18] Changing indentation --- 103221-1/TS_103_221_01.xsd | 270 ++++++++++++++++++------------------- 1 file changed, 135 insertions(+), 135 deletions(-) diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd index ca39859..c253a0e 100644 --- a/103221-1/TS_103_221_01.xsd +++ b/103221-1/TS_103_221_01.xsd @@ -101,12 +101,12 @@ - - - - - - + + + + + + @@ -633,7 +633,7 @@ - + @@ -663,7 +663,7 @@ - + @@ -797,143 +797,143 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + -- GitLab From be980bb549fb2253cee76e908ff87b84a34a0e06 Mon Sep 17 00:00:00 2001 From: SvS <239-svs@users.noreply.forge.etsi.org> Date: Mon, 11 Oct 2021 08:05:21 +0200 Subject: [PATCH 05/18] Rename ts_103120_Deli.xsd to ts_103120_Delivery.xsd --- 103120/schema/{ts_103120_Deli.xsd => ts_103120_Delivery.xsd} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename 103120/schema/{ts_103120_Deli.xsd => ts_103120_Delivery.xsd} (100%) diff --git a/103120/schema/ts_103120_Deli.xsd b/103120/schema/ts_103120_Delivery.xsd similarity index 100% rename from 103120/schema/ts_103120_Deli.xsd rename to 103120/schema/ts_103120_Delivery.xsd -- GitLab From 0565790aaa7629d66d5cf4d15ec6b8d0428d73c1 Mon Sep 17 00:00:00 2001 From: SvS <239-svs@users.noreply.forge.etsi.org> Date: Mon, 11 Oct 2021 08:07:24 +0200 Subject: [PATCH 06/18] More renaming of Deli into Delivery --- .../{request5-Binary-Deli.xml => request5-Binary-Delivery.xml} | 0 .../examples/{request5-XML-Deli.xml => request5-XML-Delivery.xml} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename 103120/examples/{request5-Binary-Deli.xml => request5-Binary-Delivery.xml} (100%) rename 103120/examples/{request5-XML-Deli.xml => request5-XML-Delivery.xml} (100%) diff --git a/103120/examples/request5-Binary-Deli.xml b/103120/examples/request5-Binary-Delivery.xml similarity index 100% rename from 103120/examples/request5-Binary-Deli.xml rename to 103120/examples/request5-Binary-Delivery.xml diff --git a/103120/examples/request5-XML-Deli.xml b/103120/examples/request5-XML-Delivery.xml similarity index 100% rename from 103120/examples/request5-XML-Deli.xml rename to 103120/examples/request5-XML-Delivery.xml -- GitLab From b7fc3e0ea866d024829f92e0acddb03b5cea560c Mon Sep 17 00:00:00 2001 From: SvS <239-svs@users.noreply.forge.etsi.org> Date: Mon, 11 Oct 2021 08:14:34 +0200 Subject: [PATCH 07/18] Correct phone number format in examples --- 103120/examples/request1.xml | 2 +- 103120/examples/request4.xml | 2 +- 103120/examples/response2.xml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/103120/examples/request1.xml b/103120/examples/request1.xml index e8b6a5f..d0b64ee 100644 --- a/103120/examples/request1.xml +++ b/103120/examples/request1.xml @@ -53,7 +53,7 @@ ETSI InternationalE164 - +447700900000 + 442079460223 diff --git a/103120/examples/request4.xml b/103120/examples/request4.xml index 555974f..6296da5 100644 --- a/103120/examples/request4.xml +++ b/103120/examples/request4.xml @@ -55,7 +55,7 @@ ETSI InternationalE164 - +31701234567 + 442079460223 diff --git a/103120/examples/response2.xml b/103120/examples/response2.xml index 9ae5d35..3f3e550 100644 --- a/103120/examples/response2.xml +++ b/103120/examples/response2.xml @@ -71,7 +71,7 @@ ETSI InternationalE164 - +447700900000 + 442079460223 @@ -94,11 +94,11 @@ 3000 The associated Authorisation is in an Invalid state - + - + -- GitLab From d0f6b40b19343e42bfd7d3dd3b13d850eddc2168 Mon Sep 17 00:00:00 2001 From: SvS <239-svs@users.noreply.forge.etsi.org> Date: Mon, 11 Oct 2021 08:20:48 +0200 Subject: [PATCH 08/18] Update RequestDetails and add applicable example --- 103120/examples/request6.xml | 80 ++++++++++++++++++++++++++++++++ 103120/examples/response6.xml | 38 +++++++++++++++ 103120/schema/ts_103120_Task.xsd | 1 + 3 files changed, 119 insertions(+) create mode 100644 103120/examples/request6.xml create mode 100644 103120/examples/response6.xml diff --git a/103120/examples/request6.xml b/103120/examples/request6.xml new file mode 100644 index 0000000..15a2bf1 --- /dev/null +++ b/103120/examples/request6.xml @@ -0,0 +1,80 @@ + + +
+ + XX + ACTOR01 + + + XX + ACTOR02 + + c02358b2-76cf-4ba4-a8eb-f6436ccaea2f + 2021-10-11T13:37:00.000000Z + + V1.10.1 + XX + v1.0 + +
+ + + + + 0 + + + 7dbbc880-8750-4d3c-abe7-ea4a1764604f + XX + ACTOR01 + W000001 + + 2021-10-11T12:00:00Z + 2021-12-01T12:00:00Z + + + + + + 1 + + + 2b36a78b-b628-416d-bd22-404e68a0cd3f + XX + ACTOR01 + + 7dbbc880-8750-4d3c-abe7-ea4a1764604f + + XX-ACTOR01-1234 + + 2021-10-03T12:32:12Z + 2021-10-03T12:35:34Z + 2021-10-03T13:37:00Z + + + + ETSI + IPv4Address + + 192.0.2.23 + + + + + + + 192.0.2.0 + + + + + XX + ACTOR02 + + + + + + + + diff --git a/103120/examples/response6.xml b/103120/examples/response6.xml new file mode 100644 index 0000000..99b0ddc --- /dev/null +++ b/103120/examples/response6.xml @@ -0,0 +1,38 @@ + + +
+ + XX + ACTOR01 + + + XX + ACTOR02 + + c02358b2-76cf-4ba4-a8eb-f6436ccaea2f + 2021-10-11T13:37:01.000000Z + + V1.10.1 + XX + v1.0 + +
+ + + + + 0 + + 7dbbc880-8750-4d3c-abe7-ea4a1764604f + + + + 1 + + 2b36a78b-b628-416d-bd22-404e68a0cd3f + + + + + + diff --git a/103120/schema/ts_103120_Task.xsd b/103120/schema/ts_103120_Task.xsd index ae3e65e..4459cf9 100644 --- a/103120/schema/ts_103120_Task.xsd +++ b/103120/schema/ts_103120_Task.xsd @@ -138,6 +138,7 @@ + -- GitLab From 479fec4e5739b0f704029fb3404dc70e4a6e2a80 Mon Sep 17 00:00:00 2001 From: markc Date: Wed, 20 Oct 2021 08:51:22 +0200 Subject: [PATCH 09/18] Changing "UpdateObjectResponse" to "ModifyObjectResponse" --- 103221-1/TS_103_221_01.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd index c253a0e..241256b 100644 --- a/103221-1/TS_103_221_01.xsd +++ b/103221-1/TS_103_221_01.xsd @@ -843,7 +843,7 @@ - + -- GitLab From 6ec63f83089c64b1ee7e02c39ba06a7af4929ed6 Mon Sep 17 00:00:00 2001 From: markc Date: Wed, 20 Oct 2021 08:52:00 +0200 Subject: [PATCH 10/18] Correcting RequestMessageType --- 103221-1/TS_103_221_01.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd index 241256b..82e0492 100644 --- a/103221-1/TS_103_221_01.xsd +++ b/103221-1/TS_103_221_01.xsd @@ -102,7 +102,7 @@ - + -- GitLab From 186019fcc7837fb0b7e7264a7cac48adb949c8bb Mon Sep 17 00:00:00 2001 From: SvS <239-svs@users.noreply.forge.etsi.org> Date: Fri, 22 Oct 2021 12:46:25 +0200 Subject: [PATCH 11/18] - Update Common to change ApproverEmailAddress/ApproverPhoneNumber into ApproverContactDetails - Update examples/request3.xml to use multiple ApproverContactDetails - Remove whitespace from examples --- 103120/examples/request3.xml | 11 ++++++++++- 103120/examples/response2.xml | 4 ++-- 103120/examples/response5.xml | 10 +++++----- 103120/schema/ts_103120_Common.xsd | 9 +++++++++ 103120/schema/ts_103120_Core.xsd | 2 +- 5 files changed, 27 insertions(+), 9 deletions(-) diff --git a/103120/examples/request3.xml b/103120/examples/request3.xml index 5da0df3..c93bb7a 100644 --- a/103120/examples/request3.xml +++ b/103120/examples/request3.xml @@ -39,7 +39,16 @@ - Approver + John Doe + + john.doe@example.com + 442079460223 + + + Jane Doe + jane.doe@example.com + 442079461110 + 2015-09-01T12:00:00Z diff --git a/103120/examples/response2.xml b/103120/examples/response2.xml index 9ae5d35..2aa59c8 100644 --- a/103120/examples/response2.xml +++ b/103120/examples/response2.xml @@ -94,11 +94,11 @@ 3000 The associated Authorisation is in an Invalid state - + - + diff --git a/103120/examples/response5.xml b/103120/examples/response5.xml index e210444..32bfcd1 100644 --- a/103120/examples/response5.xml +++ b/103120/examples/response5.xml @@ -1,9 +1,9 @@ -
diff --git a/103120/schema/ts_103120_Common.xsd b/103120/schema/ts_103120_Common.xsd index 6ebf340..abaf323 100644 --- a/103120/schema/ts_103120_Common.xsd +++ b/103120/schema/ts_103120_Common.xsd @@ -37,6 +37,7 @@ + @@ -44,6 +45,14 @@ + + + + + + + + diff --git a/103120/schema/ts_103120_Core.xsd b/103120/schema/ts_103120_Core.xsd index af1674d..1105f2c 100644 --- a/103120/schema/ts_103120_Core.xsd +++ b/103120/schema/ts_103120_Core.xsd @@ -2,7 +2,7 @@ Date: Fri, 22 Oct 2021 13:20:15 +0200 Subject: [PATCH 12/18] Added EUI64 definition --- 103280/TS_103_280.xsd | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/103280/TS_103_280.xsd b/103280/TS_103_280.xsd index ce66ea6..a6ec077 100644 --- a/103280/TS_103_280.xsd +++ b/103280/TS_103_280.xsd @@ -241,4 +241,9 @@ + + + + + \ No newline at end of file -- GitLab From dae58f69aa0f35755940f7d6560a60ea762e5301 Mon Sep 17 00:00:00 2001 From: Christoph Marthy Date: Fri, 22 Oct 2021 13:20:49 +0200 Subject: [PATCH 13/18] Cr/ts 102657/137 138 139 140 --- 102657/RDMessage.asn | 65 ++++++++++++++++++++++++++++++++++++++------ 102657/RDMessage.xsd | 48 ++++++++++++++++++++++++++++++-- 2 files changed, 102 insertions(+), 11 deletions(-) diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn index ea717ef..f3d98eb 100644 --- a/102657/RDMessage.asn +++ b/102657/RDMessage.asn @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version25(25)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version26(26)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version25(25)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version26(26)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -837,9 +837,11 @@ TelephonyServiceUsage ::= SEQUENCE nationalTelephonyServiceUsage [10] NationalTelephonyServiceUsage OPTIONAL, -- To be defined on a national basis -- Only to be used in case the present document cannot fulfil the national requirements - operatorSpecificCallDetails [11] UTF8String OPTIONAL + operatorSpecificCallDetails [11] UTF8String OPTIONAL, -- CSP specific value which indicates the nature of a call -- (e.g. "CallIndicator: GPR, CallActionCode: 2") + trunkGroupIDs [12] TrunkGroupIDs OPTIONAL, + interOperatorIDs [13] InterOperatorIDs OPTIONAL } NationalTelephonyServiceUsage ::= SEQUENCE @@ -1157,6 +1159,26 @@ TelephonyPartyRole ::= ENUMERATED mmsRecipientTrn(17) } +TrunkGroupIDs ::= SEQUENCE +{ + incomingTrunkGroupID [1] UTF8String OPTIONAL, + -- identifies the incoming PSTN leg. Format as defined by the CSP. + outgoingTrunkGroupID [2] UTF8String OPTIONAL, + -- identifies the outgoing PSTN leg. Format as defined by the CSP. + ... +} + +InterOperatorIDs ::= SEQUENCE +{ + originatingInterOperatorID [1] UTF8String OPTIONAL, + -- orig-ioi formated as defined in IETF RFC 7315 [55]. + terminatingInterOperatorID [2] UTF8String OPTIONAL, + -- term-ioi, formated as defined in IETF RFC 7315 [55]. + transitInterOperatorIDList [3] UTF8String OPTIONAL, + -- transit-ioi-list, formated as defined in IETF RFC 7315 [55]. + ... +} + -- ======================= -- Device Data definitions -- ======================= @@ -1678,7 +1700,9 @@ MsgTransmission ::= SEQUENCE ..., messageID [10] MessageID OPTIONAL, sourceServerName [11] UTF8String OPTIONAL, - destinationServerName [12] UTF8String OPTIONAL + destinationServerName [12] UTF8String OPTIONAL, + clientPort [13] PortNumber OPTIONAL, + serverPort [14] PortNumber OPTIONAL } MsgStoreOperation ::= SEQUENCE @@ -1700,7 +1724,11 @@ MsgStoreOperation ::= SEQUENCE addMsg(5), -- E.g. the APPEND command in IMAP ..., - editMsg(6) + editMsg(6), + sendMsg(7), + -- Only applicable to webmail solutions + forwardMsg(8) + -- Only applicable to webmail solutions } OPTIONAL, senderAddress [5] MsgAddress OPTIONAL, -- For Internet email, use the From address in the mail headers @@ -1716,7 +1744,9 @@ MsgStoreOperation ::= SEQUENCE clientID [8] IPAddress OPTIONAL, serverID [9] IPAddress OPTIONAL, ..., - messageID [10] MessageID OPTIONAL + messageID [10] MessageID OPTIONAL, + clientPort [11] PortNumber OPTIONAL, + serverPort [12] PortNumber OPTIONAL } MessageID ::= UTF8String @@ -1928,8 +1958,10 @@ MultimediaServiceUsage ::= SEQUENCE relayIP [20] IPAddress OPTIONAL, vmLength [21] INTEGER OPTIONAL, -- number of seconds reason [22] UTF8String OPTIONAL, - smsInformation [23] SmsInformation OPTIONAL, - mmsInformation [24] MmsInformation OPTIONAL + smsInformation [23] SmsInformation OPTIONAL, + mmsInformation [24] MmsInformation OPTIONAL, + trunkGroupIDs [25] TrunkGroupIDs OPTIONAL, + interOperatorIDs [26] InterOperatorIDs OPTIONAL } MultimediaPartyInformation ::= SEQUENCE @@ -2403,9 +2435,13 @@ WifiInformation ::= SEQUENCE accessPointAdditionalDescriptions [8] SEQUENCE OF UTF8String OPTIONAL, -- Informal description of location, category or type of access point, -- or a name of the network to which the access point belongs. - accessPointAdditionalProviders [9] SEQUENCE OF UTF8String OPTIONAL + accessPointAdditionalProviders [9] SEQUENCE OF UTF8String OPTIONAL, -- For WiFi, there may be other parties involved in hosting or owning the -- Access Points, e.g. access point provider or partner providers + cSPDefinedName [10] UTF8String OPTIONAL + -- CSP-defined label or name assigned to the access point. + -- The access points of a CSP within a venue or geographical location + -- typically share this name. } AuthenticationType ::= ENUMERATED @@ -2787,6 +2823,17 @@ IPAddress ::= CHOICE ... } +PortNumber ::= CHOICE +{ + tCPPort [0] TCPPort, + uDPPort [1] UDPPort, + ... +} + +TCPPort ::= INTEGER (1..65535) + +UDPPort ::= INTEGER (0..65535) + NAAssignedAddress ::= SEQUENCE { addressSetOrRangeOrMask [1] IPAddressSetOrRangeOrMask OPTIONAL, diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd index e74c0c2..39e5551 100644 --- a/102657/RDMessage.xsd +++ b/102657/RDMessage.xsd @@ -1,8 +1,8 @@ - + - XSD translated from ASN.1 derived from outcome of TS 102 657 v1.27.1 + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.28.1 @@ -223,6 +223,21 @@ + + + + + + + + + + + + + + + @@ -349,6 +364,24 @@ + + + + + + + + + + + + + + + + + + @@ -1089,6 +1122,8 @@ + + @@ -1755,6 +1790,8 @@ + + @@ -1773,6 +1810,8 @@ + + @@ -1796,6 +1835,8 @@ + + @@ -2157,6 +2198,7 @@ + @@ -2868,6 +2910,8 @@ + + -- GitLab From 9c55a97c5e1a9e89442a954d447bc0fd41d879ed Mon Sep 17 00:00:00 2001 From: markc Date: Fri, 22 Oct 2021 14:16:39 +0200 Subject: [PATCH 14/18] TS 103 221-1 CR028 - Hashed Identifiers --- 103221-1/TS_103_221_01.xsd | 11 ++++- 103221-1/TS_103_221_01_HashedID.xsd | 45 ++++++++++++++++++++ 103221-1/examples/CreateHashedID_example.xml | 38 +++++++++++++++++ 3 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 103221-1/TS_103_221_01_HashedID.xsd create mode 100644 103221-1/examples/CreateHashedID_example.xml diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd index 82e0492..3752f66 100644 --- a/103221-1/TS_103_221_01.xsd +++ b/103221-1/TS_103_221_01.xsd @@ -1,6 +1,14 @@ - + + + @@ -179,6 +187,7 @@ + diff --git a/103221-1/TS_103_221_01_HashedID.xsd b/103221-1/TS_103_221_01_HashedID.xsd new file mode 100644 index 0000000..90f961d --- /dev/null +++ b/103221-1/TS_103_221_01_HashedID.xsd @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/103221-1/examples/CreateHashedID_example.xml b/103221-1/examples/CreateHashedID_example.xml new file mode 100644 index 0000000..89dea20 --- /dev/null +++ b/103221-1/examples/CreateHashedID_example.xml @@ -0,0 +1,38 @@ + + + + admfID + neID + 2017-10-06T18:46:21.247432Z + v1.9.1 + f9138c05-f82e-4cf4-a1ae-ae92fed2d564 + + 30fbde5e-3195-4a22-b3e9-15e1d60d0528 + sha-256 + 4241792fc4d3d097 + + + + admfID + neID + 2017-10-06T18:46:21.247432Z + v1.9.1 + f9138c05-f82e-4cf4-a1ae-ae92fed2d565 + + 30fbde5e-3195-4a22-b3e9-15e1d60d0529 + + + + 30fbde5e-3195-4a22-b3e9-15e1d60d0528 + InternationalE164 + 303e57c6968f308a6a7df0ef48c0e21580bc29ae2ed1bd8e5466eb42e72cc39a + + + + X2andX3 + + + + -- GitLab From 52d74c4c201efe95fe059b5ee8a4b2ebff943826 Mon Sep 17 00:00:00 2001 From: markc Date: Fri, 22 Oct 2021 15:27:47 +0200 Subject: [PATCH 15/18] Merge branch 'cr/TS103221-1/029' into 'master' Added EUI64 in TargetIdentifier See merge request li/trial!49 --- 103221-1/TS_103_221_01.xsd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd index 3752f66..d018f8f 100644 --- a/103221-1/TS_103_221_01.xsd +++ b/103221-1/TS_103_221_01.xsd @@ -187,7 +187,8 @@ - + + -- GitLab From f09ba7fbd8d7c5fcc122e3eb3124f66b5effc32a Mon Sep 17 00:00:00 2001 From: markc Date: Fri, 22 Oct 2021 15:41:05 +0200 Subject: [PATCH 16/18] Addition of listOfServiceTypes to TaskDetails. --- 103221-1/TS_103_221_01.xsd | 1 + 1 file changed, 1 insertion(+) diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd index d018f8f..a4b3d6c 100644 --- a/103221-1/TS_103_221_01.xsd +++ b/103221-1/TS_103_221_01.xsd @@ -144,6 +144,7 @@ + -- GitLab From ba3461c650a5228da6f9a4113ba4e796effbcf14 Mon Sep 17 00:00:00 2001 From: markc Date: Fri, 22 Oct 2021 16:24:58 +0200 Subject: [PATCH 17/18] Cleanup/ts103120 --- 103120/examples/FooServiceSchema.xsd | 27 ++ 103120/examples/example.key | 28 ++ 103120/examples/example.pem | 19 ++ .../mutliple-auth-example-request.xml | 2 +- 103120/examples/request1.xml | 2 +- 103120/examples/request2.xml | 2 +- 103120/examples/request3.xml | 2 +- 103120/examples/request4.xml | 2 +- 103120/examples/request5-Binary-Delivery.xml | 2 +- 103120/examples/request5-XML-Delivery.xml | 2 +- 103120/examples/request6_signed.xml | 118 +++++++ 103120/examples/response1.xml | 2 +- 103120/examples/response2.xml | 2 +- 103120/examples/response3.xml | 2 +- 103120/examples/response4.xml | 2 +- 103120/examples/response5.xml | 2 +- testing/check_xsd.py | 53 ++- testing/deps/xmldsig/xmldsig-core-schema.xsd | 318 ++++++++++++++++++ 18 files changed, 568 insertions(+), 19 deletions(-) create mode 100644 103120/examples/FooServiceSchema.xsd create mode 100644 103120/examples/example.key create mode 100644 103120/examples/example.pem create mode 100644 103120/examples/request6_signed.xml create mode 100644 testing/deps/xmldsig/xmldsig-core-schema.xsd diff --git a/103120/examples/FooServiceSchema.xsd b/103120/examples/FooServiceSchema.xsd new file mode 100644 index 0000000..5657394 --- /dev/null +++ b/103120/examples/FooServiceSchema.xsd @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/103120/examples/example.key b/103120/examples/example.key new file mode 100644 index 0000000..b5959e7 --- /dev/null +++ b/103120/examples/example.key @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDc9UQSsRmchhOC +ixyrHvmjmDFeIApVlfTfVV5RJL/280wDlAYymhAcEcvMOyvBCHq4c3M8hBxt9zKD +mV+NbcDqXyblt8rVpjzbggn3Ch2dMJ/kLNO+O+WJSl3Jpyx3b4r8IVoUDXai2sjX +8jLNYI4TC673X3xX1VikzcGwFjt2zbL+WLHEnvUVeG/8FJfRl2ttWlSFMA2252ak +OwtAPF4AKJBW5pXSeILA+K32bf+Y5JMODWwI+njylAafTFV1eM/dTOSEKYCHVCN0 +cxiO6KCC2GSzLeQEGWmh/C+uyhSlLW/6EyEHJcLdi6eTPunYJGanai6PLLr5zNWX +lvcj/YbZAgMBAAECggEAbm1BPRo3U4uKWpaNmFPdrU3VdlYK9CUCgU8X2PPF4HRN +TAiBZG6smGqocIQt5MYJFv/T2q2ny6lcHHrdT0BHxpoRRYMqIsZ26bk+o7DxheqU +LiPdGtiyaX+6CZq71WDwk/tTGmx0GwW+lHXdv9h+iLQxGD4nVXoxWAPgxdEGnONY +gSYbOhXz+MEFZaW8HnVPfoA+RR9Hg59gnmBCZlhbahqf3WnjAwgS0nsbSUN57wVi +FcWHWLyzv94bQHcTgalXqVakQv5+ymJKF4ImiYUP2rLPQ8ubqwmdQ6xI8Gp3AGCr +FY5koP3JT2mMY+aZJEEGWE3U4JRDyrkOpI34No8iEQKBgQD6niFOopCjE2k7eIFr +c+s5Khp3ITmcgV4tycxngXOQw8GnPEzzZUW7xodTiMPLYz/8lFbJvCAWCeQpmVWX +U8OX9anzY0U0ILbolXpdpGdZkBHbKWtAVBNOZ/lY0SAmt6/ZWf/EcqpMm/fH+iph +aqafwQuX4qhy9HlwY2qwyj5y5QKBgQDhtBH9/9Hy0X2HI+uzNRaU0y1BqvuqjHOf +1v57DM5uYF0MAp1SAfAJcx+jUXdf28Nr4GlxBIvQumq6rsvfKhqBINsKgJf/4+PA +Lv+fofeUEEqrGHuecB4NbdHP5XIIiuyyuOtRhGq/sclOQSZAa1kxajGvDI1AVHL4 +LCwcy9HA5QKBgQDIq+2HhWvC6DwOvoMCgyMJ9siSMyxqQLwkdb0R8/mRJO3e9s22 +5pRbsq+RF6WPKb2GhVCo39XhT7I+DOUX8p5fAvo+RHKZNsi+m1ILwSRv9ogVsKiM +LcX3thFWKL1RwysvIn1F03rBNPHGUm206yzYJj8eMwMmaNMERtabEJXIcQKBgHct +Kvbwlr5daafrCrDkzlilLVdoXlzOrtrung8BUxsrHNaTptg/l6yVslX9VUgzdXvH +0kVP/jenx2VtmM7sn3Qhkid4gUon3gGDj4yN7HmtJJA1bEjbsLKsk0XwRIdIO/We ++PphLjCsQrxkYDtRs5YJGdTxjsAyF0b9pAlMgiQVAoGBAK/NGV5+IPDHEmz0CNJN +ApaA2jG8KrsIPWNpgOC3CxPMT3kWYK601y0CLw8ZpUnVTMfPkKMSOVsqaOpHV6eP +Oecq3bP1CiNunro+j3EOIDIST2ttrlNuKIBaiz63ZMNDbs/DyaGL8Zf688OJCXsb +yCWSJh8NbrNblNfI0jaMoTGw +-----END PRIVATE KEY----- diff --git a/103120/examples/example.pem b/103120/examples/example.pem new file mode 100644 index 0000000..2aa1eac --- /dev/null +++ b/103120/examples/example.pem @@ -0,0 +1,19 @@ +-----BEGIN CERTIFICATE----- +MIIC/zCCAeegAwIBAgIUUOGdj0hEfnnW9gqIOCTJ9EUocnMwDQYJKoZIhvcNAQEL +BQAwDzENMAsGA1UEAwwEdGVzdDAeFw0yMTA2MjUwNzIyMDlaFw0yNDAzMjEwNzIy +MDlaMA8xDTALBgNVBAMMBHRlc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK +AoIBAQDc9UQSsRmchhOCixyrHvmjmDFeIApVlfTfVV5RJL/280wDlAYymhAcEcvM +OyvBCHq4c3M8hBxt9zKDmV+NbcDqXyblt8rVpjzbggn3Ch2dMJ/kLNO+O+WJSl3J +pyx3b4r8IVoUDXai2sjX8jLNYI4TC673X3xX1VikzcGwFjt2zbL+WLHEnvUVeG/8 +FJfRl2ttWlSFMA2252akOwtAPF4AKJBW5pXSeILA+K32bf+Y5JMODWwI+njylAaf +TFV1eM/dTOSEKYCHVCN0cxiO6KCC2GSzLeQEGWmh/C+uyhSlLW/6EyEHJcLdi6eT +PunYJGanai6PLLr5zNWXlvcj/YbZAgMBAAGjUzBRMB0GA1UdDgQWBBSFT3NqexF1 +LcYkjqUr9MMTIFp/ATAfBgNVHSMEGDAWgBSFT3NqexF1LcYkjqUr9MMTIFp/ATAP +BgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCzwydpNgq680qWmd0D +4ya9fHUopeX7LBSYOU7NU3CagjXnUMwaCmSpokkH0Wvn1UtXDUF+slA9bEeXkfZm +70YW8msIEt1mljDi4CBI+MvaJ40OJkXwkQUE3dhj9LJl5Nv0UBEyv7k/a/6+eO9K +OQoHIVqXwrWs9JHTW6T4diN1w7xcgvSXhlcOySHjfNzFzferqx8i0/Wz6jD/7YSC +FOEaUrXbeFS3asRoZRLW6uXgfDJ7qfCmUZZ853OF3MN63OwWjPGxtFmeZAqMS/K0 +FKgwMCrmZlVq6Fx87E+sc3eppXIceCau/+CHG91mRvMSha6jQD7jLMT9xjND5Dob +/scV +-----END CERTIFICATE----- diff --git a/103120/examples/mutliple-auth-example-request.xml b/103120/examples/mutliple-auth-example-request.xml index 5e5f226..8fd893c 100644 --- a/103120/examples/mutliple-auth-example-request.xml +++ b/103120/examples/mutliple-auth-example-request.xml @@ -12,7 +12,7 @@ d442c58c-d5e1-4fd9-90ec-9c228ad947f1 2020-09-22T08:06:17.025833Z - V1.8.1 + V1.10.1 XX v1.1.1 diff --git a/103120/examples/request1.xml b/103120/examples/request1.xml index d0b64ee..a5e40d6 100644 --- a/103120/examples/request1.xml +++ b/103120/examples/request1.xml @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2015-09-01T12:00:00.000000Z - V1.8.1 + V1.10.1 XX v1.0 diff --git a/103120/examples/request2.xml b/103120/examples/request2.xml index 67cbefd..2b1d012 100644 --- a/103120/examples/request2.xml +++ b/103120/examples/request2.xml @@ -12,7 +12,7 @@ 45002c1e-dc4a-470a-9152-8e752638c86c 2015-09-01T12:01:00.000000Z - V1.8.1 + V1.10.1 XX v1.0 diff --git a/103120/examples/request3.xml b/103120/examples/request3.xml index c93bb7a..dce6620 100644 --- a/103120/examples/request3.xml +++ b/103120/examples/request3.xml @@ -12,7 +12,7 @@ 69353ac0-9582-4c71-b162-86259c99de20 2015-09-01T12:02:00.000000Z - V1.8.1 + V1.10.1 XX v1.0 diff --git a/103120/examples/request4.xml b/103120/examples/request4.xml index 6296da5..73d6c07 100644 --- a/103120/examples/request4.xml +++ b/103120/examples/request4.xml @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2019-09-30T13:37:00.000000Z - V1.8.1 + V1.10.1 XX v1.0 diff --git a/103120/examples/request5-Binary-Delivery.xml b/103120/examples/request5-Binary-Delivery.xml index 7d51707..2a13dfb 100644 --- a/103120/examples/request5-Binary-Delivery.xml +++ b/103120/examples/request5-Binary-Delivery.xml @@ -12,7 +12,7 @@ 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.8.1 + V1.10.1 XX v1.0 diff --git a/103120/examples/request5-XML-Delivery.xml b/103120/examples/request5-XML-Delivery.xml index f9314cd..c345dbb 100644 --- a/103120/examples/request5-XML-Delivery.xml +++ b/103120/examples/request5-XML-Delivery.xml @@ -12,7 +12,7 @@ 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.8.1 + V1.10.1 XX v1.0 diff --git a/103120/examples/request6_signed.xml b/103120/examples/request6_signed.xml new file mode 100644 index 0000000..2bc0404 --- /dev/null +++ b/103120/examples/request6_signed.xml @@ -0,0 +1,118 @@ + +
+ + XX + ACTOR01 + + + XX + ACTOR02 + + 9964584e-c1a5-4ffa-b949-d9da504c4efb + 2021-06-25T12:00:00.000000Z + + V1.9.1 + XX + v1.0 + +
+ + + + + 0 + + + 68c78910-c922-45f2-aeb3-017eb958bb05 + XX + ACTOR01 + W000001 + + 2021-06-25T12:00:00Z + 2021-09-01T12:00:00Z + + + + + + 1 + + + 4d8127db-e8bc-4a69-9378-457f0424ec2c + XX + ACTOR01 + + 68c78910-c922-45f2-aeb3-017eb958bb05 + + LIID1 + + + + + ETSI + InternationalizedEmailAddress + + Όνομα.παραδείγματος@example.com + + + + + ETSI + TaskDeliveryType + IRIandCC + + + + + 192.0.2.0 + + + + + XX + RECVER01 + + + + + + + + + + + + + + + + + + kARbaz+wH6oJWSvmy6Fk4vTQ7t4m3Y16IiNNdDO08/I= + + + DdT9ie03Z9O47sN8ad9gsfuhZhchtNhtvTyNhtiHKuqgNCt696tDH2c68tVqr+iJ3WpCn0gWJHKnYeniTwVPj6fxDh2RbCqk5SVHvdggZjCv3BInNH0ZfOrlvuArJS3UP/gifYXlT5s59Seze1nSjZDNeC25o9WRxNy0krGrhbqIFjxTHDilR40cmKq2SI1540yM3rsc+5D3hgsxGu7ly2dg7qtiFGQIQaFJi8twrViQUnOyDZ63yJHhWeLVU+2FvIuBZh3orDc3VipKsbqrjrDqdfi8qfYEHHPp25DfTpHXnCuhD/3hOwcxvhVJ4+47R8ysO9qMTvGRCUNptgskhQ== + + + MIIC/zCCAeegAwIBAgIUUOGdj0hEfnnW9gqIOCTJ9EUocnMwDQYJKoZIhvcNAQEL +BQAwDzENMAsGA1UEAwwEdGVzdDAeFw0yMTA2MjUwNzIyMDlaFw0yNDAzMjEwNzIy +MDlaMA8xDTALBgNVBAMMBHRlc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK +AoIBAQDc9UQSsRmchhOCixyrHvmjmDFeIApVlfTfVV5RJL/280wDlAYymhAcEcvM +OyvBCHq4c3M8hBxt9zKDmV+NbcDqXyblt8rVpjzbggn3Ch2dMJ/kLNO+O+WJSl3J +pyx3b4r8IVoUDXai2sjX8jLNYI4TC673X3xX1VikzcGwFjt2zbL+WLHEnvUVeG/8 +FJfRl2ttWlSFMA2252akOwtAPF4AKJBW5pXSeILA+K32bf+Y5JMODWwI+njylAaf +TFV1eM/dTOSEKYCHVCN0cxiO6KCC2GSzLeQEGWmh/C+uyhSlLW/6EyEHJcLdi6eT +PunYJGanai6PLLr5zNWXlvcj/YbZAgMBAAGjUzBRMB0GA1UdDgQWBBSFT3NqexF1 +LcYkjqUr9MMTIFp/ATAfBgNVHSMEGDAWgBSFT3NqexF1LcYkjqUr9MMTIFp/ATAP +BgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCzwydpNgq680qWmd0D +4ya9fHUopeX7LBSYOU7NU3CagjXnUMwaCmSpokkH0Wvn1UtXDUF+slA9bEeXkfZm +70YW8msIEt1mljDi4CBI+MvaJ40OJkXwkQUE3dhj9LJl5Nv0UBEyv7k/a/6+eO9K +OQoHIVqXwrWs9JHTW6T4diN1w7xcgvSXhlcOySHjfNzFzferqx8i0/Wz6jD/7YSC +FOEaUrXbeFS3asRoZRLW6uXgfDJ7qfCmUZZ853OF3MN63OwWjPGxtFmeZAqMS/K0 +FKgwMCrmZlVq6Fx87E+sc3eppXIceCau/+CHG91mRvMSha6jQD7jLMT9xjND5Dob +/scV + + + + + \ No newline at end of file diff --git a/103120/examples/response1.xml b/103120/examples/response1.xml index 25aa22c..54fad1c 100644 --- a/103120/examples/response1.xml +++ b/103120/examples/response1.xml @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2015-09-01T12:00:01.000000Z - V1.8.1 + V1.10.1 XX v1.0 diff --git a/103120/examples/response2.xml b/103120/examples/response2.xml index 3f3e550..104a76f 100644 --- a/103120/examples/response2.xml +++ b/103120/examples/response2.xml @@ -12,7 +12,7 @@ 45002c1e-dc4a-470a-9152-8e752638c86c 2015-09-01T12:01:00.000000Z - V1.8.1 + V1.10.1 XX v1.0 diff --git a/103120/examples/response3.xml b/103120/examples/response3.xml index e3b1537..445187d 100644 --- a/103120/examples/response3.xml +++ b/103120/examples/response3.xml @@ -12,7 +12,7 @@ 69353ac0-9582-4c71-b162-86259c99de20 2015-09-01T12:02:00.000000Z - V1.8.1 + V1.10.1 XX v1.0 diff --git a/103120/examples/response4.xml b/103120/examples/response4.xml index a8dc811..3ca45c2 100644 --- a/103120/examples/response4.xml +++ b/103120/examples/response4.xml @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2019-09-30T13:37:01.000000Z - V1.8.1 + V1.10.1 XX v1.0 diff --git a/103120/examples/response5.xml b/103120/examples/response5.xml index 32bfcd1..d02dff5 100644 --- a/103120/examples/response5.xml +++ b/103120/examples/response5.xml @@ -17,7 +17,7 @@ 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.8.1 + V1.10.1 XX v1.0 diff --git a/testing/check_xsd.py b/testing/check_xsd.py index db4ee8c..816e389 100644 --- a/testing/check_xsd.py +++ b/testing/check_xsd.py @@ -11,7 +11,6 @@ from lxml import etree from xml.etree.ElementTree import ParseError from xmlschema import XMLSchema, XMLSchemaParseError - def BuildSchemaDictonary (fileList): if len(fileList) == 0: logging.info("No schema files provided") @@ -22,7 +21,7 @@ def BuildSchemaDictonary (fileList): for schemaFile in fileList: try: xs = XMLSchema(schemaFile, validation='skip') - schemaLocations.append((xs.default_namespace, str(Path(schemaFile).resolve()))) + schemaLocations.append((xs.target_namespace, str(Path(schemaFile).resolve()))) logging.info(" [ {0} -> {1} ]".format(xs.default_namespace, schemaFile)) except ParseError as ex: logging.warning (" [ {0} failed to parse: {1} ]".format(schemaFile, ex)) @@ -53,6 +52,7 @@ def ValidateXSDFiles (fileList): schemaLocations = BuildSchemaDictonary(fileList) errors = {} + schemaDictionary = {} logging.info("Schema validation:") for schemaFile in fileList: @@ -60,6 +60,7 @@ def ValidateXSDFiles (fileList): schema = XMLSchema(schemaFile, locations = schemaLocations) logging.info(schemaFile + ": OK") errors[schemaFile] = [] + schemaDictionary[schema.target_namespace] = schema except XMLSchemaParseError as ex: if (ex.schema_url) and (ex.schema_url != ex.origin_url): logging.info(" Error {1} comes from {0}, suppressing".format(ex.schema_url, ex.message)) @@ -67,7 +68,7 @@ def ValidateXSDFiles (fileList): else: logging.warning(schemaFile + ": Failed validation ({0})".format(ex)) errors[schemaFile] = [ex.message] - return errors + return errors, schemaDictionary def ValidateInstanceDocuments (coreFile, supportingSchemas, instanceDocs): @@ -91,6 +92,7 @@ if __name__ == '__main__': parser = argparse.ArgumentParser() parser.add_argument("-v", "--verbosity", help="verbosity level", action="count", default=0) parser.add_argument("input", help="include a directory or file", action="append", nargs="+") + parser.add_argument("-p", "--primaryNamespace", help="Primary schema namespace for instance doc validation") args = parser.parse_args() logging.getLogger().setLevel(logging.WARNING) @@ -100,8 +102,10 @@ if __name__ == '__main__': logging.getLogger().setLevel(logging.DEBUG) logging.debug("Very verbose selected") + logging.debug(f"Path: {args.input}") includeFileList = [] + includeInstanceDocList = [] for path in args.input[0]: p = Path(path) if not p.exists(): @@ -112,12 +116,25 @@ if __name__ == '__main__': for g in glob.glob(os.path.join(str(p), "*.xsd")): logging.info(f">Including {g}") includeFileList.append(g) + for g in glob.glob(os.path.join(str(p), "*.xml")): + logging.info(f">Including instance doc {g}") + includeInstanceDocList.append(g) else: - logging.info(f"Including {p.absolute()}") - includeFileList.append(p.absolute()) + logging.info(f">Including {p.absolute()}") + if str(p.absolute()).endswith('.xml'): + includeInstanceDocList.append(str(p.absolute())) + elif str(p.absolute()).endswith('.xsd'): + includeFileList.append(str(p.absolute())) + else: + logging.warning(f'Ignoring file {p.absolute()}') + if len(includeInstanceDocList) and (args.primaryNamespace is None): + print("Cannot validate instance documents without specifying a primary namespace (use -h for usage guidelines)") + exit(-1) + syntaxErrors = 0 + print ("=============================") print ("XSD syntax checks:") print ("-----------------------------") for file in includeFileList: @@ -132,9 +149,12 @@ if __name__ == '__main__': if (syntaxErrors > 0): print (f"{syntaxErrors} syntax errors detected") exit(syntaxErrors) + else: + print ("0 syntax errors detected") - results = ValidateXSDFiles(includeFileList) + results, schemaDict = ValidateXSDFiles(includeFileList) + print ("=============================") print ("XSD build checks:") print ("-----------------------------") errorCount = 0 @@ -152,4 +172,23 @@ if __name__ == '__main__': print ("-----------------------------") print (f"{errorCount} build errors detected") - exit(errorCount) \ No newline at end of file + if (errorCount > 0): + exit(errorCount) + + print ("=============================") + print ("Instance document checks") + print ("-----------------------------") + errorCount = 0 + + primarySchema = schemaDict[args.primaryNamespace] + for instanceDoc in includeInstanceDocList: + try: + results = primarySchema.validate(instanceDoc) + print (f" {instanceDoc} : OK") + except Exception as ex: + errorCount += 1 + print (f" {instanceDoc} : {str(ex)}") + print ("-----------------------------") + print (f"{errorCount} instance doc errors detected") + print ("=============================") + exit(errorCount) diff --git a/testing/deps/xmldsig/xmldsig-core-schema.xsd b/testing/deps/xmldsig/xmldsig-core-schema.xsd new file mode 100644 index 0000000..df126b3 --- /dev/null +++ b/testing/deps/xmldsig/xmldsig-core-schema.xsd @@ -0,0 +1,318 @@ + + + + + + ]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- GitLab From 91534e4fc74ccd52714e0da85c65b994eec20ea7 Mon Sep 17 00:00:00 2001 From: canterburym Date: Wed, 12 Jan 2022 14:08:56 +0000 Subject: [PATCH 18/18] Post-publication updates --- 103221-1/TS_103_221_01.xsd | 67 +++++----------- 103221-1/TS_103_221_01_HashedID.xsd | 76 ++++++++----------- 103221-1/examples/CreateObject_example.xml | 2 +- .../GetAllDetailsResponse_example2.xml | 2 +- .../examples/GetObjectResponse_example.xml | 2 +- 103221-1/examples/GetObject_example.xml | 2 +- .../ListAllDetailsResponse_example2.xml | 2 +- 103221-1/examples/ListObject_example.xml | 2 +- 103280/TS_103_280.asn1 | 2 +- 103280/TS_103_280.xsd | 6 +- 103707/TS_103_707.xsd | 2 +- 11 files changed, 65 insertions(+), 100 deletions(-) diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd index a4b3d6c..490e9c4 100644 --- a/103221-1/TS_103_221_01.xsd +++ b/103221-1/TS_103_221_01.xsd @@ -1,14 +1,7 @@ - - + - + @@ -188,8 +181,8 @@ - - + + @@ -674,7 +667,7 @@ - + @@ -807,33 +800,28 @@ - - + - - + - - - + + - - + - @@ -843,17 +831,15 @@ - - + - @@ -863,54 +849,47 @@ - - + - - + - - - + + - - + - - + - - + - @@ -920,31 +899,27 @@ - - + - - + - - + - diff --git a/103221-1/TS_103_221_01_HashedID.xsd b/103221-1/TS_103_221_01_HashedID.xsd index 90f961d..f5e735d 100644 --- a/103221-1/TS_103_221_01_HashedID.xsd +++ b/103221-1/TS_103_221_01_HashedID.xsd @@ -1,45 +1,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/103221-1/examples/CreateObject_example.xml b/103221-1/examples/CreateObject_example.xml index 514a182..3b0e3e9 100644 --- a/103221-1/examples/CreateObject_example.xml +++ b/103221-1/examples/CreateObject_example.xml @@ -6,7 +6,7 @@ admfID neID 2017-10-06T18:46:21.247432Z - v1.9.1 + v1.10.1 3741800e-971b-4aa9-85f4-466d2b1adc7f 3741800e-971b-4aa9-85f4-466d2b1adc7e diff --git a/103221-1/examples/GetAllDetailsResponse_example2.xml b/103221-1/examples/GetAllDetailsResponse_example2.xml index 0810429..61ac922 100644 --- a/103221-1/examples/GetAllDetailsResponse_example2.xml +++ b/103221-1/examples/GetAllDetailsResponse_example2.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.496743Z - v1.9.1 + v1.10.1 bfd0c982-b7d6-4a8e-80a0-89dab964aafd OK diff --git a/103221-1/examples/GetObjectResponse_example.xml b/103221-1/examples/GetObjectResponse_example.xml index 4892d37..b7f58e7 100644 --- a/103221-1/examples/GetObjectResponse_example.xml +++ b/103221-1/examples/GetObjectResponse_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.247432Z - v1.6.1 + v1.10.1 3741800e-971b-4aa9-85f4-466d2b1adc7f diff --git a/103221-1/examples/GetObject_example.xml b/103221-1/examples/GetObject_example.xml index 8a47ff2..8ffc3fa 100644 --- a/103221-1/examples/GetObject_example.xml +++ b/103221-1/examples/GetObject_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.247432Z - v1.6.1 + v1.10.1 3741800e-971b-4aa9-85f4-466d2b1adc7f 3741800e-971b-4aa9-85f4-466d2b1adc7e diff --git a/103221-1/examples/ListAllDetailsResponse_example2.xml b/103221-1/examples/ListAllDetailsResponse_example2.xml index d694b12..7ca03d6 100644 --- a/103221-1/examples/ListAllDetailsResponse_example2.xml +++ b/103221-1/examples/ListAllDetailsResponse_example2.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.508330Z - v1.6.1 + v1.10.1 09529160-2e44-49c6-bf54-204ca5edcfab 29f28e1c-f230-486a-a860-f5a784ab9172 diff --git a/103221-1/examples/ListObject_example.xml b/103221-1/examples/ListObject_example.xml index 6e6187b..26a1aad 100644 --- a/103221-1/examples/ListObject_example.xml +++ b/103221-1/examples/ListObject_example.xml @@ -4,7 +4,7 @@ admfID neID 2017-10-06T18:46:21.247432Z - v1.6.1 + v1.10.1 3741800e-971b-4aa9-85f4-466d2b1adc7f Q{http://uri.etsi.org/03221/X1/2017/10}Foo diff --git a/103280/TS_103_280.asn1 b/103280/TS_103_280.asn1 index c7b31a6..68cfe54 100644 --- a/103280/TS_103_280.asn1 +++ b/103280/TS_103_280.asn1 @@ -91,4 +91,4 @@ GPSINAI ::= NAI NAI ::= UTF8String -END \ No newline at end of file +END diff --git a/103280/TS_103_280.xsd b/103280/TS_103_280.xsd index a6ec077..d6d91c5 100644 --- a/103280/TS_103_280.xsd +++ b/103280/TS_103_280.xsd @@ -1,5 +1,5 @@ - + @@ -241,9 +241,9 @@ - + - \ No newline at end of file + diff --git a/103707/TS_103_707.xsd b/103707/TS_103_707.xsd index b503368..7bce63d 100644 --- a/103707/TS_103_707.xsd +++ b/103707/TS_103_707.xsd @@ -3,7 +3,7 @@ xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07" xmlns="http://uri.etsi.org/03707/2020/02" targetNamespace="http://uri.etsi.org/03707/2020/02" - version="1.3.1" + version="1.4.1" elementFormDefault="qualified"> -- GitLab