From 0a0de0c7f10cbc9f9c386bfcbc8908abe0746fc2 Mon Sep 17 00:00:00 2001 From: allwang Date: Fri, 14 May 2021 18:11:04 +0200 Subject: [PATCH 01/29] 28.623_Rel16_CR0127_Correction_Trace_MDT_related_parameters --- OpenAPI/genericNrm.yaml | 172 ++++++++++++++++++++++++++-------------- 1 file changed, 114 insertions(+), 58 deletions(-) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index aedf3c4fb..31b216550 100644 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -214,6 +214,57 @@ components: - BASE_SUBTREE scopeLevel: type: integer + AreaScope: + oneOf: + - type: array + items: + $ref: 'comDefs.yaml#/components/schemas/EutraCellId' + - type: array + items: + $ref: 'comDefs.yaml#/components/schemas/NrCellId' + - type: array + items: + $ref: 'comDefs.yaml#/components/schemas/Tac' + - type: array + items: + $ref: '#/components/schemas/Tai' + Tai: + type: object + properties: + mcc: + $ref: 'comDefs.yaml#/components/schemas/Mcc' + mnc: + $ref: 'comDefs.yaml#/components/schemas/Mnc' + tac: + $ref: 'comDefs.yaml#/components/schemas/Tac' + AreaConfig: + type: object + properties: + freqInfo: + $ref: '#/components/schemas/FreqInfo' + pciList: + type: array + items: + type: integer + FreqInfo: + description: specifies the carrier frequency and bands used in a cell. + type: object + properties: + arfcn: + type: integer + freqBands: + type: array + items: + type: integer + MbsfnArea: + type: object + properties: + mbsfnAreaId: + type: integer + minimum: 1 + earfcn: + type: integer + minimum: 1 #-------- Definition of types used in Trace control NRM fragment------------------ @@ -590,17 +641,6 @@ components: - mcc - mnc - tjStreamingTraceConsumerURI-Type: - type: string - description: The URI of the Trace Reporting MnS consumer (see 3GPP TS 28.532) to which the Trace records shall be sent. See 3GPP TS 32.422 clause 5.9 for additional details. - format: uri - - tjTraceCollectionEntityAddress-Type: - description: The IP address to which the Trace records shall be transferred. See 3GPP TS 32.422 clause 5.9 for additional details. - oneOf: - - $ref: '#/components/schemas/Ipv4Addr' - - $ref: '#/components/schemas/Ipv6Addr' - tjTraceDepth-Type: description: Specifies how detailed information should be recorded in the Network Element. The Trace Depth is a paremeter for Trace Session level, i.e., the Trace Depth is the same for all of the NEs to be traced in the same Trace Session. See 3GPP TS 32.422 clause 5.3 for additional details. type: string @@ -621,7 +661,7 @@ components: mnc: $ref: 'comDefs.yaml#/components/schemas/Mnc' traceId: - type: integer + type: string required: - mcc - mnc @@ -690,22 +730,6 @@ components: - NO_IDENTITY - TAC_OF_IMEI - tjMDTAreaConfigurationForNeighCell-Type: - description: Used for logged NR MDT and defines the area for which UE is requested to perform measurement logging for neighbour cells which have list of frequencies. For additional details see 3GPP TS 32.422 clause 5.10.26. - type: array - items: - type: object - properties: - frequency: - type: string - cell: - type: string - - tjMDTAreaScope-Type: - description: defines the area in terms or Cells or Tracking Area/Routing Area/Location Area where the MDT data collection shall take place. For additional details see 3GPP TS 32.422 clause 5.10.2. - allOf: - - $ref: 'comDefs.yaml#/components/schemas/DnList' - tjMDTCollectionPeriodRrmLte-Type: description: See details in 3GPP TS 32.422 clause 5.10.20. type: string @@ -726,6 +750,21 @@ components: - 32000ms - 64000ms + tjMDTCollectionPeriodM6Lte-Type: + description: See details in 3GPP TS 32.422 clause 5.10.32. + type: string + enum: + - 1024ms + - 2048ms + - 5120ms + - 10240ms + + tjMDTCollectionPeriodM7Lte-Type: + description: See details in 3GPP TS 32.422 clause 5.10.33. + type: integer + minimum: 1 + maximum: 60 + tjMDTCollectionPeriodRrmUmts-Type: description: See details in 3GPP TS 32.422 clause 5.10.21. type: string @@ -749,6 +788,31 @@ components: - 10240ms - 60000ms + tjMDTCollectionPeriodM6NR-Type: + description: See details in 3GPP TS 32.422 clause 5.10.34. + type: string + enum: + - 120ms + - 240ms + - 480ms + - 640ms + - 1024ms + - 2048ms + - 5120ms + - 10240ms + - 20480ms + - 40960ms + - 1min + - 6min + - 12min + - 30min + + tjMDTCollectionPeriodM7NR-Type: + description: See details in 3GPP TS 32.422 clause 5.10.35. + type: integer + minimum: 1 + maximum: 60 + tjMDTEventListForTriggeredMeasurement-Type: description: See details in 3GPP TS 32.422 clause 5.10.28. type: string @@ -860,22 +924,6 @@ components: - 40.96s - 61.44s - tjMDTMBSFNAreaList-Type: - description: See details in 3GPP TS 32.422 clause 5.10.25. - type: array - items: - type: object - properties: - mbsfnAreaId: - type: integer - minimum: 1 - earfcn: - type: integer - minimum: 1 - required: - - mbsfnAreaId - - earfcn - tjMDTMeasurementPeriodLTE-Type: description: See details in 3GPP TS 32.422 clause 5.10.23. type: string @@ -1033,8 +1081,8 @@ components: - mnc tceAddress: oneOf: - - $ref: '#/components/schemas/tjTraceCollectionEntityAddress-Type' - - $ref: '#/components/schemas/tjStreamingTraceConsumerURI-Type' + - $ref: 'comDefs.yaml#/components/schemas/IpAddress' + - $ref: 'comDefs.yaml#/components/schemas/Uri' required: - tceID - tcePLMN @@ -1188,14 +1236,16 @@ components: $ref: '#/components/schemas/tjListOfNeTypes-Type' tjPLMNTarget: $ref: '#/components/schemas/tjPLMNTaget-Type' - tjTraceConsumer: - oneOf: - - $ref: '#/components/schemas/tjStreamingTraceConsumerURI-Type' - - $ref: '#/components/schemas/tjTraceCollectionEntityAddress-Type' + tjStreamingTraceConsumerURI: + $ref: 'comDefs.yaml#/components/schemas/Uri' + tjTraceCollectionEntityAddress: + $ref: 'comDefs.yaml#/components/schemas/IpAddress' tjTraceDepth: $ref: '#/components/schemas/tjTraceDepth-Type' tjTraceReference: $ref: '#/components/schemas/tjTraceReference-Type' + tjTraceRecordSessionReference: + type: string tjTraceReportingFormat: $ref: '#/components/schemas/tjTraceReportingFormat-Type' tjTraceTarget: @@ -1207,13 +1257,23 @@ components: tjMDTAreaConfigurationForNeighCell: $ref: '#/components/schemas/tjMDTAreaConfigurationForNeighCell-Type' tjMDTAreaScope: - $ref: '#/components/schemas/tjMDTAreaScope-Type' + type: array + items: + $ref: '#/components/schemas/AreaScope' tjMDTCollectionPeriodRrmLte: $ref: '#/components/schemas/tjMDTCollectionPeriodRrmLte-Type' + tjMDTCollectionPeriodM6Lte: + $ref: '#/components/schemas/tjMDTCollectionPeriodM6Lte-Type' + tjMDTCollectionPeriodM7Lte: + $ref: '#/components/schemas/tjMDTCollectionPeriodM7Lte-Type' tjMDTCollectionPeriodRrmUmts: $ref: '#/components/schemas/tjMDTCollectionPeriodRrmUmts-Type' tjMDTCollectionPeriodRrmNR: $ref: '#/components/schemas/tjMDTCollectionPeriodRrmNR-Type' + tjMDTCollectionPeriodM6NR: + $ref: '#/components/schemas/tjMDTCollectionPeriodM6NR-Type' + tjMDTCollectionPeriodM7NR: + $ref: '#/components/schemas/tjMDTCollectionPeriodM7NR-Type' tjMDTEventListForTriggeredMeasurement: $ref: '#/components/schemas/tjMDTEventListForTriggeredMeasurement-Type' tjMDTEventThreshold: @@ -1225,7 +1285,9 @@ components: tjMDTLoggingInterval: $ref: '#/components/schemas/tjMDTLoggingInterval-Type' tjMDTMBSFNAreaList: - $ref: '#/components/schemas/tjMDTMBSFNAreaList-Type' + type: array + items: + $ref: '#/components/schemas/MbsfnArea' tjMDTMeasurementPeriodLTE: $ref: '#/components/schemas/tjMDTMeasurementPeriodLTE-Type' tjMDTMeasurementPeriodUMTS: @@ -1248,12 +1310,6 @@ components: $ref: '#/components/schemas/tjMDTSensorInformation-Type' tjMDTTraceCollectionEntityID: $ref: '#/components/schemas/tjMDTTraceCollectionEntityID-Type' - required: - - tjJobType - - tjTraceReference - - tjTraceConsumer - - tjTraceReportingFormat - - tjTraceTarget ManagedFunction-ncO: type: object -- GitLab From 0d32b9b0d23ae55ee8ce584584cbcbb587afe77f Mon Sep 17 00:00:00 2001 From: allwang Date: Fri, 14 May 2021 18:14:59 +0200 Subject: [PATCH 02/29] Update comDefs.yaml --- OpenAPI/comDefs.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/OpenAPI/comDefs.yaml b/OpenAPI/comDefs.yaml index fb6d7f4db..b0649dd7c 100644 --- a/OpenAPI/comDefs.yaml +++ b/OpenAPI/comDefs.yaml @@ -43,6 +43,15 @@ components: required: - mcc - mnc + Tac: + type: string + pattern: '(^[A-Fa-f0-9]{4}$)|(^[A-Fa-f0-9]{6}$)' + EutraCellId: + type: string + pattern: '^[A-Fa-f0-9]{7}$' + NrCellId: + type: string + pattern: '^[A-Fa-f0-9]{9}$' Fqdn: type: string @@ -65,6 +74,12 @@ components: - pattern: '^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))(\/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))$' - pattern: '^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))(\/.+)$' example: '2001:db8:abcd:12::0/64' + IpAddr: + oneOf: + - $ref: '#/components/schemas/Ipv4Addr' + - $ref: '#/components/schemas/Ipv6Addr' + Uri: + type: string AdministrativeState: type: string -- GitLab From f5825f6eedb863112d57ccb5aeac4fd08ff2ea47 Mon Sep 17 00:00:00 2001 From: allwang Date: Fri, 14 May 2021 18:15:32 +0200 Subject: [PATCH 03/29] Update comDefs.yaml --- OpenAPI/comDefs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/comDefs.yaml b/OpenAPI/comDefs.yaml index b0649dd7c..72809a771 100644 --- a/OpenAPI/comDefs.yaml +++ b/OpenAPI/comDefs.yaml @@ -43,7 +43,7 @@ components: required: - mcc - mnc - Tac: + Tac: type: string pattern: '(^[A-Fa-f0-9]{4}$)|(^[A-Fa-f0-9]{6}$)' EutraCellId: -- GitLab From b9c05434592b1001af6151d390847d88ed74fd9f Mon Sep 17 00:00:00 2001 From: allwang Date: Fri, 14 May 2021 19:04:31 +0200 Subject: [PATCH 04/29] Update comDefs.yaml --- OpenAPI/comDefs.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/OpenAPI/comDefs.yaml b/OpenAPI/comDefs.yaml index 72809a771..4e0ddf86c 100644 --- a/OpenAPI/comDefs.yaml +++ b/OpenAPI/comDefs.yaml @@ -55,8 +55,6 @@ components: Fqdn: type: string - Uri: - type: string Ipv4Addr: type: string -- GitLab From f36f364fd482325d6b8b824b7166aa9a5b9c11dc Mon Sep 17 00:00:00 2001 From: allwang Date: Fri, 14 May 2021 19:09:16 +0200 Subject: [PATCH 05/29] Update genericNrm.yaml --- OpenAPI/genericNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index 31b216550..90dc15069 100644 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -1081,7 +1081,7 @@ components: - mnc tceAddress: oneOf: - - $ref: 'comDefs.yaml#/components/schemas/IpAddress' + - $ref: 'comDefs.yaml#/components/schemas/IpAddr' - $ref: 'comDefs.yaml#/components/schemas/Uri' required: - tceID @@ -1239,7 +1239,7 @@ components: tjStreamingTraceConsumerURI: $ref: 'comDefs.yaml#/components/schemas/Uri' tjTraceCollectionEntityAddress: - $ref: 'comDefs.yaml#/components/schemas/IpAddress' + $ref: 'comDefs.yaml#/components/schemas/IpAddr' tjTraceDepth: $ref: '#/components/schemas/tjTraceDepth-Type' tjTraceReference: -- GitLab From 2bd18073600882b4585cf240e0959ecbec5cb8c9 Mon Sep 17 00:00:00 2001 From: allwang Date: Fri, 14 May 2021 19:14:54 +0200 Subject: [PATCH 06/29] Update genericNrm.yaml --- OpenAPI/genericNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index 90dc15069..82293058f 100644 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -1255,7 +1255,7 @@ components: tjMDTAnonymizationOfData: $ref: '#/components/schemas/tjMDTAnonymizationOfData-Type' tjMDTAreaConfigurationForNeighCell: - $ref: '#/components/schemas/tjMDTAreaConfigurationForNeighCell-Type' + $ref: '#/components/schemas/AreaConfig' tjMDTAreaScope: type: array items: -- GitLab From 9c98f3f31f8ca6a881d718f68f08a382199c6f4a Mon Sep 17 00:00:00 2001 From: allwang Date: Fri, 14 May 2021 19:36:25 +0200 Subject: [PATCH 07/29] Update genericNrm.yaml --- OpenAPI/genericNrm.yaml | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index 82293058f..2107d9571 100644 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -218,13 +218,13 @@ components: oneOf: - type: array items: - $ref: 'comDefs.yaml#/components/schemas/EutraCellId' + $ref: '#/components/schemas/EutraCellId' - type: array items: - $ref: 'comDefs.yaml#/components/schemas/NrCellId' + $ref: '#/components/schemas/NrCellId' - type: array items: - $ref: 'comDefs.yaml#/components/schemas/Tac' + $ref: '#/components/schemas/Tac' - type: array items: $ref: '#/components/schemas/Tai' @@ -236,7 +236,7 @@ components: mnc: $ref: 'comDefs.yaml#/components/schemas/Mnc' tac: - $ref: 'comDefs.yaml#/components/schemas/Tac' + $ref: '#/components/schemas/Tac' AreaConfig: type: object properties: @@ -265,6 +265,20 @@ components: earfcn: type: integer minimum: 1 + Tac: + type: string + pattern: '(^[A-Fa-f0-9]{4}$)|(^[A-Fa-f0-9]{6}$)' + EutraCellId: + type: string + pattern: '^[A-Fa-f0-9]{7}$' + NrCellId: + type: string + pattern: '^[A-Fa-f0-9]{9}$' + IpAddr: + oneOf: + - $ref: '#/components/schemas/Ipv4Addr' + - $ref: '#/components/schemas/Ipv6Addr' + #-------- Definition of types used in Trace control NRM fragment------------------ @@ -1081,7 +1095,7 @@ components: - mnc tceAddress: oneOf: - - $ref: 'comDefs.yaml#/components/schemas/IpAddr' + - $ref: '#/components/schemas/IpAddr' - $ref: 'comDefs.yaml#/components/schemas/Uri' required: - tceID @@ -1239,7 +1253,7 @@ components: tjStreamingTraceConsumerURI: $ref: 'comDefs.yaml#/components/schemas/Uri' tjTraceCollectionEntityAddress: - $ref: 'comDefs.yaml#/components/schemas/IpAddr' + $ref: '#/components/schemas/IpAddr' tjTraceDepth: $ref: '#/components/schemas/tjTraceDepth-Type' tjTraceReference: -- GitLab From 7212caa34d6208ecf6fd016bf16c4bce9fb00cd3 Mon Sep 17 00:00:00 2001 From: allwang Date: Fri, 14 May 2021 19:37:11 +0200 Subject: [PATCH 08/29] Update comDefs.yaml --- OpenAPI/comDefs.yaml | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/OpenAPI/comDefs.yaml b/OpenAPI/comDefs.yaml index 4e0ddf86c..fb6d7f4db 100644 --- a/OpenAPI/comDefs.yaml +++ b/OpenAPI/comDefs.yaml @@ -43,18 +43,11 @@ components: required: - mcc - mnc - Tac: - type: string - pattern: '(^[A-Fa-f0-9]{4}$)|(^[A-Fa-f0-9]{6}$)' - EutraCellId: - type: string - pattern: '^[A-Fa-f0-9]{7}$' - NrCellId: - type: string - pattern: '^[A-Fa-f0-9]{9}$' Fqdn: type: string + Uri: + type: string Ipv4Addr: type: string @@ -72,12 +65,6 @@ components: - pattern: '^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))(\/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))$' - pattern: '^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))(\/.+)$' example: '2001:db8:abcd:12::0/64' - IpAddr: - oneOf: - - $ref: '#/components/schemas/Ipv4Addr' - - $ref: '#/components/schemas/Ipv6Addr' - Uri: - type: string AdministrativeState: type: string -- GitLab From eaa17b6e5d1b0cd3ee3a29316b1810855519076a Mon Sep 17 00:00:00 2001 From: allwang Date: Wed, 2 Jun 2021 10:09:48 +0200 Subject: [PATCH 09/29] Merge S5-213472 (branch '28.623_Rel16_CR0128_Align_Trace_MDT_related_parameters') into Integration_Rel16_SA5_YAML --- OpenAPI/genericNrm.yaml | 227 +++++++++++++++++++++++++++------------- 1 file changed, 156 insertions(+), 71 deletions(-) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index 2107d9571..f28cd0537 100644 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -642,6 +642,12 @@ components: - GNB_CU_CP - GNB_CU_UP - GNB_DU + - AMF + - PCF + - SMF + - UPF + - AUSF + - SMSF tjPLMNTaget-Type: type: object @@ -731,6 +737,12 @@ components: - SMF - PCF - UPF + - AUSF + - NEF + - NRF + - NSSF + - SMSF + - UDM EventBitmap: type: integer required: @@ -748,21 +760,16 @@ components: description: See details in 3GPP TS 32.422 clause 5.10.20. type: string enum: - - 250ms - - 500ms + - 100ms - 1000ms - - 2000ms - - 3000ms - - 4000ms - - 6000ms - - 8000ms - - 12000ms - - 16000ms - - 20000ms - - 24000ms - - 28000ms - - 32000ms - - 64000ms + - 1024ms + - 1280ms + - 2048ms + - 2560ms + - 5120ms + - 10000ms + - 10240ms + - 60000ms tjMDTCollectionPeriodM6Lte-Type: description: See details in 3GPP TS 32.422 clause 5.10.32. @@ -783,20 +790,27 @@ components: description: See details in 3GPP TS 32.422 clause 5.10.21. type: string enum: - - 1024ms - - 1280ms - - 2048ms - - 2560ms - - 5120ms - - 10240ms - - 1min + - 250ms + - 500ms + - 1000ms + - 2000ms + - 3000ms + - 4000ms + - 6000ms + - 8000ms + - 12000ms + - 16000ms + - 20000ms + - 24000ms + - 28000ms + - 32000ms + - 64000ms tjMDTCollectionPeriodRrmNR-Type: description: See details in 3GPP TS 32.422 clause 5.10.30. type: string enum: - 1024ms - - 1280ms - 2048ms - 5120ms - 10240ms @@ -839,13 +853,21 @@ components: type: object properties: EventThresholdRSRP: - type: integer - minimum: 0 - maximum: 97 + oneOf: + - type: integer + minimum: 0 + maximum: 97 + - type: integer + minimum: 0 + maximum: 127 EventThresholdRSRQ: - type: integer - minimum: 0 - maximum: 34 + oneOf: + - type: integer + minimum: 0 + maximum: 34 + - type: integer + minimum: 0 + maximum: 127 EventThreshold1F: type: object properties: @@ -911,6 +933,7 @@ components: - M5 - M6 - M7 + - M1_EVENT_TRIGGERED - M8 - M9 @@ -927,16 +950,50 @@ components: tjMDTLoggingInterval-Type: description: See details in 3GPP TS 32.422 clause 5.10.8. - type: string - enum: - - 1.28s - - 2.56s - - 5.12s - - 10.24s - - 20.48s - - 30.72s - - 40.96s - - 61.44s + type: object + properties: + UMTS: + type: array + items: + type: string + enum: + - 1.28s + - 2.56s + - 5.12s + - 10.24s + - 20.48s + - 30.72s + - 40.96s + - 61.44s + LTE: + type: array + items: + type: string + enum: + - 1.28s + - 2.56s + - 5.12s + - 10.24s + - 20.48s + - 30.72s + - 40.96s + - 61.44s + NR: + type: array + items: + type: string + enum: + - 0.32s + - 0.64s + - 1.28s + - 2.56s + - 5.12s + - 10.24s + - 20.48s + - 30.72s + - 40.96s + - 61.44s + - INFINITY tjMDTMeasurementPeriodLTE-Type: description: See details in 3GPP TS 32.422 clause 5.10.23. @@ -1020,45 +1077,73 @@ components: type: string enum: - PERIODICAL - - A2_FOR_LTE + - A2_FOR_LTE_NR - 1F_FOR_UMTS - 1I_FOR_UMTS_MCPS_TDD - - A2_TRIGGERED_PERIODIC_FOR_LTE - - ALL_CONFIGURED_RRM_FOR_LTE + - A2_TRIGGERED_PERIODIC_FOR_LTE_NR + - ALL_CONFIGURED_RRM_FOR_LTE_NR - ALL_CONFIGURED_RRM_FOR_UMTS tjMDTReportInterval-Type: description: See details in 3GPP TS 32.422 clause 5.10.5. - type: string - enum: - - 250ms - - 500ms - - 1000ms - - 2000ms - - 3000ms - - 4000ms - - 6000ms - - 8000ms - - 12000ms - - 16000ms - - 20000ms - - 24000ms - - 28000ms - - 32000ms - - 64000ms - - 120ms - - 240ms - - 480ms - - 640ms - - 1024ms - - 2048ms - - 5120ms - - 10240ms - - 60000ms - - 360000ms - - 720000ms - - 1800000ms - - 3600000ms + type: object + properties: + UMTS: + type: array + items: + type: string + enum: + - 250ms + - 500ms + - 1000ms + - 2000ms + - 3000ms + - 4000ms + - 6000ms + - 8000ms + - 12000ms + - 16000ms + - 20000ms + - 24000ms + - 28000ms + - 32000ms + - 64000ms + LTE: + type: array + items: + type: string + enum: + - 120ms + - 240ms + - 480ms + - 640ms + - 1024ms + - 2048ms + - 5120ms + - 10240ms + - 60000ms + - 360000ms + - 720000ms + - 1800000ms + - 3600000ms + NR: + type: array + items: + type: string + enum: + - 120ms + - 240ms + - 480ms + - 640ms + - 1024ms + - 2048ms + - 5120ms + - 10240ms + - 60000ms + - 360000ms + - 720000ms + - 1800000ms + - 3600000ms tjMDTReportType-Type: description: Report type for logged NR MDT. See details in 3GPP TS 32.422 clause 5.10.27. -- GitLab From 3f87149445406e502bbf61ebbfb87e94551ccfe0 Mon Sep 17 00:00:00 2001 From: pollakowskio Date: Thu, 27 May 2021 12:01:58 +0200 Subject: [PATCH 10/29] Update genericNrm.yaml - Add missing MnsAgent --- OpenAPI/genericNrm.yaml | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index f28cd0537..d59a4b2b8 100644 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -1,13 +1,13 @@ openapi: 3.0.1 info: title: Generic NRM - version: 16.6.0 + version: 16.8.0 description: >- OAS 3.0.1 definition of the Generic NRM - © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.623 V16.5.0; Generic NRM + description: 3GPP TS 28.623 V16.7.0; Generic NRM url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/ paths: {} components: @@ -31,12 +31,12 @@ components: type: string autoScalable: type: boolean - SiteLatitude: + Latitude: type: number format: float minimum: -90 maximum: 90 - SiteLongitude: + Longitude: type: number format: float minimum: -180 @@ -49,9 +49,9 @@ components: siteDescription: type: string siteLatitude: - $ref: '#/components/schemas/SiteLatitude' + $ref: '#/components/schemas/Latitude' siteLongitude: - $ref: '#/components/schemas/SiteLongitude' + $ref: '#/components/schemas/Longitude' equipmentType: type: string environmentType: @@ -1264,6 +1264,8 @@ components: properties: ManagementNode: $ref: '#/components/schemas/ManagementNode-Multiple' + MnsAgent: + $ref: '#/components/schemas/MnsAgent-Multiple' MeContext: $ref: '#/components/schemas/MeContext-Multiple' PerfMetricJob: @@ -1279,6 +1281,8 @@ components: ManagedElement-ncO: type: object properties: + MnsAgent: + $ref: '#/components/schemas/MnsAgent-Multiple' PerfMetricJob: $ref: '#/components/schemas/PerfMetricJob-Multiple' ThresholdMonitor: @@ -1486,6 +1490,18 @@ components: type: string swVersion: type: string + MnsAgent: + $ref: '#/components/schemas/MnsAgent-Multiple' + MnsAgent-Single: + allOf: + - $ref: '#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + systemDN: + $ref: 'comDefs.yaml#/components/schemas/Dn' MeContext-Single: allOf: - $ref: '#/components/schemas/Top' @@ -1628,6 +1644,10 @@ components: type: array items: $ref: '#/components/schemas/ManagementNode-Single' + MnsAgent-Multiple: + type: array + items: + $ref: '#/components/schemas/MnsAgent-Single' MeContext-Multiple: type: array items: @@ -1657,6 +1677,7 @@ components: - $ref: '#/components/schemas/VsDataContainer-Single' - $ref: '#/components/schemas/ManagementNode-Single' + - $ref: '#/components/schemas/MnsAgent-Single' - $ref: '#/components/schemas/MeContext-Single' - $ref: '#/components/schemas/ManagedNFService-Single' -- GitLab From 59647a4f436d1840256452daee34d0bf89ba0515 Mon Sep 17 00:00:00 2001 From: Ping Date: Mon, 10 May 2021 08:46:06 +0800 Subject: [PATCH 11/29] change for 28.541_Rel16_0502_fix_inheritance_relation_of_network_slice_NRM --- OpenAPI/sliceNrm.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 1fa8d70ff..32f6b9fa2 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -331,7 +331,6 @@ components: properties: attributes: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-Attr' - type: object properties: networkSliceSubnetRef: @@ -350,7 +349,6 @@ components: properties: attributes: allOf: - - $ref: 'genericNrm.yaml#/components/schemas/SubNetwork-Attr' - type: object properties: managedFunctionRefList: -- GitLab From aab8f1e035c6829d75a7a27eb4296e09d8066169 Mon Sep 17 00:00:00 2001 From: ligan Date: Thu, 3 Jun 2021 04:05:17 +0200 Subject: [PATCH 12/29] Update nrNrm.yaml --- OpenAPI/nrNrm.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index 3de2c63a6..fe5637f2c 100644 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -1337,6 +1337,20 @@ components: properties: cesSwitch: type: boolean + intraRatEsActivationOriginalCellLoadParameters: + $ref: "#/components/schemas/IntraRatEsActivationOriginalCellLoadParameters" + intraRatEsActivationCandidateCellsLoadParameters: + $ref: "#/components/schemas/IntraRatEsActivationCandidateCellsLoadParameters" + intraRatEsDeactivationCandidateCellsLoadParameters: + $ref: "#/components/schemas/IntraRatEsDeactivationCandidateCellsLoadParameters" + esNotAllowedTimePeriod: + $ref: "#/components/schemas/EsNotAllowedTimePeriod" + interRatEsActivationOriginalCellParameters: + $ref: "#/components/schemas/IntraRatEsActivationOriginalCellLoadParameters" + interRatEsActivationCandidateCellParameters: + $ref: "#/components/schemas/IntraRatEsActivationOriginalCellLoadParameters" + interRatEsDeactivationCandidateCellParameters: + $ref: "#/components/schemas/IntraRatEsActivationOriginalCellLoadParameters" energySavingControl: type: string enum: -- GitLab From d0f030126c2ea26a71b653399453bc743ca6d16f Mon Sep 17 00:00:00 2001 From: pollakowskio Date: Fri, 21 May 2021 12:36:53 +0200 Subject: [PATCH 13/29] Update comDefs.yaml --- OpenAPI/comDefs.yaml | 60 +++++++++++++++++++++++++++++++++----------- 1 file changed, 45 insertions(+), 15 deletions(-) diff --git a/OpenAPI/comDefs.yaml b/OpenAPI/comDefs.yaml index fb6d7f4db..f9d90b78f 100644 --- a/OpenAPI/comDefs.yaml +++ b/OpenAPI/comDefs.yaml @@ -1,10 +1,10 @@ openapi: 3.0.1 info: title: Common Type Definitions - version: 16.6.0 + version: 16.8.0 description: >- OAS 3.0.1 specification of common type definitions in the Generic NRM - © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.623; Generic NRM; Common type definitions @@ -18,7 +18,17 @@ components: format: float DateTime: type: string - format: date-Time + format: date-time + Latitude: + type: number + format: float + minimum: -90 + maximum: 90 + Longitude: + type: number + format: float + minimum: -180 + maximum: 180 Dn: type: string @@ -33,6 +43,9 @@ components: Mnc: type: string pattern: '^[0-9]{2,3}$' + Nid: + type: string + pattern: '^[A-Fa-f0-9]{11}$' PlmnId: type: object properties: @@ -40,15 +53,18 @@ components: $ref: '#/components/schemas/Mcc' mnc: $ref: '#/components/schemas/Mnc' - required: - - mcc - - mnc - - Fqdn: + Tac: type: string - Uri: + pattern: '(^[A-Fa-f0-9]{4}$)|(^[A-Fa-f0-9]{6}$)' + EutraCellId: type: string + pattern: '^[A-Fa-f0-9]{7}$' + NrCellId: + type: string + pattern: '^[A-Fa-f0-9]{9}$' + Fqdn: + type: string Ipv4Addr: type: string pattern: '^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$' @@ -65,6 +81,23 @@ components: - pattern: '^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))(\/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))$' - pattern: '^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))(\/.+)$' example: '2001:db8:abcd:12::0/64' + IpAddr: + oneOf: + - $ref: '#/components/schemas/Ipv4Addr' + - $ref: '#/components/schemas/Ipv6Addr' + HostAddr: + # This definition will be deprecated, when all occurances of HostAddr + # are replaced by Host. + oneOf: + - $ref: '#/components/schemas/Ipv4Addr' + - $ref: '#/components/schemas/Ipv6Addr' + - $ref: '#/components/schemas/Fqdn' + Host: + oneOf: + - $ref: '#/components/schemas/IpAddr' + - $ref: '#/components/schemas/Fqdn' + Uri: + type: string AdministrativeState: type: string @@ -101,6 +134,8 @@ components: maxItems: 2 Filter: + description: >- + The filter format shall be compliant to XPath 1.0. type: string SystemDN: type: string @@ -113,12 +148,7 @@ components: - $ref: 'provMnS.yaml#/components/schemas/CmNotificationTypes' - $ref: 'perfMnS.yaml#/components/schemas/PerfNotificationTypes' - $ref: 'heartbeatNtf.yaml#/components/schemas/HeartbeatNotificationTypes' - # The enum below will be replaced by a reference once notification - # types are defined in "FileDataReportingMnS.yaml" - - type: string - enum: - - notifyFileReady - - notifyFilePreparationError + - $ref: 'fileDataReportingMnS.yaml#/components/schemas/FileNotificationTypes' NotificationHeader: type: object properties: -- GitLab From c8279aa6c4d894e136bc8992616fa002608a665d Mon Sep 17 00:00:00 2001 From: pollakowskio Date: Fri, 21 May 2021 12:53:37 +0200 Subject: [PATCH 14/29] Update comDefs.yaml --- OpenAPI/comDefs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/comDefs.yaml b/OpenAPI/comDefs.yaml index f9d90b78f..b306659a5 100644 --- a/OpenAPI/comDefs.yaml +++ b/OpenAPI/comDefs.yaml @@ -148,7 +148,7 @@ components: - $ref: 'provMnS.yaml#/components/schemas/CmNotificationTypes' - $ref: 'perfMnS.yaml#/components/schemas/PerfNotificationTypes' - $ref: 'heartbeatNtf.yaml#/components/schemas/HeartbeatNotificationTypes' - - $ref: 'fileDataReportingMnS.yaml#/components/schemas/FileNotificationTypes' + #- $ref: 'fileDataReportingMnS.yaml#/components/schemas/FileNotificationTypes' NotificationHeader: type: object properties: -- GitLab From 7ebf6a08a0eec561928b863acf3ec8cbe17072f9 Mon Sep 17 00:00:00 2001 From: pollakowskio Date: Wed, 26 May 2021 12:26:40 +0200 Subject: [PATCH 15/29] Update fileDataReportingMnS.yaml --- OpenAPI/FileDataReportingMnS.yaml | 278 ++++++++++++------------------ 1 file changed, 112 insertions(+), 166 deletions(-) diff --git a/OpenAPI/FileDataReportingMnS.yaml b/OpenAPI/FileDataReportingMnS.yaml index 2d1a4fb16..fba40c5d2 100644 --- a/OpenAPI/FileDataReportingMnS.yaml +++ b/OpenAPI/FileDataReportingMnS.yaml @@ -1,83 +1,108 @@ openapi: 3.0.1 info: - title: TS 28.532 File data reporting Service - version: 16.6.0 + title: File Data Reporting MnS + version: 16.7.0 description: >- - OAS 3.0.1 specification of the File data reporting Management Service © 2020, - 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All - rights reserved. + OAS 3.0.1 definition of the File Data Reporting MnS + © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + All rights reserved. externalDocs: - description: 3GPP TS 28.532 V16.5.0; Generic management services - url: 'http://www.3gpp.org/ftp/Specs/archive/28_series/28.532/' + description: 3GPP TS 28.532; Generic management services + url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.532/ servers: - - url: '{MnSRoot}/FileDataReportingMnS/{MnSversion}' + - url: '{MnSRoot}/FileDataReportingMnS/{MnSVersion}' variables: MnSRoot: - description: See subclause 4.4 of TS 32.158 - default: http://example.com/3GPPManagement - version: - description: Indicates the current version of the specification - default: 16.5.0 + description: See clause 4.4.2 of TS 32.158 + default: http://example.com/3GPPManagement + MnSVersion: + description: Version number of the OpenAPI definition + default: XXX paths: - /Files: + /files: get: - summary: Read resources of information of available files - description: With HTTP GET, resources of information of available files are read. The resources to be read are identified with the path component (base resource) and the query component (fileaType, beginTime and endTime) of the URI. The fields query component allows to select the resource properties to be returned. + summary: Read information about available files + description: >- + Information about available files is read with HTTP GET. The files for + which information shall be returned are identified with the path + component (base resource) and the query component (fileDataType, beginTime, + endTime) of the URI. parameters: - - name: fileType + - name: fileDataType in: query - description: This parameter identifies the type of management data that the file contains to select the resources from the collection resources identified with the path component of the URI. + description: >- + This parameter selects files based on the file data type. required: true schema: - $ref: '#/components/schemas/fileType-Type' + $ref: '#/components/schemas/FileDataType' - name: beginTime in: query - description: This parameter identifies the time stamp no later than which the file became available to select the resources from the collection resources identified with the path component of the URI. - required: true + description: >- + This parameter selects files based on the earliest time they + became available + required: false schema: - $ref: '#/components/schemas/dateTime-Type' + $ref: 'comDefs.yaml#/components/schemas/DateTime' - name: endTime in: query - description: This parameter identifies the time stamp no earlier than which the file became available to select the resources from the collection resources identified with the path component of the URI. - required: true + description: >- + This parameter selects files based on the latest time they + became available + required: false schema: - $ref: '#/components/schemas/dateTime-Type' + $ref: 'comDefs.yaml#/components/schemas/DateTime' responses: '200': - description: 'Success case ("200 OK"). The resources identified in the request for retrieval are returned in the response message body. In case the fields query parameter is used, the selected resources are returned.' + description: >- + 'Success case ("200 OK"). + The resources identified in the request for retrieval are returned + in the response message body.' content: application/json: schema: - $ref: '#/components/schemas/fileInfoRetrieval-ResponseType' + type: array + items: + $ref: '#/components/schemas/FileInfo' default: description: Error case. content: application/json: schema: - $ref: '#/components/schemas/error-ResponseType' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' /subscriptions: post: summary: Create a subscription - description: To create a subscription the representation of the subscription is POSTed on the /subscriptions collection resource. + description: >- + To create a subscription the representation of the subscription is + POSTed on the /subscriptions collection resource. requestBody: required: true content: application/json: schema: - $ref: '#/components/schemas/subscription-RequestType' + $ref: 'faultMnS.yaml#/components/schemas/Subscription' responses: '201': - description: Success case ("201 Created"). The representation of the newly created subscription resource shall be returned. + description: >- + Success case ("201 Created"). + The representation of the newly created subscription resource shall + be returned. content: application/json: schema: - $ref: '#/components/schemas/subscription-ResponseType' + $ref: 'faultMnS.yaml#/components/schemas/Subscription' + headers: + Location: + description: URI of the newly created subscription resource + required: true + schema: + type: string default: description: Error case. content: application/json: schema: - $ref: '#/components/schemas/error-ResponseType' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' callbacks: notifyFileReady: '{request.body#/consumerReference}': @@ -87,16 +112,19 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/notifyFileReady-NotifType' + $ref: '#/components/schemas/NotifyFileReady' responses: '204': - description: Success case ("204 No Content"). The notification is successfully delivered. The response message body is absent. + description: >- + Success case ("204 No Content"). + The notification is successfully delivered. The response message + body is absent. default: description: Error case. content: application/json: schema: - $ref: '#/components/schemas/error-ResponseType' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' notifyFilePreparationError: '{request.body#/consumerReference}': post: @@ -105,179 +133,97 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/notifyFilePreparationError-NotifType' + $ref: '#/components/schemas/NotifyFilePreparationError' responses: '204': - description: Success case ("204 No Content"). The notification is successfully delivered. The response message body is absent. + description: >- + Success case ("204 No Content"). + The notification is successfully delivered. The response message + body is absent. default: description: Error case. content: application/json: schema: - $ref: '#/components/schemas/error-ResponseType' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' + /subscriptions/{subscriptionId}: delete: - summary: Delete all subscriptions made with a specific consumerReferenceId - description: The subscriptions are deleted by deleting the corresponding subscription resources. The resources to be deleted are identified with the path component of the URI pointing to the /subscription collection resource and filtering on the consumerReferenceId provided in the query part. - parameters: - - name: consumerReferenceId - in: query - description: Identifies the subscriptions to be deleted. - required: true - schema: - $ref: '#/components/schemas/consumerReferenceId-QueryType' - responses: - '204': - description: Success case ("204 No Content"). The subscription resources have been deleted. The response message body is absent. - default: - description: Error case. - content: - application/json: - schema: - $ref: '#/components/schemas/error-ResponseType' - '/subscriptions/{subscriptionId}': - delete: - summary: Delete a single subscription - description: The subscription is deleted by deleting the corresponding subscription resource. The resource to be deleted is identified with the path component of the URI. + summary: Delete a subscription + description: >- + The subscription is deleted by deleting the corresponding subscription + resource. The resource to be deleted is identified with the path + component of the URI. parameters: - name: subscriptionId in: path description: Identifies the subscription to be deleted. required: true schema: - $ref: '#/components/schemas/subscriptionId-PathType' + type: string responses: '204': - description: Success case ("204 No Content"). The subscription resource has been deleted. The response message body is absent. + description: >- + Success case ("204 No Content"). + The subscription resource has been deleted. The response message body + is absent. default: description: Error case. content: application/json: schema: - $ref: '#/components/schemas/error-ResponseType' + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' components: schemas: - dateTime-Type: - type: string - format: date-Time - uri-Type: + FileDataType: type: string - long-Type: - type: string - format: long - additionalText-Type: - type: string - reason-Type: + enum: + - Performance + - Trace + - Anatytics + - Proprietary + FileNotificationTypes: type: string - fileInfoRetrieval-ResponseType: - type: object - properties: - data: - type: array - items: - $ref: '#/components/schemas/fileInfo-Type' - fileInfo-Type: + enum: + - notifyFileReady + - notifyFilePreparationError + FileInfo: type: object properties: fileLocation: - $ref: '#/components/schemas/uri-Type' + $ref: 'comDefs.yaml#/components/schemas/Uri' fileSize: - $ref: '#/components/schemas/long-Type' + type: integer fileReadyTime: - $ref: '#/components/schemas/dateTime-Type' + $ref: 'comDefs.yaml#/components/schemas/DateTime' fileExpirationTime: - $ref: '#/components/schemas/dateTime-Type' + $ref: 'comDefs.yaml#/components/schemas/DateTime' fileCompression: type: string fileFormat: type: string - fileType: - $ref: '#/components/schemas/fileType-Type' - error-ResponseType: - type: object - properties: - error: - type: object - properties: - errorInfo: - type: string - fileType-Type: - type: string - enum: - - PERFORMANCE - - TRACE - - ANALYTICS - - PROPRIETARY - header-Type: - description: Header used in notifications as notification header - type: object - properties: - uri: - $ref: '#/components/schemas/uri-Type' - notificationId: - $ref: '#/components/schemas/notificationId-Type' - notificationType: - $ref: '#/components/schemas/notificationType-Type' - eventTime: - $ref: '#/components/schemas/dateTime-Type' - subscriptionId-PathType: - type: string - filter-Type: - type: string - notificationId-Type: - $ref: '#/components/schemas/long-Type' - notificationType-Type: - type: string - enum: - - notifyFileReady - - notifyFilePreparationError - subscription-ResourceType: - type: object - properties: - consumerReference: - $ref: '#/components/schemas/uri-Type' - timeTick: - $ref: '#/components/schemas/long-Type' - filter: - $ref: '#/components/schemas/filter-Type' - subscription-RequestType: - type: object - properties: - data: - $ref: '#/components/schemas/subscription-ResourceType' - subscription-ResponseType: - type: object - properties: - data: - $ref: '#/components/schemas/subscription-ResourceType' - consumerReferenceId-QueryType: - $ref: '#/components/schemas/uri-Type' - notifyFileReady-NotifType: - type: object - properties: - header: - $ref: '#/components/schemas/header-Type' - body: - type: object + fileDataType: + $ref: '#/components/schemas/FileDataType' + NotifyFileReady: + allOf: + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' + - type: object properties: fileInfoList: type: array items: - $ref: '#/components/schemas/fileInfo-Type' + $ref: '#/components/schemas/FileInfo' additionalText: - $ref: '#/components/schemas/additionalText-Type' - notifyFilePreparationError-NotifType: - type: object - properties: - header: - $ref: '#/components/schemas/header-Type' - body: - type: object + type: string + NotifyFilePreparationError: + allOf: + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' + - type: object properties: fileInfoList: type: array items: - $ref: '#/components/schemas/fileInfo-Type' + $ref: '#/components/schemas/FileInfo' reason: - $ref: '#/components/schemas/reason-Type' + type: string additionalText: - $ref: '#/components/schemas/additionalText-Type' + type: string \ No newline at end of file -- GitLab From e8996498b24e48d5e2815348aaf7106a6c78a09b Mon Sep 17 00:00:00 2001 From: pollakowskio Date: Wed, 26 May 2021 12:55:10 +0200 Subject: [PATCH 16/29] Update comDefs.yaml --- OpenAPI/comDefs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/comDefs.yaml b/OpenAPI/comDefs.yaml index b306659a5..f9d90b78f 100644 --- a/OpenAPI/comDefs.yaml +++ b/OpenAPI/comDefs.yaml @@ -148,7 +148,7 @@ components: - $ref: 'provMnS.yaml#/components/schemas/CmNotificationTypes' - $ref: 'perfMnS.yaml#/components/schemas/PerfNotificationTypes' - $ref: 'heartbeatNtf.yaml#/components/schemas/HeartbeatNotificationTypes' - #- $ref: 'fileDataReportingMnS.yaml#/components/schemas/FileNotificationTypes' + - $ref: 'fileDataReportingMnS.yaml#/components/schemas/FileNotificationTypes' NotificationHeader: type: object properties: -- GitLab From 125ba733476acdb2e8ac95b58be61e23dcb4af17 Mon Sep 17 00:00:00 2001 From: pingj Date: Mon, 7 Jun 2021 05:43:05 +0200 Subject: [PATCH 17/29] Update genericNrm.yaml - 28.623_Rel16_CR0129_Clean_up_regarding_common_data_types --- OpenAPI/genericNrm.yaml | 39 +++------------------------------------ 1 file changed, 3 insertions(+), 36 deletions(-) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index d59a4b2b8..45ebd735e 100644 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -31,16 +31,6 @@ components: type: string autoScalable: type: boolean - Latitude: - type: number - format: float - minimum: -90 - maximum: 90 - Longitude: - type: number - format: float - minimum: -180 - maximum: 180 PeeParameter: type: object properties: @@ -49,9 +39,9 @@ components: siteDescription: type: string siteLatitude: - $ref: '#/components/schemas/Latitude' + $ref: 'comDefs.yaml#/components/schemas/Latitude' siteLongitude: - $ref: '#/components/schemas/Longitude' + $ref: 'comDefs.yaml#/components/schemas/Longitude' equipmentType: type: string environmentType: @@ -110,8 +100,6 @@ components: - AF - UDSF - DN - Fqdn: - type: string OperationSemantics: type: string enum: @@ -121,7 +109,7 @@ components: type: object properties: host: - $ref: '#/components/schemas/HostAddr' + $ref: 'comDefs.yaml#/components/schemas/HostAddr' port: type: integer NFServiceType: @@ -134,27 +122,6 @@ components: - Nsmf_PDUSession - Nsmf_EventExposure - Others - HostAddr: - oneOf: - - $ref: '#/components/schemas/Ipv4Addr' - - $ref: '#/components/schemas/Ipv6Addr' - - $ref: '#/components/schemas/Fqdn' - Ipv4Addr: - type: string - pattern: '^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])$' - example: '198.51.100.1' - Ipv6Addr: - type: string - allOf: - - pattern: '^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))$' - - pattern: '^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))$' - example: '2001:db8:85a3::8a2e:370:7334' - Ipv6Prefix: - type: string - allOf: - - pattern: '^((:|(0?|([1-9a-f][0-9a-f]{0,3}))):)((0?|([1-9a-f][0-9a-f]{0,3})):){0,6}(:|(0?|([1-9a-f][0-9a-f]{0,3})))(\/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))$' - - pattern: '^((([^:]+:){7}([^:]+))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?))(\/.+)$' - example: '2001:db8:abcd:12::0/64' TransportProtocol: anyOf: - type: string -- GitLab From 90fbf13e9e6f75ea4794eabbaca19f7c51bcdee3 Mon Sep 17 00:00:00 2001 From: Ping Date: Mon, 7 Jun 2021 20:13:52 +0800 Subject: [PATCH 18/29] 28.623_Rel16_CR0129_Clean_up_regarding_common_data_types - update 5G NRM to align with common definition change --- OpenAPI/5gcNrm.yaml | 24 ++++++++++++------------ OpenAPI/nrNrm.yaml | 12 ++++++------ OpenAPI/sliceNrm.yaml | 4 ++-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index eb4083228..e6de13427 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -41,11 +41,11 @@ components: type: object properties: ipv4Address: - $ref: 'genericNrm.yaml#/components/schemas/Ipv4Addr' + $ref: 'comDefs.yaml#/components/schemas/Ipv4Addr' ipv6Address: - $ref: 'genericNrm.yaml#/components/schemas/Ipv6Addr' + $ref: 'comDefs.yaml#/components/schemas/Ipv6Addr' ipv6Prefix: - $ref: 'genericNrm.yaml#/components/schemas/Ipv6Prefix' + $ref: 'comDefs.yaml#/components/schemas/Ipv6Prefix' transport: $ref: 'genericNrm.yaml#/components/schemas/TransportProtocol' port: @@ -71,9 +71,9 @@ components: sNssais: $ref: 'nrNrm.yaml#/components/schemas/Snssai' fqdn: - $ref: 'genericNrm.yaml#/components/schemas/Fqdn' + $ref: 'comDefs.yaml#/components/schemas/Fqdn' interPlmnFqdn: - $ref: 'genericNrm.yaml#/components/schemas/Fqdn' + $ref: 'comDefs.yaml#/components/schemas/Fqdn' nfServices: type: array items: @@ -91,9 +91,9 @@ components: schema: type: string fqdn: - $ref: 'genericNrm.yaml#/components/schemas/Fqdn' + $ref: 'comDefs.yaml#/components/schemas/Fqdn' interPlmnFqdn: - $ref: 'genericNrm.yaml#/components/schemas/Fqdn' + $ref: 'comDefs.yaml#/components/schemas/Fqdn' ipEndPoints: type: array items: @@ -183,7 +183,7 @@ components: authzInfo: type: string hostAddr: - $ref: 'genericNrm.yaml#/components/schemas/HostAddr' + $ref: 'comDefs.yaml#/components/schemas/HostAddr' locality: type: string nFInfo: @@ -992,7 +992,7 @@ components: sEPPId: type: integer fqdn: - $ref: 'genericNrm.yaml#/components/schemas/Fqdn' + $ref: 'comDefs.yaml#/components/schemas/Fqdn' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: @@ -1031,7 +1031,7 @@ components: supportedFuncList: $ref: '#/components/schemas/SupportedFuncList' address: - $ref: 'genericNrm.yaml#/components/schemas/HostAddr' + $ref: 'comDefs.yaml#/components/schemas/HostAddr' - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO' NefFunction-Single: allOf: @@ -1110,7 +1110,7 @@ components: sEPPId: type: integer fqdn: - $ref: 'genericNrm.yaml#/components/schemas/Fqdn' + $ref: 'comDefs.yaml#/components/schemas/Fqdn' EP_N2-Single: @@ -1441,7 +1441,7 @@ components: remotePlmnId: $ref: 'nrNrm.yaml#/components/schemas/PlmnId' remoteSeppAddress: - $ref: 'genericNrm.yaml#/components/schemas/HostAddr' + $ref: 'comDefs.yaml#/components/schemas/HostAddr' remoteSeppId: type: integer n32cParas: diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index fe5637f2c..406529b57 100644 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -272,9 +272,9 @@ components: type: object properties: ipv4Address: - $ref: 'genericNrm.yaml#/components/schemas/Ipv4Addr' + $ref: 'comDefs.yaml#/components/schemas/Ipv4Addr' ipv6Address: - $ref: 'genericNrm.yaml#/components/schemas/Ipv6Addr' + $ref: 'comDefs.yaml#/components/schemas/Ipv6Addr' vlanId: type: integer minimum: 0 @@ -292,9 +292,9 @@ components: type: object properties: ipv4Address: - $ref: 'genericNrm.yaml#/components/schemas/Ipv4Addr' + $ref: 'comDefs.yaml#/components/schemas/Ipv4Addr' ipv6Address: - $ref: 'genericNrm.yaml#/components/schemas/Ipv6Addr' + $ref: 'comDefs.yaml#/components/schemas/Ipv6Addr' CellIndividualOffset: type: object @@ -556,8 +556,8 @@ components: properties: TceIPAddress: oneOf: - - $ref: 'genericNrm.yaml#/components/schemas/Ipv4Addr' - - $ref: 'genericNrm.yaml#/components/schemas/Ipv6Addr' + - $ref: 'comDefs.yaml#/components/schemas/Ipv4Addr' + - $ref: 'comDefs.yaml#/components/schemas/Ipv6Addr' TceID: type: integer PlmnTarget: diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 32f6b9fa2..66ef52fd0 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -290,8 +290,8 @@ components: IpAddress: oneOf: - - $ref: 'genericNrm.yaml#/components/schemas/Ipv4Addr' - - $ref: 'genericNrm.yaml#/components/schemas/Ipv6Addr' + - $ref: 'comDefs.yaml#/components/schemas/Ipv4Addr' + - $ref: 'comDefs.yaml#/components/schemas/Ipv6Addr' ServiceProfileList: type: array items: -- GitLab From 12f471e5b3b5b3313a9b976c888aeed2a34fb4ea Mon Sep 17 00:00:00 2001 From: Ping Date: Tue, 8 Jun 2021 10:00:40 +0800 Subject: [PATCH 19/29] deleted: OpenAPI/fileDataReportingMnS.yaml modified: OpenAPI/FileDataReportingMnS.yaml modified: OpenAPI/README.md new file: OpenAPI/fileDataReportingMnS.yaml --- OpenAPI/FileDataReportingMnS.yaml | 2 +- OpenAPI/README.md | 4 +- OpenAPI/fileDataReportingMnS.yaml | 229 ++++++++++++++++++++++++++++++ 3 files changed, 232 insertions(+), 3 deletions(-) create mode 100644 OpenAPI/fileDataReportingMnS.yaml diff --git a/OpenAPI/FileDataReportingMnS.yaml b/OpenAPI/FileDataReportingMnS.yaml index fba40c5d2..0c18b8f52 100644 --- a/OpenAPI/FileDataReportingMnS.yaml +++ b/OpenAPI/FileDataReportingMnS.yaml @@ -10,7 +10,7 @@ externalDocs: description: 3GPP TS 28.532; Generic management services url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.532/ servers: - - url: '{MnSRoot}/FileDataReportingMnS/{MnSVersion}' + - url: '{MnSRoot}/fileDataReportingMnS/{MnSVersion}' variables: MnSRoot: description: See clause 4.4.2 of TS 32.158 diff --git a/OpenAPI/README.md b/OpenAPI/README.md index 5e2f09862..9601c8caf 100644 --- a/OpenAPI/README.md +++ b/OpenAPI/README.md @@ -54,8 +54,8 @@ The links below will open the Swagger Editor/UI and auto-load the OpenAPI YAML f ([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/streamingDataMnS.yaml)) * File Data Reporting MnS (TS 28.532) -([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/FileDataReportMnS.yaml)) -([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/FileDataReportMnS.yaml)) +([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/fileDataReportingMnS.yaml)) +([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/fileDataReportingMnS.yaml)) ## Tools diff --git a/OpenAPI/fileDataReportingMnS.yaml b/OpenAPI/fileDataReportingMnS.yaml new file mode 100644 index 000000000..0c18b8f52 --- /dev/null +++ b/OpenAPI/fileDataReportingMnS.yaml @@ -0,0 +1,229 @@ +openapi: 3.0.1 +info: + title: File Data Reporting MnS + version: 16.7.0 + description: >- + OAS 3.0.1 definition of the File Data Reporting MnS + © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + All rights reserved. +externalDocs: + description: 3GPP TS 28.532; Generic management services + url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.532/ +servers: + - url: '{MnSRoot}/fileDataReportingMnS/{MnSVersion}' + variables: + MnSRoot: + description: See clause 4.4.2 of TS 32.158 + default: http://example.com/3GPPManagement + MnSVersion: + description: Version number of the OpenAPI definition + default: XXX +paths: + /files: + get: + summary: Read information about available files + description: >- + Information about available files is read with HTTP GET. The files for + which information shall be returned are identified with the path + component (base resource) and the query component (fileDataType, beginTime, + endTime) of the URI. + parameters: + - name: fileDataType + in: query + description: >- + This parameter selects files based on the file data type. + required: true + schema: + $ref: '#/components/schemas/FileDataType' + - name: beginTime + in: query + description: >- + This parameter selects files based on the earliest time they + became available + required: false + schema: + $ref: 'comDefs.yaml#/components/schemas/DateTime' + - name: endTime + in: query + description: >- + This parameter selects files based on the latest time they + became available + required: false + schema: + $ref: 'comDefs.yaml#/components/schemas/DateTime' + responses: + '200': + description: >- + 'Success case ("200 OK"). + The resources identified in the request for retrieval are returned + in the response message body.' + content: + application/json: + schema: + type: array + items: + $ref: '#/components/schemas/FileInfo' + default: + description: Error case. + content: + application/json: + schema: + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' + /subscriptions: + post: + summary: Create a subscription + description: >- + To create a subscription the representation of the subscription is + POSTed on the /subscriptions collection resource. + requestBody: + required: true + content: + application/json: + schema: + $ref: 'faultMnS.yaml#/components/schemas/Subscription' + responses: + '201': + description: >- + Success case ("201 Created"). + The representation of the newly created subscription resource shall + be returned. + content: + application/json: + schema: + $ref: 'faultMnS.yaml#/components/schemas/Subscription' + headers: + Location: + description: URI of the newly created subscription resource + required: true + schema: + type: string + default: + description: Error case. + content: + application/json: + schema: + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' + callbacks: + notifyFileReady: + '{request.body#/consumerReference}': + post: + requestBody: + required: true + content: + application/json: + schema: + $ref: '#/components/schemas/NotifyFileReady' + responses: + '204': + description: >- + Success case ("204 No Content"). + The notification is successfully delivered. The response message + body is absent. + default: + description: Error case. + content: + application/json: + schema: + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' + notifyFilePreparationError: + '{request.body#/consumerReference}': + post: + requestBody: + required: true + content: + application/json: + schema: + $ref: '#/components/schemas/NotifyFilePreparationError' + responses: + '204': + description: >- + Success case ("204 No Content"). + The notification is successfully delivered. The response message + body is absent. + default: + description: Error case. + content: + application/json: + schema: + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' + /subscriptions/{subscriptionId}: + delete: + summary: Delete a subscription + description: >- + The subscription is deleted by deleting the corresponding subscription + resource. The resource to be deleted is identified with the path + component of the URI. + parameters: + - name: subscriptionId + in: path + description: Identifies the subscription to be deleted. + required: true + schema: + type: string + responses: + '204': + description: >- + Success case ("204 No Content"). + The subscription resource has been deleted. The response message body + is absent. + default: + description: Error case. + content: + application/json: + schema: + $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' +components: + schemas: + FileDataType: + type: string + enum: + - Performance + - Trace + - Anatytics + - Proprietary + FileNotificationTypes: + type: string + enum: + - notifyFileReady + - notifyFilePreparationError + FileInfo: + type: object + properties: + fileLocation: + $ref: 'comDefs.yaml#/components/schemas/Uri' + fileSize: + type: integer + fileReadyTime: + $ref: 'comDefs.yaml#/components/schemas/DateTime' + fileExpirationTime: + $ref: 'comDefs.yaml#/components/schemas/DateTime' + fileCompression: + type: string + fileFormat: + type: string + fileDataType: + $ref: '#/components/schemas/FileDataType' + NotifyFileReady: + allOf: + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' + - type: object + properties: + fileInfoList: + type: array + items: + $ref: '#/components/schemas/FileInfo' + additionalText: + type: string + NotifyFilePreparationError: + allOf: + - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' + - type: object + properties: + fileInfoList: + type: array + items: + $ref: '#/components/schemas/FileInfo' + reason: + type: string + additionalText: + type: string \ No newline at end of file -- GitLab From a6a4faee810fdee691e829c727ba5bcb366eb071 Mon Sep 17 00:00:00 2001 From: Ping Date: Tue, 8 Jun 2021 11:27:04 +0800 Subject: [PATCH 20/29] modified: OpenAPI/genericNrm.yaml to change referrence of IpAddr --- OpenAPI/genericNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index 45ebd735e..c0019a34d 100644 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -243,8 +243,8 @@ components: pattern: '^[A-Fa-f0-9]{9}$' IpAddr: oneOf: - - $ref: '#/components/schemas/Ipv4Addr' - - $ref: '#/components/schemas/Ipv6Addr' + - $ref: 'comDefs.yaml#/components/schemas/Ipv4Addr' + - $ref: 'comDefs.yaml#/components/schemas/Ipv6Addr' #-------- Definition of types used in Trace control NRM fragment------------------ -- GitLab From 2a0a98775c02ecebbdd8890cc4fd71c05f0deaa4 Mon Sep 17 00:00:00 2001 From: pingj Date: Tue, 8 Jun 2021 05:41:31 +0200 Subject: [PATCH 21/29] Deleted OpenAPI/FileDataReportingMnS.yaml --- OpenAPI/FileDataReportingMnS.yaml | 229 ------------------------------ 1 file changed, 229 deletions(-) delete mode 100644 OpenAPI/FileDataReportingMnS.yaml diff --git a/OpenAPI/FileDataReportingMnS.yaml b/OpenAPI/FileDataReportingMnS.yaml deleted file mode 100644 index 0c18b8f52..000000000 --- a/OpenAPI/FileDataReportingMnS.yaml +++ /dev/null @@ -1,229 +0,0 @@ -openapi: 3.0.1 -info: - title: File Data Reporting MnS - version: 16.7.0 - description: >- - OAS 3.0.1 definition of the File Data Reporting MnS - © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). - All rights reserved. -externalDocs: - description: 3GPP TS 28.532; Generic management services - url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.532/ -servers: - - url: '{MnSRoot}/fileDataReportingMnS/{MnSVersion}' - variables: - MnSRoot: - description: See clause 4.4.2 of TS 32.158 - default: http://example.com/3GPPManagement - MnSVersion: - description: Version number of the OpenAPI definition - default: XXX -paths: - /files: - get: - summary: Read information about available files - description: >- - Information about available files is read with HTTP GET. The files for - which information shall be returned are identified with the path - component (base resource) and the query component (fileDataType, beginTime, - endTime) of the URI. - parameters: - - name: fileDataType - in: query - description: >- - This parameter selects files based on the file data type. - required: true - schema: - $ref: '#/components/schemas/FileDataType' - - name: beginTime - in: query - description: >- - This parameter selects files based on the earliest time they - became available - required: false - schema: - $ref: 'comDefs.yaml#/components/schemas/DateTime' - - name: endTime - in: query - description: >- - This parameter selects files based on the latest time they - became available - required: false - schema: - $ref: 'comDefs.yaml#/components/schemas/DateTime' - responses: - '200': - description: >- - 'Success case ("200 OK"). - The resources identified in the request for retrieval are returned - in the response message body.' - content: - application/json: - schema: - type: array - items: - $ref: '#/components/schemas/FileInfo' - default: - description: Error case. - content: - application/json: - schema: - $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' - /subscriptions: - post: - summary: Create a subscription - description: >- - To create a subscription the representation of the subscription is - POSTed on the /subscriptions collection resource. - requestBody: - required: true - content: - application/json: - schema: - $ref: 'faultMnS.yaml#/components/schemas/Subscription' - responses: - '201': - description: >- - Success case ("201 Created"). - The representation of the newly created subscription resource shall - be returned. - content: - application/json: - schema: - $ref: 'faultMnS.yaml#/components/schemas/Subscription' - headers: - Location: - description: URI of the newly created subscription resource - required: true - schema: - type: string - default: - description: Error case. - content: - application/json: - schema: - $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' - callbacks: - notifyFileReady: - '{request.body#/consumerReference}': - post: - requestBody: - required: true - content: - application/json: - schema: - $ref: '#/components/schemas/NotifyFileReady' - responses: - '204': - description: >- - Success case ("204 No Content"). - The notification is successfully delivered. The response message - body is absent. - default: - description: Error case. - content: - application/json: - schema: - $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' - notifyFilePreparationError: - '{request.body#/consumerReference}': - post: - requestBody: - required: true - content: - application/json: - schema: - $ref: '#/components/schemas/NotifyFilePreparationError' - responses: - '204': - description: >- - Success case ("204 No Content"). - The notification is successfully delivered. The response message - body is absent. - default: - description: Error case. - content: - application/json: - schema: - $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' - /subscriptions/{subscriptionId}: - delete: - summary: Delete a subscription - description: >- - The subscription is deleted by deleting the corresponding subscription - resource. The resource to be deleted is identified with the path - component of the URI. - parameters: - - name: subscriptionId - in: path - description: Identifies the subscription to be deleted. - required: true - schema: - type: string - responses: - '204': - description: >- - Success case ("204 No Content"). - The subscription resource has been deleted. The response message body - is absent. - default: - description: Error case. - content: - application/json: - schema: - $ref: 'comDefs.yaml#/components/schemas/ErrorResponse' -components: - schemas: - FileDataType: - type: string - enum: - - Performance - - Trace - - Anatytics - - Proprietary - FileNotificationTypes: - type: string - enum: - - notifyFileReady - - notifyFilePreparationError - FileInfo: - type: object - properties: - fileLocation: - $ref: 'comDefs.yaml#/components/schemas/Uri' - fileSize: - type: integer - fileReadyTime: - $ref: 'comDefs.yaml#/components/schemas/DateTime' - fileExpirationTime: - $ref: 'comDefs.yaml#/components/schemas/DateTime' - fileCompression: - type: string - fileFormat: - type: string - fileDataType: - $ref: '#/components/schemas/FileDataType' - NotifyFileReady: - allOf: - - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - - type: object - properties: - fileInfoList: - type: array - items: - $ref: '#/components/schemas/FileInfo' - additionalText: - type: string - NotifyFilePreparationError: - allOf: - - $ref: 'comDefs.yaml#/components/schemas/NotificationHeader' - - type: object - properties: - fileInfoList: - type: array - items: - $ref: '#/components/schemas/FileInfo' - reason: - type: string - additionalText: - type: string \ No newline at end of file -- GitLab From d96f6d4827aa964a9885d93e0e5cbfed25d53716 Mon Sep 17 00:00:00 2001 From: pingj Date: Tue, 8 Jun 2021 06:27:30 +0200 Subject: [PATCH 22/29] Update OpenAPI header with new TS version: 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index e6de13427..b8fb363e7 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -1,13 +1,13 @@ openapi: 3.0.1 info: title: 3GPP 5GC NRM - version: 16.6.0 + version: 16.9.0 description: >- OAS 3.0.1 specification of the 5GC NRM © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.541 V16.6.0; 5G NRM, 5GC NRM + description: 3GPP TS 28.541 V16.9.0; 5G NRM, 5GC NRM url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.541/ paths: {} components: -- GitLab From 09fa55bf24389dba862833a8df2c42ef3730a8aa Mon Sep 17 00:00:00 2001 From: pingj Date: Tue, 8 Jun 2021 06:28:51 +0200 Subject: [PATCH 23/29] Update OpenAPI header with new TS version: nrNrm.yaml --- OpenAPI/nrNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index 406529b57..83f09c562 100644 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -1,13 +1,13 @@ openapi: 3.0.1 info: title: NR NRM - version: 16.6.0 + version: 16.9.0 description: >- OAS 3.0.1 specification of the NR NRM © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.541 V16.6.0; 5G NRM, NR NRM + description: 3GPP TS 28.541 V16.9.0; 5G NRM, NR NRM url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.541/ paths: {} components: -- GitLab From f15861c0dd50358125174253e565d3b4d4775050 Mon Sep 17 00:00:00 2001 From: pingj Date: Tue, 8 Jun 2021 06:29:39 +0200 Subject: [PATCH 24/29] Update OpenAPI header with new TS version: sliceNrm.yaml --- OpenAPI/sliceNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index 66ef52fd0..b7218014f 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -1,13 +1,13 @@ openapi: 3.0.1 info: title: Slice NRM - version: 16.8.0 + version: 16.9.0 description: >- OAS 3.0.1 specification of the Slice NRM @ 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.541 V16.4.0; 5G NRM, Slice NRM + description: 3GPP TS 28.541 V16.9.0; 5G NRM, Slice NRM url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.541/ paths: {} components: -- GitLab From 3c34c956559186e707c8d6d545596578c49c196a Mon Sep 17 00:00:00 2001 From: pingj Date: Tue, 8 Jun 2021 06:33:31 +0200 Subject: [PATCH 25/29] Update OpenAPI header with new TS version: fileDataReportingMnS.yaml --- OpenAPI/fileDataReportingMnS.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/fileDataReportingMnS.yaml b/OpenAPI/fileDataReportingMnS.yaml index 0c18b8f52..66bf53764 100644 --- a/OpenAPI/fileDataReportingMnS.yaml +++ b/OpenAPI/fileDataReportingMnS.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: File Data Reporting MnS - version: 16.7.0 + version: 16.8.0 description: >- OAS 3.0.1 definition of the File Data Reporting MnS © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From e98e75489bcf7318902dde0782f45ff7bb96cf9f Mon Sep 17 00:00:00 2001 From: pingj Date: Tue, 8 Jun 2021 07:36:32 +0200 Subject: [PATCH 26/29] Update OpenAPI header with new TS version: 5gcNrm.yaml --- OpenAPI/5gcNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/5gcNrm.yaml b/OpenAPI/5gcNrm.yaml index b8fb363e7..543c2be3d 100644 --- a/OpenAPI/5gcNrm.yaml +++ b/OpenAPI/5gcNrm.yaml @@ -7,7 +7,7 @@ info: © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.541 V16.9.0; 5G NRM, 5GC NRM + description: 3GPP TS 28.541; 5G NRM, 5GC NRM url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.541/ paths: {} components: -- GitLab From 37ecb695d6596d71f8515ddadc3e525400e38cf3 Mon Sep 17 00:00:00 2001 From: pingj Date: Tue, 8 Jun 2021 07:37:44 +0200 Subject: [PATCH 27/29] Update OpenAPI header with new TS version: genericNrm.yaml --- OpenAPI/genericNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/genericNrm.yaml b/OpenAPI/genericNrm.yaml index c0019a34d..c45aad4b2 100644 --- a/OpenAPI/genericNrm.yaml +++ b/OpenAPI/genericNrm.yaml @@ -7,7 +7,7 @@ info: © 2021, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.623 V16.7.0; Generic NRM + description: 3GPP TS 28.623; Generic NRM url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/ paths: {} components: -- GitLab From 8ba276d7c1f51d61a022035b25086c48069ffed6 Mon Sep 17 00:00:00 2001 From: pingj Date: Tue, 8 Jun 2021 07:38:41 +0200 Subject: [PATCH 28/29] Update OpenAPI header with new TS version: nrNrm.yaml --- OpenAPI/nrNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml index 83f09c562..ada95116b 100644 --- a/OpenAPI/nrNrm.yaml +++ b/OpenAPI/nrNrm.yaml @@ -7,7 +7,7 @@ info: © 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.541 V16.9.0; 5G NRM, NR NRM + description: 3GPP TS 28.541; 5G NRM, NR NRM url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.541/ paths: {} components: -- GitLab From ee61f83eadb9e245465484d3038b1165ef68b108 Mon Sep 17 00:00:00 2001 From: pingj Date: Tue, 8 Jun 2021 07:39:43 +0200 Subject: [PATCH 29/29] Update OpenAPI header with new TS version: sliceNrm.yaml --- OpenAPI/sliceNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/sliceNrm.yaml b/OpenAPI/sliceNrm.yaml index b7218014f..81a86cc0f 100644 --- a/OpenAPI/sliceNrm.yaml +++ b/OpenAPI/sliceNrm.yaml @@ -7,7 +7,7 @@ info: @ 2020, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.541 V16.9.0; 5G NRM, Slice NRM + description: 3GPP TS 28.541; 5G NRM, Slice NRM url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.541/ paths: {} components: -- GitLab