From 6e20b6bf56715d4293fb9396be87c1c82b6728b7 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 29 Sep 2023 09:26:37 +0000 Subject: [PATCH 1/3] Update 2 files - /OpenAPI/TS28312_IntentNrm.yaml - /OpenAPI/TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 62 +++++++++++++++++++++++++ OpenAPI/TS28312_IntentNrm.yaml | 3 +- 2 files changed, 64 insertions(+), 1 deletion(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 241e55635..c0955d24f 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -52,6 +52,33 @@ components: - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext' required: - expectationId + RadioServiceExpectation: + description: >- + This data type is the "IntentExpectation" data type with specialisations to represent MnS consumer's expectations for radio service delivering + type: object + properties: + expectationId: + type: string + expectationVerb: + $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb" + expectationObject: + $ref: "#/components/schemas/RadioServiceExpectationObject" + expectationTargets: + type: array + items: + type: object + oneOf: + - $ref: '#/components/schemas/DLLatencyTarget' + - $ref: '#/components/schemas/ULLatencyTarget' + - $ref: '#/components/schemas/DLThptPerUETarget' + - $ref: '#/components/schemas/ULThptPerUETarget' + - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget' + expectationContexts: + type: array + items: + $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext' + required: + - expectationId EdgeServiceSupportExpectation: description: >- This data type is the "IntentExpectation" data type with specialisations to represent MnS consumer's expectations for service deployment @@ -143,6 +170,25 @@ components: - $ref: '#/components/schemas/RATContext' - $ref: "#/components/schemas/UEGroupContext" - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ObjectContext' + RadioServiceExpectationObject: + description: >- + This data type is the "ExpectationObject" data type with specialisations for RadioServicekExpectation + type: object + properties: + objectType: + type: string + enum: + - Radio_Service + objectInstance: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + objectContexts: + type: array + items: + type: object + oneOf: + - $ref: '#/components/schemas/CoverageAreaPolygonContext' + - $ref: '#/components/schemas/ServiceTypeContext' + - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ObjectContext' ServiceSupportExpectationObject: description: >- This data type is the "ExpectationObject" data type with specialisations for EdgeServiceSupportExpectation @@ -942,4 +988,20 @@ components: - IS_EQUAL_TO contextValueRange: $ref: "TS28541_SliceNrm.yaml#/components/schemas/SharingLevel" + ServiceTypeContext: + description: >- + This data type is the "ExpectationContext" data type with specialisations for ServiceTypeContext + type: object + properties: + contextAttribute: + type: string + enum: + - ServiceType + contextCondition: + type: string + enum: + - IS_EQUAL_TO + contextValueRange: + $ref: "TS28541_SliceNrm.yaml#/components/schemas/SST" + #-------Definition of the concrete ExpectionContext dataType----------------# diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 03af89506..19515d7fe 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -44,7 +44,8 @@ components: oneOf: - $ref: "#/components/schemas/IntentExpectation" - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/RadioNetworkExpectation" - - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/EdgeServiceSupportExpectation" + - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/EdgeServiceSupportExpectation" + - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/RadioServiceExpectation" intentContexts: type: array items: -- GitLab From 89915cae49fb8411cdf2df8d89a59baa6962478b Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 29 Sep 2023 09:30:08 +0000 Subject: [PATCH 2/3] 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 c0955d24f..4578b76df 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -1002,6 +1002,6 @@ components: enum: - IS_EQUAL_TO contextValueRange: - $ref: "TS28541_SliceNrm.yaml#/components/schemas/SST" + $ref: "TS28541_SliceNrm.yaml#/components/schemas/Sst" #-------Definition of the concrete ExpectionContext dataType----------------# -- GitLab From 81379acf6aeac82587461e87f543f4e19d5d884f Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 29 Sep 2023 09:36:05 +0000 Subject: [PATCH 3/3] 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 4578b76df..b86d911ed 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -1002,6 +1002,6 @@ components: enum: - IS_EQUAL_TO contextValueRange: - $ref: "TS28541_SliceNrm.yaml#/components/schemas/Sst" + $ref: "TS28541_NrNrm.yaml#/components/schemas/Sst" #-------Definition of the concrete ExpectionContext dataType----------------# -- GitLab