From 67b29c8d787fe0aafa6c3abe0458e7d728b42d10 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 11 Apr 2025 09:35:34 +0000 Subject: [PATCH 1/9] Rel18 CR1493 TS28.541 correction to inconsistency between stage 2 and stage 3... --- OpenAPI/TS28541_NrNrm.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index f724f144b..055c285de 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -729,6 +729,8 @@ components: $ref: '#/components/schemas/CCOFunction-Single' NTNFunction: $ref: '#/components/schemas/NTNFunction-Single' + NRECMappingRule: + $ref: '#/components/schemas/NRECMappingRule-Multiple' ManagedElement-ncO-NrNrm: type: object properties: @@ -758,6 +760,8 @@ components: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple' NTNFunction: $ref: '#/components/schemas/NTNFunction-Single' + NRECMappingRule: + $ref: '#/components/schemas/NRECMappingRule-Multiple' #-------- Definition of abstract IOCs -------------------------------------------- -- GitLab From 582a7b808d2899976751f88147090844cf83fe76 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 11 Apr 2025 09:40:21 +0000 Subject: [PATCH 2/9] Rel18 CR1494 TS28.541 correction_to_stage_3_of_SatelliteBackhaulInfo: Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index c231b37d5..fd854dcf0 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -2268,9 +2268,9 @@ components: description: defines the list of satellite backhaul information type: object properties: - globalRanNodeID: - $ref: '#/components/schemas/GlobalRanNodeID' - SatelliteBackhaulCategory: + nTNGlobalRanNodeID: + $ref: '#/components/schemas/NTNGlobalRanNodeID' + satelliteBackhaulCategory: anyOf: - type: string enum: @@ -2287,7 +2287,7 @@ components: geoSatelliteId: type: string pattern: '^[0-9]{5}$' - GlobalRanNodeID: + NTNGlobalRanNodeID: description: globally identification of an NG-RAN node type: object oneOf: @@ -3089,8 +3089,11 @@ components: $ref: '#/components/schemas/AmfInfo' sliceExpiryInfo: $ref: '#/components/schemas/SliceExpiryInfo' - SatelliteBackhaulInfoList: - $ref: '#/components/schemas/SatelliteBackhaulInfo' + satelliteBackhaulInfoList: + type: array + items: + $ref: '#/components/schemas/SatelliteBackhaulInfo' + minItems: 1 mappedCellIdInfoList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList' mdtUserConsentReqList: -- GitLab From d0d4c51a02498bb35c58afad117cf7ac6bdf98bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Fri, 28 Mar 2025 08:28:37 +0000 Subject: [PATCH 3/9] Update TS28318_DsoNrm.yaml --- OpenAPI/TS28318_DsoNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28318_DsoNrm.yaml b/OpenAPI/TS28318_DsoNrm.yaml index 7246dca06..ec4f9ca21 100644 --- a/OpenAPI/TS28318_DsoNrm.yaml +++ b/OpenAPI/TS28318_DsoNrm.yaml @@ -17,8 +17,8 @@ components: EnergyServiceLocation: type: object properties: - CGI: - type: string + outageArea: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AreaOfInterest' energySupplyId: type: string -- GitLab From 35b216fbb243ddf59348a713ab38d9edd228e7de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Fri, 28 Mar 2025 16:47:02 +0000 Subject: [PATCH 4/9] Update TS28318_DsoNrm.yaml --- OpenAPI/TS28318_DsoNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28318_DsoNrm.yaml b/OpenAPI/TS28318_DsoNrm.yaml index ec4f9ca21..085fdafc0 100644 --- a/OpenAPI/TS28318_DsoNrm.yaml +++ b/OpenAPI/TS28318_DsoNrm.yaml @@ -4,7 +4,7 @@ info: version: 18.1.0 description: >- OAS 3.0.1 specification of the OutageAndRecoveryInfo NRM - © 2024, 3GPP Organizational OutageAndRecoveryInfo Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2025, 3GPP Organizational OutageAndRecoveryInfo Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.318; OutageAndRecoveryInfo NRM -- GitLab From 6fe5a601b8789c8cbb9934eb0cc6c69f2e49dcf1 Mon Sep 17 00:00:00 2001 From: ruanb Date: Fri, 28 Mar 2025 17:32:02 +0000 Subject: [PATCH 5/9] Rel18_CR1522_TS28541_Fix_nTNTAClist_for_stage3_OpenAPI --- OpenAPI/TS28541_NrNrm.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 055c285de..cee902348 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -561,12 +561,6 @@ components: type: integer minValue: type: integer - - NTNTAClist: - type: array - items: - $ref: '#/components/schemas/NrTac' - Ephemeris: type: object oneOf: -- GitLab From ef406d4c13e4261a537e3efc637b5fd7cad8b608 Mon Sep 17 00:00:00 2001 From: lengyelb Date: Tue, 27 May 2025 16:22:45 +0200 Subject: [PATCH 6/9] 28.111_CR0042_Rel18_Add_alarmType_other into Integration --- OpenAPI/TS28111_FaultNrm.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/TS28111_FaultNrm.yaml b/OpenAPI/TS28111_FaultNrm.yaml index 7a525d13f..cf6e69f88 100644 --- a/OpenAPI/TS28111_FaultNrm.yaml +++ b/OpenAPI/TS28111_FaultNrm.yaml @@ -40,6 +40,7 @@ components: - PHYSICAL_VIOLATION - SECURITY_SERVICE_OR_MECHANISM_VIOLATION - TIME_DOMAIN_VIOLATION + - OTHER ProbableCause: description: >- The value of the probable cause may be a specific standardized string, or any -- GitLab From 9f961373ef26a6ff2a22bdb100e2ffb78eb24fe2 Mon Sep 17 00:00:00 2001 From: zhaoxxian Date: Wed, 7 May 2025 07:45:28 +0000 Subject: [PATCH 7/9] rename the dataType ThresholdInfo as ThresholdCrossing (stage 2 was agreed in S5-252068) --- OpenAPI/TS28111_FaultNrm.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenAPI/TS28111_FaultNrm.yaml b/OpenAPI/TS28111_FaultNrm.yaml index cf6e69f88..685eaa577 100644 --- a/OpenAPI/TS28111_FaultNrm.yaml +++ b/OpenAPI/TS28111_FaultNrm.yaml @@ -101,7 +101,7 @@ components: properties: down: $ref: '#/components/schemas/ThresholdHysteresis' - ThresholdInfo: + ThresholdCrossing: type: object properties: observedMeasurement: @@ -170,7 +170,7 @@ components: trendIndication: $ref: '#/components/schemas/TrendIndication' thresholdinfo: - $ref: '#/components/schemas/ThresholdInfo' + $ref: '#/components/schemas/ThresholdCrossing' correlatedNotifications: $ref: '#/components/schemas/CorrelatedNotifications' stateChangeDefinition: @@ -281,7 +281,7 @@ components: trendIndication: $ref: '#/components/schemas/TrendIndication' thresholdInfo: - $ref: '#/components/schemas/ThresholdInfo' + $ref: '#/components/schemas/ThresholdCrossing' correlatedNotifications: $ref: '#/components/schemas/CorrelatedNotifications' stateChangeDefinition: @@ -402,7 +402,7 @@ components: trendIndication: $ref: '#/components/schemas/TrendIndication' thresholdInfo: - $ref: '#/components/schemas/ThresholdInfo' + $ref: '#/components/schemas/ThresholdCrossing' stateChangeDefinition: $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeValueChangeSet' monitoredAttributes: -- GitLab From 1907d0ef9f63aca1459555f632994948b14a2cf2 Mon Sep 17 00:00:00 2001 From: ruanb Date: Fri, 9 May 2025 19:33:54 +0000 Subject: [PATCH 8/9] Rel18_CR1544_28.541_Fix_stage3_related_to_UpfInfo --- OpenAPI/TS28541_5GcNrm.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index fd854dcf0..f21df1ed5 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -2838,42 +2838,34 @@ components: type: array items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai' - minItems: 1 pduSessionTypes: type: array items: $ref: 'TS29571_CommonData.yaml#/components/schemas/PduSessionType' - minItems: 1 ipv4AddressRanges: type: array items: $ref: '#/components/schemas/Ipv4AddressRange' - minItems: 1 ipv6PrefixRanges: type: array items: $ref: '#/components/schemas/Ipv6PrefixRange' - minItems: 1 natedIpv4AddressRanges: type: array items: $ref: '#/components/schemas/Ipv4AddressRange' - minItems: 1 natedIpv6PrefixRanges: type: array items: $ref: '#/components/schemas/Ipv6PrefixRange' - minItems: 1 ipv4IndexList: type: array items: $ref: '#/components/schemas/IpIndex' - minItems: 1 ipv6IndexList: type: array items: $ref: '#/components/schemas/IpIndex' - minItems: 1 networkInstance: description: > The N6 Network Instance associated with the S-NSSAI and DNN. -- GitLab From 4bfaa7e5d05dd7f1e9681f90fa94070793344871 Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 28 May 2025 13:52:45 +0800 Subject: [PATCH 9/9] Update versions to be aligned with the version of word spec for SA plenary#108 --- OpenAPI/TS28111_FaultNrm.yaml | 4 ++-- OpenAPI/TS28318_DsoNrm.yaml | 2 +- OpenAPI/TS28541_5GcNrm.yaml | 2 +- OpenAPI/TS28541_NrNrm.yaml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/OpenAPI/TS28111_FaultNrm.yaml b/OpenAPI/TS28111_FaultNrm.yaml index 685eaa577..8cd906745 100644 --- a/OpenAPI/TS28111_FaultNrm.yaml +++ b/OpenAPI/TS28111_FaultNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Fault Management NRM - version: 18.1.0 + version: 18.5.0 description: >- OAS 3.0.1 definition of the Fault Supervision MnS - © 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.111; Fault Management diff --git a/OpenAPI/TS28318_DsoNrm.yaml b/OpenAPI/TS28318_DsoNrm.yaml index 085fdafc0..41968fa51 100644 --- a/OpenAPI/TS28318_DsoNrm.yaml +++ b/OpenAPI/TS28318_DsoNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP NRM - version: 18.1.0 + version: 18.2.0 description: >- OAS 3.0.1 specification of the OutageAndRecoveryInfo NRM © 2025, 3GPP Organizational OutageAndRecoveryInfo Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index f21df1ed5..73fc83dfe 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP 5GC NRM - version: 18.11.0 + version: 18.12.0 description: >- OAS 3.0.1 specification of the 5GC NRM © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index cee902348..3ad07f7b7 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: NR NRM - version: 18.11.0 + version: 18.12.0 description: >- OAS 3.0.1 specification of the NR NRM © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab