diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 19515d7feea4dd2fc21b368c91705130cbb7de69..9f7248ad2ddebd6fccd34172e93fc99e9f070f62 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -73,10 +73,11 @@ components: items: $ref: '#/components/schemas/IntentConflictReport' intentFeasibilityCheckReport: - $ref: '#/components/schemas/IntentFeasibilityCheckReport' + $ref: '#/components/schemas/IntentFeasibilityCheckReport' + lastUpdated: + $ref: 'TS28623_ComDefs.yaml#/components/schemas/DateTime' intentReference: $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' - IntentHandlingFunction-Single: allOf: - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top' @@ -347,8 +348,18 @@ components: - INTENT_CONFLICT - EXPECTATION_CONFLICT - TARGET_CONFLICT - conflictField: - type: string + conflictingIntent: + description: >- + This will be present if the value of conflictType is INTENT_CONFLICT. It describes the DN of the conflicting intent + $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn' + conflictingExpectation: + description: >- + This will be present if the value of conflictType is EXPECTATION_CONFLICT. It describes the expectationId of the conflicting IntentExpectation with an Intent + type: string + conflictingTarget: + description: >- + This will be present if the value of conflictType is TARGET_CONFLICT. It describes the targetName of the conflicting ExpectationTarget with an IntentExpectation + type: string #-------Definition of the concrete IntentConflictReport dataType----------------# #-------Definition of the generic IntentFeasibilityCheckReport dataType----------------# @@ -380,9 +391,7 @@ components: - RAN_SUBNETWORK - EDGE_SERVICE_SUPPORT supportedExpectationTargetType: - type: array - items: - $ref: "#/components/schemas/ExpectationTarget" + type: string #-------Definition of the concrete IntentHandlingCapability dataType----------------# #------Definition of JSON arrays for name-contained IOCs ---------------# @@ -414,6 +423,8 @@ components: resources-intentNrm: oneOf: - $ref: '#/components/schemas/SubNetwork-Single' + - $ref: '#/components/schemas/IntentHandlingFunction-Single' - $ref: '#/components/schemas/Intent-Single' + - $ref: '#/components/schemas/IntentReport-Single' #----- Definitions in TS 28.312 for TS 28.532 --------------------------#