From 6e935ef1d0a67f69a689b707a2613baa6087a738 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 18 Oct 2024 06:28:22 +0000 Subject: [PATCH 01/42] TS28.541 Rel19 CR1371 TS28623 CR0450 Alignment of IP Address modeling --- OpenAPI/TS28541_5GcNrm.yaml | 9 ++++----- OpenAPI/TS28541_NrNrm.yaml | 23 +++++++---------------- OpenAPI/TS28623_ComDefs.yaml | 4 ++++ 3 files changed, 15 insertions(+), 21 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 5fe4522ff..b298b5e57 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -692,8 +692,7 @@ components: type: object properties: uPFIpAddress: - type: string - readOnly: true + $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostRo' uPFRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' SnssaiList: @@ -3956,11 +3955,11 @@ components: eDNServiceArea: $ref: 'TS28538_EdgeNrm.yaml#/components/schemas/ServingLocation' eASIpAddress: - type: string + $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' eESIpAddress: - type: string + $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' eCSIpAddress: - type: string + $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' ednIdentifier: type: string ecmConnectionType: diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 3aea8f9c8..0c3c8831f 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -282,10 +282,8 @@ components: AddressWithVlan: type: object properties: - ipv4Address: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' - ipv6Address: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' + iPAddress: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' vlanId: type: integer minimum: 0 @@ -300,12 +298,7 @@ components: minimum: 0 maximum: 65535 RemoteAddress: - type: object - properties: - ipv4Address: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' - ipv6Address: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' CellIndividualOffset: type: object @@ -579,13 +572,11 @@ components: TceMappingInfo: type: object properties: - TceIPAddress: - oneOf: - - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' - - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' - TceID: + tceIPAddress: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' + tceID: type: integer - PlmnTarget: + pLMNTarget: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' TceMappingInfoList: type: array diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index ff303617c..962116a9b 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -281,6 +281,10 @@ components: oneOf: - $ref: '#/components/schemas/IpAddr' - $ref: '#/components/schemas/Fqdn' + HostRo: + oneOf: + - $ref: '#/components/schemas/IpAddrRo' + - $ref: '#/components/schemas/FqdnRo' Uri: description: This datatype is used for writable attribute type: string -- GitLab From 9eafa4dfb78d0622ea5f58725341b0e8df1dad36 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 18 Oct 2024 06:37:05 +0000 Subject: [PATCH 02/42] TS28.623 Rel19 CR0440 enhance the isUnique property for stage 3 OpenAPI --- OpenAPI/TS28623_ComDefs.yaml | 3 +++ OpenAPI/TS28623_GenericNrm.yaml | 25 +++++++++++++++++++ OpenAPI/TS28623_MnSRegistryNrm.yaml | 1 + OpenAPI/TS28623_PmControlNrm.yaml | 1 + .../TS28623_QoEMeasurementCollectionNrm.yaml | 3 +++ OpenAPI/TS28623_SubscriptionControlNrm.yaml | 1 + OpenAPI/TS28623_ThresholdMonitorNrm.yaml | 2 ++ 7 files changed, 36 insertions(+) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 962116a9b..d3fb8663c 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -69,11 +69,13 @@ components: DnList: description: This datatype is used for writable attribute type: array + uniqueItems: true items: $ref: '#/components/schemas/Dn' DnListRo: description: This datatype is used for readOnly attribute type: array + uniqueItems: true items: $ref: '#/components/schemas/DnRo' @@ -170,6 +172,7 @@ components: $ref: '#/components/schemas/Float' ConvexGeoPolygon: type: array + uniqueItems: true items: $ref: '#/components/schemas/GeoCoordinate' minItems: 3 diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 1346cf3a9..ed0dbc293 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -59,17 +59,20 @@ components: properties: performanceMetrics: type: array + uniqueItems: true items: type: string readOnly: true granularityPeriods: type: array + uniqueItems: true items: type: integer minimum: 1 readOnly: true reportingMethods: type: array + uniqueItems: true items: type: string enum: @@ -79,6 +82,7 @@ components: readOnly: true reportingPeriods: type: array + uniqueItems: true items: type: integer minimum: 1 @@ -189,16 +193,19 @@ components: properties: timeIntervals: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeInterval' - type: object properties: timeIntervals: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeInterval' daysOfWeek: type: array + uniqueItems: true items: type: string enum: @@ -213,10 +220,12 @@ components: properties: timeIntervals: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeInterval' daysOfMonth: type: array + uniqueItems: true items: type: integer minimum: 0 @@ -228,12 +237,14 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' cAGIdList: type: array + uniqueItems: true items: type: string minItems: 1 maxItems: 256 nIDList: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Nid' minItems: 1 @@ -288,6 +299,7 @@ components: type: string setOfMcc: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mcc' readOnly: true @@ -296,10 +308,12 @@ components: readOnly: true supportedPerfMetricGroups: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupportedPerfMetricGroup' supportedTraceMetrics: type: array + uniqueItems: true items: type: string ManagedElement-Attr: @@ -309,6 +323,7 @@ components: type: string managedElementTypeList: type: array + uniqueItems: true items: type: string userLabel: @@ -329,10 +344,12 @@ components: type: integer supportedPerfMetricGroups: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupportedPerfMetricGroup' supportedTraceMetrics: type: array + uniqueItems: true items: type: string readOnly: true @@ -384,20 +401,24 @@ components: type: string vnfParametersList: type: array + uniqueItems: true items: $ref: '#/components/schemas/VnfParameter' peeParametersList: type: array + uniqueItems: true items: $ref: '#/components/schemas/PeeParameter' priorityLabel: type: integer supportedPerfMetricGroups: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupportedPerfMetricGroup' supportedTraceMetrics: type: array + uniqueItems: true items: type: string EP_RP-Attr: @@ -410,6 +431,7 @@ components: readOnly: true supportedPerfMetricGroups: type: array + uniqueItems: true items: $ref: '#/components/schemas/SupportedPerfMetricGroup' @@ -500,6 +522,7 @@ components: properties: schedulingTimes: type: array + uniqueItems: true items: $ref: '#/components/schemas/SchedulingTime' minItems: 1 @@ -530,10 +553,12 @@ components: properties: notificationTypes: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationType' notificationProtocols: type: array + uniqueItems: true items: type: string enum: diff --git a/OpenAPI/TS28623_MnSRegistryNrm.yaml b/OpenAPI/TS28623_MnSRegistryNrm.yaml index 153a45cc9..eddba948c 100644 --- a/OpenAPI/TS28623_MnSRegistryNrm.yaml +++ b/OpenAPI/TS28623_MnSRegistryNrm.yaml @@ -61,6 +61,7 @@ components: contain the DN of the SubNetwork instead of the DNs of the individual managed entities within the SubNetwork. type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' diff --git a/OpenAPI/TS28623_PmControlNrm.yaml b/OpenAPI/TS28623_PmControlNrm.yaml index 720842e2d..fd5ea0d2a 100644 --- a/OpenAPI/TS28623_PmControlNrm.yaml +++ b/OpenAPI/TS28623_PmControlNrm.yaml @@ -47,6 +47,7 @@ components: type: string performanceMetrics: type: array + uniqueItems: true items: type: string granularityPeriod: diff --git a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml index c7811203e..1ee6c7c98 100644 --- a/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml +++ b/OpenAPI/TS28623_QoEMeasurementCollectionNrm.yaml @@ -45,6 +45,7 @@ components: - VR areaScope: type: array + uniqueItems: true items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/AreaScope' qoECollectionEntityAddress: @@ -59,6 +60,7 @@ components: type: string sliceScope: type: array + uniqueItems: true items: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' qMCConfigFile: @@ -67,6 +69,7 @@ components: $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/traceReference-Type' availableRANqoEMetrics: type: array + uniqueItems: true items: type: string enum: diff --git a/OpenAPI/TS28623_SubscriptionControlNrm.yaml b/OpenAPI/TS28623_SubscriptionControlNrm.yaml index f077c875d..4e8a470a1 100644 --- a/OpenAPI/TS28623_SubscriptionControlNrm.yaml +++ b/OpenAPI/TS28623_SubscriptionControlNrm.yaml @@ -57,6 +57,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' notificationTypes: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationType' scope: diff --git a/OpenAPI/TS28623_ThresholdMonitorNrm.yaml b/OpenAPI/TS28623_ThresholdMonitorNrm.yaml index 84e95a94a..d456e046f 100644 --- a/OpenAPI/TS28623_ThresholdMonitorNrm.yaml +++ b/OpenAPI/TS28623_ThresholdMonitorNrm.yaml @@ -31,6 +31,7 @@ components: properties: performanceMetrics: type: array + uniqueItems: true items: type: string thresholdDirection: @@ -66,6 +67,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' thresholdInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/ThresholdInfo' monitorGranularityPeriod: -- GitLab From cb2dd512306a5d6e25d425853f0b9b516a6cb79c Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 3 Oct 2024 14:51:28 +0000 Subject: [PATCH 03/42] TS28105 Rel19 CR0184 enhance the isUnique property for stage 3 OpenAPI --- OpenAPI/TS28105_AiMlNrm.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 4bdb73a0e..cc688f5ee 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -69,6 +69,7 @@ components: properties: thresholdList: type: array + uniqueItems: true items: $ref: 'TS28623_ThresholdMonitorNrm.yaml#/components/schemas/ThresholdInfo' managedActivationScope: @@ -91,18 +92,21 @@ components: properties: dNList: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - type: object properties: timeWindow: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' - type: object properties: geoPolygon: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' @@ -124,10 +128,12 @@ components: type: string mLCapabilityVersionId: type: array + uniqueItems: true items: type: string expectedPerformanceGains: type: array + uniqueItems: true items: $ref: '#/components/schemas/ModelPerformance' mLModelRef: @@ -138,12 +144,14 @@ components: properties: inferenceOutputId: type: array + uniqueItems: true items: type: string aIMLInferenceName: type: string inferenceOutputTime: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' # FIXME, isOrder/isUnique both as True @@ -229,6 +237,7 @@ components: type: string candidateTrainingDataSource: type: array + uniqueItems: true items: type: string trainingDataQualityScore: @@ -241,6 +250,7 @@ components: $ref: '#/components/schemas/MLContext' performanceRequirements: type: array + uniqueItems: true items: $ref: '#/components/schemas/ModelPerformance' cancelRequest: @@ -291,16 +301,19 @@ components: properties: usedConsumerTrainingData: type: array + uniqueItems: true items: type: string modelConfidenceIndication: type: integer modelPerformanceTraining: type: array + uniqueItems: true items: $ref: '#/components/schemas/ModelPerformance' modelPerformanceValidation: type: array + uniqueItems: true items: $ref: '#/components/schemas/ModelPerformance' dataRatioTrainingAndValidation: @@ -371,6 +384,7 @@ components: properties: modelPerformanceTesting: type: array + uniqueItems: true items: $ref: '#/components/schemas/ModelPerformance' mLTestingResult: @@ -458,6 +472,7 @@ components: $ref: '#/components/schemas/SupportedPerfIndicator' mLCapabilitiesInfoList: type: array + uniqueItems: true items: $ref: '#/components/schemas/MLCapabilityInfo' retrainingEventsMonitorRef: @@ -525,10 +540,12 @@ components: properties: performanceGainThreshold: type: array + uniqueItems: true items: $ref: '#/components/schemas/ModelPerformance' newCapabilityVersionId: type: array + uniqueItems: true items: type: string updateTimeDeadline: @@ -628,6 +645,7 @@ components: properties: inferenceOutputs: type: array + uniqueItems: true items: $ref: '#/components/schemas/InferenceOutput' minItems: 1 -- GitLab From cefbf1e58bf8f44b41cd1a2e4479ec5d613b8233 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 3 Oct 2024 14:35:35 +0000 Subject: [PATCH 04/42] TS28623 Rel19 CR0442 correction to Jex for dataNodeSelector and notificationFilter in OpenAPI --- OpenAPI/TS28623_ComDefs.yaml | 17 ++++++++++++++++- OpenAPI/TS28623_SubscriptionControlNrm.yaml | 6 ++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index d3fb8663c..ff9c3735d 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -364,6 +364,21 @@ components: description: >- The filter format shall be compliant to Jex (TS 32.161). type: string + JexConditions: + type: string + description: >- + The value of the string shall be a Jex expression that is compliant to the + Jex conditions profile specified in clause 7.6 of TS 32.161. + JexNodeSelectionBasic: + type: string + description: >- + The value of the string shall be a Jex expression that is compliant to the + Jex basic profile specified in clause 7.4 of TS 32.161. + JexNodeSelectionAdvanced: + type: string + description: >- + The value of the string shall be a Jex expression that is compliant to the + Jex advanced profile specified in clause 7.5 of TS 32.161. SystemDN: type: string @@ -415,7 +430,7 @@ components: timeTick: type: integer filter: - $ref: '#/components/schemas/Filter' + $ref: '#/components/schemas/JexConditions' ErrorResponseGet: description: >- diff --git a/OpenAPI/TS28623_SubscriptionControlNrm.yaml b/OpenAPI/TS28623_SubscriptionControlNrm.yaml index 4e8a470a1..290043015 100644 --- a/OpenAPI/TS28623_SubscriptionControlNrm.yaml +++ b/OpenAPI/TS28623_SubscriptionControlNrm.yaml @@ -42,7 +42,9 @@ components: - type: object properties: dataNodeSelector: - type: string + oneOf: + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexNodeSelectionBasic' + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexNodeSelectionAdvanced' #-------- Definition of concrete IOCs -------------------------------------------- NtfSubscriptionControl-Single: @@ -63,7 +65,7 @@ components: scope: $ref: '#/components/schemas/Scope' notificationFilter: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Filter' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/JexConditions' HeartbeatControl: $ref: '#/components/schemas/HeartbeatControl-Single' HeartbeatControl-Single: -- GitLab From ef4d68b209f47a4ab4d92b5fc1fb53e067f1a203 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 18 Oct 2024 08:09:57 +0000 Subject: [PATCH 05/42] TS28.541 Rel19 CR1372 Alignment of attribute value list with TS29.510 for... --- OpenAPI/TS28541_5GcNrm.yaml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index b298b5e57..d3342c96a 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -196,6 +196,9 @@ components: - P_BDT - P_PLMNUE - P_NSSCD + - P_PDTQ + - P_MBSCD + - P_GROUP NotificationType: type: string readOnly: true @@ -208,6 +211,12 @@ components: - LOCATION_UPDATE_NOTIFICATION - NSSAA_REAUTH_NOTIFICATION - NSSAA_REVOC_NOTIFICATION + - MATCH_INFO_NOTIFICATION + - DATA_RESTORATION_NOTIFICATION + - TSCTS_NOTIFICATION + - LCS_KEY_DELIVERY_NOTIFICATION + - UUAA_MM_AUTH_NOTIFICATION + - DC_SESSION_EVENT_NOTIFICATION DefaultNotificationSubscription: type: object properties: @@ -815,6 +824,21 @@ components: - N6MB - N19MB - NMB9 + - S1U + - S5U + - S8U + - S11U + - S12 + - S2AU + - S2BU + - N3TRUSTEDN3GPP + - N3UNTRUSTEDN3GPP + - N9ROAMING + - SGI + - N19 + - SXAU + - SXBU + - N4U ipv4EndpointAddresses: type: array items: -- GitLab From 3dc05602df1472a060162387cb6140c5258d8f75 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sun, 29 Sep 2024 02:55:08 +0000 Subject: [PATCH 06/42] Update file TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 0c3c8831f..dcdb1648b 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1744,6 +1744,11 @@ components: $ref: '#/components/schemas/NRFrequency-Multiple' ExternalGnbCuCpFunction: $ref: '#/components/schemas/ExternalGnbCuCpFunction-Multiple' + ExternalGnbCuUpFunction: + $ref: '#/components/schemas/ExternalGnbCuUpFunction-Multiple' + ExternalGnbDuFunction: + $ref: '#/components/schemas/ExternalGnbDuFunction-Multiple' + ExternalGnbCuUpFunction-Single: allOf: -- GitLab From 29e5266a62b4c53045155723eaaf48a9b6d35298 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sun, 29 Sep 2024 01:27:22 +0000 Subject: [PATCH 07/42] Update 3 files - /OpenAPI/TS28623_FileManagementNrm.yaml - /OpenAPI/TS28623_GenericNrm.yaml - /OpenAPI/TS28623_PmControlNrm.yaml --- OpenAPI/TS28623_FileManagementNrm.yaml | 2 +- OpenAPI/TS28623_GenericNrm.yaml | 2 +- OpenAPI/TS28623_PmControlNrm.yaml | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28623_FileManagementNrm.yaml b/OpenAPI/TS28623_FileManagementNrm.yaml index 305ba783a..5904e4613 100644 --- a/OpenAPI/TS28623_FileManagementNrm.yaml +++ b/OpenAPI/TS28623_FileManagementNrm.yaml @@ -38,7 +38,7 @@ components: for usage in the "FileDownloadJob". type: object properties: - jobId: + id: type: string readOnly: true status: diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index ed0dbc293..a65dc2245 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -114,7 +114,7 @@ components: This data type is the "ProcessMonitor" data type without specialisations. type: object properties: - jobId: + id: type: string readOnly: true status: diff --git a/OpenAPI/TS28623_PmControlNrm.yaml b/OpenAPI/TS28623_PmControlNrm.yaml index fd5ea0d2a..865e830f6 100644 --- a/OpenAPI/TS28623_PmControlNrm.yaml +++ b/OpenAPI/TS28623_PmControlNrm.yaml @@ -63,6 +63,8 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' reportingCtrl: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ReportingCtrl' + _linkToFiles: + type: string Files: $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/Files-Multiple' -- GitLab From 25f4f0642d5a5facc5491b230fe9b489ee74ddf3 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sun, 29 Sep 2024 03:47:29 +0000 Subject: [PATCH 08/42] Update file TS28105_AiMlNrm.yaml --- OpenAPI/TS28105_AiMlNrm.yaml | 102 ++++++++++++++++++++--------------- 1 file changed, 60 insertions(+), 42 deletions(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index cc688f5ee..bab55f85e 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -19,12 +19,13 @@ components: type: object properties: inferenceModelRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' dataProviderRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' RequestStatus: type: string + readOnly: true enum: - NOT_STARTED - IN_PROGRESS @@ -81,10 +82,13 @@ components: properties: performanceIndicatorName: type: string + readOnly: true isSupportedForTraining: type: boolean + readOnly: true isSupportedForTesting: type: boolean + readOnly: true ManagedActivationScope: oneOf: @@ -115,8 +119,10 @@ components: properties: aIMLInferenceName: type: string + readOnly: true capabilityName: type: string + readOnly: true mLCapabilityParameters: description: A map (list of key-value pairs) for an aIMLInferenceName and capabilityName $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' @@ -126,18 +132,20 @@ components: properties: availMLCapabilityReportID: type: string + readOnly: true mLCapabilityVersionId: type: array uniqueItems: true items: type: string + readOnly: true expectedPerformanceGains: type: array uniqueItems: true items: $ref: '#/components/schemas/ModelPerformance' mLModelRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' InferenceOutput: type: object @@ -147,13 +155,15 @@ components: uniqueItems: true items: type: string + readOnly: true aIMLInferenceName: type: string + readOnly: true inferenceOutputTime: type: array uniqueItems: true items: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' # FIXME, isOrder/isUnique both as True inferencePerformance: $ref: '#/components/schemas/ModelPerformance' @@ -207,7 +217,7 @@ components: - type: object properties: mLModelRepositoryRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -234,7 +244,8 @@ components: - type: object properties: aIMLInferenceName: - type: string + type: string + readOnly: true candidateTrainingDataSource: type: array uniqueItems: true @@ -258,9 +269,9 @@ components: suspendRequest: type: boolean mLModelRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' mLModelCoordinationGroupRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' MLTrainingProcess-Single: allOf: @@ -282,13 +293,13 @@ components: suspendProcess: type: boolean trainingRequestRef: ## Figure 7.3a.1.1.1-1 has no such pointer - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' trainingReportRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' mLModelGeneratedRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' mLModelRef: ## Figure 7.3a.1.1.1-1 is 1-0..1 mapping, hence should be single - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' MLTrainingReport-Single: allOf: @@ -304,8 +315,10 @@ components: uniqueItems: true items: type: string + readOnly: true modelConfidenceIndication: type: integer + readOnly: true modelPerformanceTraining: type: array uniqueItems: true @@ -320,18 +333,19 @@ components: type: integer areNewTrainingDataUsed: type: boolean + readOnly: true trainingRequestRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' trainingProcessRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' lastTrainingRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' mLModelGeneratedRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' mLModelCoordinationGroupGeneratedRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' mLModelRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' MLTestingFunction-Single: allOf: @@ -344,7 +358,7 @@ components: - type: object properties: ##FIXME pointer to MLModelCoordinationGroup missing mLModelRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -369,9 +383,9 @@ components: suspendRequest: type: boolean mLModelRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' mLModelCoordinationGroupRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' MLTestingReport-Single: allOf: @@ -389,8 +403,9 @@ components: $ref: '#/components/schemas/ModelPerformance' mLTestingResult: type: string + readOnly: true testingRequestRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' MLModelLoadingRequest-Single: allOf: @@ -408,7 +423,7 @@ components: suspendRequest: type: boolean mLModelToLoadRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' MLModelLoadingPolicy-Single: allOf: @@ -424,7 +439,7 @@ components: policyForLoading: $ref: '#/components/schemas/AIMLManagementPolicy' mLModelRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' MLModelLoadingProcess-Single: allOf: @@ -442,11 +457,11 @@ components: suspendProcess: type: boolean mLModelLoadingRequestRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' mLModelLoadingPolicyRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' loadedMLModelRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' MLModel-Single: allOf: @@ -458,10 +473,13 @@ components: properties: mLModelId: type: string + readOnly: true aIMLInferenceName: type: string + readOnly: true mLModelVersion: type: string + readOnly: true expectedRunTimeContext: $ref: '#/components/schemas/MLContext' trainingContext: @@ -478,11 +496,11 @@ components: retrainingEventsMonitorRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' sourceTrainedMLModelRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' aIMLInferenceReportRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' usedByFunctionRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' MLModelRepository-Single: allOf: @@ -503,7 +521,7 @@ components: type: object properties: memberMLModelRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' ## 7.3a.4.1 IOC MLUpdateFunction-Single: @@ -519,7 +537,7 @@ components: availMLCapabilityReport: $ref: '#/components/schemas/AvailMLCapabilityReport' mLModelRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -559,9 +577,9 @@ components: suspendRequest: type: boolean mLUpdateProcessRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' mLModelRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' MLUpdateProcess-Single: allOf: @@ -578,11 +596,11 @@ components: suspendProcess: type: boolean mLModelRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' mLUpdateRequestRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' mLUpdateReportRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' MLUpdateReport-Single: allOf: @@ -595,9 +613,9 @@ components: updatedMLCapability: $ref: '#/components/schemas/AvailMLCapabilityReport' mLModelRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' mLUpdateProcessRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' AIMLInferenceFunction-Single: allOf: @@ -617,9 +635,9 @@ components: managedActivationScope: $ref: '#/components/schemas/AIMLManagementPolicy' usedByFunctionRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' mLModelRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -650,7 +668,7 @@ components: $ref: '#/components/schemas/InferenceOutput' minItems: 1 mLModelRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' AIMLInferenceEmulationFunction-Single: allOf: -- GitLab From a1a2795fabe4deda60658494cd3137ee874d26a2 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sun, 29 Sep 2024 06:20:44 +0000 Subject: [PATCH 09/42] Update file TS28317_RanScNrm.yaml --- OpenAPI/TS28317_RanScNrm.yaml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/OpenAPI/TS28317_RanScNrm.yaml b/OpenAPI/TS28317_RanScNrm.yaml index 3b1973463..dc7279eac 100644 --- a/OpenAPI/TS28317_RanScNrm.yaml +++ b/OpenAPI/TS28317_RanScNrm.yaml @@ -64,7 +64,7 @@ components: description: >- Setting this attribute to "TRUE" cancels the self configuration process. scMgmtProfileRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' #-------Definition of IOCs ----------# @@ -100,8 +100,9 @@ components: for usage in the RANSC management for monitoring for the self configuration process. type: object properties: - jobId: + id: type: string + readOnly: true status: type: string enum: @@ -111,10 +112,12 @@ components: - FAILED - CANCELLING - CANCELLED + readOnly: true progressPercentage: type: integer minimum: 0 maximum: 100 + readOnly: true progressStateInfo: type: string enum: @@ -126,6 +129,7 @@ components: - RETRIEVE_CONFIGURATION_DATA - SETUP_PRECONFIGURED_SIGNALLING_LINKS - SET_FINAL_STATE_OF_NE + readOnly: true resultStateInfo: oneOf: - type: string @@ -135,11 +139,13 @@ components: - NE_HARDWARE_ERROR_DELECTED - DISCONNECTION_BETWEEN_NE_AND_OAM - OTHER + readOnly: true - type: string + readony: true startTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' endTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeEo' #-------Definition of Data types ----------# -- GitLab From 1ffc4269afe5f8aa3a46d95ddb03f22103a7aad5 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sun, 29 Sep 2024 06:25:26 +0000 Subject: [PATCH 10/42] Update file TS28317_RanScNrm.yaml --- OpenAPI/TS28317_RanScNrm.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28317_RanScNrm.yaml b/OpenAPI/TS28317_RanScNrm.yaml index dc7279eac..1d4caa109 100644 --- a/OpenAPI/TS28317_RanScNrm.yaml +++ b/OpenAPI/TS28317_RanScNrm.yaml @@ -117,7 +117,7 @@ components: type: integer minimum: 0 maximum: 100 - readOnly: true + readOnly: true progressStateInfo: type: string enum: @@ -133,15 +133,15 @@ components: resultStateInfo: oneOf: - type: string + readOnly: true enum: - UNKNOWN - INCORRECT_CONFIGURATION - NE_HARDWARE_ERROR_DELECTED - DISCONNECTION_BETWEEN_NE_AND_OAM - OTHER - readOnly: true - type: string - readony: true + readOnly: true startTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' endTime: -- GitLab From 008818711bceb5adfd529f607eb246a404f1dfc5 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sun, 29 Sep 2024 06:27:15 +0000 Subject: [PATCH 11/42] Update file TS28317_RanScNrm.yaml --- OpenAPI/TS28317_RanScNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28317_RanScNrm.yaml b/OpenAPI/TS28317_RanScNrm.yaml index 1d4caa109..3bc789c4f 100644 --- a/OpenAPI/TS28317_RanScNrm.yaml +++ b/OpenAPI/TS28317_RanScNrm.yaml @@ -145,7 +145,7 @@ components: startTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' endTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeEo' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' #-------Definition of Data types ----------# -- GitLab From c28f0d2ea0538d20bcb618b1483eb73d6940e491 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sun, 29 Sep 2024 06:50:55 +0000 Subject: [PATCH 12/42] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 3d018cb18..acf72057c 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -71,7 +71,7 @@ components: It represents the observation period of the fulfilmentInfo for corresponding ExpectationTargets, IntentExpectations and Intent. intentReportReference: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' IntentReport-Single: description: It represents intent report information from MnS producer to MnS consumer. allOf: @@ -87,9 +87,9 @@ components: intentFeasibilityCheckReport: $ref: '#/components/schemas/IntentFeasibilityCheckReport' lastUpdatedTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' intentReference: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' IntentHandlingFunction-Single: description: >- It represents the intent handling capabilities can be supported by a specific intent @@ -338,6 +338,7 @@ components: properties: expectaitonId: type: string + readOnly: true expectationFulfilmentInfo: $ref: '#/components/schemas/FulfilmentInfo' targetFulfilmentResult: @@ -354,6 +355,7 @@ components: properties: targetName: type: string + readOnly: true targetFulfilmentInfo: $ref: '#/components/schemas/FulfilmentInfo' targetAchievedValue: @@ -361,6 +363,7 @@ components: description: >- It describes the value that has been achieved for the expectation target at the time at which the report is generated. + readOnly: true #-------Definition of the concrete TargetFulfilmentResult dataType----------------# #-------Definition of the generic IntentConflictReport dataType----------------# @@ -372,8 +375,10 @@ components: properties: conflictId: type: string + readOnly: true conflictType: type: string + readOnly: true enum: - INTENT_CONFLICT - EXPECTATION_CONFLICT @@ -381,17 +386,20 @@ components: conflictingIntent: description: >- This will be present if the value of conflictType is INTENT_CONFLICT. It describes the DN of the conflicting intent - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' conflictingExpectation: description: >- This will be present if the value of conflictType is EXPECTATION_CONFLICT. It describes the expectationId of the conflicting IntentExpectation with an Intent - type: string + type: string + readOnly: true conflictingTarget: description: >- This will be present if the value of conflictType is TARGET_CONFLICT. It describes the targetName of the conflicting ExpectationTarget with an IntentExpectation - type: string + type: string + readOnly: true recommendedSolutions: - type: string + type: string + readOnly: true enum: - MODIFY - DELETE @@ -407,11 +415,13 @@ components: properties: feasibilityCheckResult: type: string + readOnly: true enum: - FEASIBLE - INFEASIBLE infeasibilityReason: type: string + readOOnly: true description: An attribute which is used when feasibilityCheckResult is INFEASIBLE #-------Definition of the concrete IntentFeasibilityCheckReport dataType----------------# @@ -424,6 +434,7 @@ components: properties: intentHandlingCapabilityId: type: string + readOnly: true supportedExpectationObjectType: type: string enum: @@ -431,11 +442,13 @@ components: - EDGE_SERVICE_SUPPORT - 5GC_SUBNETWORK - 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: type: array items: type: string + readOnly: true description: It describes the supported expectation targets for the supported expectation object type. #-------Definition of the concrete IntentHandlingCapability dataType----------------# -- GitLab From 017aa238effffbc1b450796183629d0c89b0c971 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sun, 29 Sep 2024 06:54:26 +0000 Subject: [PATCH 13/42] 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 acf72057c..c8d30316a 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -421,7 +421,7 @@ components: - INFEASIBLE infeasibilityReason: type: string - readOOnly: true + readOnly: true description: An attribute which is used when feasibilityCheckResult is INFEASIBLE #-------Definition of the concrete IntentFeasibilityCheckReport dataType----------------# -- GitLab From 5a70380f658e812ad98eda765d1a82222956e94f Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sun, 29 Sep 2024 07:09:48 +0000 Subject: [PATCH 14/42] Update 2 files - /OpenAPI/TS28623_ComDefs.yaml - /OpenAPI/TS28111_FaultNrm.yaml --- OpenAPI/TS28111_FaultNrm.yaml | 48 ++++++++++++++++++++++------------- OpenAPI/TS28623_ComDefs.yaml | 2 +- 2 files changed, 31 insertions(+), 19 deletions(-) diff --git a/OpenAPI/TS28111_FaultNrm.yaml b/OpenAPI/TS28111_FaultNrm.yaml index 7a525d13f..53fc292f0 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 + readOnly: true ProbableCause: description: >- The value of the probable cause may be a specific standardized string, or any @@ -58,12 +59,17 @@ components: - PROBABLE_CAUSE_003 - PROBABLE_CAUSE_004 - PROBABLE_CAUSE_005 + readOnly: true - type: string + readOnly: true - type: integer + readOnly: true SpecificProblem: oneOf: - type: string + readOnly: true - type: integer + readOnly: true PerceivedSeverity: type: string enum: @@ -72,9 +78,10 @@ components: - MAJOR - MINOR - WARNING - - CLEARED + - CLEARED TrendIndication: type: string + readOnly: true enum: - MORE_SEVERE - NO_CHANGE @@ -87,9 +94,9 @@ components: high: oneOf: - type: integer - - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/FloatRo' low: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/FloatRo' ThresholdLevelInd: oneOf: - type: object @@ -105,12 +112,14 @@ components: properties: observedMeasurement: type: string + readOnly: true observedValue: type: number + readOnly: true thresholdLevel: $ref: '#/components/schemas/ThresholdLevelInd' armTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' required: - observedMeasurement - observedValue @@ -118,7 +127,7 @@ components: type: object properties: sourceObjectInstance: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' notificationIds: type: array items: @@ -145,15 +154,15 @@ components: # alarmId: # $ref: '#/components/schemas/AlarmId' objectInstance: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' notificationId: $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationId' alarmRaisedTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' alarmChangedTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' alarmClearedTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' alarmType: $ref: '#/components/schemas/AlarmType' probableCause: @@ -165,7 +174,7 @@ components: backedUpStatus: type: boolean backUpObject: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' trendIndication: $ref: '#/components/schemas/TrendIndication' thresholdinfo: @@ -178,34 +187,36 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' proposedRepairActions: type: string + readOnly: true additionalText: type: string + readOnly: true additionalInformation: $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet' - rootCauseIndicator: type: boolean - + readOnly: true ackTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' ackUserId: type: string ackSystemId: type: string ackState: $ref: '#/components/schemas/AckState' - clearUserId: type: string clearSystemId: type: string serviceUser: type: string + readOnly: true serviceProvider: type: string + readOnly: true securityAlarmDetector: type: string - + readOnly: true AlarmList-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -220,8 +231,9 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' numOfAlarmRecords: type: integer + readOnly: true lastModification: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' alarmRecords: description: >- This resource represents a map of alarm records. @@ -230,7 +242,7 @@ components: additionalProperties: $ref: '#/components/schemas/AlarmRecord' unreliableAlarmScope: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' #---- Definition of alarm notifications --------------------------------------------# @@ -539,7 +551,7 @@ components: type: object properties: commentTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' commentUserId: type: string commentSystemId: diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index ff9c3735d..0467bd809 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -381,9 +381,9 @@ components: Jex advanced profile specified in clause 7.5 of TS 32.161. SystemDN: type: string - NotificationId: type: integer + readOnly: true NotificationType: oneOf: - $ref: 'TS28111_FaultNrm.yaml#/components/schemas/AlarmNotificationTypes' -- GitLab From 1d18e44a87a071bef505cdec1028573fe0644733 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sun, 29 Sep 2024 07:18:31 +0000 Subject: [PATCH 15/42] Update 2 files - /OpenAPI/TS28104_MdaNrm.yaml - /OpenAPI/TS28104_MdaReport.yaml --- OpenAPI/TS28104_MdaNrm.yaml | 5 +++-- OpenAPI/TS28104_MdaReport.yaml | 15 ++++----------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index 4290465aa..41e47a9fd 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -19,6 +19,7 @@ components: type: array items: type: string + readOnly: true MDAOutputs: type: array @@ -140,9 +141,9 @@ components: supportedMDACapabilities: $ref: '#/components/schemas/MDATypes' mLModelRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' aIMLInferenceFunctionRefList: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml index b57be4d1a..846254169 100644 --- a/OpenAPI/TS28104_MdaReport.yaml +++ b/OpenAPI/TS28104_MdaReport.yaml @@ -20,12 +20,13 @@ components: properties: mDAType: type: string + readOnly: true mDAOutputList: type: array items: $ref: '#/components/schemas/MDAOutputEntry' analyticsWindow: - $ref: '#/components/schemas/TimeWindow' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindowRo' confidenceDegree: type: number format: float @@ -35,18 +36,10 @@ components: properties: mDAOutputIEName: type: string + readOnly: true mDAOutputIEValue: {} - TimeWindow: - type: object - properties: - mDAOutputStartTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - mDAOutputEndTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - - #-------- Definition of MDA Report -------------------------------------------- MDAReport: @@ -63,4 +56,4 @@ components: mDAOutputs: $ref: '#/components/schemas/MDAOutputs' mDARequestRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' -- GitLab From 50d732b9f738d6c15fe860d3922e99d15503535b Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sun, 29 Sep 2024 07:21:31 +0000 Subject: [PATCH 16/42] Update file 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 41e47a9fd..89aa349ac 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -79,7 +79,7 @@ components: timeDurations: type: array items: - $ref: 'TS28104_MdaReport.yaml#/components/schemas/TimeWindow' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' - type: object properties: granularityPeriod: -- GitLab From 33f9a8859743418d982a9b172ab47cf0c0791ab3 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sun, 29 Sep 2024 07:45:52 +0000 Subject: [PATCH 17/42] Update file TS28538_EdgeNrm.yaml --- OpenAPI/TS28538_EdgeNrm.yaml | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 83f86744d..aeb4c6e10 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -99,16 +99,10 @@ components: readOnly: true secCredential: type: string - Duration: - type: object - properties: - startTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - endTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' EASServicePermission: type: string description: any of enumerated value + readOnly: true enum: - TRIAL - SILVER @@ -118,6 +112,7 @@ components: EASStatus: type: string description: any of enumerated value + readOnly: true enum: - ENABLED - DISABLED @@ -136,9 +131,11 @@ components: properties: resourceId: type: string + readOnly: true reservationStatus: type: string description: any of enumrated value + readOnly: true enum: - RESERVED - USEd @@ -199,6 +196,7 @@ components: $ref: '#/components/schemas/EESFunction-Multiple' availableEdgeVirtualResources: type: string + readOnly: true EASFunction-Single: allOf: @@ -236,12 +234,15 @@ components: properties: aCID: type: string + readOnly: true eASProvider: type: string + readOnly: true eASdescription: type: string + readOnly: true eASSchedule: - $ref: '#/components/schemas/Duration' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindoewRo' eASGeographicalServiceArea: $ref: '#/components/schemas/GeoLoc' eASTopologicalServiceArea: @@ -252,10 +253,13 @@ components: $ref: '#/components/schemas/EASFeature' eASServiceContinuitySupport: type: boolean + readOnly: true eASDNAI: type: string + readOnly: true eASAvailabilityReportingPeriod: type: integer + readOnly: true eASStatus: $ref: '#/components/schemas/EASStatus' EESFunction-Single: @@ -328,7 +332,7 @@ components: softwareImageInfo: $ref: '#/components/schemas/SoftwareImageInfo' eASSchedule: - $ref: '#/components/schemas/Duration' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' eASFeature: $ref: '#/components/schemas/EASFeature' relocationPolicy: @@ -404,6 +408,7 @@ components: properties: bundleIdentifier: type: string + readOnly: true bundledEASIdentifier: type: string bundleType: -- GitLab From ebe3438516a8d559c0c6f58ba22f29fb7c397d2d Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sun, 29 Sep 2024 07:48:13 +0000 Subject: [PATCH 18/42] Update file 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 aeb4c6e10..c50d820f5 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -242,7 +242,7 @@ components: type: string readOnly: true eASSchedule: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindoewRo' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindowRo' eASGeographicalServiceArea: $ref: '#/components/schemas/GeoLoc' eASTopologicalServiceArea: -- GitLab From 528f2a6e85d0b6eab34c3b4a3a5042908f916b1e Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 17 Oct 2024 14:21:08 +0000 Subject: [PATCH 19/42] Update file TS28538_EdgeNrm.yaml --- OpenAPI/TS28538_EdgeNrm.yaml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index c50d820f5..b837ad30f 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -99,6 +99,13 @@ components: readOnly: true secCredential: type: string + Duration: + type: object + properties: + startTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + endTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' EASServicePermission: type: string description: any of enumerated value @@ -242,7 +249,7 @@ components: type: string readOnly: true eASSchedule: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindowRo' + $ref: '#/components/schemas/Duration' eASGeographicalServiceArea: $ref: '#/components/schemas/GeoLoc' eASTopologicalServiceArea: @@ -332,7 +339,7 @@ components: softwareImageInfo: $ref: '#/components/schemas/SoftwareImageInfo' eASSchedule: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + $ref: '#/components/schemas/Duration' eASFeature: $ref: '#/components/schemas/EASFeature' relocationPolicy: -- GitLab From 33967d9bd386e7e74c1a09c20a22c5b8d04b7a4c Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sun, 29 Sep 2024 08:25:46 +0000 Subject: [PATCH 20/42] Update file TS28536_CoslaNrm.yaml --- OpenAPI/TS28536_CoslaNrm.yaml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28536_CoslaNrm.yaml b/OpenAPI/TS28536_CoslaNrm.yaml index 54d2c5898..59d730ebb 100755 --- a/OpenAPI/TS28536_CoslaNrm.yaml +++ b/OpenAPI/TS28536_CoslaNrm.yaml @@ -33,30 +33,35 @@ components: AssuranceGoalStatusObserved: type: string + readOnly: true enum: - FULFILLED - NOT_FULFILLED AssuranceGoalStatusPredicted: type: string + readOnly: true enum: - FULFILLED - NOT_FULFILLED AssuranceTargetStatusObserved: type: string + readOnly: true enum: - FULFILLED - NOT_FULFILLED AssuranceTargetStatusPredicted: type: string + readOnly: true enum: - FULFILLED - NOT_FULFILLED AssuranceTargetName: type: string + readOnly: true AssuranceTarget: type: object @@ -65,6 +70,7 @@ components: $ref: '#/components/schemas/AssuranceTargetName' assuranceTargetValue: type: string + readOnly: true AssuranceTargetList: type: array @@ -76,14 +82,13 @@ components: properties: assuranceGoalStatusId: type: string + ReadOnly: true assuranceGoalId: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' assuranceGoalStatusObserved: $ref: '#/components/schemas/AssuranceGoalStatusObserved' assuranceGoalStatusPredicted: $ref: '#/components/schemas/AssuranceGoalStatusPredicted' - assuranceGoalRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' AssuranceGoalStatusList: type: array @@ -95,6 +100,7 @@ components: properties: assuranceTargetStatusId: type: string + readOnly: true assuranceTargetName: $ref: '#/components/schemas/AssuranceTargetName' assuranceTargetStatusObserved: @@ -196,6 +202,8 @@ components: properties: assuranceGoalStatusList: $ref: '#/components/schemas/AssuranceGoalStatusList' + assuranceGoalRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- -- GitLab From 9a2923b118cbe3a38affb895c644d5f8ae8ed3b6 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sun, 29 Sep 2024 08:29:52 +0000 Subject: [PATCH 21/42] Update file TS28536_CoslaNrm.yaml --- OpenAPI/TS28536_CoslaNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28536_CoslaNrm.yaml b/OpenAPI/TS28536_CoslaNrm.yaml index 59d730ebb..3848c2cd6 100755 --- a/OpenAPI/TS28536_CoslaNrm.yaml +++ b/OpenAPI/TS28536_CoslaNrm.yaml @@ -82,7 +82,7 @@ components: properties: assuranceGoalStatusId: type: string - ReadOnly: true + readOnly: true assuranceGoalId: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo' assuranceGoalStatusObserved: -- GitLab From 3f1c4fb1f3088d77c5fa89695f12f4c3893b1f7d Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sun, 29 Sep 2024 08:28:32 +0000 Subject: [PATCH 22/42] Update file TS28318_DsoNrm.yaml --- OpenAPI/TS28318_DsoNrm.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28318_DsoNrm.yaml b/OpenAPI/TS28318_DsoNrm.yaml index 7246dca06..1e03987dc 100644 --- a/OpenAPI/TS28318_DsoNrm.yaml +++ b/OpenAPI/TS28318_DsoNrm.yaml @@ -47,11 +47,13 @@ components: dsoRapidInterventionDuration: type: integer mnoInterventionTime: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTimeRo' mnoInterventionDuration: type: integer + readOnly: true mnoMaxServiceDuration: type: integer + readOnly: true affectedArea: $ref: '#/components/schemas/EnergyServiceLocation' isAffectedAreaPriority: -- GitLab From 8a130e6e70b4d2d4eeee342b82ca007fedf632bd Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 30 Sep 2024 02:32:51 +0000 Subject: [PATCH 23/42] Update 2 files - /OpenAPI/TS28541_5GcNrm.yaml - /OpenAPI/TS28541_SliceNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 28 ++++++++++++++++++++++++++-- OpenAPI/TS28541_SliceNrm.yaml | 4 +++- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index d3342c96a..1d477611b 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -446,15 +446,17 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/Arp' qosNotificationControl: type: boolean + default: false reflectiveQos: type: boolean + default: false sharingKeyDl: type: string sharingKeyUl: type: string maxPacketLossRateDl: $ref: 'TS29571_CommonData.yaml#/components/schemas/PacketLossRateRm' - maxPacketLossRateUl: + maxPacketLossRateUl:FlowStatus: $ref: 'TS29571_CommonData.yaml#/components/schemas/PacketLossRateRm' extMaxDataBurstVol: $ref: 'TS29571_CommonData.yaml#/components/schemas/ExtMaxDataBurstVolRm' @@ -494,6 +496,7 @@ components: minItems: 1 muteNotif: type: boolean + default: false trafficSteeringPolIdDl: type: string nullable: true @@ -506,6 +509,7 @@ components: $ref: 'TS29571_CommonData.yaml#/components/schemas/RouteToLocation' traffCorreInd: type: boolean + default: false upPathChgEvent: $ref: 'TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/UpPathChgEvent' steerFun: @@ -546,8 +550,10 @@ components: $ref: 'TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/AfSigProtocol' isAppRelocatable: type: boolean + default: false isUeAddrPreserved: type: boolean + deefault: false qosData: type: array items: @@ -582,6 +588,7 @@ components: $ref: '#/components/schemas/SnssaiInfo' isSubjectToNsac: type: boolean + default: false maxNumberofUEs: type: integer eACMode: @@ -590,10 +597,13 @@ components: enum: - INACTIVE - ACTIVE + default: INACTIVE activeEacThreshold: type: integer + default: 0 deactiveEacThreshold: type: integer + deefault: 100 numberofUEs: type: integer readOnly: true @@ -744,23 +754,31 @@ components: properties: proseDirectDiscovery: type: boolean + default: false proseDirectCommunication: type: boolean + default: false proseL2UetoNetworkRelay: type: boolean + default: false proseL3UetoNetworkRelay: type: boolean + default: false proseL2RemoteUe: type: boolean + default: false proseL3RemoteUe: type: boolean + default: false V2xCapability: type: object properties: lteV2x: type: boolean + default: false nrV2x: type: boolean + default: false InternalGroupIdRange: type: object properties: @@ -1372,7 +1390,7 @@ components: minItems: 1 mappingInd: type: boolean - default: False + default: false ExternalClientType: description: Indicates types of External Clients. anyOf: @@ -4786,12 +4804,15 @@ components: isEventTriggeredGtpUPathMonitoringSupported: type: boolean readOnly: true + default: true isPeriodicGtpUMonitoringSupported: type: boolean readOnly: true + default: true isImmediateGtpUMonitoringSupported: type: boolean readOnly: true + default: true gtpUPathDelayThresholds: $ref: '#/components/schemas/GtpUPathDelayThresholdsType' gtpUPathMinimumWaitTime: @@ -4826,12 +4847,15 @@ components: isEventTriggeredQFMonitoringSupported: type: boolean readOnly: true + default: true isPeriodicQFMonitoringSupported: type: boolean readOnly: true + default: true isSessionReleasedQFMonitoringSupported: type: boolean readOnly: true + default: true qFPacketDelayThresholds: $ref: '#/components/schemas/QFPacketDelayThresholdsType' qFMinimumWaitTime: diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 1dc47d0e4..ec145a216 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -765,7 +765,8 @@ components: RecommendationRequest: description: >- An attribute represents MnS consumer's request for recommended network slice related requirements. - type: boolean + type: boolean + default: false RecommendedRequirements: description: >- An attribute that specifies the recommended network slicing related requirements (i.e. ServiceProfile and SliceProfile information) which can be supported by the MnS producer.. @@ -775,6 +776,7 @@ components: description: >- An attribute represents MnS consumer's requirements for resource reservation. type: boolean + deefault: false RequestedReservationExpiration: description: >- An attribute which specifies MnS consuner's requirements for the validity period of the resource reservation. -- GitLab From b750babfb5de66ac12dbed0ced634f8a453af87d Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 30 Sep 2024 02:35:47 +0000 Subject: [PATCH 24/42] Update file TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index ec145a216..01625481f 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -776,7 +776,7 @@ components: description: >- An attribute represents MnS consumer's requirements for resource reservation. type: boolean - deefault: false + default: false RequestedReservationExpiration: description: >- An attribute which specifies MnS consuner's requirements for the validity period of the resource reservation. -- GitLab From ca57ca3f632f758a9f1c255e1aae6ccfb6ab4d8c Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 30 Sep 2024 02:39:04 +0000 Subject: [PATCH 25/42] Update file TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 1d477611b..50f585b2f 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -553,7 +553,7 @@ components: default: false isUeAddrPreserved: type: boolean - deefault: false + default: false qosData: type: array items: @@ -603,7 +603,7 @@ components: default: 0 deactiveEacThreshold: type: integer - deefault: 100 + default: 100 numberofUEs: type: integer readOnly: true -- GitLab From bd92df45636d89680a6b98bfdd567e14c6c4db50 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 30 Sep 2024 02:54:40 +0000 Subject: [PATCH 26/42] 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 50f585b2f..e5c4c0b3c 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -456,7 +456,7 @@ components: type: string maxPacketLossRateDl: $ref: 'TS29571_CommonData.yaml#/components/schemas/PacketLossRateRm' - maxPacketLossRateUl:FlowStatus: + maxPacketLossRateUl: $ref: 'TS29571_CommonData.yaml#/components/schemas/PacketLossRateRm' extMaxDataBurstVol: $ref: 'TS29571_CommonData.yaml#/components/schemas/ExtMaxDataBurstVolRm' -- GitLab From dec523dda6b1121de87e073c98b27e47d55c148d Mon Sep 17 00:00:00 2001 From: shixixi Date: Mon, 30 Sep 2024 04:21:19 +0000 Subject: [PATCH 27/42] Update TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index dcdb1648b..6639bb429 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -415,7 +415,6 @@ components: type: integer minimum: -1800 maximum: 1800 - RSSetId: type: integer maximum: 4194303 @@ -1280,6 +1279,8 @@ components: $ref: '#/components/schemas/DigitalAzimuth' digitalTilt: $ref: '#/components/schemas/DigitalTilt' + cCOParametersRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - type: object properties: Beam: -- GitLab From 5aa0d974edab82d3b004f124d189c9eeb783f5ed Mon Sep 17 00:00:00 2001 From: shixixi Date: Wed, 16 Oct 2024 14:04:51 +0000 Subject: [PATCH 28/42] Update TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 6639bb429..45a9d743c 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1278,13 +1278,24 @@ components: digitalAzimuth: $ref: '#/components/schemas/DigitalAzimuth' digitalTilt: - $ref: '#/components/schemas/DigitalTilt' - cCOParametersRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: '#/components/schemas/DigitalTilt' - type: object properties: Beam: $ref: '#/components/schemas/Beam-Multiple' + - type: object + properties: + CCOWeakCoverageParameters: + $ref: '#/components/schemas/CCOWeakCoverageParameters-Single' + - type: object + properties: + CCOPilotPollutionParameters: + $ref: '#/components/schemas/CCOWeakCoverageParameters-Single' + - type: object + properties: + CCOOvershootCoverageParameters: + $ref: '#/components/schemas/CCOOvershootCoverageParameters-Single' + Beam-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' -- GitLab From b8b1a9c40cb039663da5e8d6d2b298a30d237d31 Mon Sep 17 00:00:00 2001 From: shixixi Date: Thu, 17 Oct 2024 02:41:10 +0000 Subject: [PATCH 29/42] Update TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 45a9d743c..e8c99cf01 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1283,16 +1283,10 @@ components: properties: Beam: $ref: '#/components/schemas/Beam-Multiple' - - type: object - properties: CCOWeakCoverageParameters: $ref: '#/components/schemas/CCOWeakCoverageParameters-Single' - - type: object - properties: CCOPilotPollutionParameters: $ref: '#/components/schemas/CCOWeakCoverageParameters-Single' - - type: object - properties: CCOOvershootCoverageParameters: $ref: '#/components/schemas/CCOOvershootCoverageParameters-Single' -- GitLab From 4541bbb88f7c8d32e51ebb4e8e49466357692e7c Mon Sep 17 00:00:00 2001 From: zhaoxxian Date: Sun, 29 Sep 2024 06:19:47 +0000 Subject: [PATCH 30/42] Update file TS28538_EdgeNrm.yaml --- OpenAPI/TS28538_EdgeNrm.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index b837ad30f..480327878 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -123,6 +123,7 @@ components: enum: - ENABLED - DISABLED + - OVERLOAD_WARNING ResourceReservationRequirement: type: object properties: -- GitLab From db7cc3a13f31ab5f0cf67c7d9ab553ce5d1a13f2 Mon Sep 17 00:00:00 2001 From: shixixi Date: Sun, 29 Sep 2024 10:36:39 +0000 Subject: [PATCH 31/42] Update TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index e8c99cf01..0a4decc89 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -168,10 +168,19 @@ components: type: integer minimum: 0 maximum: 100 - numberOfPreamblesSent: - type: integer - minimum: 0 - maximum: 200 + maxNumberOfPreamblesSent: + enum: + - n3 + - n4 + - n5 + - n6 + - n7 + - n8 + - n10 + - n20 + - n50 + - n100 + - n200 UeAccDelayProbabilityDist: type: array -- GitLab From d61cd6b79928c9309927125769449a2fb42b57c8 Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Fri, 4 Oct 2024 10:33:24 +0000 Subject: [PATCH 32/42] Rel_19_CR0011_28.317_Enhance_the_isUnique_property_for_stage_3_OpenAPI --- OpenAPI/TS28317_RanScNrm.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/TS28317_RanScNrm.yaml b/OpenAPI/TS28317_RanScNrm.yaml index 3bc789c4f..39d8fa5b0 100644 --- a/OpenAPI/TS28317_RanScNrm.yaml +++ b/OpenAPI/TS28317_RanScNrm.yaml @@ -34,6 +34,7 @@ components: properties: nEInformation: type: array + uniqueItems: true items: $ref: '#/components/schemas/NEInfomration' description: >- -- GitLab From f6bf2d9d2fc48d695774b7b7b1811bba2f44de17 Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Fri, 4 Oct 2024 10:45:41 +0000 Subject: [PATCH 33/42] Rel_19_CR0103_28.536_Enhance_the_isUnique_property_for_stage_3_OpenAPI --- OpenAPI/TS28536_CoslaNrm.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OpenAPI/TS28536_CoslaNrm.yaml b/OpenAPI/TS28536_CoslaNrm.yaml index 3848c2cd6..fdb1c44cf 100755 --- a/OpenAPI/TS28536_CoslaNrm.yaml +++ b/OpenAPI/TS28536_CoslaNrm.yaml @@ -74,6 +74,7 @@ components: AssuranceTargetList: type: array + uniqueItems: true items: $ref: '#/components/schemas/AssuranceTarget' @@ -92,6 +93,7 @@ components: AssuranceGoalStatusList: type: array + uniqueItems: true items: $ref: '#/components/schemas/AssuranceGoalStatus' @@ -110,11 +112,13 @@ components: AssuranceTargetStatusList: type: array + uniqueItems: true items: $ref: '#/components/schemas/AssuranceTargetStatus' AttributeNameList: type: array + uniqueItems: true items: type: string -- GitLab From 72e7ee45c400839eb09fc3597c238fdd8daf3af1 Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Tue, 22 Oct 2024 06:29:10 +0000 Subject: [PATCH 34/42] Rel 19 cr0138 28.104 enhance the is unique property for stage 3 open api --- OpenAPI/TS28104_MdaNrm.yaml | 4 ++++ OpenAPI/TS28104_MdaReport.yaml | 1 + 2 files changed, 5 insertions(+) diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml index 89aa349ac..ffe182c4f 100644 --- a/OpenAPI/TS28104_MdaNrm.yaml +++ b/OpenAPI/TS28104_MdaNrm.yaml @@ -17,12 +17,14 @@ components: MDATypes: type: array + uniqueItems: true items: type: string readOnly: true MDAOutputs: type: array + uniqueItems: true items: $ref: '#/components/schemas/MDAOutputPerMDAType' @@ -45,6 +47,7 @@ components: type: string mDAOutputIEFilters: type: array + uniqueItems: true items: $ref: '#/components/schemas/MDAOutputIEFilter' @@ -78,6 +81,7 @@ components: properties: timeDurations: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' - type: object diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml index 846254169..4b76b47a4 100644 --- a/OpenAPI/TS28104_MdaReport.yaml +++ b/OpenAPI/TS28104_MdaReport.yaml @@ -23,6 +23,7 @@ components: readOnly: true mDAOutputList: type: array + uniqueItems: true items: $ref: '#/components/schemas/MDAOutputEntry' analyticsWindow: -- GitLab From 6d9159d869f9db597e20683c34bfc6d50eb6aa5b Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Tue, 22 Oct 2024 06:36:22 +0000 Subject: [PATCH 35/42] Rel 19 cr0251 28.312 enhance the is unique property for stage 3 open api --- OpenAPI/TS28312_IntentExpectations.yaml | 25 +++++++++++++++++++++++++ OpenAPI/TS28312_IntentNrm.yaml | 14 ++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 3938719ef..3d4b65c45 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -27,6 +27,7 @@ components: $ref: "#/components/schemas/RadioNetworkExpectationObject" expectationTargets: type: array + uniqueItems: true items: type: object oneOf: @@ -45,6 +46,7 @@ components: - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget' expectationContexts: type: array + uniqueItems: true items: type: object oneOf: @@ -65,6 +67,7 @@ components: $ref: "#/components/schemas/RadioServiceExpectationObject" expectationTargets: type: array + uniqueItems: true items: type: object oneOf: @@ -75,6 +78,7 @@ components: - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget' expectationContexts: type: array + uniqueItems: true items: $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context' required: @@ -92,6 +96,7 @@ components: $ref: '#/components/schemas/EdgeServiceSupportExpectationObject' expectationTargets: type: array + uniqueItems: true items: type: object oneOf: @@ -105,6 +110,7 @@ components: - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget' expectationContexts: type: array + uniqueItems: true items: type: object oneOf: @@ -126,10 +132,12 @@ components: $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb" expectationObjects: type: array + uniqueItems: true items: $ref: "#/components/schemas/5GCNetworkExpectationObject" expectationTargets: type: array + uniqueItems: true items: type: object oneOf: @@ -140,6 +148,7 @@ components: - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget" expectationContexts: type: array + uniqueItems: true items: type: object oneOf: @@ -164,6 +173,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' objectContexts: type: array + uniqueItems: true items: type: object oneOf: @@ -188,6 +198,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' objectContexts: type: array + uniqueItems: true items: type: object oneOf: @@ -207,6 +218,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' objectContexts: type: array + uniqueItems: true items: type: object oneOf: @@ -227,6 +239,7 @@ components: $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" objectContexts: type: array + uniqueItems: true items: type: object oneOf: @@ -812,6 +825,7 @@ components: - IS_ALL_OF contextValueRange: type: array + uniqueItems: true items: $ref: "TS28623_ComDefs.yaml#/components/schemas/Tac" PLMNContext: @@ -829,6 +843,7 @@ components: - IS_ALL_OF contextValueRange: type: array + uniqueItems: true items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' DlFrequencyContext: @@ -847,6 +862,7 @@ components: - IS_ALL_OF contextValueRange: type: array + uniqueItems: true items: $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Frequency' UlFrequencyContext: @@ -865,6 +881,7 @@ components: - IS_ALL_OF contextValueRange: type: array + uniqueItems: true items: $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Frequency' RATContext: @@ -883,6 +900,7 @@ components: - IS_ALL_OF contextValueRange: type: array + uniqueItems: true items: type: string enum: @@ -904,6 +922,7 @@ components: - IS_ALL_OF contextValueRange: type: array + uniqueItems: true items: $ref: "TS28312_IntentNrm.yaml#/components/schemas/UEGroup" EdgeIdentificationIdContext: @@ -951,6 +970,7 @@ components: - IS_ALL_OF contextValueRange: type: array + uniqueItems: true items: $ref: "TS28623_ComDefs.yaml#/components/schemas/Tac" NfTypeContext: @@ -968,6 +988,7 @@ components: - IS_ALL_OF contextValueRange: type: array + uniqueItems: true items: $ref: "TS28541_5GcNrm.yaml#/components/schemas/NFType" NfInstanceLocationContext: @@ -985,6 +1006,7 @@ components: - IS_ALL_OF contextValueRange: type: array + uniqueItems: true items: type: string TaiContext: @@ -1002,6 +1024,7 @@ components: - IS_ALL_OF contextValueRange: type: array + uniqueItems: true items: $ref: "TS28623_GenericNrm.yaml#/components/schemas/Tai" ServingScopeContext: @@ -1019,6 +1042,7 @@ components: - IS_ALL_OF contextValueRange: type: array + uniqueItems: true items: type: string DnnContext: @@ -1036,6 +1060,7 @@ components: - IS_ALL_OF contextValueRange: type: array + uniqueItems: true items: type: string #-------Definition of the scenario specific ObjectTarget dataType----------------# diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index c8d30316a..937bfea94 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -33,6 +33,7 @@ components: type: string intentExpectations: type: array + uniqueItems: true items: type: object oneOf: @@ -45,6 +46,7 @@ components: $ref: "#/components/schemas/Selectivity" intentContexts: type: array + uniqueItems: true items: $ref: '#/components/schemas/Context' description: >- @@ -82,6 +84,7 @@ components: $ref: '#/components/schemas/IntentFulfilmentReport' intentConflictReports: type: array + uniqueItems: true items: $ref: '#/components/schemas/IntentConflictReport' intentFeasibilityCheckReport: @@ -100,6 +103,7 @@ components: properties: intentHandlingCapabilityList: type: array + uniqueItems: true items: $ref: '#/components/schemas/IntentHandlingCapability' Intent: @@ -125,12 +129,14 @@ components: $ref: "#/components/schemas/ExpectationObject" expectationTargets: type: array + uniqueItems: true items: $ref: '#/components/schemas/ExpectationTarget' contextSelectivity: $ref: "#/components/schemas/Selectivity" expectationContexts: type: array + uniqueItems: true items: $ref: '#/components/schemas/Context' required: @@ -155,6 +161,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' objectContexts: type: array + uniqueItems: true items: $ref: '#/components/schemas/Context' description: >- @@ -216,6 +223,7 @@ components: $ref: "#/components/schemas/NotFulfilledState" notFulfilledReasons: type: array + uniqueItems: true items: type: string readOnly: true @@ -285,6 +293,7 @@ components: targetValueRange: oneOf: - type: array + uniqueItems: true items: $ref: "#/components/schemas/ValueRangeType" - $ref: "#/components/schemas/ValueRangeType" @@ -292,6 +301,7 @@ components: $ref: "#/components/schemas/Selectivity" targetContexts: type: array + uniqueItems: true items: $ref: '#/components/schemas/Context' description: It describes the list of constraints and conditions that should apply for a specific expectationTarget. @@ -310,6 +320,7 @@ components: contextValueRange: oneOf: - type: array + uniqueItems: true items: $ref: "#/components/schemas/ValueRangeType" - $ref: "#/components/schemas/ValueRangeType" @@ -326,6 +337,7 @@ components: $ref: '#/components/schemas/FulfilmentInfo' expectationFulfilmentResult: type: array + uniqueItems: true items: $ref: '#/components/schemas/ExpectationFulfilmentResult' #-------Definition of the concrete IntentFulfilmentReport dataType----------------# @@ -343,6 +355,7 @@ components: $ref: '#/components/schemas/FulfilmentInfo' targetFulfilmentResult: type: array + uniqueItems: true items: $ref: '#/components/schemas/TargetFulfilmentResult' #-------Definition of the concrete ExpectationFulfilmentResult dataType----------------# @@ -446,6 +459,7 @@ components: description: It describes the expectation object type which can be supported by a specific intent handling function of MnS producer. supportedExpectationTargetNames: type: array + uniqueItems: true items: type: string readOnly: true -- GitLab From 8fd289d361db87f6b8baac9d858d090efb109821 Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Fri, 4 Oct 2024 10:10:57 +0000 Subject: [PATCH 36/42] Rel_19_CR1380_28.541_OpenAPI_SS_Stage_3_for_energy_cost_mapping_rule --- OpenAPI/TS28541_NrNrm.yaml | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 0a4decc89..8583b27a0 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -991,6 +991,8 @@ components: $ref: '#/components/schemas/QceIdMappingInfoList' mdtUserConsentReqList: $ref: '#/components/schemas/MdtUserConsentReqList' + nRECMappingRuleRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -2101,6 +2103,22 @@ components: ephemerisInfos: $ref: '#/components/schemas/EphemerisInfos' + NRECMappingRule-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - type: object + properties: + ecMRInputMinimumValue: + type: integer + ecMRInputMaximumValue: + type: integer + ecTimeInterval: + type: integer + #-------- Definition of JSON arrays for name-contained IOCs ---------------------- GnbDuFunction-Multiple: @@ -2259,6 +2277,10 @@ components: type: array items: $ref: '#/components/schemas/EphemerisInfoSet-Single' + NRECMappingRule-Multiple: + type: array + items: + $ref: '#/components/schemas/NRECMappingRule-Single' #-------- Definitions in TS 28.541 for TS 28.532 --------------------------------- @@ -2326,4 +2348,4 @@ components: - $ref: '#/components/schemas/CCOOvershootCoverageParameters-Single' - $ref: '#/components/schemas/NTNFunction-Single' - $ref: '#/components/schemas/EphemerisInfoSet-Single' - + - $ref: '#/components/schemas/NRECMappingRule-Single' -- GitLab From ad007f960b9bb1c481b5be6be7cfd5e92bcbd5a6 Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Fri, 4 Oct 2024 09:25:42 +0000 Subject: [PATCH 37/42] Rel_19_CR1378_28.541_Correction_to_sliceAvailability_and_sliceSubnetAvailability --- OpenAPI/TS28541_SliceNrm.yaml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 01625481f..170a5b961 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -428,7 +428,9 @@ components: uLPktDelayVariation: $ref: '#/components/schemas/Float' sliceSubnetAvailability: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' + type: array + items: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' RANSliceSubnetProfile: type: object @@ -584,7 +586,9 @@ components: uLPktDelayVariation: $ref: '#/components/schemas/Float' sliceSubnetAvailability: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' + type: array + items: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' ServiceProfile: type: object @@ -681,7 +685,9 @@ components: uLPktDelayVariation: $ref: '#/components/schemas/Float' sliceAvailability: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' + type: array + items: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SchedulingTime' SliceProfile: type: object -- GitLab From 43cbe523e45f3b7a17a269bc95ae201e10bcde5e Mon Sep 17 00:00:00 2001 From: potherakallo Date: Thu, 3 Oct 2024 19:05:50 +0000 Subject: [PATCH 38/42] Correction for "NR Measurent Type" for " TraceControlNrm ". Update to be aligned with 3GPP TS 32.422 section 5.10.3 --- OpenAPI/TS28623_TraceControlNrm.yaml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index f2d85e495..75e49e2db 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -820,13 +820,16 @@ components: items: type: string enum: - - M1 - - M2 - - M3 - - M4 - - M5 - - M6 - - M7 + - M1_DL + - M2_DL + - M4_DL + - M4_UL + - M5_DL + - M5_UL + - M6_DL + - M6_UL + - M7_DL + - M7_UL - M1_EVENT_TRIGGERED - M8 - M9 -- GitLab From 6ef2eda3386a01557bd4e1e234dee9bb7385d9d5 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 24 Oct 2024 10:34:34 +0000 Subject: [PATCH 39/42] Rel19 TS28541 CR1306 correction to misalignment of stage 2 and stage 3 for... --- OpenAPI/TS28541_NrNrm.yaml | 56 +++++++++++--------------------------- 1 file changed, 16 insertions(+), 40 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 8583b27a0..150f47692 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -308,30 +308,9 @@ components: maximum: 65535 RemoteAddress: $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' - - CellIndividualOffset: - type: object - properties: - rsrpOffsetSSB: - type: integer - default: 0 - rsrqOffsetSSB: - type: integer - default: 0 - sinrOffsetSSB: - type: integer - default: 0 - rsrpOffsetCSI-RS: - type: integer - default: 0 - rsrqOffsetCSI-RS: - type: integer - default: 0 - sinrOffsetCSI-RS: - type: integer - default: 0 QOffsetRange: type: integer + default: 0 enum: - -24 - -22 @@ -364,21 +343,6 @@ components: - 3 - 2 - 1 - QOffsetRangeList: - type: object - properties: - rsrpOffsetSSB: - $ref: '#/components/schemas/QOffsetRange' - rsrqOffsetSSB: - $ref: '#/components/schemas/QOffsetRange' - sinrOffsetSSB: - $ref: '#/components/schemas/QOffsetRange' - rsrpOffsetCSI-RS: - $ref: '#/components/schemas/QOffsetRange' - rsrqOffsetCSI-RS: - $ref: '#/components/schemas/QOffsetRange' - sinrOffsetCSI-RS: - $ref: '#/components/schemas/QOffsetRange' QOffsetFreq: type: number default: 0 @@ -1375,7 +1339,11 @@ components: nRTCI: type: integer cellIndividualOffset: - $ref: '#/components/schemas/CellIndividualOffset' + type: array + items: + $ref: '#/components/schemas/QOffsetRange' + minItems: 6 + maxItems: 6 adjacentNRCellRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' nRFreqRelationRef: @@ -1412,7 +1380,11 @@ components: type: object properties: offsetMO: - $ref: '#/components/schemas/QOffsetRangeList' + type: array + items: + $ref: '#/components/schemas/QOffsetRange' + minItems: 6 + maxItems: 6 blockListEntry: type: array items: @@ -1475,7 +1447,11 @@ components: type: object properties: cellIndividualOffset: - $ref: '#/components/schemas/CellIndividualOffset' + type: array + items: + $ref: '#/components/schemas/QOffsetRange' + minItems: 6 + maxItems: 6 blackListEntry: type: array items: -- GitLab From 9909ffa857b91abced08bcda82b4884d6fc45a68 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 24 Oct 2024 15:12:41 +0000 Subject: [PATCH 40/42] This is to replace MR !1411, commit: 82c1fb9bc80f8339b06796d35786814c63791041 Update TS28538_EdgeNrm.yaml --- OpenAPI/TS28538_EdgeNrm.yaml | 58 ++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 480327878..9fb42f214 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -174,6 +174,27 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' servedEESList: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + SAP: + type: object + properties: + host: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/HostAddr' + port: + type: integer + Operation: + type: object + properties: + name: + type: string + allowedConsumers: + type: string + operationSemantics: + type: string + description: any of enumrated value + enum: + - REQUEST_RESPONSE + - SUBSCRIBE_NOTIFY + #-------- Definition of types for name-containments ------ SubNetwork-ncO-EdgeNrm: type: object @@ -185,6 +206,29 @@ components: EASBundle: $ref: '#/components/schemas/EASBundle-Multiple' +#-------- Definition of Edge common IOCs -------------------------------------------- + ManagedEdgeNFService-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + userLabel: + type: string + sAP: + $ref: '#/components/schemas/SAP' + operations: + type: array + items: + $ref: '#/components/schemas/Operation' + administrativeState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' + operationalState: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' +#-------- Definition of Edge common IOCs -------------------------------------------- + #-------- Definition of concrete IOCs -------------------------------------------- EdgeDataNetwork-Single: @@ -299,6 +343,10 @@ components: registrationInfo: $ref: '#/components/schemas/RegistrationInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: + ManagedEdgeNFService: + $ref: '#/components/schemas/ManagedEdgeNFService-Multiple' ECSFunction-Single: allOf: @@ -323,6 +371,10 @@ components: sharedECSInfo: $ref: '#/components/schemas/FederatedECSInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: + ManagedEdgeNFService: + $ref: '#/components/schemas/ManagedEdgeNFService-Multiple' EASRequirements-Single: allOf: @@ -473,6 +525,11 @@ components: type: array items: $ref: '#/components/schemas/EASBundle-Single' + ManagedEdgeNFService-Multiple: + type: array + items: + $ref: '#/components/schemas/ManagedEdgeNFService-Single' + #--------------------------------- Definition ------------------------------------ resources-edgeNrm: @@ -488,3 +545,4 @@ components: - $ref: '#/components/schemas/OperatorEdgeDataNetwork-Single' - $ref: '#/components/schemas/EASResourceReservationJob-Single' - $ref: '#/components/schemas/EASBundle-Single' + - $ref: '#/components/schemas/ManagedEdgeNFService-Single' -- GitLab From 851ff875c6ea5eef70c5e56165ce5a2d235bce27 Mon Sep 17 00:00:00 2001 From: sunse Date: Tue, 29 Oct 2024 01:25:56 +0000 Subject: [PATCH 41/42] Updating Rel19 and correct the URL for scripts repository, Update README.md --- README.md | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 7ded0d216..f4bd9cbd1 100644 --- a/README.md +++ b/README.md @@ -4,18 +4,20 @@ The Rel-16 branch represents the latest Rel-16 content approved and published af The Rel-17 branch represents the latest Rel-17 content approved and published after each TSG SA plenary. -Rel-18 branch represents the current working in progress release status. +The Rel-18 branch represents the latest Rel-18 content approved and published after each TSG SA plenary. -(c) 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). +The Rel-19 branch represents the current working in progress release status. + +(c) 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. -Branch {+Rel-18+} validation status: +Branch {+Rel-19+} validation status: [![pipeline status](https://forge.3gpp.org/rep/SA5/MnS/badges/Rel-18/pipeline.svg)](https://forge.3gpp.org/rep/SA5/MnS/commits/Rel-18) -## Data models validation +## Data models/Schema validation -The YANG data models in the present projects are validated by an automated CI agent. Learn more at: +The YANG data models and YAML Schema in the present projects are validated by an automated CI agent. Learn more at: * [Management And Orchestration APIs Wiki](https://forge.3gpp.org/rep/sa5/MnS/-/wikis/home) -* [Validation scripts repository](https://forge.3gpp.org/rep/tools/3gpp-scripts/sa5) +* [Validation scripts repository](https://forge.3gpp.org/rep/tools/3gpp-scripts/-/tree/master/sa5) -- GitLab From a60a1192b2769f2b14b00019c624f2d380dd38dc Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 4 Nov 2024 08:38:03 +0000 Subject: [PATCH 42/42] Update 2 files - /OpenAPI/TS28312_IntentNrm.yaml - /OpenAPI/TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 14 ++++++++++++++ OpenAPI/TS28312_IntentNrm.yaml | 8 +++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 3d4b65c45..cb25ced84 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -347,6 +347,13 @@ components: - IS_GREATER_THAN targetValueRange: type: integer + targetContexts: + type: array + items: + type: object + oneOf: + - $ref: '#/components/schemas/UlFrequencyContext' + - $ref: '#/components/schemas/RATContext' AveDLRANUEThptTarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for AveDLRANUEThptTarget.It describes the average @@ -364,6 +371,13 @@ components: - IS_GREATER_THAN targetValueRange: type: integer + targetContexts: + type: array + items: + type: object + oneOf: + - $ref: '#/components/schemas/DlFrequencyContext' + - $ref: '#/components/schemas/RATContext' LowULRANUEThptRatioTarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for LowULRANUEThptRatioTarget.It describes the low diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 937bfea94..24a7dbc0f 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -376,7 +376,13 @@ components: description: >- It describes the value that has been achieved for the expectation target at the time at which the report is generated. - readOnly: true + readOnly: true + targetContexts: + type: array + uniqueItems: true + items: + $ref: '#/components/schemas/Context' + #-------Definition of the concrete TargetFulfilmentResult dataType----------------# #-------Definition of the generic IntentConflictReport dataType----------------# -- GitLab