From 4a62650fb68011a13d5f410015ea87ebaab64d4b Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 18 Oct 2024 06:38:06 +0000 Subject: [PATCH 01/31] TS28.623 Rel18 CR0441 and TS28532 CR0343 correction to Jex for... --- OpenAPI/TS28532_ProvMnS.yaml | 7 +++++-- OpenAPI/TS28623_ComDefs.yaml | 17 ++++++++++++++++- OpenAPI/TS28623_SubscriptionControlNrm.yaml | 6 ++++-- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index 116dfc4b7..797d7ca86 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -219,7 +219,7 @@ paths: are targeted. required: false schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Filter' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexConditions' - name: attributes in: query description: >- @@ -251,7 +251,10 @@ paths: select data nodes. required: false schema: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Filter' + oneOf: + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexNodeSelectionBasic' + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexNodeSelectionAdvanced' + responses: '200': description: >- diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index f5985b380..9319640df 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -238,6 +238,21 @@ components: description: >- The filter format shall be compliant to Jex (TS 32.161). type: string + JexConditions: + type: string + description: >- + The value of the string shall be a Jex expression that is compliant to the + Jex conditions profile specified in clause 7.6 of TS 32.161. + JexNodeSelectionBasic: + type: string + description: >- + The value of the string shall be a Jex expression that is compliant to the + Jex basic profile specified in clause 7.4 of TS 32.161. + JexNodeSelectionAdvanced: + type: string + description: >- + The value of the string shall be a Jex expression that is compliant to the + Jex advanced profile specified in clause 7.5 of TS 32.161. SystemDN: type: string @@ -289,7 +304,7 @@ components: timeTick: type: integer filter: - $ref: '#/components/schemas/Filter' + $ref: '#/components/schemas/JexConditions' ErrorResponseGet: description: >- diff --git a/OpenAPI/TS28623_SubscriptionControlNrm.yaml b/OpenAPI/TS28623_SubscriptionControlNrm.yaml index e808716e6..35de0f831 100644 --- a/OpenAPI/TS28623_SubscriptionControlNrm.yaml +++ b/OpenAPI/TS28623_SubscriptionControlNrm.yaml @@ -29,7 +29,9 @@ components: - type: object properties: dataNodeSelector: - type: string + oneOf: + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexNodeSelectionBasic' + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexNodeSelectionAdvanced' #-------- Definition of concrete IOCs -------------------------------------------- NtfSubscriptionControl-Single: @@ -49,7 +51,7 @@ components: scope: $ref: '#/components/schemas/Scope' notificationFilter: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Filter' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexConditions' HeartbeatControl: $ref: '#/components/schemas/HeartbeatControl-Single' HeartbeatControl-Single: -- GitLab From da902f08f00bfaec63a70255ec292dad7bf8f76b Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 18 Oct 2024 06:42:29 +0000 Subject: [PATCH 02/31] Rel18 TS28541 CR1305 correction to misalignment of stage 2 and stage 3 for... --- OpenAPI/TS28541_NrNrm.yaml | 49 +++++++++++++------------------------- 1 file changed, 16 insertions(+), 33 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 11e810bb7..b155a01b4 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -305,23 +305,9 @@ components: ipv6Address: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' - CellIndividualOffset: - type: object - properties: - rsrpOffsetSSB: - type: integer - rsrqOffsetSSB: - type: integer - sinrOffsetSSB: - type: integer - rsrpOffsetCSI-RS: - type: integer - rsrqOffsetCSI-RS: - type: integer - sinrOffsetCSI-RS: - type: integer QOffsetRange: type: integer + default: 0 enum: - -24 - -22 @@ -354,21 +340,6 @@ components: - 3 - 2 - 1 - QOffsetRangeList: - type: object - properties: - rsrpOffsetSSB: - $ref: '#/components/schemas/QOffsetRange' - rsrqOffsetSSB: - $ref: '#/components/schemas/QOffsetRange' - sinrOffsetSSB: - $ref: '#/components/schemas/QOffsetRange' - rsrpOffsetCSI-RS: - $ref: '#/components/schemas/QOffsetRange' - rsrqOffsetCSI-RS: - $ref: '#/components/schemas/QOffsetRange' - sinrOffsetCSI-RS: - $ref: '#/components/schemas/QOffsetRange' QOffsetFreq: type: number TReselectionNRSf: @@ -1335,7 +1306,11 @@ components: nRTCI: type: integer cellIndividualOffset: - $ref: '#/components/schemas/CellIndividualOffset' + type: array + items: + $ref: '#/components/schemas/QOffsetRange' + minItems: 6 + maxItems: 6 adjacentNRCellRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' nRFreqRelationRef: @@ -1372,7 +1347,11 @@ components: type: object properties: offsetMO: - $ref: '#/components/schemas/QOffsetRangeList' + type: array + items: + $ref: '#/components/schemas/QOffsetRange' + minItems: 6 + maxItems: 6 blockListEntry: type: array items: @@ -1435,7 +1414,11 @@ components: type: object properties: cellIndividualOffset: - $ref: '#/components/schemas/CellIndividualOffset' + type: array + items: + $ref: '#/components/schemas/QOffsetRange' + minItems: 6 + maxItems: 6 blackListEntry: type: array items: -- GitLab From 12fcf24d46fef6d5e3622ecce0bc8450eec6bcd1 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sun, 29 Sep 2024 02:31:52 +0000 Subject: [PATCH 03/31] Update file TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index b155a01b4..17809fbff 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1701,6 +1701,10 @@ components: $ref: '#/components/schemas/NRFrequency-Multiple' ExternalGnbCuCpFunction: $ref: '#/components/schemas/ExternalGnbCuCpFunction-Multiple' + ExternalGnbCuUpFunction: + $ref: '#/components/schemas/ExternalGnbCuUpFunction-Multiple' + ExternalGnbDuFunction: + $ref: '#/components/schemas/ExternalGnbDuFunction-Multiple' ExternalGnbCuUpFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' -- GitLab From a5745515cb008e0c7cf78f0a2a4be8ea9b341fe6 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sun, 29 Sep 2024 01:12:24 +0000 Subject: [PATCH 04/31] Update 3 files - /OpenAPI/TS28623_PmControlNrm.yaml - /OpenAPI/TS28623_GenericNrm.yaml - /OpenAPI/TS28623_FileManagementNrm.yaml --- OpenAPI/TS28623_FileManagementNrm.yaml | 2 +- OpenAPI/TS28623_GenericNrm.yaml | 2 +- OpenAPI/TS28623_PmControlNrm.yaml | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28623_FileManagementNrm.yaml b/OpenAPI/TS28623_FileManagementNrm.yaml index a0b20fe33..6eeec5ba7 100644 --- a/OpenAPI/TS28623_FileManagementNrm.yaml +++ b/OpenAPI/TS28623_FileManagementNrm.yaml @@ -19,7 +19,7 @@ components: for usage in the "FileDownloadJob". type: object properties: - jobId: + id: type: string status: type: string diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 081978338..6d1fa6062 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -207,7 +207,7 @@ components: This data type is the "ProcessMonitor" data type without specialisations. type: object properties: - jobId: + id: type: string status: type: string diff --git a/OpenAPI/TS28623_PmControlNrm.yaml b/OpenAPI/TS28623_PmControlNrm.yaml index 23581d777..c3aff2b14 100644 --- a/OpenAPI/TS28623_PmControlNrm.yaml +++ b/OpenAPI/TS28623_PmControlNrm.yaml @@ -49,6 +49,8 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' reportingCtrl: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ReportingCtrl' + _linkToFiles: + type: string Files: $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/Files-Multiple' -- GitLab From 484fa1c95839cb55e21d4a98ef7591c2b3f24a72 Mon Sep 17 00:00:00 2001 From: zhaoxxian Date: Sun, 29 Sep 2024 06:09:47 +0000 Subject: [PATCH 05/31] Update file TS28538_EdgeNrm.yaml --- OpenAPI/TS28538_EdgeNrm.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index a87137ee0..a6ebd076d 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -121,6 +121,7 @@ components: enum: - ENABLED - DISABLED + - OVERLOAD_WARNING ResourceReservationRequirement: type: object properties: -- GitLab From 94d5498a2c77b04a45be44194e598ade9707d99b Mon Sep 17 00:00:00 2001 From: shixixi Date: Sun, 29 Sep 2024 10:30:53 +0000 Subject: [PATCH 06/31] Update TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 17809fbff..6e3ee7839 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -167,10 +167,19 @@ components: type: integer minimum: 0 maximum: 100 - numberOfPreamblesSent: - type: integer - minimum: 0 - maximum: 200 + maxNumberOfPreamblesSent: + enum: + - n3 + - n4 + - n5 + - n6 + - n7 + - n8 + - n10 + - n20 + - n50 + - n100 + - n200 UeAccDelayProbabilityDist: type: array -- GitLab From aaa713a081bb6834f92db1f2bc89d6f990d0c4e8 Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Fri, 4 Oct 2024 09:35:57 +0000 Subject: [PATCH 07/31] Rel_18_CR1379_28.541_OpenAPI_SS_Stage_3_for_energy_cost_mapping_rule --- OpenAPI/TS28541_NrNrm.yaml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 6e3ee7839..2bcfbbec0 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -947,6 +947,8 @@ components: $ref: '#/components/schemas/QceIdMappingInfoList' mdtUserConsentReqList: $ref: '#/components/schemas/MdtUserConsentReqList' + nRECMappingRuleRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -2049,6 +2051,22 @@ components: ephemerisInfos: $ref: '#/components/schemas/EphemerisInfos' + NRECMappingRule-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - type: object + properties: + ecMRInputMinimumValue: + type: integer + ecMRInputMaximumValue: + type: integer + ecTimeInterval: + type: integer + #-------- Definition of JSON arrays for name-contained IOCs ---------------------- GnbDuFunction-Multiple: @@ -2207,6 +2225,10 @@ components: type: array items: $ref: '#/components/schemas/EphemerisInfoSet-Single' + NRECMappingRule-Multiple: + type: array + items: + $ref: '#/components/schemas/NRECMappingRule-Single' #-------- Definitions in TS 28.541 for TS 28.532 --------------------------------- @@ -2274,4 +2296,5 @@ components: - $ref: '#/components/schemas/CCOOvershootCoverageParameters-Single' - $ref: '#/components/schemas/NTNFunction-Single' - $ref: '#/components/schemas/EphemerisInfoSet-Single' + - $ref: '#/components/schemas/NRECMappingRule-Single' -- GitLab From 73fd57a4b1d63271407dc7bb8a93a8c678740e7d Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Tue, 22 Oct 2024 06:37:47 +0000 Subject: [PATCH 08/31] Rel-18_CR1377_28.541_Correction_to_sliceAvailability_and_sliceSubnetAvailability --- OpenAPI/TS28541_SliceNrm.yaml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 121dc8f67..3b6c18f57 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -415,7 +415,9 @@ components: uLPktDelayVariation: $ref: '#/components/schemas/Float' sliceSubnetAvailability: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' + type: array + items: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' RANSliceSubnetProfile: type: object @@ -571,7 +573,9 @@ components: uLPktDelayVariation: $ref: '#/components/schemas/Float' sliceSubnetAvailability: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' + type: array + items: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' ServiceProfile: type: object @@ -667,7 +671,9 @@ components: uLPktDelayVariation: $ref: '#/components/schemas/Float' sliceAvailability: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' + type: array + items: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' SliceProfile: type: object -- GitLab From c89087ae640cb5f0c34d30fa4eb13dae4c56c68e Mon Sep 17 00:00:00 2001 From: potherakallo Date: Thu, 3 Oct 2024 18:47:35 +0000 Subject: [PATCH 09/31] Correction for "NR Measurent Type" for " TraceControlNrm ". Update to be aligned with 3GPP TS 32.422 section 5.10.3 --- OpenAPI/TS28623_TraceControlNrm.yaml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index 5806dc392..f5d59297b 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -808,13 +808,16 @@ components: items: type: string enum: - - M1 - - M2 - - M3 - - M4 - - M5 - - M6 - - M7 + - M1_DL + - M2_DL + - M4_DL + - M4_UL + - M5_DL + - M5_UL + - M6_DL + - M6_UL + - M7_DL + - M7_UL - M1_EVENT_TRIGGERED - M8 - M9 -- GitLab From 21cea4f3ad9db6b8e5c822569365d5fc0b6e4884 Mon Sep 17 00:00:00 2001 From: Jan Groenendijk Date: Thu, 17 Oct 2024 07:48:49 +0000 Subject: [PATCH 10/31] Update TS28312_IntentNrm.yaml infeasibilityReason --- OpenAPI/TS28312_IntentNrm.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 3d018cb18..f1508cd61 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -411,8 +411,12 @@ components: - FEASIBLE - INFEASIBLE infeasibilityReason: - type: string - description: An attribute which is used when feasibilityCheckResult is INFEASIBLE + description: An attribute which is used when feasibilityCheckResult is INFEASIBLE + type: enum + readOnly: true + enum: + - INVALID_INTENT_EXPRESSION + - INTENT_CONFLICT #-------Definition of the concrete IntentFeasibilityCheckReport dataType----------------# #-------Definition of the generic IntentHandlingCapability dataType----------------# -- GitLab From b6f18a055102030643b7981393455d9574e0f2f5 Mon Sep 17 00:00:00 2001 From: Jan Groenendijk Date: Thu, 17 Oct 2024 08:19:30 +0000 Subject: [PATCH 11/31] Update TS28312_IntentNrm.yaml type string --- OpenAPI/TS28312_IntentNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index f1508cd61..81fc68b3a 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -412,7 +412,7 @@ components: - INFEASIBLE infeasibilityReason: description: An attribute which is used when feasibilityCheckResult is INFEASIBLE - type: enum + type: string readOnly: true enum: - INVALID_INTENT_EXPRESSION -- GitLab From 16fbbc465c24a3109b1a2e045a2034c5f94e8f5e Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 22 Nov 2024 17:51:44 +0000 Subject: [PATCH 12/31] Draft: Rel18 CR1416 TS28.541 correction to stage 2 and stage 3 for blockListEntry and... --- OpenAPI/TS28541_NrNrm.yaml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 2bcfbbec0..f6530c98b 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1368,9 +1368,13 @@ components: items: type: integer minimum: 0 - maximum: 1007 + maximum: 503 blockListEntryIdleMode: - type: integer + type: array + items: + type: integer + minimum: 0 + maximum: 1007 cellReselectionPriority: type: integer cellReselectionSubPriority: @@ -1430,14 +1434,18 @@ components: $ref: '#/components/schemas/QOffsetRange' minItems: 6 maxItems: 6 - blackListEntry: + blockListEntry: + type: array + items: + type: integer + minimum: 0 + maximum: 503 + blockListEntryIdleMode: type: array items: type: integer minimum: 0 maximum: 1007 - blackListEntryIdleMode: - type: integer cellReselectionPriority: type: integer cellReselectionSubPriority: -- GitLab From a254eea165c162440157136cf2aea5f9984a91cc Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 7 Nov 2024 08:30:27 +0000 Subject: [PATCH 13/31] Rel18 CR0466 TS28623 correction to duplicate AreaScope --- OpenAPI/TS28623_TraceControlNrm.yaml | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index f5d59297b..f246bcb14 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -1380,7 +1380,7 @@ components: areaScope: type: array items: - $ref: '#/components/schemas/AreaScope' + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/AreaScope' sensorInformation: $ref: '#/components/schemas/sensorInformation-Type' immediateMDTConfig: @@ -1403,23 +1403,6 @@ components: rootObjectInstances: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - AreaScope: - oneOf: - - type: array - items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/EutraCellId' - - type: array - items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NrCellId' - - type: array - items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Tac' - - type: array - items: - $ref: '#/components/schemas/Tai' - - type: array - items: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NpnId-Type' Tai: type: object properties: -- GitLab From 14131ec4e04f13c9b35c797b1c99ebebc2232e34 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 8 Nov 2024 02:01:32 +0000 Subject: [PATCH 14/31] Rel18 TS28105 CR0205 correction to stage 3 implementation related to supportedPerformanceIndicators --- 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 4bdb73a0e..47d3a1f84 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -455,7 +455,9 @@ components: runTimeContext: $ref: '#/components/schemas/MLContext' supportedPerformanceIndicators: - $ref: '#/components/schemas/SupportedPerfIndicator' + type: array + items: + $ref: '#/components/schemas/SupportedPerfIndicator' mLCapabilitiesInfoList: type: array items: -- GitLab From 9b575aea699d8b1bcdb20c491a980937f6bbdcda Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 8 Nov 2024 01:43:02 +0000 Subject: [PATCH 15/31] Rel18 TS28623 CR0475 stage 3 correction to listOfTraceMetrics and ueCoreMeasurements --- OpenAPI/TS28623_TraceControlNrm.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index f246bcb14..770f3d1c4 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -1393,7 +1393,9 @@ components: type: object properties: ueCoreMeasurements: - type: string + type: array + items: + type: string ueCoreMeasGranularityPeriod: type: integer nfTypeToMeasure: @@ -1453,6 +1455,8 @@ components: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NpnId-Type' listOfTraceMetrics: type: array + items: + type: string traceReportingConsumerUri: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' traceCollectionEntityIpAddress: -- GitLab From 48f9d9bf7f3d53f07f72e8c2c4939a8cf65c57ae Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 7 Nov 2024 15:00:29 +0000 Subject: [PATCH 16/31] Rel18 TS28541 CR1411 correction to stage 2 stage3 attribute name inconsistence --- OpenAPI/TS28541_NrNrm.yaml | 14 ++++++++------ OpenAPI/TS28541_SliceNrm.yaml | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index f6530c98b..1485871bb 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -543,7 +543,7 @@ components: type: array items: $ref: '#/components/schemas/RimRSReportInfo' - TceMappingInfo: + TceIDMappingInfo: type: object properties: TceIPAddress: @@ -554,10 +554,10 @@ components: type: integer PlmnTarget: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' - TceMappingInfoList: + TceIDMappingInfoList: type: array items: - $ref: '#/components/schemas/TceMappingInfo' + $ref: '#/components/schemas/TceIDMappingInfo' ResourceType: type: string enum: @@ -928,9 +928,11 @@ components: xnHOBlackList: $ref: '#/components/schemas/GGnbIdList' mappingSetIDBackhaulAddress: - $ref: '#/components/schemas/MappingSetIDBackhaulAddress' - tceMappingInfoList: - $ref: '#/components/schemas/TceMappingInfoList' + type: array + items: + $ref: '#/components/schemas/MappingSetIDBackhaulAddress' + tceIDMappingInfoList: + $ref: '#/components/schemas/TceIDMappingInfoList' configurable5QISetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 3b6c18f57..4e4a0d41f 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -906,7 +906,7 @@ components: type: string epApplicationRefs: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - connectionPointRefList: + externalEndPointRefList: type: array items: $ref: '#/components/schemas/ConnectionPointInfo' -- GitLab From ed0b7163a6d960893585636f3e17065c6d67b88e Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Sat, 23 Nov 2024 03:08:13 +0000 Subject: [PATCH 17/31] Rel 18 cr0153 28.104 fix mismatch between stage 2 and stage 3 --- OpenAPI/TS28104_MdaNrm.yaml | 9 ++++++--- OpenAPI/TS28104_MdaReport.yaml | 4 +++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index 4290465aa..f9f405cde 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -34,8 +34,9 @@ components: - type: object properties: areaScope: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' - + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' MDAOutputPerMDAType: type: object @@ -55,7 +56,9 @@ components: filterValue: type: string threshold: - $ref: '#/components/schemas/ThresholdInfo' + type: array + items: + $ref: '#/components/schemas/ThresholdInfo' analyticsPeriod: $ref: '#/components/schemas/AnalyticsSchedule' timeOut: diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml index b57be4d1a..bd6bdf93d 100644 --- a/OpenAPI/TS28104_MdaReport.yaml +++ b/OpenAPI/TS28104_MdaReport.yaml @@ -61,6 +61,8 @@ components: mDAReportID: type: string mDAOutputs: - $ref: '#/components/schemas/MDAOutputs' + type: array + items: + $ref: '#/components/schemas/MDAOutputs' mDARequestRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' -- GitLab From 014a6b6679641d8617a006a06df48f10ab360c83 Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Fri, 8 Nov 2024 14:07:03 +0000 Subject: [PATCH 18/31] Rel_18_CR0110_28.536_Fix_mismatch_between_stage_2_and_stage_3 --- OpenAPI/TS28536_CoslaNrm.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28536_CoslaNrm.yaml b/OpenAPI/TS28536_CoslaNrm.yaml index 54d2c5898..1dd7eb90f 100755 --- a/OpenAPI/TS28536_CoslaNrm.yaml +++ b/OpenAPI/TS28536_CoslaNrm.yaml @@ -84,6 +84,8 @@ components: $ref: '#/components/schemas/AssuranceGoalStatusPredicted' assuranceGoalRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + assuranceTargetStatusList: + $ref: '#/components/schemas/AssuranceTargetStatusList' AssuranceGoalStatusList: type: array @@ -155,7 +157,9 @@ components: controlLoopLifeCyclePhase: $ref: '#/components/schemas/ControlLoopLifeCyclePhase' aCCLDisallowedList: - $ref: '#/components/schemas/ACCLDisallowedAttributes' + type: array + items: + $ref: '#/components/schemas/ACCLDisallowedAttributes' networkSliceRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' networkSliceSubnetRef: -- GitLab From 45a90af6013b9853087ff9b813830621b3c49575 Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Fri, 8 Nov 2024 13:06:56 +0000 Subject: [PATCH 19/31] Rel_18_CR0274_28.312_Fix_mismatch_between_stage_2_and_stage_3 --- OpenAPI/TS28312_IntentNrm.yaml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 81fc68b3a..db3e844c8 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -324,7 +324,7 @@ components: properties: intentFulfilmentInfo: $ref: '#/components/schemas/FulfilmentInfo' - expectationFulfilmentResult: + expectationFulfilmentResults: type: array items: $ref: '#/components/schemas/ExpectationFulfilmentResult' @@ -340,7 +340,7 @@ components: type: string expectationFulfilmentInfo: $ref: '#/components/schemas/FulfilmentInfo' - targetFulfilmentResult: + targetFulfilmentResults: type: array items: $ref: '#/components/schemas/TargetFulfilmentResult' @@ -410,13 +410,15 @@ components: enum: - FEASIBLE - INFEASIBLE - infeasibilityReason: + infeasibilityReasons: description: An attribute which is used when feasibilityCheckResult is INFEASIBLE - type: string - readOnly: true - enum: - - INVALID_INTENT_EXPRESSION - - INTENT_CONFLICT + type: array + items: + type: string + readOnly: true + enum: + - INVALID_INTENT_EXPRESSION + - INTENT_CONFLICT #-------Definition of the concrete IntentFeasibilityCheckReport dataType----------------# #-------Definition of the generic IntentHandlingCapability dataType----------------# -- GitLab From 038a7b6982dc044497dc2fde2778ea8024e9236b Mon Sep 17 00:00:00 2001 From: potherakallo Date: Fri, 22 Nov 2024 17:24:30 +0000 Subject: [PATCH 20/31] Update TS28623_ComDefs.yaml --- OpenAPI/TS28623_ComDefs.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 9319640df..69f06fac4 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -112,10 +112,11 @@ components: $ref: '#/components/schemas/GeoCoordinate' minItems: 3 GeoArea: - type: object - properties: - convexGeoPolygon: - $ref: '#/components/schemas/ConvexGeoPolygon' + oneOf: + - type: object + properties: + geoPolygon: + $ref: '#/components/schemas/GeoCoordinate' GeoAreaToCellMapping: type: object properties: -- GitLab From 10427e857fe7946941ae076d6a4d01da8cec764e Mon Sep 17 00:00:00 2001 From: potherakallo Date: Fri, 22 Nov 2024 18:09:38 +0000 Subject: [PATCH 21/31] Update TS28623_ComDefs.yaml --- OpenAPI/TS28623_ComDefs.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 69f06fac4..5fecd2af3 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -106,11 +106,11 @@ components: $ref: '#/components/schemas/Longitude' altitude: $ref: '#/components/schemas/Float' - ConvexGeoPolygon: + GeoPolygon: type: array items: $ref: '#/components/schemas/GeoCoordinate' - minItems: 3 + minItems: 1 GeoArea: oneOf: - type: object -- GitLab From b14341c1ede58fc50d794a0965ba2220e09d1cff Mon Sep 17 00:00:00 2001 From: ruanb Date: Sat, 23 Nov 2024 03:32:16 +0000 Subject: [PATCH 22/31] Rel-18 CR1438 Delete unused attributes blockedDurStartTime and blockedDurEndTime --- OpenAPI/TS28541_5GcNrm.yaml | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 9ed184190..2a958f1a0 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -2319,7 +2319,12 @@ components: type: string pattern: '^[A-Fa-f0-9]+$' twifId: - type: string + type: string + NTNPLMNRestrictionsList: + description: NTNPLMNRestrictionsInfoList that relates to non-terrestrial network access + type: array + items: + $ref: '#/components/schemas/NTNPLMNRestrictionsInfo' NTNPLMNRestrictionsInfo: description: restrictions per PLMN that relates to non-terrestrial network access type: object @@ -2329,27 +2334,17 @@ components: blockedLocationInfoList: type: array items: - $ref: '#/components/schemas/BlockedLocationInfoList' - minItems: 1 - BlockedLocationInfoList: + $ref: '#/components/schemas/BlockedLocationInfo' + BlockedLocationInfo: description: location for which the PLMN access restrictions are to be applied in case of NTN type: object properties: blockedLocation: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' - blockedDur: - $ref: '#/components/schemas/TimeDuration' + blockedDurWindow: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' blockedSlice: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' - TimeDuration: - description: location for which the PLMN access restrictions are to be applied in case of NTN - type: object - properties: - blockedDurStartTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - blockedDurEndTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - 5GDdnmfInfo: description: Information of an 5G DDNMF NF Instance type: object @@ -3052,8 +3047,8 @@ components: $ref: '#/components/schemas/ManagedNFProfile' commModelList: $ref: '#/components/schemas/CommModelList' - nTNPLMNInfoList: - $ref: '#/components/schemas/NTNPLMNRestrictionsInfo' + nTNPLMNRestrictionsList: + $ref: '#/components/schemas/NTNPLMNRestrictionsList' amfInfo: $ref: '#/components/schemas/AmfInfo' sliceExpiryInfo: -- GitLab From 4767f6573e19ac3233aba71e9866f48341d91aca Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 5 Nov 2024 05:14:33 +0000 Subject: [PATCH 23/31] Update file TS28104_MdaNrm.yaml --- OpenAPI/TS28104_MdaNrm.yaml | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index f9f405cde..7803c3d6d 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -14,11 +14,29 @@ components: schemas: #-------- Definition of types----------------------------------------------------- - + MDAType: + type: string + enum: + - COVERAGEANALYTICS_COVERAGEPROBLEMANALYSIS + - COVERAGEANALYTICS_PAGINGOPTIMIZATION + - SLSANALYSIS_SERVICEEXPERIENCEANALYSIS + - SLSANALYSIS_NETWORKSLICETHROUGHPUTANALYSIS + - SLSANALYSIS_NETWORKSLICETRAFFICANALYSIS + - SLSANALYSIS_E2ELATENCYANALYSIS + - SLSANALYSIS_NETWORKSLICELOADANALYSIS + - MDAASSISTEDFAULTMANAGEMENT_FAILUREPREDICTION + - MDAASSISTEDENERGYSAVING_ENERGYSAVINGANALYSIS + - MOBILITYMANAGEMENTANALYTICS_MOBILITYPERFORMANCEANALYSIS + - MOBILITYMANAGEMENTANALYTICS_HANDOVEROPTIMIZATION + - MAINTENANCE_MAINTENANCEANALYTICS + - RESOURCEANALYTICS_VIRTUALIZEDRESOURCEUTILIZATIONANALYSISNF + - RESOURCEANALYTICS_PHYISCALRESOURCEUTILIZATIONANALYSISNF + - RESOURCEANALYTICS_5GCCONTROLPLANECONGESTIONANALYSIS + - PREDICTIONS_PMDATA MDATypes: type: array items: - type: string + $ref: '#/components/schemas/MDAType' MDAOutputs: type: array -- GitLab From 37e0a29ac2e9efebe316d241959083b926c77bf6 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 5 Nov 2024 05:25:54 +0000 Subject: [PATCH 24/31] Update file TS28105_AiMlNrm.yaml --- OpenAPI/TS28105_AiMlNrm.yaml | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 47d3a1f84..8abff4122 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -110,7 +110,7 @@ components: type: object properties: aIMLInferenceName: - type: string + $ref: '#/components/schemas/AIMLInferenceName' capabilityName: type: string mLCapabilityParameters: @@ -141,7 +141,7 @@ components: items: type: string aIMLInferenceName: - type: string + $ref: '#/components/schemas/AIMLInferenceName' inferenceOutputTime: type: array items: @@ -152,7 +152,22 @@ components: outputResult: description: A map (list of key-value pairs) for Inference result name and it's value $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' - + AIMLInferenceName: + oneOf: + - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/MDAType' + - $ref: '#/components/schemas/NwdafAnalyticsID' + - $ref: '#/components/schemas/NgRanInferenceType' + - $ref: '#/components/schemas/VSExtensionType' + NwdafAnalyticsID: + $ref: 'TS29520_Nnwdaf_EventsSubscription.yaml#/components/schemas/NwdafEvent' + NgRanInferenceType: + type: string + enum: + - NG_RAN_NETWORK_ENERGY_SAVING + - NG_RAN_LOAD_BALANCING + - NG_RAN_ MOBILITY_OPTIMIZATION + VSExtensionType: + type: string #-------- Definition of types for name-containments ------ SubNetwork-ncO-AiMlNrm: type: object @@ -226,7 +241,7 @@ components: - type: object properties: aIMLInferenceName: - type: string + $ref: '#/components/schemas/AIMLInferenceName' candidateTrainingDataSource: type: array items: @@ -406,7 +421,7 @@ components: - type: object properties: aIMLInferenceName: - type: string + $ref: '#/components/schemas/AIMLInferenceName' policyForLoading: $ref: '#/components/schemas/AIMLManagementPolicy' mLModelRef: @@ -445,7 +460,7 @@ components: mLModelId: type: string aIMLInferenceName: - type: string + $ref: '#/components/schemas/AIMLInferenceName' mLModelVersion: type: string expectedRunTimeContext: -- GitLab From acf08c00486c895a2c1d6ce91b093057222b9596 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 5 Nov 2024 05:33:43 +0000 Subject: [PATCH 25/31] Update file TS28105_AiMlNrm.yaml --- OpenAPI/TS28105_AiMlNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 8abff4122..abe9fd0e2 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -155,10 +155,10 @@ components: AIMLInferenceName: oneOf: - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/MDAType' - - $ref: '#/components/schemas/NwdafAnalyticsID' + - $ref: '#/components/schemas/NwdafAnalyticsType' - $ref: '#/components/schemas/NgRanInferenceType' - $ref: '#/components/schemas/VSExtensionType' - NwdafAnalyticsID: + NwdafAnalyticsType: $ref: 'TS29520_Nnwdaf_EventsSubscription.yaml#/components/schemas/NwdafEvent' NgRanInferenceType: type: string -- GitLab From c8431d29137d2cf51d55e0147c564494b79ed339 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 5 Nov 2024 01:16:29 +0000 Subject: [PATCH 26/31] Update file TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 4e4a0d41f..cb61b7d7b 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -144,6 +144,15 @@ components: $ref: '#/components/schemas/ServAttrCom' nOofPDUSessions: type: integer + MaxNumberofUEs: + type: object + properties: + servAttrCom: + $ref: '#/components/schemas/ServAttrCom' + 3GPPNoOfUEs: + type: integer + non3GPPNoOfUEs: + type: integer KPIMonitoring: type: object properties: @@ -355,7 +364,7 @@ components: type: object properties: maxNumberofUEs: - type: integer + $ref: '#/components/schemas/MaxNumberofUEs' dLLatency: type: number uLLatency: @@ -433,7 +442,7 @@ components: resourceSharingLevel: $ref: '#/components/schemas/SharingLevel' maxNumberofUEs: - type: integer + $ref: '#/components/schemas/MaxNumberofUEs' activityFactor: type: integer dLThptPerSliceSubnet: @@ -499,7 +508,7 @@ components: uLLatency: type: integer maxNumberofUEs: - type: integer + $ref: '#/components/schemas/MaxNumberofUEs' dLThptPerSliceSubnet: $ref: '#/components/schemas/XLThpt' dLThptPerUE: @@ -585,7 +594,7 @@ components: plmnInfoList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList' maxNumberofUEs: - type: number + $ref: '#/components/schemas/MaxNumberofUEs' dLLatency: type: number uLLatency: -- GitLab From cadf618eda3df910b91bfacb2ad0051aec641b96 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 5 Nov 2024 01:23:34 +0000 Subject: [PATCH 27/31] Update file TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index cb61b7d7b..183a863cc 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -150,9 +150,9 @@ components: servAttrCom: $ref: '#/components/schemas/ServAttrCom' 3GPPNoOfUEs: - type: integer + type: integer non3GPPNoOfUEs: - type: integer + type: integer KPIMonitoring: type: object properties: -- GitLab From dddfaf3e9faaa5e799c6f51ee15d5d0031db1d58 Mon Sep 17 00:00:00 2001 From: zhaoxxian Date: Wed, 6 Nov 2024 08:47:01 +0000 Subject: [PATCH 28/31] Update file TS28538_EdgeNrm.yaml --- OpenAPI/TS28538_EdgeNrm.yaml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index a6ebd076d..8720eb784 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -154,9 +154,11 @@ components: - FUTURE futuristicTriggerTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - AvailableEDNList: + AvailableEDN: type: object properties: + availableEDN: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' resourceQuota: $ref: '#/components/schemas/VirtualResource' FederatedECSInfo: @@ -386,8 +388,10 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' leadingOPiD: type: string - avaibleEDNList: - $ref: '#/components/schemas/AvailableEDNList' + availableEDNList: + type: array + items: + $ref: '#/components/schemas/AvailableEDN' acceptedEDN: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' OperatorEdgeDataNetwork-Single: -- GitLab From a35de655c075cd010f081774bbc50622ecd7b107 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Fri, 29 Nov 2024 08:50:59 +0000 Subject: [PATCH 29/31] Rel-18 CR0222 TS 28.105 Correction of not used attribute and attribute properties. --- 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 abe9fd0e2..834db4ce1 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -18,7 +18,7 @@ components: MLContext: type: object properties: - inferenceModelRef: + inferenceEntityRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' dataProviderRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' -- GitLab From 41500123d9f0576bfca460442762c413e97d7a93 Mon Sep 17 00:00:00 2001 From: mcdonnelleo Date: Mon, 2 Dec 2024 09:58:52 +0000 Subject: [PATCH 30/31] Ts 28.541 rel18 cr1436 correction of attributes --- OpenAPI/TS28541_5GcNrm.yaml | 40 ++++++++++++++++++------------------- OpenAPI/TS28541_NrNrm.yaml | 4 ++-- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 2a958f1a0..fd7df61eb 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -106,7 +106,7 @@ components: $ref: '#/components/schemas/IpEndPoint' apiPrefix: type: string - allowedPlmns: + allowedPlMNs: type: array items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' @@ -114,7 +114,7 @@ components: type: array items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NFType' - allowedNssais: + allowedNSSAIs: type: array items: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' @@ -223,7 +223,7 @@ components: ManagedNFProfile: type: object properties: - nfInstanceID: + nfInstanceId: type: string interPlmnFqdn: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' @@ -1614,13 +1614,13 @@ components: description: Information of an AMF NF Instance type: object required: - - amfSetId - - amfRegionId + - aMFSetId + - aMFRegionId - guamiList properties: - amfSetId: + aMFSetId: $ref: 'TS29571_CommonData.yaml#/components/schemas/AmfSetId' - amfRegionId: + aMFRegionId: $ref: 'TS29571_CommonData.yaml#/components/schemas/AmfRegionId' guamiList: type: array @@ -2293,14 +2293,14 @@ components: description: globally identification of an NG-RAN node type: object oneOf: - - required: [ pLmnId, n3IwfId] - - required: [ plmnId, gNbId] - - required: [ pLmnId, ngeNbId] - - required: [ plmnId, wagfId] - - required: [ pLmnId, tngfId] - - required: [ plmnId, twifId] + - required: [ pLMNId, n3IwfId] + - required: [ plMNId, gNbId] + - required: [ pLMNId, ngeNbId] + - required: [ plMNId, wagfId] + - required: [ pLMNId, tngfId] + - required: [ plMNId, twifId] properties: - pLmnId: + pLMNId: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' n3IwfId: type: string @@ -2349,9 +2349,9 @@ components: description: Information of an 5G DDNMF NF Instance type: object required: - - plmnId + - plMNId properties: - plmnId: + plMNId: $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId' ImsiRange: description: > @@ -2570,7 +2570,7 @@ components: mbsServiceIdEnd: type: string pattern: '^[A-Fa-f0-9]{6}$' - plmnId: + plMNId: $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId' nid: $ref: 'TS29571_CommonData.yaml#/components/schemas/Nid' @@ -2625,7 +2625,7 @@ components: type: string pattern: '^[A-Fa-f0-9]{6}$' description: MBS Service ID - plmnId: + plMNId: $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId' required: - mbsServiceId @@ -2683,7 +2683,7 @@ components: description: Contains the NCGI (NR Cell Global Identity), as described in 3GPP 23.003 type: object properties: - plmnId: + plMNId: $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId' nrCellId: type: string @@ -4452,7 +4452,7 @@ components: allOf: - type: object properties: - FiveQiDscpMappingList: + fiveQiDscpMappingList: type: array items: $ref: '#/components/schemas/FiveQiDscpMapping' diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 1485871bb..10f0f601b 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -109,7 +109,7 @@ components: MappingSetIDBackhaulAddress: type: object properties: - setID: + setId: type: integer backhaulAddress: $ref: '#/components/schemas/BackhaulAddress' @@ -1157,7 +1157,7 @@ components: type: integer minimum: 0 maximum: 3279165 - ssbSubCarrierSpacing: + sSBSubCarrierSpacing: $ref: '#/components/schemas/SsbSubCarrierSpacing' multiFrequencyBandListNR: type: integer -- GitLab From 45fbbf60cfb4299da80fc74c63e8ac208e2c9b32 Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 2 Dec 2024 13:14:26 +0000 Subject: [PATCH 31/31] Code Moderator update openAPI version --- OpenAPI/TS28104_MdaNrm.yaml | 2 +- OpenAPI/TS28104_MdaReport.yaml | 2 +- OpenAPI/TS28105_AiMlNrm.yaml | 2 +- OpenAPI/TS28312_IntentNrm.yaml | 2 +- OpenAPI/TS28532_ProvMnS.yaml | 2 +- OpenAPI/TS28536_CoslaNrm.yaml | 2 +- OpenAPI/TS28538_EdgeNrm.yaml | 2 +- OpenAPI/TS28541_5GcNrm.yaml | 2 +- OpenAPI/TS28541_NrNrm.yaml | 2 +- OpenAPI/TS28541_SliceNrm.yaml | 2 +- OpenAPI/TS28623_ComDefs.yaml | 2 +- OpenAPI/TS28623_FileManagementNrm.yaml | 2 +- OpenAPI/TS28623_GenericNrm.yaml | 2 +- OpenAPI/TS28623_PmControlNrm.yaml | 2 +- OpenAPI/TS28623_SubscriptionControlNrm.yaml | 2 +- OpenAPI/TS28623_TraceControlNrm.yaml | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index 7803c3d6d..2f0530b4b 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: MDA NRM - version: 18.5.0 + version: 18.6.0 description: >- OAS 3.0.1 specification of the MDA NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml index bd6bdf93d..f3b97098d 100644 --- a/OpenAPI/TS28104_MdaReport.yaml +++ b/OpenAPI/TS28104_MdaReport.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: MDA Report - version: 18.3.0 + version: 18.6.0 description: >- OAS 3.0.1 specification of the MDA Report © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 834db4ce1..e85c31cb2 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.5.0 + 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). diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index db3e844c8..f353412f6 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Intent NRM - version: 18.5.0 + version: 18.6.0 description: >- OAS 3.0.1 definition of the Intent NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index 797d7ca86..ce913eb9a 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Provisioning MnS - version: 18.3.0 + version: 18.5.0 description: >- OAS 3.0.1 definition of the Provisioning MnS © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28536_CoslaNrm.yaml b/OpenAPI/TS28536_CoslaNrm.yaml index 1dd7eb90f..1efd9ca6d 100755 --- a/OpenAPI/TS28536_CoslaNrm.yaml +++ b/OpenAPI/TS28536_CoslaNrm.yaml @@ -2,7 +2,7 @@ openapi: 3.0.1 info: title: coslaNrm - version: 18.2.0 + version: 18.3.0 description: >- OAS 3.0.1 specification of the Cosla NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 8720eb784..919cf25b4 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP Edge NRM - version: 18.8.0 + version: 18.9.0 description: >- OAS 3.0.1 specification of the Edge NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index fd7df61eb..82448ccc6 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.9.0 + version: 18.10.0 description: >- OAS 3.0.1 specification of the 5GC NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 10f0f601b..751378165 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.9.0 + version: 18.10.0 description: >- OAS 3.0.1 specification of the NR NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 183a863cc..215139ba0 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Slice NRM - version: 18.8.0 + version: 18.10.0 description: >- OAS 3.0.1 specification of the Slice NRM @ 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 5fecd2af3..8c62eb9d1 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Common Type Definitions - version: 18.7.0 + version: 18.9.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). diff --git a/OpenAPI/TS28623_FileManagementNrm.yaml b/OpenAPI/TS28623_FileManagementNrm.yaml index 6eeec5ba7..4a84bd523 100644 --- a/OpenAPI/TS28623_FileManagementNrm.yaml +++ b/OpenAPI/TS28623_FileManagementNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: File Management NRM - version: 18.7.0 + version: 18.9.0 description: >- OAS 3.0.1 definition of the File Management NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 6d1fa6062..c0e76d70c 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Generic NRM - version: 18.8.0 + version: 18.9.0 description: >- OAS 3.0.1 definition of the Generic NRM © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_PmControlNrm.yaml b/OpenAPI/TS28623_PmControlNrm.yaml index c3aff2b14..a53978b09 100644 --- a/OpenAPI/TS28623_PmControlNrm.yaml +++ b/OpenAPI/TS28623_PmControlNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: PM control NRM - version: 18.6.0 + version: 18.9.0 description: >- OAS 3.0.1 definition of the PM control NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_SubscriptionControlNrm.yaml b/OpenAPI/TS28623_SubscriptionControlNrm.yaml index 35de0f831..479f33874 100644 --- a/OpenAPI/TS28623_SubscriptionControlNrm.yaml +++ b/OpenAPI/TS28623_SubscriptionControlNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Subscription Control NRM - version: 18.8.0 + version: 18.9.0 description: >- OAS 3.0.1 definition of the Subscription Control NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index 770f3d1c4..8d3a24b0a 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Trace Control NRM - version: 18.8.0 + version: 18.9.0 description: >- OAS 3.0.1 definition of the Trace Control NRM fragment © 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab