From d4d1f2227ca4213f7d6ddb5e57e0f94bf8287b7d Mon Sep 17 00:00:00 2001 From: MAMENM Date: Thu, 30 Nov 2023 02:44:28 +0000 Subject: [PATCH 1/2] Ts28.312 rel 17 cr0119 correct issues for redefined objectcontext in open api document --- OpenAPI/TS28312_IntentExpectations.yaml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 0258d5e35..9ed96d7dd 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -418,19 +418,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 -- GitLab From 48b5ec422450c697815d3a6ee420a70f53779721 Mon Sep 17 00:00:00 2001 From: MAMENM Date: Thu, 30 Nov 2023 03:07:29 +0000 Subject: [PATCH 2/2] Ts28.312 rel 17 cr0118 correct the relationship uml diagram for intent --- OpenAPI/TS28312_IntentExpectations.yaml | 8 ++-- OpenAPI/TS28312_IntentNrm.yaml | 59 ++++--------------------- 2 files changed, 12 insertions(+), 55 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 9ed96d7dd..34292ec5b 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -40,7 +40,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: @@ -78,7 +78,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" expectationfulfilmentInfo: $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" required: @@ -107,7 +107,7 @@ components: - $ref: "#/components/schemas/PLMNContext" - $ref: "#/components/schemas/NRFqBandContext" - $ref: "#/components/schemas/RATContext" - - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ObjectContext" + - $ref: "TS28312_IntentNrm.yaml#/components/schemas/Context" EdgeServiceSupportExpectationObject: description: >- This data type is the "ExpectationObject" data type with specialisations for EdgeServiceSupportExpectation @@ -127,7 +127,7 @@ components: - $ref: "#/components/schemas/EdgeIdentificationIdContext" - $ref: "#/components/schemas/EdgeIdentificationLocContext" - $ref: "#/components/schemas/CoverageAreaTAContext" - - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ObjectContext" + - $ref: "TS28312_IntentNrm.yaml#/components/schemas/Context" #-------Definition of the ExpectationObject dataType ----------# diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 1ad10359a..9af9bf8ad 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -48,7 +48,7 @@ components: intentContexts: type: array items: - $ref: "#/components/schemas/IntentContext" + $ref: "#/components/schemas/Context" intentFulfilmentInfo: $ref: "#/components/schemas/FulfilmentInfo" #-------Definition of generic IOCs ----------# @@ -72,7 +72,7 @@ components: expectationContexts: type: array items: - $ref: "#/components/schemas/ExpectationContext" + $ref: "#/components/schemas/Context" expectationfulfilmentInfo: $ref: "#/components/schemas/FulfilmentInfo" required: @@ -95,7 +95,7 @@ components: objectContexts: type: array items: - $ref: "#/components/schemas/ObjectContext" + $ref: "#/components/schemas/Context" #-------Definition of the generic ExpectationObject dataType ----------# @@ -150,10 +150,10 @@ components: - ENSURE #-------Definition of the generic dataType --------------# - #-------Definition of the generic IntentContext dataType --------------# - IntentContext: + #-------Definition of the generic Context dataType --------------# + Context: description: >- - This data type is the "IntentContext" data type without specialisations + This data type is the "Context" data type without specialisations type: object properties: contextAttribute: @@ -164,7 +164,7 @@ components: type: array items: type: number - #-------Definition of the generic IntentContext dataType --------------# + #-------Definition of the generic Context dataType --------------# #-------Definition of the generic ExpectationTarget dataType----------# ExpectationTarget: @@ -181,52 +181,9 @@ 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: - type: number + $ref: "#/components/schemas/Context" #-------Definition of the generic ExpectationTarget dataType----------# - - #-------Definition of the generic ObjectContext dataType----------------# - ObjectContext: - description: >- - This data type is the "ObjectContext" data type without specialisations - type: object - properties: - contextAttribute: - type: string - contextCondition: - $ref: "#/components/schemas/Condition" - contextValueRange: - type: array - items: - type: number - #-------Definition of the generic ObjectContext 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: - type: array - items: - type: number - #-------Definition of the concrete ExpectationContext dataType----------------# - #------Definition of JSON arrays for name-contained IOCs ---------------# SubNetwork-Multiple: -- GitLab