From 2ab12ade7c10201134fd0c127c10c74f49b8eba7 Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 18 Jul 2024 12:34:58 +0100 Subject: [PATCH 1/2] Making changes post conference call --- .../examples/example1/csp_records.schema.json | 1 + 103705/examples/example1/csp_results.json | 3 +- 103705/schema/etsi_types.schema.json | 88 +++++++++---------- 103705/schema/records.schema.json | 9 +- 103705/schema/response.schema.json | 5 +- 5 files changed, 53 insertions(+), 53 deletions(-) diff --git a/103705/examples/example1/csp_records.schema.json b/103705/examples/example1/csp_records.schema.json index 53e719a..55d933b 100644 --- a/103705/examples/example1/csp_records.schema.json +++ b/103705/examples/example1/csp_records.schema.json @@ -4,6 +4,7 @@ "title": "CSP Record Schema", "description": "Defines the valid set of Records that may appear in a RecordSet (see ETSI TS 103 705 clause 6.2.4)", "cspSchemaID" : "csp.example_1", + "cspName" : "csp.example.com", "dateIssued" : "2024-04-024T09:00:01Z", "version" : "1.1.1", "$defs": { diff --git a/103705/examples/example1/csp_results.json b/103705/examples/example1/csp_results.json index bc10207..52dbe6f 100644 --- a/103705/examples/example1/csp_results.json +++ b/103705/examples/example1/csp_results.json @@ -19,7 +19,8 @@ "parties": [ { "identity": {"phoneNumber": "491713920067"}, - "role": "originating" + "role": "originating", + "initialAccessTechnology" : "5G" }, { "identity": {"phoneNumber": "441632960123"}, diff --git a/103705/schema/etsi_types.schema.json b/103705/schema/etsi_types.schema.json index a30a09a..707619a 100644 --- a/103705/schema/etsi_types.schema.json +++ b/103705/schema/etsi_types.schema.json @@ -18,11 +18,11 @@ "type": "string", "title": "Relationship", "description": "Indicates the nature of the relationship. Valid values and their meaning should be provided by the CSP" - }, - "required": [ - "destination" - ] - } + } + }, + "required": [ + "destination" + ] }, "CallRecord": { "type": "object", @@ -38,11 +38,11 @@ }, "timeBegin": { "$ref": "ts_103280_2017_07#/$defs/QualifiedMicrosecondDateTime", - "description": "Unknown fractions of the time to be filled-in with zeros" + "description": "Time at which the call began" }, "timeEnd": { "$ref": "ts_103280_2017_07#/$defs/QualifiedMicrosecondDateTime", - "description": "Unknown fractions of the time to be filled-in with zeros" + "description": "Time at which the call ended" }, "callDuration": { "type": "integer", @@ -78,7 +78,7 @@ }, "eventTime": { "$ref": "ts_103280_2017_07#/$defs/QualifiedMicrosecondDateTime", - "description": "Unknown fractions of the time to be filled-in with zeros" + "description": "Time at which the event happened" }, "parties": { "type": "array", @@ -102,7 +102,7 @@ }, "eventTime": { "$ref": "ts_103280_2017_07#/$defs/QualifiedMicrosecondDateTime", - "description": "Unknown fractions of the time to be filled-in with zeros" + "description": "Time at which the event happened" }, "parties": { "type": "array", @@ -126,11 +126,11 @@ }, "timeBegin": { "$ref": "ts_103280_2017_07#/$defs/QualifiedMicrosecondDateTime", - "description": "Unknown fractions of the time to be filled-in with zeros" + "description": "Time at which the data access session began" }, "timeEnd": { "$ref": "ts_103280_2017_07#/$defs/QualifiedMicrosecondDateTime", - "description": "Unknown fractions of the time to be filled-in with zeros" + "description": "Time at which the data access session ended" }, "parties": { "type": "array", @@ -158,9 +158,9 @@ "unknown" ] }, - "bearer": { - "$ref": "#/$defs/Bearer", - "description": "For bearer information specific for this party" + "initialAccessTechnology": { + "$ref": "#/$defs/AccessTechnology", + "description": "Access technology used at the start of the call" }, "locations": { "type": "array", @@ -183,9 +183,9 @@ "receiver" ] }, - "bearer": { - "$ref": "#/$defs/Bearer", - "description": "For bearer information specific for this party" + "accessTechnology": { + "$ref": "#/$defs/AccessTechnology", + "description": "Access technology used" }, "locations": { "type": "array", @@ -208,9 +208,9 @@ "receiver" ] }, - "bearer": { - "$ref": "#/$defs/Bearer", - "description": "For bearer information specific for this party" + "accessTechnology": { + "$ref": "#/$defs/AccessTechnology", + "description": "Access technology used" }, "locations": { "type": "array", @@ -225,17 +225,18 @@ "description": "Information about the participants and technologies related to the data service", "properties": { "identity": { - "$ref": "#/$defs/DataPartyId" + "$ref": "#/$defs/DataAccessPartyId" }, - "aPN": { - "type": "s_103280_2017_07#/$defs/APN" + "aPNdNN": { + "description" : "APN or DPN associated with the data access", + "$ref": "ts_103280_2017_07#/$defs/DNN" }, "dNN": { - "type": "s_103280_2017_07#/$defs/DNN" + "$ref": "ts_103280_2017_07#/$defs/DNN" }, - "bearer": { - "$ref": "#/$defs/Bearer", - "description": "For bearer information specific for this party" + "initialAccessTechnology": { + "$ref": "#/$defs/AccessTechnology", + "description": "Access technology used at the start of the data access session" }, "locations": { "type": "array", @@ -368,26 +369,19 @@ } } }, - "Bearer": { - "type": "object", - "description": "The Technology used", - "properties": { - "technology": { - "enum": [ - "2G", - "3G", - "4G", - "5G", - "fiber", - "cable", - "wifi", - "xDSL", - "pstn" - ], - "description": "The technology used;" - } - - } + "AccessTechnology": { + "description": "Access technology used", + "enum": [ + "2G", + "3G", + "4G", + "5G", + "fiber", + "cable", + "wifi", + "xDSL", + "pstn" + ] }, "Location": { "type": "object", diff --git a/103705/schema/records.schema.json b/103705/schema/records.schema.json index c2b2698..ab59701 100644 --- a/103705/schema/records.schema.json +++ b/103705/schema/records.schema.json @@ -1,11 +1,12 @@ { - "$id": "urn:etsi:li:103705:record-schema-id:v1", + "$id": "urn:etsi:li:103705:record-schema-id:v1.1.1", "$schema": "https://json-schema.org/draft/2020-12/schema", "title": "CSP Record Schema", "description": "Defines the valid set of Records that may appear in a RecordSet (see ETSI TS 103 705 clause 6.2.4)", - "cspSchemaID" : "{replace with assigned ID - see TS 103 705 Table 6.2}", - "dateIssued" : "{replace with date issued - see TS 103 705 Table 6.2}", - "version" : "{Replace with version - see TS 103 705 Table 6.2}", + "cspName" : "{replace with assigned CSP name - see ETSI TS 103 705 Table 6.2.4-1", + "cspSchemaID" : "{replace with assigned ID - see ETSI TS 103 705 Table 6.2.4-1}", + "dateIssued" : "{replace with date issued - see ETSI TS 103 705 Table 6.2.4-1}", + "cspSchemaVersion" : "{Replace with version - see ETSI TS 103 705 Table 6.2.4-1}", "$defs": { "record" : { "oneOf" : [ diff --git a/103705/schema/response.schema.json b/103705/schema/response.schema.json index d7985f0..2529b2a 100644 --- a/103705/schema/response.schema.json +++ b/103705/schema/response.schema.json @@ -42,16 +42,19 @@ "$ref": "#/$defs/schemaId" }, "cspSchemaVersion" : { - "description" : "the version number assigned by the CSP to the CSP Record Schema identified by the cspSchemaId (see clause 5.2.6)", + "description" : "Version number assigned by the CSP to the CSP Record Schema identified by the cspSchemaId (see clause 5.2.6)", "$ref": "#/$defs/version" }, "resultSetId": { + "description" : "Unique identifier for this result set (see clause 5.2.7)", "$ref": "#/$defs/resultSetId" }, "requestReference": { + "description" : "Reference to the original request (see clause 5.2.8)", "$ref": "#/$defs/requestReference" }, "created": { + "description" : "Timestamp showing the creation time of the Response (see clause 5.2.9)", "$ref": "ts_103280_2017_07#/$defs/QualifiedMicrosecondDateTime" } }, -- GitLab From 886388095b9d66d99b92851bbf7c640ec3a8847e Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 18 Jul 2024 12:38:09 +0100 Subject: [PATCH 2/2] Removing DNN --- 103705/schema/etsi_types.schema.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/103705/schema/etsi_types.schema.json b/103705/schema/etsi_types.schema.json index 707619a..181b385 100644 --- a/103705/schema/etsi_types.schema.json +++ b/103705/schema/etsi_types.schema.json @@ -231,9 +231,6 @@ "description" : "APN or DPN associated with the data access", "$ref": "ts_103280_2017_07#/$defs/DNN" }, - "dNN": { - "$ref": "ts_103280_2017_07#/$defs/DNN" - }, "initialAccessTechnology": { "$ref": "#/$defs/AccessTechnology", "description": "Access technology used at the start of the data access session" -- GitLab