From d47debeab51c98ebbdb6a64d6fb10c6356d80ece Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 29 Sep 2023 08:48:10 +0000 Subject: [PATCH 1/4] Update file TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 5423a87ad..ee918931d 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -46,7 +46,10 @@ components: expectationContexts: type: array items: - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext' + type: object + oneOf: + - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/TargetAssuranceTimeContext' + - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext' required: - expectationId EdgeServiceSupportExpectation: @@ -862,6 +865,22 @@ components: #-------Definition of the scenario specific ObjectTarget dataType----------------# #-------Definition of the concrete ExpectationContext dataType----------------# + + TargetAssuranceTimeContext: + description: >- + This data type is the "Expectation Context" data type with specialisations for TargetAssuranceTimeContext + type: object + properties: + contextAttribute: + type: string + enum: + - TargetAssuranceTime + type: string + enum: + - IS_EQUAL_TO + contextValueRange: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/TimeWindow' + ServiceStartTimeContext: description: >- This data type is the "ExpectationContext" data type with specialisations for ServiceStartTimeContext -- GitLab From 25cfc1162aba74ccf71d4e1d0424452cfe251072 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 29 Sep 2023 08:51:35 +0000 Subject: [PATCH 2/4] Update file TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index ee918931d..6de4f4a08 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -876,6 +876,7 @@ components: enum: - TargetAssuranceTime type: string + contextCondition: enum: - IS_EQUAL_TO contextValueRange: -- GitLab From dd8212ce4c856b48dd729aef9e7893e5a42e0153 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 29 Sep 2023 08:54:57 +0000 Subject: [PATCH 3/4] Update file TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 6de4f4a08..d59842ab0 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -875,8 +875,8 @@ components: type: string enum: - TargetAssuranceTime - type: string contextCondition: + type: string enum: - IS_EQUAL_TO contextValueRange: -- GitLab From b5729a009f8985777fa4a427f0408b61c441edc7 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 29 Sep 2023 09:02:38 +0000 Subject: [PATCH 4/4] Update file TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index d59842ab0..241e55635 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -48,7 +48,7 @@ components: items: type: object oneOf: - - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/TargetAssuranceTimeContext' + - $ref: '#/components/schemas/TargetAssuranceTimeContext' - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext' required: - expectationId -- GitLab