From bf8d3de0423a773bc54e7cf54c89d341164859cd Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 11 Aug 2023 13:22:50 +0000 Subject: [PATCH 1/3] Update 2 files - /OpenAPI/TS28312_IntentNrm.yaml - /OpenAPI/TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 16 --- OpenAPI/TS28312_IntentNrm.yaml | 158 ++++++++++++++++++++++-- 2 files changed, 150 insertions(+), 24 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index 971302e2a..bd5e1f883 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -42,8 +42,6 @@ components: type: array items: $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext" - expectationfulfilmentInfo: - $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" required: - expectationId ServiceSupportExpectation: @@ -82,8 +80,6 @@ components: - $ref: "#/components/schemas/UEMobilityLevelContext" - $ref: "#/components/schemas/ResourceSharingLevelContext" - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext" - expectationfulfilmentInfo: - $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" required: - expectationId #-------Definition of the IntentExpectation dataType ----------# @@ -154,8 +150,6 @@ components: maximum: 100 targetContexts: $ref: "#/components/schemas/WeakRSRPContext" - targetFulfilmentInfo: - $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" WeakRSRPContext: description: >- This data type is the "TargetContext" data type with specialisations for WeakRSRPContext @@ -190,8 +184,6 @@ components: maximum: 100 targetContexts: $ref: "#/components/schemas/LowSINRContext" - targetFulfilmentInfo: - $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" LowSINRContext: description: >- This data type is the "TargetContext" data type with specialisations for LowSINRContext @@ -222,8 +214,6 @@ components: - IS_GREATER_THAN targetValueRange: type: integer - targetFulfilmentInfo: - $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" AveDLRANUEThptTarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for AveDLRANUEThptTarget @@ -239,8 +229,6 @@ components: - IS_GREATER_THAN targetValueRange: type: integer - targetFulfilmentInfo: - $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" LowULRANUEThptRatioTarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for LowULRANUEThptRatioTarget @@ -260,8 +248,6 @@ components: maximum: 100 targetContexts: $ref: "#/components/schemas/LowULRANUEThptContext" - targetFulfilmentInfo: - $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" LowULRANUEThptContext: description: >- This data type is the "TargetContext" data type with specialisations for LowULRANUEThptContext @@ -296,8 +282,6 @@ components: maximum: 100 targetContexts: $ref: "#/components/schemas/LowDLRANUEThptContext" - targetFulfilmentInfo: - $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" LowDLRANUEThptContext: description: >- This data type is the "TargetContext" data type with specialisations for LowDLRANUEThptContext diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index bd3c83c28..98247621c 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -27,8 +27,8 @@ components: properties: SubNetwork: $ref: '#/components/schemas/SubNetwork-Multiple' - Intent: - $ref: '#/components/schemas/Intent-Multiple' + IntentHandlingFunction: + $ref: '#/components/schemas/IntentHandlingFunction-Multiple' Intent-Single: allOf: @@ -49,8 +49,45 @@ components: type: array items: $ref: "#/components/schemas/IntentContext" - intentFulfilmentInfo: - $ref: "#/components/schemas/FulfilmentInfo" + observationPeriod: + type: integer + intentReportReference: + $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" + + IntentReport-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + intentFulfilmentReport: + type: array + items: + $ref: "#/components/schemas/IntentFulfilmentReport" + intentConflictReports: + type: array + items: + $ref: "#/components/schemas/IntentConflictReport" + intentFeasibilityCheckReport: + type: array + items: + $ref: "#/components/schemas/IntentFeasibilityCheckReport" + intentReference: + $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" + + IntentHandlingFunction-Single: + allOf: + - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' + - type: object + properties: + intentHandlingCapabilityList: + type: array + items: + $ref: "/components/schemas/IntentHandlingCapability" + Intent: + $ref: '#/components/schemas/Intent-Multiple' + IntentReport: + $ref: '#/components/schemas/IntentReport-Multiple' + #-------Definition of generic IOCs ----------# #-------Definition of the generic IntentExpectation dataType ----------# @@ -75,8 +112,6 @@ components: type: array items: $ref: "#/components/schemas/ExpectationContext" - expectationfulfilmentInfo: - $ref: "#/components/schemas/FulfilmentInfo" required: - expectationId #-------Definition of the generic IntentExpectation dataType ----------# @@ -229,7 +264,102 @@ components: items: type: number #-------Definition of the concrete ExpectionContext dataType----------------# - + #-------Definition of the generic IntentFulfilmentReport dataType----------------# + IntentFulfilmentReport: + description: >- + This data type is the "IntentFulfilmentReport" data type without specialisations + type: object + properties: + intentFulfilmentInfo: + $ref: "#/components/schemas/FulfilmentInfo" + expectationFulfilmentResult: + type: array + items: + $ref: "#/components/schemas/ExpectationFulfilmentResult" + #-------Definition of the concrete IntentFulfilmentReport dataType----------------# + + #-------Definition of the generic ExpectationFulfilmentResult dataType----------------# + ExpectationFulfilmentResult: + description: >- + This data type is the "ExpectationFulfilmentResult" data type without specialisations + type: object + properties: + expectaitonId: + type: string + expectationFulfilmentInfo: + $ref: "#/components/schemas/FulfilmentInfo" + targetFulfilmentResult: + type: array + items: + $ref: "#/components/schemas/TargetFulfilmentResult" + #-------Definition of the concrete ExpectationFulfilmentResult dataType----------------# + + #-------Definition of the generic TargetFulfilmentResult dataType----------------# + TargetFulfilmentResult: + description: >- + This data type is the "TargetFulfilmentResult" data type without specialisations + type: object + properties: + targetName: + type: string + targetFulfilmentInfo: + $ref: "#/components/schemas/FulfilmentInfo" + targetAchievedValue: + type: number + #-------Definition of the concrete TargetFulfilmentResult dataType----------------# + + #-------Definition of the generic IntentConflictReport dataType----------------# + IntentConflictReport: + description: >- + This data type is the "IntentConflictReport" data type without specialisations + type: object + properties: + conflictType: + type: string + enum: + - INTENT_CONFLICT + - EXPECTATION_CONFLICT + - TARGET_CONFLICT + conflictField: + type: string + #-------Definition of the concrete IntentConflictReport dataType----------------# + + #-------Definition of the generic IntentFeasibilityCheckReport dataType----------------# + IntentFeasibilityCheckReport: + description: >- + This data type is the "IntentFeasibilityCheckReport" data type without specialisations + type: object + properties: + feasibilityCheckResult: + type: string + enum: + - FEASIBLE + - INFEASIBLE + infeasibilityReason: + description: -> + An attribute which is used when feasibilityCheckResult is INFEASIBLE + type: string + #-------Definition of the concrete IntentFeasibilityCheckReport dataType----------------# + + #-------Definition of the generic IntentHandlingCapability dataType----------------# + IntentHandlingCapability: + description: >- + This data type is the "IntentHandlingCapability" data type without specialisations + type: object + properties: + intentHandlingCapabilityId: + type: string + supportedExpectationObjectType: + type: string + enum: + - RAN_SUBNETWORK + - EDGE_SERVICE_SUPPORT + supportedExpectationTargetType: + type: array + items: + $ref: "#/components/schemas/ExpectationTarget" + #-------Definition of the concrete IntentHandlingCapability dataType----------------# + #------Definition of JSON arrays for name-contained IOCs ---------------# SubNetwork-Multiple: @@ -240,7 +370,19 @@ components: Intent-Multiple: type: array items: - $ref: '#/components/schemas/Intent-Single' + $ref: '#/components/schemas/Intent-Single' + + IntentReport-Multiple: + type: array + items: + $ref: '#/components/schemas/IntentReport-Single' + + IntentHandlingFunction-Multiple: + type: array + items: + $ref: '#/components/schemas/IntentHandlingFunction-Single' + + #------Definition of JSON arrays for name-contained IOCs ---------------# #----- Definitions in TS 28.312 for TS 28.532 --------------------------# -- GitLab From f8a5e4d51236b53da5f1ce5db29ad2854ef1a749 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Fri, 11 Aug 2023 13:45:10 +0000 Subject: [PATCH 2/3] Update 2 files - /OpenAPI/TS28312_IntentNrm.yaml - /OpenAPI/TS28312_IntentExpectations.yaml --- OpenAPI/TS28312_IntentExpectations.yaml | 98 ++++++++++++------------- OpenAPI/TS28312_IntentNrm.yaml | 60 ++++++++------- 2 files changed, 78 insertions(+), 80 deletions(-) diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml index bd5e1f883..5e42457aa 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -22,26 +22,26 @@ components: expectationId: type: string expectationVerb: - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb" + $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb' expectationObjects: type: array items: - $ref: "#/components/schemas/RadioNetworkExpectationObject" + $ref: '#/components/schemas/RadioNetworkExpectationObject' expectationTargets: type: array items: type: object oneOf: - - $ref: "#/components/schemas/WeakRSRPRatioTarget" - - $ref: "#/components/schemas/LowSINRRatioTarget" - - $ref: "#/components/schemas/AveULRANUEThptTarget" - - $ref: "#/components/schemas/AveDLRANUEThptTarget" - - $ref: "#/components/schemas/LowULRANUEThptRatioTarget" - - $ref: "#/components/schemas/LowDLRANUEThptRatioTarget" + - $ref: '#/components/schemas/WeakRSRPRatioTarget' + - $ref: '#/components/schemas/LowSINRRatioTarget' + - $ref: '#/components/schemas/AveULRANUEThptTarget' + - $ref: '#/components/schemas/AveDLRANUEThptTarget' + - $ref: '#/components/schemas/LowULRANUEThptRatioTarget' + - $ref: '#/components/schemas/LowDLRANUEThptRatioTarget' expectationContexts: type: array items: - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext" + $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext' required: - expectationId ServiceSupportExpectation: @@ -52,34 +52,34 @@ components: expectationId: type: string expectationVerb: - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb" + $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb' expectationObjects: type: array items: - $ref: "#/components/schemas/ServiceSupportExpectationObject" + $ref: '#/components/schemas/ServiceSupportExpectationObject' expectationTargets: type: array items: type: object oneOf: - - $ref: "#/components/schemas/DLThptPerUETarget" - - $ref: "#/components/schemas/ULThptPerUETarget" - - $ref: "#/components/schemas/DLLatencyTarget" - - $ref: "#/components/schemas/ULLatencyTarget" - - $ref: "#/components/schemas/MaxNumberofUEsTarget" - - $ref: "#/components/schemas/ActivityFactorTarget" - - $ref: "#/components/schemas/UESpeedTarget" - - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget" + - $ref: '#/components/schemas/DLThptPerUETarget' + - $ref: '#/components/schemas/ULThptPerUETarget' + - $ref: '#/components/schemas/DLLatencyTarget' + - $ref: '#/components/schemas/ULLatencyTarget' + - $ref: '#/components/schemas/MaxNumberofUEsTarget' + - $ref: '#/components/schemas/ActivityFactorTarget' + - $ref: '#/components/schemas/UESpeedTarget' + - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget' expectationContexts: type: array items: type: object oneOf: - - $ref: "#/components/schemas/ServiceStartTimeContext" - - $ref: "#/components/schemas/ServiceEndTimeContext" - - $ref: "#/components/schemas/UEMobilityLevelContext" - - $ref: "#/components/schemas/ResourceSharingLevelContext" - - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext" + - $ref: '#/components/schemas/ServiceStartTimeContext' + - $ref: '#/components/schemas/ServiceEndTimeContext' + - $ref: '#/components/schemas/UEMobilityLevelContext' + - $ref: '#/components/schemas/ResourceSharingLevelContext' + - $ref: 'TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext' required: - expectationId #-------Definition of the IntentExpectation dataType ----------# @@ -95,18 +95,18 @@ components: enum: - RAN_SubNetwork #value for Radio Network Expectation--# objectInstance: - $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' objectContexts: type: array items: type: object oneOf: - - $ref: "#/components/schemas/CoverageAreaPolygonContext" - - $ref: "#/components/schemas/CoverageTACContext" - - $ref: "#/components/schemas/PLMNContext" - - $ref: "#/components/schemas/NRFqBandContext" - - $ref: "#/components/schemas/RATContext" - - $ref: "#/components/schemas/ObjectContext" + - $ref: '#/components/schemas/CoverageAreaPolygonContext' + - $ref: '#/components/schemas/CoverageTACContext' + - $ref: '#/components/schemas/PLMNContext' + - $ref: '#/components/schemas/NRFqBandContext' + - $ref: '#/components/schemas/RATContext' + - $ref: '#/components/schemas/ObjectContext' ServiceSupportExpectationObject: description: >- This data type is the "ExpectationObject" data type with specialisations for ServiceSupportExpectation @@ -117,16 +117,16 @@ components: enum: - Service_Support #value for Service Support Expectation--# objectInstance: - $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' objectContexts: type: array items: type: object oneOf: - - $ref: "#/components/schemas/EdgeIdenfiticationIdContext" - - $ref: "#/components/schemas/EdgeIdenfiticationLocContext" - - $ref: "#/components/schemas/CoverageAreaTAContext" - - $ref: "#/components/schemas/ObjectContext" + - $ref: '#/components/schemas/EdgeIdenfiticationIdContext' + - $ref: '#/components/schemas/EdgeIdenfiticationLocContext' + - $ref: '#/components/schemas/CoverageAreaTAContext' + - $ref: '#/components/schemas/ObjectContext' #-------Definition of the ExpectationObject dataType ----------# @@ -149,7 +149,7 @@ components: minimum: 0 maximum: 100 targetContexts: - $ref: "#/components/schemas/WeakRSRPContext" + $ref: '#/components/schemas/WeakRSRPContext' WeakRSRPContext: description: >- This data type is the "TargetContext" data type with specialisations for WeakRSRPContext @@ -183,7 +183,7 @@ components: minimum: 0 maximum: 100 targetContexts: - $ref: "#/components/schemas/LowSINRContext" + $ref: '#/components/schemas/LowSINRContext' LowSINRContext: description: >- This data type is the "TargetContext" data type with specialisations for LowSINRContext @@ -247,7 +247,7 @@ components: minimum: 0 maximum: 100 targetContexts: - $ref: "#/components/schemas/LowULRANUEThptContext" + $ref: '#/components/schemas/LowULRANUEThptContext' LowULRANUEThptContext: description: >- This data type is the "TargetContext" data type with specialisations for LowULRANUEThptContext @@ -281,7 +281,7 @@ components: minimum: 0 maximum: 100 targetContexts: - $ref: "#/components/schemas/LowDLRANUEThptContext" + $ref: '#/components/schemas/LowDLRANUEThptContext' LowDLRANUEThptContext: description: >- This data type is the "TargetContext" data type with specialisations for LowDLRANUEThptContext @@ -311,7 +311,7 @@ components: enum: - IS_GREATER_THAN targetValueRange: - $ref: "TS28541_SliceNrm.yaml#/components/schemas/XLThpt" + $ref: 'TS28541_SliceNrm.yaml#/components/schemas/XLThpt' ULThptPerUETarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for ULThptPerUETarget @@ -326,7 +326,7 @@ components: enum: - IS_GREATER_THAN targetValueRange: - $ref: "TS28541_SliceNrm.yaml#/components/schemas/XLThpt" + $ref: 'TS28541_SliceNrm.yaml#/components/schemas/XLThpt' DLLatencyTarget: description: >- This data type is the "ExpectationTarget" data type with specialisations for DLLatencyTarget @@ -413,7 +413,7 @@ components: contextAttribute: type: string contextCondition: - $ref: "TS28312_IntentNrm.yaml#/components/schemas/Condition" + $ref: 'TS28312_IntentNrm.yaml#/components/schemas/Condition' contextValueRange: type: array items: @@ -434,7 +434,7 @@ components: contextValueRange: type: array items: - $ref: "#/components/schemas/CoverageArea" + $ref: '#/components/schemas/CoverageArea' CoverageArea: type: string CoverageTACContext: @@ -453,7 +453,7 @@ components: contextValueRange: type: array items: - $ref: "TS28541_NrNrm.yaml#/components/schemas/NrTac" + $ref: 'TS28541_NrNrm.yaml#/components/schemas/NrTac' PLMNContext: description: >- This data type is the "ObjectContext" data type with specialisations for PLMNContext @@ -470,7 +470,7 @@ components: contextValueRange: type: array items: - $ref: "TS28623_ComDefs.yaml#/components/schemas/PlmnId" + $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId' NRFqBandContext: description: >- This data type is the "ObjectContext" data type with specialisations for NRFqBandContext @@ -559,7 +559,7 @@ components: contextValueRange: type: array items: - $ref: "#/components/schemas/CoverageAreaTAList" + $ref: '#/components/schemas/CoverageAreaTAList' CoverageAreaTAList: type: integer #-------Definition of the scenario specific ObjectTarget dataType----------------# @@ -611,7 +611,7 @@ components: contextValueRange: type: array items: - $ref: "TS28541_SliceNrm.yaml#/components/schemas/MobilityLevel" + $ref: 'TS28541_SliceNrm.yaml#/components/schemas/MobilityLevel' ResourceSharingLevelContext: description: >- This data type is the "ExpectationContext" data type with specialisations for ResourceSharingLevelContext @@ -628,5 +628,5 @@ components: contextValueRange: type: array items: - $ref: "TS28541_SliceNrm.yaml#/components/schemas/SharingLevel" + $ref: 'TS28541_SliceNrm.yaml#/components/schemas/SharingLevel' #-------Definition of the concrete ExpectionContext dataType----------------# diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 98247621c..7a641df28 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -42,17 +42,17 @@ components: items: type: object oneOf: - - $ref: "#/components/schemas/IntentExpectation" - - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/RadioNetworkExpectation" - - $ref: "TS28312_IntentExpectations.yaml#/components/schemas/ServiceSupportExpectation" + - $ref: '#/components/schemas/IntentExpectation' + - $ref: 'TS28312_IntentExpectations.yaml#/components/schemas/RadioNetworkExpectation' + - $ref: 'TS28312_IntentExpectations.yaml#/components/schemas/ServiceSupportExpectation' intentContexts: type: array items: - $ref: "#/components/schemas/IntentContext" + $ref: '#/components/schemas/IntentContext' observationPeriod: type: integer intentReportReference: - $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' IntentReport-Single: allOf: @@ -62,17 +62,17 @@ components: intentFulfilmentReport: type: array items: - $ref: "#/components/schemas/IntentFulfilmentReport" + $ref: '#/components/schemas/IntentFulfilmentReport' intentConflictReports: type: array items: - $ref: "#/components/schemas/IntentConflictReport" + $ref: '#/components/schemas/IntentConflictReport' intentFeasibilityCheckReport: type: array items: - $ref: "#/components/schemas/IntentFeasibilityCheckReport" + $ref: '#/components/schemas/IntentFeasibilityCheckReport' intentReference: - $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' IntentHandlingFunction-Single: allOf: @@ -82,7 +82,7 @@ components: intentHandlingCapabilityList: type: array items: - $ref: "/components/schemas/IntentHandlingCapability" + $ref: '#/components/schemas/IntentHandlingCapability' Intent: $ref: '#/components/schemas/Intent-Multiple' IntentReport: @@ -99,19 +99,19 @@ components: expectationId: type: string expectationVerb: - $ref: "#/components/schemas/ExpectationVerb" + $ref: '#/components/schemas/ExpectationVerb' expectationObjects: type: array items: - $ref: "#/components/schemas/ExpectationObject" + $ref: '#/components/schemas/ExpectationObject' expectationTargets: type: array items: - $ref: "#/components/schemas/ExpectationTarget" + $ref: '#/components/schemas/ExpectationTarget' expectationContexts: type: array items: - $ref: "#/components/schemas/ExpectationContext" + $ref: '#/components/schemas/ExpectationContext' required: - expectationId #-------Definition of the generic IntentExpectation dataType ----------# @@ -129,11 +129,11 @@ components: - Service_Support #value for Service Support Expectation--# - TBD #-This will be added based on defined scenario specfic intent expectation-# objectInstance: - $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn" + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' objectContexts: type: array items: - $ref: "#/components/schemas/ObjectContext" + $ref: '#/components/schemas/ObjectContext' #-------Definition of the generic ExpectationObject dataType ----------# @@ -171,7 +171,7 @@ components: type: object properties: fulfilStatus: - $ref: "#/components/schemas/FulfilStatus" + $ref: '#/components/schemas/FulfilStatus' notFullfilledState: description: -> An attribute which is used when FulfilmentInfo is implemented for IntentFulfilmentInfo @@ -197,7 +197,7 @@ components: contextAttribute: type: string contextCondition: - $ref: "#/components/schemas/Condition" + $ref: '#/components/schemas/Condition' contextValueRange: type: array items: @@ -213,13 +213,13 @@ components: targetName: type: string targetCondition: - $ref: "#/components/schemas/Condition" + $ref: '#/components/schemas/Condition' targetValueRange: type: number targetContexts: type: array items: - $ref: "#/components/schemas/TargetContext" + $ref: '#/components/schemas/TargetContext' TargetContext: description: >- This data type is the "TargetContext" data type without specialisations @@ -228,7 +228,7 @@ components: contextAttribute: type: string contextCondition: - $ref: "#/components/schemas/Condition" + $ref: '#/components/schemas/Condition' contextValueRange: type: number #-------Definition of the generic ExpectationTarget dataType----------# @@ -242,7 +242,7 @@ components: contextAttribute: type: string contextCondition: - $ref: "#/components/schemas/Condition" + $ref: '#/components/schemas/Condition' contextValueRange: type: array items: @@ -258,7 +258,7 @@ components: contextAttribute: type: string contextCondition: - $ref: "#/components/schemas/Condition" + $ref: '#/components/schemas/Condition' contextValueRange: type: array items: @@ -271,11 +271,11 @@ components: type: object properties: intentFulfilmentInfo: - $ref: "#/components/schemas/FulfilmentInfo" + $ref: '#/components/schemas/FulfilmentInfo' expectationFulfilmentResult: type: array items: - $ref: "#/components/schemas/ExpectationFulfilmentResult" + $ref: '#/components/schemas/ExpectationFulfilmentResult' #-------Definition of the concrete IntentFulfilmentReport dataType----------------# #-------Definition of the generic ExpectationFulfilmentResult dataType----------------# @@ -287,11 +287,11 @@ components: expectaitonId: type: string expectationFulfilmentInfo: - $ref: "#/components/schemas/FulfilmentInfo" + $ref: '#/components/schemas/FulfilmentInfo' targetFulfilmentResult: type: array items: - $ref: "#/components/schemas/TargetFulfilmentResult" + $ref: '#/components/schemas/TargetFulfilmentResult' #-------Definition of the concrete ExpectationFulfilmentResult dataType----------------# #-------Definition of the generic TargetFulfilmentResult dataType----------------# @@ -303,7 +303,7 @@ components: targetName: type: string targetFulfilmentInfo: - $ref: "#/components/schemas/FulfilmentInfo" + $ref: '#/components/schemas/FulfilmentInfo' targetAchievedValue: type: number #-------Definition of the concrete TargetFulfilmentResult dataType----------------# @@ -342,9 +342,7 @@ components: #-------Definition of the concrete IntentFeasibilityCheckReport dataType----------------# #-------Definition of the generic IntentHandlingCapability dataType----------------# - IntentHandlingCapability: - description: >- - This data type is the "IntentHandlingCapability" data type without specialisations + IntentHandlingCapability: type: object properties: intentHandlingCapabilityId: -- GitLab From 1996123e2d158deee5ee58c8548425714c2bc84c Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 4 Sep 2023 03:50:00 +0000 Subject: [PATCH 3/3] Update file 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 afa987051..e10f7bd52 100644 --- a/OpenAPI/TS28312_IntentExpectations.yaml +++ b/OpenAPI/TS28312_IntentExpectations.yaml @@ -127,8 +127,8 @@ components: items: type: object oneOf: - - $ref: '#/components/schemas/EdgeIdenfiticationIdContext' - - $ref: '#/components/schemas/EdgeIdenfiticationLocContext' + - $ref: '#/components/schemas/EdgeIdentificationIdContext' + - $ref: '#/components/schemas/EdgeIdentificationLocContext' - $ref: '#/components/schemas/CoverageAreaTAContext' - $ref: '#/components/schemas/ObjectContext' #-------Definition of the ExpectationObject dataType ----------# -- GitLab