From 936b706a127668c1b76e1b7dc1851f782058f8fc Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 11 Apr 2025 09:34:40 +0000 Subject: [PATCH 01/76] Rel19 CR1492 TS28.541 correction to inconsistency between stage 2 and stage 3... --- OpenAPI/TS28541_NrNrm.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 4f85f0025..de7a1980d 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -795,6 +795,10 @@ components: $ref: '#/components/schemas/CCOFunction-Single' NTNFunction: $ref: '#/components/schemas/NTNFunction-Single' + NRECMappingRule: + $ref: '#/components/schemas/NRECMappingRule-Multiple' + MWAB: + $ref: '#/components/schemas/MWAB-Multiple' ManagedElement-ncO-NrNrm: type: object @@ -825,6 +829,10 @@ components: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple' NTNFunction: $ref: '#/components/schemas/NTNFunction-Single' + NRECMappingRule: + $ref: '#/components/schemas/NRECMappingRule-Multiple' + MWAB: + $ref: '#/components/schemas/MWAB-Multiple' #-------- Definition of abstract IOCs -------------------------------------------- @@ -2377,6 +2385,10 @@ components: type: array items: $ref: '#/components/schemas/NRECMappingRule-Single' + MWAB-Multiple: + type: array + items: + $ref: '#/components/schemas/MWAB-Single' #-------- Definitions in TS 28.541 for TS 28.532 --------------------------------- -- GitLab From 5c48f506c742c8e5e131fd1b4326d8abdca6a024 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 11 Apr 2025 09:38:50 +0000 Subject: [PATCH 02/76] Rel19 CR1495 TS28.541 correction_to_stage_3_of_SatelliteBackhaulInfo Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 0cab03904..63f1b0e7d 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -2644,9 +2644,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: @@ -2663,7 +2663,7 @@ components: geoSatelliteId: type: string pattern: '^[0-9]{5}$' - GlobalRanNodeID: + NTNGlobalRanNodeID: description: globally identification of an NG-RAN node type: object oneOf: @@ -3622,8 +3622,12 @@ components: $ref: '#/components/schemas/AmfInfo' sliceExpiryInfo: $ref: '#/components/schemas/SliceExpiryInfo' - SatelliteBackhaulInfoList: - $ref: '#/components/schemas/SatelliteBackhaulInfo' + satelliteBackhaulInfoList: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/SatelliteBackhaulInfo' + minItems: 1 mappedCellIdInfoList: $ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList' mdtUserConsentReqList: -- GitLab From c6d3a865aab305bddae554f11747f76789bebf9a Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 11 Apr 2025 21:21:38 +0000 Subject: [PATCH 03/76] Rel19 CR0108 TS28.538 change_the_dataType_concerning_HostAddr: Update TS28538_EdgeNrm.yaml --- OpenAPI/TS28538_EdgeNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 3aa0bbfa7..24332bb0a 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -173,7 +173,7 @@ components: type: object properties: host: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Host' port: type: integer Operation: -- GitLab From a5fb761a2e10bd7ed70480926d26f67dcb0a2f12 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 11 Apr 2025 21:24:52 +0000 Subject: [PATCH 04/76] Rel19 CR1490 TC28.541 enhancement to Update to ManagedNFProfile: TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 118 ++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 63f1b0e7d..552ead2d9 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -340,6 +340,13 @@ components: readOnly: true nfType: $ref: '#/components/schemas/NFType' + collocatedNfInstances: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/CollocatedNfInstance' + nfInstanceName: + type: string nfStatus: $ref: '#/components/schemas/NFStatus' plmnList: @@ -370,6 +377,11 @@ components: uniqueItems: true items: $ref: '#/components/schemas/SnpnId' + perPlmnSnssaiList: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/PlmnSnssai' allowedSNPNs: type: array uniqueItems: true @@ -390,10 +402,30 @@ components: uniqueItems: true items: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' + allowedRuleSet: + description: A map (list of key-value pairs) where a valid JSON pointer Id serves as key + type: object + additionalProperties: + $ref: '#/components/schemas/RuleSet' + minProperties: 1 locality: type: string + extLocality: + description: > + A map (list of key-value pairs) where a (unique) valid JSON string serves + as key representing a type of locality + type: object + additionalProperties: + type: string + minProperties: 1 capacity: type: integer + load: + type: integer + minimum: 0 + maximum: 100 + loadTimeStamp: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' nfSetIdList: type: array uniqueItems: true @@ -431,6 +463,14 @@ components: readOnly: true nfProfileChangesSupportInd: type: boolean + nfProfilePartialUpdateChangesSupportInd: + type: boolean + default: false + writeOnly: true + nfProfileChangesInd: + type: boolean + default: false + readOnly: true defaultNotificationSubscriptions: type: array uniqueItems: true @@ -3495,6 +3535,84 @@ components: enum: - REGISTERED - DEREGISTERED + CollocatedNfInstance: + description: Information of an collocated NF Instance registered in the NRF + type: object + required: + - nfInstanceId + - nfType + properties: + nfInstanceId: + $ref: 'TS29571_CommonData.yaml#/components/schemas/NfInstanceId' + nfType: + $ref: '#/components/schemas/NFType' + PlmnSnssai: + description: List of network slices (S-NSSAIs) for a given PLMN ID + type: object + required: + - plmnId + - sNssaiList + properties: + plmnId: + $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId' + sNssaiList: + type: array + uniqueItems: true + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/ExtSnssai' + minItems: 1 + nid: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Nid' + RuleSet: + type: object + required: + - priority + - action + properties: + priority: + type: integer + minimum: 0 + maximum: 65535 + plmns: + type: array + uniqueItems: true + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId' + snpns: + type: array + uniqueItems: true + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnIdNid' + nfTypes: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/NFType' + nfDomains: + type: array + uniqueItems: true + items: + type: string + nssais: + type: array + uniqueItems: true + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/ExtSnssai' + nfInstances: + type: array + uniqueItems: true + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/NfInstanceId' + scopes: + type: array + uniqueItems: true + items: + type: string + action: + type: string + enum: + - ALLOW + - DENY #-------- Definition of types for name-containments ------ SubNetwork-ncO-5GcNrm: -- GitLab From 3d80ecd1292d52c3e946c0dd56292d58c5d0ec6a Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 11 Apr 2025 21:28:08 +0000 Subject: [PATCH 05/76] Rel19 CR1491 TS28.541 change_the_dataType_concerning_HostAddr Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 552ead2d9..5cbf87998 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -366,7 +366,7 @@ components: authzInfo: type: string hostAddr: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Host' allowedPLMNs: type: array uniqueItems: true @@ -3433,7 +3433,7 @@ components: type: object properties: host: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Host' port: type: integer NFServiceType: @@ -4369,7 +4369,7 @@ components: supportedFuncList: $ref: '#/components/schemas/SupportedFuncList' address: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Host' scpInfo: $ref: '#/components/schemas/ScpInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' @@ -4926,7 +4926,7 @@ components: remotePlmnId: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' remoteSeppAddress: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Host' remoteSeppId: type: integer n32cParas: -- GitLab From 3c68495db6cfe92d7176f13136fa090c7416a87f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Fri, 28 Mar 2025 08:30:59 +0000 Subject: [PATCH 06/76] 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 06bc702eb..ccc9ea819 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 d4cb663cf715de4c741ba917ea3025d4da2d4c4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Fri, 28 Mar 2025 16:48:13 +0000 Subject: [PATCH 07/76] 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 ccc9ea819..161740415 100644 --- a/OpenAPI/TS28318_DsoNrm.yaml +++ b/OpenAPI/TS28318_DsoNrm.yaml @@ -4,7 +4,7 @@ info: version: 19.0.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 68a0963d7a442388024e6fadf2ac2401e65365fc Mon Sep 17 00:00:00 2001 From: zhaoxxian Date: Mon, 14 Apr 2025 11:38:17 +0000 Subject: [PATCH 08/76] Rel-19 CR1510 TS 28.541 Add AIOTF and ADM IOC to support management of Ambient IoT --- OpenAPI/TS28541_5GcNrm.yaml | 38 ++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 5cbf87998..d79871dd7 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3706,6 +3706,10 @@ components: $ref: '#/components/schemas/MbUpfFunction-Multiple' MNPFFunction: $ref: '#/components/schemas/MnpfFunction-Multiple' + AiotfFunction: + $ref: '#/components/schemas/AiotfFunction-Multiple' + AdmFunction: + $ref: '#/components/schemas/AdmFunction-Multiple' #-------- Definition of concrete IOCs -------------------------------------------- AmfFunction-Single: @@ -4598,6 +4602,28 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/FqdnRo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' + AiotfFunction-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' + + AdmFunction-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' + EP_N2-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -6284,7 +6310,15 @@ components: type: array items: $ref: '#/components/schemas/EASDFFunction-Single' - + AiotfFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/AiotfFunction-Single' + AdmFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/AdmFunction-Single' + EP_N2-Multiple: type: array items: @@ -6761,3 +6795,5 @@ components: - $ref: '#/components/schemas/MbSmfFunction-Single' - $ref: '#/components/schemas/MbUpfFunction-Single' - $ref: '#/components/schemas/MnpfFunction-Single' + - $ref: '#/components/schemas/AiotfFunction-Single' + - $ref: '#/components/schemas/AdmFunction-Single' -- GitLab From cc972412b7e6b36424053d9b71d9fe5345e30669 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Refik=20Fatih=20=C3=9Cstok?= Date: Mon, 14 Apr 2025 11:41:23 +0000 Subject: [PATCH 09/76] 28.312_Rel19_CR0318_Add_stage_3_solution_for_intent_driven_management_of_network_maintenance --- OpenAPI/TS28312_IntentExpectations.yaml | 142 +++++++++++++++++++++++- OpenAPI/TS28312_IntentNrm.yaml | 5 +- 2 files changed, 145 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 85edc5ba7..477d234c5 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -162,7 +162,55 @@ components: - $ref: '#/components/schemas/ResourceSharingLevelContext' - $ref: "TS28312_IntentNrm.yaml#/components/schemas/Context" required: - - expectationId + - expectationId + NetworkMaintenanceExpectation: + description: >- + This data type is the "IntentExpectation" data type with specialisations to represent MnS consumer's expectations for Network Maintenance + type: object + properties: + expectationId: + type: string + expectationVerb: + $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb" + expectationObjects: + type: array + uniqueItems: true + items: + $ref: "#/components/schemas/NetworkMaintenanceExpectationObject" + expectationTargets: + type: array + uniqueItems: true + items: + type: object + oneOf: + - $ref: '#/components/schemas/MaintenanceVersionTarget' + - $ref: '#/components/schemas/WeakRSRPRatioTarget' + - $ref: '#/components/schemas/LowSINRRatioTarget' + - $ref: '#/components/schemas/AveULRANUEThptTarget' + - $ref: '#/components/schemas/AveDLRANUEThptTarget' + - $ref: '#/components/schemas/LowULRANUEThptRatioTarget' + - $ref: '#/components/schemas/LowDLRANUEThptRatioTarget' + - $ref: '#/components/schemas/HighULPrbLoadRatioTarget' + - $ref: '#/components/schemas/HighDLPrbLoadRatioTarget' + - $ref: '#/components/schemas/AveULPrbLoadTarget' + - $ref: '#/components/schemas/AveDLPrbLoadTarget' + - $ref: "#/components/schemas/RANEnergyConsumptionTarget" + - $ref: "#/components/schemas/RANEnergyEfficiencyTarget" + - $ref: "#/components/schemas/MaxNumberofPDUsessionsTarget" + - $ref: "#/components/schemas/MaxNumberofRegisteredsubscribersTarget" + - $ref: "#/components/schemas/IncomingDataTarget" + - $ref: "#/components/schemas/OutgoingDataTarget" + - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget" + expectationContexts: + type: array + uniqueItems: true + items: + type: object + oneOf: + - $ref: '#/components/schemas/MaintenanceTimeContext' + - $ref: "TS28312_IntentNrm.yaml#/components/schemas/Context" + required: + - expectationId #-------Definition of the IntentExpectation dataType ----------# #-------Definition of the scenario specific ExpectationObject dataType ----------# @@ -258,6 +306,34 @@ components: - $ref: "#/components/schemas/ServingScopeContext" - $ref: "#/components/schemas/DnnContext" - $ref: "TS28312_IntentNrm.yaml#/components/schemas/Context" + NetworkMaintenanceExpectationObject: + description: >- + This data type is the "ExpectationObject" data type with specialisations for NetworkMaintenanceExpectation + type: object + properties: + objectInstance: + $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" + objectContexts: + type: array + uniqueItems: true + items: + type: object + oneOf: + - $ref: "#/components/schemas/MaintenanceVersionContext" + - $ref: "#/components/schemas/MaintenanceOrderContext" + - $ref: "#/components/schemas/NfTypeContext" + - $ref: "#/components/schemas/NfInstanceLocationContext" + - $ref: "#/components/schemas/PLMNContext" + - $ref: "#/components/schemas/TaiContext" + - $ref: "#/components/schemas/ServingScopeContext" + - $ref: "#/components/schemas/DnnContext" + - $ref: '#/components/schemas/CoverageAreaPolygonContext' + - $ref: '#/components/schemas/CoverageTACContext' + - $ref: '#/components/schemas/PLMNContext' + - $ref: '#/components/schemas/DlFrequencyContext' + - $ref: '#/components/schemas/UlFrequencyContext' + - $ref: '#/components/schemas/RATContext' + - $ref: "TS28312_IntentNrm.yaml#/components/schemas/Context" #-------Definition of the ExpectationObject dataType ----------# @@ -851,6 +927,21 @@ components: - IS_LESS_THAN targetValueRange: type: integer + MaintenanceVersionTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for Maintenance Version Target. It describes the maintenance version target for the network maintenance, such as target version of the maintenance object after maintenance. + type: object + properties: + targetName: + type: string + enum: + - MaintenanceVersion + targetCondition: + type: string + enum: + - IS_EQUAL_TO + targetValueRange: + type: string #-------Definition of the concrete ExpectationTarget dataType----------# @@ -1149,6 +1240,40 @@ components: uniqueItems: true items: type: string + MaintenanceVersionContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for MaintenanceVersionContext. It describes the scope of the maintenance objects based on software version. + type: object + properties: + contextAttribute: + type: string + enum: + - swVersion + contextCondition: + type: string + enum: + - IS_ALL_OF + contextValueRange: + type: array + items: + type: string + MaintenanceOrderContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for MaintenanceOrderContext. It describes describes the list of DNs for NFs/NEs based on their order for maintenance. + type: object + properties: + contextAttribute: + type: string + enum: + - maintenanceOrder + contextCondition: + type: string + enum: + - IS_ALL_OF + contextValueRange: + type: array + items: + type: string #-------Definition of the scenario specific ObjectTarget dataType----------------# #-------Definition of the concrete ExpectationContext dataType----------------# @@ -1295,4 +1420,19 @@ components: - IS_EQUAL_TO contextValueRange: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + MaintenanceTimeContext: + description: >- + This data type is the "ExpectationContext" data type with specialisations for MaintenanceTimeContext + type: object + properties: + contextAttribute: + type: string + enum: + - MaintenanceTime + contextCondition: + type: string + enum: + - IS_EQUAL_TO + contextValueRange: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' #-------Definition of the concrete ExpectionContext dataType----------------# diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 2048c8d88..ab7ff6514 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -43,6 +43,7 @@ components: - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/EdgeServiceSupportExpectation" - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/5GCNetworkExpectation" - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/RadioServiceExpectation" + - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/NetworkMaintenanceExpectation" intentMgmtPurpose: $ref: "#/components/schemas/IntentMgmtPurpose" contextSelectivity: @@ -173,7 +174,8 @@ components: - RAN_SUBNETWORK #value for Radio Network Expectation--# - EDGE_SERVICE_SUPPORT #value for Edge Service Support Expectation--# - 5GC_SUBNETWORK #value for 5GC Network Expectation--# - - Radio_Service #value for Radio Service Expectation--# + - Radio_Service #value for Radio Service Expectation--# + - SUBNETWORK #value for Network Maintenance Expectation--# objectInstance: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' objectContexts: @@ -260,6 +262,7 @@ components: enum: - DELIVER - ENSURE + - MAINTAIN description: It describes the characteristic of the intentExpectation and is the property that describes the types of intentExpectations. Vendor extensions are allowed Frequency: description: >- -- GitLab From 560199d627aed53a8572a6efc73b3b83ab8796ee Mon Sep 17 00:00:00 2001 From: Zhen Xing Date: Mon, 14 Apr 2025 12:01:32 +0000 Subject: [PATCH 10/76] 28.312 rel19 cr0316 support mocn undifferentiated radio service in a specified area(251367) --- OpenAPI/TS28312_IntentExpectations.yaml | 38 ++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 477d234c5..03759545e 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -43,7 +43,9 @@ components: - $ref: '#/components/schemas/AveDLPrbLoadTarget' - $ref: "#/components/schemas/RANEnergyConsumptionTarget" - $ref: "#/components/schemas/RANEnergyEfficiencyTarget" - - $ref: "#/components/schemas/ActiveUEsNumTarget" + - $ref: "#/components/schemas/ActiveUEsNumTarget" + - $ref: '#/components/schemas/PRBsTarget' + - $ref: '#/components/schemas/InterRAThandoverTarget' - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget' expectationContexts: type: array @@ -716,6 +718,40 @@ components: type: integer minItems: 1 maxItems: 2 + PRBsTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for PRBsTarget. + It describes total available number of physical resource blocks (PRBs). This target is equal to the difference between the DL total available PRB plus UL total available PRB of operator A and the DL total available PRB plus UL total available PRB of operator B. DL total available PRB and UL total available PRB defined in clause 5.1.1.2.6 and 5.1.1.2.8 of TS 28.552 [12]. + type: object + properties: + targetName: + type: string + enum: + - PRBS + targetCondition: + type: string + enum: + - IS_EQUAL_TO + targetValueRange: + type: integer + InterRAThandoverTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for PRBsTarget. + it shows how often a handover from 5GS to EPS is successful. The InterRAThandover target is equal to the difference between 5GS to EPS handover success rate of operator A and 5GS to EPS handover success rate of operator B. For details see attribute 5GS to EPS handover success rate defined in clause 6.6.4 of TS 28.554 [11]. + type: object + properties: + targetName: + type: string + enum: + - INTERRATHANDOVER + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer + minimum: 0 + maximum: 100 NumberofUEsTarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for NumberofUEsTarget.It describes -- GitLab From cd3f228a9b855bdd6130bbb21c41dddb4e8a0bf7 Mon Sep 17 00:00:00 2001 From: zhaoxxian Date: Mon, 14 Apr 2025 12:27:40 +0000 Subject: [PATCH 11/76] Rel-19 CR1511 TS 28.541 add YAML stage 3 for NTN time based solution --- OpenAPI/TS28541_NrNrm.yaml | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index de7a1980d..b51c774d1 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -755,6 +755,19 @@ components: - M8 - M9 - MDT_UE_LOCATION + + NTNEntityConf: + type: object + properties: + nTNConfEntity: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + nTNConfList: + type: array + uniqueItems: true + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' + + #-------- Definition of types for name-containments ------ SubNetwork-ncO-NrNrm: type: object @@ -2174,6 +2187,8 @@ components: $ref: '#/components/schemas/NrTacList' ephemerisInfoSet: $ref: '#/components/schemas/EphemerisInfoSet-Multiple' + nTNTimeBasedConfig: + $ref: '#/components/schemas/NTNTimeBasedConfig-Multiple' EphemerisInfoSet-Single: allOf: @@ -2222,6 +2237,24 @@ components: type: integer ecTimeInterval: type: integer + + NTNTimeBasedConfig-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - type: object + properties: + timeWindow: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + nTNEntityConfigList: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/NTNEntityConf' + minItems: 1 #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -2385,6 +2418,10 @@ components: type: array items: $ref: '#/components/schemas/NRECMappingRule-Single' + NTNTimeBasedConfig-Multiple: + type: array + items: + $ref: '#/components/schemas/NTNTimeBasedConfig-Single' MWAB-Multiple: type: array items: @@ -2458,3 +2495,4 @@ components: - $ref: '#/components/schemas/EphemerisInfoSet-Single' - $ref: '#/components/schemas/MWAB-Single' - $ref: '#/components/schemas/NRECMappingRule-Single' + - $ref: '#/components/schemas/NTNTimeBasedConfig-Single' -- GitLab From 89b248b26117f9d81c2ece0da1121271c088f590 Mon Sep 17 00:00:00 2001 From: shixixi Date: Tue, 25 Mar 2025 08:47:08 +0000 Subject: [PATCH 12/76] Update TS28104_MdaNrm.yaml --- OpenAPI/TS28104_MdaNrm.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index babe49e8f..82102436b 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -33,6 +33,7 @@ components: - RESOURCEANALYTICS_PHYISCALRESOURCEUTILIZATIONANALYSISNF - RESOURCEANALYTICS_5GCCONTROLPLANECONGESTIONANALYSIS - PREDICTIONS_PMDATA + MDATypes: type: array -- GitLab From 4dedbe561c0854e842679cb0ab110f62bdbad69c Mon Sep 17 00:00:00 2001 From: shixixi Date: Tue, 25 Mar 2025 09:14:13 +0000 Subject: [PATCH 13/76] Update TS28104_MdaNrm.yaml --- OpenAPI/TS28104_MdaNrm.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index 82102436b..cfcab51c9 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -33,6 +33,7 @@ components: - RESOURCEANALYTICS_PHYISCALRESOURCEUTILIZATIONANALYSISNF - RESOURCEANALYTICS_5GCCONTROLPLANECONGESTIONANALYSIS - PREDICTIONS_PMDATA + - UETHROUGHPUTANALYTICS_TRAFFICCONGESTIONPROBLEMANALYSIS MDATypes: -- GitLab From b8bfa26143f02cc8f26edb070485e48d6167d06f Mon Sep 17 00:00:00 2001 From: shixixi Date: Fri, 28 Mar 2025 09:18:50 +0000 Subject: [PATCH 14/76] Update TS28104_MdaNrm.yaml --- OpenAPI/TS28104_MdaNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index cfcab51c9..af908cdce 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -33,7 +33,7 @@ components: - RESOURCEANALYTICS_PHYISCALRESOURCEUTILIZATIONANALYSISNF - RESOURCEANALYTICS_5GCCONTROLPLANECONGESTIONANALYSIS - PREDICTIONS_PMDATA - - UETHROUGHPUTANALYTICS_TRAFFICCONGESTIONPROBLEMANALYSIS + - UETHROUGHPUTANALYSIS_TRAFFICCONGESTIONPROBLEMANALYSIS MDATypes: -- GitLab From f3b47024e6df771a4c65fa748fd92dcca8e11142 Mon Sep 17 00:00:00 2001 From: ruanb Date: Fri, 28 Mar 2025 17:36:41 +0000 Subject: [PATCH 15/76] Rel19_CR1523_TS28541_Fix_nTNTAClist_for_stage3_OpenAPI --- OpenAPI/TS28541_NrNrm.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index b51c774d1..ea02f7f10 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -610,13 +610,6 @@ components: type: integer minValue: type: integer - - NTNTAClist: - type: array - uniqueItems: true - items: - $ref: '#/components/schemas/NrTac' - Ephemeris: type: object oneOf: -- GitLab From e6feba6d2c48808f0be4cbb3836f01f818a95ddc Mon Sep 17 00:00:00 2001 From: ruanb Date: Tue, 15 Apr 2025 10:03:16 +0000 Subject: [PATCH 16/76] Rel19_CR1506_TS28541_Add_attributes_to_support_MEC_deployment_onboard_the_NTN --- OpenAPI/TS28541_5GcNrm.yaml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index d79871dd7..df1cc353d 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -849,6 +849,10 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai' minItems: 1 + SatelliteId: + type: string + pattern: '^[0-9]{5}$' + dnaiSatelliteMapping: type: object properties: @@ -859,8 +863,7 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai' minItems: 1 geoSatelliteId: - type: string - pattern: '^[0-9]{5}$' + $ref: '#/components/schemas/SatelliteId' SnssaiSmfInfoItem: type: object @@ -3937,8 +3940,7 @@ components: isOnboardSatellite: type: boolean onboardSatelliteId: - type: string - pattern: '^[0-9]{5}$' + $ref: '#/components/schemas/SatelliteId' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object @@ -4497,6 +4499,10 @@ components: type: string easdfInfo: $ref: '#/components/schemas/EasdfInfo' + isOnboardSatellite: + type: boolean + onboardSatelliteId: + $ref: '#/components/schemas/SatelliteId' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object -- GitLab From b7ab5832d41097c20e8936a465b60b0fda4ac7cf Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 16 Apr 2025 00:44:31 +0000 Subject: [PATCH 17/76] Rel_19_CR1500_TS_28.541_update_the_naming_convention_in_TS28541_NrNrm_yaml_to_align_with_stage_2_definition --- OpenAPI/TS28541_NrNrm.yaml | 243 +++++++++++++++++++------------------ 1 file changed, 124 insertions(+), 119 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index ea02f7f10..64413f14c 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -73,13 +73,13 @@ components: items: $ref: '#/components/schemas/PlmnInfo' minItems: 1 - NpnIdentityList: + NPNIdentityList: type: array uniqueItems: true items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NpnId-Type' minItems: 1 - GGnbId: + GgNBId: type: object properties: plmnId: @@ -88,7 +88,7 @@ components: $ref: '#/components/schemas/GnbIdLength' gnbId: $ref: '#/components/schemas/GnbId' - GEnbId: + GeNBId: type: object properties: plmnId: @@ -98,24 +98,24 @@ components: minimum: 0 maximum: 4194303 - GGnbIdList: + GgNBIdList: type: array uniqueItems: true items: - $ref: '#/components/schemas/GGnbId' + $ref: '#/components/schemas/GgNBId' - GEnbIdList: + GeNBIdList: type: array uniqueItems: true items: - $ref: '#/components/schemas/GEnbId' + $ref: '#/components/schemas/GeNBId' NrPci: type: integer maximum: 503 - NrTac: + NRTAC: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac' - NrTacList: + NRTACList: type: array uniqueItems: true items: @@ -294,18 +294,18 @@ components: - NO - PARTIAL - FULL - RrmPolicyMember: + RRMPolicyMember: type: object properties: plmnId: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' snssai: $ref: '#/components/schemas/Snssai' - RrmPolicyMemberList: + RRMPolicyMemberList: type: array uniqueItems: true items: - $ref: '#/components/schemas/RrmPolicyMember' + $ref: '#/components/schemas/RRMPolicyMember' minItems: 1 AddressWithVlan: type: object @@ -610,6 +610,11 @@ components: type: integer minValue: type: integer + NTNTAClist: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/NRTAC' Ephemeris: type: object oneOf: @@ -767,12 +772,12 @@ components: properties: NRFrequency: $ref: '#/components/schemas/NRFrequency-Multiple' - ExternalGnbCuCpFunction: - $ref: '#/components/schemas/ExternalGnbCuCpFunction-Multiple' - ExternalGnbCuUpFunction: - $ref: '#/components/schemas/ExternalGnbCuUpFunction-Multiple' - ExternalGnbDuFunction: - $ref: '#/components/schemas/ExternalGnbDuFunction-Multiple' + ExternalGNBCUCPFunction: + $ref: '#/components/schemas/GNBCUCPFunction-Multiple' + ExternalGNBCUUPFunction: + $ref: '#/components/schemas/ExternalGNBCUUPFunction-Multiple' + ExternalGNBDUFunction: + $ref: '#/components/schemas/ExternalGNBDUFunction-Multiple' ExternalENBFunction: $ref: '#/components/schemas/ExternalENBFunction-Multiple' EUtranFrequency: @@ -809,12 +814,12 @@ components: ManagedElement-ncO-NrNrm: type: object properties: - GnbDuFunction: - $ref: '#/components/schemas/GnbDuFunction-Multiple' - GnbCuUpFunction: - $ref: '#/components/schemas/GnbCuUpFunction-Multiple' - GnbCuCpFunction: - $ref: '#/components/schemas/GnbCuCpFunction-Multiple' + GNBDUFunction: + $ref: '#/components/schemas/GNBDUFunction-Multiple' + GNBCUUPFunction: + $ref: '#/components/schemas/GNBCUUPFunction-Multiple' + GNBCUCPFunction: + $ref: '#/components/schemas/GNBCUCPFunction-Multiple' DESManagementFunction: $ref: '#/components/schemas/DESManagementFunction-Single' DRACHOptimizationFunction: @@ -842,17 +847,17 @@ components: #-------- Definition of abstract IOCs -------------------------------------------- - RrmPolicy_-Attr: + RRMPolicy_-Attr: type: object properties: resourceType: $ref: '#/components/schemas/ResourceType' - rRMPolicyMemberList: - $ref: '#/components/schemas/RrmPolicyMemberList' + RRMPolicyMemberList: + $ref: '#/components/schemas/RRMPolicyMemberList' #-------- Definition of concrete IOCs -------------------------------------------- - GnbDuFunction-Single: + GNBDUFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -885,12 +890,12 @@ components: properties: RRMPolicyRatio: $ref: '#/components/schemas/RRMPolicyRatio-Multiple' - NrCellDu: - $ref: '#/components/schemas/NrCellDu-Multiple' - Bwp-Multiple: - $ref: '#/components/schemas/Bwp-Multiple' - NrSectorCarrier-Multiple: - $ref: '#/components/schemas/NrSectorCarrier-Multiple' + NRCellDU: + $ref: '#/components/schemas/NRCellDU-Multiple' + BWP-Multiple: + $ref: '#/components/schemas/BWP-Multiple' + NRSectorCarrier-Multiple: + $ref: '#/components/schemas/NRSectorCarrier-Multiple' EP_F1C: $ref: '#/components/schemas/EP_F1C-Single' EP_F1U: @@ -898,7 +903,7 @@ components: DRACHOptimizationFunction: $ref: '#/components/schemas/DRACHOptimizationFunction-Single' OperatorDU: - $ref: '#/components/schemas/OperatorDu-Multiple' + $ref: '#/components/schemas/OperatorDU-Multiple' BWPSet: $ref: '#/components/schemas/BWPSet-Multiple' Configurable5QISet: @@ -906,7 +911,7 @@ components: Dynamic5QISet: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple' - OperatorDu-Single: + OperatorDU-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -927,9 +932,9 @@ components: dynamic5QISetRef: description: This attribute is condition optional. The condition is NG-RAN Multi-Operator Core Network (NG-RAN MOCN) network sharing with operator specific 5QI is supported. $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' - NrOperatorCellDu: - $ref: '#/components/schemas/NrOperatorCellDu-Multiple' - GnbCuUpFunction-Single: + NROperatorCellDU: + $ref: '#/components/schemas/NROperatorCellDU-Multiple' + GNBCUUPFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -949,7 +954,7 @@ components: type: boolean onboardSatelliteId: $ref: '#/components/schemas/SatelliteId' - plmnInfoList: + PlmnInfoList: $ref: '#/components/schemas/PlmnInfoList' configurable5QISetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' @@ -977,7 +982,7 @@ components: Dynamic5QISet: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple' - GnbCuCpFunction-Single: + GNBCUCPFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -996,17 +1001,17 @@ components: plmnId: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' x2BlockList: - $ref: '#/components/schemas/GGnbIdList' + $ref: '#/components/schemas/GgNBIdList' xnBlockList: - $ref: '#/components/schemas/GGnbIdList' + $ref: '#/components/schemas/GgNBIdList' x2AllowList: - $ref: '#/components/schemas/GGnbIdList' + $ref: '#/components/schemas/GgNBIdList' xnAllowList: - $ref: '#/components/schemas/GGnbIdList' + $ref: '#/components/schemas/GgNBIdList' x2HOBlockList: - $ref: '#/components/schemas/GEnbIdList' + $ref: '#/components/schemas/GeNBIdList' xnHOBlockList: - $ref: '#/components/schemas/GGnbIdList' + $ref: '#/components/schemas/GgNBIdList' mappingSetIDBackhaulAddressList: type: array uniqueItems: true @@ -1044,8 +1049,8 @@ components: properties: RRMPolicyRatio: $ref: '#/components/schemas/RRMPolicyRatio-Multiple' - NrCellCu: - $ref: '#/components/schemas/NrCellCu-Multiple' + NRCellCU: + $ref: '#/components/schemas/NRCellCU-Multiple' EP_XnC: $ref: '#/components/schemas/EP_XnC-Multiple' EP_E1: @@ -1073,7 +1078,7 @@ components: EUtranNetwork: $ref: '#/components/schemas/EUtraNetwork-Single' - NrCellCu-Single: + NRCellCU-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -1113,7 +1118,7 @@ components: DPCIConfigurationFunction: $ref: '#/components/schemas/DPCIConfigurationFunction-Single' - NrCellDu-Single: + NRCellDU-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -1131,13 +1136,13 @@ components: type: integer cellState: $ref: '#/components/schemas/CellState' - plmnInfoList: + plmnInfoInfoList: $ref: '#/components/schemas/PlmnInfoList' - npnIdentityList: - $ref: '#/components/schemas/NpnIdentityList' + nPNIdentityList: + $ref: '#/components/schemas/NPNIdentityList' nrPci: $ref: '#/components/schemas/NrPci' - nrTac: + nRTAC: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac' arfcnDL: type: integer @@ -1173,18 +1178,18 @@ components: enum: - REDCAP_1RX - REDCAP_2RX - nrSectorCarrierRef: + nRSectorCarrierRef: type: array uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - bwpRef: + bWPRef: description: "Condition is BWP sets are not supported" type: array uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - bwpSetRef: + bWPSetRef: description: "Condition is BWP sets are supported" $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' rimRSMonitoringStartTime: @@ -1230,7 +1235,7 @@ components: maxItems: 12 - NrOperatorCellDu-Single: + NROperatorCellDU-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -1241,7 +1246,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' plmnInfoList: $ref: '#/components/schemas/PlmnInfoList' - nrTac: + nRTAC: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac' NRFrequency-Single: @@ -1280,7 +1285,7 @@ components: minimum: 1 maximum: 256 - NrSectorCarrier-Single: + NRSectorCarrier-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -1309,7 +1314,7 @@ components: properties: CommonBeamformingFunction: $ref: '#/components/schemas/CommonBeamformingFunction-Single' - Bwp-Single: + BWP-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -1402,7 +1407,7 @@ components: properties: attributes: allOf: - - $ref: '#/components/schemas/RrmPolicy_-Attr' + - $ref: '#/components/schemas/RRMPolicy_-Attr' - type: object properties: rRMPolicyMaxRatio: @@ -1816,7 +1821,7 @@ components: nRCellDURefs: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' - ExternalGnbDuFunction-Single: + ExternalGNBDUFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -1844,15 +1849,15 @@ components: properties: NRFrequency: $ref: '#/components/schemas/NRFrequency-Multiple' - ExternalGnbCuCpFunction: - $ref: '#/components/schemas/ExternalGnbCuCpFunction-Multiple' - ExternalGnbCuUpFunction: - $ref: '#/components/schemas/ExternalGnbCuUpFunction-Multiple' - ExternalGnbDuFunction: - $ref: '#/components/schemas/ExternalGnbDuFunction-Multiple' + ExternalGNBCUCPFunction: + $ref: '#/components/schemas/ExternalGNBCUCPFunction-Multiple' + ExternalGNBCUUPFunction: + $ref: '#/components/schemas/ExternalGNBCUUPFunction-Multiple' + ExternalGNBDUFunction: + $ref: '#/components/schemas/ExternalGNBDUFunction-Multiple' - ExternalGnbCuUpFunction-Single: + ExternalGNBCUUPFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -1875,7 +1880,7 @@ components: $ref: '#/components/schemas/EP_F1U-Multiple' EP_XnU: $ref: '#/components/schemas/EP_XnU-Multiple' - ExternalGnbCuCpFunction-Single: + ExternalGNBCUCPFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -1895,15 +1900,15 @@ components: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: - ExternalNrCellCu: - $ref: '#/components/schemas/ExternalNrCellCu-Multiple' + ExternalNRCellCU: + $ref: '#/components/schemas/ExternalNRCellCU-Multiple' EP_XnC: $ref: '#/components/schemas/EP_XnC-Multiple' EP_E1: $ref: '#/components/schemas/EP_E1-Multiple' EP_F1C: $ref: '#/components/schemas/EP_F1C-Multiple' - ExternalNrCellCu-Single: + ExternalNRCellCU-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -2124,11 +2129,11 @@ components: properties: cCOControl: type: boolean - cCOWeakCoverageParameters: + CCOWeakCoverageParameters: $ref: '#/components/schemas/CCOWeakCoverageParameters-Single' - cCOPilotPollutionParameters: + CCOPilotPollutionParameters: $ref: '#/components/schemas/CCOPilotPollutionParameters-Single' - cCOOvershootCoverageParameters-Single: + CCOOvershootCoverageParameters-Single: $ref: '#/components/schemas/CCOOvershootCoverageParameters-Single' CCOParameters-Attr: allOf: @@ -2177,8 +2182,8 @@ components: nTNpLMNInfoList: $ref: '#/components/schemas/PlmnInfoList' nTNTAClist: - $ref: '#/components/schemas/NrTacList' - ephemerisInfoSet: + $ref: '#/components/schemas/NRTACList' + EphemerisInfoSet: $ref: '#/components/schemas/EphemerisInfoSet-Multiple' nTNTimeBasedConfig: $ref: '#/components/schemas/NTNTimeBasedConfig-Multiple' @@ -2251,41 +2256,41 @@ components: #-------- Definition of JSON arrays for name-contained IOCs ---------------------- - GnbDuFunction-Multiple: + GNBDUFunction-Multiple: type: array items: - $ref: '#/components/schemas/GnbDuFunction-Single' - OperatorDu-Multiple: + $ref: '#/components/schemas/GNBDUFunction-Single' + OperatorDU-Multiple: type: array items: - $ref: '#/components/schemas/OperatorDu-Single' - GnbCuUpFunction-Multiple: + $ref: '#/components/schemas/OperatorDU-Single' + GNBCUUPFunction-Multiple: type: array items: - $ref: '#/components/schemas/GnbCuUpFunction-Single' - GnbCuCpFunction-Multiple: + $ref: '#/components/schemas/GNBCUUPFunction-Single' + GNBCUCPFunction-Multiple: type: array items: - $ref: '#/components/schemas/GnbCuCpFunction-Single' + $ref: '#/components/schemas/GNBCUCPFunction-Single' BWPSet-Multiple: type: array items: $ref: '#/components/schemas/BWPSet-Single' - NrCellDu-Multiple: + NRCellDU-Multiple: type: array items: - $ref: '#/components/schemas/NrCellDu-Single' + $ref: '#/components/schemas/NRCellDU-Single' - NrOperatorCellDu-Multiple: + NROperatorCellDU-Multiple: type: array items: - $ref: '#/components/schemas/NrOperatorCellDu-Single' + $ref: '#/components/schemas/NROperatorCellDU-Single' - NrCellCu-Multiple: + NRCellCU-Multiple: type: array items: - $ref: '#/components/schemas/NrCellCu-Single' + $ref: '#/components/schemas/NRCellCU-Single' NRFrequency-Multiple: type: array @@ -2298,14 +2303,14 @@ components: items: $ref: '#/components/schemas/EUtranFrequency-Single' - NrSectorCarrier-Multiple: + NRSectorCarrier-Multiple: type: array items: - $ref: '#/components/schemas/NrSectorCarrier-Single' - Bwp-Multiple: + $ref: '#/components/schemas/NRSectorCarrier-Single' + BWP-Multiple: type: array items: - $ref: '#/components/schemas/Bwp-Single' + $ref: '#/components/schemas/BWP-Single' Beam-Multiple: type: array items: @@ -2337,22 +2342,22 @@ components: items: $ref: '#/components/schemas/RimRSSet-Single' - ExternalGnbDuFunction-Multiple: + ExternalGNBDUFunction-Multiple: type: array items: - $ref: '#/components/schemas/ExternalGnbDuFunction-Single' - ExternalGnbCuUpFunction-Multiple: + $ref: '#/components/schemas/ExternalGNBDUFunction-Single' + ExternalGNBCUUPFunction-Multiple: type: array items: - $ref: '#/components/schemas/ExternalGnbCuUpFunction-Single' - ExternalGnbCuCpFunction-Multiple: + $ref: '#/components/schemas/ExternalGNBCUUPFunction-Single' + ExternalGNBCUCPFunction-Multiple: type: array items: - $ref: '#/components/schemas/ExternalGnbCuCpFunction-Single' - ExternalNrCellCu-Multiple: + $ref: '#/components/schemas/ExternalGNBCUCPFunction-Single' + ExternalNRCellCU-Multiple: type: array items: - $ref: '#/components/schemas/ExternalNrCellCu-Single' + $ref: '#/components/schemas/ExternalNRCellCU-Single' ExternalENBFunction-Multiple: type: array @@ -2424,14 +2429,14 @@ components: resources-nrNrm: oneOf: - - $ref: '#/components/schemas/GnbDuFunction-Single' - - $ref: '#/components/schemas/GnbCuUpFunction-Single' - - $ref: '#/components/schemas/GnbCuCpFunction-Single' - - $ref: '#/components/schemas/OperatorDu-Single' + - $ref: '#/components/schemas/GNBDUFunction-Single' + - $ref: '#/components/schemas/GNBCUUPFunction-Single' + - $ref: '#/components/schemas/GNBCUCPFunction-Single' + - $ref: '#/components/schemas/OperatorDU-Single' - - $ref: '#/components/schemas/NrCellCu-Single' - - $ref: '#/components/schemas/NrCellDu-Single' - - $ref: '#/components/schemas/NrOperatorCellDu-Single' + - $ref: '#/components/schemas/NRCellCU-Single' + - $ref: '#/components/schemas/NRCellDU-Single' + - $ref: '#/components/schemas/NROperatorCellDU-Single' - $ref: '#/components/schemas/NRNetwork-Single' - $ref: '#/components/schemas/EUtraNetwork-Single' @@ -2439,8 +2444,8 @@ components: - $ref: '#/components/schemas/NRFrequency-Single' - $ref: '#/components/schemas/EUtranFrequency-Single' - - $ref: '#/components/schemas/NrSectorCarrier-Single' - - $ref: '#/components/schemas/Bwp-Single' + - $ref: '#/components/schemas/NRSectorCarrier-Single' + - $ref: '#/components/schemas/BWP-Single' - $ref: '#/components/schemas/BWPSet-Single' - $ref: '#/components/schemas/CommonBeamformingFunction-Single' - $ref: '#/components/schemas/Beam-Single' @@ -2463,10 +2468,10 @@ components: - $ref: '#/components/schemas/RimRSGlobal-Single' - $ref: '#/components/schemas/RimRSSet-Single' - - $ref: '#/components/schemas/ExternalGnbDuFunction-Single' - - $ref: '#/components/schemas/ExternalGnbCuUpFunction-Single' - - $ref: '#/components/schemas/ExternalGnbCuCpFunction-Single' - - $ref: '#/components/schemas/ExternalNrCellCu-Single' + - $ref: '#/components/schemas/ExternalGNBDUFunction-Single' + - $ref: '#/components/schemas/ExternalGNBCUUPFunction-Single' + - $ref: '#/components/schemas/ExternalGNBCUCPFunction-Single' + - $ref: '#/components/schemas/ExternalNRCellCU-Single' - $ref: '#/components/schemas/ExternalENBFunction-Single' - $ref: '#/components/schemas/ExternalEUTranCell-Single' -- GitLab From 1b1ae1a71938b2e4305df80ed1dcddda3cd0a3b5 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 26 Mar 2025 03:15:12 +0000 Subject: [PATCH 18/76] Update 2 files - /OpenAPI/TS28312_IntentNrm.yaml - /OpenAPI/TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 30 +++++++------------------ OpenAPI/TS28312_IntentNrm.yaml | 9 ++++---- 2 files changed, 13 insertions(+), 26 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 03759545e..df861ada0 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -260,8 +260,11 @@ components: type: object oneOf: - $ref: '#/components/schemas/CoverageAreaPolygonContext' + - $ref: '#/components/schemas/DlFrequencyContext' + - $ref: '#/components/schemas/UlFrequencyContext' + - $ref: '#/components/schemas/CellContext' - $ref: '#/components/schemas/ServiceTypeContext' - - $ref: '#/components/schemas/PlmnInfoContext' + - $ref: '#/components/schemas/UEGroupContext' - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context' EdgeServiceSupportExpectationObject: description: >- @@ -1020,7 +1023,7 @@ components: CellContext: description: >- This data type is the "ObjectContext" data type with specialisations for CellContext. - It describes the coverage areas for the RAN SubNetwork that the intent expectation is applied + It describes the coverage areas for the RAN SubNetwork or Radio Service that the intent expectation is applied in the form of a list of cells (including E-UTRAN cells identified by E-UTRAN-CGI and NR cells identified by NG-RAN CGI). type: object @@ -1062,7 +1065,7 @@ components: DlFrequencyContext: description: >- This data type is the "Context" data type with specialisations for Object context "DLFrequencyContext". It describes the downlink frequency information (RF reference - frequencies and/ or the frequency operating band) supported by the RAN SubNetwork that the intent expectation is applied. + frequencies and/ or the frequency operating band) supported by the RAN SubNetwork or Radio Service that the intent expectation is applied. type: object properties: contextAttribute: @@ -1081,7 +1084,7 @@ components: UlFrequencyContext: description: >- This data type is the "Context" data type with specialisations for Object context "ULFrequencyContext".It describes the uplink frequency information (RF reference - frequencies and/ or the frequency operating band) supported by the RAN SubNetwork that the intent expectation is applied. + frequencies and/ or the frequency operating band) supported by the RAN SubNetwork or Radio Service that the intent expectation is applied. type: object properties: contextAttribute: @@ -1122,7 +1125,7 @@ components: - NR UEGroupContext: description: >- - This data type is the "ObjectContext" data type with specialisations for UEGroup([5QI, SNSSAI]) + This data type is the "ObjectContext" data type with specialisations for UEGroup([5QI, SNSSAI, pLMNId]) type: object properties: contextAttribute: @@ -1407,23 +1410,6 @@ components: - IS_EQUAL_TO contextValueRange: $ref: "TS28541_NrNrm.yaml#/components/schemas/Sst" - PlmnInfoContext: - description: >- - This data type is the "ExpectationContext" data type with specialisations for PlmnInfoContext.It describes - the PLMN supported by the Radio Service that the intent expectation is applied. In case of network slicing - feature is supported, this also represents the S-NSSAI in the PLMN supported by the Radio Service. - type: object - properties: - contextAttribute: - type: string - enum: - - PlmnInfo - contextCondition: - type: string - enum: - - IS_ALL_OF - contextValueRange: - $ref: "TS28541_NrNrm.yaml#/components/schemas/PlmnInfo" SchedulingTimeContext: description: >- This data type is the "ExpectationContext" data type with specialisations for SchedulingTimeContext.It describes diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index ab7ff6514..8a66cce2e 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -295,14 +295,15 @@ components: - $ref: '#/components/schemas/UEGroup' - $ref: '#/components/schemas/Frequency' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' - - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfo' UEGroup: description: >- - It describes the UE Group, which is - represented by specific 5QI, specific S-NSSAI, or a specific combination - of S-NSSAI and 5QI + It describes the UE Group, + which is represented by specific 5QI, specific S-NSSAI, specific PLMNId or + a specific combination of S-NSSAI, 5QI and PLMNId. type: object properties: + pLMNId: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' fiveQI: type: integer minimum: 0 -- GitLab From 7295d2e94ed25149f80e1296ab65fa9def0ccadf Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 27 Mar 2025 12:28:03 +0000 Subject: [PATCH 19/76] Update file TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 27 +++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index df861ada0..8f49b6b62 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -235,6 +235,7 @@ components: oneOf: - $ref: '#/components/schemas/CoverageAreaPolygonContext' - $ref: '#/components/schemas/CoverageTACContext' + - $ref: '#/components/schemas/TimeBasedAreaContext' - $ref: '#/components/schemas/CellContext' - $ref: '#/components/schemas/PLMNContext' - $ref: '#/components/schemas/DlFrequencyContext' @@ -1044,6 +1045,32 @@ components: oneOf: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/EutraCellId' - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NrCellId' + TimeBasedAreaContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for TimeBasedAreaContext. + It describes the areas for specific times for the RAN SubNetwork that the intent expectation is + applied in the form of a list. + type: object + properties: + contextAttribute: + type: string + enum: + - TimeBasedArea + contextCondition: + type: string + enum: + - IS_ALL_OF + contextValueRange: + type: array + items: + $ref: "#/components/schemas/TimeBasedArea" + TimeBasedArea: + type: object + properties: + geoArea: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' + timeWindow: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' PLMNContext: description: >- This data type is the "ObjectContext" data type with specialisations for PLMNContext -- GitLab From f4bb9f8631c72d986079af1fe8fc79cd7bbafb06 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 26 Mar 2025 14:09:21 +0000 Subject: [PATCH 20/76] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 8a66cce2e..b451403a2 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -217,6 +217,7 @@ components: - FEASIBILITYCHECK - FULFILMENT - EXPLORATION + - FULFILMENT_WITH_NEGOTIATION default: FULFILMENT FulfilmentStatus: type: string -- GitLab From b97b346c361bdacf5133b57a0cca508eeb84685e Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 8 Apr 2025 19:05:43 +0000 Subject: [PATCH 21/76] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index b451403a2..c95e1aeb2 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -215,10 +215,10 @@ components: type: string enum: - FEASIBILITYCHECK - - FULFILMENT + - FULFILMENT_WITHOUT_NEGOTIATION - EXPLORATION - FULFILMENT_WITH_NEGOTIATION - default: FULFILMENT + default: FULFILMENT_WITHOUT_NEGOTIATION FulfilmentStatus: type: string readOnly: true -- GitLab From 40f625841f19ca0e8797444ca4198576bb6d7ef5 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 25 Mar 2025 12:50:16 +0000 Subject: [PATCH 22/76] Update file TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 89d1d35e8..cd0002be6 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -16,7 +16,7 @@ components: #-------- Definition of types----------------------------------------------------- - VnfParameter: + VnfParameters: type: object properties: vnfInstanceId: @@ -27,7 +27,7 @@ components: type: string autoScalable: type: boolean - PeeParameter: + PeeParameters: type: object properties: siteIdentification: @@ -41,13 +41,14 @@ components: siteAltitude: type: number format: float + siteDescription: + type: string equipmentType: type: string environmentType: type: string powerInterface: type: string - TransportProtocol: anyOf: - type: string @@ -414,12 +415,12 @@ components: type: array uniqueItems: true items: - $ref: '#/components/schemas/VnfParameter' + $ref: '#/components/schemas/VnfParameters' peeParametersList: type: array uniqueItems: true items: - $ref: '#/components/schemas/PeeParameter' + $ref: '#/components/schemas/PeeParameters' priorityLabel: type: integer supportedPerfMetricGroups: -- GitLab From 936640aefe39e145939a7358e3408001f624d634 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 25 Mar 2025 12:54:34 +0000 Subject: [PATCH 23/76] Update file TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index cd0002be6..177cccc19 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -17,6 +17,8 @@ components: VnfParameters: + description: -> + This <> represents the parameter set of the VNF instance(s) corresponding to an NE. type: object properties: vnfInstanceId: @@ -28,12 +30,12 @@ components: autoScalable: type: boolean PeeParameters: + description: -> + This <> represents the parameter list for the control and monitoring of power, energy and environmental parameters. type: object properties: siteIdentification: type: string - siteDescription: - type: string siteLatitude: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Latitude' siteLongitude: -- GitLab From b0659e161fe0619e5a95dfd9a583382f773b5c68 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 9 Apr 2025 15:03:45 +0000 Subject: [PATCH 24/76] Update file TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 177cccc19..3aa14f00f 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -29,6 +29,7 @@ components: type: string autoScalable: type: boolean + default: FALSE PeeParameters: description: -> This <> represents the parameter list for the control and monitoring of power, energy and environmental parameters. -- GitLab From d496cf5f8f6f67e8043a5444780aa64fb0a53ebb Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 24 Mar 2025 07:56:13 +0000 Subject: [PATCH 25/76] Update file TS28623_SubscriptionControlNrm.yaml --- OpenAPI/TS28623_SubscriptionControlNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_SubscriptionControlNrm.yaml b/OpenAPI/TS28623_SubscriptionControlNrm.yaml index 83b75c6b6..a12682a94 100644 --- a/OpenAPI/TS28623_SubscriptionControlNrm.yaml +++ b/OpenAPI/TS28623_SubscriptionControlNrm.yaml @@ -83,7 +83,7 @@ components: triggerHeartbeatNtf: type: boolean default: FALSE - + writeOnly: true #-------- Definition of YAML arrays for name-contained IOCs ---------------------- NtfSubscriptionControl-Multiple: type: array -- GitLab From cbc60e62bf926796dd64dc10e9e39bada4356aa8 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sun, 23 Mar 2025 07:51:38 +0000 Subject: [PATCH 26/76] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index c95e1aeb2..41c5b355c 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -112,12 +112,6 @@ components: minItems: 1 items: $ref: '#/components/schemas/IntentHandlingCapability' - supportedExpectationTargetInfo: - type: array - items: - $ref: '#/components/schemas/SupportedExpectationTargetInfo' - uniqueItems: true - minItems: 1 Intent: $ref: '#/components/schemas/Intent-Multiple' IntentReport: @@ -630,20 +624,18 @@ components: - Radio_Service readOnly: true description: It describes the expectation object type which can be supported by a specific intent handling function of MnS producer. - supportedExpectationTargetNames: + supportedExpectationTargetInfos: type: array + items: + $ref: '#/components/schemas/SupportedExpectationTargetInfo' uniqueItems: true minItems: 1 - items: - type: string - readOnly: true - description: It describes the supported expectation targets for the supported expectation object type. SupportedExpectationTargetInfo: description: >- It indicates the detailed information about what the intent driven MnS producer supports for a given supportedExpectationObjectType. type: object properties: - supportedExpectationTargetName: + supportedTargetName: type: string readOnly: true supportedTargetCondition: -- GitLab From 568328ddab63bfb2ce7586cced51ceb3c7f5360e Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 8 Apr 2025 19:52:24 +0000 Subject: [PATCH 27/76] Update file TS28312_IntentNrm.yaml --- 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 41c5b355c..c8e988e12 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -624,7 +624,7 @@ components: - Radio_Service readOnly: true description: It describes the expectation object type which can be supported by a specific intent handling function of MnS producer. - supportedExpectationTargetInfos: + supportedExpectationTargetInfoList: type: array items: $ref: '#/components/schemas/SupportedExpectationTargetInfo' -- GitLab From 3e95f8af9e5418cf2c49910f46420f81e9aaff3a Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sun, 23 Mar 2025 06:34:15 +0000 Subject: [PATCH 28/76] Update file TS28623_MnSRegistryNrm.yaml --- OpenAPI/TS28623_MnSRegistryNrm.yaml | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/OpenAPI/TS28623_MnSRegistryNrm.yaml b/OpenAPI/TS28623_MnSRegistryNrm.yaml index 70e245c10..4c525b6c3 100644 --- a/OpenAPI/TS28623_MnSRegistryNrm.yaml +++ b/OpenAPI/TS28623_MnSRegistryNrm.yaml @@ -53,15 +53,29 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/UriRo' mnsScope: description: >- - List of the managed object instances that can be accessed using the MnS. - If a complete SubNetwork can be accessed using the MnS, this attribute may - contain the DN of the SubNetwork instead of the DNs of the individual managed - entities within the SubNetwork. + It is used to provide information about the management scope of the Management Service. The management scope is + used to represent the set of managed object instances that can be accessed using the Management Service. type: array uniqueItems: true items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: '#/components/schemas/MnsScope' minItems: 1 + MnsScope: + description: -> + It defines the information about the management scope of the Management Service. + oneOf: + - type: array + uniqueItems: true + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + - type: array + uniqueItems: true + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' + - type: array + uniqueItems: true + items: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' #-------- Definition of YAML arrays for name-contained IOCs ---------------------- -- GitLab From bf4b041fef4259da1c0d636903090eda509a2a97 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sun, 23 Mar 2025 07:21:42 +0000 Subject: [PATCH 29/76] Update file TS28623_MnSRegistryNrm.yaml --- OpenAPI/TS28623_MnSRegistryNrm.yaml | 40 ++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_MnSRegistryNrm.yaml b/OpenAPI/TS28623_MnSRegistryNrm.yaml index 4c525b6c3..e2db3186f 100644 --- a/OpenAPI/TS28623_MnSRegistryNrm.yaml +++ b/OpenAPI/TS28623_MnSRegistryNrm.yaml @@ -22,7 +22,38 @@ components: #-------Definition of generic IOCs ----------# #-------- Definition of types----------------------------------------------------- - + MnsCapability: + type: string + enum: + - NR_PROVISIONING + - 5GC_PROVISIONING + - NETWORK_SLICING_PROVISIONING + - EDGE_COMPUTING_PROVISIONING + - PERFORMANCE_METRIC_COLLECTION_CONTROL + - PERFORMANCE_METRIC_DATA_REPORT + - PERFORMANCE_METRIC_THRESHOLD_MONITOR_CONTROL + - PERFORMANCE_METRIC_THRESHOLD_NOTIFICATION + - FAULT_CONTROL + - FAULT_NOTIFICATION + - TRACE_MDT_DATA_COLLECTION_CONTROL + - TRACE_MDT_DATA_REPORT + - QOE_DATA_COLLECTION_CONTROL + - QOE_DATA_REPORT + - FILE_RETRIEVAL + - FILE_DOWNLOAD + - SUBSCRIPTION_CONTROL + - HEARTBEAT_CONTROL + - HEARTBEAT_NOTIFICATION + - ML_MODEL_MANAGEMENT + - MANAGEMENT DATA ANALYTIC + - RANSC_MANAGEMENT + - SON_POLICY + - COMMUNICATION_SERVICE_ASSURANCE_CONTROL + - INTENT_DRIVEN_MANAGEMENT + - ML_MODEL_MANAGEMENT + - MNS_REGISTRY_AND_DISCOVERY + - MNS_ACCESS_CONTROL_MANAGEMENT + - DSO_RAPID_RECOVERY_AND_THRESHOLD MONITORING #-------- Definition of concrete IOCs -------------------------------------------- MnsRegistry-Single: allOf: @@ -51,6 +82,13 @@ components: mnsAddress: description: Resource URI as defined in the relevant Technical Specification $ref: 'TS28623_ComDefs.yaml#/components/schemas/UriRo' + mnsCapability: + description: >- + It describes the types of management capabilities of the MnS instance provided by the MnS producer. + type: array + uniqueItems: true + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/MnsCapability' mnsScope: description: >- It is used to provide information about the management scope of the Management Service. The management scope is -- GitLab From 48c5a4b0f57e6c5784a8509e320322802759c053 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sun, 23 Mar 2025 07:24:28 +0000 Subject: [PATCH 30/76] Update file TS28623_MnSRegistryNrm.yaml --- OpenAPI/TS28623_MnSRegistryNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_MnSRegistryNrm.yaml b/OpenAPI/TS28623_MnSRegistryNrm.yaml index e2db3186f..a8f703886 100644 --- a/OpenAPI/TS28623_MnSRegistryNrm.yaml +++ b/OpenAPI/TS28623_MnSRegistryNrm.yaml @@ -88,7 +88,7 @@ components: type: array uniqueItems: true items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/MnsCapability' + $ref: '#/components/schemas/MnsCapability' mnsScope: description: >- It is used to provide information about the management scope of the Management Service. The management scope is -- GitLab From fc67eb36e31dd91aab1a8a84be3932a8ee9ae9e1 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 9 Apr 2025 09:50:58 +0000 Subject: [PATCH 31/76] Update file TS28623_MnSRegistryNrm.yaml --- OpenAPI/TS28623_MnSRegistryNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_MnSRegistryNrm.yaml b/OpenAPI/TS28623_MnSRegistryNrm.yaml index a8f703886..07f286080 100644 --- a/OpenAPI/TS28623_MnSRegistryNrm.yaml +++ b/OpenAPI/TS28623_MnSRegistryNrm.yaml @@ -82,7 +82,7 @@ components: mnsAddress: description: Resource URI as defined in the relevant Technical Specification $ref: 'TS28623_ComDefs.yaml#/components/schemas/UriRo' - mnsCapability: + mnsCapabilities: description: >- It describes the types of management capabilities of the MnS instance provided by the MnS producer. type: array -- GitLab From 949d52955a31248e9db505fd0571a3c9e6923289 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 10 Apr 2025 06:05:50 +0000 Subject: [PATCH 32/76] Update file TS28623_MnSRegistryNrm.yaml --- OpenAPI/TS28623_MnSRegistryNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_MnSRegistryNrm.yaml b/OpenAPI/TS28623_MnSRegistryNrm.yaml index 07f286080..a8f703886 100644 --- a/OpenAPI/TS28623_MnSRegistryNrm.yaml +++ b/OpenAPI/TS28623_MnSRegistryNrm.yaml @@ -82,7 +82,7 @@ components: mnsAddress: description: Resource URI as defined in the relevant Technical Specification $ref: 'TS28623_ComDefs.yaml#/components/schemas/UriRo' - mnsCapabilities: + mnsCapability: description: >- It describes the types of management capabilities of the MnS instance provided by the MnS producer. type: array -- GitLab From 603548060e53abf8e9af2db16655ba0b372c1d5c Mon Sep 17 00:00:00 2001 From: Jan Groenendijk Date: Wed, 26 Mar 2025 17:05:04 +0000 Subject: [PATCH 33/76] Update TS28541_5GcNrm with additional pccRuleSet attributes --- OpenAPI/TS28541_5GcNrm.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index df1cc353d..6dddac95e 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -751,6 +751,19 @@ components: $ref: 'TS29514_Npcf_PolicyAuthorization.yaml#/components/schemas/TscaiInputContainer' tscaiInputUl: $ref: 'TS29514_Npcf_PolicyAuthorization.yaml#/components/schemas/TscaiInputContainer' + easRedisInd: + type: boolean + default: false + tscaiTimeDom: + type: integer + capBatAdaptation: + type: boolean + default: false + disUeNotif: + type: boolean + default: false + packFiltAllPrec: + type: integer SnssaiInfo: type: object -- GitLab From 8c22b39573a9ff132929e3172dd68146d687de6a Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 16 Apr 2025 12:52:10 +0000 Subject: [PATCH 34/76] Rel19_CR0379_TS28.532_Enhance_notifyFilePreparationError_definition_yaml --- OpenAPI/TS28532_FileDataReportingMnS.yaml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28532_FileDataReportingMnS.yaml b/OpenAPI/TS28532_FileDataReportingMnS.yaml index 4138a3c11..7a324b4a2 100644 --- a/OpenAPI/TS28532_FileDataReportingMnS.yaml +++ b/OpenAPI/TS28532_FileDataReportingMnS.yaml @@ -203,6 +203,17 @@ components: type: string fileDataType: $ref: '#/components/schemas/FileDataType' + jobId: + type: string + FileCreationErrorInfoList: + type: object + properties: + fileLocation: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' + fileDataType: + $ref: '#/components/schemas/FileDataType' + jobId: + type: string NotifyFileReady: allOf: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' @@ -222,7 +233,7 @@ components: fileInfoList: type: array items: - $ref: '#/components/schemas/FileInfo' + $ref: '#/components/schemas/FileCreationErrorInfoList' reason: type: string additionalText: -- GitLab From abefe0a80772f4112c850f8da96bf93608b965b9 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 9 May 2025 17:02:46 +0800 Subject: [PATCH 35/76] Rel19 CR1528 TS 28.541 NRM enhancement cleanup --- OpenAPI/TS28541_5GcNrm.yaml | 2 ++ OpenAPI/TS28541_NrNrm.yaml | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 6dddac95e..d588396cc 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -162,8 +162,10 @@ components: properties: featureName: type: string + readOnly: true featureVersion: type: string + readOnly: true NFStatus: type: string description: any of enumerated value diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 64413f14c..99bb35ef4 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -2210,13 +2210,15 @@ components: administrativeState: $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' operationalState: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' allowedArea: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' allowedTime: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' -- GitLab From 112445d6125c74099c3bc6d99a94755d48121e59 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 23 May 2025 11:31:11 +0800 Subject: [PATCH 36/76] Rel19 CR0125 TS28.104 adding the new MDAType and correct the value format --- OpenAPI/TS28104_MdaNrm.yaml | 42 +++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index af908cdce..4577e1a28 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -17,24 +17,30 @@ components: 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 - - UETHROUGHPUTANALYSIS_TRAFFICCONGESTIONPROBLEMANALYSIS - + - COVERAGE_ANALYTICS_COVERAGE_PROBLEM_ANALYSIS + - COVERAGE_ANALYTICS_PAGING_OPTIMIZATION + - SLS_ANALYSIS_SERVICE_EXPERIENCE_ANALYSIS + - SLS_ANALYSIS_NETWORK_SLICE_THROUGHPUT_ANALYSIS + - SLS_ANALYSIS_NETWORK_SLICE_TRAFFIC_ANALYSIS + - SLS_ANALYSIS_E2E_LATENCY_ANALYSIS + - SLS_ANALYSIS_NETWORK_SLICE_LOAD_ANALYSIS + - SLS_ANALYSIS_EDGE_APPLICATION_DEPLOYMENT_LOCATION_ANALYSIS + - SLS_ANALYSIS_EDGE_COMPUTING_PERFORMANCE_ANALYSIS + - SLS_ANALYSIS_TRAFFIC_CONGESTION_PREDICTION_ANALYSIS + - MDA_ASSISTED_FAULT_MANAGEMENT_FAILURE_PREDICTION + - MDA_ASSISTED_ENERGY_SAVING_ENERGY_SAVING_ANALYSIS + - MOBILITY_MANAGEMENT_ANALYTICS_MOBILITY_PERFORMANCE_ANALYSIS + - MOBILITY_MANAGEMENT_ANALYTICS_HANDOVER_OPTIMIZATION + - MAINTENANCE_MAINTENANCE_ANALYTICS + - MAINTENANCE_SOFTWARE_UPGRADE_VALIDATION_ANALYTICS + - RESOURCE_ANALYTICS_VIRTUALIZED_RESOURCE_UTILIZATION_ANALYSIS_NF + - RESOURCE_ANALYTICS_PHYSICAL_RESOURCE_UTILIZATION_ANALYSIS_NF + - RESOURCE_ANALYTICS_5GC_CONTROL_PLANE_CONGESTION_ANALYSIS + - PREDICTIONS_PM_DATA + - UE_THROUGHPUT_ANALYSIS_TRAFFIC_CONGESTION_PROBLEM_ANALYSIS + - CORRELATION_ANALYTICS_TRAINING_DATA_ANALYSIS + - CORRELATION_ANALYTICS_NF_SCALING_DIMENSIONING_DATA_ANALYSIS + MDATypes: type: array -- GitLab From 8916d73aa627f4d2a43b42107443aac1163800f4 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 23 May 2025 11:33:47 +0800 Subject: [PATCH 37/76] Rel19 CR0214 TS28.104 enhancement to stage 2 and stage 3 for clause 8 --- OpenAPI/TS28104_MdaReport.yaml | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml index 46eaca579..942a1cb6f 100644 --- a/OpenAPI/TS28104_MdaReport.yaml +++ b/OpenAPI/TS28104_MdaReport.yaml @@ -14,6 +14,30 @@ components: schemas: #-------- Definition of types----------------------------------------------------- + ProjectionDuration: + type: object + properties: + fromTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + toTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + PagingOptimizationAnalysisOutput: + type: object + properties: + oOCDuration: + $ref: '#/components/schemas/ProjectionDuration' + oOCLocation: + type: array + uniqueItems: true + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoCoordinate' + minItems: 1 + oOCMap: + type: array + uniqueItems: true + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' + minItems: 1 MDAOutputs: type: object @@ -21,10 +45,12 @@ components: mDAType: $ref: 'TS28104_MdaNrm.yaml#/components/schemas/MDAType' mDAOutputList: - type: array - uniqueItems: true - items: - $ref: '#/components/schemas/MDAOutputEntry' + oneOf: + - $ref: '#/components/schemas/PagingOptimizationAnalysisOutput' + - type: array + uniqueItems: true + items: + $ref: '#/components/schemas/MDAOutputEntry' analyticsWindow: $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindowRo' confidenceDegree: -- GitLab From 4a16c6ad37415a18551077fda9263de26e1f2912 Mon Sep 17 00:00:00 2001 From: Pengxiang Xie Date: Sat, 24 May 2025 07:37:05 +0800 Subject: [PATCH 38/76] Rel19_CR1531_TS_28.541_Enhancements_on_NRFFunction_to_support_hierarchical_NRF_scenario --- OpenAPI/TS28541_5GcNrm.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index d588396cc..706292303 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -4170,6 +4170,8 @@ components: $ref: '#/components/schemas/NFProfileList' nrfInfo: $ref: '#/components/schemas/NrfInfo' + managedNFProfile: + $ref: '#/components/schemas/ManagedNFProfile' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object -- GitLab From f6bfd745999d31fb4a16fbc3ee3b643e28a8b55f Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 8 May 2025 05:29:15 +0000 Subject: [PATCH 39/76] Update file TS28532_ProvMnS.yaml --- OpenAPI/TS28532_ProvMnS.yaml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index 6c23bf257..c8fcab2e0 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -357,6 +357,41 @@ paths: application/json: schema: $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponseDefault' + '/{URI-LDN-first-part}': + parameters: + - name: URI-LDN-first-part + in: path + required: true + schema: + type: string + post: + summary: Creates a complete single resource + description: >- + With HTTP POST a complete single resource is created. The identifier of the new + resource is assigned by the MnS producer. + requestBody: + required: true + content: + application/json: + schema: + $ref: '#/components/schemas/Resource' + responses: + '201': + description: >- + Success case ("201 Created"). + This status code shall be returned when the resource is created. + The representation of the created resource is returned in the response + message body. + content: + application/json: + schema: + $ref: '#/components/schemas/Resource' + default: + description: Error case. + content: + application/json: + schema: + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' components: schemas: CmNotificationTypes: -- GitLab From 1941137a0c1cd6260f51b179dbf900b97b407779 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 8 May 2025 05:34:43 +0000 Subject: [PATCH 40/76] Update file TS28532_ProvMnS.yaml --- OpenAPI/TS28532_ProvMnS.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index c8fcab2e0..314e23377 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -391,7 +391,7 @@ paths: content: application/json: schema: - $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponseDefault' components: schemas: CmNotificationTypes: -- GitLab From aeae71abc5aa6330270a6e62ded4138aa536defb Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 7 May 2025 03:59:39 +0000 Subject: [PATCH 41/76] Update file TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 99bb35ef4..fbae5ac5a 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -2216,11 +2216,13 @@ components: uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' + uniqueItems: true allowedTime: type: array uniqueItems: true items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + uniqueItems: true NRECMappingRule-Single: allOf: -- GitLab From b347221ef1057d101bd9b29c1c723ddfb9b08c3c Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 26 May 2025 03:48:45 +0000 Subject: [PATCH 42/76] Update file TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index fbae5ac5a..fb17b0687 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -2216,13 +2216,11 @@ components: uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' - uniqueItems: true allowedTime: type: array uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' - uniqueItems: true NRECMappingRule-Single: allOf: -- GitLab From 7466b056c91dc37e13135b4387dd3bad2e289129 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 6 May 2025 12:23:31 +0000 Subject: [PATCH 43/76] Update file TS28623_ComDefs.yaml --- OpenAPI/TS28623_ComDefs.yaml | 46 +++++++++++------------------------- 1 file changed, 14 insertions(+), 32 deletions(-) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 3742ff064..a07f5c6ca 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -128,39 +128,21 @@ components: type: string pattern: '^[A-Fa-f0-9]{9}$' TimeWindow: - description: This datatype is used for writable attribute - oneOf: - - type: object - properties: - startTime: - $ref: '#/components/schemas/DateTime' - endTime: - $ref: '#/components/schemas/DateTime' - - type: object - properties: - startTime: - $ref: '#/components/schemas/DateTime' - - type: object - properties: - endTime: - $ref: '#/components/schemas/DateTime' + description: This datatype is used for writable attribute + type: object + properties: + startTime: + $ref: '#/components/schemas/DateTime' + endTime: + $ref: '#/components/schemas/DateTime' TimeWindowRo: - description: This datatype is used for readOnly attribute - oneOf: - - type: object - properties: - startTime: - $ref: '#/components/schemas/DateTimeRo' - endTime: - $ref: '#/components/schemas/DateTimeRo' - - type: object - properties: - startTime: - $ref: '#/components/schemas/DateTimeRo' - - type: object - properties: - endTime: - $ref: '#/components/schemas/DateTimeRo' + description: This datatype is used for readOnly attribute + type: object + properties: + startTime: + $ref: '#/components/schemas/DateTimeRo' + endTime: + $ref: '#/components/schemas/DateTimeRo' GeoCoordinate: type: object properties: -- GitLab From f91dd98ed22d3f96a61ad1f73be7c64680055f39 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 6 May 2025 01:52:30 +0000 Subject: [PATCH 44/76] Update 2 files - /OpenAPI/TS28312_IntentNrm.yaml - /OpenAPI/TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 12 ++++++------ OpenAPI/TS28312_IntentNrm.yaml | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 8f49b6b62..b482c1bc3 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -224,7 +224,7 @@ components: objectType: type: string enum: - - RAN_SubNetwork + - RAN_SUBNETWORK objectInstance: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' objectContexts: @@ -251,7 +251,7 @@ components: objectType: type: string enum: - - Radio_Service + - RADIO_SERVICE objectInstance: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' objectContexts: @@ -275,7 +275,7 @@ components: objectType: type: string enum: - - EdgeService_Support #value for Edge Service Support Expectation--# + - EDGE_SERVICE_SUPPORT #value for Edge Service Support Expectation--# objectInstance: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' objectContexts: @@ -296,7 +296,7 @@ components: objectType: type: string enum: - - 5GC_SubNetwork #value for 5GC Network Expectation--# + - 5GC_SUBNETWORK #value for 5GC Network Expectation--# objectInstance: $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" objectContexts: @@ -787,7 +787,7 @@ components: enum: - IS_GREATER_THAN targetValueRange: - $ref: 'TS28541_SliceNrm.yaml#/components/schemas/XLThpt' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' ULThptPerUETarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for ULThptPerUETarget.It describes the UL throughput target by the per UE for the edge @@ -803,7 +803,7 @@ components: enum: - IS_GREATER_THAN targetValueRange: - $ref: 'TS28541_SliceNrm.yaml#/components/schemas/XLThpt' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' DLLatencyTarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for DLLatencyTarget.It describes the DL latency target for the edge service supporting or radio service diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index c8e988e12..cc076da9f 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -168,7 +168,7 @@ components: - RAN_SUBNETWORK #value for Radio Network Expectation--# - EDGE_SERVICE_SUPPORT #value for Edge Service Support Expectation--# - 5GC_SUBNETWORK #value for 5GC Network Expectation--# - - Radio_Service #value for Radio Service Expectation--# + - RADIO_SERVICE #value for Radio Service Expectation--# - SUBNETWORK #value for Network Maintenance Expectation--# objectInstance: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' @@ -621,7 +621,7 @@ components: - RAN_SUBNETWORK - EDGE_SERVICE_SUPPORT - 5GC_SUBNETWORK - - Radio_Service + - RADIO_SERVICE readOnly: true description: It describes the expectation object type which can be supported by a specific intent handling function of MnS producer. supportedExpectationTargetInfoList: -- GitLab From 35cb7832907cfeba90114f7cee95cf0bdfd78d9f Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 9 May 2025 06:10:20 +0000 Subject: [PATCH 45/76] Update file TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index b482c1bc3..d1279f2b4 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -266,6 +266,7 @@ components: - $ref: '#/components/schemas/CellContext' - $ref: '#/components/schemas/ServiceTypeContext' - $ref: '#/components/schemas/UEGroupContext' + - $ref: '#/components/schemas/GeoCoordinateContext' - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context' EdgeServiceSupportExpectationObject: description: >- @@ -1089,6 +1090,22 @@ components: uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + GeoCoordinateContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for GeoCoordinateContext. + It describes the location (i.e. geocoordinate) that radio service intent is applied. + type: object + properties: + contextAttribute: + type: string + enum: + - GeoCoordinate + contextCondition: + type: string + enum: + - IS_EQUAL_TO + contextValueRange: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoCoordinate' DlFrequencyContext: description: >- This data type is the "Context" data type with specialisations for Object context "DLFrequencyContext". It describes the downlink frequency information (RF reference -- GitLab From 0b60fb99037ee236f49d6cb05d306d2fafa23e4a Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 29 Apr 2025 04:14:39 +0000 Subject: [PATCH 46/76] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 92 ++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index cc076da9f..b64160b6f 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -94,6 +94,8 @@ components: $ref: '#/components/schemas/IntentFeasibilityCheckReport' intentExplorationReport: $ref: '#/components/schemas/IntentExplorationReport' + intentFulfilmentNegotiationReport: + $ref: '#/components/schemas/IntentFulfilmentNegotiationReport' lastUpdatedTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' intentReference: @@ -605,6 +607,96 @@ components: minItems: 1 #-------Definition of the generic IntentExplorationReport dataType----------------# + + + #-------Definition of the generic IntentFulfilmentNegotiationReport dataType----------------# + IntentFulfilmentNegotiationReport: + description: >- + It represents the intent negotiation information during fulfilment phase + This attribute shall be supported when intent fulfilment negotiation information is supported by IntentReport + type: object + properties: + possibleIntentOutcomeList: + type: array + items: + $ref: '#/components/schemas/PossibleIntentOutcome' + uniqueItems: true + minItems: 1 + intentFulfilmentNegotiationConsumerFeedback: + $ref: '#/components/schemas/IntentFulfilmentNegotiationFeedback' + implicitIntent: + $ref: '#/components/schemas/ImplicitIntent' + PossibleIntentOutcome: + description: >- + It represents a single outcome evaluated by the MnS producer + type: object + properties: + possibleIntentOutcomeId: + type: integer + readOnly: true + intentFulfilmentInfo: + type: array + items: + $ref: '#/components/schemas/FulfilmentInfo' + uniqueItems: true + minItems: 1 + expectationFulfilmentResults: + type: array + items: + $ref: '#/components/schemas/ExpectationFulfilmentResult' + uniqueItems: true + minItems: 1 + possibleImpact: + type: array + items: + $ref: '#/components/schemas/PossibleImpact' + uniqueItems: true + minItems: 1 + PossibleImpact: + description: >- + It represents the possible impact of the possible outcome + type: object + properties: + impactedObjects: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' + uniqueItems: true + minItems: 1 + impactedAttributes: + type: array + items: + $ref: 'S28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' + uniqueItems: true + minItems: 1 + IntentFulfilmentNegotiationFeedback: + description: >- + It represents the feedback information that the MnS consumer provides to the + MnS producer as response during intent fulfilment Negotiation. + type: object + properties: + referredIntentOutcomeId: + type: integer + consumerSatisfactionIndex: + type: integer + ImplicitIntent: + description: >- + It represents the implicit intent which includes the information + that MnS consumers have not explicitly pointed out in its intent. + type: object + properties: + implicitIntentExpectations: + type: array + items: + $ref: '#/components/schemas/IntentExpectation' + implicitIntentContexts: + type: array + items: + $ref: '#/components/schemas/Context' + + #-------Definition of the generic IntentFulfilmentNegotiationReport dataType----------------# + + #-------Definition of the generic IntentHandlingCapability dataType----------------# IntentHandlingCapability: description: >- -- GitLab From f32637c160cae4245cc04c74798794310bae4a7d Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 29 Apr 2025 04:18:01 +0000 Subject: [PATCH 47/76] Update file TS28312_IntentNrm.yaml --- 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 b64160b6f..3cdce9b9c 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -666,7 +666,7 @@ components: impactedAttributes: type: array items: - $ref: 'S28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' uniqueItems: true minItems: 1 IntentFulfilmentNegotiationFeedback: -- GitLab From de3a5452f111e19cbd9c01adbf721de85fcfd36d Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 30 Apr 2025 01:51:38 +0000 Subject: [PATCH 48/76] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 3cdce9b9c..f345e4cbe 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -662,13 +662,13 @@ components: items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' uniqueItems: true - minItems: 1 + minItems: 1 impactedAttributes: type: array items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' uniqueItems: true - minItems: 1 + minItems: 1 IntentFulfilmentNegotiationFeedback: description: >- It represents the feedback information that the MnS consumer provides to the -- GitLab From e85c758f780e6e8ff840334254417431e3328337 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 16 May 2025 00:41:10 +0000 Subject: [PATCH 49/76] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index f345e4cbe..be7cb9710 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -620,8 +620,8 @@ components: type: array items: $ref: '#/components/schemas/PossibleIntentOutcome' - uniqueItems: true - minItems: 1 + uniqueItems: true + minItems: 1 intentFulfilmentNegotiationConsumerFeedback: $ref: '#/components/schemas/IntentFulfilmentNegotiationFeedback' implicitIntent: @@ -635,23 +635,19 @@ components: type: integer readOnly: true intentFulfilmentInfo: - type: array - items: - $ref: '#/components/schemas/FulfilmentInfo' - uniqueItems: true - minItems: 1 + $ref: '#/components/schemas/FulfilmentInfo' expectationFulfilmentResults: type: array items: $ref: '#/components/schemas/ExpectationFulfilmentResult' - uniqueItems: true - minItems: 1 - possibleImpact: + uniqueItems: true + minItems: 1 + possibleImpacts: type: array items: $ref: '#/components/schemas/PossibleImpact' - uniqueItems: true - minItems: 1 + uniqueItems: true + minItems: 1 PossibleImpact: description: >- It represents the possible impact of the possible outcome @@ -661,14 +657,12 @@ components: type: array items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' - uniqueItems: true - minItems: 1 + minItems: 1 impactedAttributes: type: array items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' - uniqueItems: true - minItems: 1 + minItems: 1 IntentFulfilmentNegotiationFeedback: description: >- It represents the feedback information that the MnS consumer provides to the -- GitLab From a658a5e3ae1267ed50982efdfc75c3062c0997f6 Mon Sep 17 00:00:00 2001 From: zhaoxxian Date: Fri, 9 May 2025 00:29:02 +0000 Subject: [PATCH 50/76] add AIOTReader IOC --- OpenAPI/TS28541_NrNrm.yaml | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index fb17b0687..205dc122b 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -910,6 +910,8 @@ components: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Configurable5QISet-Multiple' Dynamic5QISet: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple' + AIOTReader: + $ref: '#/components/schemas/AIOTReader-Multiple' OperatorDU-Single: allOf: @@ -2255,6 +2257,36 @@ components: items: $ref: '#/components/schemas/NTNEntityConf' minItems: 1 + AIOTReader-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + readerId: + type: integer + administrativeState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' + supportedAIOTServices: + type: array + uniqueItems: true + items: + type: string + enum: + - INVENTORY + - COMMAND + plmnId: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + nRSectorCarrierRef: + type: array + uniqueItems: true + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -2426,6 +2458,10 @@ components: type: array items: $ref: '#/components/schemas/MWAB-Single' + AIOTReader-Multiple: + type: array + items: + $ref: '#/components/schemas/AIOTReader-Single' #-------- Definitions in TS 28.541 for TS 28.532 --------------------------------- @@ -2496,3 +2532,4 @@ components: - $ref: '#/components/schemas/MWAB-Single' - $ref: '#/components/schemas/NRECMappingRule-Single' - $ref: '#/components/schemas/NTNTimeBasedConfig-Single' + - $ref: '#/components/schemas/AIOTReader-Single' -- GitLab From 298211d9105448a68af640c8b9c6719091025b7f Mon Sep 17 00:00:00 2001 From: zhaoxxian Date: Fri, 9 May 2025 01:03:23 +0000 Subject: [PATCH 51/76] Add EP_AIOTx IOCs --- OpenAPI/TS28541_5GcNrm.yaml | 179 +++++++++++++++++++++++++++++++++++- 1 file changed, 176 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 706292303..6e01e2d64 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3811,6 +3811,8 @@ components: $ref: '#/components/schemas/EP_N89-Multiple' EP_N11mb: $ref: '#/components/schemas/EP_N11mb-Multiple' + EP_AIOT3: + $ref: '#/components/schemas/EP_AIOT3-Multiple' AmfSet-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -4129,7 +4131,11 @@ components: udrInfo: $ref: '#/components/schemas/UdrInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/ManagedFunction5GC-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' + - type: object + properties: + EP_AIOT7: + $ref: '#/components/schemas/EP_AIOT7-Multiple' UdsfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -4182,6 +4188,8 @@ components: $ref: '#/components/schemas/EP_N96-Multiple' EP_SM14: $ref: '#/components/schemas/EP_SM14-Multiple' + EP_AIOT5: + $ref: '#/components/schemas/EP_AIOT5-Multiple' NssfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -4438,6 +4446,10 @@ components: $ref: '#/components/schemas/EP_N62-Multiple' EP_N63: $ref: '#/components/schemas/EP_N63-Multiple' + EP_AIOT4: + $ref: '#/components/schemas/EP_AIOT4-Multiple' + EP_AIOT8: + $ref: '#/components/schemas/EP_AIOT8-Multiple' NsacfFunction-Single: allOf: @@ -4634,7 +4646,19 @@ components: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - - $ref: '#/components/schemas/ManagedFunction5GC-nc0' + - $ref: '#/components/schemas/ManagedFunction5GC-nc0' + - type: object + properties: + EP_AIOT2: + $ref: '#/components/schemas/EP_AIOT2-Multiple' + EP_AIOT3: + $ref: '#/components/schemas/EP_AIOT3-Multiple' + EP_AIOT4: + $ref: '#/components/schemas/EP_AIOT4-Multiple' + EP_AIOT5: + $ref: '#/components/schemas/EP_AIOT5-Multiple' + EP_AIOT6: + $ref: '#/components/schemas/EP_AIOT6-Multiple' AdmFunction-Single: allOf: @@ -4646,6 +4670,14 @@ components: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' + - type: object + properties: + EP_AIOT6: + $ref: '#/components/schemas/EP_AIOT6-Multiple' + EP_AIOT7: + $ref: '#/components/schemas/EP_AIOT7-Multiple' + EP_AIOT8: + $ref: '#/components/schemas/EP_AIOT8-Multiple' EP_N2-Single: allOf: @@ -5279,7 +5311,112 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' - + + EP_AIOT2-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + + EP_AIOT3-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + + EP_AIOT4-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + + EP_AIOT5-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + + EP_AIOT6-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + + EP_AIOT7-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + + EP_AIOT8-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + FiveQiDscpMappingSet-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -6614,6 +6751,34 @@ components: type: array items: $ref: '#/components/schemas/EP_SM14-Single' + EP_AIOT2-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_AIOT2-Single' + EP_AIOT3-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_AIOT3-Single' + EP_AIOT4-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_AIOT4-Single' + EP_AIOT5-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_AIOT5-Single' + EP_AIOT6-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_AIOT6-Single' + EP_AIOT7-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_AIOT7-Single' + EP_AIOT8-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_AIOT8-Single' Configurable5QISet-Multiple: type: array items: @@ -6799,6 +6964,14 @@ components: - $ref: '#/components/schemas/EP_SM12-Single' - $ref: '#/components/schemas/EP_SM13-Single' - $ref: '#/components/schemas/EP_SM14-Single' + + - $ref: '#/components/schemas/EP_AIOT2-Single' + - $ref: '#/components/schemas/EP_AIOT3-Single' + - $ref: '#/components/schemas/EP_AIOT4-Single' + - $ref: '#/components/schemas/EP_AIOT5-Single' + - $ref: '#/components/schemas/EP_AIOT6-Single' + - $ref: '#/components/schemas/EP_AIOT7-Single' + - $ref: '#/components/schemas/EP_AIOT8-Single' - $ref: '#/components/schemas/Configurable5QISet-Single' - $ref: '#/components/schemas/FiveQiDscpMappingSet-Single' -- GitLab From 1146d2ff5d0ac828249b5c3de9916ee9fae5d6c1 Mon Sep 17 00:00:00 2001 From: zhaoxxian Date: Fri, 9 May 2025 01:33:07 +0000 Subject: [PATCH 52/76] Update file TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 6e01e2d64..cc50d2289 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -5327,7 +5327,7 @@ components: remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' - EP_AIOT3-Single: + EP_AIOT3-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object -- GitLab From 3251d555ee05c3ae7d78d0f41c66099341135dea Mon Sep 17 00:00:00 2001 From: zhaoxxian Date: Fri, 9 May 2025 02:26:09 +0000 Subject: [PATCH 53/76] Update file TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index cc50d2289..2ea31906c 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -4645,6 +4645,14 @@ components: attributes: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + plmnId: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + sBIFqdn: + type: string + managedNFProfile: + $ref: '#/components/schemas/ManagedNFProfile' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object @@ -4668,6 +4676,14 @@ components: attributes: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + plmnId: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + sBIFqdn: + type: string + managedNFProfile: + $ref: '#/components/schemas/ManagedNFProfile' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object -- GitLab From d7c7ee7037e4d16aaadb00985e901f433ea9ce43 Mon Sep 17 00:00:00 2001 From: shixixi Date: Fri, 9 May 2025 01:18:35 +0000 Subject: [PATCH 54/76] Edit TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 2ea31906c..8296d442e 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -922,6 +922,15 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostRo' uPFRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' + + UPFCapabilities: + type: object + properties: + nonStandardizedFeature: + type: string + standardizedFeature: + type: string + SnssaiList: type: array uniqueItems: true @@ -3958,6 +3967,8 @@ components: type: boolean onboardSatelliteId: $ref: '#/components/schemas/SatelliteId' + uPFCapabilities: + $ref: '#/components/schemas/UPFCapabilities' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object -- GitLab From b52c31e8e892c6f8287ee8b3d2290945cdcba821 Mon Sep 17 00:00:00 2001 From: shixixi Date: Thu, 22 May 2025 06:50:25 +0000 Subject: [PATCH 55/76] Edit TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 8296d442e..bc2507f96 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -924,12 +924,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' UPFCapabilities: - type: object - properties: - nonStandardizedFeature: - type: string - standardizedFeature: - type: string + type: string SnssaiList: type: array -- GitLab From a9fd53d2b6324a624a8babddaf126b6174bd22a5 Mon Sep 17 00:00:00 2001 From: shixixi Date: Thu, 22 May 2025 10:02:44 +0000 Subject: [PATCH 56/76] Edit TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index bc2507f96..b1a9f1397 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -922,9 +922,6 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostRo' uPFRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' - - UPFCapabilities: - type: string SnssaiList: type: array @@ -3963,7 +3960,7 @@ components: onboardSatelliteId: $ref: '#/components/schemas/SatelliteId' uPFCapabilities: - $ref: '#/components/schemas/UPFCapabilities' + type: String - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object -- GitLab From ac8d05b9d7058c27a7393ee5eae73c1ac9a0793b Mon Sep 17 00:00:00 2001 From: shixixi Date: Mon, 26 May 2025 06:54:01 +0000 Subject: [PATCH 57/76] Edit TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index b1a9f1397..0558126fd 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3960,7 +3960,7 @@ components: onboardSatelliteId: $ref: '#/components/schemas/SatelliteId' uPFCapabilities: - type: String + type: string - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object -- GitLab From c1921ec2b4308470dfdf2ac5f307ef30eb8a9c61 Mon Sep 17 00:00:00 2001 From: shixixi Date: Tue, 27 May 2025 14:25:44 +0000 Subject: [PATCH 58/76] Rel-19 CR0218 TS 28.104 add stage3 solution for mobility performance analysis and coverage problem analysis --- OpenAPI/TS28104_MdaReport.yaml | 311 ++++++++++++++++++++++++++++++++- 1 file changed, 310 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml index 942a1cb6f..ba2f51e3c 100644 --- a/OpenAPI/TS28104_MdaReport.yaml +++ b/OpenAPI/TS28104_MdaReport.yaml @@ -45,7 +45,13 @@ components: mDAType: $ref: 'TS28104_MdaNrm.yaml#/components/schemas/MDAType' mDAOutputList: - oneOf: + oneOf: + - $ref: '#/components/schemas/CoverageProblemAnalysisoutput' + - $ref: '#/components/schemas/MobilityPerformanceAnalysisoutput' + - $ref: '#/components/schemas/TrainingDataAnalysisOutput' + - $ref: '#/components/schemas/NFScalingDimensioningDataAnalysisOutput' + - $ref: '#/components/schemas/PMDataOutput' + - $ref: '#/components/schemas/FailurePredictionOutput' - $ref: '#/components/schemas/PagingOptimizationAnalysisOutput' - type: array uniqueItems: true @@ -86,3 +92,306 @@ components: $ref: '#/components/schemas/MDAOutputs' mDARequestRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' + +#-------- Definition of recommended action -------------------------------------------- + Recommended3GPPAction: + type: object + properties: + mOInstance: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + path: + type: string + op: + type: string + enum: + - ADD + - REMOVE + - REPLACE + value: + type: array + uniqueItems: true + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' + additionalText: + type: array + items: + type: string + + RecommendedAction: + type: object + properties: + recommended3GPPActions: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/Recommended3GPPAction' + recommendedNon3GPPActions: + type: array + uniqueItems: true + items: + type: string + recommendedHumanReadableActions: + type: array + uniqueItems: true + items: + type: string + actionInterval: + type: integer + timeWindow: + type: array + uniqueItems: false + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + + + +#-------- Definition of specific MobilityPerformanceAnalysis MDAoutput ----------------------------- + MobilityPerformanceAnalysisoutput: + type: object + properties: + mobilityPerformanceIssueIdentifier: + type: integer + mobilityPerformanceIssueRootCause: + type: string + enum: + - TooLongMobilityInterruptionTime + - PoorCoverageOfTheCelledge + - InappropriateHandoverParameters + - Other + mobilityPerformanceIssueLocation: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' + +#-------- Definition of specific CoverageProblemAnalysis MDAoutput ----------------------------- + CoverageProblemAnalysisoutput: + type: object + properties: + coverageProblemId: + type: string + coverageProblemType: + type: string + enum: + - WEAK_COVERAGE + - COVERAGE_HOLE + - PILOT_POLLUTION + - OVERSHOOT_COVERAGE + - DL_ULCHANNEL_COVERAGE_MISMATCH + - Other + coverageProblemAreas: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' + problematicCells: + type: integer + recommendedActions: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/RecommendedAction' + radioEnvironmentMap: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/RadioEnvironmentMap' + cellConfigurations: + description: A map (list of key-value pairs) + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' + + RadioEnvironmentMap: + type: object + properties: + geoCoordinate: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' + coverageCharacterization: + $ref: '#/components/schemas/CoverageCharacterization' + + CoverageCharacterization: + type: object + properties: + rsrp: + type: number + format: float + sinr: + type: number + format: float + +#-------- Definition of specific TrainingDataAnalysis MDAoutput ----------------------------- + + TrainingDataAnalysisOutput: + type: object + properties: + measurementDataCorrelationRecommendation: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/MeasurementDataCorrelationRecommendation' + + MeasurementDataCorrelationRecommendation: + type: object + properties: + recommendedMeasurementDataToCollect: + type: array + uniqueItems: true + items: + type: string + recommendedMeasurementDataNotToCollect: + type: array + uniqueItems: true + items: + type: string + modelPerformanceImpact: + type: integer + minimum: 0 + maximum: 100 + + + + +#-------- Definition of specific NFScalingDimensioningDataAnalysis MDAoutput ----------------------------- + + NFScalingDimensioningDataAnalysisOutput: + type: object + properties: + recommendedActions: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/RecommendedAction' + + + + + +#-------- Definition of specific PMData MDAoutput ----------------------------- + PMDataOutput: + type: object + properties: + pmPredictions: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/PmPrediction' + minItems: 1 + thresholdAssessment: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/ThresholdAssessment' + thresholdAdjustmentRecommendations: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/RecommendedAction' + + PmPrediction: + type: object + properties: + pmName: + type: string + pmPredictedValue: + description: >- + This specifies the predicted value of the PM specified by “pmName” + attribute. + oneOf: + - type: integer + - type: number + format: float + + thresholdAssessment: + $ref: '#/components/schemas/ThresholdAssessment' + + ThresholdAssessment: + type: object + properties: + performanceMetrics: + description: >- + It indicates list of performance metrics with threshold + configuration issue. + Performance metrics include measurements defined in TS 28.552 + and KPIs defined in TS 28.554. + For non-3GPP specified measurements the name is defined elsewhere. + type: array + uniqueItems: true + items: + type: string + timeWindow: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + confidenceScore: + type: number + format: float + + +#-------- Definition of specific FailurePrediction MDAoutput ----------------------------- + + FailurePredictionOutput: + type: object + properties: + failurePredictionObject: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + potentialFailureType: + type: string + potentialFailureCause: + oneOf: + - type: integer + - type: string + eventTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + issueID: + type: string + issueDomain: + type: string + enum: + - RAN_ISSUE + - CN_ISSUE + - UNKNOWN + perceivedSeverity: + type: string + enum: + - CRITICAL + - MAJOR + - MINOR + - WARNING + - INTERMEDIATE + - CLEARED + trendIndication: + type: string + enum: + - MORE_SEVERE + - NO_CHANGE + - LESS_SEVERE + predictedFailureEndTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + statisticsInfoList: + type: array + items: + type: integer + managementDataCollectionRecommendations: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/ManagementDataCollectionInfo' + recommendedActions: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/RecommendedAction' + + ManagementDataCollectionInfo: + type: object + properties: + managementDataType: + type: string + enum: + - MEASUREMENT + - KPI + - TRACE_MDT + - QOE + managementData: + $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/ManagementData' + targetEntities: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + collectionDuration: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + + + + -- GitLab From 980c90c7354f4960ae9d852d0f85615d041dbe83 Mon Sep 17 00:00:00 2001 From: shumim Date: Tue, 27 May 2025 14:30:14 +0000 Subject: [PATCH 59/76] Rel_19_CR_TS_28541_CR1543_Add_NRM_solution_on_broadcasting_multiple_TACs_for_NTN --- OpenAPI/TS28541_NrNrm.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 205dc122b..a5723e176 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1146,6 +1146,13 @@ components: $ref: '#/components/schemas/NrPci' nRTAC: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac' + nTNTAClist: + type: array + uniqueItems: true + items: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac' + minItems: 1 + maxItems: 12 arfcnDL: type: integer arfcnUL: -- GitLab From 39a1be3f08947e4238152aed0648d1a4ea8cfa56 Mon Sep 17 00:00:00 2001 From: Pengxiang Xie Date: Tue, 20 May 2025 14:01:29 +0800 Subject: [PATCH 60/76] Edit TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 0558126fd..da1f2560e 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -4276,7 +4276,11 @@ components: trpInfoList: $ref: '#/components/schemas/TrpInfoList' mappedCellIdInfoList: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList' + $ref: 'TS28541_NrNrm.yaml#/components/schemas/MappedCellIdInfoList' + mLModelRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' + aIMLInferenceFunctionRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - $ref: '#/components/schemas/ManagedFunction5GC-nc0' - type: object -- GitLab From 79e84ace35f334b1439bf9c13af778f974d166ab Mon Sep 17 00:00:00 2001 From: Pengxiang Xie Date: Tue, 27 May 2025 22:44:40 +0800 Subject: [PATCH 61/76] Rel19_CR1533_TS_28.541_NRM_enhancements_on_ManagedNFProfile --- OpenAPI/TS28541_5GcNrm.yaml | 129 +++++++++++++++++++++++++++++++++++- 1 file changed, 128 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index da1f2560e..e6af55243 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -405,7 +405,8 @@ components: items: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' allowedRuleSet: - description: A map (list of key-value pairs) where a valid JSON pointer Id serves as key + description: > + A map (list of key-value pairs) where a valid JSON pointer Id serves as key type: object additionalProperties: $ref: '#/components/schemas/RuleSet' @@ -492,6 +493,132 @@ components: uniqueItems: true items: $ref: '#/components/schemas/NFService' + supportedVendorSpecificFeatures: + description: > + A map (list of key-value pairs) where IANA-assigned "SMI Network Management Private Enterprise Codes" serves as key + type: object + additionalProperties: + type: array + items: + $ref: '#/components/schemas/VendorSpecificFeature' + minItems: 1 + minProperties: 1 + canaryRelease: + type: boolean + default: false + exclusiveCanaryReleaseSelection: + type: boolean + default: false + sharedProfileDataId: + type: string + shutdownTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + supportedRcfs: + type: array + uniqueItems: true + items: + type: string + minItems: 1 + canaryPrecedenceOverPreferred: + type: boolean + default: false + selectionConditions: + description: > + conditions under which an NF Instance shall be selected by an NF Service Consumer. + type: array + items: + $ref: '#/components/schemas/SelectionConditions' + minItems: 1 + SelectionConditions: + description: > + It contains the set of conditions that shall be evaluated to determine whether a consumer + shall select a given producer. The producer shall only be selected if the evaluation of + the conditions is . The set of conditions can be represented by a single + ConditionItem or by a ConditionGroup, where the latter contains a (recursive) list of + conditions joined by the "and" or "or" logical relationships. + oneOf: + - $ref: '#/components/schemas/ConditionItem' + - $ref: '#/components/schemas/ConditionGroup' + ConditionGroup: + description: > + List (array) of conditions (joined by the "and" or "or" logical relationship), + under which an NF Instance with an NFStatus or NFServiceStatus value set to, + "CANARY_RELEASE", or with a "canaryRelease" attribute set to true, + shall be selected by an NF Service Consumer. + type: object + oneOf: + - required: [ and ] + - required: [ or ] + properties: + and: + type: array + items: + $ref: '#/components/schemas/SelectionConditions' + minItems: 1 + or: + type: array + items: + $ref: '#/components/schemas/SelectionConditions' + minItems: 1 + ConditionItem: + description: > + A ConditionItem consists of a number of attributes representing individual conditions + (e.g. a SUPI range, or a TAI list). If several attributes/conditions are present, + the evaluation of the ConditionItem is if all attributes/conditions are evaluated + as (i.e., it follows the AND logical relationship). + type: object + allOf: + - not: + required: [ and ] + - not: + required: [ or ] + properties: + consumerNfTypes: + type: array + items: + $ref: '#/components/schemas/NFType' + minItems: 1 + serviceFeature: + type: integer + minimum: 1 + vsServiceFeature: + type: integer + minimum: 1 + supiRangeList: + type: array + items: + $ref: '#/components/schemas/SupiRange' + minItems: 1 + gpsiRangeList: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + minItems: 1 + impuRangeList: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + minItems: 1 + impiRangeList: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + minItems: 1 + peiList: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Pei' + minItems: 1 + taiRangeList: + type: array + items: + $ref: '#/components/schemas/TaiRange' + minItems: 1 + dnnList: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn' + minItems: 1 SEPPType: type: string readOnly: true -- GitLab From 4159357b256077c815d5e613fa97799413906f0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Refik=20Fatih=20=C3=9Cstok?= Date: Wed, 28 May 2025 02:24:41 +0000 Subject: [PATCH 62/76] 28.312_Rel19_CR0352_Enhance_the_solution_for_network_maintenance_expectation --- OpenAPI/TS28312_IntentExpectations.yaml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index d1279f2b4..7b922fdbb 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -328,6 +328,7 @@ components: oneOf: - $ref: "#/components/schemas/MaintenanceVersionContext" - $ref: "#/components/schemas/MaintenanceOrderContext" + - $ref: "#/components/schemas/MaintenanceTypeContext" - $ref: "#/components/schemas/NfTypeContext" - $ref: "#/components/schemas/NfInstanceLocationContext" - $ref: "#/components/schemas/PLMNContext" @@ -1357,6 +1358,27 @@ components: type: array items: type: string + MaintenanceTypeContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for MaintenanceTypeContext. It describes the type of maintenance expected for the maintenance object. + type: object + properties: + contextAttribute: + type: string + enum: + - maintenanceType + contextCondition: + type: string + enum: + - IS_EQUAL_TO + contextValueRange: + type: array + uniqueItems: true + items: + type: string + enum: + - UPGRADE + - DOWNGRADE #-------Definition of the scenario specific ObjectTarget dataType----------------# #-------Definition of the concrete ExpectationContext dataType----------------# -- GitLab From e2eb841b41b5efe52a9ebcfe21073320f52e818c Mon Sep 17 00:00:00 2001 From: zhaoxxian Date: Wed, 28 May 2025 02:37:35 +0000 Subject: [PATCH 63/76] Rel19_CR0047_TS_28.111_Stage_3_YAML_for_ThresholdCrossing_dataType --- 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 1ea8c64e9..4f754b148 100644 --- a/OpenAPI/TS28111_FaultNrm.yaml +++ b/OpenAPI/TS28111_FaultNrm.yaml @@ -107,7 +107,7 @@ components: properties: down: $ref: '#/components/schemas/ThresholdHysteresis' - ThresholdInfo: + ThresholdCrossing: type: object properties: observedMeasurement: @@ -178,7 +178,7 @@ components: trendIndication: $ref: '#/components/schemas/TrendIndication' thresholdinfo: - $ref: '#/components/schemas/ThresholdInfo' + $ref: '#/components/schemas/ThresholdCrossing' correlatedNotifications: $ref: '#/components/schemas/CorrelatedNotifications' stateChangeDefinition: @@ -292,7 +292,7 @@ components: trendIndication: $ref: '#/components/schemas/TrendIndication' thresholdInfo: - $ref: '#/components/schemas/ThresholdInfo' + $ref: '#/components/schemas/ThresholdCrossing' correlatedNotifications: $ref: '#/components/schemas/CorrelatedNotifications' stateChangeDefinition: @@ -418,7 +418,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 4863caa19fe2248d4f6ca32c9f0dd9ac12aaaa19 Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Wed, 28 May 2025 02:52:09 +0000 Subject: [PATCH 64/76] Rel_19_CR0078_TS_28.310_CR0544_TS_28.623_Introduce_energy_related_information_NRM --- OpenAPI/README.md | 3 + OpenAPI/TS28310_EnergyInformationNrm.yaml | 95 +++++++++++++++++++++++ OpenAPI/TS28623_FeatureNrm.yaml | 1 + OpenAPI/TS28623_GenericNrm.yaml | 2 +- 4 files changed, 100 insertions(+), 1 deletion(-) create mode 100644 OpenAPI/TS28310_EnergyInformationNrm.yaml diff --git a/OpenAPI/README.md b/OpenAPI/README.md index c0e969a34..8be2519a3 100644 --- a/OpenAPI/README.md +++ b/OpenAPI/README.md @@ -103,6 +103,9 @@ The links below will open the Swagger Editor/UI and auto-load the OpenAPI YAML f ([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28318_DsoNrm.yaml)) ([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28318_DsoNrm.yaml)) +* Energy Information NRM (TS 28.310) +([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28310_EnergyInformationNrm.yaml)) +([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28310_EnergyInformationNrm.yaml)) ## Management Services (MnS) diff --git a/OpenAPI/TS28310_EnergyInformationNrm.yaml b/OpenAPI/TS28310_EnergyInformationNrm.yaml new file mode 100644 index 000000000..496cb7c0e --- /dev/null +++ b/OpenAPI/TS28310_EnergyInformationNrm.yaml @@ -0,0 +1,95 @@ +openapi: 3.0.1 +info: + title: Energy Information NRM + version: 19.0.0 + description: >- + OAS 3.0.1 specification of the Energy Information NRM + © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + All rights reserved. +externalDocs: + description: 3GPP TS 28.310; Energy Information NRM + url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.310/ +paths: {} +components: + schemas: + +#-------- Definition of types----------------------------------------------------- + EnergySourceInfo: + type: object + properties: + energySourceType: + type: string + energySourceCef: + type: number + format: float + minimum: 0 + renewableEnergy: + type: boolean + energyCompositionPercentage: + type: number + format: float + default: 100 + minimum: 1 + maximum: 100 + EnergySupplyMode: + type: string + enum: + - GRID_ELECTRICITY + - BACKUP_ENERGY + - LOCALLY_GENERATED_ENERGY + +#-------- Definition of concrete IOCs -------------------------------------------- + SubNetwork-ncO-EnergyInformationNrm: + type: object + properties: + EnergySupplyInfo: + $ref: '#/components/schemas/EnergySupplyInfo-Multiple' + EnergyInfoGroup: + $ref: '#/components/schemas/EnergyInfoGroup-Multiple' + + EnergySupplyInfo-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + energySupplyMode: + $ref: '#/components/schemas/EnergySupplyMode' + energySourceList: + type: array + uniqueItems: true + minItems: 1 + items: + $ref: '#/components/schemas/EnergySourceInfo' + EnergyInfoGroup-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + energySupplyModeRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + memberDNList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + +#-------- Definition of JSON arrays for name-contained IOCs ---------------------- + + EnergySupplyInfo-Multiple: + type: array + items: + $ref: '#/components/schemas/EnergySupplyInfo-Single' + EnergyInfoGroup-Multiple: + type: array + items: + $ref: '#/components/schemas/EnergyInfoGroup-Single' + +#--------------------------------- Definition ------------------------------------ + + resources-energyInformationNrm: + oneOf: + - $ref: '#/components/schemas/EnergySupplyInfo-Single' + - $ref: '#/components/schemas/EnergyInfoGroup-Single' diff --git a/OpenAPI/TS28623_FeatureNrm.yaml b/OpenAPI/TS28623_FeatureNrm.yaml index 3171f4557..cb4a79611 100644 --- a/OpenAPI/TS28623_FeatureNrm.yaml +++ b/OpenAPI/TS28623_FeatureNrm.yaml @@ -36,5 +36,6 @@ components: - $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/resources-subscriptionControlNrm' - $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/resources-thresholdMonitorNrm' - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/resources-traceControlNrm' + - $ref: 'TS28310_EnergyInformationNrm.yaml#/components/schemas/resources-energyInformationNrm' #----- Definitions in TS 28.623 for TS 28.532 --------------------------# diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 3aa14f00f..c9b1c9b45 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -608,7 +608,7 @@ components: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/SubNetwork-ncO-NrNrm' - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/SubNetwork-ncO-5GcNrm' - $ref: 'TS28318_DsoNrm.yaml#/components/schemas/SubNetwork-ncO-DsoNrm' - + - $ref: 'TS28310_EnergyInformationNrm.yaml#/components/schemas/SubNetwork-ncO-EnergyInformationNrm' ManagedElement-Single: allOf: -- GitLab From 61a3961649eccd00f1eb45fc227d87c0025ebff8 Mon Sep 17 00:00:00 2001 From: ruanb Date: Fri, 9 May 2025 21:33:33 +0000 Subject: [PATCH 65/76] Rel19_CR1545_28.541_Fix_stage3_related_to_DnnUpfInfo --- OpenAPI/TS28541_5GcNrm.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index e6af55243..9787c9b82 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3435,49 +3435,41 @@ components: uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai' - minItems: 1 pduSessionTypes: type: array uniqueItems: true items: $ref: 'TS29571_CommonData.yaml#/components/schemas/PduSessionType' - minItems: 1 ipv4AddressRanges: type: array uniqueItems: true items: $ref: '#/components/schemas/Ipv4AddressRange' - minItems: 1 ipv6PrefixRanges: type: array uniqueItems: true items: $ref: '#/components/schemas/Ipv6PrefixRange' - minItems: 1 natedIpv4AddressRanges: type: array uniqueItems: true items: $ref: '#/components/schemas/Ipv4AddressRange' - minItems: 1 natedIpv6PrefixRanges: type: array uniqueItems: true items: $ref: '#/components/schemas/Ipv6PrefixRange' - minItems: 1 ipv4IndexList: type: array uniqueItems: true items: $ref: '#/components/schemas/IpIndex' - minItems: 1 ipv6IndexList: type: array uniqueItems: true items: $ref: '#/components/schemas/IpIndex' - minItems: 1 networkInstance: description: > The N6 Network Instance associated with the S-NSSAI and DNN. -- GitLab From 37715c62c9091f3c156e6f984d8c48192e8f3ece Mon Sep 17 00:00:00 2001 From: lengyelb Date: Wed, 28 May 2025 04:59:53 +0200 Subject: [PATCH 66/76] 28.111_CR0043_Rel19_Add_alarmType_other_YAML 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 4f754b148..241b9a4bf 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 readOnly: true ProbableCause: description: >- -- GitLab From c6c0dd33afe59e88ab912e8655ba6096d286b204 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 9 May 2025 22:26:22 +0800 Subject: [PATCH 67/76] Rel19 CR0344 TS 28312 correct TargetAchievedValue data Type --- OpenAPI/TS28312_IntentNrm.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index be7cb9710..2bac76afe 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -476,11 +476,10 @@ components: targetFulfilmentInfo: $ref: '#/components/schemas/FulfilmentInfo' targetAchievedValue: - type: number description: >- It describes the value that has been achieved for the expectation target at the time at which the report is generated. - readOnly: true + $ref: "#/components/schemas/ValueRangeType" targetContexts: type: array uniqueItems: true -- GitLab From b68ee56bbbb93de1ba5ccd0ee7c087bc8a4923e1 Mon Sep 17 00:00:00 2001 From: lengyelb Date: Wed, 28 May 2025 05:09:02 +0200 Subject: [PATCH 68/76] 28.532_Rel19_CR0381_Add_new_notifications_for_reliability into Integration --- OpenAPI/TS28532_ProvMnS.yaml | 58 ++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index 314e23377..815bdd49a 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -192,6 +192,48 @@ paths: application/json: schema: $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' + notifyPotentialFaultyDataNodeTree: + '{request.body#/notificationRecipientAddress}': + post: + requestBody: + required: true + content: + application/json: + schema: + $ref: '#/components/schemas/NotifyPotentialFaultyDataNodeTree' + responses: + '204': + description: >- + Success case ("204 No Content"). + The notification is successfully delivered. The response + has no message body. + default: + description: Error case. + content: + application/json: + schema: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' + notifyDataNodeTreeSyncRecommended: + '{request.body#/notificationRecipientAddress}': + post: + requestBody: + required: true + content: + application/json: + schema: + $ref: '#/components/schemas/NotifyDataNodeTreeSyncRecommended' + responses: + '204': + description: >- + Success case ("204 No Content"). + The notification is successfully delivered. The response + has no message body. + default: + description: Error case. + content: + application/json: + schema: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/ErrorResponse' get: summary: Reads one or multiple resources description: >- @@ -402,6 +444,8 @@ components: - notifyMOIAttributeValueChanges - notifyEvent - notifyMOIChanges + - notifyPotentialFaultyDataNodeTree + - notifyDataNodeTreeSyncRecommended SourceIndicator: type: string enum: @@ -570,6 +614,20 @@ components: $ref: '#/components/schemas/MoiChange' required: - moiChanges + NotifyPotentialFaultyDataNodeTree: + allOf: + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' + - type: object + properties: + scope: + $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/Scope' + NotifyDataNodeTreeSyncRecommended: + allOf: + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationHeader' + - type: object + properties: + scope: + $ref: 'TS28623_SubscriptionControlNrm.yaml#/components/schemas/Scope' PatchItem: type: object properties: -- GitLab From 973b5e6fa77cff622e856ec7b2a3adb027ab0490 Mon Sep 17 00:00:00 2001 From: sabater Date: Wed, 21 May 2025 09:29:35 +0000 Subject: [PATCH 69/76] Rel19_CR1554_TS28541_SliceNrm.yaml Adding renewableEnergyPct attribute --- OpenAPI/TS28541_SliceNrm.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index b65edbc63..2fa712e57 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -456,6 +456,10 @@ components: uniqueItems: true items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' + renewableEnergyPct: + type: integer + minimum: 0 + maximum: 100 RANSliceSubnetProfile: type: object @@ -529,6 +533,10 @@ components: $ref: '#/components/schemas/Float' uLPktDelayVariation: $ref: '#/components/schemas/Float' + renewableEnergyPct: + type: integer + minimum: 0 + maximum: 100 TopSliceSubnetProfile: type: object @@ -617,6 +625,10 @@ components: uniqueItems: true items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' + renewableEnergyPct: + type: integer + minimum: 0 + maximum: 100 ServiceProfile: type: object @@ -718,6 +730,10 @@ components: uniqueItems: true items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' + renewableEnergyPct: + type: integer + minimum: 0 + maximum: 100 SliceProfile: type: object -- GitLab From e410375e9ea8a0d4e52df34a8d85a1613d028518 Mon Sep 17 00:00:00 2001 From: scottma Date: Wed, 28 May 2025 03:22:44 +0000 Subject: [PATCH 70/76] CR0356 28.312 update intent reporting to support utility function --- OpenAPI/TS28312_IntentNrm.yaml | 110 ++++++++++++++++++++++++++++++++- 1 file changed, 107 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 2bac76afe..0ce0ea96d 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -48,6 +48,8 @@ components: $ref: "#/components/schemas/IntentMgmtPurpose" contextSelectivity: $ref: "#/components/schemas/Selectivity" + consumerSatisfactionIndexThreshold: + type: integer expectationSelectivity: $ref: "#/components/schemas/Selectivity" intentContexts: @@ -77,6 +79,8 @@ components: $ref: '#/components/schemas/IntentReportControl' intentReportReference: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' + intentUtilityFormulaRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' IntentReport-Single: description: It represents intent report information from MnS producer to MnS consumer. allOf: @@ -94,6 +98,8 @@ components: $ref: '#/components/schemas/IntentFeasibilityCheckReport' intentExplorationReport: $ref: '#/components/schemas/IntentExplorationReport' + intentUtilityReport: + $ref: '#/components/schemas/IntentUtilityReport' intentFulfilmentNegotiationReport: $ref: '#/components/schemas/IntentFulfilmentNegotiationReport' lastUpdatedTime: @@ -114,11 +120,44 @@ components: minItems: 1 items: $ref: '#/components/schemas/IntentHandlingCapability' + supportedExpectationTargetInfo: + type: array + items: + $ref: '#/components/schemas/SupportedExpectationTargetInfo' + uniqueItems: true + minItems: 1 Intent: $ref: '#/components/schemas/Intent-Multiple' IntentReport: - $ref: '#/components/schemas/IntentReport-Multiple' - + $ref: '#/components/schemas/IntentReport-Multiple' + supportedUtilityList: + type: array + items: + $ref: '#/components/schemas/UtilityDefinition' + uniqueItems: true + IntentUtilityFormula-Single: + description: >- + It represents an intent utility function instance. + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + utilityFunctionId: + type: string + uniqueItems: true + minItems: 1 + utilityParameterList: + type: array + items: + $ref: '#/components/schemas/UtilityParameter' + uniqueItems: true + minItems: 1 + utilityScale: + type: number + minItems: 1 + utilityOffset: + type: number + minItems: 1 #-------Definition of generic IOCs ----------# #-------Definition of the generic IntentExpectation dataType ----------# @@ -388,6 +427,7 @@ components: - INTENT_FULFILMENT_REPORT - INTENT_CONFLICT_REPORT - INTENT_FEASIBILITY_CHECK_REPORT + - INTENT_UTILITY_REPORT reportingConditions: description: >- It indicates the specified conditions for intent reporting. @@ -527,6 +567,20 @@ components: #-------Definition of the concrete IntentConflictReport dataType----------------# + +#-------Definition of the generic IntentUtilityReport dataType----------------# + IntentUtilityReport: + description: >- + It represents the utility function results. + type: object + properties: + utilityResultList: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/UtilityResult' + #-------Definition of the concrete IntentUtilityReport dataType----------------# + #-------Definition of the generic IntentFeasibilityCheckReport dataType----------------# IntentFeasibilityCheckReport: description: >- @@ -735,6 +789,51 @@ components: - $ref: '#/components/schemas/ValueRangeType' #-------Definition of the concrete IntentHandlingCapability dataType----------------# + + #-------Definition of the generic UtilityParameter dataType----------------# + UtilityParameter: + description: >- + It represents the inputs for the specified Intent Utility Function. + type: object + properties: + parameterName: + type: string + parameterWeight: + type: number + #-------Definition of the concrete UtilityParameter dataType----------------# + + #-------Definition of the generic UtilityResult dataType----------------# + UtilityResult: + description: >- + It represents the inputs for the specified Intent Utility Function. + type: object + properties: + utilityFunctionId: + type: string + utilityResult: + type: number + #-------Definition of the concrete UtilityResult dataType----------------# + + #-------Definition of the generic UtilityDefinition dataType----------------# + UtilityDefinition: + description: >- + It represents the inputs for the specified Intent Utility Function. + type: object + properties: + utilityDefinitionId: + type: string + utilityDescription: + type: string + utilityParameterList: + oneOf: + - type: array + uniqueItems: true + minItems: 1 + items: + $ref: '#/components/schemas/UtilityParameter' + - $ref: '#/components/schemas/UtilityParameter' + #-------Definition of the concrete UtilityDefinition dataType----------------# + #------Definition of JSON arrays for name-contained IOCs ---------------# Intent-Multiple: @@ -752,6 +851,10 @@ components: items: $ref: '#/components/schemas/IntentHandlingFunction-Single' + IntentUtilityFormula-Multiple: + type: array + items: + $ref: '#/components/schemas/IntentUtilityFormula-Single' #------Definition of JSON arrays for name-contained IOCs ---------------# @@ -760,6 +863,7 @@ components: oneOf: - $ref: '#/components/schemas/IntentHandlingFunction-Single' - $ref: '#/components/schemas/Intent-Single' - - $ref: '#/components/schemas/IntentReport-Single' + - $ref: '#/components/schemas/IntentReport-Single' + - $ref: '#/components/schemas/IntentUtilityFormula-Single' #----- Definitions in TS 28.312 for TS 28.532 --------------------------# -- GitLab From 60cd8bc2cb82994e8cdf53a57c96ccee32cd18fc Mon Sep 17 00:00:00 2001 From: gautamd Date: Wed, 28 May 2025 03:28:42 +0000 Subject: [PATCH 71/76] Edit TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index a5723e176..4d83d88ba 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -796,6 +796,8 @@ components: $ref: '#/components/schemas/CPCIConfigurationFunction-Single' CESManagementFunction: $ref: '#/components/schemas/CESManagementFunction-Single' + RedCapAccessCriteria: + $ref: '#/components/schemas/RedCapAccessCriteria-Single' Configurable5QISet: $ref: 'TS28541_5GcNrm.yaml#/components/schemas/Configurable5QISet-Multiple' RimRSGlobal: @@ -1203,6 +1205,8 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' rimRSMonitoringStartTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + redCapAccessCriteriaRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' rimRSMonitoringStopTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' rimRSMonitoringWindowDuration: @@ -1814,7 +1818,18 @@ components: $ref: '#/components/schemas/TimeDomainPara' RimRSSet: $ref: '#/components/schemas/RimRSSet-Multiple' - + RedCapAccessCriteria-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + nRCellDURef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + criteriaConditonRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' RimRSSet-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -2421,6 +2436,10 @@ components: type: array items: $ref: '#/components/schemas/EP_F1C-Single' + RedCapAccessCriteria-Multiple: + type: array + items: + $ref: '#/components/schemas/RedCapAccessCriteria-Single' EP_NgC-Multiple: type: array items: @@ -2539,4 +2558,6 @@ components: - $ref: '#/components/schemas/MWAB-Single' - $ref: '#/components/schemas/NRECMappingRule-Single' - $ref: '#/components/schemas/NTNTimeBasedConfig-Single' + - $ref: '#/components/schemas/RedCapAccessCriteria-Single' - $ref: '#/components/schemas/AIOTReader-Single' + -- GitLab From 201cb579669e44aa57b3015e5fc2c393a3c89c1a Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 28 May 2025 12:59:12 +0800 Subject: [PATCH 72/76] Rel19_CR1534_TS_28.541_NRM_enhancements_on_NFService for MR!1737 --- OpenAPI/TS28541_5GcNrm.yaml | 49 +++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 9787c9b82..7f4be521f 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -157,6 +157,55 @@ components: $ref: '#/components/schemas/VendorSpecificFeature' minItems: 1 minProperties: 1 + allowedScopesRuleSet: + description: A map (list of key-value pairs) where a valid JSON pointer Id serves as key + type: object + additionalProperties: + $ref: '#/components/schemas/RuleSet' + minProperties: 1 + nfServiceSetIdList: + description: This attribute represents a list of NF Service Set ID. + type: array + items: + type: string + perPlmnSnssaiList: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/PlmnSnssai' + load: + type: integer + minimum: 0 + maximum: 100 + loadTimeStamp: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + canaryRelease: + type: boolean + default: false + exclusiveCanaryReleaseSelection: + type: boolean + default: false + shutdownTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + canaryPrecedenceOverPreferred: + type: boolean + default: false + perPlmnOauth2ReqList: + $ref: '#/components/schemas/PlmnOauth2' + PlmnOauth2: + description: Oauth2.0 required indication for a given PLMN ID + type: object + properties: + oauth2RequiredPlmnIdList: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + minItems: 1 + oauth2NotRequiredPlmnIdList: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + minItems: 1 VendorSpecificFeature: type: object properties: -- GitLab From 72a83d2b58565f610a62ad5fbe20e9648895cf9f Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 28 May 2025 13:08:57 +0800 Subject: [PATCH 73/76] Replace MR !1766 -- Rel19 cr1520 ts 28.541 align predefined pcc rule set attributes with the definitions in ts 29.512 --- OpenAPI/TS28541_5GcNrm.yaml | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 7f4be521f..f285295d0 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -881,6 +881,14 @@ components: items: $ref: '#/components/schemas/TrafficControlData' + ServiceFeatureMap: + type: object + properties: + featureList: + type: string + serviceName: + type: string + PccRule: type: object properties: @@ -929,19 +937,24 @@ components: $ref: 'TS29514_Npcf_PolicyAuthorization.yaml#/components/schemas/TscaiInputContainer' tscaiInputUl: $ref: 'TS29514_Npcf_PolicyAuthorization.yaml#/components/schemas/TscaiInputContainer' - easRedisInd: + easRedisIndRequired: type: boolean default: false tscaiTimeDom: type: integer - capBatAdaptation: + batNotificationCapable: type: boolean default: false - disUeNotif: + uENotifEnabled: type: boolean default: false packFiltAllPrec: type: integer + nscSupportedFeats: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/ServiceFeatureMap' SnssaiInfo: type: object -- GitLab From 8522f0c0c565b6a0078b89ddc4c24daa622a4856 Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 28 May 2025 14:13:15 +0800 Subject: [PATCH 74/76] Update versions to be aligned with the version of word spec for SA plenary#108 --- OpenAPI/TS28104_MdaNrm.yaml | 2 +- OpenAPI/TS28104_MdaReport.yaml | 2 +- OpenAPI/TS28111_FaultNrm.yaml | 2 +- OpenAPI/TS28312_IntentExpectations.yaml | 2 +- OpenAPI/TS28312_IntentNrm.yaml | 2 +- OpenAPI/TS28318_DsoNrm.yaml | 2 +- OpenAPI/TS28532_FileDataReportingMnS.yaml | 4 ++-- OpenAPI/TS28532_ProvMnS.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_FeatureNrm.yaml | 2 +- OpenAPI/TS28623_GenericNrm.yaml | 4 ++-- OpenAPI/TS28623_MnSRegistryNrm.yaml | 2 +- OpenAPI/TS28623_SubscriptionControlNrm.yaml | 4 ++-- 17 files changed, 20 insertions(+), 20 deletions(-) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index 4577e1a28..4839ffc8e 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: MDA NRM - version: 19.1.0 + version: 19.2.0 description: >- OAS 3.0.1 specification of the MDA NRM © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml index ba2f51e3c..3244b9f61 100644 --- a/OpenAPI/TS28104_MdaReport.yaml +++ b/OpenAPI/TS28104_MdaReport.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: MDA Report - version: 19.1.0 + version: 19.2.0 description: >- OAS 3.0.1 specification of the MDA Report © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28111_FaultNrm.yaml b/OpenAPI/TS28111_FaultNrm.yaml index 241b9a4bf..13a6967dd 100644 --- a/OpenAPI/TS28111_FaultNrm.yaml +++ b/OpenAPI/TS28111_FaultNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Fault Management NRM - version: 19.1.0 + version: 19.2.0 description: >- OAS 3.0.1 definition of the Fault Supervision MnS © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 7b922fdbb..e0ef86a29 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Scenario specific Intent Expectations - version: 19.1.0 + version: 19.2.0 description: >- OAS 3.0.1 definition of scenario specific Intent Expectations © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 0ce0ea96d..c0242f0a3 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Intent NRM - version: 19.1.0 + version: 19.2.0 description: >- OAS 3.0.1 definition of the Intent NRM © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28318_DsoNrm.yaml b/OpenAPI/TS28318_DsoNrm.yaml index 161740415..5f7901bd3 100644 --- a/OpenAPI/TS28318_DsoNrm.yaml +++ b/OpenAPI/TS28318_DsoNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP NRM - version: 19.0.0 + version: 19.1.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/TS28532_FileDataReportingMnS.yaml b/OpenAPI/TS28532_FileDataReportingMnS.yaml index 7a324b4a2..033a67bc5 100644 --- a/OpenAPI/TS28532_FileDataReportingMnS.yaml +++ b/OpenAPI/TS28532_FileDataReportingMnS.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: File Data Reporting MnS - version: 18.2.0 + version: 19.1.0 description: >- OAS 3.0.1 definition of the File Data Reporting 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.532; Generic management services diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index 815bdd49a..e24a69104 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Provisioning MnS - version: 19.0.0 + version: 19.1.0 description: >- OAS 3.0.1 definition of the Provisioning MnS © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 24332bb0a..90eb86cef 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: 19.3.0 + version: 19.4.0 description: >- OAS 3.0.1 specification of the Edge 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 f285295d0..b99e102d0 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: 19.3.0 + version: 19.4.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 4d83d88ba..30b636f3c 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: NR NRM - version: 19.3.0 + version: 19.4.0 description: >- OAS 3.0.1 specification of the NR NRM © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 2fa712e57..d062e7bfd 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Slice NRM - version: 19.3.0 + version: 19.4.0 description: >- OAS 3.0.1 specification of the Slice NRM @ 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index a07f5c6ca..7d4cb0b61 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: 19.3.0 + version: 19.4.0 description: >- OAS 3.0.1 specification of common type definitions in the Generic NRM © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_FeatureNrm.yaml b/OpenAPI/TS28623_FeatureNrm.yaml index cb4a79611..7a37deb97 100644 --- a/OpenAPI/TS28623_FeatureNrm.yaml +++ b/OpenAPI/TS28623_FeatureNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: NRM Feautres - version: 19.0.0 + version: 19.4.0 description: >- OAS 3.0.1 definition of the Features of NRM © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index c9b1c9b45..8d054aa95 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Generic NRM - version: 19.2.0 + version: 19.4.0 description: >- OAS 3.0.1 definition of 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 diff --git a/OpenAPI/TS28623_MnSRegistryNrm.yaml b/OpenAPI/TS28623_MnSRegistryNrm.yaml index a8f703886..6c10f9b5f 100644 --- a/OpenAPI/TS28623_MnSRegistryNrm.yaml +++ b/OpenAPI/TS28623_MnSRegistryNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: MnS Registry NRM - version: 19.3.0 + version: 19.4.0 description: >- OAS 3.0.1 definition of the MnS Registry NRM fragment © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_SubscriptionControlNrm.yaml b/OpenAPI/TS28623_SubscriptionControlNrm.yaml index a12682a94..3e82a68ed 100644 --- a/OpenAPI/TS28623_SubscriptionControlNrm.yaml +++ b/OpenAPI/TS28623_SubscriptionControlNrm.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Subscription Control NRM - version: 19.2.0 + version: 19.4.0 description: >- OAS 3.0.1 definition of the Subscription Control NRM fragment - © 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, Subscription Control NRM -- GitLab From 479e526c954829407fc05145cfd53e373cd74c6d Mon Sep 17 00:00:00 2001 From: potherakallo Date: Thu, 29 May 2025 05:51:12 +0000 Subject: [PATCH 75/76] 28.623_Rel-19_CR0542 --- .../TS28623_ManagementDataCollectionNrm.yaml | 67 ++++++++++++++- OpenAPI/TS28623_MnSRegistryNrm.yaml | 82 +++++++++++++++++++ 2 files changed, 147 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml index 9424693be..37b48a01a 100644 --- a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml +++ b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml @@ -4,7 +4,7 @@ info: version: 19.0.0 description: >- OAS 3.0.1 definition of the Management Data Collection NRM fragment - © 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, Management Data Collection NRM @@ -18,6 +18,8 @@ components: properties: ManagementDataCollection: $ref: '#/components/schemas/ManagementDataCollection-Multiple' + ExternalDataType: + $ref: '#/components/schemas/ExternalDataType-Multiple' #-------Definition of generic IOCs ----------# @@ -54,6 +56,31 @@ components: - UP sst: type: integer + objectInstances: + type: array + uniqueItems: true + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + + ExternalDataScope: + type: object + properties: + geoAreas: + type: array + uniqueItems: true + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' + objectInstancesIncluded: + type: array + uniqueItems: true + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + objectInstancesExcluded: + type: array + uniqueItems: true + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + #-------- Definition of concrete IOCs -------------------------------------------- ManagementDataCollection-Single: @@ -78,16 +105,52 @@ components: - SNSSAI - 5QI - PLMN + condition: + type: string + processMonitor: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ProcessMonitor' + consolidateOutput: + type: boolean + jobId: + type: string + + ExternalDataType-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + externalDataType: + type: string + mediaLocation: + type: array + uniqueItems: true + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' + externalDataTypeSchema: + type: string + externalDataScope: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/ExternalDataScope' #-------- Definition of YAML arrays for name-contained IOCs ---------------------- ManagementDataCollection-Multiple: type: array items: $ref: '#/components/schemas/ManagementDataCollection-Single' - + + ExternalDataType-Multiple: + type: array + items: + $ref: '#/components/schemas/ExternalDataType-Single' #-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- resources-mgmtDataCollectionNrm: oneOf: - $ref: '#/components/schemas/ManagementDataCollection-Single' + - $ref: '#/components/schemas/ExternalDataType-Single' diff --git a/OpenAPI/TS28623_MnSRegistryNrm.yaml b/OpenAPI/TS28623_MnSRegistryNrm.yaml index 6c10f9b5f..cfaceb325 100644 --- a/OpenAPI/TS28623_MnSRegistryNrm.yaml +++ b/OpenAPI/TS28623_MnSRegistryNrm.yaml @@ -62,6 +62,8 @@ components: properties: MnsInfo: $ref: '#/components/schemas/MnsInfo-Multiple' + MgmtDataInfo: + $ref: '#/components/schemas/MgmtDataInfo-Multiple' MnsInfo-Single: allOf: @@ -98,6 +100,16 @@ components: items: $ref: '#/components/schemas/MnsScope' minItems: 1 + mgmtDataInfoRef: + description: >- + List of DN of MgmtDataInfo instance(s) which are associated the MnSInfo which represent a + management service instance + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + uniqueItems: true + minItems: 1 + MnsScope: description: -> It defines the information about the management scope of the Management Service. @@ -115,6 +127,71 @@ components: items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' + MgmtDataInfo-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + supportedManagementData: + description: >- + It defines the list of management data that can be supported. + type: array + uniqueItems: true + items: + $ref: 'TS28623_ManagementDataCollectionNrm.yaml#/components/schemas/ManagementData' + supportedGranularityPeriods: + description: >- + Granularity periods supported for the production of associated management data. + The period is defined in seconds. + type: array + items: + type: integer + uniqueItems: true + supportedReportingPeriods: + description: >- + Reporting periods supported for the associated management data. + The period is defined in seconds. + type: array + items: + type: integer + uniqueItems: true + historicalDataPeriod: + description: >- + This attribute describes the maximum period of the requested + historical data. + The period is defined in seconds. + When the value of this attribute is NULL, which means the + capability of querying historical data is not supported. + type: integer + supportedReportingMethod: + description: >- + List of supported reporting methods for the associated + management data. + type: array + uniqueItems: true + items: + type: string + enum: + - FILE + - STREAM + minItems: 1 + supportedDataScope: + description: >- + List of supported sub counter capabilities for the associated management data. + type: array + uniqueItems: true + items: + type: string + enum: + - SNSSAI + - 5QI + - PLMN + minItems: 1 + supportedDataRequestMnSRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + supportedDataReportingMnSRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + #-------- Definition of YAML arrays for name-contained IOCs ---------------------- MnsInfo-Multiple: @@ -122,9 +199,14 @@ components: items: $ref: '#/components/schemas/MnsInfo-Single' + MgmtDataInfo-Multiple: + type: array + items: + $ref: '#/components/schemas/MgmtDataInfo-Single' #-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- resources-mnSRegistryNrm: oneOf: - $ref: '#/components/schemas/MnsInfo-Single' - $ref: '#/components/schemas/MnsRegistry-Single' + - $ref: '#/components/schemas/MgmtDataInfo-Single' \ No newline at end of file -- GitLab From 4f5c37e4fc567e6fdb0cf04b64ec844604695e58 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 29 May 2025 14:01:26 +0800 Subject: [PATCH 76/76] Update versions to be aligned with the version of word spec for SA plenary#108 --- OpenAPI/TS28623_ManagementDataCollectionNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml index 37b48a01a..5f3a20de4 100644 --- a/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml +++ b/OpenAPI/TS28623_ManagementDataCollectionNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Management Data Collection NRM - version: 19.0.0 + version: 19.4.0 description: >- OAS 3.0.1 definition of the Management Data Collection NRM fragment © 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab