diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 241e556357f8b3d19bfe94de2edac9ad10624c31..b86d911edca71f38767bb6f8a623fba9dfd0ef4f 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_NrNrm.yaml#/components/schemas/Sst" + #-------Definition of the concrete ExpectionContext dataType----------------# diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 03af895064e12b630c9b42e7b608ddbbcde26f07..19515d7feea4dd2fc21b368c91705130cbb7de69 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: