From 49df0f8bc8a6e42869e035dd9db7cc3e0ba0f369 Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 18 May 2023 11:58:07 +0100 Subject: [PATCH 01/22] Using xmltodict to generate json --- 103120/examples/request1.json | 92 ++++++++ 103120/utils/validate.py | 94 +++++++++ 103120/utils/xml_to_json.py | 12 ++ 103280/TS_103_280.schema.json | 387 ++++++++++++++++++++++++++++++++++ 4 files changed, 585 insertions(+) create mode 100644 103120/examples/request1.json create mode 100644 103120/utils/validate.py create mode 100644 103120/utils/xml_to_json.py create mode 100644 103280/TS_103_280.schema.json diff --git a/103120/examples/request1.json b/103120/examples/request1.json new file mode 100644 index 0000000..a73501e --- /dev/null +++ b/103120/examples/request1.json @@ -0,0 +1,92 @@ +{ + "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", + "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": "auth: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": "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" + } + } + } + } + ] + } + } + } + } +} \ No newline at end of file diff --git a/103120/utils/validate.py b/103120/utils/validate.py new file mode 100644 index 0000000..a290ed3 --- /dev/null +++ b/103120/utils/validate.py @@ -0,0 +1,94 @@ +import sys +from jsonschema import validate, RefResolver, Draft202012Validator +import json +from pathlib import Path +import logging +import argparse + + + +# filename = sys.argv[1] + +# def load_json (path): +# with open(path) as f: +# s = json.load(f) +# return s + +# schema_store = {} + +# json_instance = load_json(filename) +# print (json_instance) + +# etsi_schema = load_json('response.schema.json') +# ext_schema = load_json('extended.schema.json') +# ext_ent_schema = load_json("extended_entities.schema.json") +# schema_store = { +# etsi_schema['$id'] : etsi_schema, +# ext_schema['$id'] : ext_schema, +# ext_ent_schema['$id'] : ext_ent_schema +# } + +# resolver = RefResolver(None, referrer=None, store=schema_store) + +# print (etsi_schema) + +# v = Draft202012Validator(ext_schema, resolver=resolver) +# v.validate(json_instance) + +# validate(json_instance, ext_schema) +# print ("OK") + +def handle_uri(u): + print(u) + +def load_json(path : str): + with open(path) as f: + return json.load(f) + +if __name__ == "__main__": + parser = argparse.ArgumentParser() + + parser.add_argument('-s','--schemadir', action="append", help="Directory containing supporting schema files to use for validation") + parser.add_argument('-v', '--verbose', action="count", help="Verbose logging (can be specified multiple times)") + parser.add_argument('schema', help="Primary schema to validate against") + parser.add_argument('filename', help="JSON instance document to validate") + + args = parser.parse_args() + + match args.verbose: + case v if v and v >= 2: + logging.basicConfig(level=logging.DEBUG) + case 1: + logging.basicConfig(level=logging.INFO) + case _: + logging.basicConfig(level=logging.WARNING) + + logging.debug(f"Arguments: {args}") + + instance_doc = load_json(args.filename) + main_schema = load_json(args.schema) + schema_dict = { main_schema['$id'] : main_schema } + + if args.schemadir: + schema_paths = [] + for d in args.schemadir: + schema_paths += [f for f in Path(d).rglob("*.schema.json")] + logging.info(f"Schema files loaded: {schema_paths}") + + schemas_json = [json.load(p.open()) for p in schema_paths] + schema_dict = schema_dict | { s['$id'] : s for s in schemas_json } + + logging.info(f"Schema IDs loaded: {[k for k in schema_dict.keys()]}") + + logging.debug (f"Instance doc: {instance_doc}") + logging.debug (f"Main schema: {main_schema}") + + resolver = RefResolver(None, + referrer=None, + store=schema_dict) + + v = Draft202012Validator(main_schema, resolver=resolver) + + v.validate(instance_doc) + + logging.info("Done") \ No newline at end of file diff --git a/103120/utils/xml_to_json.py b/103120/utils/xml_to_json.py new file mode 100644 index 0000000..0615a03 --- /dev/null +++ b/103120/utils/xml_to_json.py @@ -0,0 +1,12 @@ +import xmltodict +from pprint import pprint +import json + +with open('../examples/request1.xml') as f: + s = f.read() + +d = xmltodict.parse(s) +pprint (d) + +with open('../examples/request.json', 'w') as f2: + f2.write(json.dumps(d)) \ No newline at end of file diff --git a/103280/TS_103_280.schema.json b/103280/TS_103_280.schema.json new file mode 100644 index 0000000..523a1a5 --- /dev/null +++ b/103280/TS_103_280.schema.json @@ -0,0 +1,387 @@ +{ + "$id" : "http://etsi.org/temp/280", + "$schema" : "https://json-schema.org/draft/2020-12/schema", + "title" : "ETSI TS 103 280 (temp)", + "description" : "A stubbed version of TS 103 280 definitions (need a CR to 280 for this)", + "$defs": { + "ShortString": { + "type": "string", + "maxLength": 255 + }, + "LongString": { + "type": "string", + "maxLength": 65535 + }, + "LIID": { + "type": "string", + "pattern": "^([!-~]{1,25})|([0-9a-f]{26,50})$" + }, + "UTCDateTime": { + "type": "string", + "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z$" + }, + "UTCMicrosecondDateTime": { + "type": "string", + "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}\\.[0-9]{6}Z$" + }, + "QualifiedDateTime": { + "type": "string", + "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}(Z|[+-][0-9]{2}:[0-9]{2})$" + }, + "QualifiedMicrosecondDateTime": { + "type": "string", + "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}\\.[0-9]{6}(Z|[+-][0-9]{2}:[0-9]{2})$" + }, + "InternationalE164": { + "type": "string", + "pattern": "^[0-9]{1,15}$" + }, + "IMSI": { + "type": "string", + "pattern": "^[0-9]{6,15}$" + }, + "IMEI": { + "type": "string", + "pattern": "^[0-9]{14}$" + }, + "IMEICheckDigit": { + "type": "string", + "pattern": "^[0-9]{15}$" + }, + "IMEISV": { + "type": "string", + "pattern": "^[0-9]{16}$" + }, + "IPv4Address": { + "type": "string", + "pattern": "^((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])$" + }, + "IPv4CIDR": { + "type": "string", + "pattern": "^((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])/([1-2]?[0-9]|3[0-2])$" + }, + "IPv6Address": { + "type": "string", + "pattern": "^([0-9a-f]{4}:){7}([0-9a-f]{4})$" + }, + "IPv6CIDR": { + "type": "string", + "pattern": "^([0-9a-f]{4}:){7}([0-9a-f]{4})/(([1-9][0-9]?)|(1[0-1][0-9])|(12[0-8]))$" + }, + "TCPPort": { + "type": "integer", + "exclusiveMinimum": 1, + "maximum": 65535 + }, + "UDPPort": { + "type": "integer", + "minimum": 0, + "maximum": 65535 + }, + "MACAddress": { + "type": "string", + "pattern": "^([a-f0-9]{2}:){5}[a-f0-9]{2}$" + }, + "EmailAddress": { + "allOf": [ + { + "$ref": "#/$defs/ShortString" + }, + { + "type": "string", + "pattern": "^[a-zA-Z0-9\\.!#$%&'\\*\\+\\\\/=\\?\\^_`\\{\\|\\}~\\-]+@[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(\\.[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$" + } + ] + }, + "UUID": { + "type": "string", + "pattern": "^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$" + }, + "ISOCountryCode": { + "type": "string", + "pattern": "^[A-Z]{2}$" + }, + "SIPURI": { + "type": "string", + "pattern": "^sips?:[a-zA-Z0-9!#$&-;=?-\\[\\]_~%]+$" + }, + "TELURI": { + "type": "string", + "pattern": "^tel:[a-zA-Z0-9!#$&-;=?-\\[\\]_~%]+$" + }, + "WGS84LatitudeDecimal": { + "type": "string", + "pattern": "^[NS][0-9]{2}\\.[0-9]{6}$" + }, + "WGS84LongitudeDecimal": { + "type": "string", + "pattern": "^[EW][0-9]{3}\\.[0-9]{6}$" + }, + "WGS84LatitudeAngular": { + "type": "string", + "pattern": "^[NS][0-9]{6}\\.[0-9]{2}$" + }, + "WGS84LongitudeAngular": { + "type": "string", + "pattern": "^[EW][0-9]{7}\\.[0-9]{2}$" + }, + "SUPIIMSI": { + "$ref": "#/$defs/IMSI" + }, + "SUPINAI": { + "$ref": "#/$defs/NAI" + }, + "SUCI": { + "type": "string", + "pattern": "^([a-fA-F0-9]{2})*$" + }, + "PEIIMEI": { + "$ref": "#/$defs/IMEI" + }, + "PEIIMEICheckDigit": { + "$ref": "#/$defs/IMEICheckDigit" + }, + "PEIIMEISV": { + "$ref": "#/$defs/IMEISV" + }, + "GPSIMSISDN": { + "type": "string", + "pattern": "^[0-9]{1,15}$" + }, + "GPSINAI": { + "$ref": "#/$defs/NAI" + }, + "NAI": { + "type": "string" + }, + "LDID": { + "type": "string", + "pattern": "^([A-Z]{2}-.+-.+)$" + }, + "InternationalizedEmailAddress": { + "allOf": [ + { + "$ref": "#/$defs/ShortString" + }, + { + "type": "string", + "pattern": "^.+@.+$" + } + ] + }, + "EUI64": { + "type": "string", + "pattern": "^([a-f0-9]{2}:){7}[a-f0-9]{2}$" + }, + "CGI": { + "type": "string", + "pattern": "^[0-9]{3}-[0-9]{2,3}-[a-f0-9]{4}-[a-f0-9]{4}$" + }, + "ECGI": { + "type": "string", + "pattern": "^[0-9]{3}-[0-9]{2,3}-[a-f0-9]{7}$" + }, + "NCGI": { + "type": "string", + "pattern": "^[0-9]{3}-[0-9]{2,3}-[a-f0-9]{9}$" + }, + "ICCID": { + "type": "string", + "pattern": "^[0-9]{19,20}$" + }, + "IPAddress": { + "oneOf": [ + { + "type": "object", + "properties": { + "IPv4Address": { + "$ref": "#/$defs/IPv4Address" + } + }, + "required": [ + "IPv4Address" + ] + }, + { + "type": "object", + "properties": { + "IPv6Address": { + "$ref": "#/$defs/IPv6Address" + } + }, + "required": [ + "IPv6Address" + ] + } + ] + }, + "IPCIDR": { + "oneOf": [ + { + "type": "object", + "properties": { + "IPv4CIDR": { + "$ref": "#/$defs/IPv4CIDR" + } + }, + "required": [ + "IPv4CIDR" + ] + }, + { + "type": "object", + "properties": { + "IPv6CIDR": { + "$ref": "#/$defs/IPv6CIDR" + } + }, + "required": [ + "IPv6CIDR" + ] + } + ] + }, + "TCPPortRange": { + "type": "object", + "properties": { + "start": { + "$ref": "#/$defs/TCPPort" + }, + "end": { + "$ref": "#/$defs/TCPPort" + } + }, + "required": [ + "start", + "end" + ] + }, + "UDPPortRange": { + "type": "object", + "properties": { + "start": { + "$ref": "#/$defs/UDPPort" + }, + "end": { + "$ref": "#/$defs/UDPPort" + } + }, + "required": [ + "start", + "end" + ] + }, + "Port": { + "oneOf": [ + { + "type": "object", + "properties": { + "TCPPort": { + "$ref": "#/$defs/TCPPort" + } + }, + "required": [ + "TCPPort" + ] + }, + { + "type": "object", + "properties": { + "UDPPort": { + "$ref": "#/$defs/UDPPort" + } + }, + "required": [ + "UDPPort" + ] + } + ] + }, + "PortRange": { + "oneOf": [ + { + "type": "object", + "properties": { + "TCPPortRange": { + "$ref": "#/$defs/TCPPortRange" + } + }, + "required": [ + "TCPPortRange" + ] + }, + { + "type": "object", + "properties": { + "UDPPortRange": { + "$ref": "#/$defs/UDPPortRange" + } + }, + "required": [ + "UDPPortRange" + ] + } + ] + }, + "IPAddressPort": { + "type": "object", + "properties": { + "address": { + "$ref": "#/$defs/IPAddress" + }, + "port": { + "$ref": "#/$defs/Port" + } + }, + "required": [ + "address", + "port" + ] + }, + "IPAddressPortRange": { + "type": "object", + "properties": { + "address": { + "$ref": "#/$defs/IPAddress" + }, + "portRange": { + "$ref": "#/$defs/PortRange" + } + }, + "required": [ + "address", + "portRange" + ] + }, + "WGS84CoordinateDecimal": { + "type": "object", + "properties": { + "latitude": { + "$ref": "#/$defs/WGS84LatitudeDecimal" + }, + "longitude": { + "$ref": "#/$defs/WGS84LongitudeDecimal" + } + }, + "required": [ + "latitude", + "longitude" + ] + }, + "WGS84CoordinateAngular": { + "type": "object", + "properties": { + "latitude": { + "$ref": "#/$defs/WGS84LatitudeAngular" + }, + "longitude": { + "$ref": "#/$defs/WGS84LongitudeAngular" + } + }, + "required": [ + "latitude", + "longitude" + ] + } + } +} \ No newline at end of file -- GitLab From 11833a0983831da2344cd9c3fda56122612c5f15 Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 18 May 2023 16:04:08 +0100 Subject: [PATCH 02/22] Getting a bit further --- utils/translate/ChoiceMapping.py | 42 ++++++ utils/translate/ComplexTypeMapping.py | 11 ++ utils/translate/SequenceMapping.py | 80 ++++++++++++ utils/translate/SimpleTypeMapping.py | 18 +++ utils/translate/TypeMapping.py | 70 ++++++++++ utils/translate/XSDNativeSimpleTypeMapping.py | 72 +++++++++++ utils/translate/__init__.py | 64 +++++++++ utils/translate_spec.py | 122 ++++++++++++++++++ utils/ts103120_config.json | 14 ++ utils/validate.py | 94 ++++++++++++++ utils/xml_to_json.py | 42 ++++++ 11 files changed, 629 insertions(+) create mode 100644 utils/translate/ChoiceMapping.py create mode 100644 utils/translate/ComplexTypeMapping.py create mode 100644 utils/translate/SequenceMapping.py create mode 100644 utils/translate/SimpleTypeMapping.py create mode 100644 utils/translate/TypeMapping.py create mode 100644 utils/translate/XSDNativeSimpleTypeMapping.py create mode 100644 utils/translate/__init__.py create mode 100644 utils/translate_spec.py create mode 100644 utils/ts103120_config.json create mode 100644 utils/validate.py create mode 100644 utils/xml_to_json.py diff --git a/utils/translate/ChoiceMapping.py b/utils/translate/ChoiceMapping.py new file mode 100644 index 0000000..fecadf8 --- /dev/null +++ b/utils/translate/ChoiceMapping.py @@ -0,0 +1,42 @@ +import logging + +from xmlschema.validators.simple_types import * +from xmlschema.validators.complex_types import * +from xmlschema.validators.groups import * +from xmlschema.validators.facets import * + +from .TypeMapping import TypeMapping +from .ComplexTypeMapping import ComplexTypeMapping + +log = logging.getLogger() + +class ChoiceMapping(ComplexTypeMapping): + @classmethod + def process_choice(cls, choice: XsdGroup, current_ns : str): + if choice.model != 'choice': + raise Exception(f"Wrong group type: {c.model}") + oneOf = [] + for c in choice.iter_model(): + if not (type(c) is XsdElement): + raise Exception (f"Non-element {c} encountered in choice {choice}") + t = TypeMapping.get_type_from_elem(c, current_ns) + oneOf.append({ + "type" : "object", + "properties" : { + c.local_name : t + }, + "required" : [c.local_name] + }) + return oneOf + + def map(self, xst : BaseXsdType): + log.debug(f"Attempting mapping of {xst} to choice") + j = super().map(xst) + if j is None: + log.debug("Not a complex type, giving up") + return None + content = xst.content + if (content.model != 'choice'): + log.debug("Not a choice, giving up") + return None + return { 'oneOf' : ChoiceMapping.process_choice(content, xst.namespaces[''])} diff --git a/utils/translate/ComplexTypeMapping.py b/utils/translate/ComplexTypeMapping.py new file mode 100644 index 0000000..e181909 --- /dev/null +++ b/utils/translate/ComplexTypeMapping.py @@ -0,0 +1,11 @@ +from xmlschema.validators.complex_types import * + +from .TypeMapping import TypeMapping + +class ComplexTypeMapping(TypeMapping): + def map(self, xst: BaseXsdType): + if not (type(xst) is XsdComplexType): + return None + return { + "type" : "object" + } diff --git a/utils/translate/SequenceMapping.py b/utils/translate/SequenceMapping.py new file mode 100644 index 0000000..91db5ea --- /dev/null +++ b/utils/translate/SequenceMapping.py @@ -0,0 +1,80 @@ +import logging + +from xmlschema.validators.simple_types import * +from xmlschema.validators.complex_types import * +from xmlschema.validators.groups import * +from xmlschema.validators.facets import * + +from .TypeMapping import TypeMapping +from .ChoiceMapping import ChoiceMapping +from .ComplexTypeMapping import ComplexTypeMapping + +log = logging.getLogger() + + +class SequenceMapping(ComplexTypeMapping): + def map(self, xst: BaseXsdType): + log.debug(f"Attempting mapping of {xst} to sequence") + j = super().map(xst) + if j is None: + log.debug("Not a complex type, giving up") + return None + content = xst.content + if (content.model != 'sequence'): + log.debug("Not a sequence, giving up") + return None + mapped_type = { + 'type' : 'object', + 'properties' : {}, + 'required' : [] + } + + # Not going to try and do all of this automatically for now + # Only make insert the xsiType parameter + if (xst.base_type): + # mapped_type['__DESCENDENT_OF__'] = TypeMapping.get_ref_for(xst.base_type, xst.namespaces['']) + mapped_type['properties']['@xsi:type'] = { + "type" : "string", + "enum" : xst.name + } + mapped_type['required'].append('@xsi:type') + # if xst.abstract: + # mapped_type['__ABSTRACT__'] = True + # pass + + inner_choice = None + for c in list(content.iter_model()): + log.debug(f"Processing model item {c}") + if type(c) is XsdElement: + if c.effective_max_occurs != 1: + mapped_type['properties'][c.local_name] = { + "type" : "array", + "items" : TypeMapping.get_type_from_elem(c, xst.namespaces['']) + } + if c.effective_max_occurs: + mapped_type['properties'][c.local_name]['maxItems'] = c.effective_max_occurs + if c.effective_min_occurs > 0: + mapped_type['properties'][c.local_name]['minItems'] = c.effective_min_occurs + else: + mapped_type['properties'][c.local_name] = TypeMapping.get_type_from_elem(c, xst.namespaces['']) + if c.effective_min_occurs == 1: + mapped_type['required'].append(c.local_name) + elif type(c) is XsdGroup: + if inner_choice: + raise Exception (f"Second group '{c.local_name}' encountered in {xst}") + if c.model != "choice": + raise Exception (f"Don't know what to do with inner group {c} in {xst} - not a choice") + inner_choice = ChoiceMapping.process_choice(c, xst.namespaces['']) + elif type(c) is XsdAnyElement: + mapped_type = {} + else: + raise Exception(f"Unknown element type {c}") + if (inner_choice): + return { + 'allOf' : [ + mapped_type, + {'oneOf' : inner_choice} + ] + } + else: + return mapped_type diff --git a/utils/translate/SimpleTypeMapping.py b/utils/translate/SimpleTypeMapping.py new file mode 100644 index 0000000..2e60f9c --- /dev/null +++ b/utils/translate/SimpleTypeMapping.py @@ -0,0 +1,18 @@ +import logging + +from xmlschema.validators.complex_types import * +from xmlschema.validators.simple_types import XsdAtomicRestriction + +from .TypeMapping import TypeMapping + +log = logging.getLogger() + +class SimpleTypeMapping(TypeMapping): + def map(self, xst: BaseXsdType): + log.debug(f"Attempting mapping of {xst} to simple type") + if not (type(xst) is XsdAtomicRestriction): + log.debug("Type is not an XsdAtomicRestriction, giving up") + return None + return { + "$ref" : xst.base_type.name + } \ No newline at end of file diff --git a/utils/translate/TypeMapping.py b/utils/translate/TypeMapping.py new file mode 100644 index 0000000..b796e66 --- /dev/null +++ b/utils/translate/TypeMapping.py @@ -0,0 +1,70 @@ +import logging +from abc import ABC, abstractmethod + +from xmlschema.validators.simple_types import * +from xmlschema.validators.complex_types import * +from xmlschema.validators.groups import * +from xmlschema.validators.facets import * + +log = logging.getLogger() + +class TypeMapping(ABC): + ns_to_id_map = {} + + XSD_NS = "http://www.w3.org/2001/XMLSchema" + + XSD_TYPE_MAP = { + "string" : { "type" : "string" }, + "normalizedString" : { "type" : "string", "pattern" : "^[^\r\n\t]*$"}, + "dateTime" : { "type" : "string"}, + "token" : { "type" : "string", "pattern" : "^[^\r\n\t]*$"}, + "anyURI" : { "type" : "string" }, + + "integer" : { "type" : "integer"}, + "nonNegativeInteger" : { "type" : "integer", "minimum" : 0}, + "positiveInteger" : { "type" : "integer", "minimum" : 1}, + + "boolean" : { "type" : "boolean" }, + + "hexBinary" : { "type" : "string", "pattern" : "^([a-fA-F0-9]{2})*$"}, + "base64Binary" : { "type" : "string", "pattern" : "^[-A-Za-z0-9+/]*={0,3}$"}, + + "anyType" : {} + } + + @abstractmethod + def map(self, xst : BaseXsdType): + return None + + @classmethod + def extract_namespace(cls, qname: str): + match = re.search(r'^\{([^\{\}]+)\}(([^\{\}]+))$', qname) + if match is None: + return None + return match.group(1) + + @classmethod + def get_ref_for(cls, xsd_type: XsdType, current_ns : str): + ns = cls.extract_namespace(xsd_type.name) + if ns == current_ns: + return { "$ref" : f"#/$defs/{xsd_type.local_name}" } + else: + mapped_id = cls.ns_to_id_map[ns] + return { "$ref" : f"{mapped_id}#/$defs/{xsd_type.local_name}"} + + @classmethod + def get_type_from_elem(cls, elem: XsdElement, current_ns : str): + ns = cls.extract_namespace(elem.type.name) + if (ns == TypeMapping.XSD_NS): + # this should be an XSD primitive type + return dict(TypeMapping.XSD_TYPE_MAP[elem.type.local_name]) + else: + return cls.get_ref_for(elem.type, current_ns) + + + + + + + + diff --git a/utils/translate/XSDNativeSimpleTypeMapping.py b/utils/translate/XSDNativeSimpleTypeMapping.py new file mode 100644 index 0000000..772ac10 --- /dev/null +++ b/utils/translate/XSDNativeSimpleTypeMapping.py @@ -0,0 +1,72 @@ +import logging + +from xmlschema.validators.simple_types import * +from xmlschema.validators.complex_types import * +from xmlschema.validators.groups import * +from xmlschema.validators.facets import * + +from .TypeMapping import TypeMapping +from .SimpleTypeMapping import SimpleTypeMapping + +log = logging.getLogger() + +class XSDNativeSimpleTypeMapping(SimpleTypeMapping): + + def map(self, xst: BaseXsdType): + log.debug(f"Attempting mapping of {xst} to XSD native type") + j = super().map(xst) + if j is None: + log.debug("Not a simple type, giving up") + return None + + mapped_type = TypeMapping.XSD_TYPE_MAP.get(xst.base_type.local_name) + parent_type = None + + if mapped_type is None: + ns = TypeMapping.extract_namespace(xst.base_type.name) + if ns == XSDNativeSimpleTypeMapping.XSD_NS: + print (xst) + print (xst.base_type) + raise Exception (f"No mapping for xs:{xst.base_type.local_name}") + if len(xst.facets) == 0: + mapped_type = TypeMapping.get_ref_for(xst.base_type, xst.namespaces['']) + else: + parent_type = TypeMapping.get_ref_for(xst.base_type, xst.namespaces['']) + mapped_type = TypeMapping.XSD_TYPE_MAP.get(xst.root_type.local_name) + if mapped_type is None: + raise Exception (f"Could not find mapping for root type xs:{xst.root_type.local_name}") + + mapped_type = dict(mapped_type) + + for k, v in xst.facets.items(): + log.debug(f"Mapping facet {v}") + if type(v) is XsdMaxLengthFacet: + mapped_type['maxLength'] = v.value + continue + if type(v) is XsdMinLengthFacet: + mapped_type['minLength'] = v.value + continue + if type(v) is XsdPatternFacets: + if len(v.regexps) > 1: + raise Exception (f"Multiple patterns given in facet {v} of {xst}") + p = v.regexps[0] + if (not p.startswith('^')) and (not p.endswith('$')): + p = f"^{p}$" + mapped_type['pattern'] = p + continue + if type (v) is XsdMinInclusiveFacet: + mapped_type['minimum'] = v.value + continue + if type (v) is XsdMaxInclusiveFacet: + mapped_type['maximum'] = v.value + continue + if type (v) is XsdMinExclusiveFacet: + mapped_type['exclusiveMinimum'] = v.value + continue + if type (v) is XsdMaxExclusiveFacet: + mapped_type['exclusiveMaximum'] = v.value + continue + raise Exception (f"Unhandled facet {v}") + if parent_type: + return { 'allOf' : [parent_type, mapped_type] } + return mapped_type diff --git a/utils/translate/__init__.py b/utils/translate/__init__.py new file mode 100644 index 0000000..983aa20 --- /dev/null +++ b/utils/translate/__init__.py @@ -0,0 +1,64 @@ +import logging + +from pathlib import Path +from xmlschema import * + +from .TypeMapping import * +from .XSDNativeSimpleTypeMapping import XSDNativeSimpleTypeMapping +from .ChoiceMapping import ChoiceMapping +from .SequenceMapping import SequenceMapping + + +log = logging.getLogger() + +mappings = [ + XSDNativeSimpleTypeMapping(), + ChoiceMapping(), + SequenceMapping(), +] + +def translate_schema (schema_path: str, ns_to_id_map: dict, schema_locations = []): + js = { + "$id" : "?", + "$defs" : {} + } + + logging.info(f"Translating schema {schema_path}") + xs = XMLSchema(schema_path, validation='lax', locations=schema_locations) + logging.info(f"Schema namespace: {xs.target_namespace}" ) + + schema_id = ns_to_id_map[xs.target_namespace] + js['$id'] = schema_id + + TypeMapping.ns_to_id_map = ns_to_id_map + + elementList = [] + for elementName, element in xs.elements.items(): + logging.info(f"Processing element {elementName} : {element}") + elementList.append(TypeMapping.get_ref_for(element.type, element.namespaces[''])) + if len(elementList) == 1: + js['$ref'] = elementList[0]['$ref'] + elif len(elementList) > 1: + js['oneOf'] = elementList + + descendent_types = {} + for type_name, xsd_type in xs.types.items(): + logging.info(f"Processing {type_name} : {xsd_type}") + + j = None + for mapping in mappings: + log.debug("\n----------------------------------------") + j = mapping.map(xsd_type) + if j is None: + continue + else: + break + if j is None: + raise Exception(f"Unmapped type {type_name} ({xsd_type})") + js["$defs"][xsd_type.local_name] = j + logging.debug (f"Mapped {type_name} to {j}") + + print (descendent_types) + return js + + diff --git a/utils/translate_spec.py b/utils/translate_spec.py new file mode 100644 index 0000000..8f89093 --- /dev/null +++ b/utils/translate_spec.py @@ -0,0 +1,122 @@ +import json +import os +import logging +from pathlib import Path +import sys + +from xmlschema import * + +from translate import * + +import jsonschema + +logging.basicConfig(level = logging.INFO) + +def build_schema_locations (paths): + schema_locations = [] + for schemaFile in paths: + try: + xs = XMLSchema(schemaFile, validation='skip') + schema_locations.append((xs.target_namespace, str(Path(schemaFile).resolve()))) + logging.debug (" [ {0} -> {1} ]".format(xs.target_namespace, schemaFile)) + except XMLSchemaParseError as ex: + logging.debug (" [ {0} failed to parse: {1} ]".format(schemaFile, ex)) + return schema_locations + +def get_json(filename): + with open(filename) as f: + j = json.load(f) + return j + +def convert_ns_to_id (ns): + if ns.startswith('http://uri.etsi.org'): + c = ns.split("/") + return f"ts_1{c[3]}{'_' + c[7] if len(c) > 7 else ''}_{c[5]}_{c[6]}" + else: + return ns.replace("http://","").replace("/","_") + +def convert_xsd_to_filename (xsd): + f = Path(xsd) + return f.name.replace('.xsd', '.schema.json') + +if __name__ == "__main__": + if len(sys.argv) < 2: + logging.error ("Usage: translate_spec.py path_to_config_file") + exit(-1) + + config = get_json(sys.argv[1]) + + schema_paths = config['schemas'] + logging.info("Bulding schema locations...") + schema_locations = build_schema_locations(schema_paths) + logging.debug(schema_locations) + + # ns_to_id_map = { + # schema[0]: schema[0].split('/')[-1].lower() + ".json" + # for schema in schema_locations if '03120' in schema[0] + # } | { + # 'http://uri.etsi.org/03280/common/2017/07' : 'etsi103280.json', + # 'http://www.w3.org/2000/09/xmldsig#' : 'xmldsig.json', + # } + logging.info("Constructing XSD NS to JSON Schema ID mapping...") + ns_to_id_map = { schema[0] : convert_ns_to_id(schema[0]) for schema in schema_locations} + logging.debug(ns_to_id_map) + + # # js = translate_schema("103280/TS_103_280.xsd", "103120.json") + # # print(json.dumps(js, indent=2)) + + output_path = Path(config['output']) + if not output_path.exists(): + logging.info("Creating output directory") + os.mkdir(str(output_path)) + + logging.info("Translating schemas...") + json_schemas = {} + for schema_tuple in schema_locations: + logging.info(f" Translating {schema_tuple}") + if 'xmldsig' in (schema_tuple[1]): + # TODO - work out what to do here + logging.info(" Skipping XML Dsig...") + continue + js = translate_schema(schema_tuple[1], ns_to_id_map, schema_locations) + if ns_to_id_map[schema_tuple[0]] == 'core.json': + js['$defs']['HI1Message']['properties'].pop('Signature') + js_path = output_path / convert_xsd_to_filename(schema_tuple[1]) + + # TODO - work out how to do this substitution automatically + # and build the graph of acceptable descendent types + if "Core" in schema_tuple[1]: + js["$defs"]['ConcreteHI1Object'] = { + 'oneOf' : [ + {'$ref' : 'ts_103120_Authorisation_2020_09#/$defs/AuthorisationObject'}, + {'$ref' : 'ts_103120_Task_2020_09#/$defs/LITaskObject'}, + {'$ref' : 'ts_103120_Task_2020_09#/$defs/LDTaskObject'}, + {'$ref' : 'ts_103120_Document_2020_09#/$defs/DocumentObject'}, + {'$ref' : 'ts_103120_Notification_2016_02#/$defs/NotificationObject'}, + {'$ref' : 'ts_103120_Delivery_2019_10#/$defs/DeliveryObject'}, + {'$ref' : 'ts_103120_TrafficPolicy_2022_07#/$defs/TrafficPolicyObject'}, + ] + } + + json_string = json.dumps(js, indent=2) + + if "Core" in schema_tuple[1]: + json_string = json_string.replace('"$ref": "#/$defs/HI1Object"', '"$ref": "#/$defs/ConcreteHI1Object"') + + with open(str(js_path), 'w') as f: + f.write(json_string) + json_schemas[js['$id']] = json.loads(json_string) + + # else: + # json_schemas = {} + # json_path = Path('json/') + # for json_file in json_path.glob("*.json"): + # json_schemas[json_file.name] = get_json(json_file) + + # resolver = jsonschema.RefResolver("", "", json_schemas) + + # instance = get_json("120.json") + # schema = json_schemas['core.json'] + # jsonschema.validate(instance, schema, resolver=resolver) + + # print(json.dumps(js, indent=2)) diff --git a/utils/ts103120_config.json b/utils/ts103120_config.json new file mode 100644 index 0000000..08aadb8 --- /dev/null +++ b/utils/ts103120_config.json @@ -0,0 +1,14 @@ +{ + "schemas" : [ "../103120/schema/ts_103120_Authorisation.xsd", + "../103120/schema/ts_103120_Common.xsd", + "../103120/schema/ts_103120_Core.xsd", + "../103120/schema/ts_103120_Delivery.xsd", + "../103120/schema/ts_103120_Document.xsd", + "../103120/schema/ts_103120_Notification.xsd", + "../103120/schema/ts_103120_Task.xsd", + "../103120/schema/ts_103120_TrafficPolicy.xsd", + "../103280/TS_103_280.xsd", + "../testing/deps/xmldsig/xmldsig-core-schema.xsd" + ], + "output" : "../103120/schema/json/" +} \ No newline at end of file diff --git a/utils/validate.py b/utils/validate.py new file mode 100644 index 0000000..a290ed3 --- /dev/null +++ b/utils/validate.py @@ -0,0 +1,94 @@ +import sys +from jsonschema import validate, RefResolver, Draft202012Validator +import json +from pathlib import Path +import logging +import argparse + + + +# filename = sys.argv[1] + +# def load_json (path): +# with open(path) as f: +# s = json.load(f) +# return s + +# schema_store = {} + +# json_instance = load_json(filename) +# print (json_instance) + +# etsi_schema = load_json('response.schema.json') +# ext_schema = load_json('extended.schema.json') +# ext_ent_schema = load_json("extended_entities.schema.json") +# schema_store = { +# etsi_schema['$id'] : etsi_schema, +# ext_schema['$id'] : ext_schema, +# ext_ent_schema['$id'] : ext_ent_schema +# } + +# resolver = RefResolver(None, referrer=None, store=schema_store) + +# print (etsi_schema) + +# v = Draft202012Validator(ext_schema, resolver=resolver) +# v.validate(json_instance) + +# validate(json_instance, ext_schema) +# print ("OK") + +def handle_uri(u): + print(u) + +def load_json(path : str): + with open(path) as f: + return json.load(f) + +if __name__ == "__main__": + parser = argparse.ArgumentParser() + + parser.add_argument('-s','--schemadir', action="append", help="Directory containing supporting schema files to use for validation") + parser.add_argument('-v', '--verbose', action="count", help="Verbose logging (can be specified multiple times)") + parser.add_argument('schema', help="Primary schema to validate against") + parser.add_argument('filename', help="JSON instance document to validate") + + args = parser.parse_args() + + match args.verbose: + case v if v and v >= 2: + logging.basicConfig(level=logging.DEBUG) + case 1: + logging.basicConfig(level=logging.INFO) + case _: + logging.basicConfig(level=logging.WARNING) + + logging.debug(f"Arguments: {args}") + + instance_doc = load_json(args.filename) + main_schema = load_json(args.schema) + schema_dict = { main_schema['$id'] : main_schema } + + if args.schemadir: + schema_paths = [] + for d in args.schemadir: + schema_paths += [f for f in Path(d).rglob("*.schema.json")] + logging.info(f"Schema files loaded: {schema_paths}") + + schemas_json = [json.load(p.open()) for p in schema_paths] + schema_dict = schema_dict | { s['$id'] : s for s in schemas_json } + + logging.info(f"Schema IDs loaded: {[k for k in schema_dict.keys()]}") + + logging.debug (f"Instance doc: {instance_doc}") + logging.debug (f"Main schema: {main_schema}") + + resolver = RefResolver(None, + referrer=None, + store=schema_dict) + + v = Draft202012Validator(main_schema, resolver=resolver) + + v.validate(instance_doc) + + logging.info("Done") \ No newline at end of file diff --git a/utils/xml_to_json.py b/utils/xml_to_json.py new file mode 100644 index 0000000..2655bd7 --- /dev/null +++ b/utils/xml_to_json.py @@ -0,0 +1,42 @@ +import xmltodict +import sys +from pprint import pprint +import json +from pathlib import Path + + +def extract_prefixes (d): + return { k.split(':')[1]: d[k] for k in d.keys() if k.startswith("@xmlns:") } + +def removePrefixes (o, prefixes): + if not isinstance(o, dict): return + replacements = [] + for k,v in o.items(): + if isinstance(v, dict): + removePrefixes(v, prefixes) + if isinstance(v, list): + for i in v: + removePrefixes(i, prefixes) + if ":" in k: + prefix = k.split(':')[0] + if (prefix) in prefixes: + new_key = k.split(':')[1] + replacements.append( (k, new_key) ) + for r in replacements: + print(r) + o[r[1]] = o.pop(r[0]) + +if __name__ == "__main__": + if len(sys.argv) < 2: + print ("Usage: xml_to_json.py filename") + + p = Path(sys.argv[1]) + s = p.read_text() + print(s) + + d = xmltodict.parse(s)['HI1Message'] + + prefixes = extract_prefixes(d) + removePrefixes(d, prefixes) + + print(d) -- GitLab From 007da2d1b9c1f2fbdb9353626b178aeb1d28012e Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 18 May 2023 16:04:56 +0100 Subject: [PATCH 03/22] Adding new stuff --- 103120/examples/fragment.json | 11 + 103120/examples/fragment.schema.json | 4 + 103120/examples/request1b.json | 43 ++ 103120/examples/request1c.json | 33 + 103120/examples/request1d.json | 47 ++ 103120/schema/json/TS_103_280.schema.json | 389 ++++++++++ .../json/ts_103120_Authorisation.schema.json | 148 ++++ .../schema/json/ts_103120_Common.schema.json | 164 +++++ 103120/schema/json/ts_103120_Core.schema.json | 589 +++++++++++++++ .../json/ts_103120_Delivery.schema.json | 209 ++++++ .../json/ts_103120_Document.schema.json | 148 ++++ .../json/ts_103120_Notification.schema.json | 103 +++ 103120/schema/json/ts_103120_Task.schema.json | 599 +++++++++++++++ .../json/ts_103120_TrafficPolicy.schema.json | 198 +++++ 103120/utils/validate.py | 94 --- 103120/utils/xml_to_json.py | 12 - 103280/TS_103_280.schema.json | 686 +++++++++--------- 17 files changed, 3029 insertions(+), 448 deletions(-) create mode 100644 103120/examples/fragment.json create mode 100644 103120/examples/fragment.schema.json create mode 100644 103120/examples/request1b.json create mode 100644 103120/examples/request1c.json create mode 100644 103120/examples/request1d.json create mode 100644 103120/schema/json/TS_103_280.schema.json create mode 100644 103120/schema/json/ts_103120_Authorisation.schema.json create mode 100644 103120/schema/json/ts_103120_Common.schema.json create mode 100644 103120/schema/json/ts_103120_Core.schema.json create mode 100644 103120/schema/json/ts_103120_Delivery.schema.json create mode 100644 103120/schema/json/ts_103120_Document.schema.json create mode 100644 103120/schema/json/ts_103120_Notification.schema.json create mode 100644 103120/schema/json/ts_103120_Task.schema.json create mode 100644 103120/schema/json/ts_103120_TrafficPolicy.schema.json delete mode 100644 103120/utils/validate.py delete mode 100644 103120/utils/xml_to_json.py diff --git a/103120/examples/fragment.json b/103120/examples/fragment.json new file mode 100644 index 0000000..98a6bfc --- /dev/null +++ b/103120/examples/fragment.json @@ -0,0 +1,11 @@ +{ + "@xsi:type": "{http://uri.etsi.org/03120/common/2020/09/Authorisation}AuthorisationObject", + "ObjectIdentifier": "7dbbc880-8750-4d3c-abe7-ea4a17646045", + "CountryCode": "GB", + "OwnerIdentifier": "ACTOR01", + "AuthorisationReference": "W000001", + "AuthorisationTimespan": { + "StartTime": "2015-09-01T12:00:00Z", + "EndTime": "2015-12-01T12:00:00Z" + } +} \ No newline at end of file diff --git a/103120/examples/fragment.schema.json b/103120/examples/fragment.schema.json new file mode 100644 index 0000000..80124bc --- /dev/null +++ b/103120/examples/fragment.schema.json @@ -0,0 +1,4 @@ +{ + "$id": "ts_103120_Authorisation_2020_09", + "$ref" : "ts_103120_Authorisation_2020_09#/$defs/AuthorisationObject" +} \ No newline at end of file diff --git a/103120/examples/request1b.json b/103120/examples/request1b.json new file mode 100644 index 0000000..82b1a1e --- /dev/null +++ b/103120/examples/request1b.json @@ -0,0 +1,43 @@ +{ + "Header": { + "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", + "AuthorisationReference": "W000001", + "AuthorisationTimespan": { + "StartTime": "2015-09-01T12:00:00Z", + "EndTime": "2015-12-01T12:00:00Z" + } + } + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/103120/examples/request1c.json b/103120/examples/request1c.json new file mode 100644 index 0000000..645f706 --- /dev/null +++ b/103120/examples/request1c.json @@ -0,0 +1,33 @@ +{ + "Header": { + "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": 1, + "GET": { + "Identifier" : "c02358b2-76cf-4ba4-a8eb-f6436ccaea2e" + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/103120/examples/request1d.json b/103120/examples/request1d.json new file mode 100644 index 0000000..bf34f7f --- /dev/null +++ b/103120/examples/request1d.json @@ -0,0 +1,47 @@ +{ + "Header" : { + "SenderIdentifier" : { + "CountryCode" : "XX", + "UniqueIdentifier" : "ACTOR01" + }, + "ReceiverIdentifier" : { + "CountryCode" : "YY", + "UniqueIdentifier" : "ACTOR02" + }, + "TransactionIdentifier" : "c4a09046-61da-485b-83f2-ca12caebf40b", + "Timestamp" : "2022-06-10T15:50:00.000000Z", + "Version" : { + "ETSIVersion" : "V1.11.2", + "NationalProfileOwner" : "NA", + "NationalProfileVersion" : "NA" + } + }, + "Payload" : { + "ResponsePayload" : { + "ActionResponses" : { + "ActionResponse" : [{ + "ActionIdentifier" : 0, + "CREATEResponse" : { + "Identifier" : "f25dec16-927c-433b-959c-1886182cac58", + "HI1Object" : { + "xsiType" : "{http://uri.etsi.org/03120/common/2020/09/Task}LITaskObject", + "ObjectIdentifier" : "d980e335-d17a-471f-bb40-cddf4457fd6b", + "Reference" : "LIID", + "TargetIdentifier" : { + "TargetIdentifierValues" : { + "TargetIdentifierValue" : [ { + "FormatType" : { + "FormatOwner" : "ETSI", + "FormatName" : "InternationalE164" + }, + "Value" : "447700900123" + } ] + } + } + } + } + }] + } + } + } +} diff --git a/103120/schema/json/TS_103_280.schema.json b/103120/schema/json/TS_103_280.schema.json new file mode 100644 index 0000000..474b3ee --- /dev/null +++ b/103120/schema/json/TS_103_280.schema.json @@ -0,0 +1,389 @@ +{ + "$id": "ts_103280_2017_07", + "$defs": { + "ShortString": { + "type": "string", + "maxLength": 255 + }, + "LongString": { + "type": "string", + "maxLength": 65535 + }, + "LIID": { + "type": "string", + "pattern": "^([!-~]{1,25})|([0-9a-f]{26,50})$" + }, + "UTCDateTime": { + "type": "string", + "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z$" + }, + "UTCMicrosecondDateTime": { + "type": "string", + "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}\\.[0-9]{6}Z$" + }, + "QualifiedDateTime": { + "type": "string", + "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}(Z|[+-][0-9]{2}:[0-9]{2})$" + }, + "QualifiedMicrosecondDateTime": { + "type": "string", + "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}\\.[0-9]{6}(Z|[+-][0-9]{2}:[0-9]{2})$" + }, + "InternationalE164": { + "type": "string", + "pattern": "^[0-9]{1,15}$" + }, + "IMSI": { + "type": "string", + "pattern": "^[0-9]{6,15}$" + }, + "IMEI": { + "type": "string", + "pattern": "^[0-9]{14}$" + }, + "IMEICheckDigit": { + "type": "string", + "pattern": "^[0-9]{15}$" + }, + "IMEISV": { + "type": "string", + "pattern": "^[0-9]{16}$" + }, + "IPv4Address": { + "type": "string", + "pattern": "^((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])$" + }, + "IPv4CIDR": { + "type": "string", + "pattern": "^((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])/([1-2]?[0-9]|3[0-2])$" + }, + "IPv6Address": { + "type": "string", + "pattern": "^([0-9a-f]{4}:){7}([0-9a-f]{4})$" + }, + "IPv6CIDR": { + "type": "string", + "pattern": "^([0-9a-f]{4}:){7}([0-9a-f]{4})/(([1-9][0-9]?)|(1[0-1][0-9])|(12[0-8]))$" + }, + "TCPPort": { + "type": "integer", + "exclusiveMinimum": 1, + "maximum": 65535 + }, + "UDPPort": { + "type": "integer", + "minimum": 0, + "maximum": 65535 + }, + "MACAddress": { + "type": "string", + "pattern": "^([a-f0-9]{2}:){5}[a-f0-9]{2}$" + }, + "EmailAddress": { + "allOf": [ + { + "$ref": "#/$defs/ShortString" + }, + { + "type": "string", + "pattern": "^[a-zA-Z0-9\\.!#$%&'\\*\\+\\\\/=\\?\\^_`\\{\\|\\}~\\-]+@[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(\\.[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$" + } + ] + }, + "UUID": { + "type": "string", + "pattern": "^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$" + }, + "ISOCountryCode": { + "type": "string", + "pattern": "^[A-Z]{2}$" + }, + "SIPURI": { + "type": "string", + "pattern": "^sips?:[a-zA-Z0-9!#$&-;=?-\\[\\]_~%]+$" + }, + "TELURI": { + "type": "string", + "pattern": "^tel:[a-zA-Z0-9!#$&-;=?-\\[\\]_~%]+$" + }, + "WGS84LatitudeDecimal": { + "type": "string", + "pattern": "^[NS][0-9]{2}\\.[0-9]{6}$" + }, + "WGS84LongitudeDecimal": { + "type": "string", + "pattern": "^[EW][0-9]{3}\\.[0-9]{6}$" + }, + "WGS84LatitudeAngular": { + "type": "string", + "pattern": "^[NS][0-9]{6}\\.[0-9]{2}$" + }, + "WGS84LongitudeAngular": { + "type": "string", + "pattern": "^[EW][0-9]{7}\\.[0-9]{2}$" + }, + "SUPIIMSI": { + "$ref": "#/$defs/IMSI" + }, + "SUPINAI": { + "$ref": "#/$defs/NAI" + }, + "SUCI": { + "type": "string", + "pattern": "^([a-fA-F0-9]{2})*$" + }, + "PEIIMEI": { + "$ref": "#/$defs/IMEI" + }, + "PEIIMEICheckDigit": { + "$ref": "#/$defs/IMEICheckDigit" + }, + "PEIIMEISV": { + "$ref": "#/$defs/IMEISV" + }, + "GPSIMSISDN": { + "type": "string", + "pattern": "^[0-9]{1,15}$" + }, + "GPSINAI": { + "$ref": "#/$defs/NAI" + }, + "NAI": { + "type": "string" + }, + "LDID": { + "type": "string", + "pattern": "^([A-Z]{2}-.+-.+)$" + }, + "InternationalizedEmailAddress": { + "allOf": [ + { + "$ref": "#/$defs/ShortString" + }, + { + "type": "string", + "pattern": "^.+@.+$" + } + ] + }, + "EUI64": { + "type": "string", + "pattern": "^([a-f0-9]{2}:){7}[a-f0-9]{2}$" + }, + "CGI": { + "type": "string", + "pattern": "^[0-9]{3}-[0-9]{2,3}-[a-f0-9]{4}-[a-f0-9]{4}$" + }, + "ECGI": { + "type": "string", + "pattern": "^[0-9]{3}-[0-9]{2,3}-[a-f0-9]{7}$" + }, + "NCGI": { + "type": "string", + "pattern": "^[0-9]{3}-[0-9]{2,3}-[a-f0-9]{9}$" + }, + "ICCID": { + "type": "string", + "pattern": "^[0-9]{19,20}$" + }, + "IPProtocol": { + "type": "integer", + "minimum": 0, + "maximum": 255 + }, + "IPAddress": { + "oneOf": [ + { + "type": "object", + "properties": { + "IPv4Address": { + "$ref": "#/$defs/IPv4Address" + } + }, + "required": [ + "IPv4Address" + ] + }, + { + "type": "object", + "properties": { + "IPv6Address": { + "$ref": "#/$defs/IPv6Address" + } + }, + "required": [ + "IPv6Address" + ] + } + ] + }, + "IPCIDR": { + "oneOf": [ + { + "type": "object", + "properties": { + "IPv4CIDR": { + "$ref": "#/$defs/IPv4CIDR" + } + }, + "required": [ + "IPv4CIDR" + ] + }, + { + "type": "object", + "properties": { + "IPv6CIDR": { + "$ref": "#/$defs/IPv6CIDR" + } + }, + "required": [ + "IPv6CIDR" + ] + } + ] + }, + "TCPPortRange": { + "type": "object", + "properties": { + "start": { + "$ref": "#/$defs/TCPPort" + }, + "end": { + "$ref": "#/$defs/TCPPort" + } + }, + "required": [ + "start", + "end" + ] + }, + "UDPPortRange": { + "type": "object", + "properties": { + "start": { + "$ref": "#/$defs/UDPPort" + }, + "end": { + "$ref": "#/$defs/UDPPort" + } + }, + "required": [ + "start", + "end" + ] + }, + "Port": { + "oneOf": [ + { + "type": "object", + "properties": { + "TCPPort": { + "$ref": "#/$defs/TCPPort" + } + }, + "required": [ + "TCPPort" + ] + }, + { + "type": "object", + "properties": { + "UDPPort": { + "$ref": "#/$defs/UDPPort" + } + }, + "required": [ + "UDPPort" + ] + } + ] + }, + "PortRange": { + "oneOf": [ + { + "type": "object", + "properties": { + "TCPPortRange": { + "$ref": "#/$defs/TCPPortRange" + } + }, + "required": [ + "TCPPortRange" + ] + }, + { + "type": "object", + "properties": { + "UDPPortRange": { + "$ref": "#/$defs/UDPPortRange" + } + }, + "required": [ + "UDPPortRange" + ] + } + ] + }, + "IPAddressPort": { + "type": "object", + "properties": { + "address": { + "$ref": "#/$defs/IPAddress" + }, + "port": { + "$ref": "#/$defs/Port" + } + }, + "required": [ + "address", + "port" + ] + }, + "IPAddressPortRange": { + "type": "object", + "properties": { + "address": { + "$ref": "#/$defs/IPAddress" + }, + "portRange": { + "$ref": "#/$defs/PortRange" + } + }, + "required": [ + "address", + "portRange" + ] + }, + "WGS84CoordinateDecimal": { + "type": "object", + "properties": { + "latitude": { + "$ref": "#/$defs/WGS84LatitudeDecimal" + }, + "longitude": { + "$ref": "#/$defs/WGS84LongitudeDecimal" + } + }, + "required": [ + "latitude", + "longitude" + ] + }, + "WGS84CoordinateAngular": { + "type": "object", + "properties": { + "latitude": { + "$ref": "#/$defs/WGS84LatitudeAngular" + }, + "longitude": { + "$ref": "#/$defs/WGS84LongitudeAngular" + } + }, + "required": [ + "latitude", + "longitude" + ] + } + } +} \ No newline at end of file diff --git a/103120/schema/json/ts_103120_Authorisation.schema.json b/103120/schema/json/ts_103120_Authorisation.schema.json new file mode 100644 index 0000000..a6f8162 --- /dev/null +++ b/103120/schema/json/ts_103120_Authorisation.schema.json @@ -0,0 +1,148 @@ +{ + "$id": "ts_103120_Authorisation_2020_09", + "$defs": { + "AuthorisationObject": { + "type": "object", + "properties": { + "@xsi:type": { + "type": "string", + "enum": "{http://uri.etsi.org/03120/common/2020/09/Authorisation}AuthorisationObject" + }, + "ObjectIdentifier": { + "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" + }, + "CountryCode": { + "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" + }, + "OwnerIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + }, + "Generation": { + "type": "integer", + "minimum": 0 + }, + "ExternalIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "AssociatedObjects": { + "$ref": "ts_103120_Core_2019_10#/$defs/AssociatedObjects" + }, + "LastChanged": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "NationalHandlingParameters": { + "$ref": "ts_103120_Core_2019_10#/$defs/NationalHandlingParameters" + }, + "AuthorisationReference": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "AuthorisationLegalType": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "AuthorisationPriority": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "AuthorisationStatus": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "AuthorisationDesiredStatus": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "AuthorisationTimespan": { + "$ref": "#/$defs/AuthorisationTimespan" + }, + "AuthorisationCSPID": { + "$ref": "#/$defs/AuthorisationCSPID" + }, + "AuthorisationCreationTimestamp": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "AuthorisationServedTimestamp": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "AuthorisationTerminationTimestamp": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "AuthorisationApprovalDetails": { + "type": "array", + "items": { + "$ref": "ts_103120_Common_2016_02#/$defs/ApprovalDetails" + } + }, + "AuthorisationInvalidReason": { + "$ref": "ts_103120_Core_2019_10#/$defs/ActionUnsuccesfulInformation" + }, + "AuthorisationFlags": { + "$ref": "#/$defs/AuthorisationFlags" + }, + "AuthorisationManualInformation": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "NationalAuthorisationParameters": { + "$ref": "#/$defs/NationalAuthorisationParameters" + }, + "AuthorisationJurisdiction": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "AuthorisationTypeOfCase": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "AuthorisationLegalEntity": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + } + }, + "required": [ + "@xsi:type", + "ObjectIdentifier" + ] + }, + "AuthorisationFlags": { + "type": "object", + "properties": { + "AuthorisationFlag": { + "type": "array", + "items": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + } + } + }, + "required": [] + }, + "AuthorisationTimespan": { + "type": "object", + "properties": { + "StartTime": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "EndTime": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + } + }, + "required": [] + }, + "AuthorisationCSPID": { + "type": "object", + "properties": { + "CSPID": { + "type": "array", + "items": { + "$ref": "ts_103120_Core_2019_10#/$defs/EndpointID" + }, + "minItems": 1 + } + }, + "required": [] + }, + "NationalAuthorisationParameters": { + "type": "object", + "properties": { + "CountryCode": { + "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" + } + }, + "required": [ + "CountryCode" + ] + } + } +} \ No newline at end of file diff --git a/103120/schema/json/ts_103120_Common.schema.json b/103120/schema/json/ts_103120_Common.schema.json new file mode 100644 index 0000000..2149684 --- /dev/null +++ b/103120/schema/json/ts_103120_Common.schema.json @@ -0,0 +1,164 @@ +{ + "$id": "ts_103120_Common_2016_02", + "$defs": { + "ETSIVersion": { + "allOf": [ + { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + }, + { + "type": "string", + "pattern": "^V\\d+\\.\\d+\\.\\d+$" + } + ] + }, + "DictionaryEntry": { + "type": "object", + "properties": { + "Owner": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + }, + "Name": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + }, + "Value": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + } + }, + "required": [ + "Owner", + "Name", + "Value" + ] + }, + "ApprovalDetails": { + "type": "object", + "properties": { + "ApprovalType": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "ApprovalDescription": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "ApprovalReference": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "ApproverDetails": { + "$ref": "#/$defs/ApproverDetails" + }, + "ApprovalTimestamp": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "ApprovalIsEmergency": { + "type": "boolean" + }, + "ApprovalDigitalSignature": { + "$ref": "#/$defs/ApprovalDigitalSignature" + }, + "ApprovalNationalDetails": { + "$ref": "#/$defs/ApprovalNationalDetails" + } + }, + "required": [] + }, + "ApproverDetails": { + "type": "object", + "properties": { + "ApproverName": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "ApproverRole": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "ApproverIdentity": { + "$ref": "#/$defs/ApproverIdentity" + }, + "ApproverContactDetails": { + "type": "array", + "items": { + "$ref": "#/$defs/ApproverContactDetails" + } + } + }, + "required": [] + }, + "ApproverIdentity": { + "oneOf": [ + { + "type": "object", + "properties": { + "NationalApproverIdentity": { + "$ref": "#/$defs/NationalApproverIdentity" + } + }, + "required": [ + "NationalApproverIdentity" + ] + } + ] + }, + "ApproverContactDetails": { + "type": "object", + "properties": { + "ApproverAlternateName": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "ApproverEmailAddress": { + "$ref": "ts_103280_2017_07#/$defs/InternationalizedEmailAddress" + }, + "ApproverPhoneNumber": { + "$ref": "ts_103280_2017_07#/$defs/InternationalE164" + } + }, + "required": [] + }, + "NationalApproverIdentity": { + "type": "object", + "properties": { + "CountryCode": { + "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" + } + }, + "required": [ + "CountryCode" + ] + }, + "ApprovalDigitalSignature": { + "oneOf": [ + { + "type": "object", + "properties": { + "NationalDigitalSignature": { + "$ref": "#/$defs/NationalDigitalSignature" + } + }, + "required": [ + "NationalDigitalSignature" + ] + } + ] + }, + "ApprovalNationalDetails": { + "type": "object", + "properties": { + "CountryCode": { + "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" + } + }, + "required": [ + "CountryCode" + ] + }, + "NationalDigitalSignature": { + "type": "object", + "properties": { + "CountryCode": { + "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" + } + }, + "required": [ + "CountryCode" + ] + } + } +} \ No newline at end of file diff --git a/103120/schema/json/ts_103120_Core.schema.json b/103120/schema/json/ts_103120_Core.schema.json new file mode 100644 index 0000000..ee2852b --- /dev/null +++ b/103120/schema/json/ts_103120_Core.schema.json @@ -0,0 +1,589 @@ +{ + "$id": "ts_103120_Core_2019_10", + "$defs": { + "ObjectIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/UUID" + }, + "HI1Message": { + "type": "object", + "properties": { + "Header": { + "$ref": "#/$defs/MessageHeader" + }, + "Payload": { + "$ref": "#/$defs/MessagePayload" + }, + "Signature": { + "$ref": "www.w3.org_2000_09_xmldsig##/$defs/SignatureType" + } + }, + "required": [ + "Header", + "Payload" + ] + }, + "MessageHeader": { + "type": "object", + "properties": { + "SenderIdentifier": { + "$ref": "#/$defs/EndpointID" + }, + "ReceiverIdentifier": { + "$ref": "#/$defs/EndpointID" + }, + "TransactionIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/UUID" + }, + "Timestamp": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedMicrosecondDateTime" + }, + "Version": { + "$ref": "#/$defs/Version" + } + }, + "required": [ + "SenderIdentifier", + "ReceiverIdentifier", + "TransactionIdentifier", + "Timestamp", + "Version" + ] + }, + "Version": { + "type": "object", + "properties": { + "ETSIVersion": { + "$ref": "ts_103120_Common_2016_02#/$defs/ETSIVersion" + }, + "NationalProfileOwner": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + }, + "NationalProfileVersion": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + } + }, + "required": [ + "ETSIVersion", + "NationalProfileOwner", + "NationalProfileVersion" + ] + }, + "EndpointID": { + "type": "object", + "properties": { + "CountryCode": { + "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" + }, + "UniqueIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + } + }, + "required": [ + "CountryCode", + "UniqueIdentifier" + ] + }, + "MessagePayload": { + "oneOf": [ + { + "type": "object", + "properties": { + "RequestPayload": { + "$ref": "#/$defs/RequestPayload" + } + }, + "required": [ + "RequestPayload" + ] + }, + { + "type": "object", + "properties": { + "ResponsePayload": { + "$ref": "#/$defs/ResponsePayload" + } + }, + "required": [ + "ResponsePayload" + ] + } + ] + }, + "RequestPayload": { + "type": "object", + "properties": { + "ActionRequests": { + "$ref": "#/$defs/ActionRequests" + } + }, + "required": [ + "ActionRequests" + ] + }, + "ActionRequests": { + "type": "object", + "properties": { + "ActionRequest": { + "type": "array", + "items": { + "$ref": "#/$defs/ActionRequest" + }, + "minItems": 1 + } + }, + "required": [] + }, + "ResponsePayload": { + "oneOf": [ + { + "type": "object", + "properties": { + "ActionResponses": { + "$ref": "#/$defs/ActionResponses" + } + }, + "required": [ + "ActionResponses" + ] + }, + { + "type": "object", + "properties": { + "ErrorInformation": { + "$ref": "#/$defs/ActionUnsuccesfulInformation" + } + }, + "required": [ + "ErrorInformation" + ] + } + ] + }, + "ActionResponses": { + "type": "object", + "properties": { + "ActionResponse": { + "type": "array", + "items": { + "$ref": "#/$defs/ActionResponse" + }, + "minItems": 1 + } + }, + "required": [] + }, + "ActionRequest": { + "allOf": [ + { + "type": "object", + "properties": { + "ActionIdentifier": { + "type": "integer", + "minimum": 0 + } + }, + "required": [ + "ActionIdentifier" + ] + }, + { + "oneOf": [ + { + "type": "object", + "properties": { + "GET": { + "$ref": "#/$defs/GETRequest" + } + }, + "required": [ + "GET" + ] + }, + { + "type": "object", + "properties": { + "CREATE": { + "$ref": "#/$defs/CREATERequest" + } + }, + "required": [ + "CREATE" + ] + }, + { + "type": "object", + "properties": { + "UPDATE": { + "$ref": "#/$defs/UPDATERequest" + } + }, + "required": [ + "UPDATE" + ] + }, + { + "type": "object", + "properties": { + "LIST": { + "$ref": "#/$defs/LISTRequest" + } + }, + "required": [ + "LIST" + ] + }, + { + "type": "object", + "properties": { + "DELIVER": { + "$ref": "#/$defs/DELIVERRequest" + } + }, + "required": [ + "DELIVER" + ] + } + ] + } + ] + }, + "ActionResponse": { + "allOf": [ + { + "type": "object", + "properties": { + "ActionIdentifier": { + "type": "integer", + "minimum": 0 + } + }, + "required": [ + "ActionIdentifier" + ] + }, + { + "oneOf": [ + { + "type": "object", + "properties": { + "GETResponse": { + "$ref": "#/$defs/GETResponse" + } + }, + "required": [ + "GETResponse" + ] + }, + { + "type": "object", + "properties": { + "CREATEResponse": { + "$ref": "#/$defs/CREATEResponse" + } + }, + "required": [ + "CREATEResponse" + ] + }, + { + "type": "object", + "properties": { + "UPDATEResponse": { + "$ref": "#/$defs/UPDATEResponse" + } + }, + "required": [ + "UPDATEResponse" + ] + }, + { + "type": "object", + "properties": { + "LISTResponse": { + "$ref": "#/$defs/LISTResponse" + } + }, + "required": [ + "LISTResponse" + ] + }, + { + "type": "object", + "properties": { + "ErrorInformation": { + "$ref": "#/$defs/ActionUnsuccesfulInformation" + } + }, + "required": [ + "ErrorInformation" + ] + }, + { + "type": "object", + "properties": { + "DELIVERResponse": { + "$ref": "#/$defs/DELIVERResponse" + } + }, + "required": [ + "DELIVERResponse" + ] + } + ] + } + ] + }, + "GETRequest": { + "type": "object", + "properties": { + "Identifier": { + "$ref": "#/$defs/ObjectIdentifier" + } + }, + "required": [ + "Identifier" + ] + }, + "GETResponse": { + "type": "object", + "properties": { + "HI1Object": { + "$ref": "#/$defs/ConcreteHI1Object" + } + }, + "required": [ + "HI1Object" + ] + }, + "CREATERequest": { + "type": "object", + "properties": { + "HI1Object": { + "$ref": "#/$defs/ConcreteHI1Object" + } + }, + "required": [ + "HI1Object" + ] + }, + "CREATEResponse": { + "type": "object", + "properties": { + "Identifier": { + "$ref": "#/$defs/ObjectIdentifier" + }, + "HI1Object": { + "$ref": "#/$defs/ConcreteHI1Object" + } + }, + "required": [ + "Identifier" + ] + }, + "UPDATERequest": { + "type": "object", + "properties": { + "HI1Object": { + "$ref": "#/$defs/ConcreteHI1Object" + } + }, + "required": [ + "HI1Object" + ] + }, + "UPDATEResponse": { + "type": "object", + "properties": { + "Identifier": { + "$ref": "#/$defs/ObjectIdentifier" + }, + "HI1Object": { + "$ref": "#/$defs/ConcreteHI1Object" + } + }, + "required": [ + "Identifier" + ] + }, + "LISTRequest": { + "type": "object", + "properties": { + "ObjectType": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "LastChanged": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + } + }, + "required": [] + }, + "LISTResponse": { + "type": "object", + "properties": { + "ListResponseRecord": { + "type": "array", + "items": { + "$ref": "#/$defs/ListResponseRecord" + } + } + }, + "required": [] + }, + "ListResponseRecord": { + "type": "object", + "properties": { + "ObjectType": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "Identifier": { + "$ref": "#/$defs/ObjectIdentifier" + }, + "CountryCode": { + "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" + }, + "OwnerIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + }, + "Generation": { + "type": "integer", + "minimum": 0 + }, + "ExternalIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "LastChanged": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + } + }, + "required": [ + "ObjectType", + "Identifier", + "Generation" + ] + }, + "ActionUnsuccesfulInformation": { + "type": "object", + "properties": { + "ErrorCode": { + "type": "integer", + "minimum": 0 + }, + "ErrorDescription": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + } + }, + "required": [ + "ErrorCode", + "ErrorDescription" + ] + }, + "DELIVERRequest": { + "type": "object", + "properties": { + "Identifier": { + "$ref": "#/$defs/ObjectIdentifier" + }, + "HI1Object": { + "$ref": "#/$defs/ConcreteHI1Object" + } + }, + "required": [ + "Identifier", + "HI1Object" + ] + }, + "DELIVERResponse": { + "type": "object", + "properties": { + "Identifier": { + "$ref": "#/$defs/ObjectIdentifier" + } + }, + "required": [ + "Identifier" + ] + }, + "HI1Object": { + "type": "object", + "properties": { + "ObjectIdentifier": { + "$ref": "#/$defs/ObjectIdentifier" + }, + "CountryCode": { + "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" + }, + "OwnerIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + }, + "Generation": { + "type": "integer", + "minimum": 0 + }, + "ExternalIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "AssociatedObjects": { + "$ref": "#/$defs/AssociatedObjects" + }, + "LastChanged": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "NationalHandlingParameters": { + "$ref": "#/$defs/NationalHandlingParameters" + } + }, + "required": [ + "ObjectIdentifier" + ] + }, + "AssociatedObjects": { + "type": "object", + "properties": { + "AssociatedObject": { + "type": "array", + "items": { + "$ref": "#/$defs/ObjectIdentifier" + } + } + }, + "required": [] + }, + "NationalHandlingParameters": { + "type": "object", + "properties": { + "CountryCode": { + "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" + } + }, + "required": [ + "CountryCode" + ] + }, + "ConcreteHI1Object": { + "oneOf": [ + { + "$ref": "ts_103120_Authorisation_2020_09#/$defs/AuthorisationObject" + }, + { + "$ref": "ts_103120_Task_2020_09#/$defs/LITaskObject" + }, + { + "$ref": "ts_103120_Task_2020_09#/$defs/LDTaskObject" + }, + { + "$ref": "ts_103120_Document_2020_09#/$defs/DocumentObject" + }, + { + "$ref": "ts_103120_Notification_2016_02#/$defs/NotificationObject" + }, + { + "$ref": "ts_103120_Delivery_2019_10#/$defs/DeliveryObject" + }, + { + "$ref": "ts_103120_TrafficPolicy_2022_07#/$defs/TrafficPolicyObject" + } + ] + } + }, + "$ref": "#/$defs/HI1Message" +} \ No newline at end of file diff --git a/103120/schema/json/ts_103120_Delivery.schema.json b/103120/schema/json/ts_103120_Delivery.schema.json new file mode 100644 index 0000000..07ca697 --- /dev/null +++ b/103120/schema/json/ts_103120_Delivery.schema.json @@ -0,0 +1,209 @@ +{ + "$id": "ts_103120_Delivery_2019_10", + "$defs": { + "DeliveryObject": { + "type": "object", + "properties": { + "@xsi:type": { + "type": "string", + "enum": "{http://uri.etsi.org/03120/common/2019/10/Delivery}DeliveryObject" + }, + "ObjectIdentifier": { + "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" + }, + "CountryCode": { + "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" + }, + "OwnerIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + }, + "Generation": { + "type": "integer", + "minimum": 0 + }, + "ExternalIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "AssociatedObjects": { + "$ref": "ts_103120_Core_2019_10#/$defs/AssociatedObjects" + }, + "LastChanged": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "NationalHandlingParameters": { + "$ref": "ts_103120_Core_2019_10#/$defs/NationalHandlingParameters" + }, + "Reference": { + "$ref": "#/$defs/Reference" + }, + "DeliveryID": { + "$ref": "ts_103280_2017_07#/$defs/UUID" + }, + "SequenceNumber": { + "type": "integer", + "minimum": 0 + }, + "LastSequence": { + "type": "boolean" + }, + "Manifest": { + "$ref": "#/$defs/Manifest" + }, + "Delivery": { + "$ref": "#/$defs/Delivery" + } + }, + "required": [ + "@xsi:type", + "ObjectIdentifier" + ] + }, + "Reference": { + "oneOf": [ + { + "type": "object", + "properties": { + "LDID": { + "$ref": "ts_103280_2017_07#/$defs/LDID" + } + }, + "required": [ + "LDID" + ] + }, + { + "type": "object", + "properties": { + "LIID": { + "$ref": "ts_103280_2017_07#/$defs/LIID" + } + }, + "required": [ + "LIID" + ] + } + ] + }, + "Manifest": { + "oneOf": [ + { + "type": "object", + "properties": { + "Specification": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + } + }, + "required": [ + "Specification" + ] + }, + { + "type": "object", + "properties": { + "ExternalSchema": { + "$ref": "#/$defs/ExternalSchema" + } + }, + "required": [ + "ExternalSchema" + ] + } + ] + }, + "ExternalSchema": { + "type": "object", + "properties": { + "ManifestID": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "ManifestContents": { + "$ref": "#/$defs/ManifestContents" + } + }, + "required": [] + }, + "ManifestContents": { + "oneOf": [ + { + "type": "object", + "properties": { + "BinaryData": { + "$ref": "#/$defs/EmbeddedBinaryData" + } + }, + "required": [ + "BinaryData" + ] + }, + { + "type": "object", + "properties": { + "XMLSchema": { + "$ref": "#/$defs/SchemaContent" + } + }, + "required": [ + "XMLSchema" + ] + } + ] + }, + "SchemaContent": { + "type": "object", + "properties": { + "schema": {} + }, + "required": [ + "schema" + ] + }, + "Delivery": { + "oneOf": [ + { + "type": "object", + "properties": { + "BinaryData": { + "$ref": "#/$defs/EmbeddedBinaryData" + } + }, + "required": [ + "BinaryData" + ] + }, + { + "type": "object", + "properties": { + "XMLData": { + "$ref": "#/$defs/EmbeddedXMLData" + } + }, + "required": [ + "XMLData" + ] + } + ] + }, + "EmbeddedBinaryData": { + "type": "object", + "properties": { + "Data": { + "type": "string", + "pattern": "^[-A-Za-z0-9+/]*={0,3}$" + }, + "ContentType": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + }, + "Checksum": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + }, + "ChecksumType": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + } + }, + "required": [ + "Data" + ] + }, + "EmbeddedXMLData": {} + } +} \ No newline at end of file diff --git a/103120/schema/json/ts_103120_Document.schema.json b/103120/schema/json/ts_103120_Document.schema.json new file mode 100644 index 0000000..fc85e13 --- /dev/null +++ b/103120/schema/json/ts_103120_Document.schema.json @@ -0,0 +1,148 @@ +{ + "$id": "ts_103120_Document_2020_09", + "$defs": { + "DocumentObject": { + "type": "object", + "properties": { + "@xsi:type": { + "type": "string", + "enum": "{http://uri.etsi.org/03120/common/2020/09/Document}DocumentObject" + }, + "ObjectIdentifier": { + "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" + }, + "CountryCode": { + "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" + }, + "OwnerIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + }, + "Generation": { + "type": "integer", + "minimum": 0 + }, + "ExternalIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "AssociatedObjects": { + "$ref": "ts_103120_Core_2019_10#/$defs/AssociatedObjects" + }, + "LastChanged": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "NationalHandlingParameters": { + "$ref": "ts_103120_Core_2019_10#/$defs/NationalHandlingParameters" + }, + "DocumentReference": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "DocumentName": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "DocumentStatus": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "DocumentDesiredStatus": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "DocumentTimespan": { + "$ref": "#/$defs/DocumentTimespan" + }, + "DocumentType": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "DocumentProperties": { + "$ref": "#/$defs/DocumentProperties" + }, + "DocumentBody": { + "$ref": "#/$defs/DocumentBody" + }, + "DocumentSignature": { + "type": "array", + "items": { + "$ref": "ts_103120_Common_2016_02#/$defs/ApprovalDetails" + } + }, + "DocumentInvalidReason": { + "$ref": "ts_103120_Core_2019_10#/$defs/ActionUnsuccesfulInformation" + }, + "NationalDocumentParameters": { + "$ref": "#/$defs/NationalDocumentParameters" + } + }, + "required": [ + "@xsi:type", + "ObjectIdentifier" + ] + }, + "DocumentTimespan": { + "type": "object", + "properties": { + "StartTime": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "EndTime": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + } + }, + "required": [] + }, + "DocumentProperties": { + "type": "object", + "properties": { + "DocumentProperty": { + "type": "array", + "items": { + "$ref": "#/$defs/DocumentProperty" + } + } + }, + "required": [] + }, + "DocumentProperty": { + "type": "object", + "properties": { + "PropertyType": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "PropertyValue": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + } + }, + "required": [ + "PropertyType", + "PropertyValue" + ] + }, + "DocumentBody": { + "type": "object", + "properties": { + "Contents": { + "type": "string", + "pattern": "^[-A-Za-z0-9+/]*={0,3}$" + }, + "ContentType": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + }, + "Checksum": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + }, + "ChecksumType": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + } + }, + "required": [] + }, + "NationalDocumentParameters": { + "type": "object", + "properties": { + "CountryCode": { + "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" + } + }, + "required": [ + "CountryCode" + ] + } + } +} \ No newline at end of file diff --git a/103120/schema/json/ts_103120_Notification.schema.json b/103120/schema/json/ts_103120_Notification.schema.json new file mode 100644 index 0000000..dffab1a --- /dev/null +++ b/103120/schema/json/ts_103120_Notification.schema.json @@ -0,0 +1,103 @@ +{ + "$id": "ts_103120_Notification_2016_02", + "$defs": { + "NotificationObject": { + "type": "object", + "properties": { + "@xsi:type": { + "type": "string", + "enum": "{http://uri.etsi.org/03120/common/2016/02/Notification}NotificationObject" + }, + "ObjectIdentifier": { + "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" + }, + "CountryCode": { + "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" + }, + "OwnerIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + }, + "Generation": { + "type": "integer", + "minimum": 0 + }, + "ExternalIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "AssociatedObjects": { + "$ref": "ts_103120_Core_2019_10#/$defs/AssociatedObjects" + }, + "LastChanged": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "NationalHandlingParameters": { + "$ref": "ts_103120_Core_2019_10#/$defs/NationalHandlingParameters" + }, + "NotificationDetails": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "NotificationType": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "NewNotification": { + "type": "boolean" + }, + "NotificationTimestamp": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "StatusOfAssociatedObjects": { + "$ref": "#/$defs/ListOfAssociatedObjectStatus" + }, + "NationalNotificationParameters": { + "$ref": "#/$defs/NationalNotificationParameters" + } + }, + "required": [ + "@xsi:type", + "ObjectIdentifier" + ] + }, + "ListOfAssociatedObjectStatus": { + "type": "object", + "properties": { + "AssociatedObjectStatus": { + "type": "array", + "items": { + "$ref": "#/$defs/AssociatedObjectStatus" + }, + "minItems": 1 + } + }, + "required": [] + }, + "AssociatedObjectStatus": { + "type": "object", + "properties": { + "AssociatedObject": { + "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" + }, + "Status": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "Details": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + } + }, + "required": [ + "AssociatedObject", + "Status" + ] + }, + "NationalNotificationParameters": { + "type": "object", + "properties": { + "CountryCode": { + "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" + } + }, + "required": [ + "CountryCode" + ] + } + } +} \ No newline at end of file diff --git a/103120/schema/json/ts_103120_Task.schema.json b/103120/schema/json/ts_103120_Task.schema.json new file mode 100644 index 0000000..d19e1ee --- /dev/null +++ b/103120/schema/json/ts_103120_Task.schema.json @@ -0,0 +1,599 @@ +{ + "$id": "ts_103120_Task_2020_09", + "$defs": { + "LITaskObject": { + "type": "object", + "properties": { + "@xsi:type": { + "type": "string", + "enum": "{http://uri.etsi.org/03120/common/2020/09/Task}LITaskObject" + }, + "ObjectIdentifier": { + "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" + }, + "CountryCode": { + "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" + }, + "OwnerIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + }, + "Generation": { + "type": "integer", + "minimum": 0 + }, + "ExternalIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "AssociatedObjects": { + "$ref": "ts_103120_Core_2019_10#/$defs/AssociatedObjects" + }, + "LastChanged": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "NationalHandlingParameters": { + "$ref": "ts_103120_Core_2019_10#/$defs/NationalHandlingParameters" + }, + "Reference": { + "$ref": "ts_103280_2017_07#/$defs/LIID" + }, + "Status": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "DesiredStatus": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "Timespan": { + "$ref": "#/$defs/TaskTimespan" + }, + "TargetIdentifier": { + "$ref": "#/$defs/TargetIdentifier" + }, + "DeliveryType": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "DeliveryDetails": { + "$ref": "#/$defs/TaskDeliveryDetails" + }, + "ApprovalDetails": { + "type": "array", + "items": { + "$ref": "ts_103120_Common_2016_02#/$defs/ApprovalDetails" + } + }, + "CSPID": { + "$ref": "ts_103120_Core_2019_10#/$defs/EndpointID" + }, + "HandlingProfile": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "InvalidReason": { + "$ref": "ts_103120_Core_2019_10#/$defs/ActionUnsuccesfulInformation" + }, + "Flags": { + "$ref": "#/$defs/TaskFlags" + }, + "NationalLITaskingParameters": { + "$ref": "#/$defs/NationalLITaskingParameters" + }, + "ListOfTrafficPolicyReferences": { + "$ref": "#/$defs/ListOfTrafficPolicyReferences" + } + }, + "required": [ + "@xsi:type", + "ObjectIdentifier" + ] + }, + "TaskTimespan": { + "type": "object", + "properties": { + "StartTime": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "EndTime": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "TerminationTime": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "ProvisioningTime": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "DeprovisioningTime": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + } + }, + "required": [] + }, + "TargetIdentifier": { + "type": "object", + "properties": { + "TargetIdentifierValues": { + "$ref": "#/$defs/TargetIdentifierValues" + }, + "ServiceType": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + } + }, + "required": [] + }, + "TargetIdentifierValues": { + "type": "object", + "properties": { + "TargetIdentifierValue": { + "type": "array", + "items": { + "$ref": "#/$defs/TargetIdentifierValue" + }, + "minItems": 1 + } + }, + "required": [] + }, + "TargetIdentifierValue": { + "type": "object", + "properties": { + "FormatType": { + "$ref": "#/$defs/FormatType" + }, + "Value": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + } + }, + "required": [ + "FormatType", + "Value" + ] + }, + "FormatType": { + "type": "object", + "properties": { + "FormatOwner": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + }, + "FormatName": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + } + }, + "required": [ + "FormatOwner", + "FormatName" + ] + }, + "TaskDeliveryDetails": { + "type": "object", + "properties": { + "DeliveryDestination": { + "type": "array", + "items": { + "$ref": "#/$defs/DeliveryDestination" + }, + "minItems": 1 + } + }, + "required": [] + }, + "DeliveryDestination": { + "type": "object", + "properties": { + "DeliveryAddress": { + "$ref": "#/$defs/DeliveryAddress" + }, + "EncryptionDetails": { + "$ref": "#/$defs/NationalEncryptionDetails" + }, + "IRIorCC": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "HandoverFormat": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "DeliveryProfile": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "NationalDeliveryParameters": { + "$ref": "#/$defs/NationalDeliveryParameters" + } + }, + "required": [] + }, + "DeliveryAddress": { + "oneOf": [ + { + "type": "object", + "properties": { + "IPv4Address": { + "$ref": "ts_103280_2017_07#/$defs/IPv4Address" + } + }, + "required": [ + "IPv4Address" + ] + }, + { + "type": "object", + "properties": { + "IPv6Address": { + "$ref": "ts_103280_2017_07#/$defs/IPv6Address" + } + }, + "required": [ + "IPv6Address" + ] + }, + { + "type": "object", + "properties": { + "IPAddressPort": { + "$ref": "ts_103280_2017_07#/$defs/IPAddressPort" + } + }, + "required": [ + "IPAddressPort" + ] + }, + { + "type": "object", + "properties": { + "IPAddressPortRange": { + "$ref": "ts_103280_2017_07#/$defs/IPAddressPortRange" + } + }, + "required": [ + "IPAddressPortRange" + ] + }, + { + "type": "object", + "properties": { + "E164Number": { + "$ref": "ts_103280_2017_07#/$defs/InternationalE164" + } + }, + "required": [ + "E164Number" + ] + }, + { + "type": "object", + "properties": { + "FTPAddress": { + "type": "string" + } + }, + "required": [ + "FTPAddress" + ] + }, + { + "type": "object", + "properties": { + "URL": { + "type": "string" + } + }, + "required": [ + "URL" + ] + }, + { + "type": "object", + "properties": { + "FQDN": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + } + }, + "required": [ + "FQDN" + ] + }, + { + "type": "object", + "properties": { + "EmailAddress": { + "$ref": "ts_103280_2017_07#/$defs/EmailAddress" + } + }, + "required": [ + "EmailAddress" + ] + }, + { + "type": "object", + "properties": { + "EndpointID": { + "$ref": "ts_103120_Core_2019_10#/$defs/EndpointID" + } + }, + "required": [ + "EndpointID" + ] + }, + { + "type": "object", + "properties": { + "DeliveryInformationID": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + } + }, + "required": [ + "DeliveryInformationID" + ] + } + ] + }, + "TaskFlags": { + "type": "object", + "properties": { + "TaskFlag": { + "type": "array", + "items": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + } + } + }, + "required": [] + }, + "NationalLITaskingParameters": { + "type": "object", + "properties": { + "CountryCode": { + "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" + } + }, + "required": [ + "CountryCode" + ] + }, + "NationalDeliveryParameters": { + "type": "object", + "properties": { + "CountryCode": { + "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" + } + }, + "required": [ + "CountryCode" + ] + }, + "NationalEncryptionDetails": { + "type": "object", + "properties": { + "CountryCode": { + "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" + } + }, + "required": [ + "CountryCode" + ] + }, + "LDTaskObject": { + "type": "object", + "properties": { + "@xsi:type": { + "type": "string", + "enum": "{http://uri.etsi.org/03120/common/2020/09/Task}LDTaskObject" + }, + "ObjectIdentifier": { + "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" + }, + "CountryCode": { + "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" + }, + "OwnerIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + }, + "Generation": { + "type": "integer", + "minimum": 0 + }, + "ExternalIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "AssociatedObjects": { + "$ref": "ts_103120_Core_2019_10#/$defs/AssociatedObjects" + }, + "LastChanged": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "NationalHandlingParameters": { + "$ref": "ts_103120_Core_2019_10#/$defs/NationalHandlingParameters" + }, + "Reference": { + "$ref": "ts_103280_2017_07#/$defs/LDID" + }, + "Status": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "StatusReason": { + "$ref": "ts_103120_Core_2019_10#/$defs/ActionUnsuccesfulInformation" + }, + "DesiredStatus": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "RequestDetails": { + "$ref": "#/$defs/RequestDetails" + }, + "DeliveryDetails": { + "$ref": "#/$defs/LDDeliveryDetails" + }, + "ApprovalDetails": { + "type": "array", + "items": { + "$ref": "ts_103120_Common_2016_02#/$defs/ApprovalDetails" + } + }, + "CSPID": { + "$ref": "ts_103120_Core_2019_10#/$defs/EndpointID" + }, + "HandlingProfile": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "Flags": { + "$ref": "#/$defs/LDTaskFlags" + }, + "NationalLDTaskingParameters": { + "$ref": "#/$defs/NationalLDTaskingParameters" + } + }, + "required": [ + "@xsi:type", + "ObjectIdentifier" + ] + }, + "RequestDetails": { + "type": "object", + "properties": { + "Type": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "StartTime": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "EndTime": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "ObservedTime": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "ObservedTimes": { + "type": "array", + "items": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + } + }, + "RequestValues": { + "$ref": "#/$defs/RequestValues" + }, + "Subtype": { + "$ref": "#/$defs/RequestSubtype" + } + }, + "required": [] + }, + "RequestValues": { + "type": "object", + "properties": { + "RequestValue": { + "type": "array", + "items": { + "$ref": "#/$defs/RequestValue" + }, + "minItems": 1 + } + }, + "required": [] + }, + "RequestValue": { + "type": "object", + "properties": { + "FormatType": { + "$ref": "#/$defs/FormatType" + }, + "Value": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + } + }, + "required": [ + "FormatType", + "Value" + ] + }, + "RequestSubtype": { + "type": "object", + "properties": { + "RequestSubtype": { + "type": "array", + "items": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "minItems": 1 + } + }, + "required": [] + }, + "LDDeliveryDetails": { + "type": "object", + "properties": { + "LDDeliveryDestination": { + "type": "array", + "items": { + "$ref": "#/$defs/LDDeliveryDestination" + }, + "minItems": 1 + } + }, + "required": [] + }, + "LDDeliveryDestination": { + "type": "object", + "properties": { + "DeliveryAddress": { + "$ref": "#/$defs/DeliveryAddress" + }, + "EncryptionDetails": { + "$ref": "#/$defs/NationalEncryptionDetails" + }, + "LDHandoverFormat": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "LDDeliveryProfile": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "NationalDeliveryParameters": { + "$ref": "#/$defs/NationalDeliveryParameters" + } + }, + "required": [] + }, + "LDTaskFlags": { + "type": "object", + "properties": { + "LDTaskFlag": { + "type": "array", + "items": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + } + } + }, + "required": [] + }, + "NationalLDTaskingParameters": { + "type": "object", + "properties": { + "CountryCode": { + "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" + } + }, + "required": [ + "CountryCode" + ] + }, + "ListOfTrafficPolicyReferences": { + "type": "object", + "properties": { + "TrafficPolicyReference": { + "type": "array", + "items": { + "$ref": "#/$defs/TrafficPolicyReference" + }, + "minItems": 1 + } + }, + "required": [] + }, + "TrafficPolicyReference": { + "type": "object", + "properties": { + "Order": { + "type": "integer", + "minimum": 1 + }, + "ObjectIdentifier": { + "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" + } + }, + "required": [] + } + } +} \ No newline at end of file diff --git a/103120/schema/json/ts_103120_TrafficPolicy.schema.json b/103120/schema/json/ts_103120_TrafficPolicy.schema.json new file mode 100644 index 0000000..53fe978 --- /dev/null +++ b/103120/schema/json/ts_103120_TrafficPolicy.schema.json @@ -0,0 +1,198 @@ +{ + "$id": "ts_103120_TrafficPolicy_2022_07", + "$defs": { + "TrafficPolicyObject": { + "type": "object", + "properties": { + "@xsi:type": { + "type": "string", + "enum": "{http://uri.etsi.org/03120/common/2022/07/TrafficPolicy}TrafficPolicyObject" + }, + "ObjectIdentifier": { + "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" + }, + "CountryCode": { + "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" + }, + "OwnerIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + }, + "Generation": { + "type": "integer", + "minimum": 0 + }, + "ExternalIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "AssociatedObjects": { + "$ref": "ts_103120_Core_2019_10#/$defs/AssociatedObjects" + }, + "LastChanged": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "NationalHandlingParameters": { + "$ref": "ts_103120_Core_2019_10#/$defs/NationalHandlingParameters" + }, + "TrafficPolicyName": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + }, + "TrafficRules": { + "$ref": "#/$defs/ListOfTrafficRuleReferences" + } + }, + "required": [ + "@xsi:type", + "ObjectIdentifier" + ] + }, + "ListOfTrafficRuleReferences": { + "type": "object", + "properties": { + "TrafficRuleReference": { + "type": "array", + "items": { + "$ref": "#/$defs/TrafficRuleReference" + }, + "minItems": 1 + } + }, + "required": [] + }, + "TrafficRuleReference": { + "type": "object", + "properties": { + "Order": { + "type": "integer", + "minimum": 1 + }, + "ObjectIdentifier": { + "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" + } + }, + "required": [ + "Order", + "ObjectIdentifier" + ] + }, + "TrafficRuleObject": { + "type": "object", + "properties": { + "@xsi:type": { + "type": "string", + "enum": "{http://uri.etsi.org/03120/common/2022/07/TrafficPolicy}TrafficRuleObject" + }, + "ObjectIdentifier": { + "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" + }, + "CountryCode": { + "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" + }, + "OwnerIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + }, + "Generation": { + "type": "integer", + "minimum": 0 + }, + "ExternalIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "AssociatedObjects": { + "$ref": "ts_103120_Core_2019_10#/$defs/AssociatedObjects" + }, + "LastChanged": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "NationalHandlingParameters": { + "$ref": "ts_103120_Core_2019_10#/$defs/NationalHandlingParameters" + }, + "Criteria": { + "$ref": "#/$defs/ListOfTrafficCriteria" + }, + "Action": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + } + }, + "required": [ + "@xsi:type", + "ObjectIdentifier" + ] + }, + "ListOfTrafficCriteria": { + "type": "object", + "properties": { + "Criteria": { + "type": "array", + "items": { + "$ref": "#/$defs/TrafficCriteria" + }, + "minItems": 1 + } + }, + "required": [] + }, + "TrafficCriteria": { + "oneOf": [ + { + "type": "object", + "properties": { + "IPPolicyCriteria": { + "$ref": "#/$defs/IPPolicyCriteria" + } + }, + "required": [ + "IPPolicyCriteria" + ] + }, + { + "type": "object", + "properties": { + "MobileAccessPolicyCriteria": { + "$ref": "#/$defs/MobileAccessPolicyCriteria" + } + }, + "required": [ + "MobileAccessPolicyCriteria" + ] + } + ] + }, + "IPPolicyCriteria": { + "type": "object", + "properties": { + "IPProtocol": { + "type": "integer", + "minimum": 0 + }, + "SourceIPRange": { + "$ref": "ts_103280_2017_07#/$defs/IPCIDR" + }, + "SourcePortRange": { + "$ref": "ts_103280_2017_07#/$defs/PortRange" + }, + "DestinationIPRange": { + "$ref": "ts_103280_2017_07#/$defs/IPCIDR" + }, + "DestinationPortRange": { + "$ref": "ts_103280_2017_07#/$defs/PortRange" + }, + "BothDirections": { + "type": "boolean" + } + }, + "required": [] + }, + "MobileAccessPolicyCriteria": { + "type": "object", + "properties": { + "APN": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + }, + "DNN": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + } + }, + "required": [] + } + } +} \ No newline at end of file diff --git a/103120/utils/validate.py b/103120/utils/validate.py deleted file mode 100644 index a290ed3..0000000 --- a/103120/utils/validate.py +++ /dev/null @@ -1,94 +0,0 @@ -import sys -from jsonschema import validate, RefResolver, Draft202012Validator -import json -from pathlib import Path -import logging -import argparse - - - -# filename = sys.argv[1] - -# def load_json (path): -# with open(path) as f: -# s = json.load(f) -# return s - -# schema_store = {} - -# json_instance = load_json(filename) -# print (json_instance) - -# etsi_schema = load_json('response.schema.json') -# ext_schema = load_json('extended.schema.json') -# ext_ent_schema = load_json("extended_entities.schema.json") -# schema_store = { -# etsi_schema['$id'] : etsi_schema, -# ext_schema['$id'] : ext_schema, -# ext_ent_schema['$id'] : ext_ent_schema -# } - -# resolver = RefResolver(None, referrer=None, store=schema_store) - -# print (etsi_schema) - -# v = Draft202012Validator(ext_schema, resolver=resolver) -# v.validate(json_instance) - -# validate(json_instance, ext_schema) -# print ("OK") - -def handle_uri(u): - print(u) - -def load_json(path : str): - with open(path) as f: - return json.load(f) - -if __name__ == "__main__": - parser = argparse.ArgumentParser() - - parser.add_argument('-s','--schemadir', action="append", help="Directory containing supporting schema files to use for validation") - parser.add_argument('-v', '--verbose', action="count", help="Verbose logging (can be specified multiple times)") - parser.add_argument('schema', help="Primary schema to validate against") - parser.add_argument('filename', help="JSON instance document to validate") - - args = parser.parse_args() - - match args.verbose: - case v if v and v >= 2: - logging.basicConfig(level=logging.DEBUG) - case 1: - logging.basicConfig(level=logging.INFO) - case _: - logging.basicConfig(level=logging.WARNING) - - logging.debug(f"Arguments: {args}") - - instance_doc = load_json(args.filename) - main_schema = load_json(args.schema) - schema_dict = { main_schema['$id'] : main_schema } - - if args.schemadir: - schema_paths = [] - for d in args.schemadir: - schema_paths += [f for f in Path(d).rglob("*.schema.json")] - logging.info(f"Schema files loaded: {schema_paths}") - - schemas_json = [json.load(p.open()) for p in schema_paths] - schema_dict = schema_dict | { s['$id'] : s for s in schemas_json } - - logging.info(f"Schema IDs loaded: {[k for k in schema_dict.keys()]}") - - logging.debug (f"Instance doc: {instance_doc}") - logging.debug (f"Main schema: {main_schema}") - - resolver = RefResolver(None, - referrer=None, - store=schema_dict) - - v = Draft202012Validator(main_schema, resolver=resolver) - - v.validate(instance_doc) - - logging.info("Done") \ No newline at end of file diff --git a/103120/utils/xml_to_json.py b/103120/utils/xml_to_json.py deleted file mode 100644 index 0615a03..0000000 --- a/103120/utils/xml_to_json.py +++ /dev/null @@ -1,12 +0,0 @@ -import xmltodict -from pprint import pprint -import json - -with open('../examples/request1.xml') as f: - s = f.read() - -d = xmltodict.parse(s) -pprint (d) - -with open('../examples/request.json', 'w') as f2: - f2.write(json.dumps(d)) \ No newline at end of file diff --git a/103280/TS_103_280.schema.json b/103280/TS_103_280.schema.json index 523a1a5..474b3ee 100644 --- a/103280/TS_103_280.schema.json +++ b/103280/TS_103_280.schema.json @@ -1,387 +1,389 @@ -{ - "$id" : "http://etsi.org/temp/280", - "$schema" : "https://json-schema.org/draft/2020-12/schema", - "title" : "ETSI TS 103 280 (temp)", - "description" : "A stubbed version of TS 103 280 definitions (need a CR to 280 for this)", - "$defs": { - "ShortString": { - "type": "string", - "maxLength": 255 - }, - "LongString": { - "type": "string", - "maxLength": 65535 - }, - "LIID": { - "type": "string", - "pattern": "^([!-~]{1,25})|([0-9a-f]{26,50})$" - }, - "UTCDateTime": { - "type": "string", - "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z$" - }, - "UTCMicrosecondDateTime": { - "type": "string", - "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}\\.[0-9]{6}Z$" - }, - "QualifiedDateTime": { - "type": "string", - "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}(Z|[+-][0-9]{2}:[0-9]{2})$" - }, - "QualifiedMicrosecondDateTime": { - "type": "string", - "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}\\.[0-9]{6}(Z|[+-][0-9]{2}:[0-9]{2})$" - }, - "InternationalE164": { - "type": "string", - "pattern": "^[0-9]{1,15}$" - }, - "IMSI": { - "type": "string", - "pattern": "^[0-9]{6,15}$" - }, - "IMEI": { - "type": "string", - "pattern": "^[0-9]{14}$" - }, - "IMEICheckDigit": { - "type": "string", - "pattern": "^[0-9]{15}$" - }, - "IMEISV": { - "type": "string", - "pattern": "^[0-9]{16}$" - }, - "IPv4Address": { - "type": "string", - "pattern": "^((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])$" - }, - "IPv4CIDR": { - "type": "string", - "pattern": "^((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])/([1-2]?[0-9]|3[0-2])$" - }, - "IPv6Address": { - "type": "string", - "pattern": "^([0-9a-f]{4}:){7}([0-9a-f]{4})$" - }, - "IPv6CIDR": { - "type": "string", - "pattern": "^([0-9a-f]{4}:){7}([0-9a-f]{4})/(([1-9][0-9]?)|(1[0-1][0-9])|(12[0-8]))$" - }, - "TCPPort": { - "type": "integer", - "exclusiveMinimum": 1, - "maximum": 65535 - }, - "UDPPort": { - "type": "integer", - "minimum": 0, - "maximum": 65535 - }, - "MACAddress": { - "type": "string", - "pattern": "^([a-f0-9]{2}:){5}[a-f0-9]{2}$" - }, - "EmailAddress": { - "allOf": [ - { - "$ref": "#/$defs/ShortString" - }, - { - "type": "string", - "pattern": "^[a-zA-Z0-9\\.!#$%&'\\*\\+\\\\/=\\?\\^_`\\{\\|\\}~\\-]+@[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(\\.[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$" - } - ] - }, - "UUID": { - "type": "string", - "pattern": "^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$" - }, - "ISOCountryCode": { - "type": "string", - "pattern": "^[A-Z]{2}$" - }, - "SIPURI": { - "type": "string", - "pattern": "^sips?:[a-zA-Z0-9!#$&-;=?-\\[\\]_~%]+$" - }, - "TELURI": { - "type": "string", - "pattern": "^tel:[a-zA-Z0-9!#$&-;=?-\\[\\]_~%]+$" - }, - "WGS84LatitudeDecimal": { - "type": "string", - "pattern": "^[NS][0-9]{2}\\.[0-9]{6}$" - }, - "WGS84LongitudeDecimal": { - "type": "string", - "pattern": "^[EW][0-9]{3}\\.[0-9]{6}$" - }, - "WGS84LatitudeAngular": { - "type": "string", - "pattern": "^[NS][0-9]{6}\\.[0-9]{2}$" - }, - "WGS84LongitudeAngular": { - "type": "string", - "pattern": "^[EW][0-9]{7}\\.[0-9]{2}$" - }, - "SUPIIMSI": { - "$ref": "#/$defs/IMSI" - }, - "SUPINAI": { - "$ref": "#/$defs/NAI" - }, - "SUCI": { - "type": "string", - "pattern": "^([a-fA-F0-9]{2})*$" - }, - "PEIIMEI": { - "$ref": "#/$defs/IMEI" - }, - "PEIIMEICheckDigit": { - "$ref": "#/$defs/IMEICheckDigit" - }, - "PEIIMEISV": { - "$ref": "#/$defs/IMEISV" - }, - "GPSIMSISDN": { - "type": "string", - "pattern": "^[0-9]{1,15}$" - }, - "GPSINAI": { - "$ref": "#/$defs/NAI" - }, - "NAI": { - "type": "string" - }, - "LDID": { - "type": "string", - "pattern": "^([A-Z]{2}-.+-.+)$" - }, - "InternationalizedEmailAddress": { - "allOf": [ - { - "$ref": "#/$defs/ShortString" - }, - { - "type": "string", - "pattern": "^.+@.+$" - } - ] - }, - "EUI64": { - "type": "string", - "pattern": "^([a-f0-9]{2}:){7}[a-f0-9]{2}$" - }, - "CGI": { - "type": "string", - "pattern": "^[0-9]{3}-[0-9]{2,3}-[a-f0-9]{4}-[a-f0-9]{4}$" - }, - "ECGI": { - "type": "string", - "pattern": "^[0-9]{3}-[0-9]{2,3}-[a-f0-9]{7}$" - }, - "NCGI": { - "type": "string", - "pattern": "^[0-9]{3}-[0-9]{2,3}-[a-f0-9]{9}$" - }, - "ICCID": { - "type": "string", - "pattern": "^[0-9]{19,20}$" - }, - "IPAddress": { - "oneOf": [ - { - "type": "object", - "properties": { - "IPv4Address": { - "$ref": "#/$defs/IPv4Address" - } - }, - "required": [ - "IPv4Address" - ] - }, - { - "type": "object", - "properties": { - "IPv6Address": { - "$ref": "#/$defs/IPv6Address" - } - }, - "required": [ - "IPv6Address" - ] - } - ] - }, - "IPCIDR": { - "oneOf": [ - { - "type": "object", - "properties": { - "IPv4CIDR": { - "$ref": "#/$defs/IPv4CIDR" - } - }, - "required": [ - "IPv4CIDR" - ] - }, - { - "type": "object", - "properties": { - "IPv6CIDR": { - "$ref": "#/$defs/IPv6CIDR" - } - }, - "required": [ - "IPv6CIDR" - ] - } - ] - }, - "TCPPortRange": { +{ + "$id": "ts_103280_2017_07", + "$defs": { + "ShortString": { + "type": "string", + "maxLength": 255 + }, + "LongString": { + "type": "string", + "maxLength": 65535 + }, + "LIID": { + "type": "string", + "pattern": "^([!-~]{1,25})|([0-9a-f]{26,50})$" + }, + "UTCDateTime": { + "type": "string", + "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z$" + }, + "UTCMicrosecondDateTime": { + "type": "string", + "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}\\.[0-9]{6}Z$" + }, + "QualifiedDateTime": { + "type": "string", + "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}(Z|[+-][0-9]{2}:[0-9]{2})$" + }, + "QualifiedMicrosecondDateTime": { + "type": "string", + "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}\\.[0-9]{6}(Z|[+-][0-9]{2}:[0-9]{2})$" + }, + "InternationalE164": { + "type": "string", + "pattern": "^[0-9]{1,15}$" + }, + "IMSI": { + "type": "string", + "pattern": "^[0-9]{6,15}$" + }, + "IMEI": { + "type": "string", + "pattern": "^[0-9]{14}$" + }, + "IMEICheckDigit": { + "type": "string", + "pattern": "^[0-9]{15}$" + }, + "IMEISV": { + "type": "string", + "pattern": "^[0-9]{16}$" + }, + "IPv4Address": { + "type": "string", + "pattern": "^((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])$" + }, + "IPv4CIDR": { + "type": "string", + "pattern": "^((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])/([1-2]?[0-9]|3[0-2])$" + }, + "IPv6Address": { + "type": "string", + "pattern": "^([0-9a-f]{4}:){7}([0-9a-f]{4})$" + }, + "IPv6CIDR": { + "type": "string", + "pattern": "^([0-9a-f]{4}:){7}([0-9a-f]{4})/(([1-9][0-9]?)|(1[0-1][0-9])|(12[0-8]))$" + }, + "TCPPort": { + "type": "integer", + "exclusiveMinimum": 1, + "maximum": 65535 + }, + "UDPPort": { + "type": "integer", + "minimum": 0, + "maximum": 65535 + }, + "MACAddress": { + "type": "string", + "pattern": "^([a-f0-9]{2}:){5}[a-f0-9]{2}$" + }, + "EmailAddress": { + "allOf": [ + { + "$ref": "#/$defs/ShortString" + }, + { + "type": "string", + "pattern": "^[a-zA-Z0-9\\.!#$%&'\\*\\+\\\\/=\\?\\^_`\\{\\|\\}~\\-]+@[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(\\.[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$" + } + ] + }, + "UUID": { + "type": "string", + "pattern": "^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$" + }, + "ISOCountryCode": { + "type": "string", + "pattern": "^[A-Z]{2}$" + }, + "SIPURI": { + "type": "string", + "pattern": "^sips?:[a-zA-Z0-9!#$&-;=?-\\[\\]_~%]+$" + }, + "TELURI": { + "type": "string", + "pattern": "^tel:[a-zA-Z0-9!#$&-;=?-\\[\\]_~%]+$" + }, + "WGS84LatitudeDecimal": { + "type": "string", + "pattern": "^[NS][0-9]{2}\\.[0-9]{6}$" + }, + "WGS84LongitudeDecimal": { + "type": "string", + "pattern": "^[EW][0-9]{3}\\.[0-9]{6}$" + }, + "WGS84LatitudeAngular": { + "type": "string", + "pattern": "^[NS][0-9]{6}\\.[0-9]{2}$" + }, + "WGS84LongitudeAngular": { + "type": "string", + "pattern": "^[EW][0-9]{7}\\.[0-9]{2}$" + }, + "SUPIIMSI": { + "$ref": "#/$defs/IMSI" + }, + "SUPINAI": { + "$ref": "#/$defs/NAI" + }, + "SUCI": { + "type": "string", + "pattern": "^([a-fA-F0-9]{2})*$" + }, + "PEIIMEI": { + "$ref": "#/$defs/IMEI" + }, + "PEIIMEICheckDigit": { + "$ref": "#/$defs/IMEICheckDigit" + }, + "PEIIMEISV": { + "$ref": "#/$defs/IMEISV" + }, + "GPSIMSISDN": { + "type": "string", + "pattern": "^[0-9]{1,15}$" + }, + "GPSINAI": { + "$ref": "#/$defs/NAI" + }, + "NAI": { + "type": "string" + }, + "LDID": { + "type": "string", + "pattern": "^([A-Z]{2}-.+-.+)$" + }, + "InternationalizedEmailAddress": { + "allOf": [ + { + "$ref": "#/$defs/ShortString" + }, + { + "type": "string", + "pattern": "^.+@.+$" + } + ] + }, + "EUI64": { + "type": "string", + "pattern": "^([a-f0-9]{2}:){7}[a-f0-9]{2}$" + }, + "CGI": { + "type": "string", + "pattern": "^[0-9]{3}-[0-9]{2,3}-[a-f0-9]{4}-[a-f0-9]{4}$" + }, + "ECGI": { + "type": "string", + "pattern": "^[0-9]{3}-[0-9]{2,3}-[a-f0-9]{7}$" + }, + "NCGI": { + "type": "string", + "pattern": "^[0-9]{3}-[0-9]{2,3}-[a-f0-9]{9}$" + }, + "ICCID": { + "type": "string", + "pattern": "^[0-9]{19,20}$" + }, + "IPProtocol": { + "type": "integer", + "minimum": 0, + "maximum": 255 + }, + "IPAddress": { + "oneOf": [ + { "type": "object", "properties": { - "start": { - "$ref": "#/$defs/TCPPort" - }, - "end": { - "$ref": "#/$defs/TCPPort" + "IPv4Address": { + "$ref": "#/$defs/IPv4Address" } }, "required": [ - "start", - "end" + "IPv4Address" ] }, - "UDPPortRange": { + { "type": "object", "properties": { - "start": { - "$ref": "#/$defs/UDPPort" - }, - "end": { - "$ref": "#/$defs/UDPPort" + "IPv6Address": { + "$ref": "#/$defs/IPv6Address" } }, "required": [ - "start", - "end" + "IPv6Address" ] - }, - "Port": { - "oneOf": [ - { - "type": "object", - "properties": { - "TCPPort": { - "$ref": "#/$defs/TCPPort" - } - }, - "required": [ - "TCPPort" - ] - }, - { - "type": "object", - "properties": { - "UDPPort": { - "$ref": "#/$defs/UDPPort" - } - }, - "required": [ - "UDPPort" - ] + } + ] + }, + "IPCIDR": { + "oneOf": [ + { + "type": "object", + "properties": { + "IPv4CIDR": { + "$ref": "#/$defs/IPv4CIDR" } + }, + "required": [ + "IPv4CIDR" ] }, - "PortRange": { - "oneOf": [ - { - "type": "object", - "properties": { - "TCPPortRange": { - "$ref": "#/$defs/TCPPortRange" - } - }, - "required": [ - "TCPPortRange" - ] - }, - { - "type": "object", - "properties": { - "UDPPortRange": { - "$ref": "#/$defs/UDPPortRange" - } - }, - "required": [ - "UDPPortRange" - ] + { + "type": "object", + "properties": { + "IPv6CIDR": { + "$ref": "#/$defs/IPv6CIDR" } + }, + "required": [ + "IPv6CIDR" ] - }, - "IPAddressPort": { + } + ] + }, + "TCPPortRange": { + "type": "object", + "properties": { + "start": { + "$ref": "#/$defs/TCPPort" + }, + "end": { + "$ref": "#/$defs/TCPPort" + } + }, + "required": [ + "start", + "end" + ] + }, + "UDPPortRange": { + "type": "object", + "properties": { + "start": { + "$ref": "#/$defs/UDPPort" + }, + "end": { + "$ref": "#/$defs/UDPPort" + } + }, + "required": [ + "start", + "end" + ] + }, + "Port": { + "oneOf": [ + { "type": "object", "properties": { - "address": { - "$ref": "#/$defs/IPAddress" - }, - "port": { - "$ref": "#/$defs/Port" + "TCPPort": { + "$ref": "#/$defs/TCPPort" } }, "required": [ - "address", - "port" + "TCPPort" ] }, - "IPAddressPortRange": { + { "type": "object", "properties": { - "address": { - "$ref": "#/$defs/IPAddress" - }, - "portRange": { - "$ref": "#/$defs/PortRange" + "UDPPort": { + "$ref": "#/$defs/UDPPort" } }, "required": [ - "address", - "portRange" + "UDPPort" ] - }, - "WGS84CoordinateDecimal": { + } + ] + }, + "PortRange": { + "oneOf": [ + { "type": "object", "properties": { - "latitude": { - "$ref": "#/$defs/WGS84LatitudeDecimal" - }, - "longitude": { - "$ref": "#/$defs/WGS84LongitudeDecimal" + "TCPPortRange": { + "$ref": "#/$defs/TCPPortRange" } }, "required": [ - "latitude", - "longitude" + "TCPPortRange" ] }, - "WGS84CoordinateAngular": { + { "type": "object", "properties": { - "latitude": { - "$ref": "#/$defs/WGS84LatitudeAngular" - }, - "longitude": { - "$ref": "#/$defs/WGS84LongitudeAngular" + "UDPPortRange": { + "$ref": "#/$defs/UDPPortRange" } }, "required": [ - "latitude", - "longitude" + "UDPPortRange" ] } - } -} \ No newline at end of file + ] + }, + "IPAddressPort": { + "type": "object", + "properties": { + "address": { + "$ref": "#/$defs/IPAddress" + }, + "port": { + "$ref": "#/$defs/Port" + } + }, + "required": [ + "address", + "port" + ] + }, + "IPAddressPortRange": { + "type": "object", + "properties": { + "address": { + "$ref": "#/$defs/IPAddress" + }, + "portRange": { + "$ref": "#/$defs/PortRange" + } + }, + "required": [ + "address", + "portRange" + ] + }, + "WGS84CoordinateDecimal": { + "type": "object", + "properties": { + "latitude": { + "$ref": "#/$defs/WGS84LatitudeDecimal" + }, + "longitude": { + "$ref": "#/$defs/WGS84LongitudeDecimal" + } + }, + "required": [ + "latitude", + "longitude" + ] + }, + "WGS84CoordinateAngular": { + "type": "object", + "properties": { + "latitude": { + "$ref": "#/$defs/WGS84LatitudeAngular" + }, + "longitude": { + "$ref": "#/$defs/WGS84LongitudeAngular" + } + }, + "required": [ + "latitude", + "longitude" + ] + } + } +} \ No newline at end of file -- GitLab From c51267717890a78ea7ff1261b72cb696ba41e4ff Mon Sep 17 00:00:00 2001 From: mark Date: Fri, 19 May 2023 09:30:54 +0100 Subject: [PATCH 04/22] Preparing to keep namespaces --- utils/xml_to_json.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/utils/xml_to_json.py b/utils/xml_to_json.py index 2655bd7..9d51972 100644 --- a/utils/xml_to_json.py +++ b/utils/xml_to_json.py @@ -23,7 +23,6 @@ def removePrefixes (o, prefixes): new_key = k.split(':')[1] replacements.append( (k, new_key) ) for r in replacements: - print(r) o[r[1]] = o.pop(r[0]) if __name__ == "__main__": @@ -32,11 +31,10 @@ if __name__ == "__main__": p = Path(sys.argv[1]) s = p.read_text() - print(s) d = xmltodict.parse(s)['HI1Message'] prefixes = extract_prefixes(d) removePrefixes(d, prefixes) - print(d) + print(json.dumps(d)) -- GitLab From 980c66ee17bfc948a7fed25f5b2cdbe3048b8185 Mon Sep 17 00:00:00 2001 From: mark Date: Tue, 23 May 2023 17:50:11 +0100 Subject: [PATCH 05/22] Updates to converter --- utils/xml_to_json.py | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/utils/xml_to_json.py b/utils/xml_to_json.py index 9d51972..a85d48a 100644 --- a/utils/xml_to_json.py +++ b/utils/xml_to_json.py @@ -1,8 +1,12 @@ -import xmltodict import sys +import logging from pprint import pprint import json from pathlib import Path +import fileinput + +import xmltodict +import argparse def extract_prefixes (d): @@ -26,12 +30,32 @@ def removePrefixes (o, prefixes): o[r[1]] = o.pop(r[0]) if __name__ == "__main__": - if len(sys.argv) < 2: - print ("Usage: xml_to_json.py filename") + parser = argparse.ArgumentParser() + parser.add_argument('-v', '--verbose', action='count', help='Verbose logging (can be specified multiple times)') + parser.add_argument('-i', '--input', type=argparse.FileType('r'), default=sys.stdin, help="Path to input file (if absent, stdin is used)") + args = parser.parse_args() + + match args.verbose: + case v if v and v >= 2: + logging.basicConfig(level=logging.DEBUG) + case 1: + logging.basicConfig(level=logging.INFO) + case _: + logging.basicConfig(level=logging.WARNING) + + logging.debug(f"Arguments: {args}") - p = Path(sys.argv[1]) - s = p.read_text() + # if (args.input): + # logging.info(f"Reading from {args.input}") + # with open(args.input) as f: + # s = f.read() + # else: + # logging.info(f"Reading from stdin") + # s = sys.stdin.read() + s = args.input.read() + args.input.close() + logging.debug(s) d = xmltodict.parse(s)['HI1Message'] prefixes = extract_prefixes(d) -- GitLab From e38ceae4fecd5af4898da9f76610d6947601da82 Mon Sep 17 00:00:00 2001 From: mark Date: Tue, 23 May 2023 17:52:47 +0100 Subject: [PATCH 06/22] Moving 280 schema --- 103120/schema/json/TS_103_280.schema.json | 389 ---------------------- 1 file changed, 389 deletions(-) delete mode 100644 103120/schema/json/TS_103_280.schema.json diff --git a/103120/schema/json/TS_103_280.schema.json b/103120/schema/json/TS_103_280.schema.json deleted file mode 100644 index 474b3ee..0000000 --- a/103120/schema/json/TS_103_280.schema.json +++ /dev/null @@ -1,389 +0,0 @@ -{ - "$id": "ts_103280_2017_07", - "$defs": { - "ShortString": { - "type": "string", - "maxLength": 255 - }, - "LongString": { - "type": "string", - "maxLength": 65535 - }, - "LIID": { - "type": "string", - "pattern": "^([!-~]{1,25})|([0-9a-f]{26,50})$" - }, - "UTCDateTime": { - "type": "string", - "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z$" - }, - "UTCMicrosecondDateTime": { - "type": "string", - "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}\\.[0-9]{6}Z$" - }, - "QualifiedDateTime": { - "type": "string", - "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}(Z|[+-][0-9]{2}:[0-9]{2})$" - }, - "QualifiedMicrosecondDateTime": { - "type": "string", - "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}\\.[0-9]{6}(Z|[+-][0-9]{2}:[0-9]{2})$" - }, - "InternationalE164": { - "type": "string", - "pattern": "^[0-9]{1,15}$" - }, - "IMSI": { - "type": "string", - "pattern": "^[0-9]{6,15}$" - }, - "IMEI": { - "type": "string", - "pattern": "^[0-9]{14}$" - }, - "IMEICheckDigit": { - "type": "string", - "pattern": "^[0-9]{15}$" - }, - "IMEISV": { - "type": "string", - "pattern": "^[0-9]{16}$" - }, - "IPv4Address": { - "type": "string", - "pattern": "^((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])$" - }, - "IPv4CIDR": { - "type": "string", - "pattern": "^((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])/([1-2]?[0-9]|3[0-2])$" - }, - "IPv6Address": { - "type": "string", - "pattern": "^([0-9a-f]{4}:){7}([0-9a-f]{4})$" - }, - "IPv6CIDR": { - "type": "string", - "pattern": "^([0-9a-f]{4}:){7}([0-9a-f]{4})/(([1-9][0-9]?)|(1[0-1][0-9])|(12[0-8]))$" - }, - "TCPPort": { - "type": "integer", - "exclusiveMinimum": 1, - "maximum": 65535 - }, - "UDPPort": { - "type": "integer", - "minimum": 0, - "maximum": 65535 - }, - "MACAddress": { - "type": "string", - "pattern": "^([a-f0-9]{2}:){5}[a-f0-9]{2}$" - }, - "EmailAddress": { - "allOf": [ - { - "$ref": "#/$defs/ShortString" - }, - { - "type": "string", - "pattern": "^[a-zA-Z0-9\\.!#$%&'\\*\\+\\\\/=\\?\\^_`\\{\\|\\}~\\-]+@[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(\\.[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$" - } - ] - }, - "UUID": { - "type": "string", - "pattern": "^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$" - }, - "ISOCountryCode": { - "type": "string", - "pattern": "^[A-Z]{2}$" - }, - "SIPURI": { - "type": "string", - "pattern": "^sips?:[a-zA-Z0-9!#$&-;=?-\\[\\]_~%]+$" - }, - "TELURI": { - "type": "string", - "pattern": "^tel:[a-zA-Z0-9!#$&-;=?-\\[\\]_~%]+$" - }, - "WGS84LatitudeDecimal": { - "type": "string", - "pattern": "^[NS][0-9]{2}\\.[0-9]{6}$" - }, - "WGS84LongitudeDecimal": { - "type": "string", - "pattern": "^[EW][0-9]{3}\\.[0-9]{6}$" - }, - "WGS84LatitudeAngular": { - "type": "string", - "pattern": "^[NS][0-9]{6}\\.[0-9]{2}$" - }, - "WGS84LongitudeAngular": { - "type": "string", - "pattern": "^[EW][0-9]{7}\\.[0-9]{2}$" - }, - "SUPIIMSI": { - "$ref": "#/$defs/IMSI" - }, - "SUPINAI": { - "$ref": "#/$defs/NAI" - }, - "SUCI": { - "type": "string", - "pattern": "^([a-fA-F0-9]{2})*$" - }, - "PEIIMEI": { - "$ref": "#/$defs/IMEI" - }, - "PEIIMEICheckDigit": { - "$ref": "#/$defs/IMEICheckDigit" - }, - "PEIIMEISV": { - "$ref": "#/$defs/IMEISV" - }, - "GPSIMSISDN": { - "type": "string", - "pattern": "^[0-9]{1,15}$" - }, - "GPSINAI": { - "$ref": "#/$defs/NAI" - }, - "NAI": { - "type": "string" - }, - "LDID": { - "type": "string", - "pattern": "^([A-Z]{2}-.+-.+)$" - }, - "InternationalizedEmailAddress": { - "allOf": [ - { - "$ref": "#/$defs/ShortString" - }, - { - "type": "string", - "pattern": "^.+@.+$" - } - ] - }, - "EUI64": { - "type": "string", - "pattern": "^([a-f0-9]{2}:){7}[a-f0-9]{2}$" - }, - "CGI": { - "type": "string", - "pattern": "^[0-9]{3}-[0-9]{2,3}-[a-f0-9]{4}-[a-f0-9]{4}$" - }, - "ECGI": { - "type": "string", - "pattern": "^[0-9]{3}-[0-9]{2,3}-[a-f0-9]{7}$" - }, - "NCGI": { - "type": "string", - "pattern": "^[0-9]{3}-[0-9]{2,3}-[a-f0-9]{9}$" - }, - "ICCID": { - "type": "string", - "pattern": "^[0-9]{19,20}$" - }, - "IPProtocol": { - "type": "integer", - "minimum": 0, - "maximum": 255 - }, - "IPAddress": { - "oneOf": [ - { - "type": "object", - "properties": { - "IPv4Address": { - "$ref": "#/$defs/IPv4Address" - } - }, - "required": [ - "IPv4Address" - ] - }, - { - "type": "object", - "properties": { - "IPv6Address": { - "$ref": "#/$defs/IPv6Address" - } - }, - "required": [ - "IPv6Address" - ] - } - ] - }, - "IPCIDR": { - "oneOf": [ - { - "type": "object", - "properties": { - "IPv4CIDR": { - "$ref": "#/$defs/IPv4CIDR" - } - }, - "required": [ - "IPv4CIDR" - ] - }, - { - "type": "object", - "properties": { - "IPv6CIDR": { - "$ref": "#/$defs/IPv6CIDR" - } - }, - "required": [ - "IPv6CIDR" - ] - } - ] - }, - "TCPPortRange": { - "type": "object", - "properties": { - "start": { - "$ref": "#/$defs/TCPPort" - }, - "end": { - "$ref": "#/$defs/TCPPort" - } - }, - "required": [ - "start", - "end" - ] - }, - "UDPPortRange": { - "type": "object", - "properties": { - "start": { - "$ref": "#/$defs/UDPPort" - }, - "end": { - "$ref": "#/$defs/UDPPort" - } - }, - "required": [ - "start", - "end" - ] - }, - "Port": { - "oneOf": [ - { - "type": "object", - "properties": { - "TCPPort": { - "$ref": "#/$defs/TCPPort" - } - }, - "required": [ - "TCPPort" - ] - }, - { - "type": "object", - "properties": { - "UDPPort": { - "$ref": "#/$defs/UDPPort" - } - }, - "required": [ - "UDPPort" - ] - } - ] - }, - "PortRange": { - "oneOf": [ - { - "type": "object", - "properties": { - "TCPPortRange": { - "$ref": "#/$defs/TCPPortRange" - } - }, - "required": [ - "TCPPortRange" - ] - }, - { - "type": "object", - "properties": { - "UDPPortRange": { - "$ref": "#/$defs/UDPPortRange" - } - }, - "required": [ - "UDPPortRange" - ] - } - ] - }, - "IPAddressPort": { - "type": "object", - "properties": { - "address": { - "$ref": "#/$defs/IPAddress" - }, - "port": { - "$ref": "#/$defs/Port" - } - }, - "required": [ - "address", - "port" - ] - }, - "IPAddressPortRange": { - "type": "object", - "properties": { - "address": { - "$ref": "#/$defs/IPAddress" - }, - "portRange": { - "$ref": "#/$defs/PortRange" - } - }, - "required": [ - "address", - "portRange" - ] - }, - "WGS84CoordinateDecimal": { - "type": "object", - "properties": { - "latitude": { - "$ref": "#/$defs/WGS84LatitudeDecimal" - }, - "longitude": { - "$ref": "#/$defs/WGS84LongitudeDecimal" - } - }, - "required": [ - "latitude", - "longitude" - ] - }, - "WGS84CoordinateAngular": { - "type": "object", - "properties": { - "latitude": { - "$ref": "#/$defs/WGS84LatitudeAngular" - }, - "longitude": { - "$ref": "#/$defs/WGS84LongitudeAngular" - } - }, - "required": [ - "latitude", - "longitude" - ] - } - } -} \ No newline at end of file -- GitLab From bd97198a02c203293f191305a4cfc8f9842aefa8 Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 1 Jun 2023 11:46:23 +0100 Subject: [PATCH 07/22] validate can read from stdin --- utils/validate.py | 37 +++---------------------------------- utils/xml_to_json.py | 7 ------- 2 files changed, 3 insertions(+), 41 deletions(-) diff --git a/utils/validate.py b/utils/validate.py index a290ed3..c832631 100644 --- a/utils/validate.py +++ b/utils/validate.py @@ -6,38 +6,6 @@ import logging import argparse - -# filename = sys.argv[1] - -# def load_json (path): -# with open(path) as f: -# s = json.load(f) -# return s - -# schema_store = {} - -# json_instance = load_json(filename) -# print (json_instance) - -# etsi_schema = load_json('response.schema.json') -# ext_schema = load_json('extended.schema.json') -# ext_ent_schema = load_json("extended_entities.schema.json") -# schema_store = { -# etsi_schema['$id'] : etsi_schema, -# ext_schema['$id'] : ext_schema, -# ext_ent_schema['$id'] : ext_ent_schema -# } - -# resolver = RefResolver(None, referrer=None, store=schema_store) - -# print (etsi_schema) - -# v = Draft202012Validator(ext_schema, resolver=resolver) -# v.validate(json_instance) - -# validate(json_instance, ext_schema) -# print ("OK") - def handle_uri(u): print(u) @@ -50,8 +18,8 @@ if __name__ == "__main__": parser.add_argument('-s','--schemadir', action="append", help="Directory containing supporting schema files to use for validation") parser.add_argument('-v', '--verbose', action="count", help="Verbose logging (can be specified multiple times)") + parser.add_argument('-i', '--input', type=argparse.FileType('r'), default=sys.stdin, help="Path to input file (if absent, stdin is used)") parser.add_argument('schema', help="Primary schema to validate against") - parser.add_argument('filename', help="JSON instance document to validate") args = parser.parse_args() @@ -65,7 +33,8 @@ if __name__ == "__main__": logging.debug(f"Arguments: {args}") - instance_doc = load_json(args.filename) + instance_doc = json.loads(args.input.read()) + args.input.close() main_schema = load_json(args.schema) schema_dict = { main_schema['$id'] : main_schema } diff --git a/utils/xml_to_json.py b/utils/xml_to_json.py index a85d48a..b8c9e27 100644 --- a/utils/xml_to_json.py +++ b/utils/xml_to_json.py @@ -45,13 +45,6 @@ if __name__ == "__main__": logging.debug(f"Arguments: {args}") - # if (args.input): - # logging.info(f"Reading from {args.input}") - # with open(args.input) as f: - # s = f.read() - # else: - # logging.info(f"Reading from stdin") - # s = sys.stdin.read() s = args.input.read() args.input.close() -- GitLab From d2cedd75ac2a997f77da0f18700131ae48df82e5 Mon Sep 17 00:00:00 2001 From: mark Date: Fri, 2 Jun 2023 12:40:35 +0100 Subject: [PATCH 08/22] Validation giving more helpful messages --- 103120/examples/fragment.json | 41 ++++- 103120/examples/fragment.schema.json | 4 +- 103120/examples/request1.json | 154 +++++++++-------- .../json/ts_103120_Authorisation.schema.json | 48 +++--- .../schema/json/ts_103120_Common.schema.json | 54 +++--- 103120/schema/json/ts_103120_Core.schema.json | 3 +- .../json/ts_103120_Delivery.schema.json | 30 ++-- .../json/ts_103120_Document.schema.json | 48 +++--- .../json/ts_103120_Notification.schema.json | 28 +-- 103120/schema/json/ts_103120_Task.schema.json | 160 +++++++++--------- .../json/ts_103120_TrafficPolicy.schema.json | 36 ++-- test1.json | 90 ++++++++++ test2.json | 1 + utils/request.fragment.schema.json | 4 + utils/translate/SequenceMapping.py | 18 +- utils/translate/TypeMapping.py | 2 +- utils/translate/__init__.py | 2 +- utils/translate_spec.py | 57 +++---- utils/ts103120_config.json | 46 +++-- utils/validate.py | 59 ++++++- utils/xml_to_json.py | 16 +- 21 files changed, 548 insertions(+), 353 deletions(-) create mode 100644 test1.json create mode 100644 test2.json create mode 100644 utils/request.fragment.schema.json diff --git a/103120/examples/fragment.json b/103120/examples/fragment.json index 98a6bfc..44f2f88 100644 --- a/103120/examples/fragment.json +++ b/103120/examples/fragment.json @@ -1,11 +1,38 @@ { - "@xsi:type": "{http://uri.etsi.org/03120/common/2020/09/Authorisation}AuthorisationObject", - "ObjectIdentifier": "7dbbc880-8750-4d3c-abe7-ea4a17646045", - "CountryCode": "GB", + "@xsi:type": "{http://uri.etsi.org/03120/common/2020/09/Task}LITaskObject", + "ObjectIdentifier": "2b36a78b-b628-416d-bd22-404e68a0cd36", + "CountryCode": "XX", "OwnerIdentifier": "ACTOR01", - "AuthorisationReference": "W000001", - "AuthorisationTimespan": { - "StartTime": "2015-09-01T12:00:00Z", - "EndTime": "2015-12-01T12:00:00Z" + "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": { + "IPv4Address": "192.0.2.0" + } + }] + }, + "task:CSPID": { + "CountryCode": "XX", + "UniqueIdentifier": "RECVER01" } + } \ No newline at end of file diff --git a/103120/examples/fragment.schema.json b/103120/examples/fragment.schema.json index 80124bc..afb21c1 100644 --- a/103120/examples/fragment.schema.json +++ b/103120/examples/fragment.schema.json @@ -1,4 +1,4 @@ { - "$id": "ts_103120_Authorisation_2020_09", - "$ref" : "ts_103120_Authorisation_2020_09#/$defs/AuthorisationObject" + "$id": "ts_103120_Task_2020_09", + "$ref" : "#/$defs/RequestPayload" } \ No newline at end of file diff --git a/103120/examples/request1.json b/103120/examples/request1.json index a73501e..d5c90ab 100644 --- a/103120/examples/request1.json +++ b/103120/examples/request1.json @@ -1,91 +1,89 @@ { - "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", - "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" - } + "@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", + "UniqueIdentifier": "ACTOR01" }, - "Payload": { - "RequestPayload": { - "ActionRequests": { - "ActionRequest": [ - { - "ActionIdentifier": "0", - "CREATE": { - "HI1Object": { - "@xsi:type": "auth: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" - } + "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": "auth: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": "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" - } + } + }, + { + "ActionIdentifier": 1, + "CREATE": { + "HI1Object": { + "@xsi:type": "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: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" } + }, + "task:CSPID": { + "CountryCode": "XX", + "UniqueIdentifier": "RECVER01" } } } - ] - } + } + ] } } } diff --git a/103120/schema/json/ts_103120_Authorisation.schema.json b/103120/schema/json/ts_103120_Authorisation.schema.json index a6f8162..1c9a68f 100644 --- a/103120/schema/json/ts_103120_Authorisation.schema.json +++ b/103120/schema/json/ts_103120_Authorisation.schema.json @@ -33,61 +33,61 @@ "NationalHandlingParameters": { "$ref": "ts_103120_Core_2019_10#/$defs/NationalHandlingParameters" }, - "AuthorisationReference": { + "auth:AuthorisationReference": { "$ref": "ts_103280_2017_07#/$defs/LongString" }, - "AuthorisationLegalType": { + "auth:AuthorisationLegalType": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" }, - "AuthorisationPriority": { + "auth:AuthorisationPriority": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" }, - "AuthorisationStatus": { + "auth:AuthorisationStatus": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" }, - "AuthorisationDesiredStatus": { + "auth:AuthorisationDesiredStatus": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" }, - "AuthorisationTimespan": { + "auth:AuthorisationTimespan": { "$ref": "#/$defs/AuthorisationTimespan" }, - "AuthorisationCSPID": { + "auth:AuthorisationCSPID": { "$ref": "#/$defs/AuthorisationCSPID" }, - "AuthorisationCreationTimestamp": { + "auth:AuthorisationCreationTimestamp": { "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" }, - "AuthorisationServedTimestamp": { + "auth:AuthorisationServedTimestamp": { "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" }, - "AuthorisationTerminationTimestamp": { + "auth:AuthorisationTerminationTimestamp": { "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" }, - "AuthorisationApprovalDetails": { + "auth:AuthorisationApprovalDetails": { "type": "array", "items": { "$ref": "ts_103120_Common_2016_02#/$defs/ApprovalDetails" } }, - "AuthorisationInvalidReason": { + "auth:AuthorisationInvalidReason": { "$ref": "ts_103120_Core_2019_10#/$defs/ActionUnsuccesfulInformation" }, - "AuthorisationFlags": { + "auth:AuthorisationFlags": { "$ref": "#/$defs/AuthorisationFlags" }, - "AuthorisationManualInformation": { + "auth:AuthorisationManualInformation": { "$ref": "ts_103280_2017_07#/$defs/LongString" }, - "NationalAuthorisationParameters": { + "auth:NationalAuthorisationParameters": { "$ref": "#/$defs/NationalAuthorisationParameters" }, - "AuthorisationJurisdiction": { + "auth:AuthorisationJurisdiction": { "$ref": "ts_103280_2017_07#/$defs/LongString" }, - "AuthorisationTypeOfCase": { + "auth:AuthorisationTypeOfCase": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" }, - "AuthorisationLegalEntity": { + "auth:AuthorisationLegalEntity": { "$ref": "ts_103280_2017_07#/$defs/ShortString" } }, @@ -99,7 +99,7 @@ "AuthorisationFlags": { "type": "object", "properties": { - "AuthorisationFlag": { + "auth:AuthorisationFlag": { "type": "array", "items": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" @@ -111,10 +111,10 @@ "AuthorisationTimespan": { "type": "object", "properties": { - "StartTime": { + "auth:StartTime": { "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" }, - "EndTime": { + "auth:EndTime": { "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" } }, @@ -123,7 +123,7 @@ "AuthorisationCSPID": { "type": "object", "properties": { - "CSPID": { + "auth:CSPID": { "type": "array", "items": { "$ref": "ts_103120_Core_2019_10#/$defs/EndpointID" @@ -136,12 +136,12 @@ "NationalAuthorisationParameters": { "type": "object", "properties": { - "CountryCode": { + "auth:CountryCode": { "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" } }, "required": [ - "CountryCode" + "auth:CountryCode" ] } } diff --git a/103120/schema/json/ts_103120_Common.schema.json b/103120/schema/json/ts_103120_Common.schema.json index 2149684..2564e8d 100644 --- a/103120/schema/json/ts_103120_Common.schema.json +++ b/103120/schema/json/ts_103120_Common.schema.json @@ -15,47 +15,47 @@ "DictionaryEntry": { "type": "object", "properties": { - "Owner": { + "common:Owner": { "$ref": "ts_103280_2017_07#/$defs/ShortString" }, - "Name": { + "common:Name": { "$ref": "ts_103280_2017_07#/$defs/ShortString" }, - "Value": { + "common:Value": { "$ref": "ts_103280_2017_07#/$defs/ShortString" } }, "required": [ - "Owner", - "Name", - "Value" + "common:Owner", + "common:Name", + "common:Value" ] }, "ApprovalDetails": { "type": "object", "properties": { - "ApprovalType": { + "common:ApprovalType": { "$ref": "ts_103280_2017_07#/$defs/LongString" }, - "ApprovalDescription": { + "common:ApprovalDescription": { "$ref": "ts_103280_2017_07#/$defs/LongString" }, - "ApprovalReference": { + "common:ApprovalReference": { "$ref": "ts_103280_2017_07#/$defs/LongString" }, - "ApproverDetails": { + "common:ApproverDetails": { "$ref": "#/$defs/ApproverDetails" }, - "ApprovalTimestamp": { + "common:ApprovalTimestamp": { "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" }, - "ApprovalIsEmergency": { + "common:ApprovalIsEmergency": { "type": "boolean" }, - "ApprovalDigitalSignature": { + "common:ApprovalDigitalSignature": { "$ref": "#/$defs/ApprovalDigitalSignature" }, - "ApprovalNationalDetails": { + "common:ApprovalNationalDetails": { "$ref": "#/$defs/ApprovalNationalDetails" } }, @@ -64,16 +64,16 @@ "ApproverDetails": { "type": "object", "properties": { - "ApproverName": { + "common:ApproverName": { "$ref": "ts_103280_2017_07#/$defs/LongString" }, - "ApproverRole": { + "common:ApproverRole": { "$ref": "ts_103280_2017_07#/$defs/LongString" }, - "ApproverIdentity": { + "common:ApproverIdentity": { "$ref": "#/$defs/ApproverIdentity" }, - "ApproverContactDetails": { + "common:ApproverContactDetails": { "type": "array", "items": { "$ref": "#/$defs/ApproverContactDetails" @@ -100,13 +100,13 @@ "ApproverContactDetails": { "type": "object", "properties": { - "ApproverAlternateName": { + "common:ApproverAlternateName": { "$ref": "ts_103280_2017_07#/$defs/LongString" }, - "ApproverEmailAddress": { + "common:ApproverEmailAddress": { "$ref": "ts_103280_2017_07#/$defs/InternationalizedEmailAddress" }, - "ApproverPhoneNumber": { + "common:ApproverPhoneNumber": { "$ref": "ts_103280_2017_07#/$defs/InternationalE164" } }, @@ -115,12 +115,12 @@ "NationalApproverIdentity": { "type": "object", "properties": { - "CountryCode": { + "common:CountryCode": { "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" } }, "required": [ - "CountryCode" + "common:CountryCode" ] }, "ApprovalDigitalSignature": { @@ -141,23 +141,23 @@ "ApprovalNationalDetails": { "type": "object", "properties": { - "CountryCode": { + "common:CountryCode": { "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" } }, "required": [ - "CountryCode" + "common:CountryCode" ] }, "NationalDigitalSignature": { "type": "object", "properties": { - "CountryCode": { + "common:CountryCode": { "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" } }, "required": [ - "CountryCode" + "common:CountryCode" ] } } diff --git a/103120/schema/json/ts_103120_Core.schema.json b/103120/schema/json/ts_103120_Core.schema.json index ee2852b..f116d31 100644 --- a/103120/schema/json/ts_103120_Core.schema.json +++ b/103120/schema/json/ts_103120_Core.schema.json @@ -13,7 +13,8 @@ "Payload": { "$ref": "#/$defs/MessagePayload" }, - "Signature": { + "Signature": {}, + "xmldsig:Signature": { "$ref": "www.w3.org_2000_09_xmldsig##/$defs/SignatureType" } }, diff --git a/103120/schema/json/ts_103120_Delivery.schema.json b/103120/schema/json/ts_103120_Delivery.schema.json index 07ca697..3d79eb2 100644 --- a/103120/schema/json/ts_103120_Delivery.schema.json +++ b/103120/schema/json/ts_103120_Delivery.schema.json @@ -33,23 +33,23 @@ "NationalHandlingParameters": { "$ref": "ts_103120_Core_2019_10#/$defs/NationalHandlingParameters" }, - "Reference": { + "delivery:Reference": { "$ref": "#/$defs/Reference" }, - "DeliveryID": { + "delivery:DeliveryID": { "$ref": "ts_103280_2017_07#/$defs/UUID" }, - "SequenceNumber": { + "delivery:SequenceNumber": { "type": "integer", "minimum": 0 }, - "LastSequence": { + "delivery:LastSequence": { "type": "boolean" }, - "Manifest": { + "delivery:Manifest": { "$ref": "#/$defs/Manifest" }, - "Delivery": { + "delivery:Delivery": { "$ref": "#/$defs/Delivery" } }, @@ -113,10 +113,10 @@ "ExternalSchema": { "type": "object", "properties": { - "ManifestID": { + "delivery:ManifestID": { "$ref": "ts_103280_2017_07#/$defs/LongString" }, - "ManifestContents": { + "delivery:ManifestContents": { "$ref": "#/$defs/ManifestContents" } }, @@ -151,10 +151,10 @@ "SchemaContent": { "type": "object", "properties": { - "schema": {} + "delivery:schema": {} }, "required": [ - "schema" + "delivery:schema" ] }, "Delivery": { @@ -186,22 +186,22 @@ "EmbeddedBinaryData": { "type": "object", "properties": { - "Data": { + "delivery:Data": { "type": "string", "pattern": "^[-A-Za-z0-9+/]*={0,3}$" }, - "ContentType": { + "delivery:ContentType": { "$ref": "ts_103280_2017_07#/$defs/ShortString" }, - "Checksum": { + "delivery:Checksum": { "$ref": "ts_103280_2017_07#/$defs/ShortString" }, - "ChecksumType": { + "delivery:ChecksumType": { "$ref": "ts_103280_2017_07#/$defs/ShortString" } }, "required": [ - "Data" + "delivery:Data" ] }, "EmbeddedXMLData": {} diff --git a/103120/schema/json/ts_103120_Document.schema.json b/103120/schema/json/ts_103120_Document.schema.json index fc85e13..f5b850b 100644 --- a/103120/schema/json/ts_103120_Document.schema.json +++ b/103120/schema/json/ts_103120_Document.schema.json @@ -33,40 +33,40 @@ "NationalHandlingParameters": { "$ref": "ts_103120_Core_2019_10#/$defs/NationalHandlingParameters" }, - "DocumentReference": { + "document:DocumentReference": { "$ref": "ts_103280_2017_07#/$defs/LongString" }, - "DocumentName": { + "document:DocumentName": { "$ref": "ts_103280_2017_07#/$defs/LongString" }, - "DocumentStatus": { + "document:DocumentStatus": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" }, - "DocumentDesiredStatus": { + "document:DocumentDesiredStatus": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" }, - "DocumentTimespan": { + "document:DocumentTimespan": { "$ref": "#/$defs/DocumentTimespan" }, - "DocumentType": { + "document:DocumentType": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" }, - "DocumentProperties": { + "document:DocumentProperties": { "$ref": "#/$defs/DocumentProperties" }, - "DocumentBody": { + "document:DocumentBody": { "$ref": "#/$defs/DocumentBody" }, - "DocumentSignature": { + "document:DocumentSignature": { "type": "array", "items": { "$ref": "ts_103120_Common_2016_02#/$defs/ApprovalDetails" } }, - "DocumentInvalidReason": { + "document:DocumentInvalidReason": { "$ref": "ts_103120_Core_2019_10#/$defs/ActionUnsuccesfulInformation" }, - "NationalDocumentParameters": { + "document:NationalDocumentParameters": { "$ref": "#/$defs/NationalDocumentParameters" } }, @@ -78,10 +78,10 @@ "DocumentTimespan": { "type": "object", "properties": { - "StartTime": { + "document:StartTime": { "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" }, - "EndTime": { + "document:EndTime": { "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" } }, @@ -90,7 +90,7 @@ "DocumentProperties": { "type": "object", "properties": { - "DocumentProperty": { + "document:DocumentProperty": { "type": "array", "items": { "$ref": "#/$defs/DocumentProperty" @@ -102,32 +102,32 @@ "DocumentProperty": { "type": "object", "properties": { - "PropertyType": { + "document:PropertyType": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" }, - "PropertyValue": { + "document:PropertyValue": { "$ref": "ts_103280_2017_07#/$defs/LongString" } }, "required": [ - "PropertyType", - "PropertyValue" + "document:PropertyType", + "document:PropertyValue" ] }, "DocumentBody": { "type": "object", "properties": { - "Contents": { + "document:Contents": { "type": "string", "pattern": "^[-A-Za-z0-9+/]*={0,3}$" }, - "ContentType": { + "document:ContentType": { "$ref": "ts_103280_2017_07#/$defs/ShortString" }, - "Checksum": { + "document:Checksum": { "$ref": "ts_103280_2017_07#/$defs/ShortString" }, - "ChecksumType": { + "document:ChecksumType": { "$ref": "ts_103280_2017_07#/$defs/ShortString" } }, @@ -136,12 +136,12 @@ "NationalDocumentParameters": { "type": "object", "properties": { - "CountryCode": { + "document:CountryCode": { "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" } }, "required": [ - "CountryCode" + "document:CountryCode" ] } } diff --git a/103120/schema/json/ts_103120_Notification.schema.json b/103120/schema/json/ts_103120_Notification.schema.json index dffab1a..84fbf04 100644 --- a/103120/schema/json/ts_103120_Notification.schema.json +++ b/103120/schema/json/ts_103120_Notification.schema.json @@ -33,22 +33,22 @@ "NationalHandlingParameters": { "$ref": "ts_103120_Core_2019_10#/$defs/NationalHandlingParameters" }, - "NotificationDetails": { + "notification:NotificationDetails": { "$ref": "ts_103280_2017_07#/$defs/LongString" }, - "NotificationType": { + "notification:NotificationType": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" }, - "NewNotification": { + "notification:NewNotification": { "type": "boolean" }, - "NotificationTimestamp": { + "notification:NotificationTimestamp": { "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" }, - "StatusOfAssociatedObjects": { + "notification:StatusOfAssociatedObjects": { "$ref": "#/$defs/ListOfAssociatedObjectStatus" }, - "NationalNotificationParameters": { + "notification:NationalNotificationParameters": { "$ref": "#/$defs/NationalNotificationParameters" } }, @@ -60,7 +60,7 @@ "ListOfAssociatedObjectStatus": { "type": "object", "properties": { - "AssociatedObjectStatus": { + "notification:AssociatedObjectStatus": { "type": "array", "items": { "$ref": "#/$defs/AssociatedObjectStatus" @@ -73,30 +73,30 @@ "AssociatedObjectStatus": { "type": "object", "properties": { - "AssociatedObject": { + "notification:AssociatedObject": { "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" }, - "Status": { + "notification:Status": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" }, - "Details": { + "notification:Details": { "$ref": "ts_103280_2017_07#/$defs/LongString" } }, "required": [ - "AssociatedObject", - "Status" + "notification:AssociatedObject", + "notification:Status" ] }, "NationalNotificationParameters": { "type": "object", "properties": { - "CountryCode": { + "notification:CountryCode": { "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" } }, "required": [ - "CountryCode" + "notification:CountryCode" ] } } diff --git a/103120/schema/json/ts_103120_Task.schema.json b/103120/schema/json/ts_103120_Task.schema.json index d19e1ee..6854a61 100644 --- a/103120/schema/json/ts_103120_Task.schema.json +++ b/103120/schema/json/ts_103120_Task.schema.json @@ -33,49 +33,49 @@ "NationalHandlingParameters": { "$ref": "ts_103120_Core_2019_10#/$defs/NationalHandlingParameters" }, - "Reference": { + "task:Reference": { "$ref": "ts_103280_2017_07#/$defs/LIID" }, - "Status": { + "task:Status": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" }, - "DesiredStatus": { + "task:DesiredStatus": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" }, - "Timespan": { + "task:Timespan": { "$ref": "#/$defs/TaskTimespan" }, - "TargetIdentifier": { + "task:TargetIdentifier": { "$ref": "#/$defs/TargetIdentifier" }, - "DeliveryType": { + "task:DeliveryType": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" }, - "DeliveryDetails": { + "task:DeliveryDetails": { "$ref": "#/$defs/TaskDeliveryDetails" }, - "ApprovalDetails": { + "task:ApprovalDetails": { "type": "array", "items": { "$ref": "ts_103120_Common_2016_02#/$defs/ApprovalDetails" } }, - "CSPID": { + "task:CSPID": { "$ref": "ts_103120_Core_2019_10#/$defs/EndpointID" }, - "HandlingProfile": { + "task:HandlingProfile": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" }, - "InvalidReason": { + "task:InvalidReason": { "$ref": "ts_103120_Core_2019_10#/$defs/ActionUnsuccesfulInformation" }, - "Flags": { + "task:Flags": { "$ref": "#/$defs/TaskFlags" }, - "NationalLITaskingParameters": { + "task:NationalLITaskingParameters": { "$ref": "#/$defs/NationalLITaskingParameters" }, - "ListOfTrafficPolicyReferences": { + "task:ListOfTrafficPolicyReferences": { "$ref": "#/$defs/ListOfTrafficPolicyReferences" } }, @@ -87,19 +87,19 @@ "TaskTimespan": { "type": "object", "properties": { - "StartTime": { + "task:StartTime": { "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" }, - "EndTime": { + "task:EndTime": { "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" }, - "TerminationTime": { + "task:TerminationTime": { "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" }, - "ProvisioningTime": { + "task:ProvisioningTime": { "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" }, - "DeprovisioningTime": { + "task:DeprovisioningTime": { "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" } }, @@ -108,10 +108,10 @@ "TargetIdentifier": { "type": "object", "properties": { - "TargetIdentifierValues": { + "task:TargetIdentifierValues": { "$ref": "#/$defs/TargetIdentifierValues" }, - "ServiceType": { + "task:ServiceType": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" } }, @@ -120,7 +120,7 @@ "TargetIdentifierValues": { "type": "object", "properties": { - "TargetIdentifierValue": { + "task:TargetIdentifierValue": { "type": "array", "items": { "$ref": "#/$defs/TargetIdentifierValue" @@ -133,37 +133,37 @@ "TargetIdentifierValue": { "type": "object", "properties": { - "FormatType": { + "task:FormatType": { "$ref": "#/$defs/FormatType" }, - "Value": { + "task:Value": { "$ref": "ts_103280_2017_07#/$defs/LongString" } }, "required": [ - "FormatType", - "Value" + "task:FormatType", + "task:Value" ] }, "FormatType": { "type": "object", "properties": { - "FormatOwner": { + "task:FormatOwner": { "$ref": "ts_103280_2017_07#/$defs/ShortString" }, - "FormatName": { + "task:FormatName": { "$ref": "ts_103280_2017_07#/$defs/ShortString" } }, "required": [ - "FormatOwner", - "FormatName" + "task:FormatOwner", + "task:FormatName" ] }, "TaskDeliveryDetails": { "type": "object", "properties": { - "DeliveryDestination": { + "task:DeliveryDestination": { "type": "array", "items": { "$ref": "#/$defs/DeliveryDestination" @@ -176,22 +176,22 @@ "DeliveryDestination": { "type": "object", "properties": { - "DeliveryAddress": { + "task:DeliveryAddress": { "$ref": "#/$defs/DeliveryAddress" }, - "EncryptionDetails": { + "task:EncryptionDetails": { "$ref": "#/$defs/NationalEncryptionDetails" }, - "IRIorCC": { + "task:IRIorCC": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" }, - "HandoverFormat": { + "task:HandoverFormat": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" }, - "DeliveryProfile": { + "task:DeliveryProfile": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" }, - "NationalDeliveryParameters": { + "task:NationalDeliveryParameters": { "$ref": "#/$defs/NationalDeliveryParameters" } }, @@ -325,7 +325,7 @@ "TaskFlags": { "type": "object", "properties": { - "TaskFlag": { + "task:TaskFlag": { "type": "array", "items": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" @@ -337,34 +337,34 @@ "NationalLITaskingParameters": { "type": "object", "properties": { - "CountryCode": { + "task:CountryCode": { "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" } }, "required": [ - "CountryCode" + "task:CountryCode" ] }, "NationalDeliveryParameters": { "type": "object", "properties": { - "CountryCode": { + "task:CountryCode": { "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" } }, "required": [ - "CountryCode" + "task:CountryCode" ] }, "NationalEncryptionDetails": { "type": "object", "properties": { - "CountryCode": { + "task:CountryCode": { "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" } }, "required": [ - "CountryCode" + "task:CountryCode" ] }, "LDTaskObject": { @@ -399,40 +399,40 @@ "NationalHandlingParameters": { "$ref": "ts_103120_Core_2019_10#/$defs/NationalHandlingParameters" }, - "Reference": { + "task:Reference": { "$ref": "ts_103280_2017_07#/$defs/LDID" }, - "Status": { + "task:Status": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" }, - "StatusReason": { + "task:StatusReason": { "$ref": "ts_103120_Core_2019_10#/$defs/ActionUnsuccesfulInformation" }, - "DesiredStatus": { + "task:DesiredStatus": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" }, - "RequestDetails": { + "task:RequestDetails": { "$ref": "#/$defs/RequestDetails" }, - "DeliveryDetails": { + "task:DeliveryDetails": { "$ref": "#/$defs/LDDeliveryDetails" }, - "ApprovalDetails": { + "task:ApprovalDetails": { "type": "array", "items": { "$ref": "ts_103120_Common_2016_02#/$defs/ApprovalDetails" } }, - "CSPID": { + "task:CSPID": { "$ref": "ts_103120_Core_2019_10#/$defs/EndpointID" }, - "HandlingProfile": { + "task:HandlingProfile": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" }, - "Flags": { + "task:Flags": { "$ref": "#/$defs/LDTaskFlags" }, - "NationalLDTaskingParameters": { + "task:NationalLDTaskingParameters": { "$ref": "#/$defs/NationalLDTaskingParameters" } }, @@ -444,28 +444,28 @@ "RequestDetails": { "type": "object", "properties": { - "Type": { + "task:Type": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" }, - "StartTime": { + "task:StartTime": { "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" }, - "EndTime": { + "task:EndTime": { "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" }, - "ObservedTime": { + "task:ObservedTime": { "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" }, - "ObservedTimes": { + "task:ObservedTimes": { "type": "array", "items": { "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" } }, - "RequestValues": { + "task:RequestValues": { "$ref": "#/$defs/RequestValues" }, - "Subtype": { + "task:Subtype": { "$ref": "#/$defs/RequestSubtype" } }, @@ -474,7 +474,7 @@ "RequestValues": { "type": "object", "properties": { - "RequestValue": { + "task:RequestValue": { "type": "array", "items": { "$ref": "#/$defs/RequestValue" @@ -487,22 +487,22 @@ "RequestValue": { "type": "object", "properties": { - "FormatType": { + "task:FormatType": { "$ref": "#/$defs/FormatType" }, - "Value": { + "task:Value": { "$ref": "ts_103280_2017_07#/$defs/LongString" } }, "required": [ - "FormatType", - "Value" + "task:FormatType", + "task:Value" ] }, "RequestSubtype": { "type": "object", "properties": { - "RequestSubtype": { + "task:RequestSubtype": { "type": "array", "items": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" @@ -515,7 +515,7 @@ "LDDeliveryDetails": { "type": "object", "properties": { - "LDDeliveryDestination": { + "task:LDDeliveryDestination": { "type": "array", "items": { "$ref": "#/$defs/LDDeliveryDestination" @@ -528,19 +528,19 @@ "LDDeliveryDestination": { "type": "object", "properties": { - "DeliveryAddress": { + "task:DeliveryAddress": { "$ref": "#/$defs/DeliveryAddress" }, - "EncryptionDetails": { + "task:EncryptionDetails": { "$ref": "#/$defs/NationalEncryptionDetails" }, - "LDHandoverFormat": { + "task:LDHandoverFormat": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" }, - "LDDeliveryProfile": { + "task:LDDeliveryProfile": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" }, - "NationalDeliveryParameters": { + "task:NationalDeliveryParameters": { "$ref": "#/$defs/NationalDeliveryParameters" } }, @@ -549,7 +549,7 @@ "LDTaskFlags": { "type": "object", "properties": { - "LDTaskFlag": { + "task:LDTaskFlag": { "type": "array", "items": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" @@ -561,18 +561,18 @@ "NationalLDTaskingParameters": { "type": "object", "properties": { - "CountryCode": { + "task:CountryCode": { "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" } }, "required": [ - "CountryCode" + "task:CountryCode" ] }, "ListOfTrafficPolicyReferences": { "type": "object", "properties": { - "TrafficPolicyReference": { + "task:TrafficPolicyReference": { "type": "array", "items": { "$ref": "#/$defs/TrafficPolicyReference" @@ -585,11 +585,11 @@ "TrafficPolicyReference": { "type": "object", "properties": { - "Order": { + "task:Order": { "type": "integer", "minimum": 1 }, - "ObjectIdentifier": { + "task:ObjectIdentifier": { "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" } }, diff --git a/103120/schema/json/ts_103120_TrafficPolicy.schema.json b/103120/schema/json/ts_103120_TrafficPolicy.schema.json index 53fe978..2bbfc17 100644 --- a/103120/schema/json/ts_103120_TrafficPolicy.schema.json +++ b/103120/schema/json/ts_103120_TrafficPolicy.schema.json @@ -33,10 +33,10 @@ "NationalHandlingParameters": { "$ref": "ts_103120_Core_2019_10#/$defs/NationalHandlingParameters" }, - "TrafficPolicyName": { + "tp:TrafficPolicyName": { "$ref": "ts_103280_2017_07#/$defs/ShortString" }, - "TrafficRules": { + "tp:TrafficRules": { "$ref": "#/$defs/ListOfTrafficRuleReferences" } }, @@ -48,7 +48,7 @@ "ListOfTrafficRuleReferences": { "type": "object", "properties": { - "TrafficRuleReference": { + "tp:TrafficRuleReference": { "type": "array", "items": { "$ref": "#/$defs/TrafficRuleReference" @@ -61,17 +61,17 @@ "TrafficRuleReference": { "type": "object", "properties": { - "Order": { + "tp:Order": { "type": "integer", "minimum": 1 }, - "ObjectIdentifier": { + "tp:ObjectIdentifier": { "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" } }, "required": [ - "Order", - "ObjectIdentifier" + "tp:Order", + "tp:ObjectIdentifier" ] }, "TrafficRuleObject": { @@ -106,10 +106,10 @@ "NationalHandlingParameters": { "$ref": "ts_103120_Core_2019_10#/$defs/NationalHandlingParameters" }, - "Criteria": { + "tp:Criteria": { "$ref": "#/$defs/ListOfTrafficCriteria" }, - "Action": { + "tp:Action": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" } }, @@ -121,7 +121,7 @@ "ListOfTrafficCriteria": { "type": "object", "properties": { - "Criteria": { + "tp:Criteria": { "type": "array", "items": { "$ref": "#/$defs/TrafficCriteria" @@ -160,23 +160,23 @@ "IPPolicyCriteria": { "type": "object", "properties": { - "IPProtocol": { + "tp:IPProtocol": { "type": "integer", "minimum": 0 }, - "SourceIPRange": { + "tp:SourceIPRange": { "$ref": "ts_103280_2017_07#/$defs/IPCIDR" }, - "SourcePortRange": { + "tp:SourcePortRange": { "$ref": "ts_103280_2017_07#/$defs/PortRange" }, - "DestinationIPRange": { + "tp:DestinationIPRange": { "$ref": "ts_103280_2017_07#/$defs/IPCIDR" }, - "DestinationPortRange": { + "tp:DestinationPortRange": { "$ref": "ts_103280_2017_07#/$defs/PortRange" }, - "BothDirections": { + "tp:BothDirections": { "type": "boolean" } }, @@ -185,10 +185,10 @@ "MobileAccessPolicyCriteria": { "type": "object", "properties": { - "APN": { + "tp:APN": { "$ref": "ts_103280_2017_07#/$defs/ShortString" }, - "DNN": { + "tp:DNN": { "$ref": "ts_103280_2017_07#/$defs/ShortString" } }, diff --git a/test1.json b/test1.json new file mode 100644 index 0000000..6838b7d --- /dev/null +++ b/test1.json @@ -0,0 +1,90 @@ +{ + "@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", + "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": 1, + "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": 2, + "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" + } + } + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/test2.json b/test2.json new file mode 100644 index 0000000..bf5b94c --- /dev/null +++ b/test2.json @@ -0,0 +1 @@ +{"@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", "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": "auth: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": "task:LITaskObject", "ObjectIdentifier": "2b36a78b-b628-416d-bd22-404e68a0cd36", "CountryCode": "XX", "OwnerIdentifier": "ACTOR01", "AssociatedObjects": {"AssociatedObject": ["7dbbc880-8750-4d3c-abe7-ea4a17646045", "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"}}}}]}}}} diff --git a/utils/request.fragment.schema.json b/utils/request.fragment.schema.json new file mode 100644 index 0000000..dc2bb14 --- /dev/null +++ b/utils/request.fragment.schema.json @@ -0,0 +1,4 @@ +{ + "$id": "fragment_request", + "$ref" : "#/$defs/RequestPayload" +} \ No newline at end of file diff --git a/utils/translate/SequenceMapping.py b/utils/translate/SequenceMapping.py index 91db5ea..9fd4d69 100644 --- a/utils/translate/SequenceMapping.py +++ b/utils/translate/SequenceMapping.py @@ -45,23 +45,29 @@ class SequenceMapping(ComplexTypeMapping): inner_choice = None for c in list(content.iter_model()): log.debug(f"Processing model item {c}") + print("Model item -------------") if type(c) is XsdElement: + element_name = c.local_name + if c.target_namespace in self.ns_to_id_map: + ns = self.ns_to_id_map[c.target_namespace] + if 'prefix' in ns: + element_name = ns['prefix'] + ":" + element_name if c.effective_max_occurs != 1: - mapped_type['properties'][c.local_name] = { + mapped_type['properties'][element_name] = { "type" : "array", "items" : TypeMapping.get_type_from_elem(c, xst.namespaces['']) } if c.effective_max_occurs: - mapped_type['properties'][c.local_name]['maxItems'] = c.effective_max_occurs + mapped_type['properties'][element_name]['maxItems'] = c.effective_max_occurs if c.effective_min_occurs > 0: - mapped_type['properties'][c.local_name]['minItems'] = c.effective_min_occurs + mapped_type['properties'][element_name]['minItems'] = c.effective_min_occurs else: - mapped_type['properties'][c.local_name] = TypeMapping.get_type_from_elem(c, xst.namespaces['']) + mapped_type['properties'][element_name] = TypeMapping.get_type_from_elem(c, xst.namespaces['']) if c.effective_min_occurs == 1: - mapped_type['required'].append(c.local_name) + mapped_type['required'].append(element_name) elif type(c) is XsdGroup: if inner_choice: - raise Exception (f"Second group '{c.local_name}' encountered in {xst}") + raise Exception (f"Second group '{element_name}' encountered in {xst}") if c.model != "choice": raise Exception (f"Don't know what to do with inner group {c} in {xst} - not a choice") inner_choice = ChoiceMapping.process_choice(c, xst.namespaces['']) diff --git a/utils/translate/TypeMapping.py b/utils/translate/TypeMapping.py index b796e66..e3daf62 100644 --- a/utils/translate/TypeMapping.py +++ b/utils/translate/TypeMapping.py @@ -50,7 +50,7 @@ class TypeMapping(ABC): return { "$ref" : f"#/$defs/{xsd_type.local_name}" } else: mapped_id = cls.ns_to_id_map[ns] - return { "$ref" : f"{mapped_id}#/$defs/{xsd_type.local_name}"} + return { "$ref" : f"{mapped_id['id']}#/$defs/{xsd_type.local_name}"} @classmethod def get_type_from_elem(cls, elem: XsdElement, current_ns : str): diff --git a/utils/translate/__init__.py b/utils/translate/__init__.py index 983aa20..ba05008 100644 --- a/utils/translate/__init__.py +++ b/utils/translate/__init__.py @@ -27,7 +27,7 @@ def translate_schema (schema_path: str, ns_to_id_map: dict, schema_locations = [ xs = XMLSchema(schema_path, validation='lax', locations=schema_locations) logging.info(f"Schema namespace: {xs.target_namespace}" ) - schema_id = ns_to_id_map[xs.target_namespace] + schema_id = ns_to_id_map[xs.target_namespace]["id"] js['$id'] = schema_id TypeMapping.ns_to_id_map = ns_to_id_map diff --git a/utils/translate_spec.py b/utils/translate_spec.py index 8f89093..54ac5cd 100644 --- a/utils/translate_spec.py +++ b/utils/translate_spec.py @@ -8,8 +8,6 @@ from xmlschema import * from translate import * -import jsonschema - logging.basicConfig(level = logging.INFO) def build_schema_locations (paths): @@ -46,24 +44,22 @@ if __name__ == "__main__": config = get_json(sys.argv[1]) - schema_paths = config['schemas'] - logging.info("Bulding schema locations...") - schema_locations = build_schema_locations(schema_paths) + + logging.info("Bulding ns map...") + ns_map = {} + for location, settings in config['schemas'].items(): + xs = XMLSchema(location, validation='skip') + ns = xs.target_namespace + id = convert_ns_to_id(ns) + ns_map[ns] = { + "id" : id, + "location" : str(Path(location).resolve()) + } | settings + logging.debug(ns_map) + + logging.info("Building schema locations") + schema_locations = [(k, v["location"]) for k,v in ns_map.items()] logging.debug(schema_locations) - - # ns_to_id_map = { - # schema[0]: schema[0].split('/')[-1].lower() + ".json" - # for schema in schema_locations if '03120' in schema[0] - # } | { - # 'http://uri.etsi.org/03280/common/2017/07' : 'etsi103280.json', - # 'http://www.w3.org/2000/09/xmldsig#' : 'xmldsig.json', - # } - logging.info("Constructing XSD NS to JSON Schema ID mapping...") - ns_to_id_map = { schema[0] : convert_ns_to_id(schema[0]) for schema in schema_locations} - logging.debug(ns_to_id_map) - - # # js = translate_schema("103280/TS_103_280.xsd", "103120.json") - # # print(json.dumps(js, indent=2)) output_path = Path(config['output']) if not output_path.exists(): @@ -78,13 +74,14 @@ if __name__ == "__main__": # TODO - work out what to do here logging.info(" Skipping XML Dsig...") continue - js = translate_schema(schema_tuple[1], ns_to_id_map, schema_locations) - if ns_to_id_map[schema_tuple[0]] == 'core.json': + js = translate_schema(schema_tuple[1], ns_map, schema_locations) + + # TODO - Special case, get rid of signature + if ns_map[schema_tuple[0]] == 'core.json': js['$defs']['HI1Message']['properties'].pop('Signature') js_path = output_path / convert_xsd_to_filename(schema_tuple[1]) - # TODO - work out how to do this substitution automatically - # and build the graph of acceptable descendent types + # TODO - Special case - abstract HI1Object if "Core" in schema_tuple[1]: js["$defs"]['ConcreteHI1Object'] = { 'oneOf' : [ @@ -106,17 +103,3 @@ if __name__ == "__main__": with open(str(js_path), 'w') as f: f.write(json_string) json_schemas[js['$id']] = json.loads(json_string) - - # else: - # json_schemas = {} - # json_path = Path('json/') - # for json_file in json_path.glob("*.json"): - # json_schemas[json_file.name] = get_json(json_file) - - # resolver = jsonschema.RefResolver("", "", json_schemas) - - # instance = get_json("120.json") - # schema = json_schemas['core.json'] - # jsonschema.validate(instance, schema, resolver=resolver) - - # print(json.dumps(js, indent=2)) diff --git a/utils/ts103120_config.json b/utils/ts103120_config.json index 08aadb8..ec32171 100644 --- a/utils/ts103120_config.json +++ b/utils/ts103120_config.json @@ -1,14 +1,36 @@ { - "schemas" : [ "../103120/schema/ts_103120_Authorisation.xsd", - "../103120/schema/ts_103120_Common.xsd", - "../103120/schema/ts_103120_Core.xsd", - "../103120/schema/ts_103120_Delivery.xsd", - "../103120/schema/ts_103120_Document.xsd", - "../103120/schema/ts_103120_Notification.xsd", - "../103120/schema/ts_103120_Task.xsd", - "../103120/schema/ts_103120_TrafficPolicy.xsd", - "../103280/TS_103_280.xsd", - "../testing/deps/xmldsig/xmldsig-core-schema.xsd" - ], - "output" : "../103120/schema/json/" + "schemas" : { + "./103120/schema/ts_103120_Authorisation.xsd" : { + "prefix" : "auth" + }, + "./103120/schema/ts_103120_Common.xsd" : { + "prefix" : "common" + }, + "./103120/schema/ts_103120_Core.xsd" : { + }, + "./103120/schema/ts_103120_Delivery.xsd" : { + "prefix" : "delivery" + }, + "./103120/schema/ts_103120_Document.xsd" : { + "prefix" : "document" + }, + "./103120/schema/ts_103120_Notification.xsd" : { + "prefix" : "notification" + }, + "./103120/schema/ts_103120_Task.xsd" : { + "prefix" : "task" + }, + "./103120/schema/ts_103120_TrafficPolicy.xsd" : { + "prefix" : "tp" + }, + "./103280/TS_103_280.xsd" : { + "prefix" : "etsi280", + "skip" : true + }, + "./testing/deps/xmldsig/xmldsig-core-schema.xsd" : { + "prefix" : "xmldsig", + "skip" : true + } + }, + "output" : "./103120/schema/json/" } \ No newline at end of file diff --git a/utils/validate.py b/utils/validate.py index c832631..17070bb 100644 --- a/utils/validate.py +++ b/utils/validate.py @@ -1,5 +1,6 @@ import sys from jsonschema import validate, RefResolver, Draft202012Validator +from jsonschema.exceptions import ValidationError import json from pathlib import Path import logging @@ -41,6 +42,8 @@ if __name__ == "__main__": if args.schemadir: schema_paths = [] for d in args.schemadir: + logging.info(f"Searching {d}") + logging.info(list(Path(d).rglob("*.schema.json"))) schema_paths += [f for f in Path(d).rglob("*.schema.json")] logging.info(f"Schema files loaded: {schema_paths}") @@ -57,7 +60,61 @@ if __name__ == "__main__": store=schema_dict) v = Draft202012Validator(main_schema, resolver=resolver) + try: + v.validate(instance_doc) + except ValidationError as ex: + # Any failure within the Payload element results in a failure against the oneOf constraint in the Payload element + # This isn't terribly helpful in working out what is actually wrong, so in this case we attempt an explicit + # validation against the relevant oneOf alternation to try and get a more useful validation error + if list(ex.schema_path) == ['properties', 'Payload', 'oneOf']: + logging.error ("Error detected validating payload oneOf - attempting explicit validation...") + try: + if 'RequestPayload' in instance_doc['Payload'].keys(): + request_fragment_schema = { "$ref" : "ts_103120_Core_2019_10#/$defs/RequestPayload" } + v = Draft202012Validator(request_fragment_schema, resolver=resolver) + v.validate(instance_doc['Payload']['RequestPayload']) + elif 'ResponsePayload' in instance_doc['Payload'].keys(): + request_fragment_schema = { "$ref" : "ts_103120_Core_2019_10#/$defs/ResponsePayload" } + v = Draft202012Validator(request_fragment_schema, resolver=resolver) + v.validate(instance_doc['Payload']['ResponsePayload']) + else: + logging.error("No RequestPayload or ResponsePayload found - is the Payload malformed?") + raise ex + except ValidationError as ex2: + # Similar to above, this is inner validation to try and get a more useful error in the event + # that something fails the verb oneOf constraint + logging.error("Error detected in ActionRequests/ActionResponses") + error_path = list(ex2.schema_path) + if error_path != ['properties', 'ActionRequests', 'properties', 'ActionRequest', 'items', 'allOf', 1, 'oneOf'] and error_path != ['properties', 'ActionResponses', 'properties', 'ActionResponse', 'items', 'allOf', 1, 'oneOf']: + logging.error("Error not in inner Request/Response allOf/oneOf constraint") + raise ex2 + j = ex2.instance + j.pop('ActionIdentifier') # Remove ActionIdentifier - one remaining key will be the verb + verb = list(j.keys())[0] + message = "Request" if error_path[1] == "ActionRequests" else "Response" + v = Draft202012Validator({"$ref" : f"ts_103120_Core_2019_10#/$defs/{verb}{message}"}, resolver=resolver) + try: + v.validate(j[verb]) + except ValidationError as ex3: + logging.error("Error detected in verb") + # The final level of validation is for the actual HI1Object validation + if list(ex3.schema_path) != ['properties', 'HI1Object', 'oneOf']: + logging.error("Error not inside HI1Object") + raise ex3 + object_type = ex3.instance['@xsi:type'].split('}')[-1] + object_ref = { + 'AuthorisationObject': 'ts_103120_Authorisation_2020_09#/$defs/AuthorisationObject', + 'LITaskObject': 'ts_103120_Task_2020_09#/$defs/LITaskObject', + 'LDTaskObject': 'ts_103120_Task_2020_09#/$defs/LDTaskObject', + 'DocumentObject': 'ts_103120_Document_2020_09#/$defs/DocumentObject', + 'NotificationObject': 'ts_103120_Notification_2016_02#/$defs/NotificationObject', + 'DeliveryObject': 'ts_103120_Delivery_2019_10#/$defs/DeliveryObject', + 'TrafficPolicyObject': 'ts_103120_TrafficPolicy_2022_07#/$defs/TrafficPolicyObject' + }[object_type] + v = Draft202012Validator({"$ref" : object_ref}, resolver=resolver) + v.validate(ex3.instance) + + exit(-1) - v.validate(instance_doc) logging.info("Done") \ No newline at end of file diff --git a/utils/xml_to_json.py b/utils/xml_to_json.py index b8c9e27..ac32d7e 100644 --- a/utils/xml_to_json.py +++ b/utils/xml_to_json.py @@ -49,9 +49,15 @@ if __name__ == "__main__": args.input.close() logging.debug(s) - d = xmltodict.parse(s)['HI1Message'] - - prefixes = extract_prefixes(d) - removePrefixes(d, prefixes) + # d = xmltodict.parse(s, + # force_list=('AssociatedObject',) + # )['HI1Message'] - print(json.dumps(d)) + d = xmltodict.parse(s, + force_list=('AssociatedObject',) + )['HI1Message'] + + # prefixes = extract_prefixes(d) + # removePrefixes(d, prefixes) + + print(json.dumps(d, indent=2)) -- GitLab From 2d9c5a45edaf22e7de12936fc700c1ae9113ef3a Mon Sep 17 00:00:00 2001 From: mark Date: Fri, 2 Jun 2023 12:43:01 +0100 Subject: [PATCH 09/22] Tidying up a bit --- test1.json | 90 ------------------------------------------------------ test2.json | 1 - 2 files changed, 91 deletions(-) delete mode 100644 test1.json delete mode 100644 test2.json diff --git a/test1.json b/test1.json deleted file mode 100644 index 6838b7d..0000000 --- a/test1.json +++ /dev/null @@ -1,90 +0,0 @@ -{ - "@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", - "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": 1, - "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": 2, - "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" - } - } - } - } - ] - } - } - } -} \ No newline at end of file diff --git a/test2.json b/test2.json deleted file mode 100644 index bf5b94c..0000000 --- a/test2.json +++ /dev/null @@ -1 +0,0 @@ -{"@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", "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": "auth: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": "task:LITaskObject", "ObjectIdentifier": "2b36a78b-b628-416d-bd22-404e68a0cd36", "CountryCode": "XX", "OwnerIdentifier": "ACTOR01", "AssociatedObjects": {"AssociatedObject": ["7dbbc880-8750-4d3c-abe7-ea4a17646045", "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"}}}}]}}}} -- GitLab From 81aab74ef0a9d5c214ddd057be4f3f3447706fe9 Mon Sep 17 00:00:00 2001 From: mark Date: Fri, 2 Jun 2023 14:07:08 +0100 Subject: [PATCH 10/22] Fixing namespace qualifiers for choice --- 103120/schema/json/TS_103_280.schema.json | 389 ++++++++++++++++++ .../schema/json/ts_103120_Common.schema.json | 8 +- .../json/ts_103120_Delivery.schema.json | 32 +- 103120/schema/json/ts_103120_Task.schema.json | 44 +- .../json/ts_103120_TrafficPolicy.schema.json | 8 +- utils/translate/ChoiceMapping.py | 13 +- utils/translate/SequenceMapping.py | 2 +- utils/xml_to_json.py | 60 ++- 8 files changed, 501 insertions(+), 55 deletions(-) create mode 100644 103120/schema/json/TS_103_280.schema.json diff --git a/103120/schema/json/TS_103_280.schema.json b/103120/schema/json/TS_103_280.schema.json new file mode 100644 index 0000000..02cd078 --- /dev/null +++ b/103120/schema/json/TS_103_280.schema.json @@ -0,0 +1,389 @@ +{ + "$id": "ts_103280_2017_07", + "$defs": { + "ShortString": { + "type": "string", + "maxLength": 255 + }, + "LongString": { + "type": "string", + "maxLength": 65535 + }, + "LIID": { + "type": "string", + "pattern": "^([!-~]{1,25})|([0-9a-f]{26,50})$" + }, + "UTCDateTime": { + "type": "string", + "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z$" + }, + "UTCMicrosecondDateTime": { + "type": "string", + "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}\\.[0-9]{6}Z$" + }, + "QualifiedDateTime": { + "type": "string", + "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}(Z|[+-][0-9]{2}:[0-9]{2})$" + }, + "QualifiedMicrosecondDateTime": { + "type": "string", + "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}\\.[0-9]{6}(Z|[+-][0-9]{2}:[0-9]{2})$" + }, + "InternationalE164": { + "type": "string", + "pattern": "^[0-9]{1,15}$" + }, + "IMSI": { + "type": "string", + "pattern": "^[0-9]{6,15}$" + }, + "IMEI": { + "type": "string", + "pattern": "^[0-9]{14}$" + }, + "IMEICheckDigit": { + "type": "string", + "pattern": "^[0-9]{15}$" + }, + "IMEISV": { + "type": "string", + "pattern": "^[0-9]{16}$" + }, + "IPv4Address": { + "type": "string", + "pattern": "^((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])$" + }, + "IPv4CIDR": { + "type": "string", + "pattern": "^((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])/([1-2]?[0-9]|3[0-2])$" + }, + "IPv6Address": { + "type": "string", + "pattern": "^([0-9a-f]{4}:){7}([0-9a-f]{4})$" + }, + "IPv6CIDR": { + "type": "string", + "pattern": "^([0-9a-f]{4}:){7}([0-9a-f]{4})/(([1-9][0-9]?)|(1[0-1][0-9])|(12[0-8]))$" + }, + "TCPPort": { + "type": "integer", + "exclusiveMinimum": 1, + "maximum": 65535 + }, + "UDPPort": { + "type": "integer", + "minimum": 0, + "maximum": 65535 + }, + "MACAddress": { + "type": "string", + "pattern": "^([a-f0-9]{2}:){5}[a-f0-9]{2}$" + }, + "EmailAddress": { + "allOf": [ + { + "$ref": "#/$defs/ShortString" + }, + { + "type": "string", + "pattern": "^[a-zA-Z0-9\\.!#$%&'\\*\\+\\\\/=\\?\\^_`\\{\\|\\}~\\-]+@[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(\\.[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$" + } + ] + }, + "UUID": { + "type": "string", + "pattern": "^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$" + }, + "ISOCountryCode": { + "type": "string", + "pattern": "^[A-Z]{2}$" + }, + "SIPURI": { + "type": "string", + "pattern": "^sips?:[a-zA-Z0-9!#$&-;=?-\\[\\]_~%]+$" + }, + "TELURI": { + "type": "string", + "pattern": "^tel:[a-zA-Z0-9!#$&-;=?-\\[\\]_~%]+$" + }, + "WGS84LatitudeDecimal": { + "type": "string", + "pattern": "^[NS][0-9]{2}\\.[0-9]{6}$" + }, + "WGS84LongitudeDecimal": { + "type": "string", + "pattern": "^[EW][0-9]{3}\\.[0-9]{6}$" + }, + "WGS84LatitudeAngular": { + "type": "string", + "pattern": "^[NS][0-9]{6}\\.[0-9]{2}$" + }, + "WGS84LongitudeAngular": { + "type": "string", + "pattern": "^[EW][0-9]{7}\\.[0-9]{2}$" + }, + "SUPIIMSI": { + "$ref": "#/$defs/IMSI" + }, + "SUPINAI": { + "$ref": "#/$defs/NAI" + }, + "SUCI": { + "type": "string", + "pattern": "^([a-fA-F0-9]{2})*$" + }, + "PEIIMEI": { + "$ref": "#/$defs/IMEI" + }, + "PEIIMEICheckDigit": { + "$ref": "#/$defs/IMEICheckDigit" + }, + "PEIIMEISV": { + "$ref": "#/$defs/IMEISV" + }, + "GPSIMSISDN": { + "type": "string", + "pattern": "^[0-9]{1,15}$" + }, + "GPSINAI": { + "$ref": "#/$defs/NAI" + }, + "NAI": { + "type": "string" + }, + "LDID": { + "type": "string", + "pattern": "^([A-Z]{2}-.+-.+)$" + }, + "InternationalizedEmailAddress": { + "allOf": [ + { + "$ref": "#/$defs/ShortString" + }, + { + "type": "string", + "pattern": "^.+@.+$" + } + ] + }, + "EUI64": { + "type": "string", + "pattern": "^([a-f0-9]{2}:){7}[a-f0-9]{2}$" + }, + "CGI": { + "type": "string", + "pattern": "^[0-9]{3}-[0-9]{2,3}-[a-f0-9]{4}-[a-f0-9]{4}$" + }, + "ECGI": { + "type": "string", + "pattern": "^[0-9]{3}-[0-9]{2,3}-[a-f0-9]{7}$" + }, + "NCGI": { + "type": "string", + "pattern": "^[0-9]{3}-[0-9]{2,3}-[a-f0-9]{9}$" + }, + "ICCID": { + "type": "string", + "pattern": "^[0-9]{19,20}$" + }, + "IPProtocol": { + "type": "integer", + "minimum": 0, + "maximum": 255 + }, + "IPAddress": { + "oneOf": [ + { + "type": "object", + "properties": { + "etsi280:IPv4Address": { + "$ref": "#/$defs/IPv4Address" + } + }, + "required": [ + "etsi280:IPv4Address" + ] + }, + { + "type": "object", + "properties": { + "etsi280:IPv6Address": { + "$ref": "#/$defs/IPv6Address" + } + }, + "required": [ + "etsi280:IPv6Address" + ] + } + ] + }, + "IPCIDR": { + "oneOf": [ + { + "type": "object", + "properties": { + "etsi280:IPv4CIDR": { + "$ref": "#/$defs/IPv4CIDR" + } + }, + "required": [ + "etsi280:IPv4CIDR" + ] + }, + { + "type": "object", + "properties": { + "etsi280:IPv6CIDR": { + "$ref": "#/$defs/IPv6CIDR" + } + }, + "required": [ + "etsi280:IPv6CIDR" + ] + } + ] + }, + "TCPPortRange": { + "type": "object", + "properties": { + "etsi280:start": { + "$ref": "#/$defs/TCPPort" + }, + "etsi280:end": { + "$ref": "#/$defs/TCPPort" + } + }, + "required": [ + "etsi280:start", + "etsi280:end" + ] + }, + "UDPPortRange": { + "type": "object", + "properties": { + "etsi280:start": { + "$ref": "#/$defs/UDPPort" + }, + "etsi280:end": { + "$ref": "#/$defs/UDPPort" + } + }, + "required": [ + "etsi280:start", + "etsi280:end" + ] + }, + "Port": { + "oneOf": [ + { + "type": "object", + "properties": { + "etsi280:TCPPort": { + "$ref": "#/$defs/TCPPort" + } + }, + "required": [ + "etsi280:TCPPort" + ] + }, + { + "type": "object", + "properties": { + "etsi280:UDPPort": { + "$ref": "#/$defs/UDPPort" + } + }, + "required": [ + "etsi280:UDPPort" + ] + } + ] + }, + "PortRange": { + "oneOf": [ + { + "type": "object", + "properties": { + "etsi280:TCPPortRange": { + "$ref": "#/$defs/TCPPortRange" + } + }, + "required": [ + "etsi280:TCPPortRange" + ] + }, + { + "type": "object", + "properties": { + "etsi280:UDPPortRange": { + "$ref": "#/$defs/UDPPortRange" + } + }, + "required": [ + "etsi280:UDPPortRange" + ] + } + ] + }, + "IPAddressPort": { + "type": "object", + "properties": { + "etsi280:address": { + "$ref": "#/$defs/IPAddress" + }, + "etsi280:port": { + "$ref": "#/$defs/Port" + } + }, + "required": [ + "etsi280:address", + "etsi280:port" + ] + }, + "IPAddressPortRange": { + "type": "object", + "properties": { + "etsi280:address": { + "$ref": "#/$defs/IPAddress" + }, + "etsi280:portRange": { + "$ref": "#/$defs/PortRange" + } + }, + "required": [ + "etsi280:address", + "etsi280:portRange" + ] + }, + "WGS84CoordinateDecimal": { + "type": "object", + "properties": { + "etsi280:latitude": { + "$ref": "#/$defs/WGS84LatitudeDecimal" + }, + "etsi280:longitude": { + "$ref": "#/$defs/WGS84LongitudeDecimal" + } + }, + "required": [ + "etsi280:latitude", + "etsi280:longitude" + ] + }, + "WGS84CoordinateAngular": { + "type": "object", + "properties": { + "etsi280:latitude": { + "$ref": "#/$defs/WGS84LatitudeAngular" + }, + "etsi280:longitude": { + "$ref": "#/$defs/WGS84LongitudeAngular" + } + }, + "required": [ + "etsi280:latitude", + "etsi280:longitude" + ] + } + } +} \ No newline at end of file diff --git a/103120/schema/json/ts_103120_Common.schema.json b/103120/schema/json/ts_103120_Common.schema.json index 2564e8d..d11b4b4 100644 --- a/103120/schema/json/ts_103120_Common.schema.json +++ b/103120/schema/json/ts_103120_Common.schema.json @@ -87,12 +87,12 @@ { "type": "object", "properties": { - "NationalApproverIdentity": { + "common:NationalApproverIdentity": { "$ref": "#/$defs/NationalApproverIdentity" } }, "required": [ - "NationalApproverIdentity" + "common:NationalApproverIdentity" ] } ] @@ -128,12 +128,12 @@ { "type": "object", "properties": { - "NationalDigitalSignature": { + "common:NationalDigitalSignature": { "$ref": "#/$defs/NationalDigitalSignature" } }, "required": [ - "NationalDigitalSignature" + "common:NationalDigitalSignature" ] } ] diff --git a/103120/schema/json/ts_103120_Delivery.schema.json b/103120/schema/json/ts_103120_Delivery.schema.json index 3d79eb2..9cfceae 100644 --- a/103120/schema/json/ts_103120_Delivery.schema.json +++ b/103120/schema/json/ts_103120_Delivery.schema.json @@ -63,23 +63,23 @@ { "type": "object", "properties": { - "LDID": { + "delivery:LDID": { "$ref": "ts_103280_2017_07#/$defs/LDID" } }, "required": [ - "LDID" + "delivery:LDID" ] }, { "type": "object", "properties": { - "LIID": { + "delivery:LIID": { "$ref": "ts_103280_2017_07#/$defs/LIID" } }, "required": [ - "LIID" + "delivery:LIID" ] } ] @@ -89,23 +89,23 @@ { "type": "object", "properties": { - "Specification": { + "delivery:Specification": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" } }, "required": [ - "Specification" + "delivery:Specification" ] }, { "type": "object", "properties": { - "ExternalSchema": { + "delivery:ExternalSchema": { "$ref": "#/$defs/ExternalSchema" } }, "required": [ - "ExternalSchema" + "delivery:ExternalSchema" ] } ] @@ -127,23 +127,23 @@ { "type": "object", "properties": { - "BinaryData": { + "delivery:BinaryData": { "$ref": "#/$defs/EmbeddedBinaryData" } }, "required": [ - "BinaryData" + "delivery:BinaryData" ] }, { "type": "object", "properties": { - "XMLSchema": { + "delivery:XMLSchema": { "$ref": "#/$defs/SchemaContent" } }, "required": [ - "XMLSchema" + "delivery:XMLSchema" ] } ] @@ -162,23 +162,23 @@ { "type": "object", "properties": { - "BinaryData": { + "delivery:BinaryData": { "$ref": "#/$defs/EmbeddedBinaryData" } }, "required": [ - "BinaryData" + "delivery:BinaryData" ] }, { "type": "object", "properties": { - "XMLData": { + "delivery:XMLData": { "$ref": "#/$defs/EmbeddedXMLData" } }, "required": [ - "XMLData" + "delivery:XMLData" ] } ] diff --git a/103120/schema/json/ts_103120_Task.schema.json b/103120/schema/json/ts_103120_Task.schema.json index 6854a61..24de4c5 100644 --- a/103120/schema/json/ts_103120_Task.schema.json +++ b/103120/schema/json/ts_103120_Task.schema.json @@ -202,122 +202,122 @@ { "type": "object", "properties": { - "IPv4Address": { + "task:IPv4Address": { "$ref": "ts_103280_2017_07#/$defs/IPv4Address" } }, "required": [ - "IPv4Address" + "task:IPv4Address" ] }, { "type": "object", "properties": { - "IPv6Address": { + "task:IPv6Address": { "$ref": "ts_103280_2017_07#/$defs/IPv6Address" } }, "required": [ - "IPv6Address" + "task:IPv6Address" ] }, { "type": "object", "properties": { - "IPAddressPort": { + "task:IPAddressPort": { "$ref": "ts_103280_2017_07#/$defs/IPAddressPort" } }, "required": [ - "IPAddressPort" + "task:IPAddressPort" ] }, { "type": "object", "properties": { - "IPAddressPortRange": { + "task:IPAddressPortRange": { "$ref": "ts_103280_2017_07#/$defs/IPAddressPortRange" } }, "required": [ - "IPAddressPortRange" + "task:IPAddressPortRange" ] }, { "type": "object", "properties": { - "E164Number": { + "task:E164Number": { "$ref": "ts_103280_2017_07#/$defs/InternationalE164" } }, "required": [ - "E164Number" + "task:E164Number" ] }, { "type": "object", "properties": { - "FTPAddress": { + "task:FTPAddress": { "type": "string" } }, "required": [ - "FTPAddress" + "task:FTPAddress" ] }, { "type": "object", "properties": { - "URL": { + "task:URL": { "type": "string" } }, "required": [ - "URL" + "task:URL" ] }, { "type": "object", "properties": { - "FQDN": { + "task:FQDN": { "$ref": "ts_103280_2017_07#/$defs/LongString" } }, "required": [ - "FQDN" + "task:FQDN" ] }, { "type": "object", "properties": { - "EmailAddress": { + "task:EmailAddress": { "$ref": "ts_103280_2017_07#/$defs/EmailAddress" } }, "required": [ - "EmailAddress" + "task:EmailAddress" ] }, { "type": "object", "properties": { - "EndpointID": { + "task:EndpointID": { "$ref": "ts_103120_Core_2019_10#/$defs/EndpointID" } }, "required": [ - "EndpointID" + "task:EndpointID" ] }, { "type": "object", "properties": { - "DeliveryInformationID": { + "task:DeliveryInformationID": { "$ref": "ts_103280_2017_07#/$defs/LongString" } }, "required": [ - "DeliveryInformationID" + "task:DeliveryInformationID" ] } ] diff --git a/103120/schema/json/ts_103120_TrafficPolicy.schema.json b/103120/schema/json/ts_103120_TrafficPolicy.schema.json index 2bbfc17..1d9619e 100644 --- a/103120/schema/json/ts_103120_TrafficPolicy.schema.json +++ b/103120/schema/json/ts_103120_TrafficPolicy.schema.json @@ -136,23 +136,23 @@ { "type": "object", "properties": { - "IPPolicyCriteria": { + "tp:IPPolicyCriteria": { "$ref": "#/$defs/IPPolicyCriteria" } }, "required": [ - "IPPolicyCriteria" + "tp:IPPolicyCriteria" ] }, { "type": "object", "properties": { - "MobileAccessPolicyCriteria": { + "tp:MobileAccessPolicyCriteria": { "$ref": "#/$defs/MobileAccessPolicyCriteria" } }, "required": [ - "MobileAccessPolicyCriteria" + "tp:MobileAccessPolicyCriteria" ] } ] diff --git a/utils/translate/ChoiceMapping.py b/utils/translate/ChoiceMapping.py index fecadf8..b477a33 100644 --- a/utils/translate/ChoiceMapping.py +++ b/utils/translate/ChoiceMapping.py @@ -12,20 +12,25 @@ log = logging.getLogger() class ChoiceMapping(ComplexTypeMapping): @classmethod - def process_choice(cls, choice: XsdGroup, current_ns : str): + def process_choice(cls, choice: XsdGroup, current_ns : str, ns_to_id_map): if choice.model != 'choice': raise Exception(f"Wrong group type: {c.model}") oneOf = [] for c in choice.iter_model(): if not (type(c) is XsdElement): raise Exception (f"Non-element {c} encountered in choice {choice}") + element_name = c.local_name + if c.target_namespace in ns_to_id_map: + ns = ns_to_id_map[c.target_namespace] + if 'prefix' in ns: + element_name = ns['prefix'] + ":" + element_name t = TypeMapping.get_type_from_elem(c, current_ns) oneOf.append({ "type" : "object", "properties" : { - c.local_name : t + element_name : t }, - "required" : [c.local_name] + "required" : [element_name] }) return oneOf @@ -39,4 +44,4 @@ class ChoiceMapping(ComplexTypeMapping): if (content.model != 'choice'): log.debug("Not a choice, giving up") return None - return { 'oneOf' : ChoiceMapping.process_choice(content, xst.namespaces[''])} + return { 'oneOf' : ChoiceMapping.process_choice(content, xst.namespaces[''], self.ns_to_id_map)} diff --git a/utils/translate/SequenceMapping.py b/utils/translate/SequenceMapping.py index 9fd4d69..670a3ba 100644 --- a/utils/translate/SequenceMapping.py +++ b/utils/translate/SequenceMapping.py @@ -70,7 +70,7 @@ class SequenceMapping(ComplexTypeMapping): raise Exception (f"Second group '{element_name}' encountered in {xst}") if c.model != "choice": raise Exception (f"Don't know what to do with inner group {c} in {xst} - not a choice") - inner_choice = ChoiceMapping.process_choice(c, xst.namespaces['']) + inner_choice = ChoiceMapping.process_choice(c, xst.namespaces[''], self.ns_to_id_map) elif type(c) is XsdAnyElement: mapped_type = {} else: diff --git a/utils/xml_to_json.py b/utils/xml_to_json.py index ac32d7e..92a0348 100644 --- a/utils/xml_to_json.py +++ b/utils/xml_to_json.py @@ -29,6 +29,58 @@ def removePrefixes (o, prefixes): for r in replacements: o[r[1]] = o.pop(r[0]) +object_namespaces = { + 'AuthorisationObject' : 'http://uri.etsi.org/03120/common/2020/09/Authorisation', + 'DeliveryObject' : 'http://uri.etsi.org/03120/common/2019/10/Delivery', + 'DocumentObject' : 'http://uri.etsi.org/03120/common/2020/09/Document', + 'NotificationObject' : 'http://uri.etsi.org/03120/common/2016/02/Notification', + 'LITaskObject' : 'http://uri.etsi.org/03120/common/2020/09/Task', + 'LDTaskObject' : 'http://uri.etsi.org/03120/common/2020/09/Task', + 'TrafficPolicyObject' : 'http://uri.etsi.org/03120/common/2022/07/TrafficPolicy', + 'TrafficRuleObject' : 'http://uri.etsi.org/03120/common/2022/07/TrafficPolicy' +} + +coerce_to_list = [ + 'auth:AuthorisationApprovalDetails', + 'auth:AuthorisationFlag', + 'auth:CSPID', + 'common:ApproverContactDetails', + 'ActionRequest', + 'ActionResponse', + 'ListResponseRecord', + 'AssociatedObject', + 'document:DocumentSignature', + 'document:DocumentProperty', + 'notification:AssociatedObjectStatus', + 'task:ApprovalDetails', + 'task:TargetIdentifierValue', + 'task:DeliveryDestination', + 'task:TaskFlag', + 'task:ApprovalDetails', + 'task:ObservedTimes', + 'task:RequestValue', + 'task:RequestSubtype', + 'task:LDDeliveryDestination', + 'task:LDTaskFlag', + 'task:TrafficPolicyReference', + 'tp:TrafficRuleReference', + 'tp:Criteria' +] + +coerce_to_int = [ + 'ActionIdentifier' +] + +def postprocessor (path, key, value): + if key == "@xsi:type": + object_name = value.split(":")[-1] + if object_name in object_namespaces.keys(): + value = "{" + object_namespaces[object_name] + "}" + object_name + return key, value + if key in coerce_to_int: + return key, int(value) + return key, value + if __name__ == "__main__": parser = argparse.ArgumentParser() parser.add_argument('-v', '--verbose', action='count', help='Verbose logging (can be specified multiple times)') @@ -49,12 +101,12 @@ if __name__ == "__main__": args.input.close() logging.debug(s) - # d = xmltodict.parse(s, - # force_list=('AssociatedObject',) - # )['HI1Message'] d = xmltodict.parse(s, - force_list=('AssociatedObject',) + force_list=tuple(coerce_to_list), + # process_namespaces=True, + # namespaces = namespace_prefixes, + postprocessor=postprocessor )['HI1Message'] # prefixes = extract_prefixes(d) -- GitLab From d6e23cee2e5d51190e22114d969fd486ac11334b Mon Sep 17 00:00:00 2001 From: mark Date: Fri, 2 Jun 2023 15:38:06 +0100 Subject: [PATCH 11/22] Fixing doc prefix --- 103120/examples/request3.xml | 2 +- .../json/ts_103120_Document.schema.json | 48 +++++++++---------- utils/translate/SequenceMapping.py | 1 - utils/ts103120_config.json | 2 +- utils/xml_to_json.py | 4 +- 5 files changed, 28 insertions(+), 29 deletions(-) diff --git a/103120/examples/request3.xml b/103120/examples/request3.xml index 718f621..7d9b7c3 100644 --- a/103120/examples/request3.xml +++ b/103120/examples/request3.xml @@ -29,7 +29,7 @@ ACTOR01 W000001 - 2015-09-01T12:00:00Z + 2015-09-01T12:00:00BlahBlahZ 2015-12-01T12:00:00Z diff --git a/103120/schema/json/ts_103120_Document.schema.json b/103120/schema/json/ts_103120_Document.schema.json index f5b850b..afeb421 100644 --- a/103120/schema/json/ts_103120_Document.schema.json +++ b/103120/schema/json/ts_103120_Document.schema.json @@ -33,40 +33,40 @@ "NationalHandlingParameters": { "$ref": "ts_103120_Core_2019_10#/$defs/NationalHandlingParameters" }, - "document:DocumentReference": { + "doc:DocumentReference": { "$ref": "ts_103280_2017_07#/$defs/LongString" }, - "document:DocumentName": { + "doc:DocumentName": { "$ref": "ts_103280_2017_07#/$defs/LongString" }, - "document:DocumentStatus": { + "doc:DocumentStatus": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" }, - "document:DocumentDesiredStatus": { + "doc:DocumentDesiredStatus": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" }, - "document:DocumentTimespan": { + "doc:DocumentTimespan": { "$ref": "#/$defs/DocumentTimespan" }, - "document:DocumentType": { + "doc:DocumentType": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" }, - "document:DocumentProperties": { + "doc:DocumentProperties": { "$ref": "#/$defs/DocumentProperties" }, - "document:DocumentBody": { + "doc:DocumentBody": { "$ref": "#/$defs/DocumentBody" }, - "document:DocumentSignature": { + "doc:DocumentSignature": { "type": "array", "items": { "$ref": "ts_103120_Common_2016_02#/$defs/ApprovalDetails" } }, - "document:DocumentInvalidReason": { + "doc:DocumentInvalidReason": { "$ref": "ts_103120_Core_2019_10#/$defs/ActionUnsuccesfulInformation" }, - "document:NationalDocumentParameters": { + "doc:NationalDocumentParameters": { "$ref": "#/$defs/NationalDocumentParameters" } }, @@ -78,10 +78,10 @@ "DocumentTimespan": { "type": "object", "properties": { - "document:StartTime": { + "doc:StartTime": { "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" }, - "document:EndTime": { + "doc:EndTime": { "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" } }, @@ -90,7 +90,7 @@ "DocumentProperties": { "type": "object", "properties": { - "document:DocumentProperty": { + "doc:DocumentProperty": { "type": "array", "items": { "$ref": "#/$defs/DocumentProperty" @@ -102,32 +102,32 @@ "DocumentProperty": { "type": "object", "properties": { - "document:PropertyType": { + "doc:PropertyType": { "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" }, - "document:PropertyValue": { + "doc:PropertyValue": { "$ref": "ts_103280_2017_07#/$defs/LongString" } }, "required": [ - "document:PropertyType", - "document:PropertyValue" + "doc:PropertyType", + "doc:PropertyValue" ] }, "DocumentBody": { "type": "object", "properties": { - "document:Contents": { + "doc:Contents": { "type": "string", "pattern": "^[-A-Za-z0-9+/]*={0,3}$" }, - "document:ContentType": { + "doc:ContentType": { "$ref": "ts_103280_2017_07#/$defs/ShortString" }, - "document:Checksum": { + "doc:Checksum": { "$ref": "ts_103280_2017_07#/$defs/ShortString" }, - "document:ChecksumType": { + "doc:ChecksumType": { "$ref": "ts_103280_2017_07#/$defs/ShortString" } }, @@ -136,12 +136,12 @@ "NationalDocumentParameters": { "type": "object", "properties": { - "document:CountryCode": { + "doc:CountryCode": { "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" } }, "required": [ - "document:CountryCode" + "doc:CountryCode" ] } } diff --git a/utils/translate/SequenceMapping.py b/utils/translate/SequenceMapping.py index 670a3ba..4dc5c93 100644 --- a/utils/translate/SequenceMapping.py +++ b/utils/translate/SequenceMapping.py @@ -45,7 +45,6 @@ class SequenceMapping(ComplexTypeMapping): inner_choice = None for c in list(content.iter_model()): log.debug(f"Processing model item {c}") - print("Model item -------------") if type(c) is XsdElement: element_name = c.local_name if c.target_namespace in self.ns_to_id_map: diff --git a/utils/ts103120_config.json b/utils/ts103120_config.json index ec32171..d213376 100644 --- a/utils/ts103120_config.json +++ b/utils/ts103120_config.json @@ -12,7 +12,7 @@ "prefix" : "delivery" }, "./103120/schema/ts_103120_Document.xsd" : { - "prefix" : "document" + "prefix" : "doc" }, "./103120/schema/ts_103120_Notification.xsd" : { "prefix" : "notification" diff --git a/utils/xml_to_json.py b/utils/xml_to_json.py index 92a0348..afc0f03 100644 --- a/utils/xml_to_json.py +++ b/utils/xml_to_json.py @@ -49,8 +49,8 @@ coerce_to_list = [ 'ActionResponse', 'ListResponseRecord', 'AssociatedObject', - 'document:DocumentSignature', - 'document:DocumentProperty', + 'doc:DocumentSignature', + 'doc:DocumentProperty', 'notification:AssociatedObjectStatus', 'task:ApprovalDetails', 'task:TargetIdentifierValue', -- GitLab From 6a8c9138968dff21221df0dc530c05e1c31f6004 Mon Sep 17 00:00:00 2001 From: mark Date: Fri, 2 Jun 2023 15:39:05 +0100 Subject: [PATCH 12/22] Fixing XML --- 103120/examples/request3.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/103120/examples/request3.xml b/103120/examples/request3.xml index 7d9b7c3..718f621 100644 --- a/103120/examples/request3.xml +++ b/103120/examples/request3.xml @@ -29,7 +29,7 @@ ACTOR01 W000001 - 2015-09-01T12:00:00BlahBlahZ + 2015-09-01T12:00:00Z 2015-12-01T12:00:00Z -- GitLab From d1ff3d1a0fa58c96efdd0bbd3ae18452f0344766 Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 8 Jun 2023 16:21:38 +0100 Subject: [PATCH 13/22] Changing extensions of interest for CI/CD --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a8ec525..2cee538 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,7 +48,7 @@ generate_artefacts: - echo $CI_MERGE_REQUEST_IID - echo $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME - echo $ARTEFACT_NAME - - forgelib-changedocs -v -d -c -l --startdelimiter coversheets/delimiter_start.docx --enddelimiter coversheets/delimiter_end.docx https://$CI_SERVER_HOST/rep $CI_PROJECT_ID $CI_PROJECT_PATH $CI_MERGE_REQUEST_IID + - forgelib-changedocs -v -d -c -l -x asn -x asn1 -x xml -x xsd -x json --startdelimiter coversheets/delimiter_start.docx --enddelimiter coversheets/delimiter_end.docx https://$CI_SERVER_HOST/rep $CI_PROJECT_ID $CI_PROJECT_PATH $CI_MERGE_REQUEST_IID artifacts: untracked: true paths: -- GitLab From b21e777d5d61c8e1a87efdb44942d74012da6310 Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 8 Jun 2023 16:27:27 +0100 Subject: [PATCH 14/22] Extensions --- .gitlab-ci.yml | 2 +- ...ce_diff_blocks_instead_of_track_changes.docx | Bin 0 -> 36570 bytes 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 Update_artefacts_to_produce_diff_blocks_instead_of_track_changes.docx diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2cee538..bb69914 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,7 +48,7 @@ generate_artefacts: - echo $CI_MERGE_REQUEST_IID - echo $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME - echo $ARTEFACT_NAME - - forgelib-changedocs -v -d -c -l -x asn -x asn1 -x xml -x xsd -x json --startdelimiter coversheets/delimiter_start.docx --enddelimiter coversheets/delimiter_end.docx https://$CI_SERVER_HOST/rep $CI_PROJECT_ID $CI_PROJECT_PATH $CI_MERGE_REQUEST_IID + - forgelib-changedocs -v -d -c -l -x json --startdelimiter coversheets/delimiter_start.docx --enddelimiter coversheets/delimiter_end.docx https://$CI_SERVER_HOST/rep $CI_PROJECT_ID $CI_PROJECT_PATH $CI_MERGE_REQUEST_IID artifacts: untracked: true paths: diff --git a/Update_artefacts_to_produce_diff_blocks_instead_of_track_changes.docx b/Update_artefacts_to_produce_diff_blocks_instead_of_track_changes.docx new file mode 100644 index 0000000000000000000000000000000000000000..74b1d0ec85080a6d16d974d4c00ebabeba589c59 GIT binary patch literal 36570 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
7Y{e@NwfS){SCn9PkabA;tZqUl_K$| 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 IlDj}W0H0VWLjV8( literal 0 HcmV?d00001 -- GitLab From 8d2bfa0b755d638fa0bbc3ddb24ee19482af5876 Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 8 Jun 2023 16:35:51 +0100 Subject: [PATCH 15/22] Reverting CI/CD changes --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bb69914..a8ec525 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,7 +48,7 @@ generate_artefacts: - echo $CI_MERGE_REQUEST_IID - echo $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME - echo $ARTEFACT_NAME - - forgelib-changedocs -v -d -c -l -x json --startdelimiter coversheets/delimiter_start.docx --enddelimiter coversheets/delimiter_end.docx https://$CI_SERVER_HOST/rep $CI_PROJECT_ID $CI_PROJECT_PATH $CI_MERGE_REQUEST_IID + - forgelib-changedocs -v -d -c -l --startdelimiter coversheets/delimiter_start.docx --enddelimiter coversheets/delimiter_end.docx https://$CI_SERVER_HOST/rep $CI_PROJECT_ID $CI_PROJECT_PATH $CI_MERGE_REQUEST_IID artifacts: untracked: true paths: -- GitLab From c61e1409735f75b60400118e52746a5ce76a5471 Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 8 Jun 2023 16:58:43 +0100 Subject: [PATCH 16/22] Removing extra changes --- 103120/examples/fragment.json | 38 -- 103120/examples/fragment.schema.json | 4 - 103120/examples/request1.json | 90 --- 103120/examples/request1b.json | 43 -- 103120/examples/request1c.json | 33 - 103120/examples/request1d.json | 47 -- 103120/schema/json/TS_103_280.schema.json | 389 ------------ .../json/ts_103120_Authorisation.schema.json | 148 ----- .../schema/json/ts_103120_Common.schema.json | 164 ----- 103120/schema/json/ts_103120_Core.schema.json | 590 ----------------- .../json/ts_103120_Delivery.schema.json | 209 ------ .../json/ts_103120_Document.schema.json | 148 ----- .../json/ts_103120_Notification.schema.json | 103 --- 103120/schema/json/ts_103120_Task.schema.json | 599 ------------------ .../json/ts_103120_TrafficPolicy.schema.json | 198 ------ 15 files changed, 2803 deletions(-) delete mode 100644 103120/examples/fragment.json delete mode 100644 103120/examples/fragment.schema.json delete mode 100644 103120/examples/request1.json delete mode 100644 103120/examples/request1b.json delete mode 100644 103120/examples/request1c.json delete mode 100644 103120/examples/request1d.json delete mode 100644 103120/schema/json/TS_103_280.schema.json delete mode 100644 103120/schema/json/ts_103120_Authorisation.schema.json delete mode 100644 103120/schema/json/ts_103120_Common.schema.json delete mode 100644 103120/schema/json/ts_103120_Core.schema.json delete mode 100644 103120/schema/json/ts_103120_Delivery.schema.json delete mode 100644 103120/schema/json/ts_103120_Document.schema.json delete mode 100644 103120/schema/json/ts_103120_Notification.schema.json delete mode 100644 103120/schema/json/ts_103120_Task.schema.json delete mode 100644 103120/schema/json/ts_103120_TrafficPolicy.schema.json diff --git a/103120/examples/fragment.json b/103120/examples/fragment.json deleted file mode 100644 index 44f2f88..0000000 --- a/103120/examples/fragment.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "@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": { - "IPv4Address": "192.0.2.0" - } - }] - }, - "task:CSPID": { - "CountryCode": "XX", - "UniqueIdentifier": "RECVER01" - } - -} \ No newline at end of file diff --git a/103120/examples/fragment.schema.json b/103120/examples/fragment.schema.json deleted file mode 100644 index afb21c1..0000000 --- a/103120/examples/fragment.schema.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "$id": "ts_103120_Task_2020_09", - "$ref" : "#/$defs/RequestPayload" -} \ No newline at end of file diff --git a/103120/examples/request1.json b/103120/examples/request1.json deleted file mode 100644 index d5c90ab..0000000 --- a/103120/examples/request1.json +++ /dev/null @@ -1,90 +0,0 @@ -{ - "@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", - "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": "auth: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": "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" - } - } - } - } - ] - } - } - } -} \ No newline at end of file diff --git a/103120/examples/request1b.json b/103120/examples/request1b.json deleted file mode 100644 index 82b1a1e..0000000 --- a/103120/examples/request1b.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "Header": { - "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", - "AuthorisationReference": "W000001", - "AuthorisationTimespan": { - "StartTime": "2015-09-01T12:00:00Z", - "EndTime": "2015-12-01T12:00:00Z" - } - } - } - } - ] - } - } - } -} \ No newline at end of file diff --git a/103120/examples/request1c.json b/103120/examples/request1c.json deleted file mode 100644 index 645f706..0000000 --- a/103120/examples/request1c.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "Header": { - "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": 1, - "GET": { - "Identifier" : "c02358b2-76cf-4ba4-a8eb-f6436ccaea2e" - } - } - ] - } - } - } -} \ No newline at end of file diff --git a/103120/examples/request1d.json b/103120/examples/request1d.json deleted file mode 100644 index bf34f7f..0000000 --- a/103120/examples/request1d.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "Header" : { - "SenderIdentifier" : { - "CountryCode" : "XX", - "UniqueIdentifier" : "ACTOR01" - }, - "ReceiverIdentifier" : { - "CountryCode" : "YY", - "UniqueIdentifier" : "ACTOR02" - }, - "TransactionIdentifier" : "c4a09046-61da-485b-83f2-ca12caebf40b", - "Timestamp" : "2022-06-10T15:50:00.000000Z", - "Version" : { - "ETSIVersion" : "V1.11.2", - "NationalProfileOwner" : "NA", - "NationalProfileVersion" : "NA" - } - }, - "Payload" : { - "ResponsePayload" : { - "ActionResponses" : { - "ActionResponse" : [{ - "ActionIdentifier" : 0, - "CREATEResponse" : { - "Identifier" : "f25dec16-927c-433b-959c-1886182cac58", - "HI1Object" : { - "xsiType" : "{http://uri.etsi.org/03120/common/2020/09/Task}LITaskObject", - "ObjectIdentifier" : "d980e335-d17a-471f-bb40-cddf4457fd6b", - "Reference" : "LIID", - "TargetIdentifier" : { - "TargetIdentifierValues" : { - "TargetIdentifierValue" : [ { - "FormatType" : { - "FormatOwner" : "ETSI", - "FormatName" : "InternationalE164" - }, - "Value" : "447700900123" - } ] - } - } - } - } - }] - } - } - } -} diff --git a/103120/schema/json/TS_103_280.schema.json b/103120/schema/json/TS_103_280.schema.json deleted file mode 100644 index 02cd078..0000000 --- a/103120/schema/json/TS_103_280.schema.json +++ /dev/null @@ -1,389 +0,0 @@ -{ - "$id": "ts_103280_2017_07", - "$defs": { - "ShortString": { - "type": "string", - "maxLength": 255 - }, - "LongString": { - "type": "string", - "maxLength": 65535 - }, - "LIID": { - "type": "string", - "pattern": "^([!-~]{1,25})|([0-9a-f]{26,50})$" - }, - "UTCDateTime": { - "type": "string", - "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z$" - }, - "UTCMicrosecondDateTime": { - "type": "string", - "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}\\.[0-9]{6}Z$" - }, - "QualifiedDateTime": { - "type": "string", - "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}(Z|[+-][0-9]{2}:[0-9]{2})$" - }, - "QualifiedMicrosecondDateTime": { - "type": "string", - "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}\\.[0-9]{6}(Z|[+-][0-9]{2}:[0-9]{2})$" - }, - "InternationalE164": { - "type": "string", - "pattern": "^[0-9]{1,15}$" - }, - "IMSI": { - "type": "string", - "pattern": "^[0-9]{6,15}$" - }, - "IMEI": { - "type": "string", - "pattern": "^[0-9]{14}$" - }, - "IMEICheckDigit": { - "type": "string", - "pattern": "^[0-9]{15}$" - }, - "IMEISV": { - "type": "string", - "pattern": "^[0-9]{16}$" - }, - "IPv4Address": { - "type": "string", - "pattern": "^((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])$" - }, - "IPv4CIDR": { - "type": "string", - "pattern": "^((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])/([1-2]?[0-9]|3[0-2])$" - }, - "IPv6Address": { - "type": "string", - "pattern": "^([0-9a-f]{4}:){7}([0-9a-f]{4})$" - }, - "IPv6CIDR": { - "type": "string", - "pattern": "^([0-9a-f]{4}:){7}([0-9a-f]{4})/(([1-9][0-9]?)|(1[0-1][0-9])|(12[0-8]))$" - }, - "TCPPort": { - "type": "integer", - "exclusiveMinimum": 1, - "maximum": 65535 - }, - "UDPPort": { - "type": "integer", - "minimum": 0, - "maximum": 65535 - }, - "MACAddress": { - "type": "string", - "pattern": "^([a-f0-9]{2}:){5}[a-f0-9]{2}$" - }, - "EmailAddress": { - "allOf": [ - { - "$ref": "#/$defs/ShortString" - }, - { - "type": "string", - "pattern": "^[a-zA-Z0-9\\.!#$%&'\\*\\+\\\\/=\\?\\^_`\\{\\|\\}~\\-]+@[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(\\.[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$" - } - ] - }, - "UUID": { - "type": "string", - "pattern": "^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$" - }, - "ISOCountryCode": { - "type": "string", - "pattern": "^[A-Z]{2}$" - }, - "SIPURI": { - "type": "string", - "pattern": "^sips?:[a-zA-Z0-9!#$&-;=?-\\[\\]_~%]+$" - }, - "TELURI": { - "type": "string", - "pattern": "^tel:[a-zA-Z0-9!#$&-;=?-\\[\\]_~%]+$" - }, - "WGS84LatitudeDecimal": { - "type": "string", - "pattern": "^[NS][0-9]{2}\\.[0-9]{6}$" - }, - "WGS84LongitudeDecimal": { - "type": "string", - "pattern": "^[EW][0-9]{3}\\.[0-9]{6}$" - }, - "WGS84LatitudeAngular": { - "type": "string", - "pattern": "^[NS][0-9]{6}\\.[0-9]{2}$" - }, - "WGS84LongitudeAngular": { - "type": "string", - "pattern": "^[EW][0-9]{7}\\.[0-9]{2}$" - }, - "SUPIIMSI": { - "$ref": "#/$defs/IMSI" - }, - "SUPINAI": { - "$ref": "#/$defs/NAI" - }, - "SUCI": { - "type": "string", - "pattern": "^([a-fA-F0-9]{2})*$" - }, - "PEIIMEI": { - "$ref": "#/$defs/IMEI" - }, - "PEIIMEICheckDigit": { - "$ref": "#/$defs/IMEICheckDigit" - }, - "PEIIMEISV": { - "$ref": "#/$defs/IMEISV" - }, - "GPSIMSISDN": { - "type": "string", - "pattern": "^[0-9]{1,15}$" - }, - "GPSINAI": { - "$ref": "#/$defs/NAI" - }, - "NAI": { - "type": "string" - }, - "LDID": { - "type": "string", - "pattern": "^([A-Z]{2}-.+-.+)$" - }, - "InternationalizedEmailAddress": { - "allOf": [ - { - "$ref": "#/$defs/ShortString" - }, - { - "type": "string", - "pattern": "^.+@.+$" - } - ] - }, - "EUI64": { - "type": "string", - "pattern": "^([a-f0-9]{2}:){7}[a-f0-9]{2}$" - }, - "CGI": { - "type": "string", - "pattern": "^[0-9]{3}-[0-9]{2,3}-[a-f0-9]{4}-[a-f0-9]{4}$" - }, - "ECGI": { - "type": "string", - "pattern": "^[0-9]{3}-[0-9]{2,3}-[a-f0-9]{7}$" - }, - "NCGI": { - "type": "string", - "pattern": "^[0-9]{3}-[0-9]{2,3}-[a-f0-9]{9}$" - }, - "ICCID": { - "type": "string", - "pattern": "^[0-9]{19,20}$" - }, - "IPProtocol": { - "type": "integer", - "minimum": 0, - "maximum": 255 - }, - "IPAddress": { - "oneOf": [ - { - "type": "object", - "properties": { - "etsi280:IPv4Address": { - "$ref": "#/$defs/IPv4Address" - } - }, - "required": [ - "etsi280:IPv4Address" - ] - }, - { - "type": "object", - "properties": { - "etsi280:IPv6Address": { - "$ref": "#/$defs/IPv6Address" - } - }, - "required": [ - "etsi280:IPv6Address" - ] - } - ] - }, - "IPCIDR": { - "oneOf": [ - { - "type": "object", - "properties": { - "etsi280:IPv4CIDR": { - "$ref": "#/$defs/IPv4CIDR" - } - }, - "required": [ - "etsi280:IPv4CIDR" - ] - }, - { - "type": "object", - "properties": { - "etsi280:IPv6CIDR": { - "$ref": "#/$defs/IPv6CIDR" - } - }, - "required": [ - "etsi280:IPv6CIDR" - ] - } - ] - }, - "TCPPortRange": { - "type": "object", - "properties": { - "etsi280:start": { - "$ref": "#/$defs/TCPPort" - }, - "etsi280:end": { - "$ref": "#/$defs/TCPPort" - } - }, - "required": [ - "etsi280:start", - "etsi280:end" - ] - }, - "UDPPortRange": { - "type": "object", - "properties": { - "etsi280:start": { - "$ref": "#/$defs/UDPPort" - }, - "etsi280:end": { - "$ref": "#/$defs/UDPPort" - } - }, - "required": [ - "etsi280:start", - "etsi280:end" - ] - }, - "Port": { - "oneOf": [ - { - "type": "object", - "properties": { - "etsi280:TCPPort": { - "$ref": "#/$defs/TCPPort" - } - }, - "required": [ - "etsi280:TCPPort" - ] - }, - { - "type": "object", - "properties": { - "etsi280:UDPPort": { - "$ref": "#/$defs/UDPPort" - } - }, - "required": [ - "etsi280:UDPPort" - ] - } - ] - }, - "PortRange": { - "oneOf": [ - { - "type": "object", - "properties": { - "etsi280:TCPPortRange": { - "$ref": "#/$defs/TCPPortRange" - } - }, - "required": [ - "etsi280:TCPPortRange" - ] - }, - { - "type": "object", - "properties": { - "etsi280:UDPPortRange": { - "$ref": "#/$defs/UDPPortRange" - } - }, - "required": [ - "etsi280:UDPPortRange" - ] - } - ] - }, - "IPAddressPort": { - "type": "object", - "properties": { - "etsi280:address": { - "$ref": "#/$defs/IPAddress" - }, - "etsi280:port": { - "$ref": "#/$defs/Port" - } - }, - "required": [ - "etsi280:address", - "etsi280:port" - ] - }, - "IPAddressPortRange": { - "type": "object", - "properties": { - "etsi280:address": { - "$ref": "#/$defs/IPAddress" - }, - "etsi280:portRange": { - "$ref": "#/$defs/PortRange" - } - }, - "required": [ - "etsi280:address", - "etsi280:portRange" - ] - }, - "WGS84CoordinateDecimal": { - "type": "object", - "properties": { - "etsi280:latitude": { - "$ref": "#/$defs/WGS84LatitudeDecimal" - }, - "etsi280:longitude": { - "$ref": "#/$defs/WGS84LongitudeDecimal" - } - }, - "required": [ - "etsi280:latitude", - "etsi280:longitude" - ] - }, - "WGS84CoordinateAngular": { - "type": "object", - "properties": { - "etsi280:latitude": { - "$ref": "#/$defs/WGS84LatitudeAngular" - }, - "etsi280:longitude": { - "$ref": "#/$defs/WGS84LongitudeAngular" - } - }, - "required": [ - "etsi280:latitude", - "etsi280:longitude" - ] - } - } -} \ No newline at end of file diff --git a/103120/schema/json/ts_103120_Authorisation.schema.json b/103120/schema/json/ts_103120_Authorisation.schema.json deleted file mode 100644 index 1c9a68f..0000000 --- a/103120/schema/json/ts_103120_Authorisation.schema.json +++ /dev/null @@ -1,148 +0,0 @@ -{ - "$id": "ts_103120_Authorisation_2020_09", - "$defs": { - "AuthorisationObject": { - "type": "object", - "properties": { - "@xsi:type": { - "type": "string", - "enum": "{http://uri.etsi.org/03120/common/2020/09/Authorisation}AuthorisationObject" - }, - "ObjectIdentifier": { - "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" - }, - "CountryCode": { - "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" - }, - "OwnerIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - }, - "Generation": { - "type": "integer", - "minimum": 0 - }, - "ExternalIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "AssociatedObjects": { - "$ref": "ts_103120_Core_2019_10#/$defs/AssociatedObjects" - }, - "LastChanged": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "NationalHandlingParameters": { - "$ref": "ts_103120_Core_2019_10#/$defs/NationalHandlingParameters" - }, - "auth:AuthorisationReference": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "auth:AuthorisationLegalType": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "auth:AuthorisationPriority": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "auth:AuthorisationStatus": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "auth:AuthorisationDesiredStatus": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "auth:AuthorisationTimespan": { - "$ref": "#/$defs/AuthorisationTimespan" - }, - "auth:AuthorisationCSPID": { - "$ref": "#/$defs/AuthorisationCSPID" - }, - "auth:AuthorisationCreationTimestamp": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "auth:AuthorisationServedTimestamp": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "auth:AuthorisationTerminationTimestamp": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "auth:AuthorisationApprovalDetails": { - "type": "array", - "items": { - "$ref": "ts_103120_Common_2016_02#/$defs/ApprovalDetails" - } - }, - "auth:AuthorisationInvalidReason": { - "$ref": "ts_103120_Core_2019_10#/$defs/ActionUnsuccesfulInformation" - }, - "auth:AuthorisationFlags": { - "$ref": "#/$defs/AuthorisationFlags" - }, - "auth:AuthorisationManualInformation": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "auth:NationalAuthorisationParameters": { - "$ref": "#/$defs/NationalAuthorisationParameters" - }, - "auth:AuthorisationJurisdiction": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "auth:AuthorisationTypeOfCase": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "auth:AuthorisationLegalEntity": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - } - }, - "required": [ - "@xsi:type", - "ObjectIdentifier" - ] - }, - "AuthorisationFlags": { - "type": "object", - "properties": { - "auth:AuthorisationFlag": { - "type": "array", - "items": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - } - } - }, - "required": [] - }, - "AuthorisationTimespan": { - "type": "object", - "properties": { - "auth:StartTime": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "auth:EndTime": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - } - }, - "required": [] - }, - "AuthorisationCSPID": { - "type": "object", - "properties": { - "auth:CSPID": { - "type": "array", - "items": { - "$ref": "ts_103120_Core_2019_10#/$defs/EndpointID" - }, - "minItems": 1 - } - }, - "required": [] - }, - "NationalAuthorisationParameters": { - "type": "object", - "properties": { - "auth:CountryCode": { - "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" - } - }, - "required": [ - "auth:CountryCode" - ] - } - } -} \ No newline at end of file diff --git a/103120/schema/json/ts_103120_Common.schema.json b/103120/schema/json/ts_103120_Common.schema.json deleted file mode 100644 index d11b4b4..0000000 --- a/103120/schema/json/ts_103120_Common.schema.json +++ /dev/null @@ -1,164 +0,0 @@ -{ - "$id": "ts_103120_Common_2016_02", - "$defs": { - "ETSIVersion": { - "allOf": [ - { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - }, - { - "type": "string", - "pattern": "^V\\d+\\.\\d+\\.\\d+$" - } - ] - }, - "DictionaryEntry": { - "type": "object", - "properties": { - "common:Owner": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - }, - "common:Name": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - }, - "common:Value": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - } - }, - "required": [ - "common:Owner", - "common:Name", - "common:Value" - ] - }, - "ApprovalDetails": { - "type": "object", - "properties": { - "common:ApprovalType": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "common:ApprovalDescription": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "common:ApprovalReference": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "common:ApproverDetails": { - "$ref": "#/$defs/ApproverDetails" - }, - "common:ApprovalTimestamp": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "common:ApprovalIsEmergency": { - "type": "boolean" - }, - "common:ApprovalDigitalSignature": { - "$ref": "#/$defs/ApprovalDigitalSignature" - }, - "common:ApprovalNationalDetails": { - "$ref": "#/$defs/ApprovalNationalDetails" - } - }, - "required": [] - }, - "ApproverDetails": { - "type": "object", - "properties": { - "common:ApproverName": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "common:ApproverRole": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "common:ApproverIdentity": { - "$ref": "#/$defs/ApproverIdentity" - }, - "common:ApproverContactDetails": { - "type": "array", - "items": { - "$ref": "#/$defs/ApproverContactDetails" - } - } - }, - "required": [] - }, - "ApproverIdentity": { - "oneOf": [ - { - "type": "object", - "properties": { - "common:NationalApproverIdentity": { - "$ref": "#/$defs/NationalApproverIdentity" - } - }, - "required": [ - "common:NationalApproverIdentity" - ] - } - ] - }, - "ApproverContactDetails": { - "type": "object", - "properties": { - "common:ApproverAlternateName": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "common:ApproverEmailAddress": { - "$ref": "ts_103280_2017_07#/$defs/InternationalizedEmailAddress" - }, - "common:ApproverPhoneNumber": { - "$ref": "ts_103280_2017_07#/$defs/InternationalE164" - } - }, - "required": [] - }, - "NationalApproverIdentity": { - "type": "object", - "properties": { - "common:CountryCode": { - "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" - } - }, - "required": [ - "common:CountryCode" - ] - }, - "ApprovalDigitalSignature": { - "oneOf": [ - { - "type": "object", - "properties": { - "common:NationalDigitalSignature": { - "$ref": "#/$defs/NationalDigitalSignature" - } - }, - "required": [ - "common:NationalDigitalSignature" - ] - } - ] - }, - "ApprovalNationalDetails": { - "type": "object", - "properties": { - "common:CountryCode": { - "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" - } - }, - "required": [ - "common:CountryCode" - ] - }, - "NationalDigitalSignature": { - "type": "object", - "properties": { - "common:CountryCode": { - "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" - } - }, - "required": [ - "common:CountryCode" - ] - } - } -} \ No newline at end of file diff --git a/103120/schema/json/ts_103120_Core.schema.json b/103120/schema/json/ts_103120_Core.schema.json deleted file mode 100644 index f116d31..0000000 --- a/103120/schema/json/ts_103120_Core.schema.json +++ /dev/null @@ -1,590 +0,0 @@ -{ - "$id": "ts_103120_Core_2019_10", - "$defs": { - "ObjectIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/UUID" - }, - "HI1Message": { - "type": "object", - "properties": { - "Header": { - "$ref": "#/$defs/MessageHeader" - }, - "Payload": { - "$ref": "#/$defs/MessagePayload" - }, - "Signature": {}, - "xmldsig:Signature": { - "$ref": "www.w3.org_2000_09_xmldsig##/$defs/SignatureType" - } - }, - "required": [ - "Header", - "Payload" - ] - }, - "MessageHeader": { - "type": "object", - "properties": { - "SenderIdentifier": { - "$ref": "#/$defs/EndpointID" - }, - "ReceiverIdentifier": { - "$ref": "#/$defs/EndpointID" - }, - "TransactionIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/UUID" - }, - "Timestamp": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedMicrosecondDateTime" - }, - "Version": { - "$ref": "#/$defs/Version" - } - }, - "required": [ - "SenderIdentifier", - "ReceiverIdentifier", - "TransactionIdentifier", - "Timestamp", - "Version" - ] - }, - "Version": { - "type": "object", - "properties": { - "ETSIVersion": { - "$ref": "ts_103120_Common_2016_02#/$defs/ETSIVersion" - }, - "NationalProfileOwner": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - }, - "NationalProfileVersion": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - } - }, - "required": [ - "ETSIVersion", - "NationalProfileOwner", - "NationalProfileVersion" - ] - }, - "EndpointID": { - "type": "object", - "properties": { - "CountryCode": { - "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" - }, - "UniqueIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - } - }, - "required": [ - "CountryCode", - "UniqueIdentifier" - ] - }, - "MessagePayload": { - "oneOf": [ - { - "type": "object", - "properties": { - "RequestPayload": { - "$ref": "#/$defs/RequestPayload" - } - }, - "required": [ - "RequestPayload" - ] - }, - { - "type": "object", - "properties": { - "ResponsePayload": { - "$ref": "#/$defs/ResponsePayload" - } - }, - "required": [ - "ResponsePayload" - ] - } - ] - }, - "RequestPayload": { - "type": "object", - "properties": { - "ActionRequests": { - "$ref": "#/$defs/ActionRequests" - } - }, - "required": [ - "ActionRequests" - ] - }, - "ActionRequests": { - "type": "object", - "properties": { - "ActionRequest": { - "type": "array", - "items": { - "$ref": "#/$defs/ActionRequest" - }, - "minItems": 1 - } - }, - "required": [] - }, - "ResponsePayload": { - "oneOf": [ - { - "type": "object", - "properties": { - "ActionResponses": { - "$ref": "#/$defs/ActionResponses" - } - }, - "required": [ - "ActionResponses" - ] - }, - { - "type": "object", - "properties": { - "ErrorInformation": { - "$ref": "#/$defs/ActionUnsuccesfulInformation" - } - }, - "required": [ - "ErrorInformation" - ] - } - ] - }, - "ActionResponses": { - "type": "object", - "properties": { - "ActionResponse": { - "type": "array", - "items": { - "$ref": "#/$defs/ActionResponse" - }, - "minItems": 1 - } - }, - "required": [] - }, - "ActionRequest": { - "allOf": [ - { - "type": "object", - "properties": { - "ActionIdentifier": { - "type": "integer", - "minimum": 0 - } - }, - "required": [ - "ActionIdentifier" - ] - }, - { - "oneOf": [ - { - "type": "object", - "properties": { - "GET": { - "$ref": "#/$defs/GETRequest" - } - }, - "required": [ - "GET" - ] - }, - { - "type": "object", - "properties": { - "CREATE": { - "$ref": "#/$defs/CREATERequest" - } - }, - "required": [ - "CREATE" - ] - }, - { - "type": "object", - "properties": { - "UPDATE": { - "$ref": "#/$defs/UPDATERequest" - } - }, - "required": [ - "UPDATE" - ] - }, - { - "type": "object", - "properties": { - "LIST": { - "$ref": "#/$defs/LISTRequest" - } - }, - "required": [ - "LIST" - ] - }, - { - "type": "object", - "properties": { - "DELIVER": { - "$ref": "#/$defs/DELIVERRequest" - } - }, - "required": [ - "DELIVER" - ] - } - ] - } - ] - }, - "ActionResponse": { - "allOf": [ - { - "type": "object", - "properties": { - "ActionIdentifier": { - "type": "integer", - "minimum": 0 - } - }, - "required": [ - "ActionIdentifier" - ] - }, - { - "oneOf": [ - { - "type": "object", - "properties": { - "GETResponse": { - "$ref": "#/$defs/GETResponse" - } - }, - "required": [ - "GETResponse" - ] - }, - { - "type": "object", - "properties": { - "CREATEResponse": { - "$ref": "#/$defs/CREATEResponse" - } - }, - "required": [ - "CREATEResponse" - ] - }, - { - "type": "object", - "properties": { - "UPDATEResponse": { - "$ref": "#/$defs/UPDATEResponse" - } - }, - "required": [ - "UPDATEResponse" - ] - }, - { - "type": "object", - "properties": { - "LISTResponse": { - "$ref": "#/$defs/LISTResponse" - } - }, - "required": [ - "LISTResponse" - ] - }, - { - "type": "object", - "properties": { - "ErrorInformation": { - "$ref": "#/$defs/ActionUnsuccesfulInformation" - } - }, - "required": [ - "ErrorInformation" - ] - }, - { - "type": "object", - "properties": { - "DELIVERResponse": { - "$ref": "#/$defs/DELIVERResponse" - } - }, - "required": [ - "DELIVERResponse" - ] - } - ] - } - ] - }, - "GETRequest": { - "type": "object", - "properties": { - "Identifier": { - "$ref": "#/$defs/ObjectIdentifier" - } - }, - "required": [ - "Identifier" - ] - }, - "GETResponse": { - "type": "object", - "properties": { - "HI1Object": { - "$ref": "#/$defs/ConcreteHI1Object" - } - }, - "required": [ - "HI1Object" - ] - }, - "CREATERequest": { - "type": "object", - "properties": { - "HI1Object": { - "$ref": "#/$defs/ConcreteHI1Object" - } - }, - "required": [ - "HI1Object" - ] - }, - "CREATEResponse": { - "type": "object", - "properties": { - "Identifier": { - "$ref": "#/$defs/ObjectIdentifier" - }, - "HI1Object": { - "$ref": "#/$defs/ConcreteHI1Object" - } - }, - "required": [ - "Identifier" - ] - }, - "UPDATERequest": { - "type": "object", - "properties": { - "HI1Object": { - "$ref": "#/$defs/ConcreteHI1Object" - } - }, - "required": [ - "HI1Object" - ] - }, - "UPDATEResponse": { - "type": "object", - "properties": { - "Identifier": { - "$ref": "#/$defs/ObjectIdentifier" - }, - "HI1Object": { - "$ref": "#/$defs/ConcreteHI1Object" - } - }, - "required": [ - "Identifier" - ] - }, - "LISTRequest": { - "type": "object", - "properties": { - "ObjectType": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "LastChanged": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - } - }, - "required": [] - }, - "LISTResponse": { - "type": "object", - "properties": { - "ListResponseRecord": { - "type": "array", - "items": { - "$ref": "#/$defs/ListResponseRecord" - } - } - }, - "required": [] - }, - "ListResponseRecord": { - "type": "object", - "properties": { - "ObjectType": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "Identifier": { - "$ref": "#/$defs/ObjectIdentifier" - }, - "CountryCode": { - "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" - }, - "OwnerIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - }, - "Generation": { - "type": "integer", - "minimum": 0 - }, - "ExternalIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "LastChanged": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - } - }, - "required": [ - "ObjectType", - "Identifier", - "Generation" - ] - }, - "ActionUnsuccesfulInformation": { - "type": "object", - "properties": { - "ErrorCode": { - "type": "integer", - "minimum": 0 - }, - "ErrorDescription": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - } - }, - "required": [ - "ErrorCode", - "ErrorDescription" - ] - }, - "DELIVERRequest": { - "type": "object", - "properties": { - "Identifier": { - "$ref": "#/$defs/ObjectIdentifier" - }, - "HI1Object": { - "$ref": "#/$defs/ConcreteHI1Object" - } - }, - "required": [ - "Identifier", - "HI1Object" - ] - }, - "DELIVERResponse": { - "type": "object", - "properties": { - "Identifier": { - "$ref": "#/$defs/ObjectIdentifier" - } - }, - "required": [ - "Identifier" - ] - }, - "HI1Object": { - "type": "object", - "properties": { - "ObjectIdentifier": { - "$ref": "#/$defs/ObjectIdentifier" - }, - "CountryCode": { - "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" - }, - "OwnerIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - }, - "Generation": { - "type": "integer", - "minimum": 0 - }, - "ExternalIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "AssociatedObjects": { - "$ref": "#/$defs/AssociatedObjects" - }, - "LastChanged": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "NationalHandlingParameters": { - "$ref": "#/$defs/NationalHandlingParameters" - } - }, - "required": [ - "ObjectIdentifier" - ] - }, - "AssociatedObjects": { - "type": "object", - "properties": { - "AssociatedObject": { - "type": "array", - "items": { - "$ref": "#/$defs/ObjectIdentifier" - } - } - }, - "required": [] - }, - "NationalHandlingParameters": { - "type": "object", - "properties": { - "CountryCode": { - "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" - } - }, - "required": [ - "CountryCode" - ] - }, - "ConcreteHI1Object": { - "oneOf": [ - { - "$ref": "ts_103120_Authorisation_2020_09#/$defs/AuthorisationObject" - }, - { - "$ref": "ts_103120_Task_2020_09#/$defs/LITaskObject" - }, - { - "$ref": "ts_103120_Task_2020_09#/$defs/LDTaskObject" - }, - { - "$ref": "ts_103120_Document_2020_09#/$defs/DocumentObject" - }, - { - "$ref": "ts_103120_Notification_2016_02#/$defs/NotificationObject" - }, - { - "$ref": "ts_103120_Delivery_2019_10#/$defs/DeliveryObject" - }, - { - "$ref": "ts_103120_TrafficPolicy_2022_07#/$defs/TrafficPolicyObject" - } - ] - } - }, - "$ref": "#/$defs/HI1Message" -} \ No newline at end of file diff --git a/103120/schema/json/ts_103120_Delivery.schema.json b/103120/schema/json/ts_103120_Delivery.schema.json deleted file mode 100644 index 9cfceae..0000000 --- a/103120/schema/json/ts_103120_Delivery.schema.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "$id": "ts_103120_Delivery_2019_10", - "$defs": { - "DeliveryObject": { - "type": "object", - "properties": { - "@xsi:type": { - "type": "string", - "enum": "{http://uri.etsi.org/03120/common/2019/10/Delivery}DeliveryObject" - }, - "ObjectIdentifier": { - "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" - }, - "CountryCode": { - "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" - }, - "OwnerIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - }, - "Generation": { - "type": "integer", - "minimum": 0 - }, - "ExternalIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "AssociatedObjects": { - "$ref": "ts_103120_Core_2019_10#/$defs/AssociatedObjects" - }, - "LastChanged": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "NationalHandlingParameters": { - "$ref": "ts_103120_Core_2019_10#/$defs/NationalHandlingParameters" - }, - "delivery:Reference": { - "$ref": "#/$defs/Reference" - }, - "delivery:DeliveryID": { - "$ref": "ts_103280_2017_07#/$defs/UUID" - }, - "delivery:SequenceNumber": { - "type": "integer", - "minimum": 0 - }, - "delivery:LastSequence": { - "type": "boolean" - }, - "delivery:Manifest": { - "$ref": "#/$defs/Manifest" - }, - "delivery:Delivery": { - "$ref": "#/$defs/Delivery" - } - }, - "required": [ - "@xsi:type", - "ObjectIdentifier" - ] - }, - "Reference": { - "oneOf": [ - { - "type": "object", - "properties": { - "delivery:LDID": { - "$ref": "ts_103280_2017_07#/$defs/LDID" - } - }, - "required": [ - "delivery:LDID" - ] - }, - { - "type": "object", - "properties": { - "delivery:LIID": { - "$ref": "ts_103280_2017_07#/$defs/LIID" - } - }, - "required": [ - "delivery:LIID" - ] - } - ] - }, - "Manifest": { - "oneOf": [ - { - "type": "object", - "properties": { - "delivery:Specification": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - } - }, - "required": [ - "delivery:Specification" - ] - }, - { - "type": "object", - "properties": { - "delivery:ExternalSchema": { - "$ref": "#/$defs/ExternalSchema" - } - }, - "required": [ - "delivery:ExternalSchema" - ] - } - ] - }, - "ExternalSchema": { - "type": "object", - "properties": { - "delivery:ManifestID": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "delivery:ManifestContents": { - "$ref": "#/$defs/ManifestContents" - } - }, - "required": [] - }, - "ManifestContents": { - "oneOf": [ - { - "type": "object", - "properties": { - "delivery:BinaryData": { - "$ref": "#/$defs/EmbeddedBinaryData" - } - }, - "required": [ - "delivery:BinaryData" - ] - }, - { - "type": "object", - "properties": { - "delivery:XMLSchema": { - "$ref": "#/$defs/SchemaContent" - } - }, - "required": [ - "delivery:XMLSchema" - ] - } - ] - }, - "SchemaContent": { - "type": "object", - "properties": { - "delivery:schema": {} - }, - "required": [ - "delivery:schema" - ] - }, - "Delivery": { - "oneOf": [ - { - "type": "object", - "properties": { - "delivery:BinaryData": { - "$ref": "#/$defs/EmbeddedBinaryData" - } - }, - "required": [ - "delivery:BinaryData" - ] - }, - { - "type": "object", - "properties": { - "delivery:XMLData": { - "$ref": "#/$defs/EmbeddedXMLData" - } - }, - "required": [ - "delivery:XMLData" - ] - } - ] - }, - "EmbeddedBinaryData": { - "type": "object", - "properties": { - "delivery:Data": { - "type": "string", - "pattern": "^[-A-Za-z0-9+/]*={0,3}$" - }, - "delivery:ContentType": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - }, - "delivery:Checksum": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - }, - "delivery:ChecksumType": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - } - }, - "required": [ - "delivery:Data" - ] - }, - "EmbeddedXMLData": {} - } -} \ No newline at end of file diff --git a/103120/schema/json/ts_103120_Document.schema.json b/103120/schema/json/ts_103120_Document.schema.json deleted file mode 100644 index afeb421..0000000 --- a/103120/schema/json/ts_103120_Document.schema.json +++ /dev/null @@ -1,148 +0,0 @@ -{ - "$id": "ts_103120_Document_2020_09", - "$defs": { - "DocumentObject": { - "type": "object", - "properties": { - "@xsi:type": { - "type": "string", - "enum": "{http://uri.etsi.org/03120/common/2020/09/Document}DocumentObject" - }, - "ObjectIdentifier": { - "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" - }, - "CountryCode": { - "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" - }, - "OwnerIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - }, - "Generation": { - "type": "integer", - "minimum": 0 - }, - "ExternalIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "AssociatedObjects": { - "$ref": "ts_103120_Core_2019_10#/$defs/AssociatedObjects" - }, - "LastChanged": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "NationalHandlingParameters": { - "$ref": "ts_103120_Core_2019_10#/$defs/NationalHandlingParameters" - }, - "doc:DocumentReference": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "doc:DocumentName": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "doc:DocumentStatus": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "doc:DocumentDesiredStatus": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "doc:DocumentTimespan": { - "$ref": "#/$defs/DocumentTimespan" - }, - "doc:DocumentType": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "doc:DocumentProperties": { - "$ref": "#/$defs/DocumentProperties" - }, - "doc:DocumentBody": { - "$ref": "#/$defs/DocumentBody" - }, - "doc:DocumentSignature": { - "type": "array", - "items": { - "$ref": "ts_103120_Common_2016_02#/$defs/ApprovalDetails" - } - }, - "doc:DocumentInvalidReason": { - "$ref": "ts_103120_Core_2019_10#/$defs/ActionUnsuccesfulInformation" - }, - "doc:NationalDocumentParameters": { - "$ref": "#/$defs/NationalDocumentParameters" - } - }, - "required": [ - "@xsi:type", - "ObjectIdentifier" - ] - }, - "DocumentTimespan": { - "type": "object", - "properties": { - "doc:StartTime": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "doc:EndTime": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - } - }, - "required": [] - }, - "DocumentProperties": { - "type": "object", - "properties": { - "doc:DocumentProperty": { - "type": "array", - "items": { - "$ref": "#/$defs/DocumentProperty" - } - } - }, - "required": [] - }, - "DocumentProperty": { - "type": "object", - "properties": { - "doc:PropertyType": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "doc:PropertyValue": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - } - }, - "required": [ - "doc:PropertyType", - "doc:PropertyValue" - ] - }, - "DocumentBody": { - "type": "object", - "properties": { - "doc:Contents": { - "type": "string", - "pattern": "^[-A-Za-z0-9+/]*={0,3}$" - }, - "doc:ContentType": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - }, - "doc:Checksum": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - }, - "doc:ChecksumType": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - } - }, - "required": [] - }, - "NationalDocumentParameters": { - "type": "object", - "properties": { - "doc:CountryCode": { - "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" - } - }, - "required": [ - "doc:CountryCode" - ] - } - } -} \ No newline at end of file diff --git a/103120/schema/json/ts_103120_Notification.schema.json b/103120/schema/json/ts_103120_Notification.schema.json deleted file mode 100644 index 84fbf04..0000000 --- a/103120/schema/json/ts_103120_Notification.schema.json +++ /dev/null @@ -1,103 +0,0 @@ -{ - "$id": "ts_103120_Notification_2016_02", - "$defs": { - "NotificationObject": { - "type": "object", - "properties": { - "@xsi:type": { - "type": "string", - "enum": "{http://uri.etsi.org/03120/common/2016/02/Notification}NotificationObject" - }, - "ObjectIdentifier": { - "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" - }, - "CountryCode": { - "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" - }, - "OwnerIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - }, - "Generation": { - "type": "integer", - "minimum": 0 - }, - "ExternalIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "AssociatedObjects": { - "$ref": "ts_103120_Core_2019_10#/$defs/AssociatedObjects" - }, - "LastChanged": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "NationalHandlingParameters": { - "$ref": "ts_103120_Core_2019_10#/$defs/NationalHandlingParameters" - }, - "notification:NotificationDetails": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "notification:NotificationType": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "notification:NewNotification": { - "type": "boolean" - }, - "notification:NotificationTimestamp": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "notification:StatusOfAssociatedObjects": { - "$ref": "#/$defs/ListOfAssociatedObjectStatus" - }, - "notification:NationalNotificationParameters": { - "$ref": "#/$defs/NationalNotificationParameters" - } - }, - "required": [ - "@xsi:type", - "ObjectIdentifier" - ] - }, - "ListOfAssociatedObjectStatus": { - "type": "object", - "properties": { - "notification:AssociatedObjectStatus": { - "type": "array", - "items": { - "$ref": "#/$defs/AssociatedObjectStatus" - }, - "minItems": 1 - } - }, - "required": [] - }, - "AssociatedObjectStatus": { - "type": "object", - "properties": { - "notification:AssociatedObject": { - "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" - }, - "notification:Status": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "notification:Details": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - } - }, - "required": [ - "notification:AssociatedObject", - "notification:Status" - ] - }, - "NationalNotificationParameters": { - "type": "object", - "properties": { - "notification:CountryCode": { - "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" - } - }, - "required": [ - "notification:CountryCode" - ] - } - } -} \ No newline at end of file diff --git a/103120/schema/json/ts_103120_Task.schema.json b/103120/schema/json/ts_103120_Task.schema.json deleted file mode 100644 index 24de4c5..0000000 --- a/103120/schema/json/ts_103120_Task.schema.json +++ /dev/null @@ -1,599 +0,0 @@ -{ - "$id": "ts_103120_Task_2020_09", - "$defs": { - "LITaskObject": { - "type": "object", - "properties": { - "@xsi:type": { - "type": "string", - "enum": "{http://uri.etsi.org/03120/common/2020/09/Task}LITaskObject" - }, - "ObjectIdentifier": { - "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" - }, - "CountryCode": { - "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" - }, - "OwnerIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - }, - "Generation": { - "type": "integer", - "minimum": 0 - }, - "ExternalIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "AssociatedObjects": { - "$ref": "ts_103120_Core_2019_10#/$defs/AssociatedObjects" - }, - "LastChanged": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "NationalHandlingParameters": { - "$ref": "ts_103120_Core_2019_10#/$defs/NationalHandlingParameters" - }, - "task:Reference": { - "$ref": "ts_103280_2017_07#/$defs/LIID" - }, - "task:Status": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "task:DesiredStatus": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "task:Timespan": { - "$ref": "#/$defs/TaskTimespan" - }, - "task:TargetIdentifier": { - "$ref": "#/$defs/TargetIdentifier" - }, - "task:DeliveryType": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "task:DeliveryDetails": { - "$ref": "#/$defs/TaskDeliveryDetails" - }, - "task:ApprovalDetails": { - "type": "array", - "items": { - "$ref": "ts_103120_Common_2016_02#/$defs/ApprovalDetails" - } - }, - "task:CSPID": { - "$ref": "ts_103120_Core_2019_10#/$defs/EndpointID" - }, - "task:HandlingProfile": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "task:InvalidReason": { - "$ref": "ts_103120_Core_2019_10#/$defs/ActionUnsuccesfulInformation" - }, - "task:Flags": { - "$ref": "#/$defs/TaskFlags" - }, - "task:NationalLITaskingParameters": { - "$ref": "#/$defs/NationalLITaskingParameters" - }, - "task:ListOfTrafficPolicyReferences": { - "$ref": "#/$defs/ListOfTrafficPolicyReferences" - } - }, - "required": [ - "@xsi:type", - "ObjectIdentifier" - ] - }, - "TaskTimespan": { - "type": "object", - "properties": { - "task:StartTime": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "task:EndTime": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "task:TerminationTime": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "task:ProvisioningTime": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "task:DeprovisioningTime": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - } - }, - "required": [] - }, - "TargetIdentifier": { - "type": "object", - "properties": { - "task:TargetIdentifierValues": { - "$ref": "#/$defs/TargetIdentifierValues" - }, - "task:ServiceType": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - } - }, - "required": [] - }, - "TargetIdentifierValues": { - "type": "object", - "properties": { - "task:TargetIdentifierValue": { - "type": "array", - "items": { - "$ref": "#/$defs/TargetIdentifierValue" - }, - "minItems": 1 - } - }, - "required": [] - }, - "TargetIdentifierValue": { - "type": "object", - "properties": { - "task:FormatType": { - "$ref": "#/$defs/FormatType" - }, - "task:Value": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - } - }, - "required": [ - "task:FormatType", - "task:Value" - ] - }, - "FormatType": { - "type": "object", - "properties": { - "task:FormatOwner": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - }, - "task:FormatName": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - } - }, - "required": [ - "task:FormatOwner", - "task:FormatName" - ] - }, - "TaskDeliveryDetails": { - "type": "object", - "properties": { - "task:DeliveryDestination": { - "type": "array", - "items": { - "$ref": "#/$defs/DeliveryDestination" - }, - "minItems": 1 - } - }, - "required": [] - }, - "DeliveryDestination": { - "type": "object", - "properties": { - "task:DeliveryAddress": { - "$ref": "#/$defs/DeliveryAddress" - }, - "task:EncryptionDetails": { - "$ref": "#/$defs/NationalEncryptionDetails" - }, - "task:IRIorCC": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "task:HandoverFormat": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "task:DeliveryProfile": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "task:NationalDeliveryParameters": { - "$ref": "#/$defs/NationalDeliveryParameters" - } - }, - "required": [] - }, - "DeliveryAddress": { - "oneOf": [ - { - "type": "object", - "properties": { - "task:IPv4Address": { - "$ref": "ts_103280_2017_07#/$defs/IPv4Address" - } - }, - "required": [ - "task:IPv4Address" - ] - }, - { - "type": "object", - "properties": { - "task:IPv6Address": { - "$ref": "ts_103280_2017_07#/$defs/IPv6Address" - } - }, - "required": [ - "task:IPv6Address" - ] - }, - { - "type": "object", - "properties": { - "task:IPAddressPort": { - "$ref": "ts_103280_2017_07#/$defs/IPAddressPort" - } - }, - "required": [ - "task:IPAddressPort" - ] - }, - { - "type": "object", - "properties": { - "task:IPAddressPortRange": { - "$ref": "ts_103280_2017_07#/$defs/IPAddressPortRange" - } - }, - "required": [ - "task:IPAddressPortRange" - ] - }, - { - "type": "object", - "properties": { - "task:E164Number": { - "$ref": "ts_103280_2017_07#/$defs/InternationalE164" - } - }, - "required": [ - "task:E164Number" - ] - }, - { - "type": "object", - "properties": { - "task:FTPAddress": { - "type": "string" - } - }, - "required": [ - "task:FTPAddress" - ] - }, - { - "type": "object", - "properties": { - "task:URL": { - "type": "string" - } - }, - "required": [ - "task:URL" - ] - }, - { - "type": "object", - "properties": { - "task:FQDN": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - } - }, - "required": [ - "task:FQDN" - ] - }, - { - "type": "object", - "properties": { - "task:EmailAddress": { - "$ref": "ts_103280_2017_07#/$defs/EmailAddress" - } - }, - "required": [ - "task:EmailAddress" - ] - }, - { - "type": "object", - "properties": { - "task:EndpointID": { - "$ref": "ts_103120_Core_2019_10#/$defs/EndpointID" - } - }, - "required": [ - "task:EndpointID" - ] - }, - { - "type": "object", - "properties": { - "task:DeliveryInformationID": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - } - }, - "required": [ - "task:DeliveryInformationID" - ] - } - ] - }, - "TaskFlags": { - "type": "object", - "properties": { - "task:TaskFlag": { - "type": "array", - "items": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - } - } - }, - "required": [] - }, - "NationalLITaskingParameters": { - "type": "object", - "properties": { - "task:CountryCode": { - "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" - } - }, - "required": [ - "task:CountryCode" - ] - }, - "NationalDeliveryParameters": { - "type": "object", - "properties": { - "task:CountryCode": { - "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" - } - }, - "required": [ - "task:CountryCode" - ] - }, - "NationalEncryptionDetails": { - "type": "object", - "properties": { - "task:CountryCode": { - "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" - } - }, - "required": [ - "task:CountryCode" - ] - }, - "LDTaskObject": { - "type": "object", - "properties": { - "@xsi:type": { - "type": "string", - "enum": "{http://uri.etsi.org/03120/common/2020/09/Task}LDTaskObject" - }, - "ObjectIdentifier": { - "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" - }, - "CountryCode": { - "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" - }, - "OwnerIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - }, - "Generation": { - "type": "integer", - "minimum": 0 - }, - "ExternalIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "AssociatedObjects": { - "$ref": "ts_103120_Core_2019_10#/$defs/AssociatedObjects" - }, - "LastChanged": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "NationalHandlingParameters": { - "$ref": "ts_103120_Core_2019_10#/$defs/NationalHandlingParameters" - }, - "task:Reference": { - "$ref": "ts_103280_2017_07#/$defs/LDID" - }, - "task:Status": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "task:StatusReason": { - "$ref": "ts_103120_Core_2019_10#/$defs/ActionUnsuccesfulInformation" - }, - "task:DesiredStatus": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "task:RequestDetails": { - "$ref": "#/$defs/RequestDetails" - }, - "task:DeliveryDetails": { - "$ref": "#/$defs/LDDeliveryDetails" - }, - "task:ApprovalDetails": { - "type": "array", - "items": { - "$ref": "ts_103120_Common_2016_02#/$defs/ApprovalDetails" - } - }, - "task:CSPID": { - "$ref": "ts_103120_Core_2019_10#/$defs/EndpointID" - }, - "task:HandlingProfile": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "task:Flags": { - "$ref": "#/$defs/LDTaskFlags" - }, - "task:NationalLDTaskingParameters": { - "$ref": "#/$defs/NationalLDTaskingParameters" - } - }, - "required": [ - "@xsi:type", - "ObjectIdentifier" - ] - }, - "RequestDetails": { - "type": "object", - "properties": { - "task:Type": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "task:StartTime": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "task:EndTime": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "task:ObservedTime": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "task:ObservedTimes": { - "type": "array", - "items": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - } - }, - "task:RequestValues": { - "$ref": "#/$defs/RequestValues" - }, - "task:Subtype": { - "$ref": "#/$defs/RequestSubtype" - } - }, - "required": [] - }, - "RequestValues": { - "type": "object", - "properties": { - "task:RequestValue": { - "type": "array", - "items": { - "$ref": "#/$defs/RequestValue" - }, - "minItems": 1 - } - }, - "required": [] - }, - "RequestValue": { - "type": "object", - "properties": { - "task:FormatType": { - "$ref": "#/$defs/FormatType" - }, - "task:Value": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - } - }, - "required": [ - "task:FormatType", - "task:Value" - ] - }, - "RequestSubtype": { - "type": "object", - "properties": { - "task:RequestSubtype": { - "type": "array", - "items": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "minItems": 1 - } - }, - "required": [] - }, - "LDDeliveryDetails": { - "type": "object", - "properties": { - "task:LDDeliveryDestination": { - "type": "array", - "items": { - "$ref": "#/$defs/LDDeliveryDestination" - }, - "minItems": 1 - } - }, - "required": [] - }, - "LDDeliveryDestination": { - "type": "object", - "properties": { - "task:DeliveryAddress": { - "$ref": "#/$defs/DeliveryAddress" - }, - "task:EncryptionDetails": { - "$ref": "#/$defs/NationalEncryptionDetails" - }, - "task:LDHandoverFormat": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "task:LDDeliveryProfile": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "task:NationalDeliveryParameters": { - "$ref": "#/$defs/NationalDeliveryParameters" - } - }, - "required": [] - }, - "LDTaskFlags": { - "type": "object", - "properties": { - "task:LDTaskFlag": { - "type": "array", - "items": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - } - } - }, - "required": [] - }, - "NationalLDTaskingParameters": { - "type": "object", - "properties": { - "task:CountryCode": { - "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" - } - }, - "required": [ - "task:CountryCode" - ] - }, - "ListOfTrafficPolicyReferences": { - "type": "object", - "properties": { - "task:TrafficPolicyReference": { - "type": "array", - "items": { - "$ref": "#/$defs/TrafficPolicyReference" - }, - "minItems": 1 - } - }, - "required": [] - }, - "TrafficPolicyReference": { - "type": "object", - "properties": { - "task:Order": { - "type": "integer", - "minimum": 1 - }, - "task:ObjectIdentifier": { - "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" - } - }, - "required": [] - } - } -} \ No newline at end of file diff --git a/103120/schema/json/ts_103120_TrafficPolicy.schema.json b/103120/schema/json/ts_103120_TrafficPolicy.schema.json deleted file mode 100644 index 1d9619e..0000000 --- a/103120/schema/json/ts_103120_TrafficPolicy.schema.json +++ /dev/null @@ -1,198 +0,0 @@ -{ - "$id": "ts_103120_TrafficPolicy_2022_07", - "$defs": { - "TrafficPolicyObject": { - "type": "object", - "properties": { - "@xsi:type": { - "type": "string", - "enum": "{http://uri.etsi.org/03120/common/2022/07/TrafficPolicy}TrafficPolicyObject" - }, - "ObjectIdentifier": { - "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" - }, - "CountryCode": { - "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" - }, - "OwnerIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - }, - "Generation": { - "type": "integer", - "minimum": 0 - }, - "ExternalIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "AssociatedObjects": { - "$ref": "ts_103120_Core_2019_10#/$defs/AssociatedObjects" - }, - "LastChanged": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "NationalHandlingParameters": { - "$ref": "ts_103120_Core_2019_10#/$defs/NationalHandlingParameters" - }, - "tp:TrafficPolicyName": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - }, - "tp:TrafficRules": { - "$ref": "#/$defs/ListOfTrafficRuleReferences" - } - }, - "required": [ - "@xsi:type", - "ObjectIdentifier" - ] - }, - "ListOfTrafficRuleReferences": { - "type": "object", - "properties": { - "tp:TrafficRuleReference": { - "type": "array", - "items": { - "$ref": "#/$defs/TrafficRuleReference" - }, - "minItems": 1 - } - }, - "required": [] - }, - "TrafficRuleReference": { - "type": "object", - "properties": { - "tp:Order": { - "type": "integer", - "minimum": 1 - }, - "tp:ObjectIdentifier": { - "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" - } - }, - "required": [ - "tp:Order", - "tp:ObjectIdentifier" - ] - }, - "TrafficRuleObject": { - "type": "object", - "properties": { - "@xsi:type": { - "type": "string", - "enum": "{http://uri.etsi.org/03120/common/2022/07/TrafficPolicy}TrafficRuleObject" - }, - "ObjectIdentifier": { - "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" - }, - "CountryCode": { - "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" - }, - "OwnerIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - }, - "Generation": { - "type": "integer", - "minimum": 0 - }, - "ExternalIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "AssociatedObjects": { - "$ref": "ts_103120_Core_2019_10#/$defs/AssociatedObjects" - }, - "LastChanged": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "NationalHandlingParameters": { - "$ref": "ts_103120_Core_2019_10#/$defs/NationalHandlingParameters" - }, - "tp:Criteria": { - "$ref": "#/$defs/ListOfTrafficCriteria" - }, - "tp:Action": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - } - }, - "required": [ - "@xsi:type", - "ObjectIdentifier" - ] - }, - "ListOfTrafficCriteria": { - "type": "object", - "properties": { - "tp:Criteria": { - "type": "array", - "items": { - "$ref": "#/$defs/TrafficCriteria" - }, - "minItems": 1 - } - }, - "required": [] - }, - "TrafficCriteria": { - "oneOf": [ - { - "type": "object", - "properties": { - "tp:IPPolicyCriteria": { - "$ref": "#/$defs/IPPolicyCriteria" - } - }, - "required": [ - "tp:IPPolicyCriteria" - ] - }, - { - "type": "object", - "properties": { - "tp:MobileAccessPolicyCriteria": { - "$ref": "#/$defs/MobileAccessPolicyCriteria" - } - }, - "required": [ - "tp:MobileAccessPolicyCriteria" - ] - } - ] - }, - "IPPolicyCriteria": { - "type": "object", - "properties": { - "tp:IPProtocol": { - "type": "integer", - "minimum": 0 - }, - "tp:SourceIPRange": { - "$ref": "ts_103280_2017_07#/$defs/IPCIDR" - }, - "tp:SourcePortRange": { - "$ref": "ts_103280_2017_07#/$defs/PortRange" - }, - "tp:DestinationIPRange": { - "$ref": "ts_103280_2017_07#/$defs/IPCIDR" - }, - "tp:DestinationPortRange": { - "$ref": "ts_103280_2017_07#/$defs/PortRange" - }, - "tp:BothDirections": { - "type": "boolean" - } - }, - "required": [] - }, - "MobileAccessPolicyCriteria": { - "type": "object", - "properties": { - "tp:APN": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - }, - "tp:DNN": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - } - }, - "required": [] - } - } -} \ No newline at end of file -- GitLab From c59057ecc287494c907a905636e8002c7c1dc082 Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 8 Jun 2023 16:59:13 +0100 Subject: [PATCH 17/22] Removing artefact --- ...ce_diff_blocks_instead_of_track_changes.docx | Bin 36570 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Update_artefacts_to_produce_diff_blocks_instead_of_track_changes.docx diff --git a/Update_artefacts_to_produce_diff_blocks_instead_of_track_changes.docx b/Update_artefacts_to_produce_diff_blocks_instead_of_track_changes.docx deleted file mode 100644 index 74b1d0ec85080a6d16d974d4c00ebabeba589c59..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36570 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
7Y{e@NwfS){SCn9PkabA;tZqUl_K$| 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 IlDj}W0H0VWLjV8( -- GitLab From b10726b4584d9f54a1ffeaab2a535281ff004a55 Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 8 Jun 2023 16:59:34 +0100 Subject: [PATCH 18/22] Removing extra schema fragment --- utils/request.fragment.schema.json | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 utils/request.fragment.schema.json diff --git a/utils/request.fragment.schema.json b/utils/request.fragment.schema.json deleted file mode 100644 index dc2bb14..0000000 --- a/utils/request.fragment.schema.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "$id": "fragment_request", - "$ref" : "#/$defs/RequestPayload" -} \ No newline at end of file -- GitLab From 11906096a48e1d5b50769216269e3e2e03978f6f Mon Sep 17 00:00:00 2001 From: mark Date: Fri, 9 Jun 2023 10:55:42 +0100 Subject: [PATCH 19/22] Fixing regex --- 103120/schema/json/TS_103_280.schema.json | 389 ++++++++++++ .../json/ts_103120_Authorisation.schema.json | 148 +++++ .../schema/json/ts_103120_Common.schema.json | 164 +++++ 103120/schema/json/ts_103120_Core.schema.json | 590 +++++++++++++++++ .../json/ts_103120_Delivery.schema.json | 209 ++++++ .../json/ts_103120_Document.schema.json | 148 +++++ .../json/ts_103120_Notification.schema.json | 103 +++ 103120/schema/json/ts_103120_Task.schema.json | 599 ++++++++++++++++++ .../json/ts_103120_TrafficPolicy.schema.json | 198 ++++++ 103280/TS_103_280.schema.json | 80 +-- utils/translate/TypeMapping.py | 6 +- utils/xml_to_json.py | 14 +- 12 files changed, 2599 insertions(+), 49 deletions(-) create mode 100644 103120/schema/json/TS_103_280.schema.json create mode 100644 103120/schema/json/ts_103120_Authorisation.schema.json create mode 100644 103120/schema/json/ts_103120_Common.schema.json create mode 100644 103120/schema/json/ts_103120_Core.schema.json create mode 100644 103120/schema/json/ts_103120_Delivery.schema.json create mode 100644 103120/schema/json/ts_103120_Document.schema.json create mode 100644 103120/schema/json/ts_103120_Notification.schema.json create mode 100644 103120/schema/json/ts_103120_Task.schema.json create mode 100644 103120/schema/json/ts_103120_TrafficPolicy.schema.json diff --git a/103120/schema/json/TS_103_280.schema.json b/103120/schema/json/TS_103_280.schema.json new file mode 100644 index 0000000..02cd078 --- /dev/null +++ b/103120/schema/json/TS_103_280.schema.json @@ -0,0 +1,389 @@ +{ + "$id": "ts_103280_2017_07", + "$defs": { + "ShortString": { + "type": "string", + "maxLength": 255 + }, + "LongString": { + "type": "string", + "maxLength": 65535 + }, + "LIID": { + "type": "string", + "pattern": "^([!-~]{1,25})|([0-9a-f]{26,50})$" + }, + "UTCDateTime": { + "type": "string", + "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z$" + }, + "UTCMicrosecondDateTime": { + "type": "string", + "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}\\.[0-9]{6}Z$" + }, + "QualifiedDateTime": { + "type": "string", + "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}(Z|[+-][0-9]{2}:[0-9]{2})$" + }, + "QualifiedMicrosecondDateTime": { + "type": "string", + "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}\\.[0-9]{6}(Z|[+-][0-9]{2}:[0-9]{2})$" + }, + "InternationalE164": { + "type": "string", + "pattern": "^[0-9]{1,15}$" + }, + "IMSI": { + "type": "string", + "pattern": "^[0-9]{6,15}$" + }, + "IMEI": { + "type": "string", + "pattern": "^[0-9]{14}$" + }, + "IMEICheckDigit": { + "type": "string", + "pattern": "^[0-9]{15}$" + }, + "IMEISV": { + "type": "string", + "pattern": "^[0-9]{16}$" + }, + "IPv4Address": { + "type": "string", + "pattern": "^((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])$" + }, + "IPv4CIDR": { + "type": "string", + "pattern": "^((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])/([1-2]?[0-9]|3[0-2])$" + }, + "IPv6Address": { + "type": "string", + "pattern": "^([0-9a-f]{4}:){7}([0-9a-f]{4})$" + }, + "IPv6CIDR": { + "type": "string", + "pattern": "^([0-9a-f]{4}:){7}([0-9a-f]{4})/(([1-9][0-9]?)|(1[0-1][0-9])|(12[0-8]))$" + }, + "TCPPort": { + "type": "integer", + "exclusiveMinimum": 1, + "maximum": 65535 + }, + "UDPPort": { + "type": "integer", + "minimum": 0, + "maximum": 65535 + }, + "MACAddress": { + "type": "string", + "pattern": "^([a-f0-9]{2}:){5}[a-f0-9]{2}$" + }, + "EmailAddress": { + "allOf": [ + { + "$ref": "#/$defs/ShortString" + }, + { + "type": "string", + "pattern": "^[a-zA-Z0-9\\.!#$%&'\\*\\+\\\\/=\\?\\^_`\\{\\|\\}~\\-]+@[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(\\.[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$" + } + ] + }, + "UUID": { + "type": "string", + "pattern": "^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$" + }, + "ISOCountryCode": { + "type": "string", + "pattern": "^[A-Z]{2}$" + }, + "SIPURI": { + "type": "string", + "pattern": "^sips?:[a-zA-Z0-9!#$&-;=?-\\[\\]_~%]+$" + }, + "TELURI": { + "type": "string", + "pattern": "^tel:[a-zA-Z0-9!#$&-;=?-\\[\\]_~%]+$" + }, + "WGS84LatitudeDecimal": { + "type": "string", + "pattern": "^[NS][0-9]{2}\\.[0-9]{6}$" + }, + "WGS84LongitudeDecimal": { + "type": "string", + "pattern": "^[EW][0-9]{3}\\.[0-9]{6}$" + }, + "WGS84LatitudeAngular": { + "type": "string", + "pattern": "^[NS][0-9]{6}\\.[0-9]{2}$" + }, + "WGS84LongitudeAngular": { + "type": "string", + "pattern": "^[EW][0-9]{7}\\.[0-9]{2}$" + }, + "SUPIIMSI": { + "$ref": "#/$defs/IMSI" + }, + "SUPINAI": { + "$ref": "#/$defs/NAI" + }, + "SUCI": { + "type": "string", + "pattern": "^([a-fA-F0-9]{2})*$" + }, + "PEIIMEI": { + "$ref": "#/$defs/IMEI" + }, + "PEIIMEICheckDigit": { + "$ref": "#/$defs/IMEICheckDigit" + }, + "PEIIMEISV": { + "$ref": "#/$defs/IMEISV" + }, + "GPSIMSISDN": { + "type": "string", + "pattern": "^[0-9]{1,15}$" + }, + "GPSINAI": { + "$ref": "#/$defs/NAI" + }, + "NAI": { + "type": "string" + }, + "LDID": { + "type": "string", + "pattern": "^([A-Z]{2}-.+-.+)$" + }, + "InternationalizedEmailAddress": { + "allOf": [ + { + "$ref": "#/$defs/ShortString" + }, + { + "type": "string", + "pattern": "^.+@.+$" + } + ] + }, + "EUI64": { + "type": "string", + "pattern": "^([a-f0-9]{2}:){7}[a-f0-9]{2}$" + }, + "CGI": { + "type": "string", + "pattern": "^[0-9]{3}-[0-9]{2,3}-[a-f0-9]{4}-[a-f0-9]{4}$" + }, + "ECGI": { + "type": "string", + "pattern": "^[0-9]{3}-[0-9]{2,3}-[a-f0-9]{7}$" + }, + "NCGI": { + "type": "string", + "pattern": "^[0-9]{3}-[0-9]{2,3}-[a-f0-9]{9}$" + }, + "ICCID": { + "type": "string", + "pattern": "^[0-9]{19,20}$" + }, + "IPProtocol": { + "type": "integer", + "minimum": 0, + "maximum": 255 + }, + "IPAddress": { + "oneOf": [ + { + "type": "object", + "properties": { + "etsi280:IPv4Address": { + "$ref": "#/$defs/IPv4Address" + } + }, + "required": [ + "etsi280:IPv4Address" + ] + }, + { + "type": "object", + "properties": { + "etsi280:IPv6Address": { + "$ref": "#/$defs/IPv6Address" + } + }, + "required": [ + "etsi280:IPv6Address" + ] + } + ] + }, + "IPCIDR": { + "oneOf": [ + { + "type": "object", + "properties": { + "etsi280:IPv4CIDR": { + "$ref": "#/$defs/IPv4CIDR" + } + }, + "required": [ + "etsi280:IPv4CIDR" + ] + }, + { + "type": "object", + "properties": { + "etsi280:IPv6CIDR": { + "$ref": "#/$defs/IPv6CIDR" + } + }, + "required": [ + "etsi280:IPv6CIDR" + ] + } + ] + }, + "TCPPortRange": { + "type": "object", + "properties": { + "etsi280:start": { + "$ref": "#/$defs/TCPPort" + }, + "etsi280:end": { + "$ref": "#/$defs/TCPPort" + } + }, + "required": [ + "etsi280:start", + "etsi280:end" + ] + }, + "UDPPortRange": { + "type": "object", + "properties": { + "etsi280:start": { + "$ref": "#/$defs/UDPPort" + }, + "etsi280:end": { + "$ref": "#/$defs/UDPPort" + } + }, + "required": [ + "etsi280:start", + "etsi280:end" + ] + }, + "Port": { + "oneOf": [ + { + "type": "object", + "properties": { + "etsi280:TCPPort": { + "$ref": "#/$defs/TCPPort" + } + }, + "required": [ + "etsi280:TCPPort" + ] + }, + { + "type": "object", + "properties": { + "etsi280:UDPPort": { + "$ref": "#/$defs/UDPPort" + } + }, + "required": [ + "etsi280:UDPPort" + ] + } + ] + }, + "PortRange": { + "oneOf": [ + { + "type": "object", + "properties": { + "etsi280:TCPPortRange": { + "$ref": "#/$defs/TCPPortRange" + } + }, + "required": [ + "etsi280:TCPPortRange" + ] + }, + { + "type": "object", + "properties": { + "etsi280:UDPPortRange": { + "$ref": "#/$defs/UDPPortRange" + } + }, + "required": [ + "etsi280:UDPPortRange" + ] + } + ] + }, + "IPAddressPort": { + "type": "object", + "properties": { + "etsi280:address": { + "$ref": "#/$defs/IPAddress" + }, + "etsi280:port": { + "$ref": "#/$defs/Port" + } + }, + "required": [ + "etsi280:address", + "etsi280:port" + ] + }, + "IPAddressPortRange": { + "type": "object", + "properties": { + "etsi280:address": { + "$ref": "#/$defs/IPAddress" + }, + "etsi280:portRange": { + "$ref": "#/$defs/PortRange" + } + }, + "required": [ + "etsi280:address", + "etsi280:portRange" + ] + }, + "WGS84CoordinateDecimal": { + "type": "object", + "properties": { + "etsi280:latitude": { + "$ref": "#/$defs/WGS84LatitudeDecimal" + }, + "etsi280:longitude": { + "$ref": "#/$defs/WGS84LongitudeDecimal" + } + }, + "required": [ + "etsi280:latitude", + "etsi280:longitude" + ] + }, + "WGS84CoordinateAngular": { + "type": "object", + "properties": { + "etsi280:latitude": { + "$ref": "#/$defs/WGS84LatitudeAngular" + }, + "etsi280:longitude": { + "$ref": "#/$defs/WGS84LongitudeAngular" + } + }, + "required": [ + "etsi280:latitude", + "etsi280:longitude" + ] + } + } +} \ No newline at end of file diff --git a/103120/schema/json/ts_103120_Authorisation.schema.json b/103120/schema/json/ts_103120_Authorisation.schema.json new file mode 100644 index 0000000..1c9a68f --- /dev/null +++ b/103120/schema/json/ts_103120_Authorisation.schema.json @@ -0,0 +1,148 @@ +{ + "$id": "ts_103120_Authorisation_2020_09", + "$defs": { + "AuthorisationObject": { + "type": "object", + "properties": { + "@xsi:type": { + "type": "string", + "enum": "{http://uri.etsi.org/03120/common/2020/09/Authorisation}AuthorisationObject" + }, + "ObjectIdentifier": { + "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" + }, + "CountryCode": { + "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" + }, + "OwnerIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + }, + "Generation": { + "type": "integer", + "minimum": 0 + }, + "ExternalIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "AssociatedObjects": { + "$ref": "ts_103120_Core_2019_10#/$defs/AssociatedObjects" + }, + "LastChanged": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "NationalHandlingParameters": { + "$ref": "ts_103120_Core_2019_10#/$defs/NationalHandlingParameters" + }, + "auth:AuthorisationReference": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "auth:AuthorisationLegalType": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "auth:AuthorisationPriority": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "auth:AuthorisationStatus": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "auth:AuthorisationDesiredStatus": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "auth:AuthorisationTimespan": { + "$ref": "#/$defs/AuthorisationTimespan" + }, + "auth:AuthorisationCSPID": { + "$ref": "#/$defs/AuthorisationCSPID" + }, + "auth:AuthorisationCreationTimestamp": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "auth:AuthorisationServedTimestamp": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "auth:AuthorisationTerminationTimestamp": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "auth:AuthorisationApprovalDetails": { + "type": "array", + "items": { + "$ref": "ts_103120_Common_2016_02#/$defs/ApprovalDetails" + } + }, + "auth:AuthorisationInvalidReason": { + "$ref": "ts_103120_Core_2019_10#/$defs/ActionUnsuccesfulInformation" + }, + "auth:AuthorisationFlags": { + "$ref": "#/$defs/AuthorisationFlags" + }, + "auth:AuthorisationManualInformation": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "auth:NationalAuthorisationParameters": { + "$ref": "#/$defs/NationalAuthorisationParameters" + }, + "auth:AuthorisationJurisdiction": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "auth:AuthorisationTypeOfCase": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "auth:AuthorisationLegalEntity": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + } + }, + "required": [ + "@xsi:type", + "ObjectIdentifier" + ] + }, + "AuthorisationFlags": { + "type": "object", + "properties": { + "auth:AuthorisationFlag": { + "type": "array", + "items": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + } + } + }, + "required": [] + }, + "AuthorisationTimespan": { + "type": "object", + "properties": { + "auth:StartTime": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "auth:EndTime": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + } + }, + "required": [] + }, + "AuthorisationCSPID": { + "type": "object", + "properties": { + "auth:CSPID": { + "type": "array", + "items": { + "$ref": "ts_103120_Core_2019_10#/$defs/EndpointID" + }, + "minItems": 1 + } + }, + "required": [] + }, + "NationalAuthorisationParameters": { + "type": "object", + "properties": { + "auth:CountryCode": { + "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" + } + }, + "required": [ + "auth:CountryCode" + ] + } + } +} \ No newline at end of file diff --git a/103120/schema/json/ts_103120_Common.schema.json b/103120/schema/json/ts_103120_Common.schema.json new file mode 100644 index 0000000..d11b4b4 --- /dev/null +++ b/103120/schema/json/ts_103120_Common.schema.json @@ -0,0 +1,164 @@ +{ + "$id": "ts_103120_Common_2016_02", + "$defs": { + "ETSIVersion": { + "allOf": [ + { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + }, + { + "type": "string", + "pattern": "^V\\d+\\.\\d+\\.\\d+$" + } + ] + }, + "DictionaryEntry": { + "type": "object", + "properties": { + "common:Owner": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + }, + "common:Name": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + }, + "common:Value": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + } + }, + "required": [ + "common:Owner", + "common:Name", + "common:Value" + ] + }, + "ApprovalDetails": { + "type": "object", + "properties": { + "common:ApprovalType": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "common:ApprovalDescription": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "common:ApprovalReference": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "common:ApproverDetails": { + "$ref": "#/$defs/ApproverDetails" + }, + "common:ApprovalTimestamp": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "common:ApprovalIsEmergency": { + "type": "boolean" + }, + "common:ApprovalDigitalSignature": { + "$ref": "#/$defs/ApprovalDigitalSignature" + }, + "common:ApprovalNationalDetails": { + "$ref": "#/$defs/ApprovalNationalDetails" + } + }, + "required": [] + }, + "ApproverDetails": { + "type": "object", + "properties": { + "common:ApproverName": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "common:ApproverRole": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "common:ApproverIdentity": { + "$ref": "#/$defs/ApproverIdentity" + }, + "common:ApproverContactDetails": { + "type": "array", + "items": { + "$ref": "#/$defs/ApproverContactDetails" + } + } + }, + "required": [] + }, + "ApproverIdentity": { + "oneOf": [ + { + "type": "object", + "properties": { + "common:NationalApproverIdentity": { + "$ref": "#/$defs/NationalApproverIdentity" + } + }, + "required": [ + "common:NationalApproverIdentity" + ] + } + ] + }, + "ApproverContactDetails": { + "type": "object", + "properties": { + "common:ApproverAlternateName": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "common:ApproverEmailAddress": { + "$ref": "ts_103280_2017_07#/$defs/InternationalizedEmailAddress" + }, + "common:ApproverPhoneNumber": { + "$ref": "ts_103280_2017_07#/$defs/InternationalE164" + } + }, + "required": [] + }, + "NationalApproverIdentity": { + "type": "object", + "properties": { + "common:CountryCode": { + "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" + } + }, + "required": [ + "common:CountryCode" + ] + }, + "ApprovalDigitalSignature": { + "oneOf": [ + { + "type": "object", + "properties": { + "common:NationalDigitalSignature": { + "$ref": "#/$defs/NationalDigitalSignature" + } + }, + "required": [ + "common:NationalDigitalSignature" + ] + } + ] + }, + "ApprovalNationalDetails": { + "type": "object", + "properties": { + "common:CountryCode": { + "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" + } + }, + "required": [ + "common:CountryCode" + ] + }, + "NationalDigitalSignature": { + "type": "object", + "properties": { + "common:CountryCode": { + "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" + } + }, + "required": [ + "common:CountryCode" + ] + } + } +} \ No newline at end of file diff --git a/103120/schema/json/ts_103120_Core.schema.json b/103120/schema/json/ts_103120_Core.schema.json new file mode 100644 index 0000000..f116d31 --- /dev/null +++ b/103120/schema/json/ts_103120_Core.schema.json @@ -0,0 +1,590 @@ +{ + "$id": "ts_103120_Core_2019_10", + "$defs": { + "ObjectIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/UUID" + }, + "HI1Message": { + "type": "object", + "properties": { + "Header": { + "$ref": "#/$defs/MessageHeader" + }, + "Payload": { + "$ref": "#/$defs/MessagePayload" + }, + "Signature": {}, + "xmldsig:Signature": { + "$ref": "www.w3.org_2000_09_xmldsig##/$defs/SignatureType" + } + }, + "required": [ + "Header", + "Payload" + ] + }, + "MessageHeader": { + "type": "object", + "properties": { + "SenderIdentifier": { + "$ref": "#/$defs/EndpointID" + }, + "ReceiverIdentifier": { + "$ref": "#/$defs/EndpointID" + }, + "TransactionIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/UUID" + }, + "Timestamp": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedMicrosecondDateTime" + }, + "Version": { + "$ref": "#/$defs/Version" + } + }, + "required": [ + "SenderIdentifier", + "ReceiverIdentifier", + "TransactionIdentifier", + "Timestamp", + "Version" + ] + }, + "Version": { + "type": "object", + "properties": { + "ETSIVersion": { + "$ref": "ts_103120_Common_2016_02#/$defs/ETSIVersion" + }, + "NationalProfileOwner": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + }, + "NationalProfileVersion": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + } + }, + "required": [ + "ETSIVersion", + "NationalProfileOwner", + "NationalProfileVersion" + ] + }, + "EndpointID": { + "type": "object", + "properties": { + "CountryCode": { + "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" + }, + "UniqueIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + } + }, + "required": [ + "CountryCode", + "UniqueIdentifier" + ] + }, + "MessagePayload": { + "oneOf": [ + { + "type": "object", + "properties": { + "RequestPayload": { + "$ref": "#/$defs/RequestPayload" + } + }, + "required": [ + "RequestPayload" + ] + }, + { + "type": "object", + "properties": { + "ResponsePayload": { + "$ref": "#/$defs/ResponsePayload" + } + }, + "required": [ + "ResponsePayload" + ] + } + ] + }, + "RequestPayload": { + "type": "object", + "properties": { + "ActionRequests": { + "$ref": "#/$defs/ActionRequests" + } + }, + "required": [ + "ActionRequests" + ] + }, + "ActionRequests": { + "type": "object", + "properties": { + "ActionRequest": { + "type": "array", + "items": { + "$ref": "#/$defs/ActionRequest" + }, + "minItems": 1 + } + }, + "required": [] + }, + "ResponsePayload": { + "oneOf": [ + { + "type": "object", + "properties": { + "ActionResponses": { + "$ref": "#/$defs/ActionResponses" + } + }, + "required": [ + "ActionResponses" + ] + }, + { + "type": "object", + "properties": { + "ErrorInformation": { + "$ref": "#/$defs/ActionUnsuccesfulInformation" + } + }, + "required": [ + "ErrorInformation" + ] + } + ] + }, + "ActionResponses": { + "type": "object", + "properties": { + "ActionResponse": { + "type": "array", + "items": { + "$ref": "#/$defs/ActionResponse" + }, + "minItems": 1 + } + }, + "required": [] + }, + "ActionRequest": { + "allOf": [ + { + "type": "object", + "properties": { + "ActionIdentifier": { + "type": "integer", + "minimum": 0 + } + }, + "required": [ + "ActionIdentifier" + ] + }, + { + "oneOf": [ + { + "type": "object", + "properties": { + "GET": { + "$ref": "#/$defs/GETRequest" + } + }, + "required": [ + "GET" + ] + }, + { + "type": "object", + "properties": { + "CREATE": { + "$ref": "#/$defs/CREATERequest" + } + }, + "required": [ + "CREATE" + ] + }, + { + "type": "object", + "properties": { + "UPDATE": { + "$ref": "#/$defs/UPDATERequest" + } + }, + "required": [ + "UPDATE" + ] + }, + { + "type": "object", + "properties": { + "LIST": { + "$ref": "#/$defs/LISTRequest" + } + }, + "required": [ + "LIST" + ] + }, + { + "type": "object", + "properties": { + "DELIVER": { + "$ref": "#/$defs/DELIVERRequest" + } + }, + "required": [ + "DELIVER" + ] + } + ] + } + ] + }, + "ActionResponse": { + "allOf": [ + { + "type": "object", + "properties": { + "ActionIdentifier": { + "type": "integer", + "minimum": 0 + } + }, + "required": [ + "ActionIdentifier" + ] + }, + { + "oneOf": [ + { + "type": "object", + "properties": { + "GETResponse": { + "$ref": "#/$defs/GETResponse" + } + }, + "required": [ + "GETResponse" + ] + }, + { + "type": "object", + "properties": { + "CREATEResponse": { + "$ref": "#/$defs/CREATEResponse" + } + }, + "required": [ + "CREATEResponse" + ] + }, + { + "type": "object", + "properties": { + "UPDATEResponse": { + "$ref": "#/$defs/UPDATEResponse" + } + }, + "required": [ + "UPDATEResponse" + ] + }, + { + "type": "object", + "properties": { + "LISTResponse": { + "$ref": "#/$defs/LISTResponse" + } + }, + "required": [ + "LISTResponse" + ] + }, + { + "type": "object", + "properties": { + "ErrorInformation": { + "$ref": "#/$defs/ActionUnsuccesfulInformation" + } + }, + "required": [ + "ErrorInformation" + ] + }, + { + "type": "object", + "properties": { + "DELIVERResponse": { + "$ref": "#/$defs/DELIVERResponse" + } + }, + "required": [ + "DELIVERResponse" + ] + } + ] + } + ] + }, + "GETRequest": { + "type": "object", + "properties": { + "Identifier": { + "$ref": "#/$defs/ObjectIdentifier" + } + }, + "required": [ + "Identifier" + ] + }, + "GETResponse": { + "type": "object", + "properties": { + "HI1Object": { + "$ref": "#/$defs/ConcreteHI1Object" + } + }, + "required": [ + "HI1Object" + ] + }, + "CREATERequest": { + "type": "object", + "properties": { + "HI1Object": { + "$ref": "#/$defs/ConcreteHI1Object" + } + }, + "required": [ + "HI1Object" + ] + }, + "CREATEResponse": { + "type": "object", + "properties": { + "Identifier": { + "$ref": "#/$defs/ObjectIdentifier" + }, + "HI1Object": { + "$ref": "#/$defs/ConcreteHI1Object" + } + }, + "required": [ + "Identifier" + ] + }, + "UPDATERequest": { + "type": "object", + "properties": { + "HI1Object": { + "$ref": "#/$defs/ConcreteHI1Object" + } + }, + "required": [ + "HI1Object" + ] + }, + "UPDATEResponse": { + "type": "object", + "properties": { + "Identifier": { + "$ref": "#/$defs/ObjectIdentifier" + }, + "HI1Object": { + "$ref": "#/$defs/ConcreteHI1Object" + } + }, + "required": [ + "Identifier" + ] + }, + "LISTRequest": { + "type": "object", + "properties": { + "ObjectType": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "LastChanged": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + } + }, + "required": [] + }, + "LISTResponse": { + "type": "object", + "properties": { + "ListResponseRecord": { + "type": "array", + "items": { + "$ref": "#/$defs/ListResponseRecord" + } + } + }, + "required": [] + }, + "ListResponseRecord": { + "type": "object", + "properties": { + "ObjectType": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "Identifier": { + "$ref": "#/$defs/ObjectIdentifier" + }, + "CountryCode": { + "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" + }, + "OwnerIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + }, + "Generation": { + "type": "integer", + "minimum": 0 + }, + "ExternalIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "LastChanged": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + } + }, + "required": [ + "ObjectType", + "Identifier", + "Generation" + ] + }, + "ActionUnsuccesfulInformation": { + "type": "object", + "properties": { + "ErrorCode": { + "type": "integer", + "minimum": 0 + }, + "ErrorDescription": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + } + }, + "required": [ + "ErrorCode", + "ErrorDescription" + ] + }, + "DELIVERRequest": { + "type": "object", + "properties": { + "Identifier": { + "$ref": "#/$defs/ObjectIdentifier" + }, + "HI1Object": { + "$ref": "#/$defs/ConcreteHI1Object" + } + }, + "required": [ + "Identifier", + "HI1Object" + ] + }, + "DELIVERResponse": { + "type": "object", + "properties": { + "Identifier": { + "$ref": "#/$defs/ObjectIdentifier" + } + }, + "required": [ + "Identifier" + ] + }, + "HI1Object": { + "type": "object", + "properties": { + "ObjectIdentifier": { + "$ref": "#/$defs/ObjectIdentifier" + }, + "CountryCode": { + "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" + }, + "OwnerIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + }, + "Generation": { + "type": "integer", + "minimum": 0 + }, + "ExternalIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "AssociatedObjects": { + "$ref": "#/$defs/AssociatedObjects" + }, + "LastChanged": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "NationalHandlingParameters": { + "$ref": "#/$defs/NationalHandlingParameters" + } + }, + "required": [ + "ObjectIdentifier" + ] + }, + "AssociatedObjects": { + "type": "object", + "properties": { + "AssociatedObject": { + "type": "array", + "items": { + "$ref": "#/$defs/ObjectIdentifier" + } + } + }, + "required": [] + }, + "NationalHandlingParameters": { + "type": "object", + "properties": { + "CountryCode": { + "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" + } + }, + "required": [ + "CountryCode" + ] + }, + "ConcreteHI1Object": { + "oneOf": [ + { + "$ref": "ts_103120_Authorisation_2020_09#/$defs/AuthorisationObject" + }, + { + "$ref": "ts_103120_Task_2020_09#/$defs/LITaskObject" + }, + { + "$ref": "ts_103120_Task_2020_09#/$defs/LDTaskObject" + }, + { + "$ref": "ts_103120_Document_2020_09#/$defs/DocumentObject" + }, + { + "$ref": "ts_103120_Notification_2016_02#/$defs/NotificationObject" + }, + { + "$ref": "ts_103120_Delivery_2019_10#/$defs/DeliveryObject" + }, + { + "$ref": "ts_103120_TrafficPolicy_2022_07#/$defs/TrafficPolicyObject" + } + ] + } + }, + "$ref": "#/$defs/HI1Message" +} \ No newline at end of file diff --git a/103120/schema/json/ts_103120_Delivery.schema.json b/103120/schema/json/ts_103120_Delivery.schema.json new file mode 100644 index 0000000..093d127 --- /dev/null +++ b/103120/schema/json/ts_103120_Delivery.schema.json @@ -0,0 +1,209 @@ +{ + "$id": "ts_103120_Delivery_2019_10", + "$defs": { + "DeliveryObject": { + "type": "object", + "properties": { + "@xsi:type": { + "type": "string", + "enum": "{http://uri.etsi.org/03120/common/2019/10/Delivery}DeliveryObject" + }, + "ObjectIdentifier": { + "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" + }, + "CountryCode": { + "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" + }, + "OwnerIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + }, + "Generation": { + "type": "integer", + "minimum": 0 + }, + "ExternalIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "AssociatedObjects": { + "$ref": "ts_103120_Core_2019_10#/$defs/AssociatedObjects" + }, + "LastChanged": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "NationalHandlingParameters": { + "$ref": "ts_103120_Core_2019_10#/$defs/NationalHandlingParameters" + }, + "delivery:Reference": { + "$ref": "#/$defs/Reference" + }, + "delivery:DeliveryID": { + "$ref": "ts_103280_2017_07#/$defs/UUID" + }, + "delivery:SequenceNumber": { + "type": "integer", + "minimum": 0 + }, + "delivery:LastSequence": { + "type": "boolean" + }, + "delivery:Manifest": { + "$ref": "#/$defs/Manifest" + }, + "delivery:Delivery": { + "$ref": "#/$defs/Delivery" + } + }, + "required": [ + "@xsi:type", + "ObjectIdentifier" + ] + }, + "Reference": { + "oneOf": [ + { + "type": "object", + "properties": { + "delivery:LDID": { + "$ref": "ts_103280_2017_07#/$defs/LDID" + } + }, + "required": [ + "delivery:LDID" + ] + }, + { + "type": "object", + "properties": { + "delivery:LIID": { + "$ref": "ts_103280_2017_07#/$defs/LIID" + } + }, + "required": [ + "delivery:LIID" + ] + } + ] + }, + "Manifest": { + "oneOf": [ + { + "type": "object", + "properties": { + "delivery:Specification": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + } + }, + "required": [ + "delivery:Specification" + ] + }, + { + "type": "object", + "properties": { + "delivery:ExternalSchema": { + "$ref": "#/$defs/ExternalSchema" + } + }, + "required": [ + "delivery:ExternalSchema" + ] + } + ] + }, + "ExternalSchema": { + "type": "object", + "properties": { + "delivery:ManifestID": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "delivery:ManifestContents": { + "$ref": "#/$defs/ManifestContents" + } + }, + "required": [] + }, + "ManifestContents": { + "oneOf": [ + { + "type": "object", + "properties": { + "delivery:BinaryData": { + "$ref": "#/$defs/EmbeddedBinaryData" + } + }, + "required": [ + "delivery:BinaryData" + ] + }, + { + "type": "object", + "properties": { + "delivery:XMLSchema": { + "$ref": "#/$defs/SchemaContent" + } + }, + "required": [ + "delivery:XMLSchema" + ] + } + ] + }, + "SchemaContent": { + "type": "object", + "properties": { + "delivery:schema": {} + }, + "required": [ + "delivery:schema" + ] + }, + "Delivery": { + "oneOf": [ + { + "type": "object", + "properties": { + "delivery:BinaryData": { + "$ref": "#/$defs/EmbeddedBinaryData" + } + }, + "required": [ + "delivery:BinaryData" + ] + }, + { + "type": "object", + "properties": { + "delivery:XMLData": { + "$ref": "#/$defs/EmbeddedXMLData" + } + }, + "required": [ + "delivery:XMLData" + ] + } + ] + }, + "EmbeddedBinaryData": { + "type": "object", + "properties": { + "delivery:Data": { + "type": "string", + "pattern": "^[A-Za-z0-9+\\/]*={0,3}$" + }, + "delivery:ContentType": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + }, + "delivery:Checksum": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + }, + "delivery:ChecksumType": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + } + }, + "required": [ + "delivery:Data" + ] + }, + "EmbeddedXMLData": {} + } +} \ No newline at end of file diff --git a/103120/schema/json/ts_103120_Document.schema.json b/103120/schema/json/ts_103120_Document.schema.json new file mode 100644 index 0000000..d844092 --- /dev/null +++ b/103120/schema/json/ts_103120_Document.schema.json @@ -0,0 +1,148 @@ +{ + "$id": "ts_103120_Document_2020_09", + "$defs": { + "DocumentObject": { + "type": "object", + "properties": { + "@xsi:type": { + "type": "string", + "enum": "{http://uri.etsi.org/03120/common/2020/09/Document}DocumentObject" + }, + "ObjectIdentifier": { + "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" + }, + "CountryCode": { + "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" + }, + "OwnerIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + }, + "Generation": { + "type": "integer", + "minimum": 0 + }, + "ExternalIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "AssociatedObjects": { + "$ref": "ts_103120_Core_2019_10#/$defs/AssociatedObjects" + }, + "LastChanged": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "NationalHandlingParameters": { + "$ref": "ts_103120_Core_2019_10#/$defs/NationalHandlingParameters" + }, + "doc:DocumentReference": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "doc:DocumentName": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "doc:DocumentStatus": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "doc:DocumentDesiredStatus": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "doc:DocumentTimespan": { + "$ref": "#/$defs/DocumentTimespan" + }, + "doc:DocumentType": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "doc:DocumentProperties": { + "$ref": "#/$defs/DocumentProperties" + }, + "doc:DocumentBody": { + "$ref": "#/$defs/DocumentBody" + }, + "doc:DocumentSignature": { + "type": "array", + "items": { + "$ref": "ts_103120_Common_2016_02#/$defs/ApprovalDetails" + } + }, + "doc:DocumentInvalidReason": { + "$ref": "ts_103120_Core_2019_10#/$defs/ActionUnsuccesfulInformation" + }, + "doc:NationalDocumentParameters": { + "$ref": "#/$defs/NationalDocumentParameters" + } + }, + "required": [ + "@xsi:type", + "ObjectIdentifier" + ] + }, + "DocumentTimespan": { + "type": "object", + "properties": { + "doc:StartTime": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "doc:EndTime": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + } + }, + "required": [] + }, + "DocumentProperties": { + "type": "object", + "properties": { + "doc:DocumentProperty": { + "type": "array", + "items": { + "$ref": "#/$defs/DocumentProperty" + } + } + }, + "required": [] + }, + "DocumentProperty": { + "type": "object", + "properties": { + "doc:PropertyType": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "doc:PropertyValue": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + } + }, + "required": [ + "doc:PropertyType", + "doc:PropertyValue" + ] + }, + "DocumentBody": { + "type": "object", + "properties": { + "doc:Contents": { + "type": "string", + "pattern": "^[A-Za-z0-9+\\/]*={0,3}$" + }, + "doc:ContentType": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + }, + "doc:Checksum": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + }, + "doc:ChecksumType": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + } + }, + "required": [] + }, + "NationalDocumentParameters": { + "type": "object", + "properties": { + "doc:CountryCode": { + "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" + } + }, + "required": [ + "doc:CountryCode" + ] + } + } +} \ No newline at end of file diff --git a/103120/schema/json/ts_103120_Notification.schema.json b/103120/schema/json/ts_103120_Notification.schema.json new file mode 100644 index 0000000..84fbf04 --- /dev/null +++ b/103120/schema/json/ts_103120_Notification.schema.json @@ -0,0 +1,103 @@ +{ + "$id": "ts_103120_Notification_2016_02", + "$defs": { + "NotificationObject": { + "type": "object", + "properties": { + "@xsi:type": { + "type": "string", + "enum": "{http://uri.etsi.org/03120/common/2016/02/Notification}NotificationObject" + }, + "ObjectIdentifier": { + "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" + }, + "CountryCode": { + "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" + }, + "OwnerIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + }, + "Generation": { + "type": "integer", + "minimum": 0 + }, + "ExternalIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "AssociatedObjects": { + "$ref": "ts_103120_Core_2019_10#/$defs/AssociatedObjects" + }, + "LastChanged": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "NationalHandlingParameters": { + "$ref": "ts_103120_Core_2019_10#/$defs/NationalHandlingParameters" + }, + "notification:NotificationDetails": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "notification:NotificationType": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "notification:NewNotification": { + "type": "boolean" + }, + "notification:NotificationTimestamp": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "notification:StatusOfAssociatedObjects": { + "$ref": "#/$defs/ListOfAssociatedObjectStatus" + }, + "notification:NationalNotificationParameters": { + "$ref": "#/$defs/NationalNotificationParameters" + } + }, + "required": [ + "@xsi:type", + "ObjectIdentifier" + ] + }, + "ListOfAssociatedObjectStatus": { + "type": "object", + "properties": { + "notification:AssociatedObjectStatus": { + "type": "array", + "items": { + "$ref": "#/$defs/AssociatedObjectStatus" + }, + "minItems": 1 + } + }, + "required": [] + }, + "AssociatedObjectStatus": { + "type": "object", + "properties": { + "notification:AssociatedObject": { + "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" + }, + "notification:Status": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "notification:Details": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + } + }, + "required": [ + "notification:AssociatedObject", + "notification:Status" + ] + }, + "NationalNotificationParameters": { + "type": "object", + "properties": { + "notification:CountryCode": { + "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" + } + }, + "required": [ + "notification:CountryCode" + ] + } + } +} \ No newline at end of file diff --git a/103120/schema/json/ts_103120_Task.schema.json b/103120/schema/json/ts_103120_Task.schema.json new file mode 100644 index 0000000..24de4c5 --- /dev/null +++ b/103120/schema/json/ts_103120_Task.schema.json @@ -0,0 +1,599 @@ +{ + "$id": "ts_103120_Task_2020_09", + "$defs": { + "LITaskObject": { + "type": "object", + "properties": { + "@xsi:type": { + "type": "string", + "enum": "{http://uri.etsi.org/03120/common/2020/09/Task}LITaskObject" + }, + "ObjectIdentifier": { + "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" + }, + "CountryCode": { + "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" + }, + "OwnerIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + }, + "Generation": { + "type": "integer", + "minimum": 0 + }, + "ExternalIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "AssociatedObjects": { + "$ref": "ts_103120_Core_2019_10#/$defs/AssociatedObjects" + }, + "LastChanged": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "NationalHandlingParameters": { + "$ref": "ts_103120_Core_2019_10#/$defs/NationalHandlingParameters" + }, + "task:Reference": { + "$ref": "ts_103280_2017_07#/$defs/LIID" + }, + "task:Status": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "task:DesiredStatus": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "task:Timespan": { + "$ref": "#/$defs/TaskTimespan" + }, + "task:TargetIdentifier": { + "$ref": "#/$defs/TargetIdentifier" + }, + "task:DeliveryType": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "task:DeliveryDetails": { + "$ref": "#/$defs/TaskDeliveryDetails" + }, + "task:ApprovalDetails": { + "type": "array", + "items": { + "$ref": "ts_103120_Common_2016_02#/$defs/ApprovalDetails" + } + }, + "task:CSPID": { + "$ref": "ts_103120_Core_2019_10#/$defs/EndpointID" + }, + "task:HandlingProfile": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "task:InvalidReason": { + "$ref": "ts_103120_Core_2019_10#/$defs/ActionUnsuccesfulInformation" + }, + "task:Flags": { + "$ref": "#/$defs/TaskFlags" + }, + "task:NationalLITaskingParameters": { + "$ref": "#/$defs/NationalLITaskingParameters" + }, + "task:ListOfTrafficPolicyReferences": { + "$ref": "#/$defs/ListOfTrafficPolicyReferences" + } + }, + "required": [ + "@xsi:type", + "ObjectIdentifier" + ] + }, + "TaskTimespan": { + "type": "object", + "properties": { + "task:StartTime": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "task:EndTime": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "task:TerminationTime": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "task:ProvisioningTime": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "task:DeprovisioningTime": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + } + }, + "required": [] + }, + "TargetIdentifier": { + "type": "object", + "properties": { + "task:TargetIdentifierValues": { + "$ref": "#/$defs/TargetIdentifierValues" + }, + "task:ServiceType": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + } + }, + "required": [] + }, + "TargetIdentifierValues": { + "type": "object", + "properties": { + "task:TargetIdentifierValue": { + "type": "array", + "items": { + "$ref": "#/$defs/TargetIdentifierValue" + }, + "minItems": 1 + } + }, + "required": [] + }, + "TargetIdentifierValue": { + "type": "object", + "properties": { + "task:FormatType": { + "$ref": "#/$defs/FormatType" + }, + "task:Value": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + } + }, + "required": [ + "task:FormatType", + "task:Value" + ] + }, + "FormatType": { + "type": "object", + "properties": { + "task:FormatOwner": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + }, + "task:FormatName": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + } + }, + "required": [ + "task:FormatOwner", + "task:FormatName" + ] + }, + "TaskDeliveryDetails": { + "type": "object", + "properties": { + "task:DeliveryDestination": { + "type": "array", + "items": { + "$ref": "#/$defs/DeliveryDestination" + }, + "minItems": 1 + } + }, + "required": [] + }, + "DeliveryDestination": { + "type": "object", + "properties": { + "task:DeliveryAddress": { + "$ref": "#/$defs/DeliveryAddress" + }, + "task:EncryptionDetails": { + "$ref": "#/$defs/NationalEncryptionDetails" + }, + "task:IRIorCC": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "task:HandoverFormat": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "task:DeliveryProfile": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "task:NationalDeliveryParameters": { + "$ref": "#/$defs/NationalDeliveryParameters" + } + }, + "required": [] + }, + "DeliveryAddress": { + "oneOf": [ + { + "type": "object", + "properties": { + "task:IPv4Address": { + "$ref": "ts_103280_2017_07#/$defs/IPv4Address" + } + }, + "required": [ + "task:IPv4Address" + ] + }, + { + "type": "object", + "properties": { + "task:IPv6Address": { + "$ref": "ts_103280_2017_07#/$defs/IPv6Address" + } + }, + "required": [ + "task:IPv6Address" + ] + }, + { + "type": "object", + "properties": { + "task:IPAddressPort": { + "$ref": "ts_103280_2017_07#/$defs/IPAddressPort" + } + }, + "required": [ + "task:IPAddressPort" + ] + }, + { + "type": "object", + "properties": { + "task:IPAddressPortRange": { + "$ref": "ts_103280_2017_07#/$defs/IPAddressPortRange" + } + }, + "required": [ + "task:IPAddressPortRange" + ] + }, + { + "type": "object", + "properties": { + "task:E164Number": { + "$ref": "ts_103280_2017_07#/$defs/InternationalE164" + } + }, + "required": [ + "task:E164Number" + ] + }, + { + "type": "object", + "properties": { + "task:FTPAddress": { + "type": "string" + } + }, + "required": [ + "task:FTPAddress" + ] + }, + { + "type": "object", + "properties": { + "task:URL": { + "type": "string" + } + }, + "required": [ + "task:URL" + ] + }, + { + "type": "object", + "properties": { + "task:FQDN": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + } + }, + "required": [ + "task:FQDN" + ] + }, + { + "type": "object", + "properties": { + "task:EmailAddress": { + "$ref": "ts_103280_2017_07#/$defs/EmailAddress" + } + }, + "required": [ + "task:EmailAddress" + ] + }, + { + "type": "object", + "properties": { + "task:EndpointID": { + "$ref": "ts_103120_Core_2019_10#/$defs/EndpointID" + } + }, + "required": [ + "task:EndpointID" + ] + }, + { + "type": "object", + "properties": { + "task:DeliveryInformationID": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + } + }, + "required": [ + "task:DeliveryInformationID" + ] + } + ] + }, + "TaskFlags": { + "type": "object", + "properties": { + "task:TaskFlag": { + "type": "array", + "items": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + } + } + }, + "required": [] + }, + "NationalLITaskingParameters": { + "type": "object", + "properties": { + "task:CountryCode": { + "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" + } + }, + "required": [ + "task:CountryCode" + ] + }, + "NationalDeliveryParameters": { + "type": "object", + "properties": { + "task:CountryCode": { + "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" + } + }, + "required": [ + "task:CountryCode" + ] + }, + "NationalEncryptionDetails": { + "type": "object", + "properties": { + "task:CountryCode": { + "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" + } + }, + "required": [ + "task:CountryCode" + ] + }, + "LDTaskObject": { + "type": "object", + "properties": { + "@xsi:type": { + "type": "string", + "enum": "{http://uri.etsi.org/03120/common/2020/09/Task}LDTaskObject" + }, + "ObjectIdentifier": { + "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" + }, + "CountryCode": { + "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" + }, + "OwnerIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + }, + "Generation": { + "type": "integer", + "minimum": 0 + }, + "ExternalIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "AssociatedObjects": { + "$ref": "ts_103120_Core_2019_10#/$defs/AssociatedObjects" + }, + "LastChanged": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "NationalHandlingParameters": { + "$ref": "ts_103120_Core_2019_10#/$defs/NationalHandlingParameters" + }, + "task:Reference": { + "$ref": "ts_103280_2017_07#/$defs/LDID" + }, + "task:Status": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "task:StatusReason": { + "$ref": "ts_103120_Core_2019_10#/$defs/ActionUnsuccesfulInformation" + }, + "task:DesiredStatus": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "task:RequestDetails": { + "$ref": "#/$defs/RequestDetails" + }, + "task:DeliveryDetails": { + "$ref": "#/$defs/LDDeliveryDetails" + }, + "task:ApprovalDetails": { + "type": "array", + "items": { + "$ref": "ts_103120_Common_2016_02#/$defs/ApprovalDetails" + } + }, + "task:CSPID": { + "$ref": "ts_103120_Core_2019_10#/$defs/EndpointID" + }, + "task:HandlingProfile": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "task:Flags": { + "$ref": "#/$defs/LDTaskFlags" + }, + "task:NationalLDTaskingParameters": { + "$ref": "#/$defs/NationalLDTaskingParameters" + } + }, + "required": [ + "@xsi:type", + "ObjectIdentifier" + ] + }, + "RequestDetails": { + "type": "object", + "properties": { + "task:Type": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "task:StartTime": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "task:EndTime": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "task:ObservedTime": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "task:ObservedTimes": { + "type": "array", + "items": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + } + }, + "task:RequestValues": { + "$ref": "#/$defs/RequestValues" + }, + "task:Subtype": { + "$ref": "#/$defs/RequestSubtype" + } + }, + "required": [] + }, + "RequestValues": { + "type": "object", + "properties": { + "task:RequestValue": { + "type": "array", + "items": { + "$ref": "#/$defs/RequestValue" + }, + "minItems": 1 + } + }, + "required": [] + }, + "RequestValue": { + "type": "object", + "properties": { + "task:FormatType": { + "$ref": "#/$defs/FormatType" + }, + "task:Value": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + } + }, + "required": [ + "task:FormatType", + "task:Value" + ] + }, + "RequestSubtype": { + "type": "object", + "properties": { + "task:RequestSubtype": { + "type": "array", + "items": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "minItems": 1 + } + }, + "required": [] + }, + "LDDeliveryDetails": { + "type": "object", + "properties": { + "task:LDDeliveryDestination": { + "type": "array", + "items": { + "$ref": "#/$defs/LDDeliveryDestination" + }, + "minItems": 1 + } + }, + "required": [] + }, + "LDDeliveryDestination": { + "type": "object", + "properties": { + "task:DeliveryAddress": { + "$ref": "#/$defs/DeliveryAddress" + }, + "task:EncryptionDetails": { + "$ref": "#/$defs/NationalEncryptionDetails" + }, + "task:LDHandoverFormat": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "task:LDDeliveryProfile": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + }, + "task:NationalDeliveryParameters": { + "$ref": "#/$defs/NationalDeliveryParameters" + } + }, + "required": [] + }, + "LDTaskFlags": { + "type": "object", + "properties": { + "task:LDTaskFlag": { + "type": "array", + "items": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + } + } + }, + "required": [] + }, + "NationalLDTaskingParameters": { + "type": "object", + "properties": { + "task:CountryCode": { + "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" + } + }, + "required": [ + "task:CountryCode" + ] + }, + "ListOfTrafficPolicyReferences": { + "type": "object", + "properties": { + "task:TrafficPolicyReference": { + "type": "array", + "items": { + "$ref": "#/$defs/TrafficPolicyReference" + }, + "minItems": 1 + } + }, + "required": [] + }, + "TrafficPolicyReference": { + "type": "object", + "properties": { + "task:Order": { + "type": "integer", + "minimum": 1 + }, + "task:ObjectIdentifier": { + "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" + } + }, + "required": [] + } + } +} \ No newline at end of file diff --git a/103120/schema/json/ts_103120_TrafficPolicy.schema.json b/103120/schema/json/ts_103120_TrafficPolicy.schema.json new file mode 100644 index 0000000..1d9619e --- /dev/null +++ b/103120/schema/json/ts_103120_TrafficPolicy.schema.json @@ -0,0 +1,198 @@ +{ + "$id": "ts_103120_TrafficPolicy_2022_07", + "$defs": { + "TrafficPolicyObject": { + "type": "object", + "properties": { + "@xsi:type": { + "type": "string", + "enum": "{http://uri.etsi.org/03120/common/2022/07/TrafficPolicy}TrafficPolicyObject" + }, + "ObjectIdentifier": { + "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" + }, + "CountryCode": { + "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" + }, + "OwnerIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + }, + "Generation": { + "type": "integer", + "minimum": 0 + }, + "ExternalIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "AssociatedObjects": { + "$ref": "ts_103120_Core_2019_10#/$defs/AssociatedObjects" + }, + "LastChanged": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "NationalHandlingParameters": { + "$ref": "ts_103120_Core_2019_10#/$defs/NationalHandlingParameters" + }, + "tp:TrafficPolicyName": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + }, + "tp:TrafficRules": { + "$ref": "#/$defs/ListOfTrafficRuleReferences" + } + }, + "required": [ + "@xsi:type", + "ObjectIdentifier" + ] + }, + "ListOfTrafficRuleReferences": { + "type": "object", + "properties": { + "tp:TrafficRuleReference": { + "type": "array", + "items": { + "$ref": "#/$defs/TrafficRuleReference" + }, + "minItems": 1 + } + }, + "required": [] + }, + "TrafficRuleReference": { + "type": "object", + "properties": { + "tp:Order": { + "type": "integer", + "minimum": 1 + }, + "tp:ObjectIdentifier": { + "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" + } + }, + "required": [ + "tp:Order", + "tp:ObjectIdentifier" + ] + }, + "TrafficRuleObject": { + "type": "object", + "properties": { + "@xsi:type": { + "type": "string", + "enum": "{http://uri.etsi.org/03120/common/2022/07/TrafficPolicy}TrafficRuleObject" + }, + "ObjectIdentifier": { + "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" + }, + "CountryCode": { + "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" + }, + "OwnerIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + }, + "Generation": { + "type": "integer", + "minimum": 0 + }, + "ExternalIdentifier": { + "$ref": "ts_103280_2017_07#/$defs/LongString" + }, + "AssociatedObjects": { + "$ref": "ts_103120_Core_2019_10#/$defs/AssociatedObjects" + }, + "LastChanged": { + "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" + }, + "NationalHandlingParameters": { + "$ref": "ts_103120_Core_2019_10#/$defs/NationalHandlingParameters" + }, + "tp:Criteria": { + "$ref": "#/$defs/ListOfTrafficCriteria" + }, + "tp:Action": { + "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" + } + }, + "required": [ + "@xsi:type", + "ObjectIdentifier" + ] + }, + "ListOfTrafficCriteria": { + "type": "object", + "properties": { + "tp:Criteria": { + "type": "array", + "items": { + "$ref": "#/$defs/TrafficCriteria" + }, + "minItems": 1 + } + }, + "required": [] + }, + "TrafficCriteria": { + "oneOf": [ + { + "type": "object", + "properties": { + "tp:IPPolicyCriteria": { + "$ref": "#/$defs/IPPolicyCriteria" + } + }, + "required": [ + "tp:IPPolicyCriteria" + ] + }, + { + "type": "object", + "properties": { + "tp:MobileAccessPolicyCriteria": { + "$ref": "#/$defs/MobileAccessPolicyCriteria" + } + }, + "required": [ + "tp:MobileAccessPolicyCriteria" + ] + } + ] + }, + "IPPolicyCriteria": { + "type": "object", + "properties": { + "tp:IPProtocol": { + "type": "integer", + "minimum": 0 + }, + "tp:SourceIPRange": { + "$ref": "ts_103280_2017_07#/$defs/IPCIDR" + }, + "tp:SourcePortRange": { + "$ref": "ts_103280_2017_07#/$defs/PortRange" + }, + "tp:DestinationIPRange": { + "$ref": "ts_103280_2017_07#/$defs/IPCIDR" + }, + "tp:DestinationPortRange": { + "$ref": "ts_103280_2017_07#/$defs/PortRange" + }, + "tp:BothDirections": { + "type": "boolean" + } + }, + "required": [] + }, + "MobileAccessPolicyCriteria": { + "type": "object", + "properties": { + "tp:APN": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + }, + "tp:DNN": { + "$ref": "ts_103280_2017_07#/$defs/ShortString" + } + }, + "required": [] + } + } +} \ No newline at end of file diff --git a/103280/TS_103_280.schema.json b/103280/TS_103_280.schema.json index 474b3ee..02cd078 100644 --- a/103280/TS_103_280.schema.json +++ b/103280/TS_103_280.schema.json @@ -196,23 +196,23 @@ { "type": "object", "properties": { - "IPv4Address": { + "etsi280:IPv4Address": { "$ref": "#/$defs/IPv4Address" } }, "required": [ - "IPv4Address" + "etsi280:IPv4Address" ] }, { "type": "object", "properties": { - "IPv6Address": { + "etsi280:IPv6Address": { "$ref": "#/$defs/IPv6Address" } }, "required": [ - "IPv6Address" + "etsi280:IPv6Address" ] } ] @@ -222,23 +222,23 @@ { "type": "object", "properties": { - "IPv4CIDR": { + "etsi280:IPv4CIDR": { "$ref": "#/$defs/IPv4CIDR" } }, "required": [ - "IPv4CIDR" + "etsi280:IPv4CIDR" ] }, { "type": "object", "properties": { - "IPv6CIDR": { + "etsi280:IPv6CIDR": { "$ref": "#/$defs/IPv6CIDR" } }, "required": [ - "IPv6CIDR" + "etsi280:IPv6CIDR" ] } ] @@ -246,31 +246,31 @@ "TCPPortRange": { "type": "object", "properties": { - "start": { + "etsi280:start": { "$ref": "#/$defs/TCPPort" }, - "end": { + "etsi280:end": { "$ref": "#/$defs/TCPPort" } }, "required": [ - "start", - "end" + "etsi280:start", + "etsi280:end" ] }, "UDPPortRange": { "type": "object", "properties": { - "start": { + "etsi280:start": { "$ref": "#/$defs/UDPPort" }, - "end": { + "etsi280:end": { "$ref": "#/$defs/UDPPort" } }, "required": [ - "start", - "end" + "etsi280:start", + "etsi280:end" ] }, "Port": { @@ -278,23 +278,23 @@ { "type": "object", "properties": { - "TCPPort": { + "etsi280:TCPPort": { "$ref": "#/$defs/TCPPort" } }, "required": [ - "TCPPort" + "etsi280:TCPPort" ] }, { "type": "object", "properties": { - "UDPPort": { + "etsi280:UDPPort": { "$ref": "#/$defs/UDPPort" } }, "required": [ - "UDPPort" + "etsi280:UDPPort" ] } ] @@ -304,23 +304,23 @@ { "type": "object", "properties": { - "TCPPortRange": { + "etsi280:TCPPortRange": { "$ref": "#/$defs/TCPPortRange" } }, "required": [ - "TCPPortRange" + "etsi280:TCPPortRange" ] }, { "type": "object", "properties": { - "UDPPortRange": { + "etsi280:UDPPortRange": { "$ref": "#/$defs/UDPPortRange" } }, "required": [ - "UDPPortRange" + "etsi280:UDPPortRange" ] } ] @@ -328,61 +328,61 @@ "IPAddressPort": { "type": "object", "properties": { - "address": { + "etsi280:address": { "$ref": "#/$defs/IPAddress" }, - "port": { + "etsi280:port": { "$ref": "#/$defs/Port" } }, "required": [ - "address", - "port" + "etsi280:address", + "etsi280:port" ] }, "IPAddressPortRange": { "type": "object", "properties": { - "address": { + "etsi280:address": { "$ref": "#/$defs/IPAddress" }, - "portRange": { + "etsi280:portRange": { "$ref": "#/$defs/PortRange" } }, "required": [ - "address", - "portRange" + "etsi280:address", + "etsi280:portRange" ] }, "WGS84CoordinateDecimal": { "type": "object", "properties": { - "latitude": { + "etsi280:latitude": { "$ref": "#/$defs/WGS84LatitudeDecimal" }, - "longitude": { + "etsi280:longitude": { "$ref": "#/$defs/WGS84LongitudeDecimal" } }, "required": [ - "latitude", - "longitude" + "etsi280:latitude", + "etsi280:longitude" ] }, "WGS84CoordinateAngular": { "type": "object", "properties": { - "latitude": { + "etsi280:latitude": { "$ref": "#/$defs/WGS84LatitudeAngular" }, - "longitude": { + "etsi280:longitude": { "$ref": "#/$defs/WGS84LongitudeAngular" } }, "required": [ - "latitude", - "longitude" + "etsi280:latitude", + "etsi280:longitude" ] } } diff --git a/utils/translate/TypeMapping.py b/utils/translate/TypeMapping.py index e3daf62..2b4b785 100644 --- a/utils/translate/TypeMapping.py +++ b/utils/translate/TypeMapping.py @@ -15,9 +15,9 @@ class TypeMapping(ABC): XSD_TYPE_MAP = { "string" : { "type" : "string" }, - "normalizedString" : { "type" : "string", "pattern" : "^[^\r\n\t]*$"}, + "normalizedString" : { "type" : "string"}, "dateTime" : { "type" : "string"}, - "token" : { "type" : "string", "pattern" : "^[^\r\n\t]*$"}, + "token" : { "type" : "string"}, "anyURI" : { "type" : "string" }, "integer" : { "type" : "integer"}, @@ -27,7 +27,7 @@ class TypeMapping(ABC): "boolean" : { "type" : "boolean" }, "hexBinary" : { "type" : "string", "pattern" : "^([a-fA-F0-9]{2})*$"}, - "base64Binary" : { "type" : "string", "pattern" : "^[-A-Za-z0-9+/]*={0,3}$"}, + "base64Binary" : { "type" : "string", "pattern" : "^[A-Za-z0-9+\/]*={0,3}$"}, "anyType" : {} } diff --git a/utils/xml_to_json.py b/utils/xml_to_json.py index afc0f03..66145f9 100644 --- a/utils/xml_to_json.py +++ b/utils/xml_to_json.py @@ -68,7 +68,12 @@ coerce_to_list = [ ] coerce_to_int = [ - 'ActionIdentifier' + 'ActionIdentifier', + 'delivery:SequenceNumber' +] + +coerce_to_bool = [ + 'delivery:LastSequence' ] def postprocessor (path, key, value): @@ -79,6 +84,8 @@ def postprocessor (path, key, value): return key, value if key in coerce_to_int: return key, int(value) + if key in coerce_to_bool: + return key, bool(value) return key, value if __name__ == "__main__": @@ -104,12 +111,7 @@ if __name__ == "__main__": d = xmltodict.parse(s, force_list=tuple(coerce_to_list), - # process_namespaces=True, - # namespaces = namespace_prefixes, postprocessor=postprocessor )['HI1Message'] - # prefixes = extract_prefixes(d) - # removePrefixes(d, prefixes) - print(json.dumps(d, indent=2)) -- GitLab From f0fae221317b8e51cf7b246cab4d3226685df015 Mon Sep 17 00:00:00 2001 From: mark Date: Fri, 9 Jun 2023 10:56:11 +0100 Subject: [PATCH 20/22] Taking out 120 stuff again --- 103120/schema/json/TS_103_280.schema.json | 389 ------------ .../json/ts_103120_Authorisation.schema.json | 148 ----- .../schema/json/ts_103120_Common.schema.json | 164 ----- 103120/schema/json/ts_103120_Core.schema.json | 590 ----------------- .../json/ts_103120_Delivery.schema.json | 209 ------ .../json/ts_103120_Document.schema.json | 148 ----- .../json/ts_103120_Notification.schema.json | 103 --- 103120/schema/json/ts_103120_Task.schema.json | 599 ------------------ .../json/ts_103120_TrafficPolicy.schema.json | 198 ------ 9 files changed, 2548 deletions(-) delete mode 100644 103120/schema/json/TS_103_280.schema.json delete mode 100644 103120/schema/json/ts_103120_Authorisation.schema.json delete mode 100644 103120/schema/json/ts_103120_Common.schema.json delete mode 100644 103120/schema/json/ts_103120_Core.schema.json delete mode 100644 103120/schema/json/ts_103120_Delivery.schema.json delete mode 100644 103120/schema/json/ts_103120_Document.schema.json delete mode 100644 103120/schema/json/ts_103120_Notification.schema.json delete mode 100644 103120/schema/json/ts_103120_Task.schema.json delete mode 100644 103120/schema/json/ts_103120_TrafficPolicy.schema.json diff --git a/103120/schema/json/TS_103_280.schema.json b/103120/schema/json/TS_103_280.schema.json deleted file mode 100644 index 02cd078..0000000 --- a/103120/schema/json/TS_103_280.schema.json +++ /dev/null @@ -1,389 +0,0 @@ -{ - "$id": "ts_103280_2017_07", - "$defs": { - "ShortString": { - "type": "string", - "maxLength": 255 - }, - "LongString": { - "type": "string", - "maxLength": 65535 - }, - "LIID": { - "type": "string", - "pattern": "^([!-~]{1,25})|([0-9a-f]{26,50})$" - }, - "UTCDateTime": { - "type": "string", - "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z$" - }, - "UTCMicrosecondDateTime": { - "type": "string", - "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}\\.[0-9]{6}Z$" - }, - "QualifiedDateTime": { - "type": "string", - "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}(Z|[+-][0-9]{2}:[0-9]{2})$" - }, - "QualifiedMicrosecondDateTime": { - "type": "string", - "pattern": "^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}\\.[0-9]{6}(Z|[+-][0-9]{2}:[0-9]{2})$" - }, - "InternationalE164": { - "type": "string", - "pattern": "^[0-9]{1,15}$" - }, - "IMSI": { - "type": "string", - "pattern": "^[0-9]{6,15}$" - }, - "IMEI": { - "type": "string", - "pattern": "^[0-9]{14}$" - }, - "IMEICheckDigit": { - "type": "string", - "pattern": "^[0-9]{15}$" - }, - "IMEISV": { - "type": "string", - "pattern": "^[0-9]{16}$" - }, - "IPv4Address": { - "type": "string", - "pattern": "^((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])$" - }, - "IPv4CIDR": { - "type": "string", - "pattern": "^((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])/([1-2]?[0-9]|3[0-2])$" - }, - "IPv6Address": { - "type": "string", - "pattern": "^([0-9a-f]{4}:){7}([0-9a-f]{4})$" - }, - "IPv6CIDR": { - "type": "string", - "pattern": "^([0-9a-f]{4}:){7}([0-9a-f]{4})/(([1-9][0-9]?)|(1[0-1][0-9])|(12[0-8]))$" - }, - "TCPPort": { - "type": "integer", - "exclusiveMinimum": 1, - "maximum": 65535 - }, - "UDPPort": { - "type": "integer", - "minimum": 0, - "maximum": 65535 - }, - "MACAddress": { - "type": "string", - "pattern": "^([a-f0-9]{2}:){5}[a-f0-9]{2}$" - }, - "EmailAddress": { - "allOf": [ - { - "$ref": "#/$defs/ShortString" - }, - { - "type": "string", - "pattern": "^[a-zA-Z0-9\\.!#$%&'\\*\\+\\\\/=\\?\\^_`\\{\\|\\}~\\-]+@[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(\\.[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$" - } - ] - }, - "UUID": { - "type": "string", - "pattern": "^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$" - }, - "ISOCountryCode": { - "type": "string", - "pattern": "^[A-Z]{2}$" - }, - "SIPURI": { - "type": "string", - "pattern": "^sips?:[a-zA-Z0-9!#$&-;=?-\\[\\]_~%]+$" - }, - "TELURI": { - "type": "string", - "pattern": "^tel:[a-zA-Z0-9!#$&-;=?-\\[\\]_~%]+$" - }, - "WGS84LatitudeDecimal": { - "type": "string", - "pattern": "^[NS][0-9]{2}\\.[0-9]{6}$" - }, - "WGS84LongitudeDecimal": { - "type": "string", - "pattern": "^[EW][0-9]{3}\\.[0-9]{6}$" - }, - "WGS84LatitudeAngular": { - "type": "string", - "pattern": "^[NS][0-9]{6}\\.[0-9]{2}$" - }, - "WGS84LongitudeAngular": { - "type": "string", - "pattern": "^[EW][0-9]{7}\\.[0-9]{2}$" - }, - "SUPIIMSI": { - "$ref": "#/$defs/IMSI" - }, - "SUPINAI": { - "$ref": "#/$defs/NAI" - }, - "SUCI": { - "type": "string", - "pattern": "^([a-fA-F0-9]{2})*$" - }, - "PEIIMEI": { - "$ref": "#/$defs/IMEI" - }, - "PEIIMEICheckDigit": { - "$ref": "#/$defs/IMEICheckDigit" - }, - "PEIIMEISV": { - "$ref": "#/$defs/IMEISV" - }, - "GPSIMSISDN": { - "type": "string", - "pattern": "^[0-9]{1,15}$" - }, - "GPSINAI": { - "$ref": "#/$defs/NAI" - }, - "NAI": { - "type": "string" - }, - "LDID": { - "type": "string", - "pattern": "^([A-Z]{2}-.+-.+)$" - }, - "InternationalizedEmailAddress": { - "allOf": [ - { - "$ref": "#/$defs/ShortString" - }, - { - "type": "string", - "pattern": "^.+@.+$" - } - ] - }, - "EUI64": { - "type": "string", - "pattern": "^([a-f0-9]{2}:){7}[a-f0-9]{2}$" - }, - "CGI": { - "type": "string", - "pattern": "^[0-9]{3}-[0-9]{2,3}-[a-f0-9]{4}-[a-f0-9]{4}$" - }, - "ECGI": { - "type": "string", - "pattern": "^[0-9]{3}-[0-9]{2,3}-[a-f0-9]{7}$" - }, - "NCGI": { - "type": "string", - "pattern": "^[0-9]{3}-[0-9]{2,3}-[a-f0-9]{9}$" - }, - "ICCID": { - "type": "string", - "pattern": "^[0-9]{19,20}$" - }, - "IPProtocol": { - "type": "integer", - "minimum": 0, - "maximum": 255 - }, - "IPAddress": { - "oneOf": [ - { - "type": "object", - "properties": { - "etsi280:IPv4Address": { - "$ref": "#/$defs/IPv4Address" - } - }, - "required": [ - "etsi280:IPv4Address" - ] - }, - { - "type": "object", - "properties": { - "etsi280:IPv6Address": { - "$ref": "#/$defs/IPv6Address" - } - }, - "required": [ - "etsi280:IPv6Address" - ] - } - ] - }, - "IPCIDR": { - "oneOf": [ - { - "type": "object", - "properties": { - "etsi280:IPv4CIDR": { - "$ref": "#/$defs/IPv4CIDR" - } - }, - "required": [ - "etsi280:IPv4CIDR" - ] - }, - { - "type": "object", - "properties": { - "etsi280:IPv6CIDR": { - "$ref": "#/$defs/IPv6CIDR" - } - }, - "required": [ - "etsi280:IPv6CIDR" - ] - } - ] - }, - "TCPPortRange": { - "type": "object", - "properties": { - "etsi280:start": { - "$ref": "#/$defs/TCPPort" - }, - "etsi280:end": { - "$ref": "#/$defs/TCPPort" - } - }, - "required": [ - "etsi280:start", - "etsi280:end" - ] - }, - "UDPPortRange": { - "type": "object", - "properties": { - "etsi280:start": { - "$ref": "#/$defs/UDPPort" - }, - "etsi280:end": { - "$ref": "#/$defs/UDPPort" - } - }, - "required": [ - "etsi280:start", - "etsi280:end" - ] - }, - "Port": { - "oneOf": [ - { - "type": "object", - "properties": { - "etsi280:TCPPort": { - "$ref": "#/$defs/TCPPort" - } - }, - "required": [ - "etsi280:TCPPort" - ] - }, - { - "type": "object", - "properties": { - "etsi280:UDPPort": { - "$ref": "#/$defs/UDPPort" - } - }, - "required": [ - "etsi280:UDPPort" - ] - } - ] - }, - "PortRange": { - "oneOf": [ - { - "type": "object", - "properties": { - "etsi280:TCPPortRange": { - "$ref": "#/$defs/TCPPortRange" - } - }, - "required": [ - "etsi280:TCPPortRange" - ] - }, - { - "type": "object", - "properties": { - "etsi280:UDPPortRange": { - "$ref": "#/$defs/UDPPortRange" - } - }, - "required": [ - "etsi280:UDPPortRange" - ] - } - ] - }, - "IPAddressPort": { - "type": "object", - "properties": { - "etsi280:address": { - "$ref": "#/$defs/IPAddress" - }, - "etsi280:port": { - "$ref": "#/$defs/Port" - } - }, - "required": [ - "etsi280:address", - "etsi280:port" - ] - }, - "IPAddressPortRange": { - "type": "object", - "properties": { - "etsi280:address": { - "$ref": "#/$defs/IPAddress" - }, - "etsi280:portRange": { - "$ref": "#/$defs/PortRange" - } - }, - "required": [ - "etsi280:address", - "etsi280:portRange" - ] - }, - "WGS84CoordinateDecimal": { - "type": "object", - "properties": { - "etsi280:latitude": { - "$ref": "#/$defs/WGS84LatitudeDecimal" - }, - "etsi280:longitude": { - "$ref": "#/$defs/WGS84LongitudeDecimal" - } - }, - "required": [ - "etsi280:latitude", - "etsi280:longitude" - ] - }, - "WGS84CoordinateAngular": { - "type": "object", - "properties": { - "etsi280:latitude": { - "$ref": "#/$defs/WGS84LatitudeAngular" - }, - "etsi280:longitude": { - "$ref": "#/$defs/WGS84LongitudeAngular" - } - }, - "required": [ - "etsi280:latitude", - "etsi280:longitude" - ] - } - } -} \ No newline at end of file diff --git a/103120/schema/json/ts_103120_Authorisation.schema.json b/103120/schema/json/ts_103120_Authorisation.schema.json deleted file mode 100644 index 1c9a68f..0000000 --- a/103120/schema/json/ts_103120_Authorisation.schema.json +++ /dev/null @@ -1,148 +0,0 @@ -{ - "$id": "ts_103120_Authorisation_2020_09", - "$defs": { - "AuthorisationObject": { - "type": "object", - "properties": { - "@xsi:type": { - "type": "string", - "enum": "{http://uri.etsi.org/03120/common/2020/09/Authorisation}AuthorisationObject" - }, - "ObjectIdentifier": { - "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" - }, - "CountryCode": { - "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" - }, - "OwnerIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - }, - "Generation": { - "type": "integer", - "minimum": 0 - }, - "ExternalIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "AssociatedObjects": { - "$ref": "ts_103120_Core_2019_10#/$defs/AssociatedObjects" - }, - "LastChanged": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "NationalHandlingParameters": { - "$ref": "ts_103120_Core_2019_10#/$defs/NationalHandlingParameters" - }, - "auth:AuthorisationReference": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "auth:AuthorisationLegalType": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "auth:AuthorisationPriority": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "auth:AuthorisationStatus": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "auth:AuthorisationDesiredStatus": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "auth:AuthorisationTimespan": { - "$ref": "#/$defs/AuthorisationTimespan" - }, - "auth:AuthorisationCSPID": { - "$ref": "#/$defs/AuthorisationCSPID" - }, - "auth:AuthorisationCreationTimestamp": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "auth:AuthorisationServedTimestamp": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "auth:AuthorisationTerminationTimestamp": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "auth:AuthorisationApprovalDetails": { - "type": "array", - "items": { - "$ref": "ts_103120_Common_2016_02#/$defs/ApprovalDetails" - } - }, - "auth:AuthorisationInvalidReason": { - "$ref": "ts_103120_Core_2019_10#/$defs/ActionUnsuccesfulInformation" - }, - "auth:AuthorisationFlags": { - "$ref": "#/$defs/AuthorisationFlags" - }, - "auth:AuthorisationManualInformation": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "auth:NationalAuthorisationParameters": { - "$ref": "#/$defs/NationalAuthorisationParameters" - }, - "auth:AuthorisationJurisdiction": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "auth:AuthorisationTypeOfCase": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "auth:AuthorisationLegalEntity": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - } - }, - "required": [ - "@xsi:type", - "ObjectIdentifier" - ] - }, - "AuthorisationFlags": { - "type": "object", - "properties": { - "auth:AuthorisationFlag": { - "type": "array", - "items": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - } - } - }, - "required": [] - }, - "AuthorisationTimespan": { - "type": "object", - "properties": { - "auth:StartTime": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "auth:EndTime": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - } - }, - "required": [] - }, - "AuthorisationCSPID": { - "type": "object", - "properties": { - "auth:CSPID": { - "type": "array", - "items": { - "$ref": "ts_103120_Core_2019_10#/$defs/EndpointID" - }, - "minItems": 1 - } - }, - "required": [] - }, - "NationalAuthorisationParameters": { - "type": "object", - "properties": { - "auth:CountryCode": { - "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" - } - }, - "required": [ - "auth:CountryCode" - ] - } - } -} \ No newline at end of file diff --git a/103120/schema/json/ts_103120_Common.schema.json b/103120/schema/json/ts_103120_Common.schema.json deleted file mode 100644 index d11b4b4..0000000 --- a/103120/schema/json/ts_103120_Common.schema.json +++ /dev/null @@ -1,164 +0,0 @@ -{ - "$id": "ts_103120_Common_2016_02", - "$defs": { - "ETSIVersion": { - "allOf": [ - { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - }, - { - "type": "string", - "pattern": "^V\\d+\\.\\d+\\.\\d+$" - } - ] - }, - "DictionaryEntry": { - "type": "object", - "properties": { - "common:Owner": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - }, - "common:Name": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - }, - "common:Value": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - } - }, - "required": [ - "common:Owner", - "common:Name", - "common:Value" - ] - }, - "ApprovalDetails": { - "type": "object", - "properties": { - "common:ApprovalType": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "common:ApprovalDescription": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "common:ApprovalReference": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "common:ApproverDetails": { - "$ref": "#/$defs/ApproverDetails" - }, - "common:ApprovalTimestamp": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "common:ApprovalIsEmergency": { - "type": "boolean" - }, - "common:ApprovalDigitalSignature": { - "$ref": "#/$defs/ApprovalDigitalSignature" - }, - "common:ApprovalNationalDetails": { - "$ref": "#/$defs/ApprovalNationalDetails" - } - }, - "required": [] - }, - "ApproverDetails": { - "type": "object", - "properties": { - "common:ApproverName": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "common:ApproverRole": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "common:ApproverIdentity": { - "$ref": "#/$defs/ApproverIdentity" - }, - "common:ApproverContactDetails": { - "type": "array", - "items": { - "$ref": "#/$defs/ApproverContactDetails" - } - } - }, - "required": [] - }, - "ApproverIdentity": { - "oneOf": [ - { - "type": "object", - "properties": { - "common:NationalApproverIdentity": { - "$ref": "#/$defs/NationalApproverIdentity" - } - }, - "required": [ - "common:NationalApproverIdentity" - ] - } - ] - }, - "ApproverContactDetails": { - "type": "object", - "properties": { - "common:ApproverAlternateName": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "common:ApproverEmailAddress": { - "$ref": "ts_103280_2017_07#/$defs/InternationalizedEmailAddress" - }, - "common:ApproverPhoneNumber": { - "$ref": "ts_103280_2017_07#/$defs/InternationalE164" - } - }, - "required": [] - }, - "NationalApproverIdentity": { - "type": "object", - "properties": { - "common:CountryCode": { - "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" - } - }, - "required": [ - "common:CountryCode" - ] - }, - "ApprovalDigitalSignature": { - "oneOf": [ - { - "type": "object", - "properties": { - "common:NationalDigitalSignature": { - "$ref": "#/$defs/NationalDigitalSignature" - } - }, - "required": [ - "common:NationalDigitalSignature" - ] - } - ] - }, - "ApprovalNationalDetails": { - "type": "object", - "properties": { - "common:CountryCode": { - "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" - } - }, - "required": [ - "common:CountryCode" - ] - }, - "NationalDigitalSignature": { - "type": "object", - "properties": { - "common:CountryCode": { - "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" - } - }, - "required": [ - "common:CountryCode" - ] - } - } -} \ No newline at end of file diff --git a/103120/schema/json/ts_103120_Core.schema.json b/103120/schema/json/ts_103120_Core.schema.json deleted file mode 100644 index f116d31..0000000 --- a/103120/schema/json/ts_103120_Core.schema.json +++ /dev/null @@ -1,590 +0,0 @@ -{ - "$id": "ts_103120_Core_2019_10", - "$defs": { - "ObjectIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/UUID" - }, - "HI1Message": { - "type": "object", - "properties": { - "Header": { - "$ref": "#/$defs/MessageHeader" - }, - "Payload": { - "$ref": "#/$defs/MessagePayload" - }, - "Signature": {}, - "xmldsig:Signature": { - "$ref": "www.w3.org_2000_09_xmldsig##/$defs/SignatureType" - } - }, - "required": [ - "Header", - "Payload" - ] - }, - "MessageHeader": { - "type": "object", - "properties": { - "SenderIdentifier": { - "$ref": "#/$defs/EndpointID" - }, - "ReceiverIdentifier": { - "$ref": "#/$defs/EndpointID" - }, - "TransactionIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/UUID" - }, - "Timestamp": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedMicrosecondDateTime" - }, - "Version": { - "$ref": "#/$defs/Version" - } - }, - "required": [ - "SenderIdentifier", - "ReceiverIdentifier", - "TransactionIdentifier", - "Timestamp", - "Version" - ] - }, - "Version": { - "type": "object", - "properties": { - "ETSIVersion": { - "$ref": "ts_103120_Common_2016_02#/$defs/ETSIVersion" - }, - "NationalProfileOwner": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - }, - "NationalProfileVersion": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - } - }, - "required": [ - "ETSIVersion", - "NationalProfileOwner", - "NationalProfileVersion" - ] - }, - "EndpointID": { - "type": "object", - "properties": { - "CountryCode": { - "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" - }, - "UniqueIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - } - }, - "required": [ - "CountryCode", - "UniqueIdentifier" - ] - }, - "MessagePayload": { - "oneOf": [ - { - "type": "object", - "properties": { - "RequestPayload": { - "$ref": "#/$defs/RequestPayload" - } - }, - "required": [ - "RequestPayload" - ] - }, - { - "type": "object", - "properties": { - "ResponsePayload": { - "$ref": "#/$defs/ResponsePayload" - } - }, - "required": [ - "ResponsePayload" - ] - } - ] - }, - "RequestPayload": { - "type": "object", - "properties": { - "ActionRequests": { - "$ref": "#/$defs/ActionRequests" - } - }, - "required": [ - "ActionRequests" - ] - }, - "ActionRequests": { - "type": "object", - "properties": { - "ActionRequest": { - "type": "array", - "items": { - "$ref": "#/$defs/ActionRequest" - }, - "minItems": 1 - } - }, - "required": [] - }, - "ResponsePayload": { - "oneOf": [ - { - "type": "object", - "properties": { - "ActionResponses": { - "$ref": "#/$defs/ActionResponses" - } - }, - "required": [ - "ActionResponses" - ] - }, - { - "type": "object", - "properties": { - "ErrorInformation": { - "$ref": "#/$defs/ActionUnsuccesfulInformation" - } - }, - "required": [ - "ErrorInformation" - ] - } - ] - }, - "ActionResponses": { - "type": "object", - "properties": { - "ActionResponse": { - "type": "array", - "items": { - "$ref": "#/$defs/ActionResponse" - }, - "minItems": 1 - } - }, - "required": [] - }, - "ActionRequest": { - "allOf": [ - { - "type": "object", - "properties": { - "ActionIdentifier": { - "type": "integer", - "minimum": 0 - } - }, - "required": [ - "ActionIdentifier" - ] - }, - { - "oneOf": [ - { - "type": "object", - "properties": { - "GET": { - "$ref": "#/$defs/GETRequest" - } - }, - "required": [ - "GET" - ] - }, - { - "type": "object", - "properties": { - "CREATE": { - "$ref": "#/$defs/CREATERequest" - } - }, - "required": [ - "CREATE" - ] - }, - { - "type": "object", - "properties": { - "UPDATE": { - "$ref": "#/$defs/UPDATERequest" - } - }, - "required": [ - "UPDATE" - ] - }, - { - "type": "object", - "properties": { - "LIST": { - "$ref": "#/$defs/LISTRequest" - } - }, - "required": [ - "LIST" - ] - }, - { - "type": "object", - "properties": { - "DELIVER": { - "$ref": "#/$defs/DELIVERRequest" - } - }, - "required": [ - "DELIVER" - ] - } - ] - } - ] - }, - "ActionResponse": { - "allOf": [ - { - "type": "object", - "properties": { - "ActionIdentifier": { - "type": "integer", - "minimum": 0 - } - }, - "required": [ - "ActionIdentifier" - ] - }, - { - "oneOf": [ - { - "type": "object", - "properties": { - "GETResponse": { - "$ref": "#/$defs/GETResponse" - } - }, - "required": [ - "GETResponse" - ] - }, - { - "type": "object", - "properties": { - "CREATEResponse": { - "$ref": "#/$defs/CREATEResponse" - } - }, - "required": [ - "CREATEResponse" - ] - }, - { - "type": "object", - "properties": { - "UPDATEResponse": { - "$ref": "#/$defs/UPDATEResponse" - } - }, - "required": [ - "UPDATEResponse" - ] - }, - { - "type": "object", - "properties": { - "LISTResponse": { - "$ref": "#/$defs/LISTResponse" - } - }, - "required": [ - "LISTResponse" - ] - }, - { - "type": "object", - "properties": { - "ErrorInformation": { - "$ref": "#/$defs/ActionUnsuccesfulInformation" - } - }, - "required": [ - "ErrorInformation" - ] - }, - { - "type": "object", - "properties": { - "DELIVERResponse": { - "$ref": "#/$defs/DELIVERResponse" - } - }, - "required": [ - "DELIVERResponse" - ] - } - ] - } - ] - }, - "GETRequest": { - "type": "object", - "properties": { - "Identifier": { - "$ref": "#/$defs/ObjectIdentifier" - } - }, - "required": [ - "Identifier" - ] - }, - "GETResponse": { - "type": "object", - "properties": { - "HI1Object": { - "$ref": "#/$defs/ConcreteHI1Object" - } - }, - "required": [ - "HI1Object" - ] - }, - "CREATERequest": { - "type": "object", - "properties": { - "HI1Object": { - "$ref": "#/$defs/ConcreteHI1Object" - } - }, - "required": [ - "HI1Object" - ] - }, - "CREATEResponse": { - "type": "object", - "properties": { - "Identifier": { - "$ref": "#/$defs/ObjectIdentifier" - }, - "HI1Object": { - "$ref": "#/$defs/ConcreteHI1Object" - } - }, - "required": [ - "Identifier" - ] - }, - "UPDATERequest": { - "type": "object", - "properties": { - "HI1Object": { - "$ref": "#/$defs/ConcreteHI1Object" - } - }, - "required": [ - "HI1Object" - ] - }, - "UPDATEResponse": { - "type": "object", - "properties": { - "Identifier": { - "$ref": "#/$defs/ObjectIdentifier" - }, - "HI1Object": { - "$ref": "#/$defs/ConcreteHI1Object" - } - }, - "required": [ - "Identifier" - ] - }, - "LISTRequest": { - "type": "object", - "properties": { - "ObjectType": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "LastChanged": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - } - }, - "required": [] - }, - "LISTResponse": { - "type": "object", - "properties": { - "ListResponseRecord": { - "type": "array", - "items": { - "$ref": "#/$defs/ListResponseRecord" - } - } - }, - "required": [] - }, - "ListResponseRecord": { - "type": "object", - "properties": { - "ObjectType": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "Identifier": { - "$ref": "#/$defs/ObjectIdentifier" - }, - "CountryCode": { - "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" - }, - "OwnerIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - }, - "Generation": { - "type": "integer", - "minimum": 0 - }, - "ExternalIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "LastChanged": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - } - }, - "required": [ - "ObjectType", - "Identifier", - "Generation" - ] - }, - "ActionUnsuccesfulInformation": { - "type": "object", - "properties": { - "ErrorCode": { - "type": "integer", - "minimum": 0 - }, - "ErrorDescription": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - } - }, - "required": [ - "ErrorCode", - "ErrorDescription" - ] - }, - "DELIVERRequest": { - "type": "object", - "properties": { - "Identifier": { - "$ref": "#/$defs/ObjectIdentifier" - }, - "HI1Object": { - "$ref": "#/$defs/ConcreteHI1Object" - } - }, - "required": [ - "Identifier", - "HI1Object" - ] - }, - "DELIVERResponse": { - "type": "object", - "properties": { - "Identifier": { - "$ref": "#/$defs/ObjectIdentifier" - } - }, - "required": [ - "Identifier" - ] - }, - "HI1Object": { - "type": "object", - "properties": { - "ObjectIdentifier": { - "$ref": "#/$defs/ObjectIdentifier" - }, - "CountryCode": { - "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" - }, - "OwnerIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - }, - "Generation": { - "type": "integer", - "minimum": 0 - }, - "ExternalIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "AssociatedObjects": { - "$ref": "#/$defs/AssociatedObjects" - }, - "LastChanged": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "NationalHandlingParameters": { - "$ref": "#/$defs/NationalHandlingParameters" - } - }, - "required": [ - "ObjectIdentifier" - ] - }, - "AssociatedObjects": { - "type": "object", - "properties": { - "AssociatedObject": { - "type": "array", - "items": { - "$ref": "#/$defs/ObjectIdentifier" - } - } - }, - "required": [] - }, - "NationalHandlingParameters": { - "type": "object", - "properties": { - "CountryCode": { - "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" - } - }, - "required": [ - "CountryCode" - ] - }, - "ConcreteHI1Object": { - "oneOf": [ - { - "$ref": "ts_103120_Authorisation_2020_09#/$defs/AuthorisationObject" - }, - { - "$ref": "ts_103120_Task_2020_09#/$defs/LITaskObject" - }, - { - "$ref": "ts_103120_Task_2020_09#/$defs/LDTaskObject" - }, - { - "$ref": "ts_103120_Document_2020_09#/$defs/DocumentObject" - }, - { - "$ref": "ts_103120_Notification_2016_02#/$defs/NotificationObject" - }, - { - "$ref": "ts_103120_Delivery_2019_10#/$defs/DeliveryObject" - }, - { - "$ref": "ts_103120_TrafficPolicy_2022_07#/$defs/TrafficPolicyObject" - } - ] - } - }, - "$ref": "#/$defs/HI1Message" -} \ No newline at end of file diff --git a/103120/schema/json/ts_103120_Delivery.schema.json b/103120/schema/json/ts_103120_Delivery.schema.json deleted file mode 100644 index 093d127..0000000 --- a/103120/schema/json/ts_103120_Delivery.schema.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "$id": "ts_103120_Delivery_2019_10", - "$defs": { - "DeliveryObject": { - "type": "object", - "properties": { - "@xsi:type": { - "type": "string", - "enum": "{http://uri.etsi.org/03120/common/2019/10/Delivery}DeliveryObject" - }, - "ObjectIdentifier": { - "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" - }, - "CountryCode": { - "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" - }, - "OwnerIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - }, - "Generation": { - "type": "integer", - "minimum": 0 - }, - "ExternalIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "AssociatedObjects": { - "$ref": "ts_103120_Core_2019_10#/$defs/AssociatedObjects" - }, - "LastChanged": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "NationalHandlingParameters": { - "$ref": "ts_103120_Core_2019_10#/$defs/NationalHandlingParameters" - }, - "delivery:Reference": { - "$ref": "#/$defs/Reference" - }, - "delivery:DeliveryID": { - "$ref": "ts_103280_2017_07#/$defs/UUID" - }, - "delivery:SequenceNumber": { - "type": "integer", - "minimum": 0 - }, - "delivery:LastSequence": { - "type": "boolean" - }, - "delivery:Manifest": { - "$ref": "#/$defs/Manifest" - }, - "delivery:Delivery": { - "$ref": "#/$defs/Delivery" - } - }, - "required": [ - "@xsi:type", - "ObjectIdentifier" - ] - }, - "Reference": { - "oneOf": [ - { - "type": "object", - "properties": { - "delivery:LDID": { - "$ref": "ts_103280_2017_07#/$defs/LDID" - } - }, - "required": [ - "delivery:LDID" - ] - }, - { - "type": "object", - "properties": { - "delivery:LIID": { - "$ref": "ts_103280_2017_07#/$defs/LIID" - } - }, - "required": [ - "delivery:LIID" - ] - } - ] - }, - "Manifest": { - "oneOf": [ - { - "type": "object", - "properties": { - "delivery:Specification": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - } - }, - "required": [ - "delivery:Specification" - ] - }, - { - "type": "object", - "properties": { - "delivery:ExternalSchema": { - "$ref": "#/$defs/ExternalSchema" - } - }, - "required": [ - "delivery:ExternalSchema" - ] - } - ] - }, - "ExternalSchema": { - "type": "object", - "properties": { - "delivery:ManifestID": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "delivery:ManifestContents": { - "$ref": "#/$defs/ManifestContents" - } - }, - "required": [] - }, - "ManifestContents": { - "oneOf": [ - { - "type": "object", - "properties": { - "delivery:BinaryData": { - "$ref": "#/$defs/EmbeddedBinaryData" - } - }, - "required": [ - "delivery:BinaryData" - ] - }, - { - "type": "object", - "properties": { - "delivery:XMLSchema": { - "$ref": "#/$defs/SchemaContent" - } - }, - "required": [ - "delivery:XMLSchema" - ] - } - ] - }, - "SchemaContent": { - "type": "object", - "properties": { - "delivery:schema": {} - }, - "required": [ - "delivery:schema" - ] - }, - "Delivery": { - "oneOf": [ - { - "type": "object", - "properties": { - "delivery:BinaryData": { - "$ref": "#/$defs/EmbeddedBinaryData" - } - }, - "required": [ - "delivery:BinaryData" - ] - }, - { - "type": "object", - "properties": { - "delivery:XMLData": { - "$ref": "#/$defs/EmbeddedXMLData" - } - }, - "required": [ - "delivery:XMLData" - ] - } - ] - }, - "EmbeddedBinaryData": { - "type": "object", - "properties": { - "delivery:Data": { - "type": "string", - "pattern": "^[A-Za-z0-9+\\/]*={0,3}$" - }, - "delivery:ContentType": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - }, - "delivery:Checksum": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - }, - "delivery:ChecksumType": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - } - }, - "required": [ - "delivery:Data" - ] - }, - "EmbeddedXMLData": {} - } -} \ No newline at end of file diff --git a/103120/schema/json/ts_103120_Document.schema.json b/103120/schema/json/ts_103120_Document.schema.json deleted file mode 100644 index d844092..0000000 --- a/103120/schema/json/ts_103120_Document.schema.json +++ /dev/null @@ -1,148 +0,0 @@ -{ - "$id": "ts_103120_Document_2020_09", - "$defs": { - "DocumentObject": { - "type": "object", - "properties": { - "@xsi:type": { - "type": "string", - "enum": "{http://uri.etsi.org/03120/common/2020/09/Document}DocumentObject" - }, - "ObjectIdentifier": { - "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" - }, - "CountryCode": { - "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" - }, - "OwnerIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - }, - "Generation": { - "type": "integer", - "minimum": 0 - }, - "ExternalIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "AssociatedObjects": { - "$ref": "ts_103120_Core_2019_10#/$defs/AssociatedObjects" - }, - "LastChanged": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "NationalHandlingParameters": { - "$ref": "ts_103120_Core_2019_10#/$defs/NationalHandlingParameters" - }, - "doc:DocumentReference": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "doc:DocumentName": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "doc:DocumentStatus": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "doc:DocumentDesiredStatus": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "doc:DocumentTimespan": { - "$ref": "#/$defs/DocumentTimespan" - }, - "doc:DocumentType": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "doc:DocumentProperties": { - "$ref": "#/$defs/DocumentProperties" - }, - "doc:DocumentBody": { - "$ref": "#/$defs/DocumentBody" - }, - "doc:DocumentSignature": { - "type": "array", - "items": { - "$ref": "ts_103120_Common_2016_02#/$defs/ApprovalDetails" - } - }, - "doc:DocumentInvalidReason": { - "$ref": "ts_103120_Core_2019_10#/$defs/ActionUnsuccesfulInformation" - }, - "doc:NationalDocumentParameters": { - "$ref": "#/$defs/NationalDocumentParameters" - } - }, - "required": [ - "@xsi:type", - "ObjectIdentifier" - ] - }, - "DocumentTimespan": { - "type": "object", - "properties": { - "doc:StartTime": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "doc:EndTime": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - } - }, - "required": [] - }, - "DocumentProperties": { - "type": "object", - "properties": { - "doc:DocumentProperty": { - "type": "array", - "items": { - "$ref": "#/$defs/DocumentProperty" - } - } - }, - "required": [] - }, - "DocumentProperty": { - "type": "object", - "properties": { - "doc:PropertyType": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "doc:PropertyValue": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - } - }, - "required": [ - "doc:PropertyType", - "doc:PropertyValue" - ] - }, - "DocumentBody": { - "type": "object", - "properties": { - "doc:Contents": { - "type": "string", - "pattern": "^[A-Za-z0-9+\\/]*={0,3}$" - }, - "doc:ContentType": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - }, - "doc:Checksum": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - }, - "doc:ChecksumType": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - } - }, - "required": [] - }, - "NationalDocumentParameters": { - "type": "object", - "properties": { - "doc:CountryCode": { - "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" - } - }, - "required": [ - "doc:CountryCode" - ] - } - } -} \ No newline at end of file diff --git a/103120/schema/json/ts_103120_Notification.schema.json b/103120/schema/json/ts_103120_Notification.schema.json deleted file mode 100644 index 84fbf04..0000000 --- a/103120/schema/json/ts_103120_Notification.schema.json +++ /dev/null @@ -1,103 +0,0 @@ -{ - "$id": "ts_103120_Notification_2016_02", - "$defs": { - "NotificationObject": { - "type": "object", - "properties": { - "@xsi:type": { - "type": "string", - "enum": "{http://uri.etsi.org/03120/common/2016/02/Notification}NotificationObject" - }, - "ObjectIdentifier": { - "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" - }, - "CountryCode": { - "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" - }, - "OwnerIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - }, - "Generation": { - "type": "integer", - "minimum": 0 - }, - "ExternalIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "AssociatedObjects": { - "$ref": "ts_103120_Core_2019_10#/$defs/AssociatedObjects" - }, - "LastChanged": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "NationalHandlingParameters": { - "$ref": "ts_103120_Core_2019_10#/$defs/NationalHandlingParameters" - }, - "notification:NotificationDetails": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "notification:NotificationType": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "notification:NewNotification": { - "type": "boolean" - }, - "notification:NotificationTimestamp": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "notification:StatusOfAssociatedObjects": { - "$ref": "#/$defs/ListOfAssociatedObjectStatus" - }, - "notification:NationalNotificationParameters": { - "$ref": "#/$defs/NationalNotificationParameters" - } - }, - "required": [ - "@xsi:type", - "ObjectIdentifier" - ] - }, - "ListOfAssociatedObjectStatus": { - "type": "object", - "properties": { - "notification:AssociatedObjectStatus": { - "type": "array", - "items": { - "$ref": "#/$defs/AssociatedObjectStatus" - }, - "minItems": 1 - } - }, - "required": [] - }, - "AssociatedObjectStatus": { - "type": "object", - "properties": { - "notification:AssociatedObject": { - "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" - }, - "notification:Status": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "notification:Details": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - } - }, - "required": [ - "notification:AssociatedObject", - "notification:Status" - ] - }, - "NationalNotificationParameters": { - "type": "object", - "properties": { - "notification:CountryCode": { - "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" - } - }, - "required": [ - "notification:CountryCode" - ] - } - } -} \ No newline at end of file diff --git a/103120/schema/json/ts_103120_Task.schema.json b/103120/schema/json/ts_103120_Task.schema.json deleted file mode 100644 index 24de4c5..0000000 --- a/103120/schema/json/ts_103120_Task.schema.json +++ /dev/null @@ -1,599 +0,0 @@ -{ - "$id": "ts_103120_Task_2020_09", - "$defs": { - "LITaskObject": { - "type": "object", - "properties": { - "@xsi:type": { - "type": "string", - "enum": "{http://uri.etsi.org/03120/common/2020/09/Task}LITaskObject" - }, - "ObjectIdentifier": { - "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" - }, - "CountryCode": { - "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" - }, - "OwnerIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - }, - "Generation": { - "type": "integer", - "minimum": 0 - }, - "ExternalIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "AssociatedObjects": { - "$ref": "ts_103120_Core_2019_10#/$defs/AssociatedObjects" - }, - "LastChanged": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "NationalHandlingParameters": { - "$ref": "ts_103120_Core_2019_10#/$defs/NationalHandlingParameters" - }, - "task:Reference": { - "$ref": "ts_103280_2017_07#/$defs/LIID" - }, - "task:Status": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "task:DesiredStatus": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "task:Timespan": { - "$ref": "#/$defs/TaskTimespan" - }, - "task:TargetIdentifier": { - "$ref": "#/$defs/TargetIdentifier" - }, - "task:DeliveryType": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "task:DeliveryDetails": { - "$ref": "#/$defs/TaskDeliveryDetails" - }, - "task:ApprovalDetails": { - "type": "array", - "items": { - "$ref": "ts_103120_Common_2016_02#/$defs/ApprovalDetails" - } - }, - "task:CSPID": { - "$ref": "ts_103120_Core_2019_10#/$defs/EndpointID" - }, - "task:HandlingProfile": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "task:InvalidReason": { - "$ref": "ts_103120_Core_2019_10#/$defs/ActionUnsuccesfulInformation" - }, - "task:Flags": { - "$ref": "#/$defs/TaskFlags" - }, - "task:NationalLITaskingParameters": { - "$ref": "#/$defs/NationalLITaskingParameters" - }, - "task:ListOfTrafficPolicyReferences": { - "$ref": "#/$defs/ListOfTrafficPolicyReferences" - } - }, - "required": [ - "@xsi:type", - "ObjectIdentifier" - ] - }, - "TaskTimespan": { - "type": "object", - "properties": { - "task:StartTime": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "task:EndTime": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "task:TerminationTime": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "task:ProvisioningTime": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "task:DeprovisioningTime": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - } - }, - "required": [] - }, - "TargetIdentifier": { - "type": "object", - "properties": { - "task:TargetIdentifierValues": { - "$ref": "#/$defs/TargetIdentifierValues" - }, - "task:ServiceType": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - } - }, - "required": [] - }, - "TargetIdentifierValues": { - "type": "object", - "properties": { - "task:TargetIdentifierValue": { - "type": "array", - "items": { - "$ref": "#/$defs/TargetIdentifierValue" - }, - "minItems": 1 - } - }, - "required": [] - }, - "TargetIdentifierValue": { - "type": "object", - "properties": { - "task:FormatType": { - "$ref": "#/$defs/FormatType" - }, - "task:Value": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - } - }, - "required": [ - "task:FormatType", - "task:Value" - ] - }, - "FormatType": { - "type": "object", - "properties": { - "task:FormatOwner": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - }, - "task:FormatName": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - } - }, - "required": [ - "task:FormatOwner", - "task:FormatName" - ] - }, - "TaskDeliveryDetails": { - "type": "object", - "properties": { - "task:DeliveryDestination": { - "type": "array", - "items": { - "$ref": "#/$defs/DeliveryDestination" - }, - "minItems": 1 - } - }, - "required": [] - }, - "DeliveryDestination": { - "type": "object", - "properties": { - "task:DeliveryAddress": { - "$ref": "#/$defs/DeliveryAddress" - }, - "task:EncryptionDetails": { - "$ref": "#/$defs/NationalEncryptionDetails" - }, - "task:IRIorCC": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "task:HandoverFormat": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "task:DeliveryProfile": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "task:NationalDeliveryParameters": { - "$ref": "#/$defs/NationalDeliveryParameters" - } - }, - "required": [] - }, - "DeliveryAddress": { - "oneOf": [ - { - "type": "object", - "properties": { - "task:IPv4Address": { - "$ref": "ts_103280_2017_07#/$defs/IPv4Address" - } - }, - "required": [ - "task:IPv4Address" - ] - }, - { - "type": "object", - "properties": { - "task:IPv6Address": { - "$ref": "ts_103280_2017_07#/$defs/IPv6Address" - } - }, - "required": [ - "task:IPv6Address" - ] - }, - { - "type": "object", - "properties": { - "task:IPAddressPort": { - "$ref": "ts_103280_2017_07#/$defs/IPAddressPort" - } - }, - "required": [ - "task:IPAddressPort" - ] - }, - { - "type": "object", - "properties": { - "task:IPAddressPortRange": { - "$ref": "ts_103280_2017_07#/$defs/IPAddressPortRange" - } - }, - "required": [ - "task:IPAddressPortRange" - ] - }, - { - "type": "object", - "properties": { - "task:E164Number": { - "$ref": "ts_103280_2017_07#/$defs/InternationalE164" - } - }, - "required": [ - "task:E164Number" - ] - }, - { - "type": "object", - "properties": { - "task:FTPAddress": { - "type": "string" - } - }, - "required": [ - "task:FTPAddress" - ] - }, - { - "type": "object", - "properties": { - "task:URL": { - "type": "string" - } - }, - "required": [ - "task:URL" - ] - }, - { - "type": "object", - "properties": { - "task:FQDN": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - } - }, - "required": [ - "task:FQDN" - ] - }, - { - "type": "object", - "properties": { - "task:EmailAddress": { - "$ref": "ts_103280_2017_07#/$defs/EmailAddress" - } - }, - "required": [ - "task:EmailAddress" - ] - }, - { - "type": "object", - "properties": { - "task:EndpointID": { - "$ref": "ts_103120_Core_2019_10#/$defs/EndpointID" - } - }, - "required": [ - "task:EndpointID" - ] - }, - { - "type": "object", - "properties": { - "task:DeliveryInformationID": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - } - }, - "required": [ - "task:DeliveryInformationID" - ] - } - ] - }, - "TaskFlags": { - "type": "object", - "properties": { - "task:TaskFlag": { - "type": "array", - "items": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - } - } - }, - "required": [] - }, - "NationalLITaskingParameters": { - "type": "object", - "properties": { - "task:CountryCode": { - "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" - } - }, - "required": [ - "task:CountryCode" - ] - }, - "NationalDeliveryParameters": { - "type": "object", - "properties": { - "task:CountryCode": { - "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" - } - }, - "required": [ - "task:CountryCode" - ] - }, - "NationalEncryptionDetails": { - "type": "object", - "properties": { - "task:CountryCode": { - "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" - } - }, - "required": [ - "task:CountryCode" - ] - }, - "LDTaskObject": { - "type": "object", - "properties": { - "@xsi:type": { - "type": "string", - "enum": "{http://uri.etsi.org/03120/common/2020/09/Task}LDTaskObject" - }, - "ObjectIdentifier": { - "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" - }, - "CountryCode": { - "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" - }, - "OwnerIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - }, - "Generation": { - "type": "integer", - "minimum": 0 - }, - "ExternalIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "AssociatedObjects": { - "$ref": "ts_103120_Core_2019_10#/$defs/AssociatedObjects" - }, - "LastChanged": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "NationalHandlingParameters": { - "$ref": "ts_103120_Core_2019_10#/$defs/NationalHandlingParameters" - }, - "task:Reference": { - "$ref": "ts_103280_2017_07#/$defs/LDID" - }, - "task:Status": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "task:StatusReason": { - "$ref": "ts_103120_Core_2019_10#/$defs/ActionUnsuccesfulInformation" - }, - "task:DesiredStatus": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "task:RequestDetails": { - "$ref": "#/$defs/RequestDetails" - }, - "task:DeliveryDetails": { - "$ref": "#/$defs/LDDeliveryDetails" - }, - "task:ApprovalDetails": { - "type": "array", - "items": { - "$ref": "ts_103120_Common_2016_02#/$defs/ApprovalDetails" - } - }, - "task:CSPID": { - "$ref": "ts_103120_Core_2019_10#/$defs/EndpointID" - }, - "task:HandlingProfile": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "task:Flags": { - "$ref": "#/$defs/LDTaskFlags" - }, - "task:NationalLDTaskingParameters": { - "$ref": "#/$defs/NationalLDTaskingParameters" - } - }, - "required": [ - "@xsi:type", - "ObjectIdentifier" - ] - }, - "RequestDetails": { - "type": "object", - "properties": { - "task:Type": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "task:StartTime": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "task:EndTime": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "task:ObservedTime": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "task:ObservedTimes": { - "type": "array", - "items": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - } - }, - "task:RequestValues": { - "$ref": "#/$defs/RequestValues" - }, - "task:Subtype": { - "$ref": "#/$defs/RequestSubtype" - } - }, - "required": [] - }, - "RequestValues": { - "type": "object", - "properties": { - "task:RequestValue": { - "type": "array", - "items": { - "$ref": "#/$defs/RequestValue" - }, - "minItems": 1 - } - }, - "required": [] - }, - "RequestValue": { - "type": "object", - "properties": { - "task:FormatType": { - "$ref": "#/$defs/FormatType" - }, - "task:Value": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - } - }, - "required": [ - "task:FormatType", - "task:Value" - ] - }, - "RequestSubtype": { - "type": "object", - "properties": { - "task:RequestSubtype": { - "type": "array", - "items": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "minItems": 1 - } - }, - "required": [] - }, - "LDDeliveryDetails": { - "type": "object", - "properties": { - "task:LDDeliveryDestination": { - "type": "array", - "items": { - "$ref": "#/$defs/LDDeliveryDestination" - }, - "minItems": 1 - } - }, - "required": [] - }, - "LDDeliveryDestination": { - "type": "object", - "properties": { - "task:DeliveryAddress": { - "$ref": "#/$defs/DeliveryAddress" - }, - "task:EncryptionDetails": { - "$ref": "#/$defs/NationalEncryptionDetails" - }, - "task:LDHandoverFormat": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "task:LDDeliveryProfile": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - }, - "task:NationalDeliveryParameters": { - "$ref": "#/$defs/NationalDeliveryParameters" - } - }, - "required": [] - }, - "LDTaskFlags": { - "type": "object", - "properties": { - "task:LDTaskFlag": { - "type": "array", - "items": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - } - } - }, - "required": [] - }, - "NationalLDTaskingParameters": { - "type": "object", - "properties": { - "task:CountryCode": { - "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" - } - }, - "required": [ - "task:CountryCode" - ] - }, - "ListOfTrafficPolicyReferences": { - "type": "object", - "properties": { - "task:TrafficPolicyReference": { - "type": "array", - "items": { - "$ref": "#/$defs/TrafficPolicyReference" - }, - "minItems": 1 - } - }, - "required": [] - }, - "TrafficPolicyReference": { - "type": "object", - "properties": { - "task:Order": { - "type": "integer", - "minimum": 1 - }, - "task:ObjectIdentifier": { - "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" - } - }, - "required": [] - } - } -} \ No newline at end of file diff --git a/103120/schema/json/ts_103120_TrafficPolicy.schema.json b/103120/schema/json/ts_103120_TrafficPolicy.schema.json deleted file mode 100644 index 1d9619e..0000000 --- a/103120/schema/json/ts_103120_TrafficPolicy.schema.json +++ /dev/null @@ -1,198 +0,0 @@ -{ - "$id": "ts_103120_TrafficPolicy_2022_07", - "$defs": { - "TrafficPolicyObject": { - "type": "object", - "properties": { - "@xsi:type": { - "type": "string", - "enum": "{http://uri.etsi.org/03120/common/2022/07/TrafficPolicy}TrafficPolicyObject" - }, - "ObjectIdentifier": { - "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" - }, - "CountryCode": { - "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" - }, - "OwnerIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - }, - "Generation": { - "type": "integer", - "minimum": 0 - }, - "ExternalIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "AssociatedObjects": { - "$ref": "ts_103120_Core_2019_10#/$defs/AssociatedObjects" - }, - "LastChanged": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "NationalHandlingParameters": { - "$ref": "ts_103120_Core_2019_10#/$defs/NationalHandlingParameters" - }, - "tp:TrafficPolicyName": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - }, - "tp:TrafficRules": { - "$ref": "#/$defs/ListOfTrafficRuleReferences" - } - }, - "required": [ - "@xsi:type", - "ObjectIdentifier" - ] - }, - "ListOfTrafficRuleReferences": { - "type": "object", - "properties": { - "tp:TrafficRuleReference": { - "type": "array", - "items": { - "$ref": "#/$defs/TrafficRuleReference" - }, - "minItems": 1 - } - }, - "required": [] - }, - "TrafficRuleReference": { - "type": "object", - "properties": { - "tp:Order": { - "type": "integer", - "minimum": 1 - }, - "tp:ObjectIdentifier": { - "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" - } - }, - "required": [ - "tp:Order", - "tp:ObjectIdentifier" - ] - }, - "TrafficRuleObject": { - "type": "object", - "properties": { - "@xsi:type": { - "type": "string", - "enum": "{http://uri.etsi.org/03120/common/2022/07/TrafficPolicy}TrafficRuleObject" - }, - "ObjectIdentifier": { - "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier" - }, - "CountryCode": { - "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode" - }, - "OwnerIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - }, - "Generation": { - "type": "integer", - "minimum": 0 - }, - "ExternalIdentifier": { - "$ref": "ts_103280_2017_07#/$defs/LongString" - }, - "AssociatedObjects": { - "$ref": "ts_103120_Core_2019_10#/$defs/AssociatedObjects" - }, - "LastChanged": { - "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime" - }, - "NationalHandlingParameters": { - "$ref": "ts_103120_Core_2019_10#/$defs/NationalHandlingParameters" - }, - "tp:Criteria": { - "$ref": "#/$defs/ListOfTrafficCriteria" - }, - "tp:Action": { - "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry" - } - }, - "required": [ - "@xsi:type", - "ObjectIdentifier" - ] - }, - "ListOfTrafficCriteria": { - "type": "object", - "properties": { - "tp:Criteria": { - "type": "array", - "items": { - "$ref": "#/$defs/TrafficCriteria" - }, - "minItems": 1 - } - }, - "required": [] - }, - "TrafficCriteria": { - "oneOf": [ - { - "type": "object", - "properties": { - "tp:IPPolicyCriteria": { - "$ref": "#/$defs/IPPolicyCriteria" - } - }, - "required": [ - "tp:IPPolicyCriteria" - ] - }, - { - "type": "object", - "properties": { - "tp:MobileAccessPolicyCriteria": { - "$ref": "#/$defs/MobileAccessPolicyCriteria" - } - }, - "required": [ - "tp:MobileAccessPolicyCriteria" - ] - } - ] - }, - "IPPolicyCriteria": { - "type": "object", - "properties": { - "tp:IPProtocol": { - "type": "integer", - "minimum": 0 - }, - "tp:SourceIPRange": { - "$ref": "ts_103280_2017_07#/$defs/IPCIDR" - }, - "tp:SourcePortRange": { - "$ref": "ts_103280_2017_07#/$defs/PortRange" - }, - "tp:DestinationIPRange": { - "$ref": "ts_103280_2017_07#/$defs/IPCIDR" - }, - "tp:DestinationPortRange": { - "$ref": "ts_103280_2017_07#/$defs/PortRange" - }, - "tp:BothDirections": { - "type": "boolean" - } - }, - "required": [] - }, - "MobileAccessPolicyCriteria": { - "type": "object", - "properties": { - "tp:APN": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - }, - "tp:DNN": { - "$ref": "ts_103280_2017_07#/$defs/ShortString" - } - }, - "required": [] - } - } -} \ No newline at end of file -- GitLab From 6bef8393d149ae8cc8b2a2baa4727a7e64e181aa Mon Sep 17 00:00:00 2001 From: mark Date: Fri, 9 Jun 2023 11:32:29 +0100 Subject: [PATCH 21/22] Adding JSON to XML conversion --- temp.xml | 2 ++ utils/json_to_xml.py | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 temp.xml create mode 100644 utils/json_to_xml.py diff --git a/temp.xml b/temp.xml new file mode 100644 index 0000000..84b8e2e --- /dev/null +++ b/temp.xml @@ -0,0 +1,2 @@ + +
XXACTOR01XXACTOR02c02358b2-76cf-4ba4-a8eb-f6436ccaea2e2015-09-01T12:00:00.000000ZV1.13.1XXv1.0
07dbbc880-8750-4d3c-abe7-ea4a17646045XXACTOR01W0000012015-09-01T12:00:00Z2015-12-01T12:00:00Z12b36a78b-b628-416d-bd22-404e68a0cd36XXACTOR017dbbc880-8750-4d3c-abe7-ea4a17646045LIID1ETSIInternationalE164442079460223ETSITaskDeliveryTypeIRIandCC192.0.2.0XXRECVER01 diff --git a/utils/json_to_xml.py b/utils/json_to_xml.py new file mode 100644 index 0000000..17764a7 --- /dev/null +++ b/utils/json_to_xml.py @@ -0,0 +1,35 @@ +import sys +import logging +from pprint import pprint +import json +from pathlib import Path +import fileinput + +import xmltodict +import argparse + + +if __name__ == "__main__": + parser = argparse.ArgumentParser() + parser.add_argument('-v', '--verbose', action='count', help='Verbose logging (can be specified multiple times)') + parser.add_argument('-i', '--input', type=argparse.FileType('r'), default=sys.stdin, help="Path to input file (if absent, stdin is used)") + args = parser.parse_args() + + match args.verbose: + case v if v and v >= 2: + logging.basicConfig(level=logging.DEBUG) + case 1: + logging.basicConfig(level=logging.INFO) + case _: + logging.basicConfig(level=logging.WARNING) + + logging.debug(f"Arguments: {args}") + + s = args.input.read() + args.input.close() + + logging.debug(s) + j = json.loads(s) + + xml = xmltodict.unparse({'HI1Message' : j}, ) + print(xml) \ No newline at end of file -- GitLab From 9356032fe2eed2baaf9a2fb56e36d2c77493e215 Mon Sep 17 00:00:00 2001 From: mark Date: Wed, 21 Jun 2023 08:41:08 +0100 Subject: [PATCH 22/22] Removing temp file --- temp.xml | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 temp.xml diff --git a/temp.xml b/temp.xml deleted file mode 100644 index 84b8e2e..0000000 --- a/temp.xml +++ /dev/null @@ -1,2 +0,0 @@ - -
XXACTOR01XXACTOR02c02358b2-76cf-4ba4-a8eb-f6436ccaea2e2015-09-01T12:00:00.000000ZV1.13.1XXv1.0
07dbbc880-8750-4d3c-abe7-ea4a17646045XXACTOR01W0000012015-09-01T12:00:00Z2015-12-01T12:00:00Z12b36a78b-b628-416d-bd22-404e68a0cd36XXACTOR017dbbc880-8750-4d3c-abe7-ea4a17646045LIID1ETSIInternationalE164442079460223ETSITaskDeliveryTypeIRIandCC192.0.2.0XXRECVER01 -- GitLab