From 36e5096b1a31d4e8335240df6d9217a6e9a6270c Mon Sep 17 00:00:00 2001
From: ruiyue <xuruiyue@huawei.com>
Date: Mon, 5 Jun 2023 01:11:07 +0000
Subject: [PATCH 1/4] Update OpenAPI/TS28312_IntentNrm.yaml

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

diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml
index ad7e7ad19..00c214435 100644
--- a/OpenAPI/TS28312_IntentNrm.yaml
+++ b/OpenAPI/TS28312_IntentNrm.yaml
@@ -113,6 +113,7 @@ components:
         - IS_NOT_ONE_OF
         - IS_EQUAL_TO_OR_LESS_THAN
         - IS_EQUAL_TO_OR_GREATER_THAN
+        - IS_ALL_OF        
     FulfilStatus:
       type: string
       enum:
-- 
GitLab


From cfc51c327589177c7c7594d5d679e07279d55a1b Mon Sep 17 00:00:00 2001
From: ruiyue <xuruiyue@huawei.com>
Date: Mon, 5 Jun 2023 01:13:26 +0000
Subject: [PATCH 2/4] Update OpenAPI/TS28312_IntentExpectations.yaml

---
 OpenAPI/TS28312_IntentExpectations.yaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml
index d7336467d..9eec14052 100644
--- a/OpenAPI/TS28312_IntentExpectations.yaml
+++ b/OpenAPI/TS28312_IntentExpectations.yaml
@@ -442,7 +442,7 @@ components:
         contextCondition:
           type: string
           enum:
-            - IS_WITHIN_RANGE
+            - IS_ALL_OF
         contextValueRange:
           type: array
           items:
@@ -461,7 +461,7 @@ components:
         contextCondition:
           type: string
           enum:
-            - IS_WITHIN_RANGE
+             - IS_ALL_OF
         contextValueRange:
           type: array
           items:
@@ -478,7 +478,7 @@ components:
         contextCondition:
           type: string
           enum:
-            - IS_WITHIN_RANGE
+            - IS_ALL_OF
         contextValueRange:
           type: array
           items:
@@ -495,7 +495,7 @@ components:
         contextCondition:
           type: string
           enum:
-            - IS_WITHIN_RANGE
+            - IS_ALL_OF
         contextValueRange:
           type: array
           items:
@@ -512,7 +512,7 @@ components:
         contextCondition:
           type: string
           enum:
-            - IS_WITHIN_RANGE
+            - IS_ALL_OF
         contextValueRange:
           type: array
           items:
@@ -567,7 +567,7 @@ components:
         contextCondition:
           type: string
           enum:
-            - IS_WITHIN_RANGE
+            - IS_ALL_OF
         contextValueRange:
           type: array
           items:
-- 
GitLab


From 14c5040608bbd772a5fdec626180f1497978a3de Mon Sep 17 00:00:00 2001
From: ruiyue <xuruiyue@huawei.com>
Date: Mon, 5 Jun 2023 01:17:48 +0000
Subject: [PATCH 3/4] Update OpenAPI/TS28312_IntentNrm.yaml

---
 OpenAPI/TS28312_IntentNrm.yaml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/OpenAPI/TS28312_IntentNrm.yaml b/OpenAPI/TS28312_IntentNrm.yaml
index 00c214435..072ef6798 100644
--- a/OpenAPI/TS28312_IntentNrm.yaml
+++ b/OpenAPI/TS28312_IntentNrm.yaml
@@ -76,7 +76,9 @@ components:
           items:
             $ref: "#/components/schemas/ExpectationContext"
         expectationfulfilmentInfo:
-            $ref: "#/components/schemas/FulfilmentInfo"                
+            $ref: "#/components/schemas/FulfilmentInfo" 
+      required:
+        - expectationId
    #-------Definition of the generic IntentExpectation dataType ----------#    
 
    #-------Definition of the generic ExpectationObject dataType ----------#    
@@ -116,11 +118,13 @@ components:
         - IS_ALL_OF        
     FulfilStatus:
       type: string
+      readOnly: true      
       enum:
           - FULFILLED
           - NOT_FULFILLED
     NotFulfilledState:
       type: string
+      readOnly: true      
       enum:
           - ACKNOWLEDGED
           - COMPLIANT
@@ -141,6 +145,7 @@ components:
           description: ->
             An attribute which is used when FulfilmentInfo is implemented for IntentFulfilmentInfo
           type: string
+          readOnly: true          
     ExpectationVerb:
       type: string
       enum:
-- 
GitLab


From 9ef0b90c25250b4aedf15b1d1494510ee4a64f0b Mon Sep 17 00:00:00 2001
From: ruiyue <xuruiyue@huawei.com>
Date: Mon, 5 Jun 2023 01:18:42 +0000
Subject: [PATCH 4/4] Update OpenAPI/TS28312_IntentExpectations.yaml

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

diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml
index 9eec14052..cbe65a006 100644
--- a/OpenAPI/TS28312_IntentExpectations.yaml
+++ b/OpenAPI/TS28312_IntentExpectations.yaml
@@ -43,7 +43,9 @@ components:
           items:
             $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext"
         expectationfulfilmentInfo:
-            $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo"                  
+            $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo" 
+      required:
+        - expectationId
     ServiceSupportExpectation:
       description: >-
         This data type is the "IntentExpectation" data type with specialisations to represent MnS consumer's expectations for service deployment    
@@ -81,7 +83,9 @@ components:
               - $ref: "#/components/schemas/ResourceSharingLevelContext"
               - $ref: "TS28312_IntentNrm.yaml#/components/schemas/ExpectationContext"
         expectationfulfilmentInfo:
-            $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo"              
+            $ref: "TS28312_IntentNrm.yaml#/components/schemas/FulfilmentInfo"    
+      required:
+        - expectationId                      
    #-------Definition of the IntentExpectation dataType ----------#    
 
    #-------Definition of the scenario specific ExpectationObject dataType ----------#    
-- 
GitLab