From 9a098e16107b06c2da52f5a7f2490c48bfba2212 Mon Sep 17 00:00:00 2001
From: sunse <sean.sun@nokia-sbell.com>
Date: Mon, 28 Aug 2023 13:17:55 +0000
Subject: [PATCH] Rel18 TS28.105 CR0023_Modelling_ML_Entity Update
 TS28105_AiMlNrm.yaml

---
 OpenAPI/TS28105_AiMlNrm.yaml | 80 +++++++++++++++++++++++++-----------
 1 file changed, 56 insertions(+), 24 deletions(-)

diff --git a/OpenAPI/TS28105_AiMlNrm.yaml b/OpenAPI/TS28105_AiMlNrm.yaml
index 2ceebaf61..01e8014e7 100644
--- a/OpenAPI/TS28105_AiMlNrm.yaml
+++ b/OpenAPI/TS28105_AiMlNrm.yaml
@@ -15,27 +15,6 @@ components:
 
 #-------- Definition of types-----------------------------------------------------
 
-    MLEntityList:
-      type: array
-      items:
-        $ref: '#/components/schemas/MLEntity'
-
-    MLEntity:
-      type: object
-      properties:
-        mLEntityId:
-          type: string
-        inferenceType:
-          type: string
-        mLEntityVersion:
-          type: string
-        expectedRunTimeContext:
-          $ref: '#/components/schemas/MLContext'
-        trainingContext:
-          $ref: '#/components/schemas/MLContext'
-        runTimeContext:
-          $ref: '#/components/schemas/MLContext'
-
     MLContext:
       type: object
       properties:
@@ -122,6 +101,8 @@ components:
               $ref: '#/components/schemas/ManagedElement-Multiple'
             MLTrainingFunction:
               $ref: '#/components/schemas/MLTrainingFunction-Multiple'
+            MLEntityRepository:
+              $ref: '#/components/schemas/MLEntityRepository-Multiple'
 
     ManagedElement-Single:
       allOf:
@@ -135,6 +116,8 @@ components:
           properties:
             MLTrainingFunction:
               $ref: '#/components/schemas/MLTrainingFunction-Multiple'
+            MLEntityRepository:
+              $ref: '#/components/schemas/MLEntityRepository-Multiple'
 
     MLTrainingFunction-Single:
       allOf:
@@ -146,8 +129,8 @@ components:
                 - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr'
                 - type: object
                   properties:
-                    mLEntityList:
-                      $ref: '#/components/schemas/MLEntityList'
+                    mLEntityRepositoryRef:
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
@@ -169,6 +152,8 @@ components:
                   properties:
                     mLEntityId:
                       type: string
+                    inferenceType:
+                      type: string  
                     candidateTrainingDataSource:
                       type: array
                       items:
@@ -188,6 +173,8 @@ components:
                       type: boolean
                     suspendRequest:
                       type: boolean
+                    mLEntityToTrainRef:
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
 
     MLTrainingProcess-Single:
       allOf:
@@ -249,6 +236,42 @@ components:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                     lastTrainingRef:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
+                    mLEnityGeneratedRef:
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
+
+    MLEntity-Single:
+      allOf:
+        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
+        - type: object
+          properties:
+            attributes:
+              type: object
+              properties:
+                mLEntityId:
+                  type: string
+                inferenceType:
+                  type: string
+                mLEntityVersion:
+                  type: string
+                expectedRunTimeContext:
+                  $ref: '#/components/schemas/MLContext'
+                trainingContext:
+                  $ref: '#/components/schemas/MLContext'
+                runTimeContext:
+                  $ref: '#/components/schemas/MLContext'   
+
+    MLEntityRepository-Single:
+      allOf:
+        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
+        - type: object
+          properties:
+            attributes:
+              type: object
+              properties:
+                mLRepositoryId:
+                  type: string
+            MLEntity:
+              $ref: '#/components/schemas/MLEntity-Multiple'
 
 #-------- Definition of JSON arrays for name-contained IOCs ----------------------
 
@@ -276,7 +299,14 @@ components:
       type: array
       items:
         $ref: '#/components/schemas/MLTrainingReport-Single'
-
+    MLEntity-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/MLEntity-Single'
+    MLEntityRepository-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/MLEntityRepository-Single'
 
 #-------- Definitions in TS 28.104 for TS 28.532 ---------------------------------
 
@@ -289,3 +319,5 @@ components:
         - $ref: '#/components/schemas/MLTrainingRequest-Single'
         - $ref: '#/components/schemas/MLTrainingProcess-Single'
         - $ref: '#/components/schemas/MLTrainingReport-Single'
+        - $ref: '#/components/schemas/MLEntity-Single'
+        - $ref: '#/components/schemas/MLEntityRepository-Single'
-- 
GitLab