From 418654b4921ed330874f1df9198941dcf717f910 Mon Sep 17 00:00:00 2001 From: yaoyiz Date: Tue, 23 Aug 2022 15:28:21 +0000 Subject: [PATCH 01/23] Update OpenAPI/TS28105_AiMlNrm.yaml --- OpenAPI/TS28105_AiMlNrm.yaml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index a4afbb619..bf6228025 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -30,11 +30,19 @@ components: aIMLEntityVersion: type: string expectedRunTimeContext: - type: string + $ref: '#/components/schemas/AIMLContext' trainingContext: - type: string + $ref: '#/components/schemas/AIMLContext' runTimeContext: - type: string + $ref: '#/components/schemas/AIMLContext' + + AIMLContext: + type: object + properties: + inferenceEntityRef: + $ref: 'comDefs.yaml#/components/schemas/DnList' + dataProviderRef: + $ref: 'comDefs.yaml#/components/schemas/DnList' RequestStatus: type: string -- GitLab From 84bb7bbf6fb7ecbfcd48c03e7d2fe567c43d8d87 Mon Sep 17 00:00:00 2001 From: yaoyiz Date: Tue, 23 Aug 2022 15:43:29 +0000 Subject: [PATCH 02/23] Update TS28105_AiMlNrm.yaml --- OpenAPI/TS28105_AiMlNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml index bf6228025..01a77f34a 100644 --- a/OpenAPI/TS28105_AiMlNrm.yaml +++ b/OpenAPI/TS28105_AiMlNrm.yaml @@ -40,9 +40,9 @@ components: type: object properties: inferenceEntityRef: - $ref: 'comDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' dataProviderRef: - $ref: 'comDefs.yaml#/components/schemas/DnList' + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' RequestStatus: type: string -- GitLab From ca10674a6a8d70ce79964759caef702e5ba257fa Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Tue, 2 Aug 2022 09:48:58 +0000 Subject: [PATCH 03/23] Update TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 2ea8a2b41..2d328accd 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -60,13 +60,6 @@ components: - SHARED - NON-SHARED - ServiceType: - type: string - enum: - - eMBB - - RLLC - - MIoT - - V2X SliceSimultaneousUse: type: string enum: @@ -378,7 +371,7 @@ components: reliability: type: number serviceType: - $ref: '#/components/schemas/ServiceType' + $ref: 'TS28541_NrNrm.yaml#/components/schemas/Sst' dLMaxPktSize: type: integer uLMaxPktSize: @@ -453,7 +446,7 @@ components: reliability: type: number serviceType: - $ref: '#/components/schemas/ServiceType' + $ref: 'TS28541_NrNrm.yaml#/components/schemas/Sst' dLDeterministicComm: $ref: '#/components/schemas/DeterministicComm' uLDeterministicComm: -- GitLab From 339cd0c4425c48eb94be4e4d67a93b61747d4577 Mon Sep 17 00:00:00 2001 From: srinivasaraj Date: Fri, 19 Aug 2022 10:36:45 +0000 Subject: [PATCH 04/23] Update TS28541_SliceNrm.yaml serviceType attribute renamed to sST in RANSliceSubnetProfile and TopSliceSubnetProfile --- OpenAPI/TS28541_SliceNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 2d328accd..d192768d7 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -370,7 +370,7 @@ components: type: integer reliability: type: number - serviceType: + sST: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Sst' dLMaxPktSize: type: integer @@ -445,7 +445,7 @@ components: type: integer reliability: type: number - serviceType: + sST: $ref: 'TS28541_NrNrm.yaml#/components/schemas/Sst' dLDeterministicComm: $ref: '#/components/schemas/DeterministicComm' -- GitLab From 8727a53a34341c898eb6c1ddcb6ddbb5f38f33cd Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 5 Aug 2022 02:54:20 +0000 Subject: [PATCH 05/23] CR0771 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 d192768d7..455a663d0 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -453,6 +453,10 @@ components: $ref: '#/components/schemas/DeterministicComm' survivalTime: type: number + nssaaSupport: + $ref: '#/components/schemas/NSSAASupport' + n6Protection: + $ref: '#/components/schemas/N6Protection' ServiceProfile: type: object -- GitLab From 07cadcb75221bb3c1d6b3068b5b3b1f151ab4460 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 4 Aug 2022 13:44:29 +0000 Subject: [PATCH 06/23] Update TS28312_IntentNrm.yaml to distinguish the generic intent expectation part and scenario specific intent part --- OpenAPI/TS28312_IntentNrm.yaml | 338 +++++++++++++++++++++++++-------- 1 file changed, 255 insertions(+), 83 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 54a5bc028..cb4d86c57 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -12,7 +12,6 @@ externalDocs: paths: {} components: schemas: - Intent-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -23,14 +22,22 @@ components: intentExpectations: type: array items: - $ref: "#/components/schemas/IntentExpectation" + type: object + oneOf: + - $ref: "#/components/schemas/IntentExpectation" + - $ref: "#/components/schemas/RadioNetworkExpectation" + - $ref: "#/components/schemas/ServiceSupportExpectation" intentContexts: type: array items: $ref: "#/components/schemas/IntentContext" intentFulfilmentInfo: $ref: "#/components/schemas/FulfilmentInfo" + + #-------Definition of the IntentExpectation dataType ----------# IntentExpectation: + description: >- + This data type is the "IntentExpectation" data type without specialisations type: object properties: expectationId: @@ -50,9 +57,82 @@ components: items: $ref: "#/components/schemas/ExpectationContext" expectationfulfilmentInfo: - $ref: "#/components/schemas/FulfilmentInfo" - + $ref: "#/components/schemas/FulfilmentInfo" + RadioNetworkExpectation: + description: >- + This data type is the "IntentExpectation" data type with specialisations to represent MnS consumer's expectations for radio network delivering and performance assurance + type: object + properties: + expectationId: + type: string + expectationVerb: + $ref: "#/components/schemas/ExpectationVerb" + expectationObjects: + type: array + items: + $ref: "#/components/schemas/RadioNetworkExpectationObject" + expectationTargets: + type: array + items: + type: object + oneOf: + - $ref: "#/components/schemas/WeakRSRPRatioTarget" + - $ref: "#/components/schemas/LowSINRRatioTarget" + - $ref: "#/components/schemas/AveULRANUEThptTarget" + - $ref: "#/components/schemas/AveDLRANUEThptTarget" + - $ref: "#/components/schemas/LowULRANUEThptRatioTarget" + - $ref: "#/components/schemas/LowDLRANUEThptRatioTarget" + - $ref: "#/components/schemas/ExpectationTarget" + expectationContexts: + type: array + items: + $ref: "#/components/schemas/ExpectationContext" + expectationfulfilmentInfo: + $ref: "#/components/schemas/FulfilmentInfo" + ServiceSupportExpectation: + description: >- + This data type is the "IntentExpectation" data type with specialisations to represent MnS consumer's expectations for service deployment + type: object + properties: + expectationId: + type: string + expectationVerb: + $ref: "#/components/schemas/ExpectationVerb" + expectationObjects: + type: array + items: + $ref: "#/components/schemas/ServiceSupportExpectationObject" + expectationTargets: + type: array + items: + type: object + oneOf: + - $ref: "#/components/schemas/DLThptPerUETarget" + - $ref: "#/components/schemas/ULThptPerUETarget" + - $ref: "#/components/schemas/DLLatencyTarget" + - $ref: "#/components/schemas/ULLatencyTarget" + - $ref: "#/components/schemas/MaxNumberofUEsTarget" + - $ref: "#/components/schemas/ActivityFactorTarget" + - $ref: "#/components/schemas/UESpeedTarget" + - $ref: "#/components/schemas/ExpectationTarget" + expectationContexts: + type: array + items: + type: object + oneOf: + - $ref: "#/components/schemas/ServiceStartTimeContext" + - $ref: "#/components/schemas/ServiceEndTimeContext" + - $ref: "#/components/schemas/UEMobilityLevelContext" + - $ref: "#/components/schemas/ResourceSharingLevelContext" + - $ref: "#/components/schemas/ExpectationContext" + expectationfulfilmentInfo: + $ref: "#/components/schemas/FulfilmentInfo" + #-------Definition of the IntentExpectation dataType ----------# + + #-------Definition of the ExpectationObject dataType ----------# ExpectationObject: + description: >- + This data type is the "ExpectationObject" data type without specialisations type: object properties: objectType: @@ -66,70 +146,52 @@ components: objectContexts: type: array items: - $ref: "#/components/schemas/ObjectContext" - - ExpectationTarget: - oneOf: - #--ExpectationTargets defind for Radio Network Expectation (ObjectType is RAN_SubNetwork)- # - - $ref: "#/components/schemas/WeakRSRPRatioTarget" - - $ref: "#/components/schemas/LowSINRRatioTarget" - - $ref: "#/components/schemas/AveULRANUEThptTarget" - - $ref: "#/components/schemas/AveDLRANUEThptTarget" - - $ref: "#/components/schemas/LowULRANUEThptRatioTarget" - - $ref: "#/components/schemas/LowDLRANUEThptRatioTarget" - #--ExpectationTargets defind for Radio Network Expectation (ObjectType is RAN_SubNetwork)- # - #--ExpectationTargets defind for Service Support Expectation (ObjectType is ServiceSupport)- # - - $ref: "#/components/schemas/DLThptPerUETarget" - - $ref: "#/components/schemas/ULThptPerUETarget" - - $ref: "#/components/schemas/DLLatencyTarget" - - $ref: "#/components/schemas/ULLatencyTarget" - - $ref: "#/components/schemas/MaxNumberofUEsTarget" - - $ref: "#/components/schemas/ActivityFactorTarget" - - $ref: "#/components/schemas/UESpeedTarget" - #--ExpectationTargets defind for Service Support Expectation (ObjectType is ServiceSupport)- # - #--ExpectationTargets defind for other Scenario specific Expectation-----TBD---------------# - #--ExpectationTargets defind for other Scenario specific Expectation-----TBD---------------# - - - ObjectContext: - oneOf: - #--ObjectContext defind for Radio Network Expectation (ObjectType is RAN_SubNetwork)-------# - - $ref: "#/components/schemas/CoverageAreaPolygonContext" - - $ref: "#/components/schemas/CoverageTACContext" - - $ref: "#/components/schemas/PLMNContext" - - $ref: "#/components/schemas/NRFqBandContext" - - $ref: "#/components/schemas/RATContext" - #--ObjectContext defind for Radio Network Expectation (ObjectType is RAN_SubNetwork)-------# - #--ObjectContext defind for Service Support Expectation (ObjectType is ServiceSupport)-------# - - $ref: "#/components/schemas/EdgeIdenfiticationIdContext" - - $ref: "#/components/schemas/EdgeIdenfiticationLocContext" - - $ref: "#/components/schemas/CoverageAreaTAContext" - #--ObjectContext defind for Service Support Expectation (ObjectType is ServiceSupport)-------# - - #--ObjectContext defind for other Scenario specific Expectation -----------TBD------------# - #--ObjectContext defind for other Scenario specific Expectation -----------TBD------------# - - - ExpectationContext: - oneOf: - #--ExpectationContext defind for Service Support Expectation (ObjectType is Service_Support)- # - - $ref: "#/components/schemas/ServiceStartTimeContext" - - $ref: "#/components/schemas/ServiceEndTimeContext" - - $ref: "#/components/schemas/UEMobilityLevelContext" - - $ref: "#/components/schemas/ResourceSharingLevelContext" - #--ExpectationContext defind for Service Support Expectation (ObjectType is Service_Support)- # - - IntentContext: + $ref: "#/components/schemas/ObjectContext" + RadioNetworkExpectationObject: + description: >- + This data type is the "ExpectationObject" data type with specialisations for RadioNetworkExpectation type: object properties: - contextAttribute: + objectType: type: string - contextCondition: - $ref: "#/components/schemas/Condition" - contextValueRange: + enum: + - RAN_SubNetwrok #value for Radio Network Expectation--# + objectInstance: + $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" + objectContexts: type: array items: - type: number + type: object + oneOf: + - $ref: "#/components/schemas/CoverageAreaPolygonContext" + - $ref: "#/components/schemas/CoverageTACContext" + - $ref: "#/components/schemas/PLMNContext" + - $ref: "#/components/schemas/NRFqBandContext" + - $ref: "#/components/schemas/RATContext" + - $ref: "#/components/schemas/ObjectContext" + ServiceSupportExpectationObject: + description: >- + This data type is the "ExpectationObject" data type with specialisations for ServiceSupportExpectation + type: object + properties: + objectType: + type: string + enum: + - Service_Support #value for Radio Network Expectation--# + objectInstance: + $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" + objectContexts: + type: array + items: + type: object + oneOf: + - $ref: "#/components/schemas/EdgeIdenfiticationIdContext" + - $ref: "#/components/schemas/EdgeIdenfiticationLocContext" + - $ref: "#/components/schemas/CoverageAreaTAContext" + - $ref: "#/components/schemas/ObjectContext" + #-------Definition of the ExpectationObject dataType ----------# + + #-------Definition of the generic dataType --------------# Condition: type: string enum: @@ -137,13 +199,11 @@ components: - Is_less_than - Is_greater_than - Is_within_the_range - FulfilStatus: type: string enum: - FULFILLED - NOT_FULFILLED - NotFulfilledState: type: string enum: @@ -153,7 +213,6 @@ components: - SUSPENDED - TERMINATED - FULFILMENTFAILED - FulfilmentInfo: type: object properties: @@ -167,15 +226,59 @@ components: description: -> An attribute which is used when FulfilmentInfo is implemented for IntentFulfilmentInfo type: string - ExpectationVerb: type: string enum: - DELIVER - ENSURE + #-------Definition of the generic dataType --------------# - #-------Definition of the concrete ExpectationTarget dataType----------# + #-------Definition of the 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: + type: array + items: + type: number + #-------Definition of the IntentContext dataType --------------# + + #-------Definition of the ExpectationTarget dataType----------# + ExpectationTarget: + description: >- + This data type is the "ExpectationTarget" data type without specialisations + type: object + properties: + targetName: + type: string + targetCondition: + $ref: "#/components/schemas/Condition" + targetValueRange: + type: number + targetContexts: + type: array + items: + $ref: "#/components/schemas/TargetContext" + TargetContext: + description: >- + This data type is the "TargetContext" data type without specialisations + type: object + properties: + contextAttribute: + type: string + contextCondition: + $ref: "#/components/schemas/Condition" + contextValueRange: + type: number WeakRSRPRatioTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for WeakRSRPRatioTarget type: object properties: targetName: @@ -194,8 +297,9 @@ components: $ref: "#/components/schemas/WeakRSRPContext" targetFulfilmentInfo: $ref: "#/components/schemas/FulfilmentInfo" - WeakRSRPContext: + description: >- + This data type is the "TargetContext" data type with specialisations for WeakRSRPContext type: object properties: contextAttribute: @@ -208,8 +312,9 @@ components: - Is_less_than contextValueRange: type: number - LowSINRRatioTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for LowSINRatioTarget type: object properties: targetName: @@ -228,8 +333,9 @@ components: $ref: "#/components/schemas/LowSINRContext" targetFulfilmentInfo: $ref: "#/components/schemas/FulfilmentInfo" - LowSINRContext: + description: >- + This data type is the "TargetContext" data type with specialisations for LowSINRContext type: object properties: contextAttribute: @@ -242,8 +348,9 @@ components: - Is_less_than contextValueRange: type: integer - AveULRANUEThptTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for AveULRANUEThptTarget type: object properties: targetName: @@ -258,8 +365,9 @@ components: type: integer targetFulfilmentInfo: $ref: "#/components/schemas/FulfilmentInfo" - AveDLRANUEThptTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for AveDLRANUEThptTarget type: object properties: targetName: @@ -274,8 +382,9 @@ components: type: integer targetFulfilmentInfo: $ref: "#/components/schemas/FulfilmentInfo" - LowULRANUEThptRatioTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for LowULRANUEThptRatioTarget type: object properties: targetName: @@ -294,8 +403,9 @@ components: $ref: "#/components/schemas/LowULRANUEThptContext" targetFulfilmentInfo: $ref: "#/components/schemas/FulfilmentInfo" - LowULRANUEThptContext: + description: >- + This data type is the "TargetContext" data type with specialisations for LowULRANUEThptContext type: object properties: contextAttribute: @@ -308,8 +418,9 @@ components: - Is_less_than contextValueRange: type: number - LowDLRANUEThptRatioTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for LowDLRANUEThptRatioTarget type: object properties: targetName: @@ -328,8 +439,9 @@ components: $ref: "#/components/schemas/LowDLRANUEThptContext" targetFulfilmentInfo: $ref: "#/components/schemas/FulfilmentInfo" - LowDLRANUEThptContext: + description: >- + This data type is the "TargetContext" data type with specialisations for LowDLRANUEThptContext type: object properties: contextAttribute: @@ -343,6 +455,8 @@ components: contextValueRange: type: number DLThptPerUETarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for DLThptPerUETarget type: object properties: targetName: @@ -356,6 +470,8 @@ components: targetValueRange: $ref: "TS28541_SliceNrm.yaml#/components/schemas/XLThpt" ULThptPerUETarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for ULThptPerUETarget type: object properties: targetName: @@ -369,6 +485,8 @@ components: targetValueRange: $ref: "TS28541_SliceNrm.yaml#/components/schemas/XLThpt" DLLatencyTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for DLLatencyTarget type: object properties: targetName: @@ -382,6 +500,8 @@ components: targetValueRange: type: integer ULLatencyTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for ULLatencyTarget type: object properties: targetName: @@ -395,6 +515,8 @@ components: targetValueRange: type: integer MaxNumberofUEsTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for MaxNumberofUEsTarget type: object properties: targetAttribute: @@ -408,6 +530,8 @@ components: targetValueRange: type: integer ActivityFactorTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for ActivityFactorTarget type: object properties: targetAttribute: @@ -421,6 +545,8 @@ components: targetValueRange: type: integer UESpeedTarget: + description: >- + This data type is the "ExpectationTarget" data type with specialisations for UESpeedTarget type: object properties: targetAttribute: @@ -433,11 +559,25 @@ components: - Is_less _than targetValueRange: type: integer - #-------Definition of the concrete ExpectationTarget dataType----------# - #-------Definition of the concrete ObjectTarget 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: "#/components/schemas/Condition" + contextValueRange: + type: array + items: + type: number CoverageAreaPolygonContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for CoverageAreaPolygonContext type: object properties: contextAttribute: @@ -455,6 +595,8 @@ components: CoverageArea: type: string CoverageTACContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for CoverageTACContext type: object properties: contextAttribute: @@ -469,8 +611,9 @@ components: type: array items: $ref: "TS28541_NrNrm.yaml#/components/schemas/NrTac" - PLMNContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for PLMNContext type: object properties: contextAttribute: @@ -485,8 +628,9 @@ components: type: array items: $ref: "TS28541_NrNrm.yaml#/components/schemas/PlmnId" - NRFqBandContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for NRFqBandContext type: object properties: contextAttribute: @@ -501,8 +645,9 @@ components: type: array items: type: string - RATContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for RATContext type: object properties: contextAttribute: @@ -522,6 +667,8 @@ components: - EUTRAN - NR EdgeIdenfiticationIdContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for EdgeIdenfiticationIdContext type: object properties: contextAttribute: @@ -537,6 +684,8 @@ components: items: type: string EdgeIdenfiticationLocContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for EdgeIdenfiticationLocContext type: object properties: contextAttribute: @@ -552,6 +701,8 @@ components: items: type: string CoverageAreaTAContext: + description: >- + This data type is the "ObjectContext" data type with specialisations for CoverageAreaTAContext type: object properties: contextAttribute: @@ -568,10 +719,25 @@ components: $ref: "#/components/schemas/CoverageAreaTAList" CoverageAreaTAList: type: integer - #-------Definition of the concrete ObjectTarget dataType----------------# + #-------Definition of the concrete 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: + type: array + items: + type: number ServiceStartTimeContext: + description: >- + This data type is the "ExpectationContext" data type with specialisations for ServiceStartTimeContext type: object properties: contextAttribute: @@ -585,6 +751,8 @@ components: contextValueRange: type: string ServiceEndTimeContext: + description: >- + This data type is the "ExpectationContext" data type with specialisations for ServiceEndTimeContext type: object properties: contextAttribute: @@ -598,6 +766,8 @@ components: contextValueRange: type: string UEMobilityLevelContext: + description: >- + This data type is the "ExpectationContext" data type with specialisations for UEMobilityLevelContext type: object properties: contextAttribute: @@ -613,6 +783,8 @@ components: items: $ref: "TS28541_SliceNrm.yaml#/components/schemas/MobilityLevel" ResourceSharingLevelContext: + description: >- + This data type is the "ExpectationContext" data type with specialisations for ResourceSharingLevelContext type: object properties: contextAttribute: -- GitLab From 9992d8a926a494ef2e5b997954dadf0352578556 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 4 Aug 2022 13:53:56 +0000 Subject: [PATCH 07/23] Update TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 455a663d0..dd49cd407 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -580,30 +580,34 @@ components: items: $ref: '#/components/schemas/SliceProfile' FeasibilityResult: - description: -> - An attribute which specifies the feasibility check result for the feasibility check job. + description: >- + An attribute which specifies the feasibility check result for the feasibility check and reservation job. type: string enum: - FEASIBLE - INFEASIBLE InFeasibleReason: - description: -> + description: >- An attribute that specifies the additional reason information if the feasibility check result is infeasible.The detailed ENUM value is FFS. type: string + RecommendationRequest: + description: >- + An attribute represents MnS consumer's request for recommended network slice related requirements. + type: boolean RecommendedRequirements: - description: -> + description: >- An attribute that specifies the recommended network slicing related requirements (i.e. ServiceProfile and SliceProfile information) which can be supported by the MnS producer.. type: string ResourceReservation: - description: -> + description: >- An attribute represents MnS consumer's requirements for resource reservation. type: boolean RequestedReservationExpiration: - description: -> + description: >- An attribute which specifes MnS consuner's requirements for the validity period of the resource reservation. type: string ResourceReservationStatus: - description: -> + description: >- An attribute which specifies the resource reservation result for the feasibility check job. type: string enum: @@ -611,11 +615,11 @@ components: - UNRESERVED - USED ReservationExpiration: - description: -> + description: >- An attribute which specifes the actual validity period of the resource reservation.. type: string ReservationFailureReason: - description: -> + description: >- An attribute that specifies the additional reason information if the reservation is failed. type: string @@ -748,7 +752,7 @@ components: type: array items: type: string - FeasibilityCheckJob-Single: + FeasibilityCheckAndReservationJob-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -762,6 +766,8 @@ components: - $ref: '#/components/schemas/ServiceProfile' resourceReservation: $ref: '#/components/schemas/ResourceReservation' + recommendationRequest: + $ref: '#/components/schemas/RecommendationRequest requestedReservationExpiration: $ref: '#/components/schemas/RequestedReservationExpiration' processMonitor: @@ -821,4 +827,4 @@ components: - $ref: '#/components/schemas/NetworkSliceSubnet-Single' - $ref: '#/components/schemas/EP_Transport-Single' - $ref: '#/components/schemas/NetworkSliceSubnetProviderCapabilities-Single' - - $ref: '#/components/schemas/FeasibilityCheckJob-Single' + - $ref: '#/components/schemas/FeasibilityCheckAndReservationJob-Single' -- GitLab From efbe2d52d4af1891a908fdb70b087c426d007500 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 4 Aug 2022 13:56:28 +0000 Subject: [PATCH 08/23] Update 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 dd49cd407..8c3f35c20 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -814,7 +814,7 @@ components: FeasibilityCheckJob-Multiple: type: array items: - $ref: '#/components/schemas/FeasibilityCheckJob-Single' + $ref: '#/components/schemas/FeasibilityCheckAndReservationJob-Single' #------------ Definitions in TS 28.541 for TS 28.532 ----------------------------- -- GitLab From b1d55514ff31d0738ddd638cd5407b54405c3b4a Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 4 Aug 2022 13:59:28 +0000 Subject: [PATCH 09/23] Update 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 8c3f35c20..6dc884509 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -767,7 +767,7 @@ components: resourceReservation: $ref: '#/components/schemas/ResourceReservation' recommendationRequest: - $ref: '#/components/schemas/RecommendationRequest + $ref: '#/components/schemas/RecommendationRequest' requestedReservationExpiration: $ref: '#/components/schemas/RequestedReservationExpiration' processMonitor: -- GitLab From 003c97e2c80157f102677dd640f12913681eb894 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 18 Aug 2022 16:00:54 +0000 Subject: [PATCH 10/23] Update TS28541_SliceNrm.yaml --- 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 6dc884509..e18997865 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -659,8 +659,8 @@ components: $ref: '#/components/schemas/EP_Transport-Multiple' NetworkSliceSubnetProviderCapabilities: $ref: '#/components/schemas/NetworkSliceSubnetProviderCapabilities-Multiple' - FeasibilityCheckJob: - $ref: '#/components/schemas/FeasibilityCheckJob-Multiple' + FeasibilityCheckAndReservationJob: + $ref: '#/components/schemas/FeasibilityCheckAndReservationJob-Multiple' NetworkSlice-Single: @@ -811,7 +811,7 @@ components: type: array items: $ref: '#/components/schemas/NetworkSliceSubnetProviderCapabilities-Single' - FeasibilityCheckJob-Multiple: + FeasibilityCheckAndReservationJob-Multiple: type: array items: $ref: '#/components/schemas/FeasibilityCheckAndReservationJob-Single' -- GitLab From 6b0eb72d523e99204c97ce7f8f309346892c45cb Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 23 Aug 2022 21:36:24 +0000 Subject: [PATCH 11/23] Update TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index e18997865..5191c7c9b 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -590,10 +590,6 @@ components: description: >- An attribute that specifies the additional reason information if the feasibility check result is infeasible.The detailed ENUM value is FFS. type: string - RecommendationRequest: - description: >- - An attribute represents MnS consumer's request for recommended network slice related requirements. - type: boolean RecommendedRequirements: description: >- An attribute that specifies the recommended network slicing related requirements (i.e. ServiceProfile and SliceProfile information) which can be supported by the MnS producer.. @@ -765,9 +761,7 @@ components: - $ref: '#/components/schemas/SliceProfile' - $ref: '#/components/schemas/ServiceProfile' resourceReservation: - $ref: '#/components/schemas/ResourceReservation' - recommendationRequest: - $ref: '#/components/schemas/RecommendationRequest' + $ref: '#/components/schemas/ResourceReservation' requestedReservationExpiration: $ref: '#/components/schemas/RequestedReservationExpiration' processMonitor: -- GitLab From 4c236747eb02d7867bdbe53318c4218fc7b13a5b Mon Sep 17 00:00:00 2001 From: ruiyue Date: Thu, 4 Aug 2022 14:16:47 +0000 Subject: [PATCH 12/23] Update 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 fbe380538..c4b54eb5a 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -426,6 +426,7 @@ components: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/resources-nrNrm' - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/resources-5gcNrm' - $ref: 'TS28541_SliceNrm.yaml#/components/schemas/resources-sliceNrm' + - $ref: 'TS28536_CoslaNrm.yaml#/components/schemas/resources-coslaNrm' - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/resources-intentNrm' MoiChange: -- GitLab From 16ee08f855ccb5de1d136dadcc629618148baa80 Mon Sep 17 00:00:00 2001 From: allwang Date: Thu, 25 Aug 2022 07:14:45 +0000 Subject: [PATCH 13/23] Correct attribute names according to Upper Camel Case Convention and WKA --- OpenAPI/TS28623_GenericNrm.yaml | 88 ++++++++++++++++----------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index adfc72fd6..dbb9dce35 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -701,7 +701,7 @@ components: enum: - F1-C - listOfNeTypes-Type: + 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: @@ -730,7 +730,7 @@ components: - HSS - UDM - plmnTarget-Type: + 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: @@ -957,7 +957,7 @@ components: - UEauthentication - EventExposure - anonymizationOfMdtData-Type: + anonymizationOfMDTData-Type: description: Specifies level of MDT anonymization. For additional details see 3GPP TS 32.422 clause 5.10.12. type: string enum: @@ -968,7 +968,7 @@ components: 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: + collectionPeriodRRMLTE-Type: description: See details in 3GPP TS 32.422 clause 5.10.20. type: string enum: @@ -983,7 +983,7 @@ components: - 10240ms - 60000ms - collectionPeriodM6Lte-Type: + collectionPeriodM6LTE-Type: description: See details in 3GPP TS 32.422 clause 5.10.32. type: string enum: @@ -992,13 +992,13 @@ components: - 5120ms - 10240ms - collectionPeriodM7Lte-Type: + collectionPeriodM7LTE-Type: description: See details in 3GPP TS 32.422 clause 5.10.33. type: integer minimum: 1 maximum: 60 - collectionPeriodRrmUmts-Type: + collectionPeriodRRMUMTS-Type: description: See details in 3GPP TS 32.422 clause 5.10.21. type: string enum: @@ -1011,7 +1011,7 @@ components: - 4000ms - 6000ms - collectionPeriodRrmNr-Type: + collectionPeriodRRMNR-Type: description: See details in 3GPP TS 32.422 clause 5.10.30. type: string enum: @@ -1021,7 +1021,7 @@ components: - 10240ms - 60000ms - collectionPeriodM6Nr-Type: + collectionPeriodM6NR-Type: description: See details in 3GPP TS 32.422 clause 5.10.34. type: string enum: @@ -1040,7 +1040,7 @@ components: - 12min - 30min - collectionPeriodM7Nr-Type: + collectionPeriodM7NR-Type: description: See details in 3GPP TS 32.422 clause 5.10.35. type: integer minimum: 1 @@ -1240,7 +1240,7 @@ components: - 2560ms - 5120ms - measurementPeriodLte-Type: + measurementPeriodLTE-Type: description: See details in 3GPP TS 32.422 clause 5.10.23. type: string enum: @@ -1250,7 +1250,7 @@ components: - 10240ms - 1min - measurementPeriodUmts-Type: + measurementPeriodUMTS-Type: description: See details in 3GPP TS 32.422 clause 5.10.22. type: string enum: @@ -1276,13 +1276,13 @@ components: - CPICH_RSCP - PathLoss - eventThresholdUphUmts-Type: + eventThresholdUphUMTS-Type: description: See details in 3GPP TS 32.422 clause 5.10.A. type: integer minimum: 0 maximum: 31 - plmnList-Type: + pLMNList-Type: description: See details in 3GPP TS 32.422 clause 5.10.24. type: array items: @@ -1600,13 +1600,13 @@ components: $ref: '#/components/schemas/jobType-Type' listOfInterfaces: $ref: '#/components/schemas/listOfInterfaces-Type' - listOfNeTypes: - $ref: '#/components/schemas/listOfNeTypes-Type' - plmnTarget: - $ref: '#/components/schemas/plmnTarget-Type' + listOfNETypes: + $ref: '#/components/schemas/listOfNETypes-Type' + pLMNTarget: + $ref: '#/components/schemas/pLMNTarget-Type' traceReportingConsumerUri: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Uri' - traceCollectionEntityIpAddress: + traceCollectionEntityIPAddress: $ref: '#/components/schemas/IpAddr' traceDepth: $ref: '#/components/schemas/traceDepth-Type' @@ -1622,8 +1622,8 @@ components: $ref: '#/components/schemas/traceTarget-Type' triggeringEvents: $ref: '#/components/schemas/triggeringEvents-Type' - anonymizationOfMdtData: - $ref: '#/components/schemas/anonymizationOfMdtData-Type' + anonymizationOfMDTData: + $ref: '#/components/schemas/anonymizationOfMDTData-Type' areaConfigurationForNeighCell: $ref: '#/components/schemas/AreaConfig' areaScope: @@ -1632,20 +1632,20 @@ components: $ref: '#/components/schemas/AreaScope' beamLevelMeasurement: $ref: '#/components/schemas/beamLevelMeasurement-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' + 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' eventListForEventTriggeredMeasurement: $ref: '#/components/schemas/eventListForEventTriggeredMeasurement-Type' eventThreshold: @@ -1662,20 +1662,20 @@ components: $ref: '#/components/schemas/hysteresisL1-Type' timeToTriggerL1: $ref: '#/components/schemas/timeToTriggerL1-Type' - mbsfnAreaList: + mBSFNAreaList: type: array items: $ref: '#/components/schemas/MbsfnArea' - measurementPeriodLte: - $ref: '#/components/schemas/measurementPeriodLte-Type' - measurementPeriodUmts: - $ref: '#/components/schemas/measurementPeriodUmts-Type' + measurementPeriodLTE: + $ref: '#/components/schemas/measurementPeriodLTE-Type' + measurementPeriodUMTS: + $ref: '#/components/schemas/measurementPeriodUMTS-Type' measurementQuantity: $ref: '#/components/schemas/measurementQuantity-Type' - eventThresholdUphUmts: - $ref: '#/components/schemas/eventThresholdUphUmts-Type' - plmnList: - $ref: '#/components/schemas/plmnList-Type' + eventThresholdUphUMTS: + $ref: '#/components/schemas/eventThresholdUphUMTS-Type' + pLMNList: + $ref: '#/components/schemas/pLMNList-Type' positioningMethod: $ref: '#/components/schemas/positioningMethod-Type' reportAmount: -- GitLab From d70b98a7b133dde5fc21077c22006458724806e1 Mon Sep 17 00:00:00 2001 From: sunse Date: Mon, 1 Aug 2022 01:57:40 +0000 Subject: [PATCH 14/23] For CR0740 Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index b62b132c7..9633f3d17 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -2094,9 +2094,7 @@ components: - type: object properties: configurable5QIs: - type: array - items: - $ref: '#/components/schemas/FiveQICharacteristics-Multiple' + $ref: '#/components/schemas/FiveQICharacteristics-Multiple' Dynamic5QISet-Single: allOf: @@ -2108,9 +2106,7 @@ components: - type: object properties: dynamic5QIs: - type: array - items: - $ref: '#/components/schemas/FiveQICharacteristics-Multiple' + $ref: '#/components/schemas/FiveQICharacteristics-Multiple' GtpUPathQoSMonitoringControl-Single: allOf: -- GitLab From e268b31511f152716fb2a6c24b1837dc8d170740 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 5 Aug 2022 03:27:03 +0000 Subject: [PATCH 15/23] CR0773 Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 9633f3d17..158d1eeda 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -880,9 +880,7 @@ components: items: $ref: '#/components/schemas/SNssaiSmfInfoItem' taiList: - type: array - items: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/Tai' + $ref: '#/components/schemas/TaiList' taiRangeList: type: array items: @@ -1338,8 +1336,7 @@ components: isCAPIFSup: type: boolean taiList: - items: - $ref: '#/components/schemas/TaiList' + $ref: '#/components/schemas/TaiList' taiRangeList: type: array items: @@ -1369,8 +1366,7 @@ components: items: $ref: '#/components/schemas/NsacfInfoSnssai' taiList: - items: - $ref: '#/components/schemas/TaiList' + $ref: '#/components/schemas/TaiList' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: -- GitLab From cac4b67e1e5f404bc9ab6a4152f53ce9b5f534f4 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 4 Aug 2022 07:43:37 +0000 Subject: [PATCH 16/23] 0742 AMFFunction Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 158d1eeda..06e9dde8a 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -752,8 +752,8 @@ components: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr' - type: object properties: - plmnIdList: - $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnIdList' + pLMNInfoList: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/PlmnInfoList' amfIdentifier: $ref: '#/components/schemas/AmfIdentifier' sBIFqdn: @@ -768,8 +768,6 @@ components: $ref: '#/components/schemas/TaiRange' weightFactor: $ref: '#/components/schemas/WeightFactor' - snssaiList: - $ref: '#/components/schemas/SnssaiList' cNSIIdList: $ref: '#/components/schemas/CNSIIdList' gUAMIdList: -- GitLab From 12061c203c982b4618721bc537e4307d8d342c4f Mon Sep 17 00:00:00 2001 From: Shitao Li Date: Wed, 17 Aug 2022 07:24:46 +0000 Subject: [PATCH 17/23] Update TS28623_GenericNrm.yaml --- OpenAPI/TS28623_GenericNrm.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenAPI/TS28623_GenericNrm.yaml b/OpenAPI/TS28623_GenericNrm.yaml index dbb9dce35..c9834fd84 100755 --- a/OpenAPI/TS28623_GenericNrm.yaml +++ b/OpenAPI/TS28623_GenericNrm.yaml @@ -646,6 +646,8 @@ components: - N10 - N11 - S5-C + - N16 + - N16a SMSFInterfaces: type: array items: -- GitLab From 01226212124656be7277db30550d55568deae789 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 26 Aug 2022 02:50:53 +0000 Subject: [PATCH 18/23] Manually rebased for the branch TS28.541_CR0222 --- OpenAPI/TS28532_ProvMnS.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28532_ProvMnS.yaml b/OpenAPI/TS28532_ProvMnS.yaml index c4b54eb5a..c53182977 100755 --- a/OpenAPI/TS28532_ProvMnS.yaml +++ b/OpenAPI/TS28532_ProvMnS.yaml @@ -427,7 +427,9 @@ components: - $ref: 'TS28541_5GcNrm.yaml#/components/schemas/resources-5gcNrm' - $ref: 'TS28541_SliceNrm.yaml#/components/schemas/resources-sliceNrm' - $ref: 'TS28536_CoslaNrm.yaml#/components/schemas/resources-coslaNrm' - - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/resources-intentNrm' + - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/resources-intentNrm' + - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/resources-mdaNrm' + - $ref: 'TS28105_AiMlNrm.yaml#/components/schemas/resources-AiMlNrm' MoiChange: type: object -- GitLab From 01afc19ab990e825a34b0c4ecd0260de109ffa15 Mon Sep 17 00:00:00 2001 From: Kai Zhang Date: Thu, 4 Aug 2022 03:18:21 +0000 Subject: [PATCH 19/23] Change the type of the attributes maxDLDataVolume and maxULDataVolume to Real. --- OpenAPI/TS28541_SliceNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index 5191c7c9b..c63cd966e 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -528,9 +528,9 @@ components: reliability: type: number maxDLDataVolume: - type: string + type: number maxULDataVolume: - type: string + type: number sliceSimultaneousUse: $ref: '#/components/schemas/SliceSimultaneousUse' energyEfficiency: -- GitLab From 39bf5e8a76b578b77037734f3d35042e54424267 Mon Sep 17 00:00:00 2001 From: sunse Date: Fri, 26 Aug 2022 03:52:51 +0000 Subject: [PATCH 20/23] remove merge request !304 (DraftCR_28.538_S5-223372_Update_OpenAPI/EdgeNRM.yam) The content is incorrectly merged (Only agreed DraftCR) --- OpenAPI/TS28538_EdgeNrm.yaml | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/OpenAPI/TS28538_EdgeNrm.yaml b/OpenAPI/TS28538_EdgeNrm.yaml index 62753ce70..4b3554df7 100644 --- a/OpenAPI/TS28538_EdgeNrm.yaml +++ b/OpenAPI/TS28538_EdgeNrm.yaml @@ -86,15 +86,6 @@ components: type: string swImageRef: type: string - RegistrationInfo: - type: object - properties: - registrationExpiry: - type: string - registrationID: - type: string - secCredential: - type: string #-------- Definition of concrete IOCs -------------------------------------------- MnS: @@ -156,14 +147,10 @@ components: type: string eASRequirementsRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - eESFunctionRef: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' eASAddress: type: array items: type: string - registrationInfo: - $ref: '#/components/schemas/RegistrationInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' EESFunction-Single: allOf: @@ -189,10 +176,8 @@ components: $ref: '#/components/schemas/SoftwareImageInfo' serviceContinuitySupport: type: boolean - eASFunctionRef: + eASFunctonRef: $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList' - registrationInfo: - $ref: '#/components/schemas/RegistrationInfo' - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' ECSFunction-Single: -- GitLab From e6860e42b7cc589d8cd9fddf8020cbd4c38ae8f5 Mon Sep 17 00:00:00 2001 From: Shitao Li Date: Tue, 30 Aug 2022 07:55:05 +0000 Subject: [PATCH 21/23] Update TS28541_5GcNrm.yaml --- OpenAPI/TS28541_5GcNrm.yaml | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/OpenAPI/TS28541_5GcNrm.yaml b/OpenAPI/TS28541_5GcNrm.yaml index 06e9dde8a..a50921f0b 100755 --- a/OpenAPI/TS28541_5GcNrm.yaml +++ b/OpenAPI/TS28541_5GcNrm.yaml @@ -741,6 +741,8 @@ components: $ref: '#/components/schemas/Dynamic5QISet-Multiple' EcmConnectionInfo: $ref: '#/components/schemas/EcmConnectionInfo-Multiple' + EASDFFunction: + $ref: '#/components/schemas/EASDFFunction-Multiple' AmfFunction-Single: allOf: @@ -1422,8 +1424,8 @@ components: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO' - type: object properties: - EP_Nxx: - $ref: '#/components/schemas/EP_Nxx-Multiple' + EP_N88: + $ref: '#/components/schemas/EP_N88-Multiple' EcmConnectionInfo-Single: allOf: @@ -2023,7 +2025,7 @@ components: remoteAddress: $ref: 'TS28541_NrNrm.yaml#/components/schemas/RemoteAddress' - EP_Nxx-Single: + EP_N88-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' - type: object @@ -2303,7 +2305,12 @@ components: type: array items: $ref: '#/components/schemas/AmfRegion-Single' - + + EASDFFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/EASDFFunction-Single' + EP_N2-Multiple: type: array items: @@ -2447,10 +2454,10 @@ components: type: array items: $ref: '#/components/schemas/EP_Npc8-Single' - EP_Nxx-Multiple: + EP_N88-Multiple: type: array items: - $ref: '#/components/schemas/EP_Nxx-Single' + $ref: '#/components/schemas/EP_N88-Single' Configurable5QISet-Multiple: type: array items: @@ -2533,7 +2540,7 @@ components: - $ref: '#/components/schemas/EP_N32-Single' - $ref: '#/components/schemas/EP_N33-Single' - $ref: '#/components/schemas/EP_N60-Single' - - $ref: '#/components/schemas/EP_Nxx-Single' + - $ref: '#/components/schemas/EP_N88-Single' - $ref: '#/components/schemas/EP_Npc4-Single' - $ref: '#/components/schemas/EP_Npc6-Single' -- GitLab From 6db9fcc466accec626537069c3fde921c9ed45e0 Mon Sep 17 00:00:00 2001 From: Brendan Hassett Date: Tue, 30 Aug 2022 09:59:37 +0000 Subject: [PATCH 22/23] S5-225787 Update TS28541_NrNrm.yaml --- OpenAPI/TS28541_NrNrm.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OpenAPI/TS28541_NrNrm.yaml b/OpenAPI/TS28541_NrNrm.yaml index 81e0ffdb8..419f054db 100755 --- a/OpenAPI/TS28541_NrNrm.yaml +++ b/OpenAPI/TS28541_NrNrm.yaml @@ -109,6 +109,10 @@ components: NrTac: type: integer maximum: 16777215 + NrTacList: + type: array + items: + $ref: '#/components/schemas/NrTac' Tai: type: object properties: -- GitLab From 26e1b89aa8bf49054329903f69d077276b63c60c Mon Sep 17 00:00:00 2001 From: Brendan Hassett Date: Tue, 30 Aug 2022 10:01:46 +0000 Subject: [PATCH 23/23] S5-225787 Update TS28541_SliceNrm.yaml --- OpenAPI/TS28541_SliceNrm.yaml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/OpenAPI/TS28541_SliceNrm.yaml b/OpenAPI/TS28541_SliceNrm.yaml index c63cd966e..48c5ceb8f 100755 --- a/OpenAPI/TS28541_SliceNrm.yaml +++ b/OpenAPI/TS28541_SliceNrm.yaml @@ -314,7 +314,7 @@ components: maxNumberOfPDUSessions: type: integer coverageAreaTAList: - type: integer + $ref: 'TS28541_NrNrm.yaml#/components/schemas/NrTacList' resourceSharingLevel: $ref: '#/components/schemas/SharingLevel' dLMaxPktSize: @@ -345,7 +345,7 @@ components: type: object properties: coverageAreaTAList: - type: integer + $ref: 'TS28541_NrNrm.yaml#/components/schemas/NrTacList' dLLatency: type: number uLLatency: @@ -436,7 +436,7 @@ components: activityFactor: type: integer coverageAreaTAList: - type: integer + $ref: 'TS28541_NrNrm.yaml#/components/schemas/NrTacList' resourceSharingLevel: $ref: '#/components/schemas/SharingLevel' uEMobilityLevel: @@ -744,10 +744,8 @@ components: $ref: '#/components/schemas/XLThpt' uLThptPerSliceSubnet: $ref: '#/components/schemas/XLThpt' - coverageAreaTAIList: - type: array - items: - type: string + coverageAreaTAList: + $ref: 'TS28541_NrNrm.yaml#/components/schemas/NrTacList' FeasibilityCheckAndReservationJob-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' -- GitLab