From 981bad3edbf1ceb2e78639fcb00bf8299f947394 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 3 Oct 2024 15:56:59 +0000 Subject: [PATCH 1/3] 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 ++ OpenAPI/TS28623_TraceControlNrm.yaml | 14 +++++++++++ 8 files changed, 50 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: diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index f2d85e495..0e0a0c39c 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -385,6 +385,7 @@ components: listOfNeTypes-Type: description: The Network Element types where Trace Session activation is needed. See 3GPP TS 32.422 clause 5.4 for additional details. type: array + uniqueItems: true items: type: string enum: @@ -423,6 +424,7 @@ components: listOfTraceMetrics: description: The trace metrics to be reported. See 3GPP TS 32.422 clause 10 for additional details. type: array + uniqueItems: true items: type: string @@ -973,6 +975,7 @@ components: plmnList-Type: description: See details in 3GPP TS 32.422 clause 5.10.24. type: array + uniqueItems: true items: type: object properties: @@ -1218,6 +1221,7 @@ components: sensorInformation-Type: description: See details in 3GPP TS 32.422 clause 5.10.29. type: array + uniqueItems: true items: type: string enum: @@ -1261,6 +1265,7 @@ components: excessPacketDelayThresholds-Type: description: Array of type excessPacketDelayThreshold-Type. type: array + uniqueItems: true items: $ref: '#/components/schemas/excessPacketDelayThreshold-Type' minItems: 0 @@ -1360,6 +1365,7 @@ components: $ref: '#/components/schemas/timeToTriggerL1-Type' mbsfnAreaList: type: array + uniqueItems: true items: $ref: '#/components/schemas/MbsfnArea' maxItems: 8 @@ -1371,11 +1377,13 @@ components: $ref: '#/components/schemas/eventListForEventTriggeredMeasurement-Type' areaConfigurationForNeighCell: type: array + uniqueItems: true items: $ref: '#/components/schemas/AreaConfig' maxItems: 32 nPNIdentityList: type: array + uniqueItems: true items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NpnId-Type' @@ -1387,6 +1395,7 @@ components: $ref: '#/components/schemas/anonymizationOfMdtData-Type' areaScope: type: array + uniqueItems: true items: $ref: '#/components/schemas/AreaScope' sensorInformation: @@ -1445,6 +1454,7 @@ components: $ref: '#/components/schemas/FreqInfo' pciList: type: array + uniqueItems: true items: type: integer FreqInfo: @@ -1455,6 +1465,7 @@ components: type: integer freqBands: type: array + uniqueItems: true items: type: integer MbsfnArea: @@ -1478,6 +1489,9 @@ components: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NpnId-Type' listOfTraceMetrics: type: array + uniqueItems: true + items: + type: string traceReportingConsumerUri: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' traceCollectionEntityIpAddress: -- GitLab From 72bf855456e20f762819ccf37312a1d2e190a160 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 4 Oct 2024 09:31:18 +0000 Subject: [PATCH 2/3] undo change to trace --- OpenAPI/TS28623_TraceControlNrm.yaml | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index 0e0a0c39c..b6edf69dc 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -385,7 +385,6 @@ components: listOfNeTypes-Type: description: The Network Element types where Trace Session activation is needed. See 3GPP TS 32.422 clause 5.4 for additional details. type: array - uniqueItems: true items: type: string enum: @@ -424,7 +423,6 @@ components: listOfTraceMetrics: description: The trace metrics to be reported. See 3GPP TS 32.422 clause 10 for additional details. type: array - uniqueItems: true items: type: string @@ -975,7 +973,6 @@ components: plmnList-Type: description: See details in 3GPP TS 32.422 clause 5.10.24. type: array - uniqueItems: true items: type: object properties: @@ -1221,7 +1218,6 @@ components: sensorInformation-Type: description: See details in 3GPP TS 32.422 clause 5.10.29. type: array - uniqueItems: true items: type: string enum: @@ -1265,7 +1261,6 @@ components: excessPacketDelayThresholds-Type: description: Array of type excessPacketDelayThreshold-Type. type: array - uniqueItems: true items: $ref: '#/components/schemas/excessPacketDelayThreshold-Type' minItems: 0 @@ -1365,7 +1360,6 @@ components: $ref: '#/components/schemas/timeToTriggerL1-Type' mbsfnAreaList: type: array - uniqueItems: true items: $ref: '#/components/schemas/MbsfnArea' maxItems: 8 @@ -1377,13 +1371,11 @@ components: $ref: '#/components/schemas/eventListForEventTriggeredMeasurement-Type' areaConfigurationForNeighCell: type: array - uniqueItems: true items: $ref: '#/components/schemas/AreaConfig' maxItems: 32 nPNIdentityList: type: array - uniqueItems: true items: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NpnId-Type' @@ -1395,7 +1387,6 @@ components: $ref: '#/components/schemas/anonymizationOfMdtData-Type' areaScope: type: array - uniqueItems: true items: $ref: '#/components/schemas/AreaScope' sensorInformation: @@ -1454,7 +1445,6 @@ components: $ref: '#/components/schemas/FreqInfo' pciList: type: array - uniqueItems: true items: type: integer FreqInfo: @@ -1465,7 +1455,6 @@ components: type: integer freqBands: type: array - uniqueItems: true items: type: integer MbsfnArea: @@ -1488,10 +1477,7 @@ components: nPNTarget: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NpnId-Type' listOfTraceMetrics: - type: array - uniqueItems: true - items: - type: string + type: string traceReportingConsumerUri: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' traceCollectionEntityIpAddress: -- GitLab From f323290bd3411d5d0df5eab9de5b8834912ee71d Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 4 Oct 2024 09:32:13 +0000 Subject: [PATCH 3/3] undo changes --- OpenAPI/TS28623_TraceControlNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index b6edf69dc..f2d85e495 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -1477,7 +1477,7 @@ components: nPNTarget: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NpnId-Type' listOfTraceMetrics: - type: string + type: array traceReportingConsumerUri: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' traceCollectionEntityIpAddress: -- GitLab