From 8922825e1fa4ade2b310fb9b46ef44167bb1d6ba Mon Sep 17 00:00:00 2001 From: Shitao Li Date: Thu, 28 Sep 2023 02:57:50 +0000 Subject: [PATCH 1/3] 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 2/3] 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 9f860bffb55c882525b948b0e540bdb4436bd5b8 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 17 Oct 2023 06:42:29 +0000 Subject: [PATCH 3/3] 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