From 0a82270b676657f3928bece27b661b5d98f7bd83 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 20 Sep 2023 01:38:09 +0000 Subject: [PATCH 001/119] Alige with the latest TS28532_FaultMnS.yaml in Rel-17 brnach --- OpenAPI/TS28532_FaultMnS.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28532_FaultMnS.yaml b/OpenAPI/TS28532_FaultMnS.yaml index fdb9a540a..2891cb221 100755 --- a/OpenAPI/TS28532_FaultMnS.yaml +++ b/OpenAPI/TS28532_FaultMnS.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Fault Supervision MnS - version: 17.2.0 + version: 17.3.0 description: >- OAS 3.0.1 definition of the Fault Supervision MnS © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -135,7 +135,7 @@ paths: patch: summary: 'Clear, acknowledge or unacknowledge a single alarm' description: >- - Clears, acknowledges or uncknowldeges a single alarm by patching the alarm + Clears, acknowledges or unacknowldeges a single alarm by patching the alarm information. A conditional acknowledge request based on the perceived severity is not supported. parameters: @@ -792,6 +792,7 @@ components: required: - alarmId - alarmType + - probableCause properties: alarmId: $ref: '#/components/schemas/AlarmId' @@ -834,6 +835,7 @@ components: required: - alarmId - alarmType + - probableCause - serviceUser - serviceProvider - securityAlarmDetector @@ -961,7 +963,7 @@ components: MergePatchAcknowledgeAlarm: description: >- Patch document acknowledging or unacknowledging a single alarm. For - acknowleding an alarm the value of ackState is ACKNOWLEDGED, for unacknowleding + acknowledging an alarm the value of ackState is ACKNOWLEDGED, for unacknowledging an alarm the value of ackState is UNACKNOWLEDGED. type: object required: -- GitLab From 997e31efcc98e26bcf7b847e2a3688480916213f Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 20 Sep 2023 01:39:02 +0000 Subject: [PATCH 002/119] Align with the TS28532_FileDataReportingMnS.yaml in Rel-17 branch --- OpenAPI/TS28532_FileDataReportingMnS.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28532_FileDataReportingMnS.yaml b/OpenAPI/TS28532_FileDataReportingMnS.yaml index 0690f0064..27c5a23b0 100644 --- a/OpenAPI/TS28532_FileDataReportingMnS.yaml +++ b/OpenAPI/TS28532_FileDataReportingMnS.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: File Data Reporting MnS - version: 17.1.0 + version: 17.3.0 description: >- OAS 3.0.1 definition of the File Data Reporting MnS © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -179,7 +179,7 @@ components: enum: - Performance - Trace - - Anatytics + - Analytics - Proprietary FileNotificationTypes: type: string -- GitLab From d59552ee0f59dba4e7e0f298b2c67ee929e4b63a Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 20 Sep 2023 01:39:49 +0000 Subject: [PATCH 003/119] Align with the latest TS28532_ProvMnS.yaml in Rel-17 branch --- OpenAPI/TS28532_ProvMnS.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index f2cacf0ed..7b734bc79 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Provisioning MnS - version: 17.5.0 + version: 17.6.0 description: >- OAS 3.0.1 definition of the Provisioning MnS © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -52,7 +52,7 @@ paths: This status code shall be returned when the resource is replaced, and when the replaced resource representation is not identical to the resource representation in the request. - This status code may be retourned when the resource is updated and when the + This status code may be returned when the resource is updated and when the updated resource representation is identical to the resource representation in the request. The representation of the updated resource is returned in the response @@ -205,7 +205,7 @@ paths: description: >- This parameter specifies the attributes of the scoped resources that are returned. - required: true + required: false schema: type: array items: -- GitLab From 18449ac078b4f4ef1a96d292dd83dbc08f3f5017 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 25 Sep 2023 09:20:47 +0000 Subject: [PATCH 004/119] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 900167412..0cafaef6e 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -76,10 +76,11 @@ components: intentFeasibilityCheckReport: type: array items: - $ref: '#/components/schemas/IntentFeasibilityCheckReport' + $ref: '#/components/schemas/IntentFeasibilityCheckReport' + lastUpdated: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' intentReference: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - IntentHandlingFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -348,8 +349,18 @@ components: - INTENT_CONFLICT - EXPECTATION_CONFLICT - TARGET_CONFLICT - conflictField: - type: string + conflictingIntent: + description: >- + This will be present if the value of conflictType is INTENT_CONFLICT.It describes the DN of the conflicting intent + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + conflictingExpectation: + description: >- + This will be present if the value of conflictType is TARGET_CONFLICT.It describes the expectationId of the conflicting IntentExpectation with an Intent + type: string + conflictingTarget: + description: >- + This will be present if the value of conflictType is EXPECTATION_CONFLICT.It describes the targetName of the conflicting ExpectationTarget with an IntentExpectation + type: string #-------Definition of the concrete IntentConflictReport dataType----------------# #-------Definition of the generic IntentFeasibilityCheckReport dataType----------------# @@ -381,9 +392,7 @@ components: - RAN_SUBNETWORK - EDGE_SERVICE_SUPPORT supportedExpectationTargetType: - type: array - items: - $ref: "#/components/schemas/ExpectationTarget" + type: string #-------Definition of the concrete IntentHandlingCapability dataType----------------# #------Definition of JSON arrays for name-contained IOCs ---------------# @@ -415,6 +424,8 @@ components: resources-intentNrm: oneOf: - $ref: '#/components/schemas/SubNetwork-Single' + - $ref: '#/components/schemas/IntentHandlingFunction-Single' - $ref: '#/components/schemas/Intent-Single' + - $ref: '#/components/schemas/IntentReport-Single' #----- Definitions in TS 28.312 for TS 28.532 --------------------------# -- GitLab From 8bde96ed589dbe3f8027d852a7c4e4e41b7361f6 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 27 Sep 2023 03:40:09 +0000 Subject: [PATCH 005/119] Update file TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 0a5099749..dda0f047e 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -828,7 +828,12 @@ components: $ref: '#/components/schemas/EP_F1C-Single' EP_F1U: $ref: '#/components/schemas/EP_F1U-Multiple' - + configurable5QISetRef: + description: This attribute is condition optional. The condition is NG-RAN Multi-Operator Core Network (NG-RAN MOCN) network sharing with operator specific 5QI is supported. + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + dynamic5QISetRef: + description: This attribute is condition optional. The condition is NG-RAN Multi-Operator Core Network (NG-RAN MOCN) network sharing with operator specific 5QI is supported. + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' GnbCuUpFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' -- GitLab From 80155b02b2741576bfaf216b7a84207f21af2cd4 Mon Sep 17 00:00:00 2001 From: Shitao Li Date: Thu, 28 Sep 2023 02:42:10 +0000 Subject: [PATCH 006/119] Update TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 900167412..32434736c 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -44,7 +44,8 @@ components: oneOf: - $ref: "#/components/schemas/IntentExpectation" - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/RadioNetworkExpectation" - - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/EdgeServiceSupportExpectation" + - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/EdgeServiceSupportExpectation" + - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/5GCNetworkExpectation" intentContexts: type: array items: @@ -131,6 +132,7 @@ components: enum: - RAN_SubNetwork #value for Radio Network Expectation--# - Edge_Service_Support #value for Edge Service Support Expectation--# + - 5GC_SubNetwork #value for 5GC Network Expectation--# objectInstance: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' objectContexts: @@ -380,6 +382,7 @@ components: enum: - RAN_SUBNETWORK - EDGE_SERVICE_SUPPORT + - 5GC_SUBNETWORK supportedExpectationTargetType: type: array items: -- GitLab From 8922825e1fa4ade2b310fb9b46ef44167bb1d6ba Mon Sep 17 00:00:00 2001 From: Shitao Li Date: Thu, 28 Sep 2023 02:57:50 +0000 Subject: [PATCH 007/119] Update TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 129 +++++++++++++++++++++++- 1 file changed, 125 insertions(+), 4 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 5423a87ad..7f98116b5 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -105,11 +105,18 @@ components: oneOf: - $ref: "#/components/schemas/MaxNumberofPDUsessionsTarget" - $ref: "#/components/schemas/MaxNumberofRegisteredsubscribersTarget" + - $ref: "#/components/schemas/IncomingDataTarget" + - $ref: "#/components/schemas/OutgoingDataTarget" - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget" expectationContexts: type: array items: - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext" + type: object + oneOf: + - $ref: '#/components/schemas/StartTimeContext' + - $ref: '#/components/schemas/DeploymentTypeContext' + - $ref: '#/components/schemas/ResourceSharingLevelContext' + - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext" expectationfulfilmentInfo: $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" required: @@ -180,7 +187,9 @@ components: - $ref: "#/components/schemas/NfInstanceLocationContext" - $ref: "#/components/schemas/PLMNContext" - $ref: "#/components/schemas/TaiContext" - - $ref: "#/components/schemas/ObjectContext" + - $ref: "#/components/schemas/ServingScopeContext" + - $ref: "#/components/schemas/DnnContext" + - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ObjectContext" #-------Definition of the ExpectationObject dataType ----------# @@ -607,6 +616,23 @@ components: - IS_LESS_THAN targetValueRange: type: integer + targetContexts: + $ref: '#/components/schemas/5GSessionContext' + 5GSessionContext: + description: >- + This data type is the "TargetContext" data type with specialisations for 5GSessionContext + type: object + properties: + contextAttribute: + type: string + enum: + - 5GSession + contextCondition: + type: string + enum: + - IS_LESS_THAN + contextValueRange: + type: integer MaxNumberofRegisteredsubscribersTarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofRegisteredsubscribersTarget @@ -622,7 +648,36 @@ components: - IS_LESS_THAN targetValueRange: type: integer - + IncomingDataTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for IncomingDataTarget + type: object + properties: + targetName: + type: string + enum: + - InComingData + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer + OutgoingDataTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for OutgoingDataTarget + type: object + properties: + targetName: + type: string + enum: + - OutGoingData + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer #-------Definition of the concrete ExpectationTarget dataType----------# #-------Definition of the concrete ObjectTarget dataType----------------# @@ -858,7 +913,40 @@ components: type: array items: $ref: "TS28623_GenericNrm.yaml#/components/schemas/Tai" - + ServingScopeContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for ServingScopeContext + type: object + properties: + contextAttribute: + type: string + enum: + - ServingScope + contextCondition: + type: string + enum: + - IS_ALL_OF + contextValueRange: + type: array + items: + type: string + DnnContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for DnnContext + type: object + properties: + contextAttribute: + type: string + enum: + - Dnn + contextCondition: + type: string + enum: + - IS_ALL_OF + contextValueRange: + type: array + items: + type: string #-------Definition of the scenario specific ObjectTarget dataType----------------# #-------Definition of the concrete ExpectationContext dataType----------------# @@ -922,4 +1010,37 @@ components: - IS_EQUAL_TO contextValueRange: $ref: "TS28541_SliceNrm.yaml#/components/schemas/SharingLevel" + StartTimeContext: + description: >- + This data type is the "ExpectationContext" data type with specialisations for StartTimeContext + type: object + properties: + contextAttribute: + type: string + enum: + - StartTime + contextCondition: + type: string + enum: + - IS_EQUAL_TO + contextValueRange: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + DeploymentTypeContext: + description: >- + This data type is the "ExpectationContext" data type with specialisations for DeploymentTypeContext + type: object + properties: + contextAttribute: + type: string + enum: + - DeploymentType + contextCondition: + type: string + enum: + - IS_EQUAL_TO + contextValueRange: + type: string + enum: + - PHYSICAL + - VIRTUALISED #-------Definition of the concrete ExpectionContext dataType----------------# -- GitLab From ffae76dc50820f271c8641e681846855c3ad9c2c Mon Sep 17 00:00:00 2001 From: Shitao Li Date: Thu, 28 Sep 2023 03:04:03 +0000 Subject: [PATCH 008/119] Update TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 7f98116b5..3d35c6dea 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -189,9 +189,8 @@ components: - $ref: "#/components/schemas/TaiContext" - $ref: "#/components/schemas/ServingScopeContext" - $ref: "#/components/schemas/DnnContext" - - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ObjectContext" - #-------Definition of the ExpectationObject dataType ----------# - + - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ObjectContext' + #-------Definition of the ExpectationObject dataType ----------# #-------Definition of the Scenario specific ExpectationTarget dataType----------# WeakRSRPRatioTarget: -- GitLab From 3ce8cb3ae6731bb206d545b7af842ddac2a085dd Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Fri, 29 Sep 2023 07:02:13 +0000 Subject: [PATCH 009/119] Attributes maxDLDataVolume and maxULDataVolume added to RANSliceSubnetProfile and TopSliceSubnetProfile. --- OpenAPI/TS28541_SliceNrm.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 88eeb7702..6a61d421c 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -354,6 +354,10 @@ components: $ref: '#/components/schemas/N6Protection' nonIPSupport: $ref: '#/components/schemas/NonIPSupport' + maxDLDataVolume: + type: number + maxULDataVolume: + type: number RANSliceSubnetProfile: type: object @@ -412,6 +416,11 @@ components: $ref: '#/components/schemas/DeterministicComm' nonIPSupport: $ref: '#/components/schemas/NonIPSupport' + maxDLDataVolume: + type: number + maxULDataVolume: + type: number + TopSliceSubnetProfile: type: object properties: @@ -475,6 +484,10 @@ components: $ref: '#/components/schemas/N6Protection' nonIPSupport: $ref: '#/components/schemas/NonIPSupport' + maxDLDataVolume: + type: number + maxULDataVolume: + type: number ServiceProfile: type: object -- GitLab From c058d7ad2b986ff0cd48364ea93049f92e6cd40a Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 9 Oct 2023 15:23:49 +0000 Subject: [PATCH 010/119] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 0cafaef6e..376a8c2c2 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -351,15 +351,15 @@ components: - TARGET_CONFLICT conflictingIntent: description: >- - This will be present if the value of conflictType is INTENT_CONFLICT.It describes the DN of the conflicting intent + This will be present if the value of conflictType is INTENT_CONFLICT. It describes the DN of the conflicting intent $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' conflictingExpectation: description: >- - This will be present if the value of conflictType is TARGET_CONFLICT.It describes the expectationId of the conflicting IntentExpectation with an Intent + This will be present if the value of conflictType is EXPECTATION_CONFLICT. It describes the expectationId of the conflicting IntentExpectation with an Intent type: string conflictingTarget: description: >- - This will be present if the value of conflictType is EXPECTATION_CONFLICT.It describes the targetName of the conflicting ExpectationTarget with an IntentExpectation + This will be present if the value of conflictType is TARGET_CONFLICT. It describes the targetName of the conflicting ExpectationTarget with an IntentExpectation type: string #-------Definition of the concrete IntentConflictReport dataType----------------# -- GitLab From bef98aaa739a716a16510ddc95d1f8e120f0af58 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 13 Oct 2023 06:43:31 +0000 Subject: [PATCH 011/119] Rel18 ts28.623 add nrm fragments for scheduler and condition mupdaonitor (open api definition) --- OpenAPI/TS28623_ComDefs.yaml | 46 ++++++++++++++--- OpenAPI/TS28623_GenericNrm.yaml | 91 +++++++++++++++++++++++++++++++++ 2 files changed, 131 insertions(+), 6 deletions(-) diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index eb9723510..aed71dbd3 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -19,6 +19,23 @@ components: DateTime: type: string format: date-time + FullTime: + type: string + description: format (e.g., full-time) is from RFC 3339 + format: full-time + DateMonth: + type: string + format: date-month + DateMonthDay: + type: string + format: date-mday + DayInYear: + type: object + properties: + month: + $ref: '#/components/schemas/DateMonth' + monthDay: + $ref: '#/components/schemas/DateMonthDay' Latitude: type: number format: float @@ -65,12 +82,21 @@ components: type: string pattern: '^[A-Fa-f0-9]{9}$' TimeWindow: - type: object - properties: - startTime: - $ref: '#/components/schemas/DateTime' - endTime: - $ref: '#/components/schemas/DateTime' + oneOf: + - type: object + properties: + startTime: + $ref: '#/components/schemas/DateTime' + endTime: + $ref: '#/components/schemas/DateTime' + - type: object + properties: + startTime: + $ref: '#/components/schemas/DateTime' + - type: object + properties: + endTime: + $ref: '#/components/schemas/DateTime' GeoCoordinate: type: object properties: @@ -150,6 +176,14 @@ components: Uri: type: string + TimeInterval: + type: object + properties: + intervalStart: + $ref: '#/components/schemas/FullTime' + intervalEnd: + $ref: '#/components/schemas/FullTime' + AdministrativeState: type: string enum: diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index e04340444..0c0ad5de6 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -397,6 +397,45 @@ components: - UP sst: type: integer + SchedulingTime: + oneOf: + - $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + - type: object + properties: + timeIntervals: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeInterval' + - type: object + properties: + timeIntervals: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeInterval' + daysOfWeek: + type: array + items: + type: string + enum: + - MONDAY + - TUESDAY + - WEDNESDAY + - THURSDAY + - FRIDAY + - SATURDAY + - SUNDAY + - type: object + properties: + timeIntervals: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeInterval' + daysOfMonth: + type: array + items: + type: integer + minimum: 0 + maximum: 31 #-------- Definition of types used in Trace control NRM fragment------------------ @@ -1784,6 +1823,10 @@ components: $ref: '#/components/schemas/Files-Multiple' MnsRegistry: $ref: '#/components/schemas/MnsRegistry-Single' + Scheduler: + $ref: '#/components/schemas/Scheduler-Multiple' + ConditionMonitor: + $ref: '#/components/schemas/ConditionMonitor-Multiple' ManagedElement-ncO: type: object properties: @@ -1803,6 +1846,10 @@ components: $ref: '#/components/schemas/FileDownloadJob-Multiple' Files: $ref: '#/components/schemas/Files-Multiple' + Scheduler: + $ref: '#/components/schemas/Scheduler-Multiple' + ConditionMonitor: + $ref: '#/components/schemas/ConditionMonitor-Multiple' #-------- Definition of abstract IOCs -------------------------------------------- @@ -1971,6 +2018,8 @@ components: properties: attributes: type: object + not: + required: [ conditionMonitorRef, schedulerRef ] properties: administrativeState: $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' @@ -1989,10 +2038,15 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' rootObjectInstances: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + conditionMonitorRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + schedulerRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' reportingCtrl: $ref: '#/components/schemas/ReportingCtrl' Files: $ref: '#/components/schemas/Files-Multiple' + ThresholdMonitor-Single: allOf: - $ref: '#/components/schemas/Top' @@ -2210,6 +2264,33 @@ components: type: array items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + Scheduler-Single: + allOf: + - $ref: '#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + schedulingTimes: + type: array + items: + $ref: '#/components/schemas/SchedulingTime' + minItems: 1 + schedulerStatus: + type: boolean + ConditionMonitor-Single: + allOf: + - $ref: '#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + condition: + type: string + conditionStatus: + type: boolean #-------- Definition of YAML arrays for name-contained IOCs ---------------------- @@ -2269,6 +2350,14 @@ components: type: array items: $ref: '#/components/schemas/MnsInfo-Single' + Scheduler-Multiple: + type: array + items: + $ref: '#/components/schemas/Scheduler-Single' + ConditionMonitor-Multiple: + type: array + items: + $ref: '#/components/schemas/ConditionMonitor-Single' #-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- @@ -2299,3 +2388,5 @@ components: - $ref: '#/components/schemas/MnsRegistry-Single' - $ref: '#/components/schemas/MnsInfo-Single' + - $ref: '#/components/schemas/Scheduler-Single' + - $ref: '#/components/schemas/ConditionMonitor-Single' -- GitLab From 28a1355126acfff531e7f98302c97e63934fee67 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 13 Oct 2023 06:55:29 +0000 Subject: [PATCH 012/119] Ts28.541 rel18 cr1041 correction to data type property for a mf identifier & a mf set id & a mf region id and s d --- OpenAPI/TS28541_NrNrm.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 0a5099749..370f6f68c 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -43,6 +43,7 @@ components: $ref: '#/components/schemas/Sst' sd: type: string + pattern: '^[A-Fa-f0-9]{6}$' PlmnIdList: type: array -- GitLab From 724ca7edf246805557bee3fafef7167a3c3638db Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 13 Oct 2023 07:14:47 +0000 Subject: [PATCH 013/119] Ts28.541 rel18 cr1026 correction to npn identity stage2 stage 3 issue --- OpenAPI/TS28541_NrNrm.yaml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 370f6f68c..ff834f78a 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -66,13 +66,24 @@ components: type: string NpnIdentity: type: object + oneOf: + - required: [ plmnId, cagidList ] + - required: [ plmnId, nidList ] properties: plmnId: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' cagidList: - $ref: '#/components/schemas/cagId' + type: array + items: + $ref: '#/components/schemas/cagId' + minItems: 1 + maxItems: 12 nidList: - $ref: '#/components/schemas/nid' + type: array + items: + $ref: '#/components/schemas/nid' + minItems: 1 + maxItems: 12 NpnIdentityList: type: array items: -- GitLab From fda414463d362f54e7d48a284c3065541aed7b73 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 13 Oct 2023 07:21:52 +0000 Subject: [PATCH 014/119] Ts28.541 rel18 cr1019 nrm enhancements for upf info and pcf info and net info --- OpenAPI/TS28541_5GcNrm.yaml | 132 +++++++++++++++++++++++++++++++++--- 1 file changed, 123 insertions(+), 9 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 4cf5ec976..25404c6f8 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1596,14 +1596,14 @@ components: UpfInfo: description: Information of an UPF NF Instance type: object - # required: - # - sNssaiUpfInfoList + required: + - sNssaiUpfInfoList properties: - # sNssaiUpfInfoList: - # type: array - # items: - # $ref: '#/components/schemas/SnssaiUpfInfoItem' - # minItems: 1 + sNssaiUpfInfoList: + type: array + items: + $ref: '#/components/schemas/SnssaiUpfInfoItem' + minItems: 1 smfServingArea: type: array items: @@ -1617,8 +1617,8 @@ components: iwkEpsInd: type: boolean default: false - # sxaInd: - # type: boolean + sxaInd: + type: boolean pduSessionTypes: type: array items: @@ -1669,6 +1669,95 @@ components: # $ref: 'TS29564_Nupf_EventExposure.yaml#/components/schemas/EventType' # minItems: 1 + # SnssaiUpfInfoItem/IpIndex/DnnUpfInfoItem stage2/3 introduced in SnssaiUpfInfoItem is introduced in CR1020 (via S5-236244) + # the stage 3 for these threes are only for validation. When merged in integration branch, + # the stage 3 for these three shall only keep one copy + SnssaiUpfInfoItem: + description: Set of parameters supported by UPF for a given S-NSSAI + type: object + required: + - sNssai + - dnnUpfInfoList + properties: + sNssai: + $ref: 'TS29571_CommonData.yaml#/components/schemas/ExtSnssai' + dnnUpfInfoList: + type: array + items: + $ref: '#/components/schemas/DnnUpfInfoItem' + minItems: 1 + redundantTransport: + type: boolean + default: false + IpIndex: + description: Represents the IP Index to be sent from UDM to the SMF (its value can be either an integer or a string) + anyOf: + - type: integer + - type: string + DnnUpfInfoItem: + description: Set of parameters supported by UPF for a given DNN + type: object + required: + - dnn + properties: + dnn: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn' + dnaiList: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai' + minItems: 1 + pduSessionTypes: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/PduSessionType' + minItems: 1 + ipv4AddressRanges: + type: array + items: + $ref: '#/components/schemas/Ipv4AddressRange' + minItems: 1 + ipv6PrefixRanges: + type: array + items: + $ref: '#/components/schemas/Ipv6PrefixRange' + minItems: 1 + natedIpv4AddressRanges: + type: array + items: + $ref: '#/components/schemas/Ipv4AddressRange' + minItems: 1 + natedIpv6PrefixRanges: + type: array + items: + $ref: '#/components/schemas/Ipv6PrefixRange' + minItems: 1 + ipv4IndexList: + type: array + items: + $ref: '#/components/schemas/IpIndex' + minItems: 1 + ipv6IndexList: + type: array + items: + $ref: '#/components/schemas/IpIndex' + minItems: 1 + networkInstance: + description: > + The N6 Network Instance associated with the S-NSSAI and DNN. + type: string + dnaiNwInstanceList: + description: > + Map of network instance per DNAI for the DNN, where the key of the map is the DNAI. + When present, the value of each entry of the map shall contain a N6 network instance + that is configured for the DNAI indicated by the key. + type: object + additionalProperties: + type: string + minProperties: 1 + not: + required: [ networkInstance, dnaiNwInstanceList ] + PcfInfo: description: Information of a PCF NF Instance type: object @@ -1704,6 +1793,25 @@ components: $ref: '#/components/schemas/ProseCapability' v2xCapability: $ref: '#/components/schemas/V2xCapability' + a2xSupportInd: + type: boolean + default: false + a2xCapability: + $ref: '#/components/schemas/A2xCapability' + rangingSlPosSupportInd: + type: boolean + default: false + + A2xCapability: + description: Information of the supported A2X Capability by the PCF + type: object + properties: + lteA2x: + type: boolean + default: false + nrA2x: + type: boolean + default: false NefInfo: description: Information of an NEF NF Instance @@ -1751,6 +1859,12 @@ components: uasNfFunctionalityInd: type: boolean default: false + multiMemAfSessQosInd: + type: boolean + default: false + memberUESelAssistInd: + type: boolean + default: false NrfInfo: description: Information of an NRF NF Instance, used in hierarchical NRF deployments -- GitLab From 223f037446e6a2c69e6d47564ef22ba7e5902854 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 29 Sep 2023 10:06:43 +0000 Subject: [PATCH 015/119] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 900167412..cf638d61e 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -342,6 +342,8 @@ components: This data type is the "IntentConflictReport" data type without specialisations type: object properties: + conflictId: + type: string conflictType: type: string enum: -- GitLab From d7a5bf72d0fac72bc771f0214f5ea1d6d05fac91 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 11 Oct 2023 13:56:13 +0000 Subject: [PATCH 016/119] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index cf638d61e..03af89506 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -66,17 +66,13 @@ components: - type: object properties: intentFulfilmentReport: - type: array - items: - $ref: '#/components/schemas/IntentFulfilmentReport' + $ref: '#/components/schemas/IntentFulfilmentReport' intentConflictReports: type: array items: $ref: '#/components/schemas/IntentConflictReport' intentFeasibilityCheckReport: - type: array - items: - $ref: '#/components/schemas/IntentFeasibilityCheckReport' + $ref: '#/components/schemas/IntentFeasibilityCheckReport' intentReference: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' -- GitLab From d47debeab51c98ebbdb6a64d6fb10c6356d80ece Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 29 Sep 2023 08:48:10 +0000 Subject: [PATCH 017/119] Update file TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 5423a87ad..ee918931d 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -46,7 +46,10 @@ components: expectationContexts: type: array items: - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext' + type: object + oneOf: + - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/TargetAssuranceTimeContext' + - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext' required: - expectationId EdgeServiceSupportExpectation: @@ -862,6 +865,22 @@ components: #-------Definition of the scenario specific ObjectTarget dataType----------------# #-------Definition of the concrete ExpectationContext dataType----------------# + + TargetAssuranceTimeContext: + description: >- + This data type is the "Expectation Context" data type with specialisations for TargetAssuranceTimeContext + type: object + properties: + contextAttribute: + type: string + enum: + - TargetAssuranceTime + type: string + enum: + - IS_EQUAL_TO + contextValueRange: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + ServiceStartTimeContext: description: >- This data type is the "ExpectationContext" data type with specialisations for ServiceStartTimeContext -- GitLab From 25cfc1162aba74ccf71d4e1d0424452cfe251072 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 29 Sep 2023 08:51:35 +0000 Subject: [PATCH 018/119] Update file TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index ee918931d..6de4f4a08 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -876,6 +876,7 @@ components: enum: - TargetAssuranceTime type: string + contextCondition: enum: - IS_EQUAL_TO contextValueRange: -- GitLab From dd8212ce4c856b48dd729aef9e7893e5a42e0153 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 29 Sep 2023 08:54:57 +0000 Subject: [PATCH 019/119] Update file TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 6de4f4a08..d59842ab0 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -875,8 +875,8 @@ components: type: string enum: - TargetAssuranceTime - type: string contextCondition: + type: string enum: - IS_EQUAL_TO contextValueRange: -- GitLab From b5729a009f8985777fa4a427f0408b61c441edc7 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 29 Sep 2023 09:02:38 +0000 Subject: [PATCH 020/119] Update file TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index d59842ab0..241e55635 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -48,7 +48,7 @@ components: items: type: object oneOf: - - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/TargetAssuranceTimeContext' + - $ref: '#/components/schemas/TargetAssuranceTimeContext' - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext' required: - expectationId -- GitLab From 6e20b6bf56715d4293fb9396be87c1c82b6728b7 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 29 Sep 2023 09:26:37 +0000 Subject: [PATCH 021/119] Update 2 files - /OpenAPI/TS28312_IntentNrm.yaml - /OpenAPI/TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 62 +++++++++++++++++++++++++ OpenAPI/TS28312_IntentNrm.yaml | 3 +- 2 files changed, 64 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 241e55635..c0955d24f 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -52,6 +52,33 @@ components: - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext' required: - expectationId + RadioServiceExpectation: + description: >- + This data type is the "IntentExpectation" data type with specialisations to represent MnS consumer's expectations for radio service delivering + type: object + properties: + expectationId: + type: string + expectationVerb: + $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb" + expectationObject: + $ref: "#/components/schemas/RadioServiceExpectationObject" + expectationTargets: + type: array + items: + type: object + oneOf: + - $ref: '#/components/schemas/DLLatencyTarget' + - $ref: '#/components/schemas/ULLatencyTarget' + - $ref: '#/components/schemas/DLThptPerUETarget' + - $ref: '#/components/schemas/ULThptPerUETarget' + - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget' + expectationContexts: + type: array + items: + $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext' + required: + - expectationId EdgeServiceSupportExpectation: description: >- This data type is the "IntentExpectation" data type with specialisations to represent MnS consumer's expectations for service deployment @@ -143,6 +170,25 @@ components: - $ref: '#/components/schemas/RATContext' - $ref: "#/components/schemas/UEGroupContext" - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ObjectContext' + RadioServiceExpectationObject: + description: >- + This data type is the "ExpectationObject" data type with specialisations for RadioServicekExpectation + type: object + properties: + objectType: + type: string + enum: + - Radio_Service + objectInstance: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + objectContexts: + type: array + items: + type: object + oneOf: + - $ref: '#/components/schemas/CoverageAreaPolygonContext' + - $ref: '#/components/schemas/ServiceTypeContext' + - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ObjectContext' ServiceSupportExpectationObject: description: >- This data type is the "ExpectationObject" data type with specialisations for EdgeServiceSupportExpectation @@ -942,4 +988,20 @@ components: - IS_EQUAL_TO contextValueRange: $ref: "TS28541_SliceNrm.yaml#/components/schemas/SharingLevel" + ServiceTypeContext: + description: >- + This data type is the "ExpectationContext" data type with specialisations for ServiceTypeContext + type: object + properties: + contextAttribute: + type: string + enum: + - ServiceType + contextCondition: + type: string + enum: + - IS_EQUAL_TO + contextValueRange: + $ref: "TS28541_SliceNrm.yaml#/components/schemas/SST" + #-------Definition of the concrete ExpectionContext dataType----------------# diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 03af89506..19515d7fe 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -44,7 +44,8 @@ components: oneOf: - $ref: "#/components/schemas/IntentExpectation" - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/RadioNetworkExpectation" - - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/EdgeServiceSupportExpectation" + - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/EdgeServiceSupportExpectation" + - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/RadioServiceExpectation" intentContexts: type: array items: -- GitLab From 89915cae49fb8411cdf2df8d89a59baa6962478b Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 29 Sep 2023 09:30:08 +0000 Subject: [PATCH 022/119] Update file TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index c0955d24f..4578b76df 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -1002,6 +1002,6 @@ components: enum: - IS_EQUAL_TO contextValueRange: - $ref: "TS28541_SliceNrm.yaml#/components/schemas/SST" + $ref: "TS28541_SliceNrm.yaml#/components/schemas/Sst" #-------Definition of the concrete ExpectionContext dataType----------------# -- GitLab From 81379acf6aeac82587461e87f543f4e19d5d884f Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 29 Sep 2023 09:36:05 +0000 Subject: [PATCH 023/119] Update file TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 4578b76df..b86d911ed 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -1002,6 +1002,6 @@ components: enum: - IS_EQUAL_TO contextValueRange: - $ref: "TS28541_SliceNrm.yaml#/components/schemas/Sst" + $ref: "TS28541_NrNrm.yaml#/components/schemas/Sst" #-------Definition of the concrete ExpectionContext dataType----------------# -- GitLab From aa64f03381db9822ae12682d2b2f3c1b0f190747 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 27 Sep 2023 02:34:25 +0000 Subject: [PATCH 024/119] Update file TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index b86d911ed..90431333f 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -698,13 +698,11 @@ components: enum: - CoverageAreaPolygon contextCondition: - type: string + type: stringEdgeIdentificationIdContext enum: - IS_ALL_OF contextValueRange: - type: array - items: - $ref: '#/components/schemas/CoverageArea' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' CoverageArea: type: string CoverageTACContext: @@ -723,7 +721,7 @@ components: contextValueRange: type: array items: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/NrTac' + $ref: "TS28623_ComDefs.yaml#/components/schemas/Tac" PLMNContext: description: >- This data type is the "ObjectContext" data type with specialisations for PLMNContext @@ -817,9 +815,7 @@ components: enum: - IS_EQUAL_TO contextValueRange: - type: array - items: - type: string + type: string EdgeIdentificationLocContext: description: >- This data type is the "ObjectContext" data type with specialisations for EdgeIdentificationLocContext @@ -834,9 +830,7 @@ components: enum: - IS_EQUAL_TO contextValueRange: - type: array - items: - type: string + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoCoordinate' CoverageAreaTAContext: description: >- This data type is the "ObjectContext" data type with specialisations for CoverageAreaTAContext @@ -853,9 +847,7 @@ components: contextValueRange: type: array items: - $ref: '#/components/schemas/CoverageAreaTAList' - CoverageAreaTAList: - type: integer + $ref: "TS28623_ComDefs.yaml#/components/schemas/Tac" NfTypeContext: description: >- This data type is the "ObjectContext" data type with specialisations for NfTypeContext -- GitLab From 8520b9cc32ea78f6591fd69114e28c6ebb8c3b53 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 27 Sep 2023 02:39:02 +0000 Subject: [PATCH 025/119] Update file TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 90431333f..40f94c033 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -698,13 +698,11 @@ components: enum: - CoverageAreaPolygon contextCondition: - type: stringEdgeIdentificationIdContext + type: string enum: - IS_ALL_OF contextValueRange: $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' - CoverageArea: - type: string CoverageTACContext: description: >- This data type is the "ObjectContext" data type with specialisations for CoverageTACContext -- GitLab From 87ea1b783e344ed87ee255a3ec69443325ce3c86 Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 16 Oct 2023 08:44:31 +0000 Subject: [PATCH 026/119] Ts28.541 rel18 cr1024 correction to stage3 of nr operator cell du containment --- OpenAPI/TS28541_NrNrm.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index ff834f78a..52e96ce9e 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -840,6 +840,8 @@ components: $ref: '#/components/schemas/EP_F1C-Single' EP_F1U: $ref: '#/components/schemas/EP_F1U-Multiple' + NrOperatorCellDu: + $ref: '#/components/schemas/NrOperatorCellDu-Multiple' GnbCuUpFunction-Single: allOf: @@ -1090,8 +1092,7 @@ components: $ref: '#/components/schemas/CPCIConfigurationFunction-Single' DRACHOptimizationFunction: $ref: '#/components/schemas/DRACHOptimizationFunction-Single' - NrOperatorCellDu: - $ref: '#/components/schemas/NrOperatorCellDu-Multiple' + BWPSet-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' -- GitLab From 16d498a1adfb34dde592cb5cb4c1d363379b0a93 Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 16 Oct 2023 08:52:05 +0000 Subject: [PATCH 027/119] Ts28.541 rel18 cr1018 nrm enhancements for nrf function and amf info and smf info --- OpenAPI/TS28541_5GcNrm.yaml | 124 +++++++++++++++++++++--------------- 1 file changed, 72 insertions(+), 52 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 25404c6f8..0fcaad7c3 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1494,18 +1494,38 @@ components: secondaryChfInstance: $ref: 'TS29571_CommonData.yaml#/components/schemas/NfInstanceId' + N2InterfaceAmfInfo: + description: AMF N2 interface information + type: object + anyOf: + - required: [ ipv4EndpointAddress ] + - required: [ ipv6EndpointAddress ] + properties: + ipv4EndpointAddress: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' + minItems: 1 + ipv6EndpointAddress: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' + minItems: 1 + amfName: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' + AmfInfo: description: Information of an AMF NF Instance type: object - # required: - # - amfSetId - # - amfRegionId - # - guamiList + required: + - amfSetId + - amfRegionId + - guamiList properties: - # amfSetId: - # $ref: 'TS29571_CommonData.yaml#/components/schemas/AmfSetId' - # amfRegionId: - # $ref: 'TS29571_CommonData.yaml#/components/schemas/AmfRegionId' + amfSetId: + $ref: 'TS29571_CommonData.yaml#/components/schemas/AmfSetId' + amfRegionId: + $ref: 'TS29571_CommonData.yaml#/components/schemas/AmfRegionId' guamiList: type: array items: @@ -1531,13 +1551,13 @@ components: items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Guami' minItems: 1 - # n2InterfaceAmfInfo: - # $ref: '#/components/schemas/N2InterfaceAmfInfo' - # amfOnboardingCapability: - # type: boolean - # default: false - # highLatencyCom: - # type: boolean + n2InterfaceAmfInfo: + $ref: '#/components/schemas/N2InterfaceAmfInfo' + amfOnboardingCapability: + type: boolean + default: false + highLatencyCom: + type: boolean SmfInfo: description: Information of an SMF NF Instance @@ -1583,15 +1603,15 @@ components: items: $ref: 'TS29571_CommonData.yaml#/components/schemas/Fqdn' minItems: 1 - # smfOnboardingCapability: - # type: boolean - # default: false - # deprecated: true - # ismfSupportInd: - # type: boolean - # smfUPRPCapability: - # type: boolean - # default: false + smfOnboardingCapability: + type: boolean + default: false + deprecated: true + ismfSupportInd: + type: boolean + smfUPRPCapability: + type: boolean + default: false UpfInfo: description: Information of an UPF NF Instance @@ -2010,26 +2030,26 @@ components: - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' minProperties: 1 minProperties: 1 - # servedBsfInfo: - # description: A map (list of key-value pairs) where nfInstanceId serves as key - # type: object - # additionalProperties: - # anyOf: - # - $ref: '#/components/schemas/BsfInfo' - # - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' - # minProperties: 1 - # servedBsfInfoList: - # description: A map (list of key-value pairs) where nfInstanceId serves as key - # type: object - # additionalProperties: - # description: A map (list of key-value pairs) where a valid JSON string serves as key - # type: object - # additionalProperties: - # anyOf: - # - $ref: '#/components/schemas/BsfInfo' - # - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' - # minProperties: 1 - # minProperties: 1 + servedBsfInfo: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/BsfInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + servedBsfInfoList: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + description: A map (list of key-value pairs) where a valid JSON string serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/BsfInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + minProperties: 1 servedChfInfo: description: A map (list of key-value pairs) where nfInstanceId serves as key type: object @@ -2088,14 +2108,14 @@ components: # - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' # minProperties: 1 # minProperties: 1 - # servedGmlcInfo: - # description: A map (list of key-value pairs) where nfInstanceId serves as key - # type: object - # additionalProperties: - # anyOf: - # - $ref: '#/components/schemas/GmlcInfo' - # - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' - # minProperties: 1 + servedGmlcInfo: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/GmlcInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 servedLmfInfo: description: A map (list of key-value pairs) where nfInstanceId serves as key type: object -- GitLab From 62432f6f48eaff63a337d71b343dd59695f20b73 Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 16 Oct 2023 08:57:35 +0000 Subject: [PATCH 028/119] Ts28.541 rel18 cr1021 nrm enhancements for mbsmf function --- OpenAPI/TS28541_5GcNrm.yaml | 303 +++++++++++++++++++++++++++++++++++- 1 file changed, 300 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 0fcaad7c3..5c0a3e2d7 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -2324,7 +2324,202 @@ components: items: $ref: '#/components/schemas/IdentityRange' minItems: 0 - + + MbSmfInfo: + description: Information of an MB-SMF NF Instance + type: object + properties: + sNssaiInfoList: + description: A map (list of key-value pairs) where a valid JSON string serves as key + additionalProperties: + $ref: '#/components/schemas/SnssaiMbSmfInfoItem' + minProperties: 1 + tmgiRangeList: + description: A map (list of key-value pairs) where a valid JSON string serves as key + additionalProperties: + $ref: '#/components/schemas/TmgiRange' + minProperties: 1 + taiList: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Tai' + minItems: 1 + taiRangeList: + type: array + items: + $ref: '#/components/schemas/TaiRange' + minItems: 1 + mbsSessionList: + description: A map (list of key-value pairs) where a valid JSON string serves as key + additionalProperties: + $ref: '#/components/schemas/MbsSession' + minProperties: 1 + + TmgiRange: + description: Range of TMGIs + type: object + required: + - mbsServiceIdStart + - mbsServiceIdEnd + - plmnId + properties: + mbsServiceIdStart: + type: string + pattern: '^[A-Fa-f0-9]{6}$' + mbsServiceIdEnd: + type: string + pattern: '^[A-Fa-f0-9]{6}$' + plmnId: + $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId' + nid: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Nid' + + MbsSession: + description: MBS Session currently served by an MB-SMF + type: object + required: + - mbsSessionId + properties: + mbsSessionId: + $ref: '#/components/schemas/MbsSessionId' + mbsAreaSessions: + description: A map (list of key-value pairs) where the key identifies an areaSessionId + additionalProperties: + $ref: '#/components/schemas/MbsServiceAreaInfo' + minProperties: 1 + + MbsServiceAreaInfo: + description: MBS Service Area Information for location dependent MBS session + type: object + properties: + areaSessionId: + type: integer + minimum: 0 + maximum: 65535 + mbsServiceArea: + $ref: '#/components/schemas/MbsServiceArea' + required: + - areaSessionId + - mbsServiceArea + + MbsSessionId: + description: MBS Session Identifier + type: object + properties: + tmgi: + $ref: '#/components/schemas/Tmgi' + ssm: + $ref: '#/components/schemas/Ssm' + nid: + $ref: '#/components/schemas/Nid' + anyOf: + - required: [ tmgi ] + - required: [ ssm ] + + Tmgi: + description: Temporary Mobile Group Identity + type: object + properties: + mbsServiceId: + type: string + pattern: '^[A-Fa-f0-9]{6}$' + description: MBS Service ID + plmnId: + $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId' + required: + - mbsServiceId + - plmnId + + Ssm: + description: Source specific IP multicast address + type: object + properties: + sourceIpAddr: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' + destIpAddr: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/IpAddr' + required: + - sourceIpAddr + - destIpAddr + + MbsServiceArea: + description: MBS Service Area + type: object + properties: + ncgiList: + type: array + items: + $ref: '#/components/schemas/NcgiTai' + minItems: 1 + description: List of NR cell Ids + taiList: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Tai' + minItems: 1 + description: List of tracking area Ids + anyOf: + - required: [ ncgiList ] + - required: [ taiList ] + + NcgiTai: + description: List of NR cell ids, with their pertaining TAIs + type: object + properties: + tai: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Tai' + cellList: + type: array + items: + $ref: '#/components/schemas/Ncgi' + minItems: 1 + description: List of List of NR cell ids + required: + - tai + - cellList + + Ncgi: + description: Contains the NCGI (NR Cell Global Identity), as described in 3GPP 23.003 + type: object + properties: + plmnId: + $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId' + nrCellId: + type: string + pattern: '^[A-Fa-f0-9]{9}$' + # $ref: 'TS29571_CommonData.yaml#/components/schemas/NrCellId' + nid: + $ref: '#/components/schemas/Nid' + required: + - plmnId + - nrCellId + + SnssaiMbSmfInfoItem: + description: Parameters supported by an MB-SMF for a given S-NSSAI + type: object + required: + - sNssai + - dnnInfoList + properties: + sNssai: + $ref: 'TS29571_CommonData.yaml#/components/schemas/ExtSnssai' + dnnInfoList: + type: array + items: + $ref: '#/components/schemas/DnnMbSmfInfoItem' + minItems: 1 + + DnnMbSmfInfoItem: + description: Parameters supported by an MB-SMF for a given DNN + type: object + required: + - dnn + properties: + dnn: + anyOf: + - $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/WildcardDnn' + AanfInfo: description: Represents the information relative to an AAnF NF Instance. type: object @@ -2335,6 +2530,7 @@ components: type: string pattern: '^[0-9]{1,4}$' + #-------- Definition of concrete IOCs -------------------------------------------- ProvMnS: oneOf: @@ -2451,7 +2647,9 @@ components: AANFFunction: $ref: '#/components/schemas/AanfFunction-Multiple' BSFFunction: - $ref: '#/components/schemas/BsfFunction-Multiple' + $ref: '#/components/schemas/BsfFunction-Multiple' + MBSMFFunction: + $ref: '#/components/schemas/MbSmfFunction-Multiple' AmfFunction-Single: allOf: @@ -2519,7 +2717,9 @@ components: EP_N42: $ref: '#/components/schemas/EP_N42-Multiple' EP_N89: - $ref: '#/components/schemas/EP_N89-Multiple' + $ref: '#/components/schemas/EP_N89-Multiple' + EP_N11mb: + $ref: '#/components/schemas/EP_N11mb-Multiple' AmfSet-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -2609,6 +2809,8 @@ components: $ref: '#/components/schemas/EP_N40-Multiple' EP_N88: $ref: '#/components/schemas/EP_N88-Multiple' + EP_N16mb: + $ref: '#/components/schemas/EP_N16mb-Multiple' FiveQiDscpMappingSet: $ref: '#/components/schemas/FiveQiDscpMappingSet-Single' GtpUPathQoSMonitoringControl: @@ -4438,6 +4640,81 @@ components: $ref: '#/components/schemas/BsfInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + MbSmfFunction-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + plmnIdList: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnIdList' + managedNFProfile: + $ref: '#/components/schemas/ManagedNFProfile' + commModelList: + $ref: '#/components/schemas/CommModelList' + mbSmfInfo: + $ref: '#/components/schemas/MbSmfInfo' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: + EP_N11mb: + $ref: '#/components/schemas/EP_N11mb-Multiple' + EP_N16mb: + $ref: '#/components/schemas/EP_N16mb-Multiple' + EP_Nmb1: + $ref: '#/components/schemas/EP_Nmb1-Multiple' + # EP_N4mb introduced in S5-236244 CR1020, to uncomment the following two lines + # by code moderator when merging CR in integration branch + # EP_N4mb: + # $ref: '#/components/schemas/EP_N4mb-Multiple' + + EP_N11mb-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + EP_N16mb-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + EP_Nmb1-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + #-------- Definition of JSON arrays for name-contained IOCs ---------------------- SubNetwork-Multiple: @@ -4773,6 +5050,18 @@ components: type: array items: $ref: '#/components/schemas/EP_N96-Single' + EP_N11mb-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N11mb-Single' + EP_N16mb-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N16mb-Single' + EP_Nmb1-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_Nmb1-Single' Configurable5QISet-Multiple: type: array items: @@ -4829,6 +5118,10 @@ components: type: array items: $ref: '#/components/schemas/BsfFunction-Single' + MbSmfFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/MbSmfFunction-Single' #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- @@ -4929,6 +5222,9 @@ components: - $ref: '#/components/schemas/EP_NL5-Single' - $ref: '#/components/schemas/EP_NL6-Single' - $ref: '#/components/schemas/EP_NL9-Single' + - $ref: '#/components/schemas/EP_N11mb-Single' + - $ref: '#/components/schemas/EP_N16mb-Single' + - $ref: '#/components/schemas/EP_Nmb1-Single' - $ref: '#/components/schemas/Configurable5QISet-Single' - $ref: '#/components/schemas/FiveQiDscpMappingSet-Single' @@ -4945,3 +5241,4 @@ components: - $ref: '#/components/schemas/TsctsfFunction-Single' - $ref: '#/components/schemas/AanfFunction-Single' - $ref: '#/components/schemas/BsfFunction-Single' + - $ref: '#/components/schemas/MbSmfFunction-Single' -- GitLab From 831e22d363f49fd35d353da5379686d03bad6bda Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 27 Sep 2023 15:02:31 +0000 Subject: [PATCH 029/119] Update file TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 52e96ce9e..349dc43e5 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -259,7 +259,7 @@ components: enum: - DL - UL - - DL and UL + - DL_AND_UL BwpContext: type: string enum: @@ -552,8 +552,8 @@ components: enum: - RS1 - RS2 - - RS1forEnoughMitigation - - RS1forNotEnoughMitigation + - RS1_FOR_ENOUGH_MITIGATION + - RS1_FOR_NOT_ENOUGH_MITIGATION RimRSReportConf: type: object @@ -594,7 +594,7 @@ components: - PRB - PRB_UL - PRB_DL - - RRC + - RRC_CONNECTED_USERS - DRB ParameterRange: type: object @@ -1239,7 +1239,7 @@ components: beamType: type: string enum: - - SSB-BEAM + - SSB_BEAM beamAzimuth: type: integer minimum: -1800 @@ -1487,13 +1487,13 @@ components: isProbingCapable: type: string enum: - - yes - - no + - YES + - NO energySavingState: type: string enum: - - isNotEnergySaving - - isEnergySaving + - IS_NOT_ENERGYSAVING + - IS_ENERGYSAVING DRACHOptimizationFunction-Single: allOf: @@ -1597,13 +1597,13 @@ components: energySavingControl: type: string enum: - - toBeEnergySaving - - toBeNotEnergySaving + - TOBE_ENERGYSAVING + - TOBE_NOT_ENERGYSAVING energySavingState: type: string enum: - - isNotEnergySaving - - isEnergySaving + - IS_NOT_ENERGYSAVING + - IS_ENERGYSAVING RimRSGlobal-Single: allOf: -- GitLab From 00a9708fed728721a6a9e66714e7956452a1496d Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 12 Oct 2023 01:36:18 +0000 Subject: [PATCH 030/119] Update file TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 349dc43e5..21568e87f 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1492,8 +1492,8 @@ components: energySavingState: type: string enum: - - IS_NOT_ENERGYSAVING - - IS_ENERGYSAVING + - IS_NOT_ENERGY_SAVING + - IS_ENERGY_SAVING DRACHOptimizationFunction-Single: allOf: @@ -1597,13 +1597,13 @@ components: energySavingControl: type: string enum: - - TOBE_ENERGYSAVING - - TOBE_NOT_ENERGYSAVING + - TOBE_ENERGY_SAVING + - TOBE_NOT_ENERGY_SAVING energySavingState: type: string enum: - - IS_NOT_ENERGYSAVING - - IS_ENERGYSAVING + - IS_NOT_ENERGY_SAVING + - IS_ENERGY_SAVING RimRSGlobal-Single: allOf: -- GitLab From b58c07d9f21699c6d3ace8197b8d0e2ce5f6f8c1 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 12 Oct 2023 02:05:42 +0000 Subject: [PATCH 031/119] Update file TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 21568e87f..36c6fad24 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1597,8 +1597,8 @@ components: energySavingControl: type: string enum: - - TOBE_ENERGY_SAVING - - TOBE_NOT_ENERGY_SAVING + - TO_BE_ENERGY_SAVING + - TO_BE_NOT_ENERGY_SAVING energySavingState: type: string enum: -- GitLab From ffa32cfc84f99ffdee640a2f5b6db7ba85bb9f72 Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Fri, 29 Sep 2023 06:53:26 +0000 Subject: [PATCH 032/119] Attribute availability added to CNSliceSubnetProfile, RANSliceSubnetProfile and TopSliceSubnetProfile. --- OpenAPI/TS28541_SliceNrm.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 88eeb7702..3b027e24a 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -354,6 +354,8 @@ components: $ref: '#/components/schemas/N6Protection' nonIPSupport: $ref: '#/components/schemas/NonIPSupport' + availability: + type: number RANSliceSubnetProfile: type: object @@ -412,6 +414,9 @@ components: $ref: '#/components/schemas/DeterministicComm' nonIPSupport: $ref: '#/components/schemas/NonIPSupport' + availability: + type: number + TopSliceSubnetProfile: type: object properties: @@ -475,6 +480,8 @@ components: $ref: '#/components/schemas/N6Protection' nonIPSupport: $ref: '#/components/schemas/NonIPSupport' + availability: + type: number ServiceProfile: type: object -- GitLab From 9d7ee379d0961ca75eb970d80161961730e14b43 Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Fri, 29 Sep 2023 06:35:07 +0000 Subject: [PATCH 033/119] Fixing Slice NRM YAML updated with dLReliability and uLReliability --- OpenAPI/TS28541_SliceNrm.yaml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 3b027e24a..941657cac 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -338,7 +338,9 @@ components: $ref: '#/components/schemas/SynchronicityRANSubnet' sliceSimultaneousUse: $ref: '#/components/schemas/SliceSimultaneousUse' - reliability: + dLReliability: + type: number + uLReliability: type: number energyEfficiency: type: number @@ -384,7 +386,9 @@ components: $ref: '#/components/schemas/XLThpt' uESpeed: type: integer - reliability: + dLReliability: + type: number + uLReliability: type: number dLMaxPktSize: type: integer @@ -466,7 +470,9 @@ components: $ref: '#/components/schemas/MobilityLevel' uESpeed: type: integer - reliability: + dLReliability: + type: number + uLReliability: type: number dLDeterministicComm: $ref: '#/components/schemas/DeterministicComm' @@ -552,7 +558,9 @@ components: type: integer survivalTime: type: number - reliability: + dLReliability: + type: number + uLReliability: type: number maxDLDataVolume: type: number -- GitLab From 5d013acbb57a86e2ecaff9d008ef88bccdaaf6fc Mon Sep 17 00:00:00 2001 From: sunse Date: Tue, 17 Oct 2023 06:20:43 +0000 Subject: [PATCH 034/119] fix auto-merge issue, Update TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 65e1c5730..43a2901d3 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -357,6 +357,7 @@ components: nonIPSupport: $ref: '#/components/schemas/NonIPSupport' availability: + type: number maxDLDataVolume: type: number maxULDataVolume: @@ -422,6 +423,7 @@ components: nonIPSupport: $ref: '#/components/schemas/NonIPSupport' availability: + type: number maxDLDataVolume: type: number maxULDataVolume: @@ -493,6 +495,7 @@ components: nonIPSupport: $ref: '#/components/schemas/NonIPSupport' availability: + type: number maxDLDataVolume: type: number maxULDataVolume: -- GitLab From 9f860bffb55c882525b948b0e540bdb4436bd5b8 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 17 Oct 2023 06:42:29 +0000 Subject: [PATCH 035/119] Update file TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index affde3918..39e0ae6f3 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -1113,8 +1113,4 @@ components: enum: - PHYSICAL - VIRTUALISED -======= - $ref: "TS28541_NrNrm.yaml#/components/schemas/Sst" - ->>>>>>> OpenAPI/TS28312_IntentExpectations.yaml #-------Definition of the concrete ExpectionContext dataType----------------# -- GitLab From 03586a6e33267dafae74a073ed6358fd8a40c81f Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 17 Oct 2023 06:57:48 +0000 Subject: [PATCH 036/119] Revert "Merge branch 'TS28.312_Rel-18_CR0137_Update_5GC_expectation' into 'Integration_Rel18_SA5_151_YAML'" This reverts merge request !803 --- OpenAPI/TS28312_IntentExpectations.yaml | 133 ++---------------------- 1 file changed, 7 insertions(+), 126 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 39e0ae6f3..40f94c033 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -135,18 +135,11 @@ components: oneOf: - $ref: "#/components/schemas/MaxNumberofPDUsessionsTarget" - $ref: "#/components/schemas/MaxNumberofRegisteredsubscribersTarget" - - $ref: "#/components/schemas/IncomingDataTarget" - - $ref: "#/components/schemas/OutgoingDataTarget" - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget" expectationContexts: type: array items: - type: object - oneOf: - - $ref: '#/components/schemas/StartTimeContext' - - $ref: '#/components/schemas/DeploymentTypeContext' - - $ref: '#/components/schemas/ResourceSharingLevelContext' - - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext" + $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext" expectationfulfilmentInfo: $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" required: @@ -236,10 +229,9 @@ components: - $ref: "#/components/schemas/NfInstanceLocationContext" - $ref: "#/components/schemas/PLMNContext" - $ref: "#/components/schemas/TaiContext" - - $ref: "#/components/schemas/ServingScopeContext" - - $ref: "#/components/schemas/DnnContext" - - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ObjectContext' - #-------Definition of the ExpectationObject dataType ----------# + - $ref: "#/components/schemas/ObjectContext" + #-------Definition of the ExpectationObject dataType ----------# + #-------Definition of the Scenario specific ExpectationTarget dataType----------# WeakRSRPRatioTarget: @@ -664,23 +656,6 @@ components: - IS_LESS_THAN targetValueRange: type: integer - targetContexts: - $ref: '#/components/schemas/5GSessionContext' - 5GSessionContext: - description: >- - This data type is the "TargetContext" data type with specialisations for 5GSessionContext - type: object - properties: - contextAttribute: - type: string - enum: - - 5GSession - contextCondition: - type: string - enum: - - IS_LESS_THAN - contextValueRange: - type: integer MaxNumberofRegisteredsubscribersTarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofRegisteredsubscribersTarget @@ -696,36 +671,7 @@ components: - IS_LESS_THAN targetValueRange: type: integer - IncomingDataTarget: - description: >- - This data type is the "ExpectationTarget" data type with specialisations for IncomingDataTarget - type: object - properties: - targetName: - type: string - enum: - - InComingData - targetCondition: - type: string - enum: - - IS_LESS_THAN - targetValueRange: - type: integer - OutgoingDataTarget: - description: >- - This data type is the "ExpectationTarget" data type with specialisations for OutgoingDataTarget - type: object - properties: - targetName: - type: string - enum: - - OutGoingData - targetCondition: - type: string - enum: - - IS_LESS_THAN - targetValueRange: - type: integer + #-------Definition of the concrete ExpectationTarget dataType----------# #-------Definition of the concrete ObjectTarget dataType----------------# @@ -951,40 +897,7 @@ components: type: array items: $ref: "TS28623_GenericNrm.yaml#/components/schemas/Tai" - ServingScopeContext: - description: >- - This data type is the "ObjectContext" data type with specialisations for ServingScopeContext - type: object - properties: - contextAttribute: - type: string - enum: - - ServingScope - contextCondition: - type: string - enum: - - IS_ALL_OF - contextValueRange: - type: array - items: - type: string - DnnContext: - description: >- - This data type is the "ObjectContext" data type with specialisations for DnnContext - type: object - properties: - contextAttribute: - type: string - enum: - - Dnn - contextCondition: - type: string - enum: - - IS_ALL_OF - contextValueRange: - type: array - items: - type: string + #-------Definition of the scenario specific ObjectTarget dataType----------------# #-------Definition of the concrete ExpectationContext dataType----------------# @@ -1080,37 +993,5 @@ components: - IS_EQUAL_TO contextValueRange: $ref: "TS28541_NrNrm.yaml#/components/schemas/Sst" - StartTimeContext: - description: >- - This data type is the "ExpectationContext" data type with specialisations for StartTimeContext - type: object - properties: - contextAttribute: - type: string - enum: - - StartTime - contextCondition: - type: string - enum: - - IS_EQUAL_TO - contextValueRange: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' - DeploymentTypeContext: - description: >- - This data type is the "ExpectationContext" data type with specialisations for DeploymentTypeContext - type: object - properties: - contextAttribute: - type: string - enum: - - DeploymentType - contextCondition: - type: string - enum: - - IS_EQUAL_TO - contextValueRange: - type: string - enum: - - PHYSICAL - - VIRTUALISED + #-------Definition of the concrete ExpectionContext dataType----------------# -- GitLab From a700cf8888d8d839ecf68b835685d4b7d495f18d Mon Sep 17 00:00:00 2001 From: sunse Date: Tue, 17 Oct 2023 07:02:33 +0000 Subject: [PATCH 037/119] TS28.541_Rel-18_CR1034_Fix_inconsitencies_related_to_network_slice_SLA_attribute_kPIMonitoring Update TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 43a2901d3..f88fbabda 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -428,6 +428,8 @@ components: type: number maxULDataVolume: type: number + kPIMonitoring: + $ref: '#/components/schemas/KPIMonitoring' TopSliceSubnetProfile: type: object @@ -500,6 +502,8 @@ components: type: number maxULDataVolume: type: number + kPIMonitoring: + $ref: '#/components/schemas/KPIMonitoring' ServiceProfile: type: object -- GitLab From d63e0b51f1a48e31ee430807b260fa2f67a0d4e4 Mon Sep 17 00:00:00 2001 From: sunse Date: Tue, 17 Oct 2023 23:30:04 +0000 Subject: [PATCH 038/119] Ts28.541 rel18 cr1020 nrm enhancements for mbupf function --- OpenAPI/TS28541_5GcNrm.yaml | 354 ++++++++++++++++++++++++++---------- 1 file changed, 256 insertions(+), 98 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 5c0a3e2d7..9d1385abf 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -749,13 +749,24 @@ components: interfaceType: type: string enum: - - IPV4ENDPOINTADDRESSES - - IPV6ENDPOINTADDRESSES - - FQDN + - N3 + - N6 + - N9 + - DATA_FORWARDING + - N3MB + - N6MB + - N19MB + - NMB9 ipv4EndpointAddresses: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv4Addr' + minItems: 1 ipv6EndpointAddresses: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Ipv6Addr' + minItems: 1 fqdn: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Fqdn' networkInstance: @@ -1689,95 +1700,6 @@ components: # $ref: 'TS29564_Nupf_EventExposure.yaml#/components/schemas/EventType' # minItems: 1 - # SnssaiUpfInfoItem/IpIndex/DnnUpfInfoItem stage2/3 introduced in SnssaiUpfInfoItem is introduced in CR1020 (via S5-236244) - # the stage 3 for these threes are only for validation. When merged in integration branch, - # the stage 3 for these three shall only keep one copy - SnssaiUpfInfoItem: - description: Set of parameters supported by UPF for a given S-NSSAI - type: object - required: - - sNssai - - dnnUpfInfoList - properties: - sNssai: - $ref: 'TS29571_CommonData.yaml#/components/schemas/ExtSnssai' - dnnUpfInfoList: - type: array - items: - $ref: '#/components/schemas/DnnUpfInfoItem' - minItems: 1 - redundantTransport: - type: boolean - default: false - IpIndex: - description: Represents the IP Index to be sent from UDM to the SMF (its value can be either an integer or a string) - anyOf: - - type: integer - - type: string - DnnUpfInfoItem: - description: Set of parameters supported by UPF for a given DNN - type: object - required: - - dnn - properties: - dnn: - $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn' - dnaiList: - type: array - items: - $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai' - minItems: 1 - pduSessionTypes: - type: array - items: - $ref: 'TS29571_CommonData.yaml#/components/schemas/PduSessionType' - minItems: 1 - ipv4AddressRanges: - type: array - items: - $ref: '#/components/schemas/Ipv4AddressRange' - minItems: 1 - ipv6PrefixRanges: - type: array - items: - $ref: '#/components/schemas/Ipv6PrefixRange' - minItems: 1 - natedIpv4AddressRanges: - type: array - items: - $ref: '#/components/schemas/Ipv4AddressRange' - minItems: 1 - natedIpv6PrefixRanges: - type: array - items: - $ref: '#/components/schemas/Ipv6PrefixRange' - minItems: 1 - ipv4IndexList: - type: array - items: - $ref: '#/components/schemas/IpIndex' - minItems: 1 - ipv6IndexList: - type: array - items: - $ref: '#/components/schemas/IpIndex' - minItems: 1 - networkInstance: - description: > - The N6 Network Instance associated with the S-NSSAI and DNN. - type: string - dnaiNwInstanceList: - description: > - Map of network instance per DNAI for the DNN, where the key of the map is the DNAI. - When present, the value of each entry of the map shall contain a N6 network instance - that is configured for the DNAI indicated by the key. - type: object - additionalProperties: - type: string - minProperties: 1 - not: - required: [ networkInstance, dnaiNwInstanceList ] - PcfInfo: description: Information of a PCF NF Instance type: object @@ -2530,6 +2452,128 @@ components: type: string pattern: '^[0-9]{1,4}$' + MbUpfInfo: + description: Information of an MB-UPF NF Instance + type: object + required: + - sNssaiMbUpfInfoList + properties: + sNssaiMbUpfInfoList: + type: array + items: + $ref: '#/components/schemas/SnssaiUpfInfoItem' + minItems: 1 + mbSmfServingArea: + type: array + items: + type: string + minItems: 1 + interfaceMbUpfInfoList: + type: array + items: + $ref: '#/components/schemas/InterfaceUpfInfoItem' + minItems: 1 + taiList: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Tai' + minItems: 1 + taiRangeList: + type: array + items: + $ref: '#/components/schemas/TaiRange' + minItems: 1 + priority: + type: integer + minimum: 0 + maximum: 65535 + supportedPfcpFeatures: + type: string + SnssaiUpfInfoItem: + description: Set of parameters supported by UPF for a given S-NSSAI + type: object + required: + - sNssai + - dnnUpfInfoList + properties: + sNssai: + $ref: 'TS29571_CommonData.yaml#/components/schemas/ExtSnssai' + dnnUpfInfoList: + type: array + items: + $ref: '#/components/schemas/DnnUpfInfoItem' + minItems: 1 + redundantTransport: + type: boolean + default: false + IpIndex: + description: Represents the IP Index to be sent from UDM to the SMF (its value can be either an integer or a string) + anyOf: + - type: integer + - type: string + DnnUpfInfoItem: + description: Set of parameters supported by UPF for a given DNN + type: object + required: + - dnn + properties: + dnn: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnn' + dnaiList: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/Dnai' + minItems: 1 + pduSessionTypes: + type: array + items: + $ref: 'TS29571_CommonData.yaml#/components/schemas/PduSessionType' + minItems: 1 + ipv4AddressRanges: + type: array + items: + $ref: '#/components/schemas/Ipv4AddressRange' + minItems: 1 + ipv6PrefixRanges: + type: array + items: + $ref: '#/components/schemas/Ipv6PrefixRange' + minItems: 1 + natedIpv4AddressRanges: + type: array + items: + $ref: '#/components/schemas/Ipv4AddressRange' + minItems: 1 + natedIpv6PrefixRanges: + type: array + items: + $ref: '#/components/schemas/Ipv6PrefixRange' + minItems: 1 + ipv4IndexList: + type: array + items: + $ref: '#/components/schemas/IpIndex' + minItems: 1 + ipv6IndexList: + type: array + items: + $ref: '#/components/schemas/IpIndex' + minItems: 1 + networkInstance: + description: > + The N6 Network Instance associated with the S-NSSAI and DNN. + type: string + dnaiNwInstanceList: + description: > + Map of network instance per DNAI for the DNN, where the key of the map is the DNAI. + When present, the value of each entry of the map shall contain a N6 network instance + that is configured for the DNAI indicated by the key. + type: object + additionalProperties: + type: string + minProperties: 1 + not: + required: [ networkInstance, dnaiNwInstanceList ] #-------- Definition of concrete IOCs -------------------------------------------- ProvMnS: @@ -2650,6 +2694,9 @@ components: $ref: '#/components/schemas/BsfFunction-Multiple' MBSMFFunction: $ref: '#/components/schemas/MbSmfFunction-Multiple' + $ref: '#/components/schemas/BsfFunction-Multiple' + MBUPFFunction: + $ref: '#/components/schemas/MbUpfFunction-Multiple' AmfFunction-Single: allOf: @@ -4667,10 +4714,8 @@ components: $ref: '#/components/schemas/EP_N16mb-Multiple' EP_Nmb1: $ref: '#/components/schemas/EP_Nmb1-Multiple' - # EP_N4mb introduced in S5-236244 CR1020, to uncomment the following two lines - # by code moderator when merging CR in integration branch - # EP_N4mb: - # $ref: '#/components/schemas/EP_N4mb-Multiple' + EP_N4mb: + $ref: '#/components/schemas/EP_N4mb-Multiple' EP_N11mb-Single: allOf: @@ -4715,6 +4760,93 @@ components: remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + MbUpfFunction-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + plmnIdList: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnIdList' + managedNFProfile: + $ref: '#/components/schemas/ManagedNFProfile' + commModelList: + $ref: '#/components/schemas/CommModelList' + mbUpfInfo: + $ref: '#/components/schemas/MbUpfInfo' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: + EP_N3mb: + $ref: '#/components/schemas/EP_N3mb-Multiple' + EP_N4mb: + $ref: '#/components/schemas/EP_N4mb-Multiple' + EP_N19mb: + $ref: '#/components/schemas/EP_N19mb-Multiple' + EP_Nmb9: + $ref: '#/components/schemas/EP_Nmb9-Multiple' + + EP_N3mb-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + EP_N4mb-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + EP_N19mb-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + EP_Nmb9-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + #-------- Definition of JSON arrays for name-contained IOCs ---------------------- SubNetwork-Multiple: @@ -5062,6 +5194,22 @@ components: type: array items: $ref: '#/components/schemas/EP_Nmb1-Single' + EP_N3mb-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N3mb-Single' + EP_N4mb-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N4mb-Single' + EP_N19mb-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N19mb-Single' + EP_Nmb9-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_Nmb9-Single' Configurable5QISet-Multiple: type: array items: @@ -5122,6 +5270,10 @@ components: type: array items: $ref: '#/components/schemas/MbSmfFunction-Single' + MbUpfFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/MbUpfFunction-Single' #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- @@ -5212,6 +5364,11 @@ components: - $ref: '#/components/schemas/EP_Npc7-Single' - $ref: '#/components/schemas/EP_Npc8-Single' + - $ref: '#/components/schemas/EP_N3mb-Single' + - $ref: '#/components/schemas/EP_N4mb-Single' + - $ref: '#/components/schemas/EP_N19mb-Single' + - $ref: '#/components/schemas/EP_Nmb9-Single' + - $ref: '#/components/schemas/EP_S5C-Single' - $ref: '#/components/schemas/EP_S5U-Single' - $ref: '#/components/schemas/EP_Rx-Single' @@ -5242,3 +5399,4 @@ components: - $ref: '#/components/schemas/AanfFunction-Single' - $ref: '#/components/schemas/BsfFunction-Single' - $ref: '#/components/schemas/MbSmfFunction-Single' + - $ref: '#/components/schemas/MbUpfFunction-Single' -- GitLab From 90754ca2477969b8d52f66afdbfaf521ab828426 Mon Sep 17 00:00:00 2001 From: sunse Date: Tue, 17 Oct 2023 23:54:03 +0000 Subject: [PATCH 039/119] correction of merge issue --- OpenAPI/TS28541_5GcNrm.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 9d1385abf..90147452c 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -2693,8 +2693,7 @@ components: BSFFunction: $ref: '#/components/schemas/BsfFunction-Multiple' MBSMFFunction: - $ref: '#/components/schemas/MbSmfFunction-Multiple' - $ref: '#/components/schemas/BsfFunction-Multiple' + $ref: '#/components/schemas/MbSmfFunction-Multiple' MBUPFFunction: $ref: '#/components/schemas/MbUpfFunction-Multiple' -- GitLab From 6979e3b3edb5de661842fdacca2272c1e697c690 Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 18 Oct 2023 01:44:32 +0000 Subject: [PATCH 040/119] Rel18 TS28.312 CR0084(CR0140) --- OpenAPI/TS28312_IntentNrm.yaml | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 38e3febf1..55eae9617 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -47,6 +47,8 @@ components: - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/EdgeServiceSupportExpectation" - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/5GCNetworkExpectation" - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/RadioServiceExpectation" + contextSelectivity: + $ref: "#/components/schemas/Selectivity" intentContexts: type: array items: @@ -111,6 +113,8 @@ components: type: array items: $ref: '#/components/schemas/ExpectationTarget' + contextSelectivity: + $ref: "#/components/schemas/Selectivity" expectationContexts: type: array items: @@ -133,6 +137,8 @@ components: - 5GC_SubNetwork #value for 5GC Network Expectation--# objectInstance: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + contextSelectivity: + $ref: "#/components/schemas/Selectivity" objectContexts: type: array items: @@ -154,6 +160,12 @@ components: - IS_EQUAL_TO_OR_LESS_THAN - IS_EQUAL_TO_OR_GREATER_THAN - IS_ALL_OF + Selectivity: + type: string + enum: + - ALL_OF + - ONE_OF + - ANY_OF FulfilStatus: type: string readOnly: true @@ -231,11 +243,13 @@ components: targetCondition: $ref: '#/components/schemas/Condition' targetValueRange: - oneOf: - - type: array - items: - $ref: "#/components/schemas/ValueRangeType" - - $ref: "#/components/schemas/ValueRangeType" + oneOf: + - type: array + items: + $ref: "#/components/schemas/ValueRangeType" + - $ref: "#/components/schemas/ValueRangeType" + contextSelectivity: + $ref: "#/components/schemas/Selectivity" targetContexts: type: array items: -- GitLab From f0be244893840b93ef5d25d9f106b0d988320579 Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 18 Oct 2023 02:54:22 +0000 Subject: [PATCH 041/119] Ts28.623 rel18 cr0268 open api ss for supported notifications --- OpenAPI/TS28623_GenericNrm.yaml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 0c0ad5de6..ee209bc40 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -1827,6 +1827,8 @@ components: $ref: '#/components/schemas/Scheduler-Multiple' ConditionMonitor: $ref: '#/components/schemas/ConditionMonitor-Multiple' + SupportedNotifications: + $ref: '#/components/schemas/SupportedNotifications-Single' ManagedElement-ncO: type: object properties: @@ -1850,6 +1852,8 @@ components: $ref: '#/components/schemas/Scheduler-Multiple' ConditionMonitor: $ref: '#/components/schemas/ConditionMonitor-Multiple' + SupportedNotifications: + $ref: '#/components/schemas/SupportedNotifications-Single' #-------- Definition of abstract IOCs -------------------------------------------- @@ -2292,6 +2296,27 @@ components: conditionStatus: type: boolean + SupportedNotifications-Single: + allOf: + - $ref: '#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + notificationTypes: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/NotificationType' + notificationProtocols: + type: array + items: + type: string + enum: + - HTTP + - HTTP_VES_ENCAPS + minItems: 1 + #-------- Definition of YAML arrays for name-contained IOCs ---------------------- VsDataContainer-Multiple: @@ -2390,3 +2415,4 @@ components: - $ref: '#/components/schemas/MnsInfo-Single' - $ref: '#/components/schemas/Scheduler-Single' - $ref: '#/components/schemas/ConditionMonitor-Single' + - $ref: '#/components/schemas/SupportedNotifications-Single' -- GitLab From cb8e981d901cc0a328541ced97f254977f1ee8a5 Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 18 Oct 2023 03:20:13 +0000 Subject: [PATCH 042/119] Ts28.623 rel18 cr0267 open api ss for qmc job --- OpenAPI/TS28623_GenericNrm.yaml | 56 +++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index ee209bc40..75d8b869f 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -1829,6 +1829,9 @@ components: $ref: '#/components/schemas/ConditionMonitor-Multiple' SupportedNotifications: $ref: '#/components/schemas/SupportedNotifications-Single' + QMCJobs: + $ref: '#/components/schemas/QMCJob-Multiple' + ManagedElement-ncO: type: object properties: @@ -1854,6 +1857,8 @@ components: $ref: '#/components/schemas/ConditionMonitor-Multiple' SupportedNotifications: $ref: '#/components/schemas/SupportedNotifications-Single' + QMCJobs: + $ref: '#/components/schemas/QMCJob-Multiple' #-------- Definition of abstract IOCs -------------------------------------------- @@ -2317,6 +2322,52 @@ components: - HTTP_VES_ENCAPS minItems: 1 + QMCJob-Single: + allOf: + - $ref: '#/components/schemas/Top' + - type: object + properties: + attributes: + type: object + properties: + serviceType: + type: string + enum: + - DASH + - MTSI + - VR + areaScope: + type: array + items: + $ref: '#/components/schemas/AreaScope' + qoECollectionEntityAddress: + $ref: '#/components/schemas/IpAddr' + pLMNTarget: + $ref: '#/components/schemas/plmnTarget-Type' + qoETarget: + type: string + qoEReference: + type: string + jobId: + type: string + sliceScope: + type: array + items: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' + qMCConfigFile: + type: string + mDTAlignmentInformation: + $ref: '#/components/schemas/traceReference-Type' + availableRANqoEMetrics: + type: array + items: + type: string + enum: + - APPLAYERBUFFERLEVELLIST + - PLAYOUTDELAYFORMEDIA_STARTUP + minItems: 0 + maxItems: 2 + #-------- Definition of YAML arrays for name-contained IOCs ---------------------- VsDataContainer-Multiple: @@ -2383,6 +2434,10 @@ components: type: array items: $ref: '#/components/schemas/ConditionMonitor-Single' + QMCJob-Multiple: + type: array + items: + $ref: '#/components/schemas/QMCJob-Single' #-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- @@ -2416,3 +2471,4 @@ components: - $ref: '#/components/schemas/Scheduler-Single' - $ref: '#/components/schemas/ConditionMonitor-Single' - $ref: '#/components/schemas/SupportedNotifications-Single' + - $ref: '#/components/schemas/QMCJob-Single' -- GitLab From cd31f454e51076ca0df1ae593d854426acf500fc Mon Sep 17 00:00:00 2001 From: swaminathan1 Date: Thu, 12 Oct 2023 03:45:34 +0000 Subject: [PATCH 043/119] Update TS28105_AiMlNrm.yaml --- OpenAPI/TS28105_AiMlNrm.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 943f6aebf..aa29dc947 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -201,6 +201,8 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' trainingReportRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + mLEnityGeneratedRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' MLTrainingReport-Single: -- GitLab From 96a22d998eade484c28b6ca8497e19d5e3bf4d76 Mon Sep 17 00:00:00 2001 From: Pengxiang Xie Date: Wed, 11 Oct 2023 13:46:10 +0000 Subject: [PATCH 044/119] Update TS28104_MdaReport.yaml --- OpenAPI/TS28104_MdaReport.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml index 670f57a03..5a3ff3369 100644 --- a/OpenAPI/TS28104_MdaReport.yaml +++ b/OpenAPI/TS28104_MdaReport.yaml @@ -20,7 +20,7 @@ components: properties: mDAType: type: string - mdaOutputList: + mDAOutputList: type: array items: $ref: '#/components/schemas/MDAOutputEntry' @@ -37,7 +37,7 @@ components: properties: mDAOutputIEName: type: string - mdaOutputIEValue: {} + mDAOutputIEValue: {} TimeWindow: -- GitLab From 27a2856c9ab9553a636f1f95be597634d9ef8912 Mon Sep 17 00:00:00 2001 From: swaminathan1 Date: Wed, 27 Sep 2023 15:47:30 +0000 Subject: [PATCH 045/119] Update TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 48 ++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 75d8b869f..e2adda96f 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -1560,34 +1560,40 @@ components: description: See details in 3GPP TS 32.422 clause 5.10.11. Only TCE Id value may be sent over the air to the UE being configured for Logged MDT. type: integer - excessPacketDelayThresholds-Type: + excessPacketDelayThreshold-Type: description: Excess Packet Delay Threshold for NR MDT. See details in 3GPP TS 32.422 clause 4.1.1 and 4.1.2. - type: array + type: object properties: fiveQIValue: type: integer excessPacketDelayThresholdValue: type: string enum: - - 0.25ms - - 0.5ms - - 1ms - - 2ms - - 4ms - - 5ms - - 10ms - - 20ms - - 30ms - - 40ms - - 50ms - - 60ms - - 70ms - - 80ms - - 90ms - - 100ms - - 150ms - - 300ms - - 500ms + - 0.25MS + - 0.5MS + - 1MS + - 2MS + - 4MS + - 5MS + - 10MS + - 20MS + - 30MS + - 40MS + - 50MS + - 60MS + - 70MS + - 80MS + - 90MS + - 100MS + - 150MS + - 300MS + - 500MS + + excessPacketDelayThresholds-Type: + description: Array of type excessPacketDelayThreshold-Type. + type: array + items: + $ref: '#/components/schemas/excessPacketDelayThreshold-Type' minItems: 0 maxItems: 255 -- GitLab From e96534022cb0c41ae2528fcf6f4caf18590abb5a Mon Sep 17 00:00:00 2001 From: swaminathan1 Date: Wed, 27 Sep 2023 14:09:40 +0000 Subject: [PATCH 046/119] Update TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 86 +++++++++++++++++++++++++++++++-- 1 file changed, 81 insertions(+), 5 deletions(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index e2adda96f..3d8607d6a 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -1398,8 +1398,9 @@ components: - 32 - 64 - INFINITY + reportAmountM1LTE-Type: - description: See details in 3GPP TS 32.422 clause 5.10.x. + description: See details in 3GPP TS 32.422 clause 5.10.6. type: string enum: - 1 @@ -1412,7 +1413,7 @@ components: - INFINITY reportAmountM4LTE-Type: - description: See details in 3GPP TS 32.422 clause 5.10.y. + description: See details in 3GPP TS 32.422 clause 5.10.6. type: string enum: - 1 @@ -1425,7 +1426,7 @@ components: - INFINITY reportAmountM5LTE-Type: - description: See details in 3GPP TS 32.422 clause 5.10.z. + description: See details in 3GPP TS 32.422 clause 5.10.6. type: string enum: - 1 @@ -1438,7 +1439,7 @@ components: - INFINITY reportAmountM6LTE-Type: - description: See details in 3GPP TS 32.422 clause 5.10.a. + description: See details in 3GPP TS 32.422 clause 5.10.6. type: string enum: - 1 @@ -1451,7 +1452,72 @@ components: - INFINITY reportAmountM7LTE-Type: - description: See details in 3GPP TS 32.422 clause 5.10.b. + description: See details in 3GPP TS 32.422 clause 5.10.6. + type: string + enum: + - 1 + - 2 + - 4 + - 8 + - 16 + - 32 + - 64 + - INFINITY + + reportAmountM1NR-Type: + description: See details in 3GPP TS 32.422 clause 5.10.6. + type: string + enum: + - 1 + - 2 + - 4 + - 8 + - 16 + - 32 + - 64 + - INFINITY + + reportAmountM4NR-Type: + description: See details in 3GPP TS 32.422 clause 5.10.6. + type: string + enum: + - 1 + - 2 + - 4 + - 8 + - 16 + - 32 + - 64 + - INFINITY + + reportAmountM5NR-Type: + description: See details in 3GPP TS 32.422 clause 5.10.6. + type: string + enum: + - 1 + - 2 + - 4 + - 8 + - 16 + - 32 + - 64 + - INFINITY + + reportAmountM6NR-Type: + description: See details in 3GPP TS 32.422 clause 5.10.6. + type: string + enum: + - 1 + - 2 + - 4 + - 8 + - 16 + - 32 + - 64 + - INFINITY + + reportAmountM7NR-Type: + description: See details in 3GPP TS 32.422 clause 5.10.6. type: string enum: - 1 @@ -1630,6 +1696,16 @@ components: $ref: '#/components/schemas/reportAmountM6LTE-Type' reportAmountM7LTE: $ref: '#/components/schemas/reportAmountM7LTE-Type' + reportAmountM1NR: + $ref: '#/components/schemas/reportAmountM1NR-Type' + reportAmountM4NR: + $ref: '#/components/schemas/reportAmountM4NR-Type' + reportAmountM5NR: + $ref: '#/components/schemas/reportAmountM5NR-Type' + reportAmountM6NR: + $ref: '#/components/schemas/reportAmountM6NR-Type' + reportAmountM7NR: + $ref: '#/components/schemas/reportAmountM7NR-Type' reportInterval: $ref: '#/components/schemas/reportInterval-Type' eventThreshold: -- GitLab From 409c5196afdc22beaeb75cf16f95b47fff0d557d Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 28 Oct 2023 03:40:14 +0000 Subject: [PATCH 047/119] Update 2 files - /OpenAPI/TS28312_IntentNrm.yaml - /OpenAPI/TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 9 +-------- OpenAPI/TS28312_IntentNrm.yaml | 8 ++++++++ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 40f94c033..405857297 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -791,14 +791,7 @@ components: contextValueRange: type: array items: - $ref: "#/components/schemas/UEGroup" - UEGroup: - type: object - properties: - fiveQI: - type: integer - sNssai: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' + $ref: "TS28312_IntentNrm.yaml#/components/schemas/UEGroup" EdgeIdenfiticationIdContext: description: >- This data type is the "ObjectContext" data type with specialisations for EdgeIdentificationIdContext diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 55eae9617..bf03d69b3 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -212,6 +212,14 @@ components: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' - $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' - $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoCoordinate' + - $ref: '#/components/schemas/UEGroup' + UEGroup: + type: object + properties: + fiveQI: + type: integer + sNssai: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' #-------Definition of the generic dataType --------------# #-------Definition of the generic IntentContext dataType --------------# -- GitLab From 97b4bc08847af182c82546e328052a6bf13d7110 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 28 Oct 2023 03:45:53 +0000 Subject: [PATCH 048/119] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index bf03d69b3..91a416acd 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -214,11 +214,17 @@ components: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoCoordinate' - $ref: '#/components/schemas/UEGroup' UEGroup: + description: -> + This <> describes the UE Group, which represented by + represented by specific 5QI, specific S-NSSAI, or specific combination + of S-NSSAI and 5QI type: object properties: fiveQI: + description: This attribute shall be supported, when support UE group to be represented by 5QI type: integer - sNssai: + sNssai: This attribute shall be supported, when support UE group to be represented by S-NSSAI + description: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' #-------Definition of the generic dataType --------------# -- GitLab From 529f4bc343eda3db757c4c81cd8ad1305ac1369f Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 28 Oct 2023 03:48:14 +0000 Subject: [PATCH 049/119] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 91a416acd..fa5470c28 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -223,8 +223,8 @@ components: fiveQI: description: This attribute shall be supported, when support UE group to be represented by 5QI type: integer - sNssai: This attribute shall be supported, when support UE group to be represented by S-NSSAI - description: + sNssai: + description: This attribute shall be supported, when support UE group to be represented by S-NSSAI $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' #-------Definition of the generic dataType --------------# -- GitLab From 23fc4193ab028f863a2a5acf0da4a8dedcd153a7 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 28 Oct 2023 07:14:18 +0000 Subject: [PATCH 050/119] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index fa5470c28..f68c75198 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -221,11 +221,11 @@ components: type: object properties: fiveQI: - description: This attribute shall be supported, when support UE group to be represented by 5QI type: integer + description: This attribute shall be supported, when support UE group to be represented by 5QI sNssai: - description: This attribute shall be supported, when support UE group to be represented by S-NSSAI - $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' + $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' + description: This attribute shall be supported, when support UE group to be represented by S-NSSAI #-------Definition of the generic dataType --------------# #-------Definition of the generic IntentContext dataType --------------# -- GitLab From 8eb00b6256d00de8aeb78a42344e2d4134334e6f Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 28 Oct 2023 07:36:18 +0000 Subject: [PATCH 051/119] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index f68c75198..bac2cf5da 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -222,10 +222,8 @@ components: properties: fiveQI: type: integer - description: This attribute shall be supported, when support UE group to be represented by 5QI sNssai: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' - description: This attribute shall be supported, when support UE group to be represented by S-NSSAI + $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' #-------Definition of the generic dataType --------------# #-------Definition of the generic IntentContext dataType --------------# -- GitLab From 82a4d253986d33102cdfde81e766e087b8d2815b Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 28 Oct 2023 08:26:26 +0000 Subject: [PATCH 052/119] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 55eae9617..9d5557a46 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -15,7 +15,7 @@ components: #-------Definition of generic IOCs ----------# - SubNetwork-Single: + SubNetwork-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -31,6 +31,8 @@ components: $ref: '#/components/schemas/IntentHandlingFunction-Multiple' Intent-Single: + description: >- + This IOC represents the properties of an Intent driven management information between MnS consumer and MnS producer. allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -58,12 +60,19 @@ components: enum: - ACTIVATED - DEACTIVATED + description: >- + It describes the intent administrative state. + This attribute is used when MnS consumer-suspension mechanism is supported intentPriority: type: integer observationPeriod: type: integer + description: It represents the observation period of the fulfilmentInfo for corresponding ExpectationTargets, IntentExpectations and Intent. intentReportReference: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + description: >- + It indicates the associated intent report instance.The observation period can be set by the + MnS consumer or by the MnS producer if the MnS consumer does not provide a value IntentReport-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' -- GitLab From 26e83f4cf280b0e046a49134e2d0792692bd9f8c Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 28 Oct 2023 08:30:21 +0000 Subject: [PATCH 053/119] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 9d5557a46..8844b2d2d 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -70,9 +70,6 @@ components: description: It represents the observation period of the fulfilmentInfo for corresponding ExpectationTargets, IntentExpectations and Intent. intentReportReference: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - description: >- - It indicates the associated intent report instance.The observation period can be set by the - MnS consumer or by the MnS producer if the MnS consumer does not provide a value IntentReport-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' -- GitLab From 0cb7709b797df47b0433fa03ef5801abb6c81121 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 30 Oct 2023 00:38:09 +0000 Subject: [PATCH 054/119] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index bac2cf5da..d2d5aa1ba 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -214,8 +214,8 @@ components: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoCoordinate' - $ref: '#/components/schemas/UEGroup' UEGroup: - description: -> - This <> describes the UE Group, which represented by + description: >- + It describes the UE Group, which represented by represented by specific 5QI, specific S-NSSAI, or specific combination of S-NSSAI and 5QI type: object -- GitLab From 695a0158a9c3a821e6e95ca6570169e96c9b9808 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 30 Oct 2023 01:43:38 +0000 Subject: [PATCH 055/119] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 77 ++++++++++++++++++++++++---------- 1 file changed, 54 insertions(+), 23 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 8844b2d2d..ee7f74ce9 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -55,6 +55,9 @@ components: type: array items: $ref: '#/components/schemas/IntentContext' + description: >- + It describes the list of IntentContext(s) which represents the constraints and conditions that should apply + for the entire intent even if there may be specific contexts defined for specific parts of the intent intentAdminState: type: string enum: @@ -67,10 +70,13 @@ components: type: integer observationPeriod: type: integer - description: It represents the observation period of the fulfilmentInfo for corresponding ExpectationTargets, IntentExpectations and Intent. + description: >- + It represents the observation period of the fulfilmentInfo for corresponding + ExpectationTargets, IntentExpectations and Intent. intentReportReference: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' IntentReport-Single: + description: It represents intent report information from MnS producer to MnS consumer. allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -83,11 +89,14 @@ components: $ref: '#/components/schemas/IntentConflictReport' intentFeasibilityCheckReport: $ref: '#/components/schemas/IntentFeasibilityCheckReport' - lastUpdated: + lastUpdatedTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' intentReference: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' IntentHandlingFunction-Single: + description: >- + It represents the intent handling capabilities can be supported by a specific inteng + handling function of MnS producer. allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -107,10 +116,12 @@ components: IntentExpectation: description: >- This data type is the "IntentExpectation" data type without specialisations + It represents MnS consumer's requirements, goals and contexts given to a 3GPP system type: object properties: expectationId: type: string + description: A unique identifier of the intentExpectation within the intent. expectationVerb: $ref: "#/components/schemas/ExpectationVerb" expectationObject: @@ -132,6 +143,7 @@ components: #-------Definition of the generic ExpectationObject dataType ----------# ExpectationObject: description: >- + It represents the Object to which the IntentExpectation should apply. This data type is the "ExpectationObject" data type without specialisations type: object properties: @@ -143,12 +155,13 @@ components: - 5GC_SubNetwork #value for 5GC Network Expectation--# objectInstance: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - contextSelectivity: - $ref: "#/components/schemas/Selectivity" objectContexts: type: array items: - $ref: '#/components/schemas/ObjectContext' + $ref: '#/components/schemas/ObjectContext' + description: >- + It describes the list of ObjectContext(s) which represents the constraints and conditions to be + used as filter information to identify the object(s) to which a given intentExpectation should apply. #-------Definition of the generic ExpectationObject dataType ----------# @@ -172,12 +185,13 @@ components: - ALL_OF - ONE_OF - ANY_OF - FulfilStatus: + FulfilmentStatus: type: string readOnly: true enum: - FULFILLED - NOT_FULFILLED + description: It describes the current status of the intent fulfilment result. NotFulfilledState: type: string readOnly: true @@ -188,25 +202,31 @@ components: - SUSPENDED - TERMINATED - FULFILMENTFAILED + description: It describes the current progress of or the reason for not achieving fulfilment + for the intent, intentExpectation or expectationTarget. + An attribute which is used when FulfilmentInfo is implemented for IntentFulfilmentInfo FulfilmentInfo: + description: >- + This dataType represents the properties of a specific fulfilment information for an aspect of + the intent (i.e. either an expectation, a target or the whole intent). type: object properties: - fulfilStatus: - $ref: '#/components/schemas/FulfilStatus' + fulfilmentStatus: + $ref: '#/components/schemas/FulfilmentStatus' notFullfilledState: - description: -> - An attribute which is used when FulfilmentInfo is implemented for IntentFulfilmentInfo $ref: "#/components/schemas/NotFulfilledState" notFulfilledReasons: - description: -> - An attribute which is used when FulfilmentInfo is implemented for IntentFulfilmentInfo - type: string - readOnly: true + type: array + items: + type: string + readOnly: true + description: An attribute which is used when FulfilmentInfo is implemented for IntentFulfilmentInfo ExpectationVerb: type: string enum: - DELIVER - ENSURE + description: It describes the characteristic of the intentExpectation and is the property that describes the types of intentExpectations. ValueRangeType: oneOf: - type: number @@ -241,6 +261,7 @@ components: #-------Definition of the generic ExpectationTarget dataType----------# ExpectationTarget: description: >- + This data type represents the target of the IntentExpectation that are required to be achieved. This data type is the "ExpectationTarget" data type without specialisations type: object properties: @@ -260,6 +281,7 @@ components: type: array items: $ref: '#/components/schemas/TargetContext' + description: It describes the list of constraints and conditions that should apply for a specific expectationTarget. TargetContext: description: >- This data type is the "TargetContext" data type without specialisations @@ -315,7 +337,8 @@ components: #-------Definition of the generic IntentFulfilmentReport dataType----------------# IntentFulfilmentReport: description: >- - This data type is the "IntentFulfilmentReport" data type without specialisations + It includes the intentFulfilmentInfo and expectationFulfilmetResult. + This attribute shall be supported when intent fulfilment information is supported by IntentReport type: object properties: intentFulfilmentInfo: @@ -329,7 +352,7 @@ components: #-------Definition of the generic ExpectationFulfilmentResult dataType----------------# ExpectationFulfilmentResult: description: >- - This data type is the "ExpectationFulfilmentResult" data type without specialisations + It includes the expectationFulfilmentInfo and targetFulfilmetResults for each IntentExpectation. type: object properties: expectaitonId: @@ -345,7 +368,7 @@ components: #-------Definition of the generic TargetFulfilmentResult dataType----------------# TargetFulfilmentResult: description: >- - This data type is the "TargetFulfilmentResult" data type without specialisations + This data type includes targetFulfilmentInfo and targetAchievedValue for each ExpectationTarget. type: object properties: targetName: @@ -359,7 +382,8 @@ components: #-------Definition of the generic IntentConflictReport dataType----------------# IntentConflictReport: description: >- - This data type is the "IntentConflictReport" data type without specialisations + It represents the conflict information for the detected conflict + This attribute shall be supported when intent conflict information is supported by IntentReport type: object properties: conflictId: @@ -387,7 +411,8 @@ components: #-------Definition of the generic IntentFeasibilityCheckReport dataType----------------# IntentFeasibilityCheckReport: description: >- - This data type is the "IntentFeasibilityCheckReport" data type without specialisations + It represents the intent feasibility check information + This attribute shall be supported when intent feasibility check information information is supported by IntentReport type: object properties: feasibilityCheckResult: @@ -396,13 +421,15 @@ components: - FEASIBLE - INFEASIBLE infeasibilityReason: - description: -> - An attribute which is used when feasibilityCheckResult is INFEASIBLE type: string + description: An attribute which is used when feasibilityCheckResult is INFEASIBLE #-------Definition of the concrete IntentFeasibilityCheckReport dataType----------------# #-------Definition of the generic IntentHandlingCapability dataType----------------# IntentHandlingCapability: + description: >- + It represents expectation object information and expectation target information + which can be supported by a specific intent handling function of MnS producer. type: object properties: intentHandlingCapabilityId: @@ -413,8 +440,12 @@ components: - RAN_SUBNETWORK - EDGE_SERVICE_SUPPORT - 5GC_SUBNETWORK - supportedExpectationTargetType: - type: string + description: It describes the expectation object type which can be supported by a specific intent handling function of MnS producer. + supportedExpectationTargetNames: + type: array + items: + type: string + description: It describes the supported expectation targets for the supported expectation object type. #-------Definition of the concrete IntentHandlingCapability dataType----------------# #------Definition of JSON arrays for name-contained IOCs ---------------# -- GitLab From c8e923c0559f68672dca0de72318a1b36e19ab2e Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 31 Oct 2023 03:11:08 +0000 Subject: [PATCH 056/119] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index d2d5aa1ba..d4a5c4079 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -222,6 +222,8 @@ components: properties: fiveQI: type: integer + minimum: 0 + maximum: 255 sNssai: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' #-------Definition of the generic dataType --------------# -- GitLab From 110bcf7f15e362ece098ba683ece6c42432e6b8a Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 3 Nov 2023 07:18:17 +0000 Subject: [PATCH 057/119] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index d4a5c4079..270f14c40 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -215,8 +215,8 @@ components: - $ref: '#/components/schemas/UEGroup' UEGroup: description: >- - It describes the UE Group, which represented by - represented by specific 5QI, specific S-NSSAI, or specific combination + It describes the UE Group, which is + represented by specific 5QI, specific S-NSSAI, or a specific combination of S-NSSAI and 5QI type: object properties: -- GitLab From baf8de3262b7c433296d43a852ec88332ce4c4c4 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 3 Nov 2023 15:39:40 +0000 Subject: [PATCH 058/119] Add new file --- OpenAPI/TS28623_TraceControlNrm.yaml | 1462 ++++++++++++++++++++++++++ 1 file changed, 1462 insertions(+) create mode 100644 OpenAPI/TS28623_TraceControlNrm.yaml diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml new file mode 100644 index 000000000..27d0e7442 --- /dev/null +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -0,0 +1,1462 @@ +openapi: 3.0.1 +info: + title: Trace Control NRM + version: 18.4.0 + description: >- + OAS 3.0.1 definition of the Trace Control NRM fragment + © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + All rights reserved. +externalDocs: + description: 3GPP TS 28.623; Generic NRM + url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/ +paths: {} +components: + schemas: +#-------- Definition of types used in Trace control NRM fragment------------------ + + jobType-Type: + type: string + description: Specifies whether the TraceJob represents only MDT, Logged MBSFN MDT, Trace or a combined Trace and MDT job. Applicable for Trace, MDT, RCEF and RLF reporting. See 3GPP TS 32.422 clause 5.9a for additional details. + enum: + - IMMEDIATE_MDT_ONLY + - LOGGED_MDT_ONLY + - TRACE_ONLY + - IMMEDIATE_MDT AND TRACE + - RLF_REPORT_ONLY + - RCEF_REPORT_ONLY + - LOGGED_MBSFN_MDT + + listOfInterfaces-Type: + description: The interfaces to be recorded in the Network Element. See 3GPP TS 32.422 clause 5.5 for additional details. + type: object + properties: + MSCServerInterfaces: + type: array + items: + type: string + enum: + - A + - Iu-CS + - Mc + - MAP-G + - MAP-B + - MAP-E + - MAP-F + - MAP-D + - MAP-C + - CAP + MGWInterfaces: + type: array + items: + type: string + enum: + - Mc + - Nb-UP + - Iu-UP + RNCInterfaces: + type: array + items: + type: string + enum: + - Iu-CS + - Iu-PS + - Iur + - Iub + - Uu + SGSNInterfaces: + type: array + items: + type: string + enum: + - Gb + - Iu-PS + - Gn + - MAP-Gr + - MAP-Gd + - MAP-Gf + - Ge + - Gs + - S6d + - S4 + - S3 + - S13 + GGSNInterfaces: + type: array + items: + type: string + enum: + - Gn + - Gi + - Gmb + S-CSCFInterfaces: + type: array + items: + type: string + enum: + - Mw + - Mg + - Mr + - Mi + P-CSCFInterfaces: + type: array + items: + type: string + enum: + - Gm + - Mw + I-CSCFInterfaces: + type: array + items: + type: string + enum: + - Cx + - Dx + - Mg + - Mw + MRFCInterfaces: + type: array + items: + type: string + enum: + - Mp + - Mr + MGCFInterfaces: + type: array + items: + type: string + enum: + - Mg + - Mj + - Mn + IBCFInterfaces: + type: array + items: + type: string + enum: + - Ix + - Mx + E-CSCFInterfaces: + type: array + items: + type: string + enum: + - Mw + - Ml + - Mm + - Mi/Mg + BGCFInterfaces: + type: array + items: + type: string + enum: + - Mi + - Mj + - Mk + ASInterfaces: + type: array + items: + type: string + enum: + - Dh + - Sh + - ISC + - Ut + HSSInterfaces: + type: array + items: + type: string + enum: + - MAP-C + - MAP-D + - Gc + - Gr + - Cx + - S6d + - S6a + - Sh + - N70 + - N71 + - NU1 + EIRInterfaces: + type: array + items: + type: string + enum: + - MAP-F + - S13 + - MAP-Gf + BM-SCInterfaces: + type: array + items: + type: string + enum: + - Gmb + MMEInterfaces: + type: array + items: + type: string + enum: + - S1-MME + - S3 + - S6a + - S10 + - S11 + - S13 + SGWInterfaces: + type: array + items: + type: string + enum: + - S4 + - S5 + - S8 + - S11 + - Gxc + PDN_GWInterfaces: + type: array + items: + type: string + enum: + - S2a + - S2b + - S2c + - S5 + - S6b + - Gx + - S8 + - SGi + eNBInterfaces: + type: array + items: + type: string + enum: + - S1-MME + - X2 + en-gNBInterfaces: + type: array + items: + type: string + enum: + - S1-MME + - X2 + - Uu + - F1-C + - E1 + AMFInterfaces: + type: array + items: + type: string + enum: + - N1 + - N2 + - N8 + - N11 + - N12 + - N14 + - N15 + - N20 + - N22 + - N26 + AUSFInterfaces: + type: array + items: + type: string + enum: + - N12 + - N13 + NEFInterfaces: + type: array + items: + type: string + enum: + - N29 + - N30 + - N33 + NRFInterfaces: + type: array + items: + type: string + enum: + - N27 + NSSFInterfaces: + type: array + items: + type: string + enum: + - N22 + - N31 + PCFInterfaces: + type: array + items: + type: string + enum: + - N5 + - N7 + - N15 + SMFInterfaces: + type: array + items: + type: string + enum: + - N4 + - N7 + - N10 + - N11 + - S5-C + SMSFInterfaces: + type: array + items: + type: string + enum: + - N20 + - N21 + UDMInterfaces: + type: array + items: + type: string + enum: + - N8 + - N10 + - N13 + - N21 + - NU1 + UPFInterfaces: + type: array + items: + type: string + enum: + - N4 + ng-eNBInterfaces: + type: array + items: + type: string + enum: + - NG-C + - Xn-C + - Uu + gNB-CU-CPInterfaces: + type: array + items: + type: string + enum: + - NG-C + - Xn-C + - Uu + - F1-C + - E1 + - X2-C + gNB-CU-UPInterfaces: + type: array + items: + type: string + enum: + - E1 + gNB-DUInterfaces: + type: array + items: + type: string + enum: + - F1-C + + 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 + items: + type: string + enum: + - MSC_SERVER + - SGSN + - MGW + - GGSN + - RNC + - BM_SC + - MME + - SGW + - PGW + - ENB + - EN_GNB + - GNB_CU_CP + - GNB_CU_UP + - GNB_DU + - AMF + - PCF + - SMF + - UPF + - AUSF + - SMSF + - HSS + - UDM + + plmnTarget-Type: + type: object + description: The PLMN for which sessions shall be selected in the Trace Session in case of management based activation when several PLMNs are supported in the RAN (this means that shared cells and not shared cells are allowed for the specified PLMN. Note that the PLMN Target might differ from the PLMN specified in the Trace Reference, as that specifies the PLMN that is containing the management system requesting the Trace Session from the NE. See 3GPP TS 32.422 clause 5.9b for additional details. + properties: + mcc: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mcc' + mnc: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mnc' + required: + - mcc + - mnc + + traceDepth-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 + enum: + - MINIMUM + - MEDIUM + - MAXIMUM + - VENDORMINIMUM + - VENDORMEDIUM + - VENDORMAXIMUM + + traceReference-Type: + type: object + description: The Trace Reference parameter shall be globally unique, therefore the Trace Reference shall compose as follows - MCC+MNC+Trace ID, where the MCC and MNC are coming with the Trace activation request from the management system to identify one PLMN containing the management system, and Trace ID is a 3 byte Octet String. See 3GPP TS 32.422 clause 5.6 for additional details. + properties: + mcc: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mcc' + mnc: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mnc' + traceId: + type: string + required: + - mcc + - mnc + - traceId + + traceReportingFormat-Type: + type: string + description: Specifies whether file-based or streaming reporting shall be used for this Trace Session. See 3GPP TS 32.422 clause 5.11 for additional details. + enum: + - FILE-BASED + - STREAMING + + traceTarget-Type: + type: object + description: Trace target conveying both the type and value of the target ID. For additional details see 3GPP TS 32.422 + properties: + TargetIdType: + type: string + enum: + - IMSI + - IMEI + - IMEISV + - PUBLIC_ID + - UTRAN_CELL + - E-UTRAN_CELL + - NG-RAN_CELL + - eNB + - RNC + - gNB + - SUPI + TargetIdValue: + type: string + required: + - TargetIdType + - TargetIdValue + + triggeringEvents-Type: + type: object + description: Specifies when to start a Trace Recording Session and which message shall be recorded first, when to stop a Trace Recording Session and which message shall be recorded last respectively. See 3GPP TS 32.422 clause 5.1 for additional detials. + properties: + MSC_SERVER: + type: array + items: + type: string + enum: + - MO_MT_CALLS + - MO_MT_SMS + - LU_IMSIattach_IMSIdetach + - HANDOVER + - SS + SGSN: + type: array + items: + type: string + enum: + - PDPcontext + - MO_MT_SMS + - RAU_GPRSattach_GPRSdetach + - MBMScontext + MGW: + type: array + items: + type: string + enum: + - CONTEXT + GGSN: + type: array + items: + type: string + enum: + - PDPcontext + - MBMScontext + IMS: + type: array + items: + type: string + enum: + - SIPsession_StandaloneTransaction + BM_SC: + type: array + items: + type: string + enum: + - MBMSactivation + MME: + type: array + items: + type: string + enum: + - UEinitiatedPDNconnectivityRequest + - ServiceRequest + - InitialAttach_TAU_Detach + - UEinitiatedPDNdisconnection + - BearerActivationModificationDeletion + - Handover + SGW: + type: array + items: + type: string + enum: + - PDNconnectionCreation + - PDNconnectionTermination + - BearerActivationModificationDeletion + PGW: + type: array + items: + type: string + enum: + - PDNconnectionCreation + - PDNconnectionTermination + - BearerActivationModificationDeletion + AMF: + type: array + items: + type: string + enum: + - Registration + - ServiceRequest + - Handover + - UEderegistration + - NetworkDeregistration + - UEMobilityFromEPC + - UEMobilityToEPC + SMF: + type: array + items: + type: string + enum: + - PDUsessionEstablishment + - PDUsessionModification + - PDUsessionRelease + - PDUsessionUPactivationDeactivation + - MobilityBtw3gppAndN3gppTo5GC + - MobilityFromEpc + PCF: + type: array + items: + type: string + enum: + - AMpolicy + - SMpolicy + - Authorization + - BDTpolicy + UPF: + type: array + items: + type: string + enum: + - N4Session + AUSF: + type: array + items: + type: string + enum: + - UEauthentication + NEF: + type: array + items: + type: string + enum: + - EventExposure + - PFDmanagement + - ParameterProvision + - Trigger + NRF: + type: array + items: + type: string + enum: + - NFmanagement + - NFdiscovery + NSSF: + type: array + items: + type: string + enum: + - NSSelection + - NSSAI + SMSF: + type: array + items: + type: string + enum: + - SMservice + UDM: + type: array + items: + type: string + enum: + - UEcontext + - SubscriberData + - UEauthentication + - EventExposure + + anonymizationOfMdtData-Type: + description: Specifies level of MDT anonymization. For additional details see 3GPP TS 32.422 clause 5.10.12. + type: string + enum: + - NO_IDENTITY + - TAC_OF_IMEI + + beamLevelMeasurement-Type: + description: Determines whether beam level measurements shall be included in case of immediate MDT M1 measurement in NR. For additional details see 3GPP TS 32.422 clause 5.10.40. + type: boolean + + collectionPeriodRrmLte-Type: + description: See details in 3GPP TS 32.422 clause 5.10.20. + type: string + enum: + - 100ms + - 1000ms + - 1024ms + - 1280ms + - 2048ms + - 2560ms + - 5120ms + - 10000ms + - 10240ms + - 60000ms + + collectionPeriodM6Lte-Type: + description: See details in 3GPP TS 32.422 clause 5.10.32. + type: string + enum: + - 1024ms + - 2048ms + - 5120ms + - 10240ms + + collectionPeriodM7Lte-Type: + description: See details in 3GPP TS 32.422 clause 5.10.33. + type: integer + minimum: 1 + maximum: 60 + + collectionPeriodRrmUmts-Type: + description: See details in 3GPP TS 32.422 clause 5.10.21. + type: string + enum: + - 100ms + - 250ms + - 500ms + - 1000ms + - 2000ms + - 3000ms + - 4000ms + - 6000ms + + collectionPeriodRrmNr-Type: + description: See details in 3GPP TS 32.422 clause 5.10.30. + type: string + enum: + - 1024ms + - 2048ms + - 5120ms + - 10240ms + - 60000ms + + collectionPeriodM6Nr-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 + + collectionPeriodM7Nr-Type: + description: See details in 3GPP TS 32.422 clause 5.10.35. + type: integer + minimum: 1 + maximum: 60 + + eventListForEventTriggeredMeasurement-Type: + description: See details in 3GPP TS 32.422 clause 5.10.28. + type: string + enum: + - OUT_OF_COVERAGE + - A2_EVENT + + eventThreshold-Type: + description: See details in 3GPP TS 32.422 clause 5.10.7, 5.10.7a, 5.10.13 and 5.10.14. + type: object + properties: + EventThresholdRSRP: + oneOf: + - type: integer + minimum: 0 + maximum: 97 + - type: integer + minimum: 0 + maximum: 127 + EventThresholdRSRQ: + oneOf: + - type: integer + minimum: 0 + maximum: 34 + - type: integer + minimum: 0 + maximum: 127 + EventThreshold1F: + type: object + properties: + CPICH_RSCP: + type: integer + minimum: -120 + maximum: 25 + CPICH_EcNo: + type: integer + minimum: -24 + maximum: 0 + PathLoss: + type: integer + minimum: 30 + maximum: 165 + EventThreshold1I: + type: integer + minimum: -120 + maximum: 25 + + listOfMeasurements-Type: + description: See details in 3GPP TS 32.422 clause 5.10.3 for details. + type: object + properties: + UMTS: + type: array + items: + type: string + enum: + - M1 + - M2 + - M3 + - M4 + - M5 + - M6_DL + - M6_UL + - M7_DL + - M7_UL + LTE: + type: array + items: + type: string + enum: + - M1 + - M2 + - M3 + - M4 + - M5 + - M1_EVENT_TRIGGERED + - M6 + - M7 + - M8 + - M9 + NR: + type: array + items: + type: string + enum: + - M1 + - M2 + - M3 + - M4 + - M5 + - M6 + - M7 + - M1_EVENT_TRIGGERED + - M8 + - M9 + + loggingDuration-Type: + description: See details in 3GPP TS 32.422 clause 5.10.9. + type: string + enum: + - 600s + - 1200s + - 2400s + - 3600s + - 5400s + - 7200s + + loggingInterval-Type: + description: See details in 3GPP TS 32.422 clause 5.10.8. + 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 + + eventThresholdL1-Type: + description: See details in 3GPP TS 32.422 clause 5.10.X. + type: object + properties: + RSRP: + type: integer + minimum: 0 + maximum: 127 + RSRQ: + type: integer + minimum: 0 + maximum: 127 + + hysteresisL1-Type: + description: See details in 3GPP TS 32.422 clause 5.10.Y. + type: integer + minimum: 0 + maximum: 30 + + timeToTriggerL1-Type: + description: See details in 3GPP TS 32.422 clause 5.10.Z. + type: string + enum: + - 0ms + - 40ms + - 64ms + - 80ms + - 100ms + - 128ms + - 160ms + - 256ms + - 320ms + - 480ms + - 512ms + - 640ms + - 1024ms + - 1280ms + - 2560ms + - 5120ms + + measurementPeriodLte-Type: + description: See details in 3GPP TS 32.422 clause 5.10.23. + type: string + enum: + - 1024ms + - 2048ms + - 5120ms + - 10240ms + - 1min + + measurementPeriodUmts-Type: + description: See details in 3GPP TS 32.422 clause 5.10.22. + type: string + enum: + - 1000ms + - 2000ms + - 3000ms + - 4000ms + - 6000ms + - 8000ms + - 12000ms + - 16000ms + - 20000ms + - 24000ms + - 28000ms + - 32000ms + - 64000ms + + measurementQuantity-Type: + description: See details in 3GPP TS 32.422 clause 5.10.15. + type: string + enum: + - CPICH_EcNo + - CPICH_RSCP + - PathLoss + + eventThresholdUphUmts-Type: + description: See details in 3GPP TS 32.422 clause 5.10.A. + type: integer + minimum: 0 + maximum: 31 + + plmnList-Type: + description: See details in 3GPP TS 32.422 clause 5.10.24. + type: array + items: + type: object + properties: + mcc: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mcc' + mnc: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mnc' + required: + - mcc + - mnc + maxItems: 16 + + positioningMethod-Type: + description: See details in 3GPP TS 32.422 clause 5.10.19. + type: string + enum: + - GNSS + - E-CELL_ID + + reportAmount-Type: + description: See details in 3GPP TS 32.422 clause 5.10.6. + type: string + enum: + - 1 + - 2 + - 4 + - 8 + - 16 + - 32 + - 64 + - INFINITY + + reportAmountM1LTE-Type: + description: See details in 3GPP TS 32.422 clause 5.10.6. + type: string + enum: + - 1 + - 2 + - 4 + - 8 + - 16 + - 32 + - 64 + - INFINITY + + reportAmountM4LTE-Type: + description: See details in 3GPP TS 32.422 clause 5.10.6. + type: string + enum: + - 1 + - 2 + - 4 + - 8 + - 16 + - 32 + - 64 + - INFINITY + + reportAmountM5LTE-Type: + description: See details in 3GPP TS 32.422 clause 5.10.6. + type: string + enum: + - 1 + - 2 + - 4 + - 8 + - 16 + - 32 + - 64 + - INFINITY + + reportAmountM6LTE-Type: + description: See details in 3GPP TS 32.422 clause 5.10.6. + type: string + enum: + - 1 + - 2 + - 4 + - 8 + - 16 + - 32 + - 64 + - INFINITY + + reportAmountM7LTE-Type: + description: See details in 3GPP TS 32.422 clause 5.10.6. + type: string + enum: + - 1 + - 2 + - 4 + - 8 + - 16 + - 32 + - 64 + - INFINITY + + reportAmountM1NR-Type: + description: See details in 3GPP TS 32.422 clause 5.10.6. + type: string + enum: + - 1 + - 2 + - 4 + - 8 + - 16 + - 32 + - 64 + - INFINITY + + reportAmountM4NR-Type: + description: See details in 3GPP TS 32.422 clause 5.10.6. + type: string + enum: + - 1 + - 2 + - 4 + - 8 + - 16 + - 32 + - 64 + - INFINITY + + reportAmountM5NR-Type: + description: See details in 3GPP TS 32.422 clause 5.10.6. + type: string + enum: + - 1 + - 2 + - 4 + - 8 + - 16 + - 32 + - 64 + - INFINITY + + reportAmountM6NR-Type: + description: See details in 3GPP TS 32.422 clause 5.10.6. + type: string + enum: + - 1 + - 2 + - 4 + - 8 + - 16 + - 32 + - 64 + - INFINITY + + reportAmountM7NR-Type: + description: See details in 3GPP TS 32.422 clause 5.10.6. + type: string + enum: + - 1 + - 2 + - 4 + - 8 + - 16 + - 32 + - 64 + - INFINITY + + reportingTrigger-Type: + description: See details in 3GPP TS 32.422 clause 5.10.4. + type: array + items: + type: string + enum: + - PERIODICAL + - A2_FOR_LTE_NR + - 1F_FOR_UMTS + - 1I_FOR_UMTS_MCPS_TDD + - A2_TRIGGERED_PERIODIC_FOR_LTE_NR + - ALL_CONFIGURED_RRM_FOR_LTE_NR + - ALL_CONFIGURED_RRM_FOR_UMTS + + reportInterval-Type: + description: See details in 3GPP TS 32.422 clause 5.10.5. + 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 + - 20480ms + - 40960ms + - 60000ms + - 360000ms + - 720000ms + - 1800000ms + + reportType-Type: + description: Report type for logged NR MDT. See details in 3GPP TS 32.422 clause 5.10.27. + type: string + enum: + - PERIODICAL + - EVENT_TRIGGERED + + sensorInformation-Type: + description: See details in 3GPP TS 32.422 clause 5.10.29. + type: array + items: + type: string + enum: + - BAROMETRIC_PRESSURE + - UE_SPEED + - UE_ORIENTATION + + traceCollectionEntityId-Type: + description: See details in 3GPP TS 32.422 clause 5.10.11. Only TCE Id value may be sent over the air to the UE being configured for Logged MDT. + type: integer + + excessPacketDelayThreshold-Type: + description: Excess Packet Delay Threshold for NR MDT. See details in 3GPP TS 32.422 clause 4.1.1 and 4.1.2. + type: object + properties: + fiveQIValue: + type: integer + excessPacketDelayThresholdValue: + type: string + enum: + - 0.25MS + - 0.5MS + - 1MS + - 2MS + - 4MS + - 5MS + - 10MS + - 20MS + - 30MS + - 40MS + - 50MS + - 60MS + - 70MS + - 80MS + - 90MS + - 100MS + - 150MS + - 300MS + - 500MS + + excessPacketDelayThresholds-Type: + description: Array of type excessPacketDelayThreshold-Type. + type: array + items: + $ref: '#/components/schemas/excessPacketDelayThreshold-Type' + minItems: 0 + maxItems: 255 + + traceConfig-Type: + description: Trace configuration parameters for NR. See details in 3GPP TS 28.622 clause 4.3.30. + type: object + properties: + listOfInterfaces: + $ref: '#/components/schemas/listOfInterfaces-Type' + listOfNeTypes: + $ref: '#/components/schemas/listOfNeTypes-Type' + traceDepth: + $ref: '#/components/schemas/traceDepth-Type' + triggeringEvents: + $ref: '#/components/schemas/triggeringEvents-Type' + + immediateMDTConfig-Type: + description: Immediate MDT configuration parameters. See details in 3GPP TS 28.622 clause 4.3.30. + type: object + properties: + listOfMeasurements: + $ref: '#/components/schemas/listOfMeasurements-Type' + reportingTrigger: + $ref: '#/components/schemas/reportingTrigger-Type' + reportAmount: + $ref: '#/components/schemas/reportAmount-Type' + reportAmountM1LTE: + $ref: '#/components/schemas/reportAmountM1LTE-Type' + reportAmountM4LTE: + $ref: '#/components/schemas/reportAmountM4LTE-Type' + reportAmountM5LTE: + $ref: '#/components/schemas/reportAmountM5LTE-Type' + reportAmountM6LTE: + $ref: '#/components/schemas/reportAmountM6LTE-Type' + reportAmountM7LTE: + $ref: '#/components/schemas/reportAmountM7LTE-Type' + reportAmountM1NR: + $ref: '#/components/schemas/reportAmountM1NR-Type' + reportAmountM4NR: + $ref: '#/components/schemas/reportAmountM4NR-Type' + reportAmountM5NR: + $ref: '#/components/schemas/reportAmountM5NR-Type' + reportAmountM6NR: + $ref: '#/components/schemas/reportAmountM6NR-Type' + reportAmountM7NR: + $ref: '#/components/schemas/reportAmountM7NR-Type' + reportInterval: + $ref: '#/components/schemas/reportInterval-Type' + eventThreshold: + $ref: '#/components/schemas/eventThreshold-Type' + collectionPeriodRrmLte: + $ref: '#/components/schemas/collectionPeriodRrmLte-Type' + collectionPeriodM6Lte: + $ref: '#/components/schemas/collectionPeriodM6Lte-Type' + collectionPeriodM7Lte: + $ref: '#/components/schemas/collectionPeriodM7Lte-Type' + collectionPeriodRrmUmts: + $ref: '#/components/schemas/collectionPeriodRrmUmts-Type' + collectionPeriodRrmNr: + $ref: '#/components/schemas/collectionPeriodRrmNr-Type' + collectionPeriodM6Nr: + $ref: '#/components/schemas/collectionPeriodM6Nr-Type' + collectionPeriodM7Nr: + $ref: '#/components/schemas/collectionPeriodM7Nr-Type' + eventThresholdUphUmts: + $ref: '#/components/schemas/eventThresholdUphUmts-Type' + measurementPeriodUmts: + $ref: '#/components/schemas/measurementPeriodUmts-Type' + measurementPeriodLte: + $ref: '#/components/schemas/measurementPeriodLte-Type' + measurementQuantity: + $ref: '#/components/schemas/measurementQuantity-Type' + beamLevelMeasurement: + $ref: '#/components/schemas/beamLevelMeasurement-Type' + positioningMethod: + $ref: '#/components/schemas/positioningMethod-Type' + excessPacketDelayThresholds: + $ref: '#/components/schemas/excessPacketDelayThresholds-Type' + + loggedMDTConfig-Type: + description: Logged MDT configuration parameters. See details in 3GPP TS 28.622 clause 4.3.30. + type: object + properties: + traceCollectionEntityId: + $ref: '#/components/schemas/traceCollectionEntityId-Type' + loggingDuration: + $ref: '#/components/schemas/loggingDuration-Type' + loggingInterval: + $ref: '#/components/schemas/loggingInterval-Type' + eventThresholdL1: + $ref: '#/components/schemas/eventThresholdL1-Type' + hysteresisL1: + $ref: '#/components/schemas/hysteresisL1-Type' + timeToTriggerL1: + $ref: '#/components/schemas/timeToTriggerL1-Type' + mbsfnAreaList: + type: array + items: + $ref: '#/components/schemas/MbsfnArea' + reportType: + $ref: '#/components/schemas/reportType-Type' + plmnList: + $ref: '#/components/schemas/plmnList-Type' + eventListForEventTriggeredMeasurement: + $ref: '#/components/schemas/eventListForEventTriggeredMeasurement-Type' + areaConfigurationForNeighCell: + $ref: '#/components/schemas/AreaConfig' + + mdtConfig-Type: + description: MDT config parameters. See details in 3GPP TS 28.622 clause 4.3.30. + type: object + properties: + anonymizationOfMdtData: + $ref: '#/components/schemas/anonymizationOfMdtData-Type' + areaScope: + type: array + items: + $ref: '#/components/schemas/AreaScope' + sensorInformation: + $ref: '#/components/schemas/sensorInformation-Type' + immediateMDTConfig: + $ref: '#/components/schemas/immediateMDTConfig-Type' + loggedMDTConfig: + $ref: '#/components/schemas/loggedMDTConfig-Type' + AreaScope: + oneOf: + - type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/EutraCellId' + - type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/NrCellId' + - type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Tac' + - type: array + items: + $ref: '#/components/schemas/Tai' + Tai: + type: object + properties: + mcc: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mcc' + mnc: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mnc' + tac: + $ref: 'TS28623_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 + TraceJob-Attr: + type: object + description: abstract class used as a container of all TraceJob attributes + properties: + jobType: + $ref: '#/components/schemas/jobType-Type' + plmnTarget: + $ref: '#/components/schemas/plmnTarget-Type' + traceReportingConsumerUri: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' + traceCollectionEntityIpAddress: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/IpAddr' + traceReference: + $ref: '#/components/schemas/traceReference-Type' + jobId: + type: string + traceReportingFormat: + $ref: '#/components/schemas/traceReportingFormat-Type' + traceTarget: + $ref: '#/components/schemas/traceTarget-Type' + traceConfig: + $ref: '#/components/schemas/traceConfig-Type' + mdtConfig: + $ref: '#/components/schemas/mdtConfig-Type' + +#-------- end of Definition of types used in Trace control NRM fragment ---------- + +#-------- Definition of concrete IOCs -------------------------------------------- + TraceJob-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + $ref: '#/components/schemas/TraceJob-Attr' + Files: + $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/Files-Multiple' + +#-------- Definition of YAML arrays for name-contained IOCs ---------------------- + + TraceJob-Multiple: + type: array + items: + $ref: '#/components/schemas/TraceJob-Single' + +#-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- + resources-TraceCollectionNrm: + oneOf: + - $ref: '#/components/schemas/TraceJob-Single' -- GitLab From bc7e6ba34bbfcd1d16a2bf4d08a0c1f921ead71d Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 3 Nov 2023 15:49:05 +0000 Subject: [PATCH 059/119] Update file TS28623_TraceControlNrm.yaml --- 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 27d0e7442..ce8fd438c 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -1447,7 +1447,7 @@ components: attributes: $ref: '#/components/schemas/TraceJob-Attr' Files: - $ref: 'TS28623_FileManagementNrm.yaml#/components/schemas/Files-Multiple' + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Files-Multiple' #-------- Definition of YAML arrays for name-contained IOCs ---------------------- -- GitLab From a1f6b705856bfa3ee55d6ed80f5b4f64d82007ec Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 3 Nov 2023 16:03:34 +0000 Subject: [PATCH 060/119] Update 2 files - /OpenAPI/TS28532_StreamingDataMnS.yaml - /OpenAPI/TS28623_GenericNrm.yaml --- OpenAPI/TS28532_StreamingDataMnS.yaml | 2 +- OpenAPI/TS28623_GenericNrm.yaml | 1429 +------------------------ 2 files changed, 7 insertions(+), 1424 deletions(-) diff --git a/OpenAPI/TS28532_StreamingDataMnS.yaml b/OpenAPI/TS28532_StreamingDataMnS.yaml index ef587dac1..651b452c0 100755 --- a/OpenAPI/TS28532_StreamingDataMnS.yaml +++ b/OpenAPI/TS28532_StreamingDataMnS.yaml @@ -402,7 +402,7 @@ components: traceInfo-Type: description: Information specific to trace data reporting allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/TraceJob-Attr' + - $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/TraceJob-Attr' traceReference-Type: description: Trace Reference (see clause 5.6 of 3GPP TS 32.422) as stream identifier for streaming trace data reporting type: string diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 3d8607d6a..e95715265 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -324,34 +324,6 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mnc' tac: $ref: '#/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 Tac: type: string pattern: '(^[A-Fa-f0-9]{4}$)|(^[A-Fa-f0-9]{6}$)' @@ -437,1357 +409,6 @@ components: minimum: 0 maximum: 31 -#-------- Definition of types used in Trace control NRM fragment------------------ - - jobType-Type: - type: string - description: Specifies whether the TraceJob represents only MDT, Logged MBSFN MDT, Trace or a combined Trace and MDT job. Applicable for Trace, MDT, RCEF and RLF reporting. See 3GPP TS 32.422 clause 5.9a for additional details. - enum: - - IMMEDIATE_MDT_ONLY - - LOGGED_MDT_ONLY - - TRACE_ONLY - - IMMEDIATE_MDT AND TRACE - - RLF_REPORT_ONLY - - RCEF_REPORT_ONLY - - LOGGED_MBSFN_MDT - - listOfInterfaces-Type: - description: The interfaces to be recorded in the Network Element. See 3GPP TS 32.422 clause 5.5 for additional details. - type: object - properties: - MSCServerInterfaces: - type: array - items: - type: string - enum: - - A - - Iu-CS - - Mc - - MAP-G - - MAP-B - - MAP-E - - MAP-F - - MAP-D - - MAP-C - - CAP - MGWInterfaces: - type: array - items: - type: string - enum: - - Mc - - Nb-UP - - Iu-UP - RNCInterfaces: - type: array - items: - type: string - enum: - - Iu-CS - - Iu-PS - - Iur - - Iub - - Uu - SGSNInterfaces: - type: array - items: - type: string - enum: - - Gb - - Iu-PS - - Gn - - MAP-Gr - - MAP-Gd - - MAP-Gf - - Ge - - Gs - - S6d - - S4 - - S3 - - S13 - GGSNInterfaces: - type: array - items: - type: string - enum: - - Gn - - Gi - - Gmb - S-CSCFInterfaces: - type: array - items: - type: string - enum: - - Mw - - Mg - - Mr - - Mi - P-CSCFInterfaces: - type: array - items: - type: string - enum: - - Gm - - Mw - I-CSCFInterfaces: - type: array - items: - type: string - enum: - - Cx - - Dx - - Mg - - Mw - MRFCInterfaces: - type: array - items: - type: string - enum: - - Mp - - Mr - MGCFInterfaces: - type: array - items: - type: string - enum: - - Mg - - Mj - - Mn - IBCFInterfaces: - type: array - items: - type: string - enum: - - Ix - - Mx - E-CSCFInterfaces: - type: array - items: - type: string - enum: - - Mw - - Ml - - Mm - - Mi/Mg - BGCFInterfaces: - type: array - items: - type: string - enum: - - Mi - - Mj - - Mk - ASInterfaces: - type: array - items: - type: string - enum: - - Dh - - Sh - - ISC - - Ut - HSSInterfaces: - type: array - items: - type: string - enum: - - MAP-C - - MAP-D - - Gc - - Gr - - Cx - - S6d - - S6a - - Sh - - N70 - - N71 - - NU1 - EIRInterfaces: - type: array - items: - type: string - enum: - - MAP-F - - S13 - - MAP-Gf - BM-SCInterfaces: - type: array - items: - type: string - enum: - - Gmb - MMEInterfaces: - type: array - items: - type: string - enum: - - S1-MME - - S3 - - S6a - - S10 - - S11 - - S13 - SGWInterfaces: - type: array - items: - type: string - enum: - - S4 - - S5 - - S8 - - S11 - - Gxc - PDN_GWInterfaces: - type: array - items: - type: string - enum: - - S2a - - S2b - - S2c - - S5 - - S6b - - Gx - - S8 - - SGi - eNBInterfaces: - type: array - items: - type: string - enum: - - S1-MME - - X2 - en-gNBInterfaces: - type: array - items: - type: string - enum: - - S1-MME - - X2 - - Uu - - F1-C - - E1 - AMFInterfaces: - type: array - items: - type: string - enum: - - N1 - - N2 - - N8 - - N11 - - N12 - - N14 - - N15 - - N20 - - N22 - - N26 - AUSFInterfaces: - type: array - items: - type: string - enum: - - N12 - - N13 - NEFInterfaces: - type: array - items: - type: string - enum: - - N29 - - N30 - - N33 - NRFInterfaces: - type: array - items: - type: string - enum: - - N27 - NSSFInterfaces: - type: array - items: - type: string - enum: - - N22 - - N31 - PCFInterfaces: - type: array - items: - type: string - enum: - - N5 - - N7 - - N15 - SMFInterfaces: - type: array - items: - type: string - enum: - - N4 - - N7 - - N10 - - N11 - - S5-C - SMSFInterfaces: - type: array - items: - type: string - enum: - - N20 - - N21 - UDMInterfaces: - type: array - items: - type: string - enum: - - N8 - - N10 - - N13 - - N21 - - NU1 - UPFInterfaces: - type: array - items: - type: string - enum: - - N4 - ng-eNBInterfaces: - type: array - items: - type: string - enum: - - NG-C - - Xn-C - - Uu - gNB-CU-CPInterfaces: - type: array - items: - type: string - enum: - - NG-C - - Xn-C - - Uu - - F1-C - - E1 - - X2-C - gNB-CU-UPInterfaces: - type: array - items: - type: string - enum: - - E1 - gNB-DUInterfaces: - type: array - items: - type: string - enum: - - F1-C - - 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 - items: - type: string - enum: - - MSC_SERVER - - SGSN - - MGW - - GGSN - - RNC - - BM_SC - - MME - - SGW - - PGW - - ENB - - EN_GNB - - GNB_CU_CP - - GNB_CU_UP - - GNB_DU - - AMF - - PCF - - SMF - - UPF - - AUSF - - SMSF - - HSS - - UDM - - plmnTarget-Type: - type: object - description: The PLMN for which sessions shall be selected in the Trace Session in case of management based activation when several PLMNs are supported in the RAN (this means that shared cells and not shared cells are allowed for the specified PLMN. Note that the PLMN Target might differ from the PLMN specified in the Trace Reference, as that specifies the PLMN that is containing the management system requesting the Trace Session from the NE. See 3GPP TS 32.422 clause 5.9b for additional details. - properties: - mcc: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mcc' - mnc: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mnc' - required: - - mcc - - mnc - - traceDepth-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 - enum: - - MINIMUM - - MEDIUM - - MAXIMUM - - VENDORMINIMUM - - VENDORMEDIUM - - VENDORMAXIMUM - - traceReference-Type: - type: object - description: The Trace Reference parameter shall be globally unique, therefore the Trace Reference shall compose as follows - MCC+MNC+Trace ID, where the MCC and MNC are coming with the Trace activation request from the management system to identify one PLMN containing the management system, and Trace ID is a 3 byte Octet String. See 3GPP TS 32.422 clause 5.6 for additional details. - properties: - mcc: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mcc' - mnc: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mnc' - traceId: - type: string - required: - - mcc - - mnc - - traceId - - traceReportingFormat-Type: - type: string - description: Specifies whether file-based or streaming reporting shall be used for this Trace Session. See 3GPP TS 32.422 clause 5.11 for additional details. - enum: - - FILE-BASED - - STREAMING - - traceTarget-Type: - type: object - description: Trace target conveying both the type and value of the target ID. For additional details see 3GPP TS 32.422 - properties: - TargetIdType: - type: string - enum: - - IMSI - - IMEI - - IMEISV - - PUBLIC_ID - - UTRAN_CELL - - E-UTRAN_CELL - - NG-RAN_CELL - - eNB - - RNC - - gNB - - SUPI - TargetIdValue: - type: string - required: - - TargetIdType - - TargetIdValue - - triggeringEvents-Type: - type: object - description: Specifies when to start a Trace Recording Session and which message shall be recorded first, when to stop a Trace Recording Session and which message shall be recorded last respectively. See 3GPP TS 32.422 clause 5.1 for additional detials. - properties: - MSC_SERVER: - type: array - items: - type: string - enum: - - MO_MT_CALLS - - MO_MT_SMS - - LU_IMSIattach_IMSIdetach - - HANDOVER - - SS - SGSN: - type: array - items: - type: string - enum: - - PDPcontext - - MO_MT_SMS - - RAU_GPRSattach_GPRSdetach - - MBMScontext - MGW: - type: array - items: - type: string - enum: - - CONTEXT - GGSN: - type: array - items: - type: string - enum: - - PDPcontext - - MBMScontext - IMS: - type: array - items: - type: string - enum: - - SIPsession_StandaloneTransaction - BM_SC: - type: array - items: - type: string - enum: - - MBMSactivation - MME: - type: array - items: - type: string - enum: - - UEinitiatedPDNconnectivityRequest - - ServiceRequest - - InitialAttach_TAU_Detach - - UEinitiatedPDNdisconnection - - BearerActivationModificationDeletion - - Handover - SGW: - type: array - items: - type: string - enum: - - PDNconnectionCreation - - PDNconnectionTermination - - BearerActivationModificationDeletion - PGW: - type: array - items: - type: string - enum: - - PDNconnectionCreation - - PDNconnectionTermination - - BearerActivationModificationDeletion - AMF: - type: array - items: - type: string - enum: - - Registration - - ServiceRequest - - Handover - - UEderegistration - - NetworkDeregistration - - UEMobilityFromEPC - - UEMobilityToEPC - SMF: - type: array - items: - type: string - enum: - - PDUsessionEstablishment - - PDUsessionModification - - PDUsessionRelease - - PDUsessionUPactivationDeactivation - - MobilityBtw3gppAndN3gppTo5GC - - MobilityFromEpc - PCF: - type: array - items: - type: string - enum: - - AMpolicy - - SMpolicy - - Authorization - - BDTpolicy - UPF: - type: array - items: - type: string - enum: - - N4Session - AUSF: - type: array - items: - type: string - enum: - - UEauthentication - NEF: - type: array - items: - type: string - enum: - - EventExposure - - PFDmanagement - - ParameterProvision - - Trigger - NRF: - type: array - items: - type: string - enum: - - NFmanagement - - NFdiscovery - NSSF: - type: array - items: - type: string - enum: - - NSSelection - - NSSAI - SMSF: - type: array - items: - type: string - enum: - - SMservice - UDM: - type: array - items: - type: string - enum: - - UEcontext - - SubscriberData - - UEauthentication - - EventExposure - - anonymizationOfMdtData-Type: - description: Specifies level of MDT anonymization. For additional details see 3GPP TS 32.422 clause 5.10.12. - type: string - enum: - - NO_IDENTITY - - TAC_OF_IMEI - - beamLevelMeasurement-Type: - description: Determines whether beam level measurements shall be included in case of immediate MDT M1 measurement in NR. For additional details see 3GPP TS 32.422 clause 5.10.40. - type: boolean - - collectionPeriodRrmLte-Type: - description: See details in 3GPP TS 32.422 clause 5.10.20. - type: string - enum: - - 100ms - - 1000ms - - 1024ms - - 1280ms - - 2048ms - - 2560ms - - 5120ms - - 10000ms - - 10240ms - - 60000ms - - collectionPeriodM6Lte-Type: - description: See details in 3GPP TS 32.422 clause 5.10.32. - type: string - enum: - - 1024ms - - 2048ms - - 5120ms - - 10240ms - - collectionPeriodM7Lte-Type: - description: See details in 3GPP TS 32.422 clause 5.10.33. - type: integer - minimum: 1 - maximum: 60 - - collectionPeriodRrmUmts-Type: - description: See details in 3GPP TS 32.422 clause 5.10.21. - type: string - enum: - - 100ms - - 250ms - - 500ms - - 1000ms - - 2000ms - - 3000ms - - 4000ms - - 6000ms - - collectionPeriodRrmNr-Type: - description: See details in 3GPP TS 32.422 clause 5.10.30. - type: string - enum: - - 1024ms - - 2048ms - - 5120ms - - 10240ms - - 60000ms - - collectionPeriodM6Nr-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 - - collectionPeriodM7Nr-Type: - description: See details in 3GPP TS 32.422 clause 5.10.35. - type: integer - minimum: 1 - maximum: 60 - - eventListForEventTriggeredMeasurement-Type: - description: See details in 3GPP TS 32.422 clause 5.10.28. - type: string - enum: - - OUT_OF_COVERAGE - - A2_EVENT - - eventThreshold-Type: - description: See details in 3GPP TS 32.422 clause 5.10.7, 5.10.7a, 5.10.13 and 5.10.14. - type: object - properties: - EventThresholdRSRP: - oneOf: - - type: integer - minimum: 0 - maximum: 97 - - type: integer - minimum: 0 - maximum: 127 - EventThresholdRSRQ: - oneOf: - - type: integer - minimum: 0 - maximum: 34 - - type: integer - minimum: 0 - maximum: 127 - EventThreshold1F: - type: object - properties: - CPICH_RSCP: - type: integer - minimum: -120 - maximum: 25 - CPICH_EcNo: - type: integer - minimum: -24 - maximum: 0 - PathLoss: - type: integer - minimum: 30 - maximum: 165 - EventThreshold1I: - type: integer - minimum: -120 - maximum: 25 - - listOfMeasurements-Type: - description: See details in 3GPP TS 32.422 clause 5.10.3 for details. - type: object - properties: - UMTS: - type: array - items: - type: string - enum: - - M1 - - M2 - - M3 - - M4 - - M5 - - M6_DL - - M6_UL - - M7_DL - - M7_UL - LTE: - type: array - items: - type: string - enum: - - M1 - - M2 - - M3 - - M4 - - M5 - - M1_EVENT_TRIGGERED - - M6 - - M7 - - M8 - - M9 - NR: - type: array - items: - type: string - enum: - - M1 - - M2 - - M3 - - M4 - - M5 - - M6 - - M7 - - M1_EVENT_TRIGGERED - - M8 - - M9 - - loggingDuration-Type: - description: See details in 3GPP TS 32.422 clause 5.10.9. - type: string - enum: - - 600s - - 1200s - - 2400s - - 3600s - - 5400s - - 7200s - - loggingInterval-Type: - description: See details in 3GPP TS 32.422 clause 5.10.8. - 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 - - eventThresholdL1-Type: - description: See details in 3GPP TS 32.422 clause 5.10.X. - type: object - properties: - RSRP: - type: integer - minimum: 0 - maximum: 127 - RSRQ: - type: integer - minimum: 0 - maximum: 127 - - hysteresisL1-Type: - description: See details in 3GPP TS 32.422 clause 5.10.Y. - type: integer - minimum: 0 - maximum: 30 - - timeToTriggerL1-Type: - description: See details in 3GPP TS 32.422 clause 5.10.Z. - type: string - enum: - - 0ms - - 40ms - - 64ms - - 80ms - - 100ms - - 128ms - - 160ms - - 256ms - - 320ms - - 480ms - - 512ms - - 640ms - - 1024ms - - 1280ms - - 2560ms - - 5120ms - - measurementPeriodLte-Type: - description: See details in 3GPP TS 32.422 clause 5.10.23. - type: string - enum: - - 1024ms - - 2048ms - - 5120ms - - 10240ms - - 1min - - measurementPeriodUmts-Type: - description: See details in 3GPP TS 32.422 clause 5.10.22. - type: string - enum: - - 1000ms - - 2000ms - - 3000ms - - 4000ms - - 6000ms - - 8000ms - - 12000ms - - 16000ms - - 20000ms - - 24000ms - - 28000ms - - 32000ms - - 64000ms - - measurementQuantity-Type: - description: See details in 3GPP TS 32.422 clause 5.10.15. - type: string - enum: - - CPICH_EcNo - - CPICH_RSCP - - PathLoss - - eventThresholdUphUmts-Type: - description: See details in 3GPP TS 32.422 clause 5.10.A. - type: integer - minimum: 0 - maximum: 31 - - plmnList-Type: - description: See details in 3GPP TS 32.422 clause 5.10.24. - type: array - items: - type: object - properties: - mcc: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mcc' - mnc: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mnc' - required: - - mcc - - mnc - maxItems: 16 - - positioningMethod-Type: - description: See details in 3GPP TS 32.422 clause 5.10.19. - type: string - enum: - - GNSS - - E-CELL_ID - - reportAmount-Type: - description: See details in 3GPP TS 32.422 clause 5.10.6. - type: string - enum: - - 1 - - 2 - - 4 - - 8 - - 16 - - 32 - - 64 - - INFINITY - - reportAmountM1LTE-Type: - description: See details in 3GPP TS 32.422 clause 5.10.6. - type: string - enum: - - 1 - - 2 - - 4 - - 8 - - 16 - - 32 - - 64 - - INFINITY - - reportAmountM4LTE-Type: - description: See details in 3GPP TS 32.422 clause 5.10.6. - type: string - enum: - - 1 - - 2 - - 4 - - 8 - - 16 - - 32 - - 64 - - INFINITY - - reportAmountM5LTE-Type: - description: See details in 3GPP TS 32.422 clause 5.10.6. - type: string - enum: - - 1 - - 2 - - 4 - - 8 - - 16 - - 32 - - 64 - - INFINITY - - reportAmountM6LTE-Type: - description: See details in 3GPP TS 32.422 clause 5.10.6. - type: string - enum: - - 1 - - 2 - - 4 - - 8 - - 16 - - 32 - - 64 - - INFINITY - - reportAmountM7LTE-Type: - description: See details in 3GPP TS 32.422 clause 5.10.6. - type: string - enum: - - 1 - - 2 - - 4 - - 8 - - 16 - - 32 - - 64 - - INFINITY - - reportAmountM1NR-Type: - description: See details in 3GPP TS 32.422 clause 5.10.6. - type: string - enum: - - 1 - - 2 - - 4 - - 8 - - 16 - - 32 - - 64 - - INFINITY - - reportAmountM4NR-Type: - description: See details in 3GPP TS 32.422 clause 5.10.6. - type: string - enum: - - 1 - - 2 - - 4 - - 8 - - 16 - - 32 - - 64 - - INFINITY - - reportAmountM5NR-Type: - description: See details in 3GPP TS 32.422 clause 5.10.6. - type: string - enum: - - 1 - - 2 - - 4 - - 8 - - 16 - - 32 - - 64 - - INFINITY - - reportAmountM6NR-Type: - description: See details in 3GPP TS 32.422 clause 5.10.6. - type: string - enum: - - 1 - - 2 - - 4 - - 8 - - 16 - - 32 - - 64 - - INFINITY - - reportAmountM7NR-Type: - description: See details in 3GPP TS 32.422 clause 5.10.6. - type: string - enum: - - 1 - - 2 - - 4 - - 8 - - 16 - - 32 - - 64 - - INFINITY - - reportingTrigger-Type: - description: See details in 3GPP TS 32.422 clause 5.10.4. - type: array - items: - type: string - enum: - - PERIODICAL - - A2_FOR_LTE_NR - - 1F_FOR_UMTS - - 1I_FOR_UMTS_MCPS_TDD - - A2_TRIGGERED_PERIODIC_FOR_LTE_NR - - ALL_CONFIGURED_RRM_FOR_LTE_NR - - ALL_CONFIGURED_RRM_FOR_UMTS - - reportInterval-Type: - description: See details in 3GPP TS 32.422 clause 5.10.5. - 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 - - 20480ms - - 40960ms - - 60000ms - - 360000ms - - 720000ms - - 1800000ms - - reportType-Type: - description: Report type for logged NR MDT. See details in 3GPP TS 32.422 clause 5.10.27. - type: string - enum: - - PERIODICAL - - EVENT_TRIGGERED - - sensorInformation-Type: - description: See details in 3GPP TS 32.422 clause 5.10.29. - type: array - items: - type: string - enum: - - BAROMETRIC_PRESSURE - - UE_SPEED - - UE_ORIENTATION - - traceCollectionEntityId-Type: - description: See details in 3GPP TS 32.422 clause 5.10.11. Only TCE Id value may be sent over the air to the UE being configured for Logged MDT. - type: integer - - excessPacketDelayThreshold-Type: - description: Excess Packet Delay Threshold for NR MDT. See details in 3GPP TS 32.422 clause 4.1.1 and 4.1.2. - type: object - properties: - fiveQIValue: - type: integer - excessPacketDelayThresholdValue: - type: string - enum: - - 0.25MS - - 0.5MS - - 1MS - - 2MS - - 4MS - - 5MS - - 10MS - - 20MS - - 30MS - - 40MS - - 50MS - - 60MS - - 70MS - - 80MS - - 90MS - - 100MS - - 150MS - - 300MS - - 500MS - - excessPacketDelayThresholds-Type: - description: Array of type excessPacketDelayThreshold-Type. - type: array - items: - $ref: '#/components/schemas/excessPacketDelayThreshold-Type' - minItems: 0 - maxItems: 255 - - traceConfig-Type: - description: Trace configuration parameters for NR. See details in 3GPP TS 28.622 clause 4.3.30. - type: object - properties: - listOfInterfaces: - $ref: '#/components/schemas/listOfInterfaces-Type' - listOfNeTypes: - $ref: '#/components/schemas/listOfNeTypes-Type' - traceDepth: - $ref: '#/components/schemas/traceDepth-Type' - triggeringEvents: - $ref: '#/components/schemas/triggeringEvents-Type' - - immediateMDTConfig-Type: - description: Immediate MDT configuration parameters. See details in 3GPP TS 28.622 clause 4.3.30. - type: object - properties: - listOfMeasurements: - $ref: '#/components/schemas/listOfMeasurements-Type' - reportingTrigger: - $ref: '#/components/schemas/reportingTrigger-Type' - reportAmount: - $ref: '#/components/schemas/reportAmount-Type' - reportAmountM1LTE: - $ref: '#/components/schemas/reportAmountM1LTE-Type' - reportAmountM4LTE: - $ref: '#/components/schemas/reportAmountM4LTE-Type' - reportAmountM5LTE: - $ref: '#/components/schemas/reportAmountM5LTE-Type' - reportAmountM6LTE: - $ref: '#/components/schemas/reportAmountM6LTE-Type' - reportAmountM7LTE: - $ref: '#/components/schemas/reportAmountM7LTE-Type' - reportAmountM1NR: - $ref: '#/components/schemas/reportAmountM1NR-Type' - reportAmountM4NR: - $ref: '#/components/schemas/reportAmountM4NR-Type' - reportAmountM5NR: - $ref: '#/components/schemas/reportAmountM5NR-Type' - reportAmountM6NR: - $ref: '#/components/schemas/reportAmountM6NR-Type' - reportAmountM7NR: - $ref: '#/components/schemas/reportAmountM7NR-Type' - reportInterval: - $ref: '#/components/schemas/reportInterval-Type' - eventThreshold: - $ref: '#/components/schemas/eventThreshold-Type' - collectionPeriodRrmLte: - $ref: '#/components/schemas/collectionPeriodRrmLte-Type' - collectionPeriodM6Lte: - $ref: '#/components/schemas/collectionPeriodM6Lte-Type' - collectionPeriodM7Lte: - $ref: '#/components/schemas/collectionPeriodM7Lte-Type' - collectionPeriodRrmUmts: - $ref: '#/components/schemas/collectionPeriodRrmUmts-Type' - collectionPeriodRrmNr: - $ref: '#/components/schemas/collectionPeriodRrmNr-Type' - collectionPeriodM6Nr: - $ref: '#/components/schemas/collectionPeriodM6Nr-Type' - collectionPeriodM7Nr: - $ref: '#/components/schemas/collectionPeriodM7Nr-Type' - eventThresholdUphUmts: - $ref: '#/components/schemas/eventThresholdUphUmts-Type' - measurementPeriodUmts: - $ref: '#/components/schemas/measurementPeriodUmts-Type' - measurementPeriodLte: - $ref: '#/components/schemas/measurementPeriodLte-Type' - measurementQuantity: - $ref: '#/components/schemas/measurementQuantity-Type' - beamLevelMeasurement: - $ref: '#/components/schemas/beamLevelMeasurement-Type' - positioningMethod: - $ref: '#/components/schemas/positioningMethod-Type' - excessPacketDelayThresholds: - $ref: '#/components/schemas/excessPacketDelayThresholds-Type' - - loggedMDTConfig-Type: - description: Logged MDT configuration parameters. See details in 3GPP TS 28.622 clause 4.3.30. - type: object - properties: - traceCollectionEntityId: - $ref: '#/components/schemas/traceCollectionEntityId-Type' - loggingDuration: - $ref: '#/components/schemas/loggingDuration-Type' - loggingInterval: - $ref: '#/components/schemas/loggingInterval-Type' - eventThresholdL1: - $ref: '#/components/schemas/eventThresholdL1-Type' - hysteresisL1: - $ref: '#/components/schemas/hysteresisL1-Type' - timeToTriggerL1: - $ref: '#/components/schemas/timeToTriggerL1-Type' - mbsfnAreaList: - type: array - items: - $ref: '#/components/schemas/MbsfnArea' - reportType: - $ref: '#/components/schemas/reportType-Type' - plmnList: - $ref: '#/components/schemas/plmnList-Type' - eventListForEventTriggeredMeasurement: - $ref: '#/components/schemas/eventListForEventTriggeredMeasurement-Type' - areaConfigurationForNeighCell: - $ref: '#/components/schemas/AreaConfig' - - mdtConfig-Type: - description: MDT config parameters. See details in 3GPP TS 28.622 clause 4.3.30. - type: object - properties: - anonymizationOfMdtData: - $ref: '#/components/schemas/anonymizationOfMdtData-Type' - areaScope: - type: array - items: - $ref: '#/components/schemas/AreaScope' - sensorInformation: - $ref: '#/components/schemas/sensorInformation-Type' - immediateMDTConfig: - $ref: '#/components/schemas/immediateMDTConfig-Type' - loggedMDTConfig: - $ref: '#/components/schemas/loggedMDTConfig-Type' - -#-------- end of Definition of types used in Trace control NRM fragment ---------- - - #-------- Definition of abstract IOC Top ----------------------------------------- Top-Attr: @@ -1892,7 +513,7 @@ components: ThresholdMonitor: $ref: '#/components/schemas/ThresholdMonitor-Multiple' TraceJob: - $ref: '#/components/schemas/TraceJob-Multiple' + $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/TraceJob-Multiple' ManagementDataCollection: $ref: '#/components/schemas/ManagementDataCollection-Multiple' NtfSubscriptionControl: @@ -1924,7 +545,7 @@ components: ThresholdMonitor: $ref: '#/components/schemas/ThresholdMonitor-Multiple' TraceJob: - $ref: '#/components/schemas/TraceJob-Multiple' + $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/TraceJob-Multiple' NtfSubscriptionControl: $ref: '#/components/schemas/NtfSubscriptionControl-Multiple' AlarmList: @@ -1979,31 +600,6 @@ components: items: $ref: '#/components/schemas/SupportedPerfMetricGroup' - TraceJob-Attr: - type: object - description: abstract class used as a container of all TraceJob attributes - properties: - jobType: - $ref: '#/components/schemas/jobType-Type' - plmnTarget: - $ref: '#/components/schemas/plmnTarget-Type' - traceReportingConsumerUri: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' - traceCollectionEntityIpAddress: - $ref: '#/components/schemas/IpAddr' - traceReference: - $ref: '#/components/schemas/traceReference-Type' - jobId: - type: string - traceReportingFormat: - $ref: '#/components/schemas/traceReportingFormat-Type' - traceTarget: - $ref: '#/components/schemas/traceTarget-Type' - traceConfig: - $ref: '#/components/schemas/traceConfig-Type' - mdtConfig: - $ref: '#/components/schemas/mdtConfig-Type' - ManagedFunction-ncO: type: object properties: @@ -2014,7 +610,7 @@ components: ManagedNFService: $ref: '#/components/schemas/ManagedNFService-Multiple' TraceJob: - $ref: '#/components/schemas/TraceJob-Multiple' + $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/TraceJob-Multiple' #-------- Definition of concrete IOCs -------------------------------------------- @@ -2198,15 +794,7 @@ components: minimum: 0 triggerHeartbeatNtf: type: boolean - TraceJob-Single: - allOf: - - $ref: '#/components/schemas/Top' - - type: object - properties: - attributes: - $ref: '#/components/schemas/TraceJob-Attr' - Files: - $ref: '#/components/schemas/Files-Multiple' + ManagementDataCollection-Single: allOf: - $ref: '#/components/schemas/Top' @@ -2425,7 +1013,7 @@ components: qoECollectionEntityAddress: $ref: '#/components/schemas/IpAddr' pLMNTarget: - $ref: '#/components/schemas/plmnTarget-Type' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' qoETarget: type: string qoEReference: @@ -2439,7 +1027,7 @@ components: qMCConfigFile: type: string mDTAlignmentInformation: - $ref: '#/components/schemas/traceReference-Type' + $ref: 'TS28623_TraceControlNrm#/components/schemas/traceReference-Type' availableRANqoEMetrics: type: array items: @@ -2480,10 +1068,6 @@ components: type: array items: $ref: '#/components/schemas/ThresholdMonitor-Single' - TraceJob-Multiple: - type: array - items: - $ref: '#/components/schemas/TraceJob-Single' ManagementDataCollection-Multiple: type: array items: @@ -2536,7 +1120,6 @@ 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' -- GitLab From 9bebf85c6a5478bcc8413ff106bd6600f896750a Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 3 Nov 2023 16:16:55 +0000 Subject: [PATCH 061/119] Update file TS28623_TraceControlNrm.yaml --- OpenAPI/TS28623_TraceControlNrm.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index ce8fd438c..84ed3a96c 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -1455,7 +1455,6 @@ components: type: array items: $ref: '#/components/schemas/TraceJob-Single' - #-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- resources-TraceCollectionNrm: oneOf: -- GitLab From f3a71edf2ec3241fc111f3d6ec952ac94ba64fc3 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 3 Nov 2023 16:42:09 +0000 Subject: [PATCH 062/119] Update file 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 e95715265..f93bcf16f 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -1027,7 +1027,7 @@ components: qMCConfigFile: type: string mDTAlignmentInformation: - $ref: 'TS28623_TraceControlNrm#/components/schemas/traceReference-Type' + $ref: 'TS28623_TraceControlNrm.yaml#/components/schemas/traceReference-Type' availableRANqoEMetrics: type: array items: -- GitLab From 8613a12d495b2fa0e99f7dcce0f7e538fe391920 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 15 Nov 2023 20:11:16 +0000 Subject: [PATCH 063/119] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index ee7f74ce9..406abf6ec 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -95,7 +95,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' IntentHandlingFunction-Single: description: >- - It represents the intent handling capabilities can be supported by a specific inteng + It represents the intent handling capabilities can be supported by a specific intent handling function of MnS producer. allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' -- GitLab From ade6e46be09c7b9ddbee4a05826288e8305896fe Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 16 Nov 2023 05:22:07 +0000 Subject: [PATCH 064/119] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 406abf6ec..29981d385 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -155,6 +155,8 @@ components: - 5GC_SubNetwork #value for 5GC Network Expectation--# objectInstance: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + contextSelectivity: + $ref: "#/components/schemas/Selectivity" objectContexts: type: array items: -- GitLab From f4415021e974ff76995ac5d7edcf0c9055a81106 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 16 Nov 2023 05:37:21 +0000 Subject: [PATCH 065/119] Update file TS28623_TraceControlNrm.yaml --- OpenAPI/TS28623_TraceControlNrm.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index 84ed3a96c..c52131762 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -3,8 +3,8 @@ info: title: Trace Control NRM version: 18.4.0 description: >- - OAS 3.0.1 definition of the Trace Control NRM fragment - © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + OAS 3.0.1 definition of the Trace Control NRM fragment + © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: description: 3GPP TS 28.623; Generic NRM @@ -1456,6 +1456,6 @@ components: items: $ref: '#/components/schemas/TraceJob-Single' #-------- Definitions in TS 28.623 for TS 28.532 --------------------------------- - resources-TraceCollectionNrm: + resources-TraceControlNrm: oneOf: - $ref: '#/components/schemas/TraceJob-Single' -- GitLab From fb536c85e072443405e3fb73d358da08fa54a30a Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 16 Nov 2023 17:40:23 +0000 Subject: [PATCH 066/119] Update file TS28623_TraceControlNrm.yaml --- 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 c52131762..b2faec87c 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -7,7 +7,7 @@ info: © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.623; Generic NRM + description: 3GPP TS 28.623; Generic NRM：Trace Control NRM url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/ paths: {} components: -- GitLab From b49a0a325b62e0727ca3c4e564fba6800f8275f0 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 16 Nov 2023 17:40:47 +0000 Subject: [PATCH 067/119] Update file TS28623_TraceControlNrm.yaml --- 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 b2faec87c..97ad48131 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -7,7 +7,7 @@ info: © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved. externalDocs: - description: 3GPP TS 28.623; Generic NRM：Trace Control NRM + description: 3GPP TS 28.623; Generic NRM:Trace Control NRM url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.623/ paths: {} components: -- GitLab From aac7a6e36f493a772c8f6500692ee187ce878483 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 16 Nov 2023 19:45:28 +0000 Subject: [PATCH 068/119] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 55eae9617..704318c26 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -59,7 +59,12 @@ components: - ACTIVATED - DEACTIVATED intentPriority: - type: integer + type: integer + intentPreemptionCapability: + type: string + enum: + - TRUE + - FALSE observationPeriod: type: integer intentReportReference: -- GitLab From 8e7be3d3f5137ee62cc4cad41eeb9e14043e5c51 Mon Sep 17 00:00:00 2001 From: sunse Date: Tue, 21 Nov 2023 06:11:10 +0000 Subject: [PATCH 069/119] 28.105_Rel18_CR0068_Resolve_issues_related_to_the_usage_of_confidenceIndicatio... --- OpenAPI/TS28105_AiMlNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index aa29dc947..2c8bd80f7 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -222,7 +222,7 @@ components: type: array items: type: string - confidenceIndication: + modelConfidenceIndication: type: integer modelPerformanceTraining: type: array -- GitLab From 7d3f87187202928c1cc1b4c13e226ff37e81b4cb Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 3 Nov 2023 07:45:39 +0000 Subject: [PATCH 070/119] 28.541_Rel18_CR1111_Stage_3_Add_FL_related_attributes_in_NWDAFFunction Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 90147452c..46e732f02 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -129,6 +129,10 @@ components: $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac' WeightFactor: type: integer + VendorId: + type: string + description: Vendor ID of the NF Service instance (Private Enterprise Number assigned by IANA) + pattern: '^[0-9]{6}$' AusfInfo: type: object properties: @@ -270,7 +274,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' minItems: 1 vendorId: - type: string + $ref: '#/components/schemas/VendorId' SEPPType: type: string description: any of enumerated value @@ -968,7 +972,22 @@ components: $ref: '#/components/schemas/SnssaiList' trackingAreaList: $ref: '#/components/schemas/TaiList' - + mlModelInterInfo: + type: array + items: + $ref: '#/components/schemas/VendorId' + minItems: 0 + flCapabilityType: + type: string + enum: + - FL_SERVER + - FL_CLIENT + - FL_SERVER_AND_CLIENT + flTimeInterval: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + minItems: 1 NwdafInfo: description: Information of a NWDAF NF Instance type: object -- GitLab From d3fcbb42fae4896b84ae8fb5f687a8510c740d78 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 3 Nov 2023 02:43:21 +0000 Subject: [PATCH 071/119] 28.312_Rel18_CR0181 test intent Update TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 55eae9617..9b50b0e96 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -81,6 +81,11 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' intentReference: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + intentTestReport: + type: array + items: + $ref: '#/components/schemas/IntentFulfilmentReport' + IntentHandlingFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' -- GitLab From a09ad1889483744a98c959958b73f7a6c817d4ae Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 3 Nov 2023 02:56:56 +0000 Subject: [PATCH 072/119] 28.312_Rel18_CR0182_Clarify_observation_period_and_fulfilment_deadline Update TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 9b50b0e96..89eb81b3d 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -62,6 +62,8 @@ components: type: integer observationPeriod: type: integer + fulfilmentDeadline: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' intentReportReference: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' IntentReport-Single: -- GitLab From 0d63b457d3743b18d8181f30376072a070d554f5 Mon Sep 17 00:00:00 2001 From: sunse Date: Tue, 31 Oct 2023 03:28:08 +0000 Subject: [PATCH 073/119] TS28.541_Rel18_CR_1069 5GC_resourceType values --- OpenAPI/TS28541_5GcNrm.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 46e732f02..a3811f096 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -4111,7 +4111,8 @@ components: type: string enum: - GBR - - NonGBR + - NON_GBR + - DELAY_CRITICAL_GBR priorityLevel: type: integer packetDelayBudget: -- GitLab From 1f11f4e90bb5346b9b651e487ba040d80d9c1fb6 Mon Sep 17 00:00:00 2001 From: sunse Date: Tue, 21 Nov 2023 06:28:59 +0000 Subject: [PATCH 074/119] Revert "Merge branch '28.312_Rel18_CR0181_information_on_a_test_Intent' into..." This reverts merge request !893 --- OpenAPI/TS28312_IntentNrm.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 89eb81b3d..d2ba389e9 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -83,11 +83,6 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' intentReference: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - intentTestReport: - type: array - items: - $ref: '#/components/schemas/IntentFulfilmentReport' - IntentHandlingFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' -- GitLab From cbc102a9923f67d2f337d6dde46ef257a6654980 Mon Sep 17 00:00:00 2001 From: sunse Date: Tue, 31 Oct 2023 06:23:11 +0000 Subject: [PATCH 075/119] TS28.541_Rel18_CR_1061_correction_to_NSSF --- OpenAPI/TS28541_5GcNrm.yaml | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index a3811f096..68c3e4bb7 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3134,8 +3134,8 @@ components: type: string cNSIIdList: $ref: '#/components/schemas/CNSIIdList' - nFProfileList: - $ref: '#/components/schemas/NFProfileList' + managedNFProfile: + $ref: '#/components/schemas/ManagedNFProfile' commModelList: $ref: '#/components/schemas/CommModelList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' @@ -3145,6 +3145,8 @@ components: $ref: '#/components/schemas/EP_N22-Multiple' EP_N31: $ref: '#/components/schemas/EP_N31-Multiple' + EP_N34: + $ref: '#/components/schemas/EP_N34-Multiple' SmsfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3283,6 +3285,9 @@ components: properties: EP_NL3: $ref: '#/components/schemas/EP_NL3-Multiple' + EP_N34: + $ref: '#/components/schemas/EP_N34-Multiple' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' ScpFunction-Single: allOf: @@ -3859,6 +3864,20 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + EP_N34-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' EP_S5C-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -5088,6 +5107,10 @@ components: type: array items: $ref: '#/components/schemas/EP_N33-Single' + EP_N34-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_N34-Single' EP_N40-Multiple: type: array items: @@ -5360,6 +5383,7 @@ components: - $ref: '#/components/schemas/EP_N31-Single' - $ref: '#/components/schemas/EP_N32-Single' - $ref: '#/components/schemas/EP_N33-Single' + - $ref: '#/components/schemas/EP_N34-Single' - $ref: '#/components/schemas/EP_N40-Single' - $ref: '#/components/schemas/EP_N41-Single' - $ref: '#/components/schemas/EP_N42-Single' -- GitLab From b9678e552b6bab9debf827527de105b8ccfc0b06 Mon Sep 17 00:00:00 2001 From: sunse Date: Tue, 31 Oct 2023 03:41:01 +0000 Subject: [PATCH 076/119] TS28.541_Rel18_CR_1066 DRACHOptimizationFunction_stage_3 --- OpenAPI/TS28541_NrNrm.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 4f3791b56..acf6603de 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1514,7 +1514,6 @@ components: $ref: "#/components/schemas/UeAccProbabilityDist" ueAccDelayProbabilityDist: $ref: "#/components/schemas/UeAccDelayProbabilityDist" - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' DMROFunction-Single: allOf: -- GitLab From 4e66736c8ba95ac70ef8f6d0561ff00b40948d5d Mon Sep 17 00:00:00 2001 From: zu Date: Fri, 3 Nov 2023 15:36:33 +0000 Subject: [PATCH 077/119] Update file TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 3d8607d6a..1601d47f3 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -728,6 +728,7 @@ components: - N10 - N11 - S5-C + - N38 SMSFInterfaces: type: array items: -- GitLab From 11248db3fe19fbbb7984903979ebf824dfa06cf0 Mon Sep 17 00:00:00 2001 From: sunse Date: Tue, 31 Oct 2023 04:38:32 +0000 Subject: [PATCH 078/119] TS28.541_Rel18_CR_1058_NRM_enhancements_for_NRFFunction --- OpenAPI/TS28541_5GcNrm.yaml | 169 +++++++++++++++++++++++++++++++++--- 1 file changed, 157 insertions(+), 12 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 68c3e4bb7..6b19f5d4f 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -2071,18 +2071,18 @@ components: # additionalProperties: # $ref: '#/components/schemas/NfInfo' # minProperties: 1 - # servedHssInfoList: - # description: A map (list of key-value pairs) where nfInstanceId serves as key - # type: object - # additionalProperties: - # description: A map (list of key-value pairs) where a valid JSON string serves as key - # type: object - # additionalProperties: - # anyOf: - # - $ref: '#/components/schemas/HssInfo' - # - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' - # minProperties: 1 - # minProperties: 1 + servedHssInfoList: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + description: A map (list of key-value pairs) where a valid JSON string serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/HssInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + minProperties: 1 servedUdsfInfo: description: A map (list of key-value pairs) where nfInstanceId serves as key type: object @@ -2119,6 +2119,75 @@ components: - $ref: '#/components/schemas/SeppInfo' - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' minProperties: 1 + servedAanfInfoList: + description: A map (list of key-value pairs) where NF Instance Id serves as key + type: object + additionalProperties: + description: A map (list of key-value pairs) where a valid JSON string serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/AanfInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + served5gDdnmfInfo: + type: object + additionalProperties: + $ref: '#/components/schemas/5GDdnmfInfo' + minProperties: 1 + servedMfafInfoList: + type: object + description: A map (list of key-value pairs) where NF Instance Id serves as key + additionalProperties: + $ref: '#/components/schemas/MfafInfo' + minProperties: 1 + servedEasdfInfoList: + type: object + description: A map (list of key-value pairs) where NF Instance Id serves as key + additionalProperties: + type: object + description: A map (list of key-value pairs) where a valid JSON string serves as key + additionalProperties: + $ref: '#/components/schemas/EasdfInfo' + minProperties: 1 + servedDccfInfoList: + type: object + description: A map (list of key-value pairs) where NF Instance Id serves as key + additionalProperties: + $ref: '#/components/schemas/DccfInfo' + minProperties: 1 + servedMbSmfInfoList: + description: A map (list of key-value pairs) where nfInstanceId serves as key + type: object + additionalProperties: + description: A map (list of key-value pairs) where a valid JSON string serves as key + type: object + additionalProperties: + anyOf: + - $ref: '#/components/schemas/MbSmfInfo' + - $ref: 'TS29571_CommonData.yaml#/components/schemas/EmptyObject' + minProperties: 1 + minProperties: 1 + servedTsctsfInfoList: + type: object + description: A map (list of key-value pairs) where NF Instance Id serves as key + additionalProperties: + type: object + description: A map (list of key-value pairs) where a valid JSON string serves as key + additionalProperties: + $ref: '#/components/schemas/TsctsfInfo' + minProperties: 1 + minProperties: 1 + servedMbUpfInfoList: + type: object + description: A map (list of key-value pairs) where NF Instance Id serves as key + additionalProperties: + type: object + description: A map (list of key-value pairs) where a valid JSON string serves as key + additionalProperties: + $ref: '#/components/schemas/MbUpfInfo' + minProperties: 1 + minProperties: 1 servedTrustAfInfo: type: object description: A map (list of key-value pairs) where NF Instance Id serves as key @@ -2161,6 +2230,82 @@ components: blockedDurEndTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + 5GDdnmfInfo: + description: Information of an 5G DDNMF NF Instance + type: object + required: + - plmnId + properties: + plmnId: + $ref: 'TS29571_CommonData.yaml#/components/schemas/PlmnId' + ImsiRange: + description: > + A range of IMSIs (subscriber identities), either based on a numeric range, + or based on regular-expression matching + type: object + oneOf: + - required: [ start, end ] + - required: [ pattern ] + properties: + start: + type: string + pattern: '^[0-9]+$' + end: + type: string + pattern: '^[0-9]+$' + pattern: + type: string + NetworkNodeDiameterAddress: + description: > + This data type is a part of smsfDiameterAddress and it should be present + whenever smsf supports Diameter protocol. + type: object + required: + - name + - realm + properties: + name: + $ref: 'TS29571_CommonData.yaml#/components/schemas/DiameterIdentity' + realm: + $ref: 'TS29571_CommonData.yaml#/components/schemas/DiameterIdentity' + HssInfo: + description: Information of an HSS NF Instance + type: object + properties: + groupId: + $ref: 'TS29571_CommonData.yaml#/components/schemas/NfGroupId' + imsiRanges: + type: array + items: + $ref: '#/components/schemas/ImsiRange' + minItems: 1 + imsPrivateIdentityRanges: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + minItems: 1 + imsPublicIdentityRanges: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + minItems: 1 + msisdnRanges: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + minItems: 1 + externalGroupIdentifiersRanges: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + minItems: 1 + hssDiameterAddress: + $ref: '#/components/schemas/NetworkNodeDiameterAddress' + additionalDiamAddresses: + type: array + items: + $ref: '#/components/schemas/NetworkNodeDiameterAddress' + minItems: 1 GmlcInfo: description: Information of a GMLC NF Instance type: object -- GitLab From 28dbcddd310718cabcd29609badef8243de3bef8 Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Sun, 29 Oct 2023 08:25:26 +0000 Subject: [PATCH 079/119] TS28.541_Rel-18_CR0858_Add_NRM_for_network_slice_isolation --- OpenAPI/TS28541_SliceNrm.yaml | 40 ++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index f88fbabda..f7b6eae90 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -706,7 +706,22 @@ components: An attribute that specifies the additional reason information if the reservation is failed. type: string - + IsolationRule: + type: string + enum: + - Dedicated + - Shared + + ResourceIsolationRule: + type: object + properties: + resourceType: + type: string + enum: + - Managed function + - Network service + isolationRule: + $ref: '#/components/schemas/IsolationRule' #------------ Definition of concrete IOCs ---------------------------------------- @@ -769,6 +784,8 @@ components: $ref: '#/components/schemas/ServiceProfileList' networkSliceControllerRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + isolationProfileRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' NetworkSliceSubnet-Single: allOf: @@ -803,6 +820,8 @@ components: - CN_SLICESUBNET networkSliceSubnetControllerRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + isolationProfileRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' EP_Transport-Single: allOf: @@ -925,6 +944,24 @@ components: networkSliceSubnetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + IsolationProfile-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - type: object + properties: + resourceIsolationRuleList: + type: array + items: + $ref: '#/components/schemas/ResourceIsolationRule' + networkSliceListRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + networkSliceSubnetRefList: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + #-------- Definition of JSON arrays for name-contained IOCs ---------------------- SubNetwork-Multiple: type: array @@ -979,4 +1016,5 @@ components: - $ref: '#/components/schemas/FeasibilityCheckAndReservationJob-Single' - $ref: '#/components/schemas/NetworkSliceController-Single' - $ref: '#/components/schemas/NetworkSliceSubnetController-Single' + - $ref: '#/components/schemas/IsolationProfile-Single' -- GitLab From 6221fdaac02e5c81242bdf818e7a29017822d325 Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Wed, 15 Nov 2023 15:37:38 +0000 Subject: [PATCH 080/119] Updates to address comments during the meeting --- OpenAPI/TS28541_SliceNrm.yaml | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index f7b6eae90..2f3d555ec 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -706,22 +706,25 @@ components: An attribute that specifies the additional reason information if the reservation is failed. type: string - IsolationRule: - type: string - enum: - - Dedicated - - Shared - ResourceIsolationRule: type: object properties: resourceType: type: string enum: - - Managed function - - Network service + - MANAGED_FUNCTION + - NETWORK_SERVICE isolationRule: - $ref: '#/components/schemas/IsolationRule' + type: string + enum: + - DEDICATED + - SHARED + + NetworkSlicingApplicability: + type: string + enum: + - NETWORKSLICE + - NETWORKSLICESUBNET #------------ Definition of concrete IOCs ---------------------------------------- @@ -763,7 +766,8 @@ components: $ref: '#/components/schemas/NetworkSliceController-Multiple' NetworkSliceSubnetController: $ref: '#/components/schemas/NetworkSliceSubnetController-Multiple' - + IsolationProfile: + $ref: '#/components/schemas/IsolationProfile-Multiple' NetworkSlice-Single: allOf: @@ -953,11 +957,13 @@ components: allOf: - type: object properties: + networkSlicingApplicability: + $ref: '#/components/schemas/NetworkSlicingApplicability' resourceIsolationRuleList: type: array items: $ref: '#/components/schemas/ResourceIsolationRule' - networkSliceListRef: + networkSliceRefList: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' networkSliceSubnetRefList: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' @@ -1002,6 +1008,11 @@ components: items: $ref: '#/components/schemas/NetworkSliceSubnetController-Single' + IsolationProfile-Multiple: + type: array + items: + $ref: '#/components/schemas/IsolationProfile-Single' + #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- resources-sliceNrm: -- GitLab From 6050f4c4a239dbadd28c0d01fe00bb631399ee87 Mon Sep 17 00:00:00 2001 From: sunse Date: Tue, 21 Nov 2023 07:38:01 +0000 Subject: [PATCH 081/119] Revert "Merge branch..." This reverts merge request !894 --- OpenAPI/TS28312_IntentNrm.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index d2ba389e9..55eae9617 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -62,8 +62,6 @@ components: type: integer observationPeriod: type: integer - fulfilmentDeadline: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' intentReportReference: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' IntentReport-Single: -- GitLab From ab1afd1463ccd8d1026ff6cec4c1d8974f46b7ff Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Tue, 21 Nov 2023 07:51:02 +0000 Subject: [PATCH 082/119] TS28.541_Rel-18_CR1038_Add_support_for_GSMA_attributes_related_to_data_networks --- OpenAPI/TS28541_SliceNrm.yaml | 75 +++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 2f3d555ec..b7c91987d 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -304,6 +304,68 @@ components: type: array items: $ref: '#/components/schemas/SecFunc' + DataNetwork: + type: object + properties: + servAttrCom: + $ref: '#/components/schemas/ServAttrCom' + dnnList: + type: array + items: + type: string + DataAccess: + type: object + properties: + dataNetworkName: + type: string + dataAccessUsed: + type: string + enum: + - DIRECT_INTERNET_ACCESS + - TERM_PVT_NETWORK + - LOCAL_TRAFFIC + TunnellingMechanism: + type: object + properties: + dataNetworkName: + type: string + tunellingMechanismUsed: + type: string + enum: + - L2TP_TUNNEL + - GRE_TUNNEL + - VPN_TUNNEL + - LABEL_BASED_ROUTING + - 802.1Q_VLAN + - SRV6 + - OTHER + LboAllowed: + type: object + properties: + dataNetworkName: + type: string + localBreakoutAllowed: + type: string + enum: + - YES + - NO + DataNetworkAccess: + type: object + properties: + servAttrCom: + $ref: '#/components/schemas/ServAttrCom' + dataAccessList: + type: array + items: + $ref: '#/components/schemas/DataAccess' + tunnellingMechanismList: + type: array + items: + $ref: '#/components/schemas/TunnellingMechanism' + localBreakoutAllowedList: + type: array + items: + $ref: '#/components/schemas/LboAllowed' CNSliceSubnetProfile: type: object @@ -362,6 +424,10 @@ components: type: number maxULDataVolume: type: number + supportedDataNetworks: + $ref: '#/components/schemas/DataNetwork' + dataNetworkAccess: + $ref: '#/components/schemas/DataNetworkAccess' RANSliceSubnetProfile: type: object @@ -504,6 +570,10 @@ components: type: number kPIMonitoring: $ref: '#/components/schemas/KPIMonitoring' + supportedDataNetworks: + $ref: '#/components/schemas/DataNetwork' + dataNetworkAccess: + $ref: '#/components/schemas/DataNetworkAccess' ServiceProfile: type: object @@ -592,6 +662,11 @@ components: $ref: '#/components/schemas/N6Protection' nonIPSupport: $ref: '#/components/schemas/NonIPSupport' + supportedDataNetworks: + $ref: '#/components/schemas/DataNetwork' + dataNetworkAccess: + $ref: '#/components/schemas/DataNetworkAccess' + SliceProfile: type: object properties: -- GitLab From a2e84b38070916730e67decc5a27ebfd10108804 Mon Sep 17 00:00:00 2001 From: sunse Date: Tue, 31 Oct 2023 06:49:00 +0000 Subject: [PATCH 083/119] TS28.541_Rel18_CR_1059_NRM_enhancements_for_MNPFFunction --- OpenAPI/TS28541_5GcNrm.yaml | 110 +++++++++++++++++++++++++++++++++++- 1 file changed, 107 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 6b19f5d4f..69f891936 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -2738,6 +2738,17 @@ components: minProperties: 1 not: required: [ networkInstance, dnaiNwInstanceList ] + MnpfInfo: + description: Information of an MNPF Instance + type: object + properties: + msisdnRanges: + type: array + items: + $ref: '#/components/schemas/IdentityRange' + minItems: 1 + required: + - msisdnRanges #-------- Definition of concrete IOCs -------------------------------------------- ProvMnS: @@ -2857,9 +2868,11 @@ components: BSFFunction: $ref: '#/components/schemas/BsfFunction-Multiple' MBSMFFunction: - $ref: '#/components/schemas/MbSmfFunction-Multiple' + $ref: '#/components/schemas/MbSmfFunction-Multiple' MBUPFFunction: - $ref: '#/components/schemas/MbUpfFunction-Multiple' + $ref: '#/components/schemas/MbUpfFunction-Multiple' + MNPFFunction: + $ref: '#/components/schemas/MnpfFunction-Multiple' AmfFunction-Single: allOf: @@ -4972,6 +4985,34 @@ components: $ref: '#/components/schemas/EP_N19mb-Multiple' EP_Nmb9: $ref: '#/components/schemas/EP_Nmb9-Multiple' + + MnpfFunction-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' + - type: object + properties: + pLMNInfoList: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList' + managedNFProfile: + $ref: '#/components/schemas/ManagedNFProfile' + commModelList: + $ref: '#/components/schemas/CommModelList' + mnpfInfo: + $ref: '#/components/schemas/MnpfInfo' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: + EP_SM12: + $ref: '#/components/schemas/EP_SM12-Multiple' + EP_SM13: + $ref: '#/components/schemas/EP_SM13-Multiple' + EP_SM14: + $ref: '#/components/schemas/EP_SM14-Multiple' EP_N3mb-Single: allOf: @@ -5029,6 +5070,48 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + EP_SM12-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + EP_SM13-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + EP_SM14-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/EP_RP-Attr' + - type: object + properties: + localAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' + remoteAddress: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -5396,7 +5479,19 @@ components: EP_Nmb9-Multiple: type: array items: - $ref: '#/components/schemas/EP_Nmb9-Single' + $ref: '#/components/schemas/EP_Nmb9-Single' + EP_SM12-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_SM12-Single' + EP_SM13-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_SM13-Single' + EP_SM14-Multiple: + type: array + items: + $ref: '#/components/schemas/EP_SM14-Single' Configurable5QISet-Multiple: type: array items: @@ -5461,6 +5556,10 @@ components: type: array items: $ref: '#/components/schemas/MbUpfFunction-Single' + MnpfFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/MnpfFunction-Single' #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- @@ -5571,6 +5670,10 @@ components: - $ref: '#/components/schemas/EP_N16mb-Single' - $ref: '#/components/schemas/EP_Nmb1-Single' + - $ref: '#/components/schemas/EP_SM12-Single' + - $ref: '#/components/schemas/EP_SM13-Single' + - $ref: '#/components/schemas/EP_SM14-Single' + - $ref: '#/components/schemas/Configurable5QISet-Single' - $ref: '#/components/schemas/FiveQiDscpMappingSet-Single' - $ref: '#/components/schemas/PredefinedPccRuleSet-Single' @@ -5588,3 +5691,4 @@ components: - $ref: '#/components/schemas/BsfFunction-Single' - $ref: '#/components/schemas/MbSmfFunction-Single' - $ref: '#/components/schemas/MbUpfFunction-Single' + - $ref: '#/components/schemas/MnpfFunction-Single' -- GitLab From 995ed96bebb4566af8326490a90a3f9edef68227 Mon Sep 17 00:00:00 2001 From: sunse Date: Tue, 31 Oct 2023 07:02:58 +0000 Subject: [PATCH 084/119] Additional changes to MNPF interface NRM --- OpenAPI/TS28541_5GcNrm.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 69f891936..602e8b476 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3276,6 +3276,8 @@ components: $ref: '#/components/schemas/EP_N27-Multiple' EP_N96: $ref: '#/components/schemas/EP_N96-Multiple' + EP_SM14: + $ref: '#/components/schemas/EP_SM14-Multiple' NssfFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -3464,6 +3466,10 @@ components: scpInfo: $ref: '#/components/schemas/ScpInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' + - type: object + properties: + EP_SM13: + $ref: '#/components/schemas/EP_SM13-Multiple' NefFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' -- GitLab From ed78673925daa2db2436c871fb3566cf75dd19ab Mon Sep 17 00:00:00 2001 From: Kai Zhang Date: Fri, 3 Nov 2023 02:00:10 +0000 Subject: [PATCH 085/119] Rel-18 CR 28.541 Add energy saving attributes to IOC UPFFunction --- OpenAPI/TS28541_5GcNrm.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 602e8b476..c4595a5d1 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -123,6 +123,18 @@ components: CNSIId: type: string description: CNSI Id is defined in TS 29.531, only for Core Network + EnergySavingControl: + type: string + description: any of enumerated value + enum: + - TO_BE_ENERGYSAVING + - TO_BE_NOT_ENERGYSAVING + EnergySavingState: + type: string + description: any of enumerated value + enum: + - IS_NOT_ENERGYSAVING + - IS_ENERGYSAVING TACList: type: array items: @@ -3059,6 +3071,10 @@ components: $ref: '#/components/schemas/TACList' cNSIIdList: $ref: '#/components/schemas/CNSIIdList' + energySavingControl: + $ref: '#/components/schemas/EnergySavingControl' + energySavingState: + $ref: '#/components/schemas/EnergySavingState' managedNFProfile: $ref: '#/components/schemas/ManagedNFProfile' supportedBMOList: -- GitLab From 66a1907270ff23efc04bc5cff3a7e8fe5e42b9e3 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 28 Oct 2023 02:45:37 +0000 Subject: [PATCH 086/119] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 55eae9617..4f7c68db3 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -201,7 +201,26 @@ components: enum: - DELIVER - ENSURE - ValueRangeType: + Frequency: + description: -> + It desribes the RF reference frequency (i.e. Absolute Radio Frequency Channel Number) + and/or the frequency operating band used for a given direction (UL or DL) in FDD or + for both UL and DL directions in TDD. + type: object + properties: + arfcn: + description: -> + This attribute shall be supported, when the frequency information represent RF reference frequency. + For NR reference frequency, see TS 38.104 subclause 5.4.2.1. + For EUTRAN reference frequency, see see TS 36.104 subclause 5.7.3 + type: integer + freqband: + description: -> + This attribute shall be supported, when the frequency information represent frequency operating band + For NR frequency operating band, see TS 38.104 subclause 5.4.2.3 + For EUTRAN frequency operating band, see TS 36.104 subclause 5.7.3 + type: integer + ValueRangeType: oneOf: - type: number - type: string @@ -212,6 +231,7 @@ components: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' - $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' - $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoCoordinate' + - $ref: '#/components/schemas/Frequency' #-------Definition of the generic dataType --------------# #-------Definition of the generic IntentContext dataType --------------# -- GitLab From a3977eab4c648e702b30a15378fac01acd139f32 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 28 Oct 2023 02:57:46 +0000 Subject: [PATCH 087/119] Update file TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 32 +++++++++++++++++++++---- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 40f94c033..2d5feac0d 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -166,7 +166,8 @@ components: - $ref: '#/components/schemas/CoverageAreaPolygonContext' - $ref: '#/components/schemas/CoverageTACContext' - $ref: '#/components/schemas/PLMNContext' - - $ref: '#/components/schemas/NRFqBandContext' + - $ref: '#/components/schemas/DlFrequencyContext' + - $ref: '#/components/schemas/UlFrequencyContext' - $ref: '#/components/schemas/RATContext' - $ref: "#/components/schemas/UEGroupContext" - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ObjectContext' @@ -737,15 +738,17 @@ components: type: array items: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' - NRFqBandContext: + DlFrequencyContext: description: >- - This data type is the "ObjectContext" data type with specialisations for NRFqBandContext + This data type is the "ObjectContext" data type with specialisations for DLFrequencyContext. + It describes the downlink frequency information (RF reference frequencies and/ or the + frequency operating band) supported by the RAN SubNetwork that the intent expectation is applied. type: object properties: contextAttribute: type: string enum: - - NRFqBand + - DlFrequency contextCondition: type: string enum: @@ -753,7 +756,26 @@ components: contextValueRange: type: array items: - type: string + $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Frequency' + UlFrequencyContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for DLFrequencyContext. + It describes the uplink frequency information (RF reference frequencies and/ or the frequency + operating band) supported by the RAN SubNetwork that the intent expectation is applied. + type: object + properties: + contextAttribute: + type: string + enum: + - UlFrequency + contextCondition: + type: string + enum: + - IS_ALL_OF + contextValueRange: + type: array + items: + $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Frequency' RATContext: description: >- This data type is the "ObjectContext" data type with specialisations for RATContext -- GitLab From e9b114bbb059885b6cf7b1c6bfe6a8f360fde52d Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 28 Oct 2023 03:14:04 +0000 Subject: [PATCH 088/119] Update file TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 2d5feac0d..8433a62fc 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -740,7 +740,7 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' DlFrequencyContext: description: >- - This data type is the "ObjectContext" data type with specialisations for DLFrequencyContext. + This data type is the "Context" data type with specialisations for Object context "DLFrequencyContext". It describes the downlink frequency information (RF reference frequencies and/ or the frequency operating band) supported by the RAN SubNetwork that the intent expectation is applied. type: object @@ -759,7 +759,7 @@ components: $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Frequency' UlFrequencyContext: description: >- - This data type is the "ObjectContext" data type with specialisations for DLFrequencyContext. + This data type is the "Context" data type with specialisations for Object context "DLFrequencyContext". It describes the uplink frequency information (RF reference frequencies and/ or the frequency operating band) supported by the RAN SubNetwork that the intent expectation is applied. type: object -- GitLab From f343828184460a77dadc698bec3bd997b98fc783 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 28 Oct 2023 07:48:45 +0000 Subject: [PATCH 089/119] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 4f7c68db3..1791368dc 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -209,17 +209,15 @@ components: type: object properties: arfcn: + type: integer description: -> This attribute shall be supported, when the frequency information represent RF reference frequency. - For NR reference frequency, see TS 38.104 subclause 5.4.2.1. - For EUTRAN reference frequency, see see TS 36.104 subclause 5.7.3 - type: integer + For NR reference frequency, see TS 38.104 subclause 5.4.2.1; For EUTRAN reference frequency, see see TS 36.104 subclause 5.7.3 freqband: + type: integer description: -> This attribute shall be supported, when the frequency information represent frequency operating band - For NR frequency operating band, see TS 38.104 subclause 5.4.2.3 - For EUTRAN frequency operating band, see TS 36.104 subclause 5.7.3 - type: integer + For NR frequency operating band, see TS 38.104 subclause 5.4.2.3;For EUTRAN frequency operating band, see TS 36.104 subclause 5.7.3 ValueRangeType: oneOf: - type: number -- GitLab From 746c872c1ac5039716e13c8025f3cccdb581640e Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 28 Oct 2023 07:57:08 +0000 Subject: [PATCH 090/119] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 1791368dc..8839b79f5 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -211,13 +211,11 @@ components: arfcn: type: integer description: -> - This attribute shall be supported, when the frequency information represent RF reference frequency. - For NR reference frequency, see TS 38.104 subclause 5.4.2.1; For EUTRAN reference frequency, see see TS 36.104 subclause 5.7.3 + This attribute shall be supported, when the frequency information represent RF reference frequency. freqband: type: integer description: -> - This attribute shall be supported, when the frequency information represent frequency operating band - For NR frequency operating band, see TS 38.104 subclause 5.4.2.3;For EUTRAN frequency operating band, see TS 36.104 subclause 5.7.3 + This attribute shall be supported, when the frequency information represent frequency operating band. ValueRangeType: oneOf: - type: number -- GitLab From 453d56d4213dd40d2386a2afcccf39f8a2ba0b3f Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 30 Oct 2023 00:29:19 +0000 Subject: [PATCH 091/119] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 8839b79f5..cab5fb09a 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -202,7 +202,7 @@ components: - DELIVER - ENSURE Frequency: - description: -> + description: >- It desribes the RF reference frequency (i.e. Absolute Radio Frequency Channel Number) and/or the frequency operating band used for a given direction (UL or DL) in FDD or for both UL and DL directions in TDD. @@ -210,12 +210,10 @@ components: properties: arfcn: type: integer - description: -> - This attribute shall be supported, when the frequency information represent RF reference frequency. + description: This attribute shall be supported, when the frequency information represent RF reference frequency. freqband: type: integer - description: -> - This attribute shall be supported, when the frequency information represent frequency operating band. + description: This attribute shall be supported, when the frequency information represent frequency operating band. ValueRangeType: oneOf: - type: number -- GitLab From ffb5ce21b69560ede8217b18dc1392f660d5e584 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 30 Oct 2023 03:40:00 +0000 Subject: [PATCH 092/119] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index cab5fb09a..d53c4192e 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -210,10 +210,14 @@ components: properties: arfcn: type: integer - description: This attribute shall be supported, when the frequency information represent RF reference frequency. + description: >- + This attribute shall be supported, when the frequency information represent RF reference frequency. + The allowed values for NR see TS 38.104 subclause 5.4.2.1; The allowed values for EUTRAN see TS 36.104 [X] subclause 5.7.3; freqband: - type: integer - description: This attribute shall be supported, when the frequency information represent frequency operating band. + type: string + description: >- + This attribute shall be supported, when the frequency information represent frequency operating band. + The allowed values for NR see TS 38.104 subclause 5.4.2.3; The allowed value for EUTRAN see TS 36.104 subclause 5.7.3 ValueRangeType: oneOf: - type: number -- GitLab From a0c50f4b8cd2365d6c790474e15f278752f357f0 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 28 Oct 2023 06:16:35 +0000 Subject: [PATCH 093/119] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 70146c832..eaa5f4aee 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -37,6 +37,8 @@ components: properties: userLabel: type: string + consumerName: + type: string intentExpectations: type: array items: @@ -59,7 +61,9 @@ components: - ACTIVATED - DEACTIVATED intentPriority: - type: integer + type: integer + minimum: 1 + maximum: 100 observationPeriod: type: integer intentReportReference: -- GitLab From 14ae8837e5fcdc500df9dc1f09d6a775ca4725b3 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 28 Oct 2023 08:02:38 +0000 Subject: [PATCH 094/119] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index eaa5f4aee..0debeca9c 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -63,7 +63,8 @@ components: intentPriority: type: integer minimum: 1 - maximum: 100 + maximum: 100 + description: It expresses the priority of the stated intent within a MnS consumer. observationPeriod: type: integer intentReportReference: -- GitLab From e5a01979c3395eab97c1300aba0c32f06bda89c3 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Sat, 28 Oct 2023 08:11:40 +0000 Subject: [PATCH 095/119] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 0debeca9c..881a0f892 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -64,7 +64,7 @@ components: type: integer minimum: 1 maximum: 100 - description: It expresses the priority of the stated intent within a MnS consumer. + description: It expresses the priority of the stated intent within a MnS consumer. observationPeriod: type: integer intentReportReference: -- GitLab From a239914a71bda35787a261532025cbaf4f5c13df Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 15 Nov 2023 19:43:24 +0000 Subject: [PATCH 096/119] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 881a0f892..a134a0558 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -37,8 +37,6 @@ components: properties: userLabel: type: string - consumerName: - type: string intentExpectations: type: array items: -- GitLab From a2f7261b9beb029b98be0a7866190ce4bd5ddaa8 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 30 Oct 2023 03:18:53 +0000 Subject: [PATCH 097/119] Update file TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 1601d47f3..c0fb0eaae 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -54,6 +54,10 @@ components: ThresholdInfo: type: object properties: + performanceMetrics: + type: array + items: + type: string thresholdDirection: type: string enum: @@ -2151,10 +2155,6 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState' operationalState: $ref: 'TS28623_ComDefs.yaml#/components/schemas/OperationalState' - performanceMetrics: - type: array - items: - type: string thresholdInfoList: type: array items: -- GitLab From 12a829c2caeb06a75c20f5c9d86971dfec23aca7 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 31 Oct 2023 02:46:44 +0000 Subject: [PATCH 098/119] Update file TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index acf6603de..23ae0bec9 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -16,7 +16,9 @@ components: #-------- Definition of types----------------------------------------------------- GnbId: - type: string + type: integer + minimum: 0 + maximum: 4294967295 GnbIdLength: type: integer minimum: 22 @@ -25,16 +27,17 @@ components: type: string maxLength: 150 GnbDuId: - type: number + type: integer minimum: 0 maximum: 68719476735 GnbCuUpId: - type: number + type: integer minimum: 0 maximum: 68719476735 Sst: type: integer + minimum: 0 maximum: 255 Snssai: type: object -- GitLab From a30717260a50e7f4ff95592db65c41f976b8fe5d Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 30 Oct 2023 12:10:25 +0000 Subject: [PATCH 099/119] Add new file --- OpenAPI/TS28317_RanScNrm.yaml | 160 ++++++++++++++++++++++++++++++++++ 1 file changed, 160 insertions(+) create mode 100644 OpenAPI/TS28317_RanScNrm.yaml diff --git a/OpenAPI/TS28317_RanScNrm.yaml b/OpenAPI/TS28317_RanScNrm.yaml new file mode 100644 index 000000000..5592ce6f3 --- /dev/null +++ b/OpenAPI/TS28317_RanScNrm.yaml @@ -0,0 +1,160 @@ +openapi: 3.0.1 +info: + title: RANSC NRM + version: 18.0.0 + description: >- + OAS 3.0.1 definition of the RANSC NRM + © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). + All rights reserved. +externalDocs: + description: 3GPP TS 28.317; Self-configuration of Radio Access Network Entities (RAN NEs) + url: http://www.3gpp.org/ftp/Specs/archive/28_series/28.317/ +paths: {} +components: + schemas: + +#-------Definition of IOCs ----------# + SubNetwork-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-Attr' + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-ncO' + - type: object + properties: + SubNetwork: + $ref: '#/components/schemas/SubNetwork-Multiple' + ScMgmtProfile: + $ref: '#/components/schemas/ScMgmtProfile-Multiple' + Sc_Process: + $ref: '#/components/schemas/Sc_Process-Multiple' + + ScMgmtProfile-Single: + description: >- + The ScMgmtProfile represents MnS Consumer’s requirements for self-configuration management + for a set of RAN NEs or RAN NE types. + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + nEInformation: + type: array + items: + $ref: '#/components/schemas/NEInfomration' + description: >- + This attribute defines the NE Type(s) or the NE instance(s) for which this + ScMgmtProfile instance is valid. + configDataFileLocation: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' + + Sc_Process-Single: + description: >- + This IOC represents the self-configuration process for a RAN NE, which allows the MnS + Consumer to be informed about the current situation of the Self Configuration process. + When the automated management process for an RAN NE starts, an instance of the Sc_Process + is created automatically by the MnS Producer and informed to MnS consumer. + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + nEIdentification: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/NEIdentification' + scProcessMonitor: + $ref: '#/components/schemas/ScProcessMonitor' + cancelScProcess: + type: string + enum: + - TRUE + - FALSE + description: >- + Setting this attribute to "TRUE" cancels the self configuration process. + scMgmtProfileRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' +#-------Definition of IOCs ----------# + + +#-------Definition of Data types ----------# + NEInfomration: + type: object + oneOf: + - type: string + - $ref: '#/components/schemas/NEIdentification' + NEIdentification: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/GnbId' + + ScProcessMonitor: + description: >- + This data type is the "ProcessMonitor" data type with specialisations + for usage in the RANSC management for monitoring for the self configuration process. + type: object + properties: + jobId: + type: string + status: + type: string + enum: + - NOT_STARTED + - RUNNING + - FINSHED + - FAILED + - CANCELLING + - CANCELLED + progressPercentage: + type: integer + minimum: 0 + maximum: 100 + progressStateInfo: + type: string + enum: + - NE_HEALTH_CHECK + - SW_DOWNLOAD + - SW_INSTALLATION + - SW_ACTIVATION + - PREPARE_BASIC_CONFIGURATION_AND_OAMLINK + - RETRIEVE_CONFIGURATION_DATA + - SETUP_PRECONFIGURED_SIGNALLING_LINKS + - TSET_FINAL_STATE_OF_NE + resultStateInfo: + oneOf: + - type: string + enum: + - UNKNOWN + - INCORRECT_CONFIGURATION + - NE_HARDWARE_ERROR_DELECTED + - DISCONNECTION_BETWEEN_NE_AND_OAM + - OTHER + - type: string + startTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + endTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + +#-------Definition of Data types ----------# + +#------Definition of JSON arrays for name-contained IOCs ---------------# + SubNetwork-Multiple: + type: array + items: + $ref: '#/components/schemas/SubNetwork-Single' + ScMgmtProfile-Multiple: + type: array + items: + $ref: '#/components/schemas/ScMgmtProfile-Single' + Sc_Process-Multiple: + type: array + items: + $ref: '#/components/schemas/Sc_Process-Single' +#------Definition of JSON arrays for name-contained IOCs ---------------# + + +#----- Definitions in TS 28.317 for TS 28.532 --------------------------# + resources-intentNrm: + oneOf: + - $ref: '#/components/schemas/SubNetwork-Single' + - $ref: '#/components/schemas/ScMgmtProfile-Single' + - $ref: '#/components/schemas/Sc_Process-Single' + +#----- Definitions in TS 28.317 for TS 28.532 --------------------------# + -- GitLab From e0d9d6e7df5798565b475eda0628d6feadfa1efb Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 30 Oct 2023 12:14:05 +0000 Subject: [PATCH 100/119] Update file TS28317_RanScNrm.yaml --- OpenAPI/TS28317_RanScNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28317_RanScNrm.yaml b/OpenAPI/TS28317_RanScNrm.yaml index 5592ce6f3..9b74fe522 100644 --- a/OpenAPI/TS28317_RanScNrm.yaml +++ b/OpenAPI/TS28317_RanScNrm.yaml @@ -60,7 +60,7 @@ components: - type: object properties: nEIdentification: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/NEIdentification' + $ref: '#/components/schemas/NEIdentification' scProcessMonitor: $ref: '#/components/schemas/ScProcessMonitor' cancelScProcess: -- GitLab From 6e0756800ad3bd793a22c9dac332b2c601bfe59f Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 30 Oct 2023 12:17:05 +0000 Subject: [PATCH 101/119] Update file TS28317_RanScNrm.yaml --- OpenAPI/TS28317_RanScNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28317_RanScNrm.yaml b/OpenAPI/TS28317_RanScNrm.yaml index 9b74fe522..d9700d1e9 100644 --- a/OpenAPI/TS28317_RanScNrm.yaml +++ b/OpenAPI/TS28317_RanScNrm.yaml @@ -150,7 +150,7 @@ components: #----- Definitions in TS 28.317 for TS 28.532 --------------------------# - resources-intentNrm: + resources-RanScNrm: oneOf: - $ref: '#/components/schemas/SubNetwork-Single' - $ref: '#/components/schemas/ScMgmtProfile-Single' -- GitLab From 3f378b6d0fe07d5b5eee92957c99864d6168aeab Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 30 Oct 2023 12:21:25 +0000 Subject: [PATCH 102/119] Update file TS28532_ProvMnS.yaml --- OpenAPI/TS28532_ProvMnS.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index 7b734bc79..306f6f0bf 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -397,6 +397,7 @@ components: - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/resources-mdaNrm' - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/resources-AiMlNrm' - $ref: 'TS28538_EdgeNrm.yaml#/components/schemas/resources-edgeNrm' + - $ref: 'TS28317_RanScNrm.yaml#/components/schemas/resources-RanScNRM' Scope: type: object properties: -- GitLab From 728f9d6cd020a32f57476ff58c98b2d8e4c8263b Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 30 Oct 2023 12:24:22 +0000 Subject: [PATCH 103/119] Update 2 files - /OpenAPI/README.md - /OpenAPI/TS28532_ProvMnS.yaml --- OpenAPI/README.md | 6 +++++- OpenAPI/TS28532_ProvMnS.yaml | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/OpenAPI/README.md b/OpenAPI/README.md index 5a86008c5..e94fc4dcc 100644 --- a/OpenAPI/README.md +++ b/OpenAPI/README.md @@ -49,7 +49,11 @@ The links below will open the Swagger Editor/UI and auto-load the OpenAPI YAML f * AI/ML NRM (TS 28.105) ([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28105_AiMlNrm.yaml)) -([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28105_AiMlNrm.yaml)) +([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28105_AiMlNrm.yaml))4 + +* RANSC NRM (TS 28.105) +([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28317_RanScNrm.yaml)) +([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28317_RanScNrm.yaml)) ## Management Services (MnS) diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index 306f6f0bf..d0eac63c2 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -397,7 +397,7 @@ components: - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/resources-mdaNrm' - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/resources-AiMlNrm' - $ref: 'TS28538_EdgeNrm.yaml#/components/schemas/resources-edgeNrm' - - $ref: 'TS28317_RanScNrm.yaml#/components/schemas/resources-RanScNRM' + - $ref: 'TS28317_RanScNrm.yaml#/components/schemas/resources-RanScNrm' Scope: type: object properties: -- GitLab From 804c743f7152cdac873eaa7ab8399176ce220ae9 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 30 Oct 2023 12:29:05 +0000 Subject: [PATCH 104/119] Update file README.md --- OpenAPI/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/README.md b/OpenAPI/README.md index e94fc4dcc..f33f1c3c7 100644 --- a/OpenAPI/README.md +++ b/OpenAPI/README.md @@ -49,7 +49,7 @@ The links below will open the Swagger Editor/UI and auto-load the OpenAPI YAML f * AI/ML NRM (TS 28.105) ([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28105_AiMlNrm.yaml)) -([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28105_AiMlNrm.yaml))4 +([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28105_AiMlNrm.yaml)) * RANSC NRM (TS 28.105) ([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28317_RanScNrm.yaml)) -- GitLab From 4cd47d45403c2d2539dd7ede98d7007efbd8099c Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 31 Oct 2023 01:33:04 +0000 Subject: [PATCH 105/119] Update file TS28317_RanScNrm.yaml --- OpenAPI/TS28317_RanScNrm.yaml | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/OpenAPI/TS28317_RanScNrm.yaml b/OpenAPI/TS28317_RanScNrm.yaml index d9700d1e9..0b6ebff71 100644 --- a/OpenAPI/TS28317_RanScNrm.yaml +++ b/OpenAPI/TS28317_RanScNrm.yaml @@ -76,14 +76,30 @@ components: #-------Definition of Data types ----------# + NEType: + type: integer + description: It defines the the type of RAN NE + GnbId: + type: integer + minimum: 0 + maximum: 4294967295 + description: It is the identity of gNB + EnbId: + type: string + minimum: 0 + maximum: 268435455 + description: It is the identity of ng-eNB + NEIdentification: + oneOf: + - $ref: '#/components/schemas/EnbId' + - $ref: '#/components/schemas/GnbId' NEInfomration: - type: object + description: >- + It defines the NE Type or the NE instance for which this + ScMgmtProfile instance is valid. oneOf: - - type: string + - $ref: '#/components/schemas/NEType' - $ref: '#/components/schemas/NEIdentification' - NEIdentification: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/GnbId' - ScProcessMonitor: description: >- This data type is the "ProcessMonitor" data type with specialisations -- GitLab From 54f81e0bb2e712f9a8b3b4b53089592a240ce9cf Mon Sep 17 00:00:00 2001 From: ruiyue Date: Wed, 1 Nov 2023 00:38:29 +0000 Subject: [PATCH 106/119] Update file TS28317_RanScNrm.yaml --- OpenAPI/TS28317_RanScNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28317_RanScNrm.yaml b/OpenAPI/TS28317_RanScNrm.yaml index 0b6ebff71..ed6566f23 100644 --- a/OpenAPI/TS28317_RanScNrm.yaml +++ b/OpenAPI/TS28317_RanScNrm.yaml @@ -33,7 +33,7 @@ components: ScMgmtProfile-Single: description: >- - The ScMgmtProfile represents MnS Consumer’s requirements for self-configuration management + The ScMgmtProfile represents MnS Consumer's requirements for self-configuration management for a set of RAN NEs or RAN NE types. allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -78,7 +78,7 @@ components: #-------Definition of Data types ----------# NEType: type: integer - description: It defines the the type of RAN NE + description: It defines the type of RAN NE GnbId: type: integer minimum: 0 -- GitLab From 428c7875159d6c310a6f3056fcc8ba6ef549540f Mon Sep 17 00:00:00 2001 From: Shitao Li Date: Fri, 3 Nov 2023 06:51:54 +0000 Subject: [PATCH 107/119] Update TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 110 +++++++++++++++++++++++- 1 file changed, 106 insertions(+), 4 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 8ef2e9ad0..12d0a0da3 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -135,11 +135,17 @@ components: oneOf: - $ref: "#/components/schemas/MaxNumberofPDUsessionsTarget" - $ref: "#/components/schemas/MaxNumberofRegisteredsubscribersTarget" + - $ref: "#/components/schemas/IncomingDataTarget" + - $ref: "#/components/schemas/OutgoingDataTarget" - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget" expectationContexts: type: array items: - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext" + type: object + oneOf: + - $ref: '#/components/schemas/StartTimeContext' + - $ref: '#/components/schemas/ResourceSharingLevelContext' + - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext" expectationfulfilmentInfo: $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" required: @@ -230,7 +236,9 @@ components: - $ref: "#/components/schemas/NfInstanceLocationContext" - $ref: "#/components/schemas/PLMNContext" - $ref: "#/components/schemas/TaiContext" - - $ref: "#/components/schemas/ObjectContext" + - $ref: "#/components/schemas/ServingScopeContext" + - $ref: "#/components/schemas/DnnContext" + - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ObjectContext" #-------Definition of the ExpectationObject dataType ----------# @@ -657,6 +665,23 @@ components: - IS_LESS_THAN targetValueRange: type: integer + targetContexts: + $ref: '#/components/schemas/5GSessionContext' + 5GSessionContext: + description: >- + This data type is the "TargetContext" data type with specialisations for 5GSessionContext + type: object + properties: + contextAttribute: + type: string + enum: + - 5GSession + contextCondition: + type: string + enum: + - IS_less_THAN + contextValueRange: + type: integer MaxNumberofRegisteredsubscribersTarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofRegisteredsubscribersTarget @@ -672,6 +697,36 @@ components: - IS_LESS_THAN targetValueRange: type: integer + IncomingDataTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for IncomingDataTarget + type: object + properties: + targetName: + type: string + enum: + - IncomingData + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer + OutgoingDataTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for OutgoingDataTarget + type: object + properties: + targetName: + type: string + enum: + - OutgoingData + targetCondition: + type: string + enum: + - IS_LESS_THAN + targetValueRange: + type: integer #-------Definition of the concrete ExpectationTarget dataType----------# @@ -912,7 +967,40 @@ components: type: array items: $ref: "TS28623_GenericNrm.yaml#/components/schemas/Tai" - + ServingScopeContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for ServingScopeContext + type: object + properties: + contextAttribute: + type: string + enum: + - ServingScope + contextCondition: + type: string + enum: + - IS_ALL_OF + contextValueRange: + type: array + items: + type: string + DnnContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for DnnContext + type: object + properties: + contextAttribute: + type: string + enum: + - Dnn + contextCondition: + type: string + enum: + - IS_ALL_OF + contextValueRange: + type: array + items: + type: string #-------Definition of the scenario specific ObjectTarget dataType----------------# #-------Definition of the concrete ExpectationContext dataType----------------# @@ -1008,5 +1096,19 @@ components: - IS_EQUAL_TO contextValueRange: $ref: "TS28541_NrNrm.yaml#/components/schemas/Sst" - + StartTimeContext: + description: >- + This data type is the "ExpectationContext" data type with specialisations for StartTimeContext + type: object + properties: + contextAttribute: + type: string + enum: + - StartTime + contextCondition: + type: string + enum: + - IS_EQUAL_TO + contextValueRange: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' #-------Definition of the concrete ExpectionContext dataType----------------# -- GitLab From 3f383f8381e5d88a2b9d8647f86913b187f3860e Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Tue, 31 Oct 2023 12:16:27 +0000 Subject: [PATCH 108/119] PositioningRANSubnet type removed, reference replaced with Positioning --- OpenAPI/TS28541_SliceNrm.yaml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index b7c91987d..669ef1e63 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -196,15 +196,6 @@ components: $ref: '#/components/schemas/PredictionFrequency' accuracy: $ref: '#/components/schemas/Float' - PositioningRANSubnet: - type: object - properties: - availability: - $ref: '#/components/schemas/PositioningAvailability' - predictionFrequency: - $ref: '#/components/schemas/PredictionFrequency' - accuracy: - $ref: '#/components/schemas/Float' UserMgmtOpen: type: object properties: @@ -471,7 +462,7 @@ components: delayTolerance: $ref: '#/components/schemas/DelayTolerance' positioning: - $ref: '#/components/schemas/PositioningRANSubnet' + $ref: '#/components/schemas/Positioning' sliceSimultaneousUse: $ref: '#/components/schemas/SliceSimultaneousUse' energyEfficiency: -- GitLab From 4da1d97920b671bf6383cc39fce12e677ec7d120 Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Tue, 31 Oct 2023 12:38:59 +0000 Subject: [PATCH 109/119] SynchronicityRANSubnet type removed, reference replaced with Synchronicity. Synchronicity not a CNSliceSubnetProfile attribute hence this attribute is removed from CNSliceSubnetProfile. --- OpenAPI/TS28541_SliceNrm.yaml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 669ef1e63..ab6ebbaa1 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -178,13 +178,6 @@ components: $ref: '#/components/schemas/SynAvailability' accuracy: $ref: '#/components/schemas/Float' - SynchronicityRANSubnet: - type: object - properties: - availability: - $ref: '#/components/schemas/SynAvailability' - accuracy: - $ref: '#/components/schemas/Float' Positioning: type: object properties: @@ -387,8 +380,6 @@ components: type: integer delayTolerance: $ref: '#/components/schemas/DelayTolerance' - synchronicity: - $ref: '#/components/schemas/SynchronicityRANSubnet' sliceSimultaneousUse: $ref: '#/components/schemas/SliceSimultaneousUse' dLReliability: @@ -472,7 +463,7 @@ components: survivalTime: type: number synchronicity: - $ref: '#/components/schemas/SynchronicityRANSubnet' + $ref: '#/components/schemas/Synchronicity' dLDeterministicComm: $ref: '#/components/schemas/DeterministicComm' uLDeterministicComm: -- GitLab From c7623e073be42ebf37d26b9a4a65a2414c94b83c Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 30 Oct 2023 09:55:07 +0000 Subject: [PATCH 110/119] Update file TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 80a35f4ff..5cd7a37ab 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -816,6 +816,7 @@ components: enum: - SNSSAI - 5QI + - PLMN AlarmList-Single: allOf: - $ref: '#/components/schemas/Top' -- GitLab From d343846f6d4a5af89ee080e34a3c6d635203984b Mon Sep 17 00:00:00 2001 From: swaminathan1 Date: Wed, 22 Nov 2023 06:35:11 +0000 Subject: [PATCH 111/119] TS28.623_Rel-18_CR0295_MDT_support_for_NPN --- OpenAPI/TS28623_GenericNrm.yaml | 18 ++++++++++++++++++ OpenAPI/TS28623_TraceControlNrm.yaml | 11 ++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 5cd7a37ab..8fcebeda6 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -319,6 +319,10 @@ components: - type: array items: $ref: '#/components/schemas/Tai' + - type: array + items: + $ref: '#/components/schemas/NpnId-Type' + Tai: type: object properties: @@ -412,6 +416,20 @@ components: type: integer minimum: 0 maximum: 31 + NpnId-Type: + type: object + description: This describes the PLMN id, CAG ID list or the NID of the SNPN within the PLMN. + properties: + plmnId: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' + cAGIdList: + type: array + items: + type: string + nIDList: + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Nid' #-------- Definition of abstract IOC Top ----------------------------------------- diff --git a/OpenAPI/TS28623_TraceControlNrm.yaml b/OpenAPI/TS28623_TraceControlNrm.yaml index 97ad48131..340072563 100644 --- a/OpenAPI/TS28623_TraceControlNrm.yaml +++ b/OpenAPI/TS28623_TraceControlNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Trace Control NRM - version: 18.4.0 + version: 18.5.0 description: >- OAS 3.0.1 definition of the Trace Control NRM fragment © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -1342,6 +1342,10 @@ components: $ref: '#/components/schemas/eventListForEventTriggeredMeasurement-Type' areaConfigurationForNeighCell: $ref: '#/components/schemas/AreaConfig' + nPNIdentityList: + type: array + items: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NpnId-Type' mdtConfig-Type: description: MDT config parameters. See details in 3GPP TS 28.622 clause 4.3.30. @@ -1373,6 +1377,9 @@ components: - type: array items: $ref: '#/components/schemas/Tai' + - type: array + items: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NpnId-Type' Tai: type: object properties: @@ -1419,6 +1426,8 @@ components: $ref: '#/components/schemas/jobType-Type' plmnTarget: $ref: '#/components/schemas/plmnTarget-Type' + nPNTarget: + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/NpnId-Type' traceReportingConsumerUri: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' traceCollectionEntityIpAddress: -- GitLab From e90a95fa80024c34afce3e97eb8bd441a1dbeec2 Mon Sep 17 00:00:00 2001 From: yaoyiz Date: Wed, 22 Nov 2023 07:10:35 +0000 Subject: [PATCH 112/119] Rel18_28.541_CR1106_Add_NRM_for_AnLF --- OpenAPI/TS28541_5GcNrm.yaml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index c4595a5d1..b38d4c100 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -3463,6 +3463,8 @@ components: $ref: '#/components/schemas/EP_NL3-Multiple' EP_N34: $ref: '#/components/schemas/EP_N34-Multiple' + AnLFFunction: + $ref: '#/components/schemas/AnLFFunction-Single' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' ScpFunction-Single: @@ -5092,6 +5094,21 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/LocalAddress' remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' + AnLFFunction-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + attributes: + allOf: + - type: object + properties: + activationStatus: + type: string + enum: + - ACTIVATED + - DEACTIVATED + EP_SM12-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' -- GitLab From 3d78862550fca3d18d66a6f9b3bd8f1e22558d4b Mon Sep 17 00:00:00 2001 From: gautamd Date: Tue, 31 Oct 2023 06:46:14 +0000 Subject: [PATCH 113/119] Update TS28538_EdgeNrm.yaml --- OpenAPI/TS28538_EdgeNrm.yaml | 134 +++++++++++++++++++++++++++++++++-- 1 file changed, 127 insertions(+), 7 deletions(-) diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 8500267e7..aa900a98d 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP Edge NRM - version: 18.3.0 + version: 17.3.0 description: >- OAS 3.0.1 specification of the Edge NRM © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). @@ -73,6 +73,8 @@ components: type: integer virutalCPU: type: string + vnfdId: + type: string SoftwareImageInfo: type: object properties: @@ -112,7 +114,50 @@ components: enum: - ENABLED - DISABLED + ResourceReservationRequirement: + type: object + properties: + computeRequirement: + type: string + storageRequirement: + type: string + networkingRequirement: + type: integer + ResourceReservationStatus: + type: object + properties: + resourceId: + type: string + reservationStatus: + type: string + description: any of enumrated value + enum: + - RESERVED + - USEd + RelocationTriggerInfo: + type: object + properties: + triggerType: + type: string + description: any of enumrated value + enum: + - IMMEDIATE + - FUTURE + futuristicTriggerTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + relocationPolicy: + type: string + description: any of enumrated value + enum: + - YES + - NO + - YESwNOTIFY + AvailableEDNList: + type: object + properties: + resourceQuota: + $ref: '#/components/schemas/VirtualResource' #-------- Definition of concrete IOCs -------------------------------------------- MnS: @@ -155,6 +200,8 @@ components: $ref: '#/components/schemas/EASFunction-Multiple' EESFunction: $ref: '#/components/schemas/EESFunction-Multiple' + availableEdgeVirtualResources: + type: string EASFunction-Single: allOf: @@ -178,6 +225,10 @@ components: type: array items: type: string + relocationTriggerInfo: + $ref: '#/components/schemas/RelocationTriggerInfo' + relocationRejectByASP: + type: boolean - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' EASProfile-Single: allOf: @@ -256,12 +307,6 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' softwareImageInfo: $ref: '#/components/schemas/SoftwareImageInfo' - trackingAreaIdList: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/TaiList' - geographicalLocation: - $ref: '#/components/schemas/GeoLoc' - mcc: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/Mcc' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' EASRequirements-Single: @@ -283,6 +328,65 @@ components: $ref: '#/components/schemas/Duration' eASFeature: $ref: '#/components/schemas/EASFeature' + relocationPolicy: + $ref: '#/components/schemas/EASFeature' + federationID: + type: string + reservationID: + type: string + + ResourceReservationJob: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + reservationLocation: + $ref: '#/components/schemas/ServingLocation' + resourceReservationRequirement: + type: array + items: + $ref: '#/components/schemas/ResourceReservationRequirement' + requestedReservationExpiration: + type: string + resourceReservationStatus: + type: array + items: + $ref: '#/components/schemas/ResourceReservationStatus' + EdgeFederation-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + participatingOPiD: + type: string + originatingOPiD: + type: string + OperatorEdgeFederation-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + federationID: + type: string + FederationExpiry: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + originatedOPiD: + type: string + avaibleEDNList: + $ref: '#/components/schemas/AvailableEDNList' + acceptedEDN: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + OperatorEdgeDataNetwork-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + availableVirtualResource: + $ref: '#/components/schemas/VirtualResource' + availableEASResource: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' + edgeDataNetworkRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -311,6 +415,19 @@ components: type: array items: $ref: '#/components/schemas/EASProfile-Single' + EdgeFederation-Multiple: + type: array + items: + $ref: '#/components/schemas/EASProfile-Single' + OperatorEdgeFederation-Multiple: + type: array + items: + $ref: '#/components/schemas/OperatorEdgeFederation-Single' + OperatorEdgeDataNetwork-Multiple: + type: array + items: + $ref: '#/components/schemas/OperatorEdgeDataNetwork-Single' + #--------------------------------- Definition ------------------------------------ @@ -324,3 +441,6 @@ components: - $ref: '#/components/schemas/EdgeDataNetwork-Single' - $ref: '#/components/schemas/EASRequirements-Single' - $ref: '#/components/schemas/EASProfile-Single' + - $ref: '#/components/schemas/EdgeFederation-Single' + - $ref: '#/components/schemas/OperatorEdgeFederation-Single' + - $ref: '#/components/schemas/OperatorEdgeDataNetwork-Single' -- GitLab From 01116de3ae303028f2d4418a600cbb0eb0363ff7 Mon Sep 17 00:00:00 2001 From: shumim Date: Fri, 3 Nov 2023 06:14:15 +0000 Subject: [PATCH 114/119] Update_definitions_of_Ephemeris --- OpenAPI/TS28541_NrNrm.yaml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 23ae0bec9..70add6d8c 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -610,15 +610,25 @@ components: type: array items: $ref: '#/components/schemas/NrTac' + Ephemeris: type: object oneOf: - - $ref: '#/components/schemas/PositionVelocity' - - $ref: '#/components/schemas/Orbital' + - required: [ positionVelocity ] + - required: [ orbital ] + required: + - satelliteId + - epochTime properties: satelliteId: type: integer - + epochTime: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' + positionVelocity: + $ref: '#/components/schemas/PositionVelocity' + orbital: + $ref: '#/components/schemas/Orbital' + PositionVelocity: type: object properties: -- GitLab From 79f9e0f1c13348220463020a973235fb9cff0640 Mon Sep 17 00:00:00 2001 From: shumim Date: Thu, 9 Nov 2023 08:17:09 +0000 Subject: [PATCH 115/119] Remove Ephemeris-Single and fix other change based on offlinle comments --- OpenAPI/TS28541_NrNrm.yaml | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 70add6d8c..51039e05d 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -606,11 +606,12 @@ components: type: integer minValue: type: integer + NTNTAClist: type: array items: $ref: '#/components/schemas/NrTac' - + Ephemeris: type: object oneOf: @@ -622,6 +623,8 @@ components: properties: satelliteId: type: integer + minimum: 0 + maximum: 99999 epochTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' positionVelocity: @@ -629,6 +632,11 @@ components: orbital: $ref: '#/components/schemas/Orbital' + EphemerisInfos: + type: array + items: + $ref: '#/components/schemas/Ephemeris' + PositionVelocity: type: object properties: @@ -943,6 +951,8 @@ components: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' dynamic5QISetRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + ephemerisInfoSetRef: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' dCHOControl: type: boolean dDAPSHOControl: @@ -1986,7 +1996,7 @@ components: $ref: '#/components/schemas/PlmnInfoList' nTNTAClist: $ref: '#/components/schemas/NrTacList' - EphemerisInfoSet: + ephemerisInfoSet: $ref: '#/components/schemas/EphemerisInfoSet-Multiple' EphemerisInfoSet-Single: @@ -1998,20 +2008,8 @@ components: allOf: - type: object properties: - EphemerisInfos: - $ref: '#/components/schemas/Ephemeris-Multiple' - - Ephemeris-Single: - allOf: - - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - - type: object - oneOf: - - $ref: '#/components/schemas/PositionVelocity' - - $ref: '#/components/schemas/Orbital' - properties: - satelliteId: - type: integer - + ephemerisInfos: + $ref: '#/components/schemas/EphemerisInfos' #-------- Definition of JSON arrays for name-contained IOCs ---------------------- @@ -2180,10 +2178,6 @@ components: items: $ref: '#/components/schemas/EphemerisInfoSet-Single' - Ephemeris-Multiple: - type: array - items: - $ref: '#/components/schemas/Ephemeris-Single' #-------- Definitions in TS 28.541 for TS 28.532 --------------------------------- resources-nrNrm: @@ -2252,5 +2246,4 @@ components: - $ref: '#/components/schemas/CCOOvershootCoverageParameters-Single' - $ref: '#/components/schemas/NTNFunction-Single' - $ref: '#/components/schemas/EphemerisInfoSet-Single' - - $ref: '#/components/schemas/Ephemeris-Single' -- GitLab From 3d5af4ef3c832e3a9c0ac33c6a9ef320e3289b5c Mon Sep 17 00:00:00 2001 From: shumim Date: Thu, 16 Nov 2023 14:04:12 +0000 Subject: [PATCH 116/119] change satelliteId from interger to string --- OpenAPI/TS28541_NrNrm.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 51039e05d..ec4d20d03 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -622,9 +622,8 @@ components: - epochTime properties: satelliteId: - type: integer - minimum: 0 - maximum: 99999 + type: string + pattern: '^[0-9]{5}$' epochTime: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' positionVelocity: -- GitLab From cf73052cc0e209ef64ea9e3e3bb0530aab230d11 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 30 Nov 2023 07:06:13 +0000 Subject: [PATCH 117/119] Integration rel18 sa5 151 yaml (Rel18 TS28.312 CR0121) --- OpenAPI/TS28312_IntentExpectations.yaml | 31 +++-------- OpenAPI/TS28312_IntentNrm.yaml | 73 ++++--------------------- 2 files changed, 20 insertions(+), 84 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 12d0a0da3..ab85100ce 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -49,7 +49,7 @@ components: type: object oneOf: - $ref: '#/components/schemas/TargetAssuranceTimeContext' - - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext' + - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context' required: - expectationId RadioServiceExpectation: @@ -76,7 +76,7 @@ components: expectationContexts: type: array items: - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext' + $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context' required: - expectationId EdgeServiceSupportExpectation: @@ -112,7 +112,7 @@ components: - $ref: '#/components/schemas/ServiceEndTimeContext' - $ref: '#/components/schemas/UEMobilityLevelContext' - $ref: '#/components/schemas/ResourceSharingLevelContext' - - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext' + - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context' required: - expectationId 5GCNetworkExpectation: @@ -145,7 +145,7 @@ components: oneOf: - $ref: '#/components/schemas/StartTimeContext' - $ref: '#/components/schemas/ResourceSharingLevelContext' - - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext" + - $ref: "TS28312_IntentNrm.yaml#/components/schemas/Context" expectationfulfilmentInfo: $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" required: @@ -176,7 +176,7 @@ components: - $ref: '#/components/schemas/UlFrequencyContext' - $ref: '#/components/schemas/RATContext' - $ref: "#/components/schemas/UEGroupContext" - - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ObjectContext' + - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context' RadioServiceExpectationObject: description: >- This data type is the "ExpectationObject" data type with specialisations for RadioServicekExpectation @@ -195,7 +195,7 @@ components: oneOf: - $ref: '#/components/schemas/CoverageAreaPolygonContext' - $ref: '#/components/schemas/ServiceTypeContext' - - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ObjectContext' + - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context' ServiceSupportExpectationObject: description: >- This data type is the "ExpectationObject" data type with specialisations for EdgeServiceSupportExpectation @@ -215,7 +215,7 @@ components: - $ref: '#/components/schemas/EdgeIdenfiticationIdContext' - $ref: '#/components/schemas/EdgeIdentificationLocContext' - $ref: '#/components/schemas/CoverageAreaTAContext' - - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ObjectContext' + - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context' 5GCNetworkExpectationObject: description: >- This data type is the "ExpectationObject" data type with specialisations for 5GCNetworkExpectation @@ -236,9 +236,9 @@ components: - $ref: "#/components/schemas/NfInstanceLocationContext" - $ref: "#/components/schemas/PLMNContext" - $ref: "#/components/schemas/TaiContext" - - $ref: "#/components/schemas/ServingScopeContext" + - $ref: "#/components/schemas/ServingScopeContext" - $ref: "#/components/schemas/DnnContext" - - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ObjectContext" + - $ref: "TS28312_IntentNrm.yaml#/components/schemas/Context" #-------Definition of the ExpectationObject dataType ----------# @@ -731,19 +731,6 @@ components: #-------Definition of the concrete ExpectationTarget dataType----------# #-------Definition of the concrete ObjectTarget dataType----------------# - ObjectContext: - description: >- - This data type is the "ObjectContext" data type without specialisations - type: object - properties: - contextAttribute: - type: string - contextCondition: - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Condition' - contextValueRange: - type: array - items: - type: number CoverageAreaPolygonContext: description: >- This data type is the "ObjectContext" data type with specialisations for CoverageAreaPolygonContext diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index bb387b51a..fa13c2656 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -54,9 +54,9 @@ components: intentContexts: type: array items: - $ref: '#/components/schemas/IntentContext' + $ref: '#/components/schemas/Context' description: >- - It describes the list of IntentContext(s) which represents the constraints and conditions that should apply + It describes the list of Context(s) which represents the constraints and conditions that should apply for the entire intent even if there may be specific contexts defined for specific parts of the intent intentAdminState: type: string @@ -143,7 +143,7 @@ components: expectationContexts: type: array items: - $ref: '#/components/schemas/ExpectationContext' + $ref: '#/components/schemas/Context' required: - expectationId #-------Definition of the generic IntentExpectation dataType ----------# @@ -168,11 +168,10 @@ components: objectContexts: type: array items: - $ref: '#/components/schemas/ObjectContext' + $ref: '#/components/schemas/Context' description: >- - It describes the list of ObjectContext(s) which represents the constraints and conditions to be + It describes the list of Context(s) which represents the constraints and conditions to be used as filter information to identify the object(s) to which a given intentExpectation should apply. - #-------Definition of the generic ExpectationObject dataType ----------# #-------Definition of the generic dataType --------------# @@ -281,24 +280,6 @@ components: sNssai: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' #-------Definition of the generic dataType --------------# - - #-------Definition of the generic IntentContext dataType --------------# - IntentContext: - description: >- - This data type is the "IntentContext" data type without specialisations - type: object - properties: - contextAttribute: - type: string - contextCondition: - $ref: '#/components/schemas/Condition' - contextValueRange: - oneOf: - - type: array - items: - $ref: "#/components/schemas/ValueRangeType" - - $ref: "#/components/schemas/ValueRangeType" - #-------Definition of the generic IntentContext dataType --------------# #-------Definition of the generic ExpectationTarget dataType----------# ExpectationTarget: @@ -322,29 +303,14 @@ components: targetContexts: type: array items: - $ref: '#/components/schemas/TargetContext' - description: It describes the list of constraints and conditions that should apply for a specific expectationTarget. - TargetContext: - description: >- - This data type is the "TargetContext" data type without specialisations - type: object - properties: - contextAttribute: - type: string - contextCondition: - $ref: '#/components/schemas/Condition' - contextValueRange: - oneOf: - - type: array - items: - $ref: "#/components/schemas/ValueRangeType" - - $ref: "#/components/schemas/ValueRangeType" + $ref: '#/components/schemas/Context' + description: It describes the list of constraints and conditions that should apply for a specific expectationTarget. #-------Definition of the generic ExpectationTarget dataType----------# - #-------Definition of the generic ObjectContext dataType----------------# - ObjectContext: + #-------Definition of the generic Context dataType----------------# + Context: description: >- - This data type is the "ObjectContext" data type without specialisations + This data type is the "Context" data type without specialisations type: object properties: contextAttribute: @@ -357,25 +323,8 @@ components: items: $ref: "#/components/schemas/ValueRangeType" - $ref: "#/components/schemas/ValueRangeType" - #-------Definition of the generic ObjectContext dataType----------------# + #-------Definition of the generic Context dataType----------------# - #-------Definition of the generic ExpectionContext dataType----------------# - ExpectationContext: - description: >- - This data type is the "ExpectationContext" data type without specialisations - type: object - properties: - contextAttribute: - type: string - contextCondition: - $ref: '#/components/schemas/Condition' - contextValueRange: - oneOf: - - type: array - items: - $ref: "#/components/schemas/ValueRangeType" - - $ref: "#/components/schemas/ValueRangeType" - #-------Definition of the concrete ExpectionContext dataType----------------# #-------Definition of the generic IntentFulfilmentReport dataType----------------# IntentFulfilmentReport: description: >- -- GitLab From 132276b96d3271c5486af51ef761391ed16b327c Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 30 Nov 2023 12:03:05 +0000 Subject: [PATCH 118/119] update updated OpenAPI version with TS version --- OpenAPI/TS28104_MdaReport.yaml | 2 +- OpenAPI/TS28105_AiMlNrm.yaml | 2 +- OpenAPI/TS28312_IntentExpectations.yaml | 2 +- OpenAPI/TS28312_IntentNrm.yaml | 2 +- OpenAPI/TS28532_FaultMnS.yaml | 2 +- OpenAPI/TS28532_FileDataReportingMnS.yaml | 2 +- OpenAPI/TS28532_HeartbeatNtf.yaml | 2 +- OpenAPI/TS28532_PerfMnS.yaml | 2 +- OpenAPI/TS28532_ProvMnS.yaml | 2 +- OpenAPI/TS28532_StreamingDataMnS.yaml | 2 +- OpenAPI/TS28538_EdgeNrm.yaml | 2 +- OpenAPI/TS28541_5GcNrm.yaml | 2 +- OpenAPI/TS28541_NrNrm.yaml | 2 +- OpenAPI/TS28541_SliceNrm.yaml | 2 +- OpenAPI/TS28623_ComDefs.yaml | 2 +- OpenAPI/TS28623_GenericNrm.yaml | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/OpenAPI/TS28104_MdaReport.yaml b/OpenAPI/TS28104_MdaReport.yaml index 5a3ff3369..a81b09f63 100644 --- a/OpenAPI/TS28104_MdaReport.yaml +++ b/OpenAPI/TS28104_MdaReport.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: MDA Report - version: 18.0.0 + version: 18.2.0 description: >- OAS 3.0.1 specification of the MDA Report © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index 2c8bd80f7..71e2d3853 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: AI/ML NRM - version: 18.1.0 + version: 18.2.0 description: >- OAS 3.0.1 specification of the AI/ML NRM © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index ab85100ce..b0c35072e 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Scenario specific Intent Expectations - version: 18.1.0 + version: 18.2.0 description: >- OAS 3.0.1 definition of scenario specific Intent Expectations © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index fa13c2656..915541a59 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Intent NRM - version: 18.1.0 + version: 18.2.0 description: >- OAS 3.0.1 definition of the Intent NRM © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28532_FaultMnS.yaml b/OpenAPI/TS28532_FaultMnS.yaml index 2891cb221..3c5631aae 100755 --- a/OpenAPI/TS28532_FaultMnS.yaml +++ b/OpenAPI/TS28532_FaultMnS.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Fault Supervision MnS - version: 17.3.0 + version: 18.1.0 description: >- OAS 3.0.1 definition of the Fault Supervision MnS © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28532_FileDataReportingMnS.yaml b/OpenAPI/TS28532_FileDataReportingMnS.yaml index 27c5a23b0..176070caf 100644 --- a/OpenAPI/TS28532_FileDataReportingMnS.yaml +++ b/OpenAPI/TS28532_FileDataReportingMnS.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: File Data Reporting MnS - version: 17.3.0 + version: 18.1.0 description: >- OAS 3.0.1 definition of the File Data Reporting MnS © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28532_HeartbeatNtf.yaml b/OpenAPI/TS28532_HeartbeatNtf.yaml index 4d10cac8a..d9d777dfb 100755 --- a/OpenAPI/TS28532_HeartbeatNtf.yaml +++ b/OpenAPI/TS28532_HeartbeatNtf.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Heartbeat notification - version: 17.1.0 + version: 18.1.0 description: >- OAS 3.0.1 definition of the heartbeat notification © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28532_PerfMnS.yaml b/OpenAPI/TS28532_PerfMnS.yaml index c2eabb541..af1014abe 100644 --- a/OpenAPI/TS28532_PerfMnS.yaml +++ b/OpenAPI/TS28532_PerfMnS.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: TS 28.532 Performance Threshold Monitoring MnS - version: 17.1.0 + version: 18.1.0 description: >- OAS 3.0.1 definition of the Performance Threshold Monitoring MnS © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index d0eac63c2..a80762036 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Provisioning MnS - version: 17.6.0 + version: 18.1.0 description: >- OAS 3.0.1 definition of the Provisioning MnS © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28532_StreamingDataMnS.yaml b/OpenAPI/TS28532_StreamingDataMnS.yaml index 651b452c0..6f7f94fc7 100755 --- a/OpenAPI/TS28532_StreamingDataMnS.yaml +++ b/OpenAPI/TS28532_StreamingDataMnS.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: TS 28.532 Streaming data reporting service - version: 17.1.0 + version: 18.1.0 description: >- OAS 3.0.1 specification for the Streaming data reporting service (Streaming MnS) © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index aa900a98d..cb10b910b 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP Edge NRM - version: 17.3.0 + version: 18.5.0 description: >- OAS 3.0.1 specification of the Edge NRM © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index b38d4c100..5a7ba3511 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: 3GPP 5GC NRM - version: 18.5.0 + version: 18.6.0 description: >- OAS 3.0.1 specification of the 5GC NRM © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index ec4d20d03..dd2a8ec6d 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: NR NRM - version: 18.5.0 + version: 18.6.0 description: >- OAS 3.0.1 specification of the NR NRM © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index ab6ebbaa1..52620a6bf 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Slice NRM - version: 18.5.0 + version: 18.6.0 description: >- OAS 3.0.1 specification of the Slice NRM @ 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_ComDefs.yaml b/OpenAPI/TS28623_ComDefs.yaml index aed71dbd3..88dbbd989 100755 --- a/OpenAPI/TS28623_ComDefs.yaml +++ b/OpenAPI/TS28623_ComDefs.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Common Type Definitions - version: 18.3.0 + version: 18.5.0 description: >- OAS 3.0.1 specification of common type definitions in the Generic NRM © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index 8fcebeda6..64b9c018e 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Generic NRM - version: 18.4.0 + version: 18.5.0 description: >- OAS 3.0.1 definition of the Generic NRM © 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab From e44f2ba0ff7429d72e53d86dd72fcfffaf67bf89 Mon Sep 17 00:00:00 2001 From: sunse Date: Tue, 19 Dec 2023 13:49:44 +0000 Subject: [PATCH 119/119] Adding the newly added yaml file. Update README.md --- OpenAPI/README.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/OpenAPI/README.md b/OpenAPI/README.md index f33f1c3c7..e6bb374b1 100644 --- a/OpenAPI/README.md +++ b/OpenAPI/README.md @@ -15,6 +15,10 @@ The links below will open the Swagger Editor/UI and auto-load the OpenAPI YAML f ([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28623_ComDefs.yaml)) ([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28623_ComDefs.yaml)) +* Trace Control NRM (TS 28.623) +([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28623_TraceControlNrm.yaml)) +([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28623_TraceControlNrm.yaml)) + * NR NRM (TS 28.541) ([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28541_NrNrm.yaml)) ([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28541_NrNrm.yaml)) @@ -35,6 +39,10 @@ The links below will open the Swagger Editor/UI and auto-load the OpenAPI YAML f ([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28312_IntentNrm.yaml)) ([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28312_IntentNrm.yaml)) +* Intent Scenario specific Intent Expectations (TS 28.312) +([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28312_IntentExpectations.yamll)) +([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28312_IntentExpectations.yaml)) + * Edge NRM (TS 28.538) ([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28538_EdgeNrm.yaml)) ([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28538_EdgeNrm.yaml)) @@ -51,7 +59,7 @@ The links below will open the Swagger Editor/UI and auto-load the OpenAPI YAML f ([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28105_AiMlNrm.yaml)) ([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28105_AiMlNrm.yaml)) -* RANSC NRM (TS 28.105) +* RANSC NRM (TS 28.317) ([Editor](https://forge.3gpp.org/swagger/tools/loader.html?yaml=OpenAPI/TS28317_RanScNrm.yaml)) ([UI](https://forge.3gpp.org/swagger/tools/loader.html?action=ui&yaml=OpenAPI/TS28317_RanScNrm.yaml)) @@ -94,4 +102,4 @@ The links below will open the Swagger Editor/UI and auto-load the OpenAPI YAML f ## Other 3GPP API definitions -* [CT4](https://forge.3gpp.org/rep/3GPP/5G_APIs) specifications. +* [5G_APIs](https://forge.3gpp.org/rep/3GPP/5G_APIs) specifications. -- GitLab