Commit d979cdce authored by shumim's avatar shumim
Browse files

delete uncessary files

parent 49a2d726
Loading
Loading
Loading
Loading
Loading

OpenAPI/28105_training.diff

deleted100644 → 0
+0 −136
Original line number Diff line number Diff line
diff --git a/OpenAPI/TS28105_AiMlNrm_draftCR.yaml b/OpenAPI/TS28105_AiMlNrm_draftCR.yaml
index e13d7fe..b451847 100644
--- a/OpenAPI/TS28105_AiMlNrm_draftCR.yaml
+++ b/OpenAPI/TS28105_AiMlNrm_draftCR.yaml
@@ -27,7 +27,7 @@ components:
       type: string
       enum:
         - NOT_STARTED
-        - TRAINING_IN_PROGRESS
+        - IN_PROGRESS
         - SUSPENDED
         - FINISHED
         - CANCELLED
@@ -45,11 +45,9 @@ components:
         performanceMetric:
           type: string
         performanceScore:
-          type: number
-          format: float
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float'
         decisionConfidenceScore:
-          type: number
-          format: float          
+          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float'         
 
     TrainingProcessMonitor:
       description: >-
@@ -150,8 +148,6 @@ components:
               allOf:
                 - type: object
                   properties:
-                    mLEntityId:
-                      type: string
                     inferenceType:
                       type: string  
                     candidateTrainingDataSource:
@@ -159,8 +155,7 @@ components:
                       items:
                         type: string
                     trainingDataQualityScore:
-                      type: number
-                      format: float
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Float'
                     trainingRequestSource:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                     requestStatus:
@@ -172,9 +167,11 @@ components:
                     cancelRequest:
                       type: boolean
                     suspendRequest:
-                      type: boolean
+                      type: boolean                  
                     mLEntityToTrainRef:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
+                    mLEntityCoordinationGroupToTrainRef:
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
 
     MLTrainingProcess-Single:
       allOf:
@@ -226,18 +223,24 @@ components:
                       type: array
                       items:
                         $ref: '#/components/schemas/ModelPerformance'
+                    modelPerformanceValidation:
+                      type: array
+                      items:
+                        $ref: '#/components/schemas/ModelPerformance'
+                    dataRatioTrainingAndValidation:
+                      type: integer  
                     areNewTrainingDataUsed:
                       type: boolean
                     trainingRequestRef:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
                     trainingProcessRef:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
-                    trainingReportRef:
-                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                     lastTrainingRef:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                     mLEnityGeneratedRef:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
+                    mLEntityCoordinationGroupToTrainRef:
+                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
 
     MLEntity-Single:
       allOf:
@@ -260,7 +263,9 @@ components:
                 runTimeContext:
                   $ref: '#/components/schemas/MLContext'
                 retrainingEventsMonitorRef:
-                  $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ThresholdMonitor-Single'
+                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
+                sourceTrainedMLEntityRef:
+                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
    
 
     MLEntityRepository-Single:
@@ -275,6 +280,21 @@ components:
                   type: string
             MLEntity:
               $ref: '#/components/schemas/MLEntity-Multiple'
+            MLEntityCoordinationGroup-Single:
+              $ref: '#/components/schemas/MLEntityCoordinationGroup-Multiple'
+    
+    MLEntityCoordinationGroup-Single:
+      allOf:
+        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
+        - type: object
+          properties:
+            attributes:
+              type: object
+              properties:
+                memberMLEntityRefList:
+                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'
+            MLEntity:
+              $ref: '#/components/schemas/MLEntity-Multiple'
 
 #-------- Definition of JSON arrays for name-contained IOCs ----------------------
 
@@ -310,7 +330,10 @@ components:
       type: array
       items:
         $ref: '#/components/schemas/MLEntityRepository-Single'
-
+    MLEntityCoordinationGroup-Multiple:
+      type: array
+      items:
+        $ref: '#/components/schemas/MLEntityCoordinationGroup-Single'
 #-------- Definitions in TS 28.104 for TS 28.532 ---------------------------------
 
     resources-AiMlNrm:
@@ -324,3 +347,4 @@ components:
         - $ref: '#/components/schemas/MLTrainingReport-Single'
         - $ref: '#/components/schemas/MLEntity-Single'
         - $ref: '#/components/schemas/MLEntityRepository-Single'
+        - $ref: '#/components/schemas/MLEntityCoordinationGroup-Single'

OpenAPI/MLTestingNRM.diff

deleted100644 → 0
+0 −125
Original line number Diff line number Diff line
diff --git a/OpenAPI/TS28105_AiMlNrm_draftCR.yaml b/OpenAPI/TS28105_AiMlNrm_draftCR.yaml
index fc41e79..b451847 100644
--- a/OpenAPI/TS28105_AiMlNrm_draftCR.yaml
+++ b/OpenAPI/TS28105_AiMlNrm_draftCR.yaml
@@ -99,8 +99,6 @@ components:
               $ref: '#/components/schemas/ManagedElement-Multiple'
             MLTrainingFunction:
               $ref: '#/components/schemas/MLTrainingFunction-Multiple'
-            MLTestingFunction:
-              $ref: '#/components/schemas/MLTestingFunction-Multiple'
             MLEntityRepository:
               $ref: '#/components/schemas/MLEntityRepository-Multiple'
 
@@ -116,8 +114,6 @@ components:
           properties:
             MLTrainingFunction:
               $ref: '#/components/schemas/MLTrainingFunction-Multiple'
-            MLTestingFunction:
-              $ref: '#/components/schemas/MLTestingFunction-Multiple'
             MLEntityRepository:
               $ref: '#/components/schemas/MLEntityRepository-Multiple'
 
@@ -142,7 +138,7 @@ components:
               $ref: '#/components/schemas/MLTrainingProcess-Multiple'
             MLTrainingReport:
               $ref: '#/components/schemas/MLTrainingReport-Multiple'
-    
+
     MLTrainingRequest-Single:
       allOf:
         - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -245,66 +241,6 @@ components:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
                     mLEntityCoordinationGroupToTrainRef:
                       $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
-    
-    MLTestingFunction-Single:
-      allOf:
-        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
-        - type: object
-          properties:
-            attributes:
-              allOf:
-                - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-Attr'
-                - type: object
-                  properties:
-                    mLEntityIdList:
-                      type: array
-                      items:
-                        type: string
-        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'
-        - type: object
-          properties:
-            MLTestingRequest:
-              $ref: '#/components/schemas/MLTestingRequest-Multiple'
-            MLTestingReport:
-              $ref: '#/components/schemas/MLTestingReport-Multiple'
-
-    MLTestingRequest-Single:
-      allOf:
-        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
-        - type: object
-          properties:
-            attributes:
-              allOf:
-                - type: object
-                  properties:
-                    requestStatus:
-                      $ref: '#/components/schemas/RequestStatus'
-                    cancelRequest:
-                      type: boolean
-                    suspendRequest:
-                      type: boolean                  
-                    mLEntityToTestRef:
-                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
-                    mLEntityCoordinationGroupToTestRef:
-                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
-
-    MLTestingReport-Single:
-      allOf:
-        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
-        - type: object
-          properties:
-            attributes:
-              allOf:
-                - type: object
-                  properties:
-                    modelPerformanceTesting:
-                      type: array
-                      items:
-                        $ref: '#/components/schemas/ModelPerformance'
-                    mLTestingResult:
-                      type: string
-                    testingRequestRef:
-                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
 
     MLEntity-Single:
       allOf:
@@ -398,18 +334,6 @@ components:
       type: array
       items:
         $ref: '#/components/schemas/MLEntityCoordinationGroup-Single'
-    MLTestingFunction-Multiple:
-      type: array
-      items:
-        $ref: '#/components/schemas/MLTestingFunction-Single'
-    MLTestingRequest-Multiple:
-      type: array
-      items:
-        $ref: '#/components/schemas/MLTestingRequest-Single'
-    MLTestingReport-Multiple:
-      type: array
-      items:
-        $ref: '#/components/schemas/MLTestingReport-Single'
 #-------- Definitions in TS 28.104 for TS 28.532 ---------------------------------
 
     resources-AiMlNrm:
@@ -424,6 +348,3 @@ components:
         - $ref: '#/components/schemas/MLEntity-Single'
         - $ref: '#/components/schemas/MLEntityRepository-Single'
         - $ref: '#/components/schemas/MLEntityCoordinationGroup-Single'
-        - $ref: '#/components/schemas/MLTestingFunction-Single'
-        - $ref: '#/components/schemas/MLTestingRequest-Single'
-        - $ref: '#/components/schemas/MLTestingReport-Single'
\ No newline at end of file