From 30906018ddf4dde9fff87468e1aed60890492e18 Mon Sep 17 00:00:00 2001
From: ruiyue <xuruiyue@huawei.com>
Date: Fri, 11 Aug 2023 12:54:17 +0000
Subject: [PATCH 1/2] Update file TS28312_IntentExpectations.yaml

---
 OpenAPI/TS28312_IntentExpectations.yaml | 34 +++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml
index 971302e2a..4e468d8e2 100644
--- a/OpenAPI/TS28312_IntentExpectations.yaml
+++ b/OpenAPI/TS28312_IntentExpectations.yaml
@@ -38,6 +38,8 @@ components:
               - $ref: "#/components/schemas/AveDLRANUEThptTarget"
               - $ref: "#/components/schemas/LowULRANUEThptRatioTarget"
               - $ref: "#/components/schemas/LowDLRANUEThptRatioTarget" 
+              - $ref: "#/components/schemas/RANEnergyConsumptionReductionRatioTarget"
+              - $ref: "#/components/schemas/RANEnergyEfficiencyTarget"
         expectationContexts:
           type: array
           items:
@@ -313,6 +315,38 @@ components:
             - IS_LESS_THAN
         contextValueRange:
           type: number
+    RANEnergyConsumptionReductionRatioTarget:
+      description: >-
+        This data type is the "ExpectationTarget" data type with specialisations for RANEnergyConsumptionReductionRatioTarget      
+      type: object
+      properties:
+        targetName:
+          type: string
+          enum:
+            - RANEnergyConsumptionReductionRatio
+        targetCondition:
+          type: string
+          enum:
+            - IS_GREATER_THAN
+        targetValueRange:
+          type: integer
+          minimum: 0
+          maximum: 100
+    RANEnergyEfficiencyTarget:
+      description: >-
+        This data type is the "ExpectationTarget" data type with specialisations for RANEnergyEfficiencyTarget       
+      type: object
+      properties:
+        targetName:
+          type: string
+          enum:
+            - RANEnergyEfficiency
+        targetCondition:
+          type: string
+          enum:
+            - IS_GREATER_THAN
+        targetValueRange:
+          type: integer
     DLThptPerUETarget:
       description: >-
         This data type is the "ExpectationTarget" data type with specialisations for DLThptPerUETarget       
-- 
GitLab


From 045ea70b7bacc8445ac92bd99b27e973339ca056 Mon Sep 17 00:00:00 2001
From: ruiyue <xuruiyue@huawei.com>
Date: Mon, 4 Sep 2023 04:04:57 +0000
Subject: [PATCH 2/2] Update file TS28312_IntentExpectations.yaml

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

diff --git a/OpenAPI/TS28312_IntentExpectations.yaml b/OpenAPI/TS28312_IntentExpectations.yaml
index 4e468d8e2..36d79764a 100644
--- a/OpenAPI/TS28312_IntentExpectations.yaml
+++ b/OpenAPI/TS28312_IntentExpectations.yaml
@@ -38,7 +38,7 @@ components:
               - $ref: "#/components/schemas/AveDLRANUEThptTarget"
               - $ref: "#/components/schemas/LowULRANUEThptRatioTarget"
               - $ref: "#/components/schemas/LowDLRANUEThptRatioTarget" 
-              - $ref: "#/components/schemas/RANEnergyConsumptionReductionRatioTarget"
+              - $ref: "#/components/schemas/RANEnergyConsumptionTarget"
               - $ref: "#/components/schemas/RANEnergyEfficiencyTarget"
         expectationContexts:
           type: array
@@ -315,23 +315,21 @@ components:
             - IS_LESS_THAN
         contextValueRange:
           type: number
-    RANEnergyConsumptionReductionRatioTarget:
+    RANEnergyConsumptionTarget:
       description: >-
-        This data type is the "ExpectationTarget" data type with specialisations for RANEnergyConsumptionReductionRatioTarget      
+        This data type is the "ExpectationTarget" data type with specialisations for RANEnergyConsumptionTarget      
       type: object
       properties:
         targetName:
           type: string
           enum:
-            - RANEnergyConsumptionReductionRatio
+            - RANEnergyConsumption
         targetCondition:
           type: string
           enum:
-            - IS_GREATER_THAN
+            - IS_LESS_THAN
         targetValueRange:
           type: integer
-          minimum: 0
-          maximum: 100
     RANEnergyEfficiencyTarget:
       description: >-
         This data type is the "ExpectationTarget" data type with specialisations for RANEnergyEfficiencyTarget       
-- 
GitLab