From cce6cc07b28e3baec0109fab6bf3ddde7b8e50c6 Mon Sep 17 00:00:00 2001 From: MAMENM Date: Thu, 30 Nov 2023 06:03:49 +0000 Subject: [PATCH 1/2] Ts28.312 rel18 cr0121 correct issues for the use of context in the open api document --- OpenAPI/TS28312_IntentExpectations.yaml | 25 +++------- OpenAPI/TS28312_IntentNrm.yaml | 66 +++---------------------- 2 files changed, 14 insertions(+), 77 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 40f94c033..d748fe112 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -112,7 +112,7 @@ components: - $ref: '#/components/schemas/ServiceEndTimeContext' - $ref: '#/components/schemas/UEMobilityLevelContext' - $ref: '#/components/schemas/ResourceSharingLevelContext' - - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext' + - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context' required: - expectationId 5GCNetworkExpectation: @@ -139,7 +139,7 @@ components: expectationContexts: type: array items: - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext" + $ref: "TS28312_IntentNrm.yaml#/components/schemas/Context" expectationfulfilmentInfo: $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" required: @@ -169,7 +169,7 @@ components: - $ref: '#/components/schemas/NRFqBandContext' - $ref: '#/components/schemas/RATContext' - $ref: "#/components/schemas/UEGroupContext" - - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ObjectContext' + - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context' RadioServiceExpectationObject: description: >- This data type is the "ExpectationObject" data type with specialisations for RadioServicekExpectation @@ -188,7 +188,7 @@ components: oneOf: - $ref: '#/components/schemas/CoverageAreaPolygonContext' - $ref: '#/components/schemas/ServiceTypeContext' - - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ObjectContext' + - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context' ServiceSupportExpectationObject: description: >- This data type is the "ExpectationObject" data type with specialisations for EdgeServiceSupportExpectation @@ -208,7 +208,7 @@ components: - $ref: '#/components/schemas/EdgeIdenfiticationIdContext' - $ref: '#/components/schemas/EdgeIdentificationLocContext' - $ref: '#/components/schemas/CoverageAreaTAContext' - - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ObjectContext' + - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context' 5GCNetworkExpectationObject: description: >- This data type is the "ExpectationObject" data type with specialisations for 5GCNetworkExpectation @@ -229,7 +229,7 @@ components: - $ref: "#/components/schemas/NfInstanceLocationContext" - $ref: "#/components/schemas/PLMNContext" - $ref: "#/components/schemas/TaiContext" - - $ref: "#/components/schemas/ObjectContext" + - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context' #-------Definition of the ExpectationObject dataType ----------# @@ -675,19 +675,6 @@ components: #-------Definition of the concrete ExpectationTarget dataType----------# #-------Definition of the concrete ObjectTarget dataType----------------# - ObjectContext: - description: >- - This data type is the "ObjectContext" data type without specialisations - type: object - properties: - contextAttribute: - type: string - contextCondition: - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Condition' - contextValueRange: - type: array - items: - type: number CoverageAreaPolygonContext: description: >- This data type is the "ObjectContext" data type with specialisations for CoverageAreaPolygonContext diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 55eae9617..50389e129 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -52,7 +52,7 @@ components: intentContexts: type: array items: - $ref: '#/components/schemas/IntentContext' + $ref: '#/components/schemas/Context' intentAdminState: type: string enum: @@ -118,7 +118,7 @@ components: expectationContexts: type: array items: - $ref: '#/components/schemas/ExpectationContext' + $ref: '#/components/schemas/Context' required: - expectationId #-------Definition of the generic IntentExpectation dataType ----------# @@ -142,7 +142,7 @@ components: objectContexts: type: array items: - $ref: '#/components/schemas/ObjectContext' + $ref: '#/components/schemas/Context' #-------Definition of the generic ExpectationObject dataType ----------# @@ -213,24 +213,6 @@ components: - $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' - $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoCoordinate' #-------Definition of the generic dataType --------------# - - #-------Definition of the generic IntentContext dataType --------------# - IntentContext: - description: >- - This data type is the "IntentContext" data type without specialisations - type: object - properties: - contextAttribute: - type: string - contextCondition: - $ref: '#/components/schemas/Condition' - contextValueRange: - oneOf: - - type: array - items: - $ref: "#/components/schemas/ValueRangeType" - - $ref: "#/components/schemas/ValueRangeType" - #-------Definition of the generic IntentContext dataType --------------# #-------Definition of the generic ExpectationTarget dataType----------# ExpectationTarget: @@ -253,28 +235,13 @@ components: targetContexts: type: array items: - $ref: '#/components/schemas/TargetContext' - TargetContext: - description: >- - This data type is the "TargetContext" data type without specialisations - type: object - properties: - contextAttribute: - type: string - contextCondition: - $ref: '#/components/schemas/Condition' - contextValueRange: - oneOf: - - type: array - items: - $ref: "#/components/schemas/ValueRangeType" - - $ref: "#/components/schemas/ValueRangeType" + $ref: '#/components/schemas/Context' #-------Definition of the generic ExpectationTarget dataType----------# - #-------Definition of the generic ObjectContext dataType----------------# - ObjectContext: + #-------Definition of the generic Context dataType----------------# + Context: description: >- - This data type is the "ObjectContext" data type without specialisations + This data type is the "Context" data type without specialisations type: object properties: contextAttribute: @@ -287,25 +254,8 @@ components: items: $ref: "#/components/schemas/ValueRangeType" - $ref: "#/components/schemas/ValueRangeType" - #-------Definition of the generic ObjectContext dataType----------------# + #-------Definition of the generic Context dataType----------------# - #-------Definition of the generic ExpectionContext dataType----------------# - ExpectationContext: - description: >- - This data type is the "ExpectationContext" data type without specialisations - type: object - properties: - contextAttribute: - type: string - contextCondition: - $ref: '#/components/schemas/Condition' - contextValueRange: - oneOf: - - type: array - items: - $ref: "#/components/schemas/ValueRangeType" - - $ref: "#/components/schemas/ValueRangeType" - #-------Definition of the concrete ExpectionContext dataType----------------# #-------Definition of the generic IntentFulfilmentReport dataType----------------# IntentFulfilmentReport: description: >- -- GitLab From 912e4b14e2480124e2a9daf856e73877f3e6d979 Mon Sep 17 00:00:00 2001 From: sunse Date: Thu, 30 Nov 2023 06:14:20 +0000 Subject: [PATCH 2/2] Update TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index d748fe112..ca767b135 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -49,7 +49,7 @@ components: type: object oneOf: - $ref: '#/components/schemas/TargetAssuranceTimeContext' - - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext' + - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context' required: - expectationId RadioServiceExpectation: @@ -76,7 +76,7 @@ components: expectationContexts: type: array items: - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext' + $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Context' required: - expectationId EdgeServiceSupportExpectation: -- GitLab