From 45d6e0c56e77f1e69a1b9229f4d78f5a57c8212a Mon Sep 17 00:00:00 2001 From: Jan Groenendijk Date: Wed, 26 Jul 2023 10:33:44 +0000 Subject: [PATCH 01/19] Update TS28541_SliceNrm.yaml, correct style of prediction frequency --- OpenAPI/TS28541_SliceNrm.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 903cf07ff..3454edc59 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -42,7 +42,7 @@ components: - AECID - HYBRID POSITIONING - NET-RTK - Predictionfrequency: + PredictionFrequency: type: string enum: - PERSEC @@ -189,8 +189,8 @@ components: $ref: '#/components/schemas/ServAttrCom' availability: $ref: '#/components/schemas/PositioningAvailability' - predictionfrequency: - $ref: '#/components/schemas/Predictionfrequency' + predictionFrequency: + $ref: '#/components/schemas/PredictionFrequency' accuracy: $ref: '#/components/schemas/Float' PositioningRANSubnet: @@ -198,8 +198,8 @@ components: properties: availability: $ref: '#/components/schemas/PositioningAvailability' - predictionfrequency: - $ref: '#/components/schemas/Predictionfrequency' + predictionFrequency: + $ref: '#/components/schemas/PredictionFrequency' accuracy: $ref: '#/components/schemas/Float' UserMgmtOpen: -- GitLab From d354b69654c88504676124dc909176b3a125788e Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 9 Aug 2023 09:11:21 +0000 Subject: [PATCH 02/19] TS28.532_Rel17_CR0267 --- OpenAPI/TS28532_FaultMnS.yaml | 4 ++-- OpenAPI/TS28532_FileDataReportingMnS.yaml | 2 +- OpenAPI/TS28532_ProvMnS.yaml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/OpenAPI/TS28532_FaultMnS.yaml b/OpenAPI/TS28532_FaultMnS.yaml index fdb9a540a..d2a61268a 100755 --- a/OpenAPI/TS28532_FaultMnS.yaml +++ b/OpenAPI/TS28532_FaultMnS.yaml @@ -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: @@ -961,7 +961,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: diff --git a/OpenAPI/TS28532_FileDataReportingMnS.yaml b/OpenAPI/TS28532_FileDataReportingMnS.yaml index 0690f0064..b74a6eb51 100644 --- a/OpenAPI/TS28532_FileDataReportingMnS.yaml +++ b/OpenAPI/TS28532_FileDataReportingMnS.yaml @@ -179,7 +179,7 @@ components: enum: - Performance - Trace - - Anatytics + - Analytics - Proprietary FileNotificationTypes: type: string diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index f2cacf0ed..2bac3706e 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -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 3a84d4518d9d2a77de9e0a49356222f462b73814 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 11 Aug 2023 08:56:49 +0000 Subject: [PATCH 03/19] Update file TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 886f4461d..b1d01edf4 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -595,7 +595,7 @@ components: enum: - IS_EQUAL_TO contextValueRange: - type: string + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' ServiceEndTimeContext: description: >- This data type is the "ExpectationContext" data type with specialisations for ServiceEndTimeContext @@ -610,7 +610,7 @@ components: enum: - IS_EQUAL_TO contextValueRange: - type: string + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' UEMobilityLevelContext: description: >- This data type is the "ExpectationContext" data type with specialisations for UEMobilityLevelContext @@ -623,11 +623,9 @@ components: contextCondition: type: string enum: - - IS_WITHIN_RANGE + - IS_EQUAL_TO contextValueRange: - type: array - items: - $ref: "TS28541_SliceNrm.yaml#/components/schemas/MobilityLevel" + $ref: "TS28541_SliceNrm.yaml#/components/schemas/MobilityLevel" ResourceSharingLevelContext: description: >- This data type is the "ExpectationContext" data type with specialisations for ResourceSharingLevelContext @@ -640,9 +638,7 @@ components: contextCondition: type: string enum: - - IS_WITHIN_RANGE + - IS_EQUAL_TO contextValueRange: - type: array - items: - $ref: "TS28541_SliceNrm.yaml#/components/schemas/SharingLevel" + $ref: "TS28541_SliceNrm.yaml#/components/schemas/SharingLevel" #-------Definition of the concrete ExpectionContext dataType----------------# -- GitLab From 1c1f96dd032fa0085f5815b6ef319fecfa02e8bc Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 11 Aug 2023 09:26:10 +0000 Subject: [PATCH 04/19] Update 2 files - /OpenAPI/TS28312_IntentNrm.yaml - /OpenAPI/TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 21 +++++++++------------ OpenAPI/TS28312_IntentNrm.yaml | 7 ++----- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 886f4461d..2cc6c56e1 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -23,10 +23,8 @@ components: type: string expectationVerb: $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb" - expectationObjects: - type: array - items: - $ref: "#/components/schemas/RadioNetworkExpectationObject" + expectationObject: + $ref: "#/components/schemas/RadioNetworkExpectationObject" expectationTargets: type: array items: @@ -38,6 +36,7 @@ components: - $ref: "#/components/schemas/AveDLRANUEThptTarget" - $ref: "#/components/schemas/LowULRANUEThptRatioTarget" - $ref: "#/components/schemas/LowDLRANUEThptRatioTarget" + - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget" expectationContexts: type: array items: @@ -55,10 +54,8 @@ components: type: string expectationVerb: $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb" - expectationObjects: - type: array - items: - $ref: "#/components/schemas/ServiceSupportExpectationObject" + expectationObject: + $ref: "#/components/schemas/ServiceSupportExpectationObject" expectationTargets: type: array items: @@ -97,7 +94,7 @@ components: objectType: type: string enum: - - RAN_SubNetwork #value for Radio Network Expectation--# + - RAN_SubNetwork objectInstance: $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" objectContexts: @@ -110,7 +107,7 @@ components: - $ref: "#/components/schemas/PLMNContext" - $ref: "#/components/schemas/NRFqBandContext" - $ref: "#/components/schemas/RATContext" - - $ref: "#/components/schemas/ObjectContext" + - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ObjectContext" ServiceSupportExpectationObject: description: >- This data type is the "ExpectationObject" data type with specialisations for ServiceSupportExpectation @@ -119,7 +116,7 @@ components: objectType: type: string enum: - - Service_Support #value for Service Support Expectation--# + - Service_Support objectInstance: $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" objectContexts: @@ -130,7 +127,7 @@ components: - $ref: "#/components/schemas/EdgeIdenfiticationIdContext" - $ref: "#/components/schemas/EdgeIdenfiticationLocContext" - $ref: "#/components/schemas/CoverageAreaTAContext" - - $ref: "#/components/schemas/ObjectContext" + - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ObjectContext" #-------Definition of the ExpectationObject dataType ----------# diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index d310f894a..24b1d3890 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -63,10 +63,8 @@ components: type: string expectationVerb: $ref: "#/components/schemas/ExpectationVerb" - expectationObjects: - type: array - items: - $ref: "#/components/schemas/ExpectationObject" + expectationObject: + $ref: "#/components/schemas/ExpectationObject" expectationTargets: type: array items: @@ -92,7 +90,6 @@ components: enum: - RAN_SubNetwork #value for Radio Network Expectation--# - Service_Support #value for Service Support Expectation--# - - TBD #-This will be added based on defined scenario specfic intent expectation-# objectInstance: $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" objectContexts: -- GitLab From cfacdb50de7b570ea5f4bf6098c01eefefe9b016 Mon Sep 17 00:00:00 2001 From: Jan Groenendijk Date: Wed, 23 Aug 2023 22:16:43 +0000 Subject: [PATCH 05/19] Update TS28312_IntentNrm.yaml adding Edge to ServiceSupport --- 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 d310f894a..d7ac09f9b 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -44,7 +44,7 @@ components: oneOf: - $ref: "#/components/schemas/IntentExpectation" - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/RadioNetworkExpectation" - - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/ServiceSupportExpectation" + - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/EdgeServiceSupportExpectation" intentContexts: type: array items: -- GitLab From f296f9d18a2ad222fbc07916b91452fd0b674cb0 Mon Sep 17 00:00:00 2001 From: Jan Groenendijk Date: Wed, 23 Aug 2023 22:20:26 +0000 Subject: [PATCH 06/19] Update TS28312_IntentExpectations.yaml Add Edge to ServiceSupport --- OpenAPI/TS28312_IntentExpectations.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 886f4461d..f1aab1dc6 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -46,7 +46,7 @@ components: $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" required: - expectationId - ServiceSupportExpectation: + EdgeServiceSupportExpectation: description: >- This data type is the "IntentExpectation" data type with specialisations to represent MnS consumer's expectations for service deployment type: object @@ -111,9 +111,9 @@ components: - $ref: "#/components/schemas/NRFqBandContext" - $ref: "#/components/schemas/RATContext" - $ref: "#/components/schemas/ObjectContext" - ServiceSupportExpectationObject: + EdgeServiceSupportExpectationObject: description: >- - This data type is the "ExpectationObject" data type with specialisations for ServiceSupportExpectation + This data type is the "ExpectationObject" data type with specialisations for EdgeServiceSupportExpectation type: object properties: objectType: -- GitLab From 1a123ecb3bb2e9717bc41332ae87b809fb5edc6a Mon Sep 17 00:00:00 2001 From: Jan Groenendijk Date: Wed, 23 Aug 2023 22:30:07 +0000 Subject: [PATCH 07/19] Update TS28312_IntentExpectations.yaml fix missing edge --- 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 f1aab1dc6..a858759f0 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -58,7 +58,7 @@ components: expectationObjects: type: array items: - $ref: "#/components/schemas/ServiceSupportExpectationObject" + $ref: "#/components/schemas/EdgeServiceSupportExpectationObject" expectationTargets: type: array items: -- GitLab From 145c571f841ef5b4fbbec02b6a7ed4a2fb1f242f Mon Sep 17 00:00:00 2001 From: Jan Groenendijk Date: Wed, 23 Aug 2023 22:40:00 +0000 Subject: [PATCH 08/19] Update TS28312_IntentNrm.yaml fix missing edge --- 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 d7ac09f9b..f310916e9 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -91,7 +91,7 @@ components: type: string enum: - RAN_SubNetwork #value for Radio Network Expectation--# - - Service_Support #value for Service Support Expectation--# + - EdgeService_Support #value for Service Support Expectation--# - TBD #-This will be added based on defined scenario specfic intent expectation-# objectInstance: $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" -- GitLab From 3c01df5cb7c184fc861826acfea7eed98c962674 Mon Sep 17 00:00:00 2001 From: sunse Date: Wed, 9 Aug 2023 09:32:06 +0000 Subject: [PATCH 09/19] TS28.541_Rel17_CR0972 --- OpenAPI/TS28541_5GcNrm.yaml | 14 +++++++------- OpenAPI/TS28541_NrNrm.yaml | 12 ++++++------ OpenAPI/TS28541_SliceNrm.yaml | 8 +++++--- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 2acfb7a7e..ae61bea71 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -112,7 +112,7 @@ components: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Snssai' NFStatus: type: string - description: any of enumrated value + description: any of enumerated value enum: - REGISTERED - SUSPENDED @@ -146,7 +146,7 @@ components: type: string SupportedDataSetId: type: string - description: any of enumrated value + description: any of enumerated value enum: - SUBSCRIPTION - POLICY @@ -187,7 +187,7 @@ components: type: string n1MessageClass: type: boolean - n2InfroamtionClass: + n2InformationClass: type: boolean versions: type: string @@ -268,7 +268,7 @@ components: type: string SEPPType: type: string - description: any of enumrated value + description: any of enumerated value enum: - CSEPP - PSEPP @@ -285,7 +285,7 @@ components: $ref: '#/components/schemas/SupportedFunc' CommModelType: type: string - description: any of enumrated value + description: any of enumerated value enum: - DIRECT_COMMUNICATION_WO_NRF - DIRECT_COMMUNICATION_WITH_NRF @@ -528,9 +528,9 @@ components: enum: - INACTIVE - ACTIVE - activeEacThreshhold: + activeEacThreshold: type: integer - deactiveEacThreshhold: + deactiveEacThreshold: type: integer numberofUEs: type: integer diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 3907bc835..a8900cf90 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -182,7 +182,7 @@ components: timeDuration: type: integer - UeAccProbilityDist: + UeAccProbabilityDist: type: object properties: targetProbability: @@ -190,7 +190,7 @@ components: numberofpreamblessent: type: integer - UeAccDelayProbilityDist: + UeAccDelayProbabilityDist: type: object properties: targetProbability: @@ -1388,10 +1388,10 @@ components: properties: drachOptimizationControl: type: boolean - ueAccProbilityDist: - $ref: "#/components/schemas/UeAccProbilityDist" - ueAccDelayProbilityDist: - $ref: "#/components/schemas/UeAccDelayProbilityDist" + ueAccProbabilityDist: + $ref: "#/components/schemas/UeAccProbabilityDist" + ueAccDelayProbabilityDist: + $ref: "#/components/schemas/UeAccDelayProbabilityDist" - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' DMROFunction-Single: diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 903cf07ff..1719d7e2b 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -522,7 +522,9 @@ components: v2XCommModels: $ref: '#/components/schemas/V2XCommModels' coverageArea: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' + type: array + items: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea' termDensity: $ref: '#/components/schemas/TermDensity' activityFactor: @@ -608,7 +610,7 @@ components: type: boolean RequestedReservationExpiration: description: >- - An attribute which specifes MnS consuner's requirements for the validity period of the resource reservation. + An attribute which specifies MnS consuner's requirements for the validity period of the resource reservation. type: string ResourceReservationStatus: description: >- @@ -620,7 +622,7 @@ components: - USED ReservationExpiration: description: >- - An attribute which specifes the actual validity period of the resource reservation.. + An attribute which specifies the actual validity period of the resource reservation.. type: string ReservationFailureReason: description: >- -- GitLab From 1ea29cb9f843faa3487ae23200b89eb0045f7d2b Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 25 Aug 2023 13:09:56 +0000 Subject: [PATCH 10/19] Ts28.541 rel17 cr0968 removing redundant tai definition in nr nrm --- OpenAPI/TS28541_5GcNrm.yaml | 4 ++-- OpenAPI/TS28541_NrNrm.yaml | 20 ++++++-------------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index ae61bea71..343062cfc 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -126,7 +126,7 @@ components: TACList: type: array items: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/NrTac' + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac' WeightFactor: type: integer UdmInfo: @@ -648,7 +648,7 @@ components: TaiList: type: array items: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/Tai' + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' #-------- Definition of concrete IOCs -------------------------------------------- ProvMnS: diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index a8900cf90..1329bd9bd 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -97,30 +97,22 @@ components: type: integer maximum: 503 NrTac: - type: integer - maximum: 16777215 + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac' NrTacList: type: array items: - $ref: '#/components/schemas/NrTac' - Tai: - type: object - properties: - plmnId: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' - nrTac: - $ref: '#/components/schemas/NrTac' + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac' TaiList: type: array items: - $ref: '#/components/schemas/Tai' + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' BackhaulAddress: type: object properties: gnbId: $ref: '#/components/schemas/GnbId' tai: - $ref: "#/components/schemas/Tai" + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tai' MappingSetIDBackhaulAddress: type: object properties: @@ -930,7 +922,7 @@ components: nrPci: $ref: '#/components/schemas/NrPci' nrTac: - $ref: '#/components/schemas/NrTac' + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac' arfcnDL: type: integer arfcnUL: @@ -1009,7 +1001,7 @@ components: plmnInfoList: $ref: '#/components/schemas/PlmnInfoList' nrTac: - $ref: '#/components/schemas/NrTac' + $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac' NRFrequency-Single: allOf: -- GitLab From 1dbce32d9f7a3e70e83bb49e836c03cb25f68c71 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 24 Aug 2023 21:34:22 +0000 Subject: [PATCH 11/19] Rel17_TS28.312_CR0106 --- OpenAPI/TS28312_IntentExpectations.yaml | 16 ++++++++-------- OpenAPI/TS28312_IntentNrm.yaml | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 886f4461d..164fbb2fb 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -127,8 +127,8 @@ components: items: type: object oneOf: - - $ref: "#/components/schemas/EdgeIdenfiticationIdContext" - - $ref: "#/components/schemas/EdgeIdenfiticationLocContext" + - $ref: "#/components/schemas/EdgeIdentificationIdContext" + - $ref: "#/components/schemas/EdgeIdentificationLocContext" - $ref: "#/components/schemas/CoverageAreaTAContext" - $ref: "#/components/schemas/ObjectContext" #-------Definition of the ExpectationObject dataType ----------# @@ -525,9 +525,9 @@ components: - UTRAN - EUTRAN - NR - EdgeIdenfiticationIdContext: + EdgeIdentificationIdContext: description: >- - This data type is the "ObjectContext" data type with specialisations for EdgeIdenfiticationIdContext + This data type is the "ObjectContext" data type with specialisations for EdgeIdentificationIdContext type: object properties: contextAttribute: @@ -542,9 +542,9 @@ components: type: array items: type: string - EdgeIdenfiticationLocContext: + EdgeIdentificationLocContext: description: >- - This data type is the "ObjectContext" data type with specialisations for EdgeIdenfiticationLocContext + This data type is the "ObjectContext" data type with specialisations for EdgeIdentificationLocContext type: object properties: contextAttribute: @@ -580,7 +580,7 @@ components: type: integer #-------Definition of the scenario specific ObjectTarget dataType----------------# - #-------Definition of the concrete ExpectionContext dataType----------------# + #-------Definition of the concrete ExpectationContext dataType----------------# ServiceStartTimeContext: description: >- This data type is the "ExpectationContext" data type with specialisations for ServiceStartTimeContext @@ -645,4 +645,4 @@ components: type: array items: $ref: "TS28541_SliceNrm.yaml#/components/schemas/SharingLevel" - #-------Definition of the concrete ExpectionContext dataType----------------# + #-------Definition of the concrete ExpectationContext dataType----------------# diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index d310f894a..62cbb889b 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -92,7 +92,7 @@ components: enum: - RAN_SubNetwork #value for Radio Network Expectation--# - Service_Support #value for Service Support Expectation--# - - TBD #-This will be added based on defined scenario specfic intent expectation-# + - TBD #-This will be added based on defined scenario specific intent expectation-# objectInstance: $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" objectContexts: @@ -228,7 +228,7 @@ components: type: array items: type: number - #-------Definition of the concrete ExpectionContext dataType----------------# + #-------Definition of the concrete ExpectationContext dataType----------------# #------Definition of JSON arrays for name-contained IOCs ---------------# -- GitLab From e94119549c8e239b86e128de9b52d0300e228ae1 Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Wed, 2 Aug 2023 16:02:55 +0000 Subject: [PATCH 12/19] Update type of coverageAreaTAList from NrTacList to TaiList --- OpenAPI/TS28541_SliceNrm.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 1719d7e2b..5ee2e25c2 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -322,7 +322,7 @@ components: maxNumberOfPDUSessions: type: integer coverageAreaTAList: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/NrTacList' + $ref: 'TS28541_NrNrm.yaml#/components/schemas/TaiList' resourceSharingLevel: $ref: '#/components/schemas/SharingLevel' dLMaxPktSize: @@ -353,7 +353,7 @@ components: type: object properties: coverageAreaTAList: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/NrTacList' + $ref: 'TS28541_NrNrm.yaml#/components/schemas/TaiList' dLLatency: type: number uLLatency: @@ -446,7 +446,7 @@ components: activityFactor: type: integer coverageAreaTAList: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/NrTacList' + $ref: 'TS28541_NrNrm.yaml#/components/schemas/TaiList' resourceSharingLevel: $ref: '#/components/schemas/SharingLevel' uEMobilityLevel: @@ -755,7 +755,7 @@ components: uLThptPerSliceSubnet: $ref: '#/components/schemas/XLThpt' coverageAreaTAList: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/NrTacList' + $ref: 'TS28541_NrNrm.yaml#/components/schemas/TaiList' FeasibilityCheckAndReservationJob-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' -- GitLab From aa54601cdfd1ca0852d69c6b214fc62d85d757a8 Mon Sep 17 00:00:00 2001 From: Kai Zhang Date: Tue, 5 Sep 2023 12:37:19 +0000 Subject: [PATCH 13/19] 28.541_Rel17_CR0978_Update_RRMPolicyRatio --- OpenAPI/TS28541_NrNrm.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 1329bd9bd..917373543 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1152,10 +1152,19 @@ components: properties: rRMPolicyMaxRatio: type: integer + default: 100 + minimum: 0 + maximum: 100 rRMPolicyMinRatio: type: integer + default: 0 + minimum: 0 + maximum: 100 rRMPolicyDedicatedRatio: type: integer + default: 0 + minimum: 0 + maximum: 100 NRCellRelation-Single: allOf: -- GitLab From efb8380996fa4648907306b80996aaef3e6bc896 Mon Sep 17 00:00:00 2001 From: lengyelb Date: Wed, 26 Jul 2023 01:59:19 +0000 Subject: [PATCH 14/19] Update TS28532_FaultMnS.yaml - make probabaleCause mandatory in NotifyChangedAlarmGeneral and NotifyChangedSecAlarmGeneral --- OpenAPI/TS28532_FaultMnS.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenAPI/TS28532_FaultMnS.yaml b/OpenAPI/TS28532_FaultMnS.yaml index d2a61268a..4388b0178 100755 --- a/OpenAPI/TS28532_FaultMnS.yaml +++ b/OpenAPI/TS28532_FaultMnS.yaml @@ -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 -- GitLab From b3279af5c9293dc1a997a38ed4ead347b2225a91 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 11 Aug 2023 10:02:20 +0000 Subject: [PATCH 15/19] Update file TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 5ee2e25c2..6c3053f3d 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -23,14 +23,14 @@ components: enum: - STATIONARY - NOMADIC - - RESTRICTED MOBILITY - - FULLY MOBILITY + - RESTRICTED_MOBILITY + - FULLY_MOBILITY SynAvailability: type: string enum: - - NOT SUPPORTED - - BETWEEN BS AND UE - - BETWEEN BS AND UE & UE AND UE + - NOT_SUPPORTED + - BETWEEN_BS_AND_UE + - BETWEEN_BS_AND_UE_&_UE_AND_UE PositioningAvailability: type: array items: @@ -38,9 +38,9 @@ components: enum: - CIDE-CID - OTDOA - - RF FINGERPRINTING + - RF_FINGERPRINTING - AECID - - HYBRID POSITIONING + - HYBRID_POSITIONING - NET-RTK Predictionfrequency: type: string @@ -98,7 +98,7 @@ components: Support: type: string enum: - - NOT SUPPORTED + - NOT_SUPPORTED - SUPPORTED DelayTolerance: type: object -- GitLab From 593e50bccf3903f061cc8e95e02ad3f38bf1c727 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 24 Aug 2023 07:56:35 +0000 Subject: [PATCH 16/19] Update file TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 6c3053f3d..4659457c1 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -24,24 +24,24 @@ components: - STATIONARY - NOMADIC - RESTRICTED_MOBILITY - - FULLY_MOBILITY + - FULL_MOBILITY SynAvailability: type: string enum: - NOT_SUPPORTED - BETWEEN_BS_AND_UE - - BETWEEN_BS_AND_UE_&_UE_AND_UE + - BETWEEN_BS_AND_UE_AND_UE_AND_UE PositioningAvailability: type: array items: type: string enum: - - CIDE-CID + - CIDE_CID - OTDOA - RF_FINGERPRINTING - AECID - HYBRID_POSITIONING - - NET-RTK + - NET_RTK Predictionfrequency: type: string enum: @@ -52,22 +52,18 @@ components: type: string enum: - SHARED - - NON-SHARED + - NON_SHARED NetworkSliceSharingIndicator: type: string enum: - SHARED - - NON-SHARED + - NON_SHARED SliceSimultaneousUse: - type: string - enum: - - ZERO - - ONE - - TWO - - THREE - - FOUR + type: Integer + minimum: 0 + maximum: 4 Category: type: string enum: @@ -576,7 +572,7 @@ components: enum: - VLAN - MPLS - - Segment + - SEGMENT logicalInterfaceId: type: string -- GitLab From e64b8ff377d5694efaa28dcf219e38a3e443e2cb Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 24 Aug 2023 08:04:59 +0000 Subject: [PATCH 17/19] Update file TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 4659457c1..c0a9ff2a0 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -61,7 +61,7 @@ components: - NON_SHARED SliceSimultaneousUse: - type: Integer + type: integer minimum: 0 maximum: 4 Category: -- GitLab From f80de694c8732a619b16dda1d8170f86f8a81417 Mon Sep 17 00:00:00 2001 From: Jan Groenendijk Date: Wed, 26 Jul 2023 10:06:33 +0000 Subject: [PATCH 18/19] Update TS28541_SliceNrm.yaml, replace models with mode --- OpenAPI/TS28541_SliceNrm.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 70f9c5eee..320d54f4b 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -206,7 +206,7 @@ components: $ref: '#/components/schemas/ServAttrCom' support: $ref: '#/components/schemas/Support' - V2XCommModels: + V2XCommMode: type: object properties: servAttrCom: @@ -516,8 +516,8 @@ components: $ref: '#/components/schemas/Positioning' userMgmtOpen: $ref: '#/components/schemas/UserMgmtOpen' - v2XCommModels: - $ref: '#/components/schemas/V2XCommModels' + v2XCommMode: + $ref: '#/components/schemas/V2XCommMode' coverageArea: type: array items: -- GitLab From 0d120b7b9de746fd35c734f1729d7d37580b2610 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 8 Sep 2023 06:40:47 +0000 Subject: [PATCH 19/19] Update versions --- OpenAPI/TS28312_IntentExpectations.yaml | 2 +- OpenAPI/TS28312_IntentNrm.yaml | 2 +- OpenAPI/TS28532_FaultMnS.yaml | 2 +- OpenAPI/TS28532_FileDataReportingMnS.yaml | 2 +- OpenAPI/TS28541_NrNrm.yaml | 2 +- OpenAPI/TS28541_SliceNrm.yaml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index f47928a96..f641734f3 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: 17.4.0 + version: 17.5.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 7a42caaa5..1ad10359a 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Intent NRM - version: 17.4.0 + version: 17.5.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 4388b0178..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). diff --git a/OpenAPI/TS28532_FileDataReportingMnS.yaml b/OpenAPI/TS28532_FileDataReportingMnS.yaml index b74a6eb51..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). diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 917373543..8c7a4a8a8 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: NR NRM - version: 17.11.0 + version: 17.12.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 320d54f4b..beb653b0b 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -1,7 +1,7 @@ openapi: 3.0.1 info: title: Slice NRM - version: 17.11.0 + version: 17.12.0 description: >- OAS 3.0.1 specification of the Slice NRM @ 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). -- GitLab