From 938bf7f1b4d2cd55044ce6a580478838547baa0c Mon Sep 17 00:00:00 2001
From: ruiyue <xuruiyue@huawei.com>
Date: Tue, 5 Nov 2024 13:35:46 +0000
Subject: [PATCH] Update 2 files

- /OpenAPI/TS28104_MdaNrm.yaml
- /OpenAPI/TS28105_AiMlNrm.yaml
---
 OpenAPI/TS28104_MdaNrm.yaml  | 22 ++++++++++++++++++++--
 OpenAPI/TS28105_AiMlNrm.yaml | 29 +++++++++++++++++++++--------
 2 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/OpenAPI/TS28104_MdaNrm.yaml b/OpenAPI/TS28104_MdaNrm.yaml
index ffe182c4f..806452fff 100644
--- a/OpenAPI/TS28104_MdaNrm.yaml
+++ b/OpenAPI/TS28104_MdaNrm.yaml
@@ -14,13 +14,31 @@ 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
       uniqueItems: true
       items:
-        type: string
-        readOnly: true
+        $ref: '#/components/schemas/MDAType'
 
     MDAOutputs:
       type: array
diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml
index 6a2840c71..33d7b4c24 100644
--- a/OpenAPI/TS28105_AiMlNrm.yaml
+++ b/OpenAPI/TS28105_AiMlNrm.yaml
@@ -120,8 +120,7 @@ components:
       type: object
       properties:
         aIMLInferenceName:
-          type: string
-          readOnly: true 
+          $ref: '#/components/schemas/AIMLInferenceName'
         capabilityName:
           type: string
           readOnly: true 
@@ -159,7 +158,7 @@ components:
             type: string
             readOnly: true
         aIMLInferenceName:
-          type: string
+          $ref: '#/components/schemas/AIMLInferenceName'
           readOnly: true
         inferenceOutputTime:
           type: array
@@ -172,6 +171,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/NwdafAnalyticsType'
+        - $ref: '#/components/schemas/NgRanInferenceType'
+        - $ref: '#/components/schemas/VSExtensionType' 
+    NwdafAnalyticsType:
+      $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:
@@ -246,8 +261,7 @@ components:
                 - type: object
                   properties:
                     aIMLInferenceName:
-                      type: string
-                      readOnly: true  
+                      $ref: '#/components/schemas/AIMLInferenceName' 
                     candidateTrainingDataSource:
                       type: array
                       uniqueItems: true
@@ -444,7 +458,7 @@ components:
                 - type: object
                   properties:
                     aIMLInferenceName:
-                      type: string
+                      $ref: '#/components/schemas/AIMLInferenceName'
                     policyForLoading:
                       $ref: '#/components/schemas/AIMLManagementPolicy'
                     mLModelRef:
@@ -486,8 +500,7 @@ components:
                   type: string
                   readOnly: true
                 aIMLInferenceName:
-                  type: string
-                  readOnly: true
+                  $ref: '#/components/schemas/AIMLInferenceName'
                 mLModelVersion:
                   type: string
                   readOnly: true
-- 
GitLab