From 7af8ed5fae427bbeb3f9e9f32af391bcfdcaf35d Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 21 Feb 2025 11:25:28 +0000 Subject: [PATCH 01/10] Rel18 CR1456 TS28.541 correction to inconsistency between stage 2 and stage 3 --- OpenAPI/TS28541_NrNrm.yaml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 751378165..2e62cec8b 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -246,10 +246,8 @@ components: CyclicPrefix: type: string enum: - - '15' - - '30' - - '60' - - '120' + - NORMAL, + - EXTENDED TxDirection: type: string enum: @@ -267,8 +265,6 @@ components: enum: - INITIAL - OTHER - - SUL - IsESCoveredBy: type: string enum: @@ -925,7 +921,7 @@ components: $ref: '#/components/schemas/GGnbIdList' x2HOBlockList: $ref: '#/components/schemas/GEnbIdList' - xnHOBlackList: + xnHOBlockList: $ref: '#/components/schemas/GGnbIdList' mappingSetIDBackhaulAddress: type: array -- GitLab From 1643097a1b8181a7bb5632e8103e916c2a062ad1 Mon Sep 17 00:00:00 2001 From: allwang Date: Tue, 4 Feb 2025 14:10:56 +0000 Subject: [PATCH 02/10] Update TS28623_ComDefs.yaml --- OpenAPI/TS28623_ComDefs.yaml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 8c62eb9d1..0c2eac63a 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -106,17 +106,15 @@ components: $ref: '#/components/schemas/Longitude' altitude: $ref: '#/components/schemas/Float' - GeoPolygon: - type: array - items: - $ref: '#/components/schemas/GeoCoordinate' - minItems: 1 GeoArea: oneOf: - type: object properties: geoPolygon: - $ref: '#/components/schemas/GeoCoordinate' + type: array + items: + $ref: '#/components/schemas/GeoCoordinate' + minItems: 1 GeoAreaToCellMapping: type: object properties: -- GitLab From 2d15ae90e6bf32c0c23225a4f1898f0b08477b8b Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 21 Jan 2025 11:19:16 +0000 Subject: [PATCH 03/10] Update file TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 2e62cec8b..508389c8a 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -735,7 +735,8 @@ components: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple' CCOFunction: $ref: '#/components/schemas/CCOFunction-Single' - + NTNFunction: + $ref: '#/components/schemas/NTNFunction-Single' ManagedElement-ncO-NrNrm: type: object properties: @@ -763,6 +764,8 @@ components: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Configurable5QISet-Multiple' Dynamic5QISet: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple' + NTNFunction: + $ref: '#/components/schemas/NTNFunction-Single' #-------- Definition of abstract IOCs -------------------------------------------- -- GitLab From 14b3214df9fee38dc0c48781278bc9ac4552ed03 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 22 Jan 2025 00:52:11 +0000 Subject: [PATCH 04/10] Update 2 files - /OpenAPI/TS28104_MdaNrm.yaml - /OpenAPI/TS28104_MdaReport.yaml --- OpenAPI/TS28104_MdaNrm.yaml | 2 +- OpenAPI/TS28104_MdaReport.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index 2f0530b4b..989a34c39 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -60,7 +60,7 @@ components: type: object properties: mDAType: - type: string + $ref: '#/components/schemas/MDAType' mDAOutputIEFilters: type: array items: diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml index f3b97098d..9848d9c61 100644 --- a/OpenAPI/TS28104_MdaReport.yaml +++ b/OpenAPI/TS28104_MdaReport.yaml @@ -19,7 +19,7 @@ components: type: object properties: mDAType: - type: string + $ref: 'TS28104_MdaNrm.yaml#/components/schemas/MDAType' mDAOutputList: type: array items: -- GitLab From 9e4f8e0472ede425af62e161a1bac8c00b3b918d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Thu, 19 Dec 2024 10:13:35 +0000 Subject: [PATCH 05/10] Update TS28105_AiMlNrm.yaml --- OpenAPI/TS28105_AiMlNrm.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index e85c31cb2..888d989d6 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -249,7 +249,9 @@ components: trainingDataQualityScore: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' trainingRequestSource: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + oneOf: + - type: string + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' requestStatus: $ref: '#/components/schemas/RequestStatus' expectedRuntimeContext: -- GitLab From 730406ca6abd074685c1fb5f87c15419fcdfc0f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Fri, 7 Feb 2025 11:58:08 +0000 Subject: [PATCH 06/10] Update TS28105_AiMlNrm.yaml --- OpenAPI/TS28105_AiMlNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 888d989d6..349f79cf7 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -4,7 +4,7 @@ info: version: 18.6.0 description: >- OAS 3.0.1 specification of the AI/ML NRM - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.105; AI/ML Management -- GitLab From aa8d9bd38084de9decfb5d1dd3d1a387715fd3d4 Mon Sep 17 00:00:00 2001 From: ruanb Date: Fri, 7 Feb 2025 09:45:39 +0000 Subject: [PATCH 07/10] Rel18_CR1465_TS28.541_add_missing_satelliteCoverageInfoList_for_stage3_OpenAPI --- OpenAPI/TS28541_5GcNrm.yaml | 46 +++++++++++++++++++++++++++++++++---- 1 file changed, 41 insertions(+), 5 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 82448ccc6..5ddc6613b 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -147,8 +147,6 @@ components: type: array items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac' - WeightFactor: - type: integer VendorId: type: string description: Vendor ID of the NF Service instance (Private Enterprise Number assigned by IANA) @@ -2342,9 +2340,47 @@ components: blockedLocation: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' blockedDurWindow: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' blockedSlice: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' + SatelliteCoverageInfoList: + description: SatelliteCoverageInfoList that relates to NR Satellite RAT type and corresponding information of satellite coverage + type: array + items: + $ref: '#/components/schemas/SatelliteCoverageInfo' + SatelliteCoverageInfo: + description: This datatype defines information related to NR Satellite RAT type and corresponding information of satellite coverage + type: object + properties: + nRSatelliteRATtype: + anyOf: + - type: string + enum: + - NRLEO + - NRMEO + - NRGEO + - NROTHERSAT + - type: string + locationInfo: + type: array + items: + $ref: '#/components/schemas/NtnLocationInfo' + NtnLocationInfo: + description: This datatype defines the information about locations and corresponding time windows + type: object + properties: + location: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' + availabilityWindows: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + nonAvailabilityWindows: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' 5GDdnmfInfo: description: Information of an 5G DDNMF NF Instance type: object @@ -3037,8 +3073,6 @@ components: $ref: '#/components/schemas/AmfIdentifier' sBIFqdn: type: string - weightFactor: - $ref: '#/components/schemas/WeightFactor' cNSIIdList: $ref: '#/components/schemas/CNSIIdList' amfSetRef: @@ -3049,6 +3083,8 @@ components: $ref: '#/components/schemas/CommModelList' nTNPLMNRestrictionsList: $ref: '#/components/schemas/NTNPLMNRestrictionsList' + satelliteCoverageInfoList: + $ref: '#/components/schemas/SatelliteCoverageInfoList' amfInfo: $ref: '#/components/schemas/AmfInfo' sliceExpiryInfo: -- GitLab From 07b98d730137e26053b8f9e54c8a9e883731bf8f Mon Sep 17 00:00:00 2001 From: shixixi Date: Sun, 26 Jan 2025 07:26:10 +0000 Subject: [PATCH 08/10] Update TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 508389c8a..0ff5e36f5 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -167,19 +167,11 @@ components: type: integer minimum: 0 maximum: 100 - maxNumberOfPreamblesSent: - enum: - - n3 - - n4 - - n5 - - n6 - - n7 - - n8 - - n10 - - n20 - - n50 - - n100 - - n200 + NumberOfPreamblesSent: + type: integer + minimum: 0 + maximum: 200 + UeAccDelayProbabilityDist: type: array -- GitLab From 1b2b2913e4291982d2cf9e57c539bfb042fe3bcf Mon Sep 17 00:00:00 2001 From: shixixi Date: Wed, 5 Feb 2025 07:25:14 +0000 Subject: [PATCH 09/10] Update TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 0ff5e36f5..1ba1e322d 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -167,7 +167,7 @@ components: type: integer minimum: 0 maximum: 100 - NumberOfPreamblesSent: + numberOfPreamblesSent: type: integer minimum: 0 maximum: 200 -- GitLab From d0f77e3f85cfe0214e9c0aed8a47cd2ddc1e21da Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 28 Feb 2025 09:38:15 +0000 Subject: [PATCH 10/10] Code Moderator update copyright and version --- OpenAPI/TS28104_MdaNrm.yaml | 4 ++-- OpenAPI/TS28104_MdaReport.yaml | 4 ++-- OpenAPI/TS28105_AiMlNrm.yaml | 2 +- OpenAPI/TS28541_5GcNrm.yaml | 4 ++-- OpenAPI/TS28541_NrNrm.yaml | 4 ++-- OpenAPI/TS28623_ComDefs.yaml | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index 989a34c39..3071fa954 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: MDA NRM - version: 18.6.0 + version: 18.7.0 description: >- OAS 3.0.1 specification of the MDA NRM - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.104; MDA diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml index 9848d9c61..ae1b0c0ad 100644 --- a/OpenAPI/TS28104_MdaReport.yaml +++ b/OpenAPI/TS28104_MdaReport.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: MDA Report - version: 18.6.0 + version: 18.7.0 description: >- OAS 3.0.1 specification of the MDA Report - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.104; MDA Report diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 349f79cf7..5e24d9000 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: AI/ML NRM - version: 18.6.0 + version: 18.7.0 description: >- OAS 3.0.1 specification of the AI/ML NRM © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 5ddc6613b..c231b37d5 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: 3GPP 5GC NRM - version: 18.10.0 + version: 18.11.0 description: >- OAS 3.0.1 specification of the 5GC NRM - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.541; 5G NRM, 5GC NRM diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 1ba1e322d..f724f144b 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: NR NRM - version: 18.10.0 + version: 18.11.0 description: >- OAS 3.0.1 specification of the NR NRM - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.541; 5G NRM, NR NRM diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 0c2eac63a..6a51002c7 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Common Type Definitions - version: 18.9.0 + version: 18.10.0 description: >- OAS 3.0.1 specification of common type definitions in the Generic NRM - © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.623; Generic NRM; Common type definitions -- GitLab