Reverting 120 changes (d1a5e7aa) · Commits · LI - Lawful Interception / TC LI schemas definitions

103120/examples/json/request1_bad.json

deleted100644 → 0

+0 −97

Original line number	Diff line number	Diff line
		{
		"@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": {
		"bad" : "bad",
		"SenderIdentifier": {
		"CountryCode": "XX",
		"UniqueIdentifier": "ACTOR01"
		},
		"ReceiverIdentifier": {
		"CountryCode": "XX",
		"UniqueIdentifier": "ACTOR02"
		},
		"TransactionIdentifier": "c02358b2-76cf-4ba4-a8eb-f6436ccaea2e",
		"Timestamp": "2015-09-01T12:00:00.000000Z",
		"Version": {
		"ETSIVersion": "V1.13.1",
		"NationalProfileOwner": "XX",
		"NationalProfileVersion": "v1.0"
		}
		},
		"Payload": {
		"RequestPayload": {
		"ActionRequests": {
		"ActionRequest": [
		{
		"ActionIdentifier": 0,
		"CREATE": {
		"HI1Object": {
		"@xsi:type": "{http://uri.etsi.org/03120/common/2020/09/Authorisation}AuthorisationObject",
		"ObjectIdentifier": "7dbbc880-8750-4d3c-abe7-ea4a17646045",
		"CountryCode": "XX",
		"OwnerIdentifier": "ACTOR01",
		"auth:AuthorisationReference": "W000001",
		"auth:AuthorisationTimespan": {
		"auth:StartTime": "2015-09-01T12:00:00Z",
		"auth:EndTime": "2015-12-01T12:00:00Z"
		}
		}
		}
		},
		{
		"ActionIdentifier": 1,
		"CREATE": {
		"HI1Object": {
		"@xsi:type": "{http://uri.etsi.org/03120/common/2020/09/Task}LITaskObject",
		"ObjectIdentifier": "2b36a78b-b628-416d-bd22-404e68a0cd36",
		"CountryCode": "XX",
		"OwnerIdentifier": "ACTOR01",
		"AssociatedObjects": {
		"AssociatedObject": [
		"7dbbc880-8750-4d3c-abe7-ea4a17646045"
		]
		},
		"task:Reference": "LIID1",
		"task:TargetIdentifier": {
		"task:TargetIdentifierValues": {
		"task:TargetIdentifierValue": [
		{
		"task:FormatType": {
		"task:FormatOwner": "ETSI",
		"task:FormatName": "InternationalE164"
		},
		"task:Value": "442079460223"
		}
		]
		}
		},
		"task:DeliveryType": {
		"common:Owner": "ETSI",
		"common:Name": "TaskDeliveryType",
		"common:Value": "IRIandCC"
		},
		"task:DeliveryDetails": {
		"task:DeliveryDestination": [
		{
		"task:DeliveryAddress": {
		"task:IPv4Address": "192.0.2.0"
		}
		}
		]
		},
		"task:CSPID": {
		"CountryCode": "XX",
		"UniqueIdentifier": "RECVER01"
		}
		}
		}
		}
		]
		}
		}
		}
		}

103120/examples/json/request7-TrafficPolicyObject.json

+15 −26

Original line number	Diff line number	Diff line
		@@ -2,8 +2,8 @@
		"@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:tp": "http://uri.etsi.org/03120/common/2022/07/TrafficPolicy",
		"@xmlns:etsi280": "http://uri.etsi.org/03280/common/2017/07",
		"@xmlns:policy": "http://uri.etsi.org/03120/common/2022/07/TrafficPolicy",
		"@xmlns:etsi": "http://uri.etsi.org/03280/common/2017/07",
		"@xmlns:task": "http://uri.etsi.org/03120/common/2020/09/Task",
		"Header": {
		"SenderIdentifier": {
		@@ -34,25 +34,16 @@
		"ObjectIdentifier": "f69eb93b-a85b-4ff7-abaa-6f3aead286d5",
		"CountryCode": "XX",
		"OwnerIdentifier": "ACTOR01",
		"tp:Criteria": {
		"tp:Criteria": [
		{
		"tp:IPPolicyCriteria": {
		"tp:SourceIPRange": {
		"etsi280:IPv4CIDR": "203.0.113.0/24"
		}
		}
		},
		{
		"tp:IPPolicyCriteria": {
		"tp:SourceIPRange": {
		"etsi280:IPv4CIDR": "203.0.113.0/24"
		"policy:Criteria": {
		"policy:Criteria": {
		"policy:IPPolicyCriteria": {
		"policy:SourceIPRange": {
		"etsi:IPv4CIDR": "203.0.113.0/24"
		}
		}
		}
		]
		},
		"tp:Action": {
		"policy:Action": {
		"common:Owner": "ETSI",
		"common:Name": "PolicyAction",
		"common:Value": "PDSR"
		@@ -68,14 +59,12 @@
		"ObjectIdentifier": "55e25c0a-787b-4049-b7fb-518a13a9483b",
		"CountryCode": "XX",
		"OwnerIdentifier": "ACTOR01",
		"tp:TrafficPolicyName": "Template Rule 1",
		"tp:TrafficRules": {
		"tp:TrafficRuleReference": [
		{
		"tp:Order": 1,
		"tp:ObjectIdentifier": "f69eb93b-a85b-4ff7-abaa-6f3aead286d5"
		"policy:TrafficPolicyName": "Template Rule 1",
		"policy:TrafficRules": {
		"policy:TrafficRuleReference": {
		"policy:Order": "1",
		"policy:ObjectIdentifier": "f69eb93b-a85b-4ff7-abaa-6f3aead286d5"
		}
		]
		}
		}
		}

103120/examples/xml/request7_TrafficPolicyObject.xml

+21 −28

Original line number	Diff line number	Diff line
		<?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:tp="http://uri.etsi.org/03120/common/2022/07/TrafficPolicy" xmlns:etsi280="http://uri.etsi.org/03280/common/2017/07" xmlns:task="http://uri.etsi.org/03120/common/2020/09/Task">
		<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:policy="http://uri.etsi.org/03120/common/2022/07/TrafficPolicy" xmlns:etsi="http://uri.etsi.org/03280/common/2017/07" xmlns:task="http://uri.etsi.org/03120/common/2020/09/Task">
		<Header>
		<SenderIdentifier>
		<CountryCode>XX</CountryCode>
		@@ -23,48 +23,41 @@
		<ActionRequest>
		<ActionIdentifier>0</ActionIdentifier>
		<CREATE>
		<HI1Object xsi:type="tp:TrafficRuleObject">
		<HI1Object xsi:type="policy:TrafficRuleObject">
		<ObjectIdentifier>f69eb93b-a85b-4ff7-abaa-6f3aead286d5</ObjectIdentifier>
		<CountryCode>XX</CountryCode>
		<OwnerIdentifier>ACTOR01</OwnerIdentifier>
		<tp:Criteria>
		<tp:Criteria>
		<tp:IPPolicyCriteria>
		<tp:SourceIPRange>
		<etsi280:IPv4CIDR>203.0.113.0/24</etsi280:IPv4CIDR>
		</tp:SourceIPRange>
		</tp:IPPolicyCriteria>
		</tp:Criteria>
		<tp:Criteria>
		<tp:IPPolicyCriteria>
		<tp:SourceIPRange>
		<etsi280:IPv4CIDR>203.0.113.0/24</etsi280:IPv4CIDR>
		</tp:SourceIPRange>
		</tp:IPPolicyCriteria>
		</tp:Criteria>
		</tp:Criteria>
		<tp:Action>
		<policy:Criteria>
		<policy:Criteria>
		<policy:IPPolicyCriteria>
		<policy:SourceIPRange>
		<etsi:IPv4CIDR>203.0.113.0/24</etsi:IPv4CIDR>
		</policy:SourceIPRange>
		</policy:IPPolicyCriteria>
		</policy:Criteria>
		</policy:Criteria>
		<policy:Action>
		<common:Owner>ETSI</common:Owner>
		<common:Name>PolicyAction</common:Name>
		<common:Value>PDSR</common:Value>
		</tp:Action>
		</policy:Action>
		</HI1Object>
		</CREATE>
		</ActionRequest>
		<ActionRequest>
		<ActionIdentifier>1</ActionIdentifier>
		<CREATE>
		<HI1Object xsi:type="tp:TrafficPolicyObject">
		<HI1Object xsi:type="policy:TrafficPolicyObject">
		<ObjectIdentifier>55e25c0a-787b-4049-b7fb-518a13a9483b</ObjectIdentifier>
		<CountryCode>XX</CountryCode>
		<OwnerIdentifier>ACTOR01</OwnerIdentifier>
		<tp:TrafficPolicyName>Template Rule 1</tp:TrafficPolicyName>
		<tp:TrafficRules>
		<tp:TrafficRuleReference>
		<tp:Order>1</tp:Order>
		<tp:ObjectIdentifier>f69eb93b-a85b-4ff7-abaa-6f3aead286d5</tp:ObjectIdentifier>
		</tp:TrafficRuleReference>
		</tp:TrafficRules>
		<policy:TrafficPolicyName>Template Rule 1</policy:TrafficPolicyName>
		<policy:TrafficRules>
		<policy:TrafficRuleReference>
		<policy:Order>1</policy:Order>
		<policy:ObjectIdentifier>f69eb93b-a85b-4ff7-abaa-6f3aead286d5</policy:ObjectIdentifier>
		</policy:TrafficRuleReference>
		</policy:TrafficRules>
		</HI1Object>
		</CREATE>
		</ActionRequest>

103120/schema/json/ts_103120_Authorisation.schema.json

+5 −10

Original line number	Diff line number	Diff line
		@@ -97,8 +97,7 @@
		"required": [
		"@xsi:type",
		"ObjectIdentifier"
		],
		"additionalProperties": false
		]
		},
		"AuthorisationFlags": {
		"type": "object",
		@@ -110,8 +109,7 @@
		}
		}
		},
		"required": [],
		"additionalProperties": false
		"required": []
		},
		"AuthorisationTimespan": {
		"type": "object",
		@@ -123,8 +121,7 @@
		"$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime"
		}
		},
		"required": [],
		"additionalProperties": false
		"required": []
		},
		"AuthorisationCSPID": {
		"type": "object",
		@@ -137,8 +134,7 @@
		"minItems": 1
		}
		},
		"required": [],
		"additionalProperties": false
		"required": []
		},
		"NationalAuthorisationParameters": {
		"type": "object",
		@@ -149,8 +145,7 @@
		},
		"required": [
		"auth:CountryCode"
		],
		"additionalProperties": false
		]
		}
		}
		}

103120/schema/json/ts_103120_Common.schema.json

+8 −16

Original line number	Diff line number	Diff line
		@@ -23,8 +23,7 @@
		}
		}
		},
		"required": [],
		"additionalProperties": false
		"required": []
		},
		"DictionaryEntry": {
		"type": "object",
		@@ -43,8 +42,7 @@
		"common:Owner",
		"common:Name",
		"common:Value"
		],
		"additionalProperties": false
		]
		},
		"ApprovalDetails": {
		"type": "object",
		@@ -74,8 +72,7 @@
		"$ref": "#/$defs/ApprovalNationalDetails"
		}
		},
		"required": [],
		"additionalProperties": false
		"required": []
		},
		"ApproverDetails": {
		"type": "object",
		@@ -96,8 +93,7 @@
		}
		}
		},
		"required": [],
		"additionalProperties": false
		"required": []
		},
		"ApproverIdentity": {
		"oneOf": [
		@@ -127,8 +123,7 @@
		"$ref": "ts_103280_2017_07#/$defs/InternationalE164"
		}
		},
		"required": [],
		"additionalProperties": false
		"required": []
		},
		"NationalApproverIdentity": {
		"type": "object",
		@@ -139,8 +134,7 @@
		},
		"required": [
		"common:CountryCode"
		],
		"additionalProperties": false
		]
		},
		"ApprovalDigitalSignature": {
		"oneOf": [
		@@ -166,8 +160,7 @@
		},
		"required": [
		"common:CountryCode"
		],
		"additionalProperties": false
		]
		},
		"NationalDigitalSignature": {
		"type": "object",
		@@ -178,8 +171,7 @@
		},
		"required": [
		"common:CountryCode"
		],
		"additionalProperties": false
		]
		}
		}
		}