From e344e2af0d3879b2eda5e6507ed2e058ed54ec48 Mon Sep 17 00:00:00 2001
From: Bertrand Souville <souville@docomolab-euro.com>
Date: Tue, 13 May 2025 16:12:53 +0200
Subject: [PATCH 1/2] Align with SOL(25)150

---
 .../General_Definitions/SOL002_def.yaml       | 54 ++++++++++++++++++-
 1 file changed, 53 insertions(+), 1 deletion(-)

diff --git a/src/SOL002/General_Definitions/SOL002_def.yaml b/src/SOL002/General_Definitions/SOL002_def.yaml
index 531e8af1..191b7bba 100644
--- a/src/SOL002/General_Definitions/SOL002_def.yaml
+++ b/src/SOL002/General_Definitions/SOL002_def.yaml
@@ -269,6 +269,11 @@ definitions:
         type: object
         additionalProperties:
           $ref: "#/definitions/Number"
+      cpuPowerStateRequirements:
+        description: >
+          Requirements of virtual CPU power state configuration data for the OS container resource.
+        $ref: "#/definitions/CpuPowerStateData"
+
   VirtualComputeDescData:
     description: >
       This type represents selected values for capacity related VDU attributes of the virtual compute resource of a VM.
@@ -318,6 +323,53 @@ definitions:
         type: object
         additionalProperties:
           $ref: "#/definitions/Number"
+      cpuPowerStateRequirements:
+        description: >
+          Requirements of virtual CPU power state configuration data for the virtual compute resource.
+        $ref: "#/definitions/CpuPowerStateData"
+
+  CpuPowerStateData:
+    description: >
+      This type provides virtual CPU power state configuration data for the virtual compute or OS container resource.
+
+      * NOTE 1: In case the value of the cpuPowerStateManagementPolicy attribute
+                is "DYNAMIC", dynamic adjustment of CPU power states of logical CPU cores
+                should adhere to the range of CPU P and C states defined in the
+                cpuOperationalPowerStates attribute.
+      * NOTE 2: In case the value of the cpuPowerStateManagementPolicy attribute
+                is "STATIC", the cpuOperationalPowerStates attribute shall contain only
+                one set of CPU P and C states requested for the virtual CPU.
+                If the value of the cpuPowerStateManagementPolicy attribute is
+                "DYNAMIC", multiple CPU P and C states can be defined to indicate the
+                range of allowed P/C state values during dynamic power state management.
+    type: object
+    required:
+      - cpuPowerStateManagementPolicy
+      - cpuOperationalPowerStates
+    properties:
+      cpuPowerStateManagementPolicy:
+        description: >
+          Indicates the policy for CPU power state management.
+          Permitted values:
+            * STATIC
+            * DYNAMIC
+          In case of "STATIC", the virtual CPU cores are requested to be
+          allocated to logical CPU cores according to the
+          cpuOperationalPowerStates attribute.
+          In case of "DYNAMIC", the CPU power states of virtual CPU cores
+          can be allocated to logical CPU cores whose power states can be
+          adjusted dynamically depending on core utilization (see note 1).
+        type: string
+        enum:
+          - STATIC
+          - DYNAMIC
+      cpuOperationalPowerStates:
+        description: >
+          Provides the list of operational power states (i.e., P and C states)
+          defined for the virtual CPU (see note 2).
+        type: array
+        items:
+          $ref: "#/definitions/KeyValuePairs"
 
   VirtualStorageDescData:
     description: >
@@ -1855,4 +1907,4 @@ definitions:
       - MODIFY_INFO
       - CREATE_SNAPSHOT
       - REVERT_TO_SNAPSHOT
-      - CHANGE_VNFPKG
\ No newline at end of file
+      - CHANGE_VNFPKG
-- 
GitLab


From a4860e324229d387a9f3cdb4ff8fa7f4d131fe8b Mon Sep 17 00:00:00 2001
From: Bertrand Souville <souville@docomolab-euro.com>
Date: Fri, 16 May 2025 17:26:06 +0200
Subject: [PATCH 2/2] Refactored to align with SOL(25)150r2

---
 src/SOL002/General_Definitions/SOL002_def.yaml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/SOL002/General_Definitions/SOL002_def.yaml b/src/SOL002/General_Definitions/SOL002_def.yaml
index 191b7bba..5df2825b 100644
--- a/src/SOL002/General_Definitions/SOL002_def.yaml
+++ b/src/SOL002/General_Definitions/SOL002_def.yaml
@@ -345,7 +345,6 @@ definitions:
     type: object
     required:
       - cpuPowerStateManagementPolicy
-      - cpuOperationalPowerStates
     properties:
       cpuPowerStateManagementPolicy:
         description: >
@@ -367,9 +366,7 @@ definitions:
         description: >
           Provides the list of operational power states (i.e., P and C states)
           defined for the virtual CPU (see note 2).
-        type: array
-        items:
-          $ref: "#/definitions/KeyValuePairs"
+        $ref: "#/definitions/KeyValuePairs"
 
   VirtualStorageDescData:
     description: >
-- 
GitLab