From 223f037446e6a2c69e6d47564ef22ba7e5902854 Mon Sep 17 00:00:00 2001
From: ruiyue <xuruiyue@huawei.com>
Date: Fri, 29 Sep 2023 10:06:43 +0000
Subject: [PATCH 1/2] Update file TS28312_IntentNrm.yaml

---
 OpenAPI/TS28312_IntentNrm.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml
index 900167412..cf638d61e 100644
--- a/OpenAPI/TS28312_IntentNrm.yaml
+++ b/OpenAPI/TS28312_IntentNrm.yaml
@@ -342,6 +342,8 @@ components:
         This data type is the "IntentConflictReport" data type without specialisations       
       type: object
       properties:
+        conflictId:
+          type: string
         conflictType:
           type: string
           enum:
-- 
GitLab


From d7a5bf72d0fac72bc771f0214f5ea1d6d05fac91 Mon Sep 17 00:00:00 2001
From: ruiyue <xuruiyue@huawei.com>
Date: Wed, 11 Oct 2023 13:56:13 +0000
Subject: [PATCH 2/2] Update file TS28312_IntentNrm.yaml

---
 OpenAPI/TS28312_IntentNrm.yaml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml
index cf638d61e..03af89506 100644
--- a/OpenAPI/TS28312_IntentNrm.yaml
+++ b/OpenAPI/TS28312_IntentNrm.yaml
@@ -66,17 +66,13 @@ components:
       - type: object
         properties:
           intentFulfilmentReport:
-            type: array
-            items:
-              $ref: '#/components/schemas/IntentFulfilmentReport'
+            $ref: '#/components/schemas/IntentFulfilmentReport'
           intentConflictReports:
             type: array
             items:
               $ref: '#/components/schemas/IntentConflictReport'
           intentFeasibilityCheckReport:
-            type: array
-            items:
-              $ref: '#/components/schemas/IntentFeasibilityCheckReport'            
+            $ref: '#/components/schemas/IntentFeasibilityCheckReport'          
           intentReference:
             $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
 
-- 
GitLab