Fixing and running JSON translation (d412db13) · Commits · LI - Lawful Interception / TC LI schemas definitions

103120/dictionaries/ts_103120_Dictionaries.schema.json

+8 −4

Original line number	Diff line number	Diff line
		@@ -12,7 +12,8 @@
		}
		}
		},
		"required": []
		"required": [],
		"additionalProperties": false
		},
		"Dictionary": {
		"type": "object",
		@@ -31,7 +32,8 @@
		"dictionaries:Owner",
		"dictionaries:Name",
		"dictionaries:DictionaryEntries"
		]
		],
		"additionalProperties": false
		},
		"DictionaryEntries": {
		"type": "object",
		@@ -43,7 +45,8 @@
		}
		}
		},
		"required": []
		"required": [],
		"additionalProperties": false
		},
		"DictionaryEntry": {
		"type": "object",
		@@ -58,7 +61,8 @@
		"required": [
		"dictionaries:Value",
		"dictionaries:Meaning"
		]
		],
		"additionalProperties": false
		}
		},
		"$ref": "#/$defs/Dictionaries"

103120/examples/json/request7-TrafficPolicyObject.json

+19 −15

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

103120/examples/xml/request7_TrafficPolicyObject.xml

+21 −21

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: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">
		<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">
		<Header>
		<SenderIdentifier>
		<CountryCode>XX</CountryCode>
		@@ -23,41 +23,41 @@
		<ActionRequest>
		<ActionIdentifier>0</ActionIdentifier>
		<CREATE>
		<HI1Object xsi:type="policy:TrafficRuleObject">
		<HI1Object xsi:type="tp:TrafficRuleObject">
		<ObjectIdentifier>f69eb93b-a85b-4ff7-abaa-6f3aead286d5</ObjectIdentifier>
		<CountryCode>XX</CountryCode>
		<OwnerIdentifier>ACTOR01</OwnerIdentifier>
		<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>
		<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>
		<common:Owner>ETSI</common:Owner>
		<common:Name>PolicyAction</common:Name>
		<common:Value>PDSR</common:Value>
		</policy:Action>
		</tp:Action>
		</HI1Object>
		</CREATE>
		</ActionRequest>
		<ActionRequest>
		<ActionIdentifier>1</ActionIdentifier>
		<CREATE>
		<HI1Object xsi:type="policy:TrafficPolicyObject">
		<HI1Object xsi:type="tp:TrafficPolicyObject">
		<ObjectIdentifier>55e25c0a-787b-4049-b7fb-518a13a9483b</ObjectIdentifier>
		<CountryCode>XX</CountryCode>
		<OwnerIdentifier>ACTOR01</OwnerIdentifier>
		<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>
		<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>
		</HI1Object>
		</CREATE>
		</ActionRequest>

103120/schema/json/ts_103120_Authorisation.schema.json

+10 −5

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

103120/schema/json/ts_103120_Common.schema.json

+139 −8

Original line number	Diff line number	Diff line
		@@ -13,6 +13,16 @@
		}
		]
		},
		"ISO639Set1LanguageIdentifier": {
		"type": "string",
		"pattern": "^[a-z]{2}$"
		},
		"Checksum": {
		"$ref": "ts_103280_2017_07#/$defs/ShortString"
		},
		"ChecksumType": {
		"$ref": "ts_103280_2017_07#/$defs/ShortString"
		},
		"DictionaryEntries": {
		"type": "object",
		"properties": {
		@@ -23,7 +33,8 @@
		}
		}
		},
		"required": []
		"required": [],
		"additionalProperties": false
		},
		"DictionaryEntry": {
		"type": "object",
		@@ -42,7 +53,8 @@
		"common:Owner",
		"common:Name",
		"common:Value"
		]
		],
		"additionalProperties": false
		},
		"ApprovalDetails": {
		"type": "object",
		@@ -72,7 +84,8 @@
		"$ref": "#/$defs/ApprovalNationalDetails"
		}
		},
		"required": []
		"required": [],
		"additionalProperties": false
		},
		"ApproverDetails": {
		"type": "object",
		@@ -93,7 +106,8 @@
		}
		}
		},
		"required": []
		"required": [],
		"additionalProperties": false
		},
		"ApproverIdentity": {
		"oneOf": [
		@@ -113,6 +127,30 @@
		"ApproverContactDetails": {
		"type": "object",
		"properties": {
		"common:Name": {
		"$ref": "ts_103280_2017_07#/$defs/LongString"
		},
		"common:Role": {
		"$ref": "ts_103280_2017_07#/$defs/LongString"
		},
		"common:EmailAddress": {
		"$ref": "ts_103280_2017_07#/$defs/InternationalizedEmailAddress"
		},
		"common:PhoneNumber": {
		"$ref": "ts_103280_2017_07#/$defs/InternationalE164"
		},
		"common:FaxNumber": {
		"$ref": "ts_103280_2017_07#/$defs/InternationalE164"
		},
		"common:Address": {
		"$ref": "ts_103280_2017_07#/$defs/LongString"
		},
		"common:Languages": {
		"type": "array",
		"items": {
		"$ref": "#/$defs/LanguageIdentifier"
		}
		},
		"common:ApproverAlternateName": {
		"$ref": "ts_103280_2017_07#/$defs/LongString"
		},
		@@ -123,7 +161,54 @@
		"$ref": "ts_103280_2017_07#/$defs/InternationalE164"
		}
		},
		"required": []
		"required": [],
		"additionalProperties": false
		},
		"GenericContactDetails": {
		"type": "object",
		"properties": {
		"common:Name": {
		"$ref": "ts_103280_2017_07#/$defs/LongString"
		},
		"common:Role": {
		"$ref": "ts_103280_2017_07#/$defs/LongString"
		},
		"common:EmailAddress": {
		"$ref": "ts_103280_2017_07#/$defs/InternationalizedEmailAddress"
		},
		"common:PhoneNumber": {
		"$ref": "ts_103280_2017_07#/$defs/InternationalE164"
		},
		"common:FaxNumber": {
		"$ref": "ts_103280_2017_07#/$defs/InternationalE164"
		},
		"common:Address": {
		"$ref": "ts_103280_2017_07#/$defs/LongString"
		},
		"common:Languages": {
		"type": "array",
		"items": {
		"$ref": "#/$defs/LanguageIdentifier"
		}
		}
		},
		"required": [],
		"additionalProperties": false
		},
		"LanguageIdentifier": {
		"oneOf": [
		{
		"type": "object",
		"properties": {
		"common:ISO639Set1LanguageIdentifier": {
		"$ref": "#/$defs/ISO639Set1LanguageIdentifier"
		}
		},
		"required": [
		"common:ISO639Set1LanguageIdentifier"
		]
		}
		]
		},
		"NationalApproverIdentity": {
		"type": "object",
		@@ -134,7 +219,8 @@
		},
		"required": [
		"common:CountryCode"
		]
		],
		"additionalProperties": false
		},
		"ApprovalDigitalSignature": {
		"oneOf": [
		@@ -160,7 +246,8 @@
		},
		"required": [
		"common:CountryCode"
		]
		],
		"additionalProperties": false
		},
		"NationalDigitalSignature": {
		"type": "object",
		@@ -171,7 +258,51 @@
		},
		"required": [
		"common:CountryCode"
		]
		],
		"additionalProperties": false
		},
		"Timespan": {
		"type": "object",
		"properties": {
		"common:StartTime": {
		"$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime"
		},
		"common:EndTime": {
		"$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime"
		}
		},
		"required": [],
		"additionalProperties": false
		},
		"ListOfChecksumAndType": {
		"type": "object",
		"properties": {
		"common:ChecksumAndType": {
		"type": "array",
		"items": {
		"$ref": "#/$defs/ChecksumAndType"
		},
		"minItems": 1
		}
		},
		"required": [],
		"additionalProperties": false
		},
		"ChecksumAndType": {
		"type": "object",
		"properties": {
		"common:Checksum": {
		"$ref": "#/$defs/Checksum"
		},
		"common:ChecksumType": {
		"$ref": "#/$defs/ChecksumType"
		}
		},
		"required": [
		"common:Checksum",
		"common:ChecksumType"
		],
		"additionalProperties": false
		}
		}
		}

Admin message