From 350d42212e3b16725187fc9129f6a83e99442731 Mon Sep 17 00:00:00 2001
From: ruiyue <xuruiyue@huawei.com>
Date: Tue, 5 Nov 2024 05:14:33 +0000
Subject: [PATCH 1/3] Update file TS28104_MdaNrm.yaml

---
 OpenAPI/TS28104_MdaNrm.yaml | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml
index f9f405cde..7803c3d6d 100644
--- a/OpenAPI/TS28104_MdaNrm.yaml
+++ b/OpenAPI/TS28104_MdaNrm.yaml
@@ -14,11 +14,29 @@ components:
   schemas:
 
 #-------- Definition of types-----------------------------------------------------
-
+    MDAType:
+      type: string
+      enum:
+        - COVERAGEANALYTICS_COVERAGEPROBLEMANALYSIS
+        - COVERAGEANALYTICS_PAGINGOPTIMIZATION
+        - SLSANALYSIS_SERVICEEXPERIENCEANALYSIS
+        - SLSANALYSIS_NETWORKSLICETHROUGHPUTANALYSIS
+        - SLSANALYSIS_NETWORKSLICETRAFFICANALYSIS
+        - SLSANALYSIS_E2ELATENCYANALYSIS
+        - SLSANALYSIS_NETWORKSLICELOADANALYSIS
+        - MDAASSISTEDFAULTMANAGEMENT_FAILUREPREDICTION
+        - MDAASSISTEDENERGYSAVING_ENERGYSAVINGANALYSIS
+        - MOBILITYMANAGEMENTANALYTICS_MOBILITYPERFORMANCEANALYSIS
+        - MOBILITYMANAGEMENTANALYTICS_HANDOVEROPTIMIZATION
+        - MAINTENANCE_MAINTENANCEANALYTICS
+        - RESOURCEANALYTICS_VIRTUALIZEDRESOURCEUTILIZATIONANALYSISNF
+        - RESOURCEANALYTICS_PHYISCALRESOURCEUTILIZATIONANALYSISNF
+        - RESOURCEANALYTICS_5GCCONTROLPLANECONGESTIONANALYSIS
+        - PREDICTIONS_PMDATA
     MDATypes:
       type: array
       items:
-        type: string
+        $ref: '#/components/schemas/MDAType'
 
     MDAOutputs:
       type: array
-- 
GitLab


From 3477df378af28127c02d3cc632cb22801a651d81 Mon Sep 17 00:00:00 2001
From: ruiyue <xuruiyue@huawei.com>
Date: Tue, 5 Nov 2024 05:25:54 +0000
Subject: [PATCH 2/3] Update file TS28105_AiMlNrm.yaml

---
 OpenAPI/TS28105_AiMlNrm.yaml | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml
index 47d3a1f84..8abff4122 100644
--- a/OpenAPI/TS28105_AiMlNrm.yaml
+++ b/OpenAPI/TS28105_AiMlNrm.yaml
@@ -110,7 +110,7 @@ components:
       type: object
       properties:
         aIMLInferenceName:
-          type: string
+          $ref: '#/components/schemas/AIMLInferenceName'
         capabilityName:
           type: string
         mLCapabilityParameters:
@@ -141,7 +141,7 @@ components:
           items:
             type: string
         aIMLInferenceName:
-          type: string
+          $ref: '#/components/schemas/AIMLInferenceName'
         inferenceOutputTime:
           type: array
           items:
@@ -152,7 +152,22 @@ components:
         outputResult:
           description: A map (list of key-value pairs) for Inference result name and it's value
           $ref: 'TS28623_ComDefs.yaml#/components/schemas/AttributeNameValuePairSet'
-          
+    AIMLInferenceName:
+      oneOf:
+        - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/MDAType'
+        - $ref: '#/components/schemas/NwdafAnalyticsID'
+        - $ref: '#/components/schemas/NgRanInferenceType'
+        - $ref: '#/components/schemas/VSExtensionType' 
+    NwdafAnalyticsID:
+      $ref: 'TS29520_Nnwdaf_EventsSubscription.yaml#/components/schemas/NwdafEvent'
+    NgRanInferenceType:
+      type: string
+      enum:
+        - NG_RAN_NETWORK_ENERGY_SAVING
+        - NG_RAN_LOAD_BALANCING 
+        - NG_RAN_ MOBILITY_OPTIMIZATION
+    VSExtensionType:
+      type: string
 #-------- Definition of types for name-containments ------
     SubNetwork-ncO-AiMlNrm:
       type: object
@@ -226,7 +241,7 @@ components:
                 - type: object
                   properties:
                     aIMLInferenceName:
-                      type: string  
+                      $ref: '#/components/schemas/AIMLInferenceName'  
                     candidateTrainingDataSource:
                       type: array
                       items:
@@ -406,7 +421,7 @@ components:
                 - type: object
                   properties:
                     aIMLInferenceName:
-                      type: string
+                      $ref: '#/components/schemas/AIMLInferenceName'
                     policyForLoading:
                       $ref: '#/components/schemas/AIMLManagementPolicy'
                     mLModelRef:
@@ -445,7 +460,7 @@ components:
                 mLModelId:
                   type: string
                 aIMLInferenceName:
-                  type: string
+                  $ref: '#/components/schemas/AIMLInferenceName'
                 mLModelVersion:
                   type: string
                 expectedRunTimeContext:
-- 
GitLab


From b95d46754ffa8cf297eabcb17d864193f3ec283c Mon Sep 17 00:00:00 2001
From: ruiyue <xuruiyue@huawei.com>
Date: Tue, 5 Nov 2024 05:33:43 +0000
Subject: [PATCH 3/3] Update file TS28105_AiMlNrm.yaml

---
 OpenAPI/TS28105_AiMlNrm.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml
index 8abff4122..abe9fd0e2 100644
--- a/OpenAPI/TS28105_AiMlNrm.yaml
+++ b/OpenAPI/TS28105_AiMlNrm.yaml
@@ -155,10 +155,10 @@ components:
     AIMLInferenceName:
       oneOf:
         - $ref: 'TS28104_MdaNrm.yaml#/components/schemas/MDAType'
-        - $ref: '#/components/schemas/NwdafAnalyticsID'
+        - $ref: '#/components/schemas/NwdafAnalyticsType'
         - $ref: '#/components/schemas/NgRanInferenceType'
         - $ref: '#/components/schemas/VSExtensionType' 
-    NwdafAnalyticsID:
+    NwdafAnalyticsType:
       $ref: 'TS29520_Nnwdaf_EventsSubscription.yaml#/components/schemas/NwdafEvent'
     NgRanInferenceType:
       type: string
-- 
GitLab