From 52d2fb3060f21e7b5e341bf9149a2e1df5b54a7b Mon Sep 17 00:00:00 2001 From: Jan Groenendijk Date: Fri, 14 Jan 2022 18:25:32 +0000 Subject: [PATCH 01/10] Update coslaNrm.yaml with AssuranceReport --- OpenAPI/coslaNrm.yaml | 60 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 49 insertions(+), 11 deletions(-) diff --git a/OpenAPI/coslaNrm.yaml b/OpenAPI/coslaNrm.yaml index e6a0ef13a..632b59d86 100755 --- a/OpenAPI/coslaNrm.yaml +++ b/OpenAPI/coslaNrm.yaml @@ -2,14 +2,14 @@ openapi: 3.0.2 info: title: coslaNrm - version: 16.4.0 + version: 17.1.0 description: OAS 3.0.1 specification of the Cosla NRM © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.536 V16.4.0; Cosla NRM + description: 3GPP TS 28.536 V17.1.0; Cosla NRM url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.536/ paths: {} @@ -62,16 +62,41 @@ components: type: string assuranceTargetValue: type: string + + AssuranceTargetList: + type: array + items: + $ref: '#/components/schemas/AssuranceTarget' + + AssuranceGoalStatus: + type: object + properties: + assuranceGoalStatusId: + type: string + assuranceGoalStatusObserved: + $ref: '#/components/schemas/AssuranceGoalStatusObserved' + assuranceGoalStatusPredicted: + $ref: '#/components/schemas/AssuranceGoalStatusPredicted' + + AssuranceGoalStatusList: + type: array + items: + $ref: '#/components/schemas/AssuranceGoalStatus' + + AssuranceTargetStatus: + type: object + properties: + assuranceTargetStatusId: + type: string assuranceTargetStatusObserved: $ref: '#/components/schemas/AssuranceTargetStatusObserved' assuranceTargetStatusPredicted: $ref: '#/components/schemas/AssuranceTargetStatusPredicted' - AssuranceTargetList: + AssuranceTargetStatusList: type: array items: - $ref: '#/components/schemas/AssuranceTarget' - + $ref: '#/components/schemas/AssuranceTargetStatus' #-------- Definition of concrete IOCs -------------------------------------------- @@ -133,10 +158,6 @@ components: $ref: '#/components/schemas/ObservationTime' assuranceTargetList: $ref: '#/components/schemas/AssuranceTargetList' - assuranceGoalStatusObserved: - $ref: '#/components/schemas/AssuranceGoalStatusObserved' - assuranceGoalStatusPredicted: - $ref: '#/components/schemas/AssuranceGoalStatusPredicted' serviceProfileId: type: string sliceProfileId: @@ -144,7 +165,23 @@ components: networkSliceRef: $ref: 'comDefs.yaml#/components/schemas/Dn' networkSliceSubnetRef: - $ref: 'comDefs.yaml#/components/schemas/Dn' + $ref: 'comDefs.yaml#/components/schemas/Dn' + + AssuranceReport-Single: + allOf: + - $ref: 'genericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - type: object + properties: + assuranceGoalStatusList: + $ref: '#/components/schemas/AssuranceGoalStatusList' + assuranceTargetStatusList: + $ref: '#/components/schemas/AssuranceTargetStatusList' + assuranceClosedControlLoopRef: + $ref: 'comDefs.yaml#/components/schemas/Dn' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -164,5 +201,6 @@ components: oneOf: - $ref: '#/components/schemas/AssuranceClosedControlLoop-Single' - $ref: '#/components/schemas/AssuranceGoal-Single' + - $ref: '#/components/schemas/AssuranceReport-Single' - $ref: '#/components/schemas/SubNetwork-Single' - - $ref: '#/components/schemas/ManagedElement-Single' \ No newline at end of file + - $ref: '#/components/schemas/ManagedElement-Single' -- GitLab From 310e3fac613092d2131d2f0819f25f73e945a9ce Mon Sep 17 00:00:00 2001 From: Jan Groenendijk Date: Thu, 27 Jan 2022 16:01:36 +0000 Subject: [PATCH 02/10] Update coslaNrm.yaml for Tdoc S5-221588d1 --- OpenAPI/coslaNrm.yaml | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/OpenAPI/coslaNrm.yaml b/OpenAPI/coslaNrm.yaml index 632b59d86..0ab7bc6c4 100755 --- a/OpenAPI/coslaNrm.yaml +++ b/OpenAPI/coslaNrm.yaml @@ -66,28 +66,34 @@ components: AssuranceTargetList: type: array items: - $ref: '#/components/schemas/AssuranceTarget' + $ref: '#/components/schemas/AssuranceTarget' AssuranceGoalStatus: type: object properties: assuranceGoalStatusId: type: string + assuranceGoalDn: + $ref: 'comDefs.yaml#/components/schemas/Dn' assuranceGoalStatusObserved: $ref: '#/components/schemas/AssuranceGoalStatusObserved' assuranceGoalStatusPredicted: $ref: '#/components/schemas/AssuranceGoalStatusPredicted' - + assuranceGoalRef: + $ref: 'comDefs.yaml#/components/schemas/Dn' + AssuranceGoalStatusList: type: array items: - $ref: '#/components/schemas/AssuranceGoalStatus' + $ref: '#/components/schemas/AssuranceGoalStatus' AssuranceTargetStatus: type: object properties: assuranceTargetStatusId: type: string + assuranceTargetName: + $ref: '#/components/schemas/AssuranceTargetName' assuranceTargetStatusObserved: $ref: '#/components/schemas/AssuranceTargetStatusObserved' assuranceTargetStatusPredicted: @@ -144,6 +150,10 @@ components: $ref: '#/components/schemas/ControlLoopLifeCyclePhase' AssuranceGoal: $ref: '#/components/schemas/AssuranceGoal-Multiple' + networkSliceRef: + $ref: 'comDefs.yaml#/components/schemas/Dn' + networkSliceSubnetRef: + $ref: 'comDefs.yaml#/components/schemas/Dn' AssuranceGoal-Single: allOf: @@ -162,11 +172,7 @@ components: type: string sliceProfileId: type: string - networkSliceRef: - $ref: 'comDefs.yaml#/components/schemas/Dn' - networkSliceSubnetRef: - $ref: 'comDefs.yaml#/components/schemas/Dn' - + AssuranceReport-Single: allOf: - $ref: 'genericNrm.yaml#/components/schemas/Top' @@ -178,10 +184,7 @@ components: properties: assuranceGoalStatusList: $ref: '#/components/schemas/AssuranceGoalStatusList' - assuranceTargetStatusList: - $ref: '#/components/schemas/AssuranceTargetStatusList' - assuranceClosedControlLoopRef: - $ref: 'comDefs.yaml#/components/schemas/Dn' + #-------- Definition of JSON arrays for name-contained IOCs ---------------------- -- GitLab From ad251b2ca57cbb806306e86899aa96b2c4870641 Mon Sep 17 00:00:00 2001 From: Jan Groenendijk Date: Fri, 28 Jan 2022 13:14:45 +0000 Subject: [PATCH 03/10] Update coslaNrm.yaml S5-221588d2 --- OpenAPI/coslaNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/coslaNrm.yaml b/OpenAPI/coslaNrm.yaml index 0ab7bc6c4..37cd2dfe2 100755 --- a/OpenAPI/coslaNrm.yaml +++ b/OpenAPI/coslaNrm.yaml @@ -93,7 +93,7 @@ components: assuranceTargetStatusId: type: string assuranceTargetName: - $ref: '#/components/schemas/AssuranceTargetName' + type: string assuranceTargetStatusObserved: $ref: '#/components/schemas/AssuranceTargetStatusObserved' assuranceTargetStatusPredicted: -- GitLab From 2ee65db07880eb966f489bfdacc9ade8a2af3761 Mon Sep 17 00:00:00 2001 From: Jan Groenendijk Date: Fri, 28 Jan 2022 14:12:44 +0000 Subject: [PATCH 04/10] Update coslaNrm.yaml update added AssuranceTargetName definition --- OpenAPI/coslaNrm.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/OpenAPI/coslaNrm.yaml b/OpenAPI/coslaNrm.yaml index 37cd2dfe2..ad5d5dcb6 100755 --- a/OpenAPI/coslaNrm.yaml +++ b/OpenAPI/coslaNrm.yaml @@ -54,12 +54,15 @@ components: enum: - FULFILLED - NOT_FULFILLED - + + AssuranceTargetName: + type: string + AssuranceTarget: type: object properties: assuranceTargetName: - type: string + $ref: '#/components/schemas/AssuranceTargetName' assuranceTargetValue: type: string @@ -93,7 +96,7 @@ components: assuranceTargetStatusId: type: string assuranceTargetName: - type: string + $ref: '#/components/schemas/AssuranceTargetName' assuranceTargetStatusObserved: $ref: '#/components/schemas/AssuranceTargetStatusObserved' assuranceTargetStatusPredicted: -- GitLab From 178515f16910c04f8f694b855bc24f02c5b5b656 Mon Sep 17 00:00:00 2001 From: Jan Groenendijk Date: Fri, 28 Jan 2022 14:49:52 +0000 Subject: [PATCH 05/10] Update coslaNrm.yaml changed assuranceGoalDn to assuranceGoalId --- OpenAPI/coslaNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/coslaNrm.yaml b/OpenAPI/coslaNrm.yaml index ad5d5dcb6..310218dcd 100755 --- a/OpenAPI/coslaNrm.yaml +++ b/OpenAPI/coslaNrm.yaml @@ -76,7 +76,7 @@ components: properties: assuranceGoalStatusId: type: string - assuranceGoalDn: + assuranceGoalId: $ref: 'comDefs.yaml#/components/schemas/Dn' assuranceGoalStatusObserved: $ref: '#/components/schemas/AssuranceGoalStatusObserved' -- GitLab From 070e88266a679dc28550ff0d2bed5883ecb59b5b Mon Sep 17 00:00:00 2001 From: pollakowskio Date: Thu, 19 May 2022 11:13:22 +0000 Subject: [PATCH 06/10] Update comDefs.yaml --- OpenAPI/comDefs.yaml | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/OpenAPI/comDefs.yaml b/OpenAPI/comDefs.yaml index d16f02ac3..70ef07f8c 100755 --- a/OpenAPI/comDefs.yaml +++ b/OpenAPI/comDefs.yaml @@ -56,12 +56,54 @@ components: Tac: type: string pattern: '(^[A-Fa-f0-9]{4}$)|(^[A-Fa-f0-9]{6}$)' + UtraCellId: + type: integer EutraCellId: type: string pattern: '^[A-Fa-f0-9]{7}$' NrCellId: type: string pattern: '^[A-Fa-f0-9]{9}$' + TimeWindow: + type: object + properties: + startTime: + $ref: '#/components/schemas/DateTime' + endTime: + $ref: '#/components/schemas/DateTime' + GeoCoordinate: + type: object + properties: + latitude: + $ref: '#/components/schemas/Latitude' + longitude: + $ref: '#/components/schemas/Longitude' + ConvexGeoPolygon: + type: array + items: + $ref: '#/components/schemas/GeoCoordinate' + GeoAreaToCellMapping: + type: object + properties: + convexGeoPolygon: + $ref: '#/components/schemas/ConvexGeoPolygon' + associationThreshold: + type: integer + AreaOfInterest: + oneOf: + - $ref: '#/components/schemas/GeoAreaToCellMapping' + - type: array + items: + $ref: 'genericNrm.yaml#/components/schemas/Tai' + - type: array + items: + $ref: '#/components/schemas/NrCellId' + - type: array + items: + $ref: '#/components/schemas/EutraCellId' + - type: array + items: + $ref: '#/components/schemas/UtraCellId' Fqdn: type: string -- GitLab From 604886080629f710f25e09e8a1fc5641d90d2e34 Mon Sep 17 00:00:00 2001 From: pollakowskio Date: Thu, 19 May 2022 11:23:19 +0000 Subject: [PATCH 07/10] Update genericNrm.yaml --- OpenAPI/genericNrm.yaml | 82 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 76 insertions(+), 6 deletions(-) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index 8e3015099..c2c6c220e 100755 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -322,7 +322,37 @@ components: oneOf: - $ref: 'comDefs.yaml#/components/schemas/Ipv4Addr' - $ref: 'comDefs.yaml#/components/schemas/Ipv6Addr' - + ManagementData: + oneOf: + - type: array + items: + type: string + enum: + - COVERAGE + - CAPACITY + - ENERGY_EFFICIENCY + - MOBILITY + - ACCESSIBILITY + - type: array + items: + type: string + NodeFilter: + type: object + properties: + areaOfInterest: + $ref: 'comDefs.yaml#/components/schemas/AreaOfInterest' + networkDomain: + type: string + enum: + - CN + - RAN + cpUpType: + type: string + enum: + - CP + - UP + sst: + type: integer #-------- Definition of types used in Trace control NRM fragment------------------ @@ -1312,6 +1342,10 @@ components: type: array items: $ref: '#/components/schemas/SupportedPerfMetricGroup' + supportedTraceMetrics: + type: array + items: + type: string ManagedElement-Attr: type: object properties: @@ -1339,6 +1373,10 @@ components: type: array items: $ref: '#/components/schemas/SupportedPerfMetricGroup' + supportedTraceMetrics: + type: array + items: + type: string SubNetwork-ncO: type: object @@ -1353,10 +1391,12 @@ components: $ref: '#/components/schemas/PerfMetricJob-Multiple' ThresholdMonitor: $ref: '#/components/schemas/ThresholdMonitor-Multiple' - NtfSubscriptionControl: - $ref: '#/components/schemas/NtfSubscriptionControl-Multiple' TraceJob: $ref: '#/components/schemas/TraceJob-Multiple' + ManagementDataCollection: + $ref: '#/components/schemas/ManagementDataCollection-Multiple' + NtfSubscriptionControl: + $ref: '#/components/schemas/NtfSubscriptionControl-Multiple' AlarmList: $ref: '#/components/schemas/AlarmList-Single' FileDownloadJob: @@ -1374,10 +1414,10 @@ components: $ref: '#/components/schemas/PerfMetricJob-Multiple' ThresholdMonitor: $ref: '#/components/schemas/ThresholdMonitor-Multiple' - NtfSubscriptionControl: - $ref: '#/components/schemas/NtfSubscriptionControl-Multiple' TraceJob: $ref: '#/components/schemas/TraceJob-Multiple' + NtfSubscriptionControl: + $ref: '#/components/schemas/NtfSubscriptionControl-Multiple' AlarmList: $ref: '#/components/schemas/AlarmList-Single' FileDownloadJob: @@ -1406,6 +1446,10 @@ components: type: array items: $ref: '#/components/schemas/SupportedPerfMetricGroup' + supportedTraceMetrics: + type: array + items: + type: string EP_RP-Attr: type: object properties: @@ -1720,6 +1764,27 @@ components: $ref: '#/components/schemas/TraceJob-Attr' Files: $ref: '#/components/schemas/Files-Multiple' + ManagementDataCollection-Single: + allOf: + - $ref: '#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + managementData: + $ref: '#/components/schemas/ManagementData' + targetNodeFilter: + $ref: '#/components/schemas/NodeFilter' + collectionTimeWindow: + $ref: 'comDefs.yaml#/components/schemas/TimeWindow' + reportingCtrl: + type: string + dataScope: + type: string + enum: + - SNSSAI + - 5QI AlarmList-Single: allOf: - $ref: '#/components/schemas/Top' @@ -1868,6 +1933,10 @@ components: type: array items: $ref: '#/components/schemas/TraceJob-Single' + ManagementDataCollection-Multiple: + type: array + items: + $ref: '#/components/schemas/ManagementDataCollection-Single' NtfSubscriptionControl-Multiple: type: array items: @@ -1905,7 +1974,8 @@ components: - $ref: '#/components/schemas/PerfMetricJob-Single' - $ref: '#/components/schemas/ThresholdMonitor-Single' - $ref: '#/components/schemas/TraceJob-Single' - + - $ref: '#/components/schemas/ManagementDataCollection-Single' + - $ref: '#/components/schemas/NtfSubscriptionControl-Single' - $ref: '#/components/schemas/HeartbeatControl-Single' -- GitLab From 75ab5095ba34b64539203a54b8fe136c454d62dd Mon Sep 17 00:00:00 2001 From: sunse Date: Tue, 21 Jun 2022 07:48:44 +0000 Subject: [PATCH 08/10] fix validation issue Update TS28623_ComDefs.yaml --- OpenAPI/TS28623_ComDefs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index 6fd05c608..b962d1032 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -94,7 +94,7 @@ components: - $ref: '#/components/schemas/GeoAreaToCellMapping' - type: array items: - $ref: 'TS28623_GgenericNrm.yaml#/components/schemas/Tai' + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' - type: array items: $ref: '#/components/schemas/NrCellId' -- GitLab From e1afb8f22e73039a71545017d528e545d577d9fa Mon Sep 17 00:00:00 2001 From: sunse Date: Tue, 21 Jun 2022 07:50:45 +0000 Subject: [PATCH 09/10] fix validation issue Update TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 3d96096cf..adfc72fd6 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -1907,7 +1907,7 @@ components: targetNodeFilter: $ref: '#/components/schemas/NodeFilter' collectionTimeWindow: - $ref: 'comDefs.yaml#/components/schemas/TimeWindow' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' reportingCtrl: type: string dataScope: -- GitLab From 9e606d2d9bdbbcc042ac3cd66b2830a2a1bdeecc Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 23 Jun 2022 06:14:58 +0000 Subject: [PATCH 10/10] fix validation issue Update 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 53ac2fda2..a73832385 100755 --- a/OpenAPI/TS28536_CoslaNrm.yaml +++ b/OpenAPI/TS28536_CoslaNrm.yaml @@ -211,7 +211,7 @@ components: AssuranceReport-Single: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/Top' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object properties: attributes: -- GitLab