From 18449ac078b4f4ef1a96d292dd83dbc08f3f5017 Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 25 Sep 2023 09:20:47 +0000 Subject: [PATCH 1/2] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 900167412..0cafaef6e 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -76,10 +76,11 @@ components: intentFeasibilityCheckReport: type: array items: - $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' @@ -348,8 +349,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 TARGET_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 EXPECTATION_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----------------# @@ -381,9 +392,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 ---------------# @@ -415,6 +424,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 --------------------------# -- GitLab From c058d7ad2b986ff0cd48364ea93049f92e6cd40a Mon Sep 17 00:00:00 2001 From: ruiyue Date: Mon, 9 Oct 2023 15:23:49 +0000 Subject: [PATCH 2/2] Update file TS28312_IntentNrm.yaml --- OpenAPI/TS28312_IntentNrm.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml index 0cafaef6e..376a8c2c2 100644 --- a/OpenAPI/TS28312_IntentNrm.yaml +++ b/OpenAPI/TS28312_IntentNrm.yaml @@ -351,15 +351,15 @@ components: - TARGET_CONFLICT conflictingIntent: description: >- - This will be present if the value of conflictType is INTENT_CONFLICT.It describes the DN of the conflicting intent + 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 TARGET_CONFLICT.It describes the expectationId of the conflicting IntentExpectation with an Intent + 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 EXPECTATION_CONFLICT.It describes the targetName of the conflicting ExpectationTarget with an IntentExpectation + 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----------------# -- GitLab