From 1c1f96dd032fa0085f5815b6ef319fecfa02e8bc Mon Sep 17 00:00:00 2001
From: ruiyue <xuruiyue@huawei.com>
Date: Fri, 11 Aug 2023 09:26:10 +0000
Subject: [PATCH] Update 2 files

- /OpenAPI/TS28312_IntentNrm.yaml
- /OpenAPI/TS28312_IntentExpectations.yaml
---
 OpenAPI/TS28312_IntentExpectations.yaml | 21 +++++++++------------
 OpenAPI/TS28312_IntentNrm.yaml          |  7 ++-----
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml
index 886f4461d..2cc6c56e1 100644
--- a/OpenAPI/TS28312_IntentExpectations.yaml
+++ b/OpenAPI/TS28312_IntentExpectations.yaml
@@ -23,10 +23,8 @@ components:
           type: string
         expectationVerb:
            $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb"
-        expectationObjects:
-          type: array
-          items:
-            $ref: "#/components/schemas/RadioNetworkExpectationObject"
+        expectationObject:
+          $ref: "#/components/schemas/RadioNetworkExpectationObject"
         expectationTargets:
           type: array
           items:
@@ -38,6 +36,7 @@ components:
               - $ref: "#/components/schemas/AveDLRANUEThptTarget"
               - $ref: "#/components/schemas/LowULRANUEThptRatioTarget"
               - $ref: "#/components/schemas/LowDLRANUEThptRatioTarget" 
+              - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationTarget"
         expectationContexts:
           type: array
           items:
@@ -55,10 +54,8 @@ components:
           type: string
         expectationVerb:
            $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationVerb"
-        expectationObjects:
-          type: array
-          items:
-            $ref: "#/components/schemas/ServiceSupportExpectationObject"
+        expectationObject:
+          $ref: "#/components/schemas/ServiceSupportExpectationObject"
         expectationTargets:
           type: array
           items:
@@ -97,7 +94,7 @@ components:
         objectType:
           type: string
           enum:
-            - RAN_SubNetwork #value for Radio Network Expectation--#
+            - RAN_SubNetwork 
         objectInstance:
           $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn"
         objectContexts:
@@ -110,7 +107,7 @@ components:
               - $ref: "#/components/schemas/PLMNContext"
               - $ref: "#/components/schemas/NRFqBandContext"
               - $ref: "#/components/schemas/RATContext"
-              - $ref: "#/components/schemas/ObjectContext"               
+              - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ObjectContext"               
     ServiceSupportExpectationObject: 
       description: >-
         This data type is the "ExpectationObject" data type with specialisations for ServiceSupportExpectation
@@ -119,7 +116,7 @@ components:
         objectType:
           type: string
           enum:
-            - Service_Support #value for Service Support Expectation--#
+            - Service_Support 
         objectInstance:
           $ref: "TS28623_ComDefs.yaml#/components/schemas/Dn"
         objectContexts:
@@ -130,7 +127,7 @@ components:
               - $ref: "#/components/schemas/EdgeIdenfiticationIdContext"
               - $ref: "#/components/schemas/EdgeIdenfiticationLocContext"
               - $ref: "#/components/schemas/CoverageAreaTAContext"   
-              - $ref: "#/components/schemas/ObjectContext"   
+              - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ObjectContext"   
    #-------Definition of the ExpectationObject dataType ----------#    
 
 
diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml
index d310f894a..24b1d3890 100644
--- a/OpenAPI/TS28312_IntentNrm.yaml
+++ b/OpenAPI/TS28312_IntentNrm.yaml
@@ -63,10 +63,8 @@ components:
           type: string
         expectationVerb:
            $ref: "#/components/schemas/ExpectationVerb"
-        expectationObjects:
-          type: array
-          items:
-            $ref: "#/components/schemas/ExpectationObject"
+        expectationObject:
+          $ref: "#/components/schemas/ExpectationObject"
         expectationTargets:
           type: array
           items:
@@ -92,7 +90,6 @@ components:
           enum:
             - RAN_SubNetwork  #value for Radio Network Expectation--#
             - 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"
         objectContexts:
-- 
GitLab