diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn
index 6def9ef41abb49dbb2822b8705affa36cfb6617f..e8b6eedb2dcfde2b5c02450ed79ac1417d4a47e6 100644
--- a/102232-1/LI-PS-PDU.asn
+++ b/102232-1/LI-PS-PDU.asn
@@ -1,5 +1,5 @@
LI-PS-PDU
-{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version30(30)}
+{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version31(31)}
DEFINITIONS IMPLICIT TAGS ::=
@@ -54,7 +54,7 @@ IMPORTS
IPMMCC,
IPMMIRI
FROM IPMultimediaPDU
- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version10(10)}
+ {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version12(12)}
-- from ETSI TS 102 232-6 [36]
PstnIsdnCC,
@@ -199,7 +199,9 @@ IMPORTS
-- This import is only used for the handover between LEMFs.
-- from 3GPP TS 33.128 [46]
- LINotificationPayload
+ LINotificationPayload,
+ IRIPayload,
+ CCPayload
FROM TS33128Payloads
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19)};
-- The relevant module (including the 3GPP release and version number)
@@ -213,7 +215,7 @@ IMPORTS
lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)}
-li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version30(30)}
+li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version31(31)}
-- ====================
-- Top-level definition
@@ -270,7 +272,7 @@ TimeStampQualifier ::= ENUMERATED
HI4Payload ::= CHOICE
{
- threeGPP-LI-Notification [1] TS33128Payloads.LiNotificationPayload,
+ threeGPP-LI-Notification [1] TS33128Payloads.LINotificationPayload,
...
}
@@ -355,7 +357,8 @@ CCContents ::= CHOICE
voipCC-CC-PDU [20] VoIP-HI3-IMS.Voip-CC-PDU,
gcseCC-CC-PDU [21] GCSE-HI3.Gcse-CC-PDU,
cSvoice-CC-PDU [22] CSvoice-HI3-IP.CSvoice-CC-PDU,
- threeGPP33128DefinedCC [23] OCTET STRING }
+ threeGPP33128DefinedCC [23] OCTET STRING (CONTAINING TS33128Payloads.CCPayload)
+}
MicroSecondTimeStamp ::= SEQUENCE
{
@@ -420,7 +423,8 @@ IRIContents ::= CHOICE
confIRI [16] ConfIRI,
proseIRI [17] ProSeIRI,
gcseIRI [18] GcseIRI,
- threeGPP33128DefinedIRI [19] OCTET STRING}
+ threeGPP33128DefinedIRI [19] OCTET STRING (CONTAINING TS33128Payloads.IRIPayload)
+}
UMTSIRI ::= CHOICE
-- This structure may be commented out if not used
diff --git a/102232-3/IPAccessPDU.asn b/102232-3/IPAccessPDU.asn
index 5c84c657f24aadf06b6070092b352167ebfeb873..2461f42b953c35fe46ac3b864766af5c1364062f 100644
--- a/102232-3/IPAccessPDU.asn
+++ b/102232-3/IPAccessPDU.asn
@@ -1,12 +1,13 @@
IPAccessPDU
-{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version13(13)}
+{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version14(14)}
DEFINITIONS IMPLICIT TAGS ::=
BEGIN
IMPORTS
+
-- from ETSI TS 102 232-1 [2]
- IPAddress,
+ IPAddress,
Location
FROM LI-PS-PDU
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version26(26)};
@@ -16,11 +17,12 @@ IMPORTS
-- Object Identifier Definition
-- ============================
-iPIRIObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version13(13) iRI(1)}
-iPCCObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version13(13) cC(2)}
-iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version13(13) iRIOnly(3)}
- -- all three definitions relative to {itu-t(0) identified-organization(4)
- -- etsi(0) securityDomain(2) lawfulintercept(2)}
+iPAccessPDUObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version14(14)}
+iPIRIObjId RELATIVE-OID ::= {iPAccessPDUObjId iRI(1)}
+iPCCObjId RELATIVE-OID ::= {iPAccessPDUObjId cC(2)}
+iPIRIOnlyObjId RELATIVE-OID ::= {iPAccessPDUObjId iRIOnly(3)}
+ -- all four definitions relative to {itu-t(0) identified-organization(4)
+ -- etsi(0) securityDomain(2) lawfulintercept(2)}
-- ==========================
-- IP Communications Contents
@@ -53,12 +55,12 @@ IPIRIContents ::= SEQUENCE
{
accessEventType [0] AccessEventType,
targetUsername [1] OCTET STRING,
- -- in ASCII-characters
+ -- in ASCII characters
internetAccessType [2] InternetAccessType,
iPVersion [3] IPVersion,
targetIPAddress [4] IPAddress OPTIONAL,
-- IP address may not be available in case of failed logon attempts.
- -- If it is available, it must be sent.
+ -- If it is available, it shall be sent.
-- This field will carry the first IPv4 or IPv6 target IP address with or without
-- subnet. Use of this field is fully described in section 6.2.1.
targetNetworkID [5] UTF8String (SIZE (1..20)) OPTIONAL,
@@ -112,9 +114,7 @@ IPIRIContents ::= SEQUENCE
-- This field will carry the NAS-Port-ID as defined in RFC 2869 [17]:
-- This parameter shall be populated with the RADIUS value.
framedRoutes [26] SEQUENCE OF FramedRoute OPTIONAL
- -- It is used to list all the available Framed Route and Framed IPv6 Route information
-
-
+ -- It is used to list all the available Framed Route and Framed IPv6 Route informationX
}
AccessEventType ::= ENUMERATED
@@ -141,6 +141,7 @@ AccessEventType ::= ENUMERATED
endOfInterceptionWithSessionActive(9),
-- LI is ended on a target who still has an active session
unknown(10)
+
}
InternetAccessType ::= ENUMERATED
@@ -199,7 +200,7 @@ IPIRIIDType ::= CHOICE
printableIDType [0] UTF8String (SIZE (1..128)),
-- For printable userIDs, such as the Radius username, phonenumbers
macAddressType [1] OCTET STRING (SIZE (6)),
- -- For MAC address types, raw binary format as in RFC 2132 [15]
+ -- For MAC address types, raw binary format as in IETF RFC 2132 [15]
ipAddressType [2] IPAddress,
-- For IP address types
...
@@ -241,12 +242,13 @@ OtherTargetIdentifiers ::= CHOICE
-- This list is extensible to accommodate other target identifiers which
-- may be required in future.
iPAddress [0] IPAddress,
- -- IPAddress imported from TS 102 232 [2].
+ -- IPAddress imported from ETSI TS 102 232 [2].
-- This can be an IPv4 address (with or without a subnet range defined) or
-- an IPv6 address (with or without a prefix range defined).
...
}
+
FramedRoute ::= CHOICE
{
-- Additional Framed Route prefix information associated with the target service
@@ -268,9 +270,10 @@ IPIRIOnly ::= SEQUENCE
{
iPIRIOnlyObjId [0] RELATIVE-OID,
iPInformation [1] IPInformation,
- protocolInformation [2] ProtocolInformation,
+ protocolInformation [2] ProtocolInformation,
iPAggregatedNbrOfPackets [3] INTEGER OPTIONAL,
iPAggregatedNbrOfBytes [4] INTEGER OPTIONAL,
+ pDSRInformation [5] PDSRInformation OPTIONAL,
...
}
@@ -339,5 +342,26 @@ UDPInformation ::= SEQUENCE
checkSum [3] OCTET STRING (SIZE (2))OPTIONAL
}
-END -- end of IPAccessPDU
+PDSRInformation::= SEQUENCE
+{
+ summaryTrigger [0] PDSRSummaryTrigger,
+ firstPacketTimestamp [1] GeneralizedTime,
+ lastPacketTimestamp [2] GeneralizedTime,
+ packetCount [3] INTEGER,
+ byteCount [4] INTEGER,
+ ...
+}
+
+PDSRSummaryTrigger ::= ENUMERATED
+{
+ startOfFlow(0),
+ timerExpiry(1),
+ packetCount(2),
+ byteCount(3),
+ endOfFlow(4),
+ ...
+}
+
+
+END -- end of IPAccessPDU
diff --git a/103120/examples/mutliple-auth-example-request.xml b/103120/examples/mutliple-auth-example-request.xml
new file mode 100644
index 0000000000000000000000000000000000000000..198e00ac9301711cbf02882a5d76261473d16c4a
--- /dev/null
+++ b/103120/examples/mutliple-auth-example-request.xml
@@ -0,0 +1,51 @@
+
+
+
+
+ XX
+ Sender
+
+
+ XX
+ Receiver
+
+ d442c58c-d5e1-4fd9-90ec-9c228ad947f1
+ 2020-09-22T08:06:17.025833Z
+
+ V1.7.1
+ XX
+ v1.1.1
+
+
+
+
+
+
+ 1
+
+
+ cd3994b1-e5f3-4b59-a852-5fecd02bd247
+
+ Single Approval
+
+
+
+
+
+ 2
+
+
+ 64e8681a-a4de-4dea-9686-4a2a15e54786
+
+ First of two approvals
+
+
+ Second of two approvals
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/103120/examples/request1.xml b/103120/examples/request1.xml
index d6d9abaed1c3cc409d08f91f757429c9d2771823..34ecaed2f8c9dbf1095e0789c0115e1d705ae24c 100644
--- a/103120/examples/request1.xml
+++ b/103120/examples/request1.xml
@@ -1,5 +1,5 @@
-
+
XX
@@ -12,7 +12,7 @@
c02358b2-76cf-4ba4-a8eb-f6436ccaea2e
2015-09-01T12:00:00.000000Z
- V1.5.1
+ V1.7.1
XX
v1.0
diff --git a/103120/examples/request2.xml b/103120/examples/request2.xml
index af4346d0b41b15388e10dc814dd088fd04cd3422..81476ba57e6154be6ac7a5bef0e3589de043953f 100644
--- a/103120/examples/request2.xml
+++ b/103120/examples/request2.xml
@@ -1,5 +1,5 @@
-
+
XX
@@ -12,7 +12,7 @@
45002c1e-dc4a-470a-9152-8e752638c86c
2015-09-01T12:01:00.000000Z
- V1.5.1
+ V1.7.1
XX
v1.0
diff --git a/103120/examples/request3.xml b/103120/examples/request3.xml
index fb975776f7d83e1a00e45a699ed8cafc1e9582c8..59d4621a98811473ea1b745848246e94b3d8d0d7 100644
--- a/103120/examples/request3.xml
+++ b/103120/examples/request3.xml
@@ -1,5 +1,5 @@
-
+
XX
@@ -12,7 +12,7 @@
69353ac0-9582-4c71-b162-86259c99de20
2015-09-01T12:02:00.000000Z
- V1.5.1
+ V1.7.1
XX
v1.0
diff --git a/103120/examples/request4.xml b/103120/examples/request4.xml
index daa4b57cbdacd87beee17c82f019793253ad7dbc..c4e750dbd1e2ae130020425d0be9e9d89bad48a8 100644
--- a/103120/examples/request4.xml
+++ b/103120/examples/request4.xml
@@ -1,5 +1,5 @@
-
+
XX
@@ -12,7 +12,7 @@
c02358b2-76cf-4ba4-a8eb-f6436ccaea2e
2019-09-30T13:37:00.000000Z
- V1.5.1
+ V1.7.1
XX
v1.0
diff --git a/103120/examples/request5-Binary-Delivery.xml b/103120/examples/request5-Binary-Delivery.xml
index 285d5e13227c9730dbf0eb10cf0fe86d19cd1e3e..048837e9087d22cfbca224d4d6df2d31d9ecf040 100644
--- a/103120/examples/request5-Binary-Delivery.xml
+++ b/103120/examples/request5-Binary-Delivery.xml
@@ -1,5 +1,5 @@
-
+
XX
@@ -12,7 +12,7 @@
8854cfad-44ac-43b8-99ae-530b690b43da
2019-09-30T13:37:37.000000Z
- V1.5.1
+ V1.7.1
XX
v1.0
diff --git a/103120/examples/request5-XML-Delivery.xml b/103120/examples/request5-XML-Delivery.xml
index 989165efe739485805ab277807f79a2763bed491..f6636600dd012c2dc826285023b6408256feb4b8 100644
--- a/103120/examples/request5-XML-Delivery.xml
+++ b/103120/examples/request5-XML-Delivery.xml
@@ -1,5 +1,5 @@
-
+
XX
@@ -12,7 +12,7 @@
8854cfad-44ac-43b8-99ae-530b690b43da
2019-09-30T13:37:37.000000Z
- V1.5.1
+ V1.7.1
XX
v1.0
diff --git a/103120/examples/response1.xml b/103120/examples/response1.xml
index cc99dbc6cb02ee6aa216b93f622f3251fac6ab76..aca92d177f4115dbd2a5dc452550f1ecdbae009c 100644
--- a/103120/examples/response1.xml
+++ b/103120/examples/response1.xml
@@ -1,5 +1,5 @@
-
+
XX
@@ -12,7 +12,7 @@
c02358b2-76cf-4ba4-a8eb-f6436ccaea2e
2015-09-01T12:00:01.000000Z
- V1.5.1
+ V1.7.1
XX
v1.0
diff --git a/103120/examples/response2.xml b/103120/examples/response2.xml
index 2f867c9944e89dde94c800d2f2aa6c890177c4ea..1980184631a9a0c44bc1652ac573fd0f441b2359 100644
--- a/103120/examples/response2.xml
+++ b/103120/examples/response2.xml
@@ -1,5 +1,5 @@
-
+
XX
@@ -12,7 +12,7 @@
45002c1e-dc4a-470a-9152-8e752638c86c
2015-09-01T12:01:00.000000Z
- V1.5.1
+ V1.7.1
XX
v1.0
diff --git a/103120/examples/response3.xml b/103120/examples/response3.xml
index 3e48fb7651a62d134295c49375c0e5878993a885..6487a8dc04f310d6e0e2bcae09367ac3b371991d 100644
--- a/103120/examples/response3.xml
+++ b/103120/examples/response3.xml
@@ -1,5 +1,5 @@
-
+
XX
@@ -12,7 +12,7 @@
69353ac0-9582-4c71-b162-86259c99de20
2015-09-01T12:02:00.000000Z
- V1.5.1
+ V1.7.1
XX
v1.0
diff --git a/103120/examples/response4.xml b/103120/examples/response4.xml
index ff14ab0fa94c6027e902e0f7865bc251fd4d7796..4a5e16c2ed62cf75fd2b7b8632e7fe628acf1ed0 100644
--- a/103120/examples/response4.xml
+++ b/103120/examples/response4.xml
@@ -1,5 +1,5 @@
-
+
XX
@@ -12,7 +12,7 @@
c02358b2-76cf-4ba4-a8eb-f6436ccaea2e
2019-09-30T13:37:01.000000Z
- V1.5.1
+ V1.7.1
XX
v1.0
diff --git a/103120/examples/response5.xml b/103120/examples/response5.xml
index a4c69c9f8ed804453c34c769ff5857600508ece4..030867e205c902579f01117f69f86bd87da0b4c6 100644
--- a/103120/examples/response5.xml
+++ b/103120/examples/response5.xml
@@ -2,7 +2,7 @@
@@ -17,7 +17,7 @@
8854cfad-44ac-43b8-99ae-530b690b43da
2019-09-30T13:37:37.000000Z
- V1.5.1
+ V1.7.1
XX
v1.0
diff --git a/103120/portal/examples/request1.xml b/103120/portal/examples/request1.xml
index d6d9abaed1c3cc409d08f91f757429c9d2771823..94e268009f8f13143cba608f08e9241193afc098 100644
--- a/103120/portal/examples/request1.xml
+++ b/103120/portal/examples/request1.xml
@@ -1,5 +1,5 @@
-
+
XX
@@ -12,7 +12,7 @@
c02358b2-76cf-4ba4-a8eb-f6436ccaea2e
2015-09-01T12:00:00.000000Z
- V1.5.1
+ V1.6.1
XX
v1.0
diff --git a/103120/portal/examples/request2.xml b/103120/portal/examples/request2.xml
index af4346d0b41b15388e10dc814dd088fd04cd3422..4841ccf6734dbf725a5cf73abdebbc5b8050b8ee 100644
--- a/103120/portal/examples/request2.xml
+++ b/103120/portal/examples/request2.xml
@@ -1,5 +1,5 @@
-
+
XX
@@ -12,7 +12,7 @@
45002c1e-dc4a-470a-9152-8e752638c86c
2015-09-01T12:01:00.000000Z
- V1.5.1
+ V1.6.1
XX
v1.0
diff --git a/103120/portal/examples/request3.xml b/103120/portal/examples/request3.xml
index fb975776f7d83e1a00e45a699ed8cafc1e9582c8..4de508d530ab73e6698d7aa659c7c28977f2cbad 100644
--- a/103120/portal/examples/request3.xml
+++ b/103120/portal/examples/request3.xml
@@ -1,5 +1,5 @@
-
+
XX
@@ -12,7 +12,7 @@
69353ac0-9582-4c71-b162-86259c99de20
2015-09-01T12:02:00.000000Z
- V1.5.1
+ V1.6.1
XX
v1.0
diff --git a/103120/portal/examples/request4.xml b/103120/portal/examples/request4.xml
index daa4b57cbdacd87beee17c82f019793253ad7dbc..d3a0da03e4e099d2e7dd296f1e7abcfedc1203da 100644
--- a/103120/portal/examples/request4.xml
+++ b/103120/portal/examples/request4.xml
@@ -1,5 +1,5 @@
-
+
XX
@@ -12,7 +12,7 @@
c02358b2-76cf-4ba4-a8eb-f6436ccaea2e
2019-09-30T13:37:00.000000Z
- V1.5.1
+ V1.6.1
XX
v1.0
diff --git a/103120/portal/examples/request5-Binary-Delivery.xml b/103120/portal/examples/request5-Binary-Delivery.xml
index 285d5e13227c9730dbf0eb10cf0fe86d19cd1e3e..ae0caca1073de116ac21f898be0e6ee810f12296 100644
--- a/103120/portal/examples/request5-Binary-Delivery.xml
+++ b/103120/portal/examples/request5-Binary-Delivery.xml
@@ -1,5 +1,5 @@
-
+
XX
@@ -12,7 +12,7 @@
8854cfad-44ac-43b8-99ae-530b690b43da
2019-09-30T13:37:37.000000Z
- V1.5.1
+ V1.6.1
XX
v1.0
diff --git a/103120/portal/examples/request5-XML-Delivery.xml b/103120/portal/examples/request5-XML-Delivery.xml
index 989165efe739485805ab277807f79a2763bed491..b70a8f73d2bec96422467f1bb9025ef7c5dc71a4 100644
--- a/103120/portal/examples/request5-XML-Delivery.xml
+++ b/103120/portal/examples/request5-XML-Delivery.xml
@@ -1,5 +1,5 @@
-
+
XX
@@ -12,7 +12,7 @@
8854cfad-44ac-43b8-99ae-530b690b43da
2019-09-30T13:37:37.000000Z
- V1.5.1
+ V1.6.1
XX
v1.0
diff --git a/103120/portal/examples/response1.xml b/103120/portal/examples/response1.xml
index cc99dbc6cb02ee6aa216b93f622f3251fac6ab76..5378b8e939ccc59168f8ecd75c481d357f42c1af 100644
--- a/103120/portal/examples/response1.xml
+++ b/103120/portal/examples/response1.xml
@@ -1,5 +1,5 @@
-
+
XX
@@ -12,7 +12,7 @@
c02358b2-76cf-4ba4-a8eb-f6436ccaea2e
2015-09-01T12:00:01.000000Z
- V1.5.1
+ V1.6.1
XX
v1.0
diff --git a/103120/portal/examples/response2.xml b/103120/portal/examples/response2.xml
index 2f867c9944e89dde94c800d2f2aa6c890177c4ea..73da83e8951378e7e9760341d36127ecc7fd35cb 100644
--- a/103120/portal/examples/response2.xml
+++ b/103120/portal/examples/response2.xml
@@ -1,5 +1,5 @@
-
+
XX
@@ -12,7 +12,7 @@
45002c1e-dc4a-470a-9152-8e752638c86c
2015-09-01T12:01:00.000000Z
- V1.5.1
+ V1.6.1
XX
v1.0
diff --git a/103120/portal/examples/response3.xml b/103120/portal/examples/response3.xml
index 3e48fb7651a62d134295c49375c0e5878993a885..44ba51e4a5a29d9d5ed60566bfea880b18f4ee07 100644
--- a/103120/portal/examples/response3.xml
+++ b/103120/portal/examples/response3.xml
@@ -1,5 +1,5 @@
-
+
XX
@@ -12,7 +12,7 @@
69353ac0-9582-4c71-b162-86259c99de20
2015-09-01T12:02:00.000000Z
- V1.5.1
+ V1.6.1
XX
v1.0
diff --git a/103120/portal/examples/response4.xml b/103120/portal/examples/response4.xml
index ff14ab0fa94c6027e902e0f7865bc251fd4d7796..39c27e6b451c1f5a1d7074514ef77a02a1511f87 100644
--- a/103120/portal/examples/response4.xml
+++ b/103120/portal/examples/response4.xml
@@ -1,5 +1,5 @@
-
+
XX
@@ -12,7 +12,7 @@
c02358b2-76cf-4ba4-a8eb-f6436ccaea2e
2019-09-30T13:37:01.000000Z
- V1.5.1
+ V1.6.1
XX
v1.0
diff --git a/103120/portal/examples/response5.xml b/103120/portal/examples/response5.xml
index a4c69c9f8ed804453c34c769ff5857600508ece4..e135903b07ac62a9528c2356e16c4ed0c723a21b 100644
--- a/103120/portal/examples/response5.xml
+++ b/103120/portal/examples/response5.xml
@@ -2,7 +2,7 @@
@@ -17,7 +17,7 @@
8854cfad-44ac-43b8-99ae-530b690b43da
2019-09-30T13:37:37.000000Z
- V1.5.1
+ V1.6.1
XX
v1.0
diff --git a/103120/schema/ts_103120_Authorisation.xsd b/103120/schema/ts_103120_Authorisation.xsd
index 14b50d7e6005b76431f32dee18b8de5042e968c6..72e87c0407ab6750187b5283c95fbf2ff85fe1d0 100644
--- a/103120/schema/ts_103120_Authorisation.xsd
+++ b/103120/schema/ts_103120_Authorisation.xsd
@@ -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 @@
-
+
diff --git a/103120/schema/ts_103120_Document.xsd b/103120/schema/ts_103120_Document.xsd
index 86b719295193146c4dcb25d6a1c5f0d43f366288..af6f13979824aba2c967860b1473bc7df91fac32 100644
--- a/103120/schema/ts_103120_Document.xsd
+++ b/103120/schema/ts_103120_Document.xsd
@@ -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 @@
-
+
diff --git a/103120/schema/ts_103120_Task.xsd b/103120/schema/ts_103120_Task.xsd
index ed8974ed70f7bf67d1a97b7b3e445682299c9d56..ae3e65e38bb1acce08c953ff0393154c57f5d217 100644
--- a/103120/schema/ts_103120_Task.xsd
+++ b/103120/schema/ts_103120_Task.xsd
@@ -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 @@
-
+
@@ -123,7 +123,7 @@
-
+
diff --git a/103120/validate_examples.py b/103120/validate_examples.py
index 7aae339dd9bd42ec63edfbb0615a93559aab9a38..133bad9e9e14f94a17666a9ad5bfb43b2db64c6c 100644
--- a/103120/validate_examples.py
+++ b/103120/validate_examples.py
@@ -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)