From 03586a6e33267dafae74a073ed6358fd8a40c81f Mon Sep 17 00:00:00 2001 From: ruiyue Date: Tue, 17 Oct 2023 06:57:48 +0000 Subject: [PATCH] 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