Commit 0b1ca862 authored by sunse's avatar sunse
Browse files

Merge branch... 

Merge branch 'Rel18_correction_to_Schema_definition_Issues_for_SubNetwork_and_ManagedElement_of_OpenAPI_SS' into 'Integration_Rel18_SA5_153_YAML'

Rel18 correction to schema definition issues for sub network and managed element of open api ss (TS28.104 CR0078, TS28.105 CR0073, TS28.312 CR0202, TS28.536 CR0066, TS28.538 CR0056, TS28.541 CR1140, TS28.623 CR0307)

See merge request !979
parents f6fb58f2 faca166e

OpenAPI/TS28104_MdaNrm.yaml

+14 −46
Original line number Diff line number Diff line
@@ -106,45 +106,25 @@ components: 
              format: float

              minimum: 0



#-------- Definition of abstract IOCs --------------------------------------------







#-------- Definition of concrete IOCs --------------------------------------------



    SubNetwork-Single:

      allOf:

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'

        - type: object

          properties:

            attributes:

              $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-Attr'

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-ncO'

        - type: object

#-------- Definition of types for name-containments ------

    SubNetwork-ncO-MdaNrm:

      type: object

      properties:

            SubNetwork:

              $ref: '#/components/schemas/SubNetwork-Multiple'

            ManagedElement:

              $ref: '#/components/schemas/ManagedElement-Multiple'

        MDAFunction:

          $ref: '#/components/schemas/MDAFunction-Multiple'

        MDAReport:

          $ref: '#/components/schemas/MDAReport-Multiple'





    ManagedElement-Single:

      allOf:

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'

        - type: object

          properties:

            attributes:

              $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedElement-Attr'

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedElement-ncO'

        - type: object

    ManagedElement-ncO-MdaNrm:

      type: object

      properties:

        MDAFunction:

          $ref: '#/components/schemas/MDAFunction-Multiple'

#-------- Definition of abstract IOCs --------------------------------------------







#-------- Definition of concrete IOCs --------------------------------------------

    MDAFunction-Single:

      allOf:

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -190,15 +170,6 @@ components: 




#-------- Definition of JSON arrays for name-contained IOCs ----------------------



    SubNetwork-Multiple:

      type: array

      items:

        $ref: '#/components/schemas/SubNetwork-Single'

    ManagedElement-Multiple:

      type: array

      items:

        $ref: '#/components/schemas/ManagedElement-Single'

    MDAFunction-Multiple:

      type: array

      items:
@@ -217,9 +188,6 @@ components: 


    resources-mdaNrm:

      oneOf:

        - $ref: '#/components/schemas/SubNetwork-Single'

        - $ref: '#/components/schemas/ManagedElement-Single'



        - $ref: '#/components/schemas/MDAFunction-Single'

        - $ref: '#/components/schemas/MDARequest-Single'

        - $ref: '#/components/schemas/MDAReport-Single'

OpenAPI/TS28105_AiMlNrm.yaml

+17 −45
Original line number Diff line number Diff line
@@ -79,46 +79,29 @@ components: 
        resultStateInfo:

          type: string



#-------- Definition of abstract IOCs --------------------------------------------







#-------- Definition of concrete IOCs --------------------------------------------



    SubNetwork-Single:

      allOf:

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'

        - type: object

          properties:

            attributes:

              $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-Attr'

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-ncO'

        - type: object

#-------- Definition of types for name-containments ------

    SubNetwork-ncO-AiMlNrm:

      type: object

      properties:

            SubNetwork:

              $ref: '#/components/schemas/SubNetwork-Multiple'

            ManagedElement:

              $ref: '#/components/schemas/ManagedElement-Multiple'

        MLTrainingFunction:

          $ref: '#/components/schemas/MLTrainingFunction-Multiple'

        MLEntityRepository:

          $ref: '#/components/schemas/MLEntityRepository-Multiple'



    ManagedElement-Single:

      allOf:

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'

        - type: object

          properties:

            attributes:

              $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedElement-Attr'

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedElement-ncO'

        - type: object

    ManagedElement-ncO-AiMlNrm:

      type: object

      properties:

        MLTrainingFunction:

          $ref: '#/components/schemas/MLTrainingFunction-Multiple'

        MLEntityRepository:

          $ref: '#/components/schemas/MLEntityRepository-Multiple' 



#-------- Definition of abstract IOCs --------------------------------------------







#-------- Definition of concrete IOCs --------------------------------------------



    MLTrainingFunction-Single:

      allOf:

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -277,14 +260,6 @@ components: 


#-------- Definition of JSON arrays for name-contained IOCs ----------------------



    SubNetwork-Multiple:

      type: array

      items:

        $ref: '#/components/schemas/SubNetwork-Single'

    ManagedElement-Multiple:

      type: array

      items:

        $ref: '#/components/schemas/ManagedElement-Single'

    MLTrainingFunction-Multiple:

      type: array

      items:
@@ -314,9 +289,6 @@ components: 


    resources-AiMlNrm:

      oneOf:

        - $ref: '#/components/schemas/SubNetwork-Single'

        - $ref: '#/components/schemas/ManagedElement-Single'



        - $ref: '#/components/schemas/MLTrainingFunction-Single'

        - $ref: '#/components/schemas/MLTrainingRequest-Single'

        - $ref: '#/components/schemas/MLTrainingProcess-Single'

OpenAPI/TS28312_IntentNrm.yaml

+7 −21
Original line number Diff line number Diff line
@@ -13,23 +13,15 @@ paths: {} 
components:

  schemas:



   #-------Definition of generic IOCs ----------#  



    SubNetwork-Single:  

      allOf:

      - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'

      - type: object

        properties:

          attributes:

            $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-Attr'

      - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-ncO'

      - type: object

  #-------- Definition of types for name-containments ------

    SubNetwork-ncO-IntentNrm:

      type: object

      properties:

          SubNetwork:

            $ref: '#/components/schemas/SubNetwork-Multiple'

        IntentHandlingFunction:

          $ref: '#/components/schemas/IntentHandlingFunction-Multiple'

       

   #-------Definition of generic IOCs ----------#  



    Intent-Single:

      description: >-

        This IOC represents the properties of an Intent driven management information between MnS consumer and MnS producer.
@@ -441,11 +433,6 @@ components: 


   #------Definition of JSON arrays for name-contained IOCs ---------------#



    SubNetwork-Multiple:

      type: array

      items:

        $ref: '#/components/schemas/SubNetwork-Single'

                                

    Intent-Multiple:

      type: array

      items:
@@ -467,7 +454,6 @@ components: 
   #----- Definitions in TS 28.312 for TS 28.532 --------------------------#

    resources-intentNrm:

      oneOf:

       - $ref: '#/components/schemas/SubNetwork-Single'

       - $ref: '#/components/schemas/IntentHandlingFunction-Single'       

       - $ref: '#/components/schemas/Intent-Single'

       - $ref: '#/components/schemas/IntentReport-Single'

OpenAPI/TS28317_RanScNrm.yaml

+10 −22
Original line number Diff line number Diff line
@@ -13,24 +13,17 @@ paths: {} 
components:

  schemas:

       

#-------Definition of IOCs ----------# 

    SubNetwork-Single:

      allOf:

      - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'

      - type: object

        properties:

          attributes:

            $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-Attr'

      - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-ncO'

      - type: object

#-------- Definition of types for name-containments ------

    SubNetwork-ncO-RanScNrm:

      type: object

      properties:

          SubNetwork:

            $ref: '#/components/schemas/SubNetwork-Multiple'

        ScMgmtProfile:

          $ref: '#/components/schemas/ScMgmtProfile-Multiple'

        Sc_Process:

          $ref: '#/components/schemas/Sc_Process-Multiple'



#-------Definition of IOCs ----------# 



    ScMgmtProfile-Single:

      description: >-

        The ScMgmtProfile represents MnS Consumer's requirements for self-configuration management
@@ -150,10 +143,6 @@ components: 
#-------Definition of Data types ----------#  



#------Definition of JSON arrays for name-contained IOCs ---------------#

    SubNetwork-Multiple:

      type: array

      items:

        $ref: '#/components/schemas/SubNetwork-Single'

    ScMgmtProfile-Multiple:

      type: array

      items:
@@ -168,7 +157,6 @@ components: 
#----- Definitions in TS 28.317 for TS 28.532 --------------------------#

    resources-RanScNrm:

      oneOf:

       - $ref: '#/components/schemas/SubNetwork-Single'

       - $ref: '#/components/schemas/ScMgmtProfile-Single'

       - $ref: '#/components/schemas/Sc_Process-Single'

OpenAPI/TS28536_CoslaNrm.yaml

+20 −42
Original line number Diff line number Diff line
@@ -126,45 +126,34 @@ components: 
        taiList:

          $ref: 'TS28541_NrNrm.yaml#/components/schemas/TaiList'



#-------- Definition of concrete IOCs --------------------------------------------

    MnS:

      oneOf:

        - type: object

          properties:

            SubNetwork:

              $ref: '#/components/schemas/SubNetwork-Multiple'

        - type: object

#-------- Definition of types for name-containments ------

    SubNetwork-ncO-CoslaNrm:

      type: object

      properties:

            ManagedElement:

              $ref: '#/components/schemas/ManagedElement-Multiple'

        AssuranceClosedControlLoop:

          $ref: '#/components/schemas/AssuranceClosedControlLoop-Multiple'

 

    SubNetwork-Single:

      allOf:

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'

        - type: object

          properties:

            attributes:

              allOf:

                - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-Attr'

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/SubNetwork-ncO'

        - type: object

    ManagedElement-ncO-CoslaNrm:

      type: object

      properties:

        AssuranceClosedControlLoop:

          $ref: '#/components/schemas/AssuranceClosedControlLoop-Multiple'



    ManagedElement-Single:

      allOf:

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'

#-------- Definition of concrete IOCs --------------------------------------------

    MnS:

      oneOf:

        - type: object

          properties:

            attributes:

              allOf:

                - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedElement-Attr'

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedElement-ncO'

            SubNetwork:

              type: array

              items:

                $ref: '#/components/schemas/SubNetwork-ncO-CoslaNrm'

        - type: object

          properties:

            AssuranceClosedControlLoop:

              $ref: '#/components/schemas/AssuranceClosedControlLoop-Multiple'

            ManagedElement:

              type: array

              items:

                $ref: '#/components/schemas/ManagedElement-ncO-CoslaNrm'



    AssuranceClosedControlLoop-Single:

      allOf:
@@ -222,15 +211,6 @@ components: 
                      $ref: '#/components/schemas/AssuranceGoalStatusList'



#-------- Definition of JSON arrays for name-contained IOCs ----------------------

    SubNetwork-Multiple:

      type: array

      items:

        $ref: '#/components/schemas/SubNetwork-Single'



    ManagedElement-Multiple:

      type: array

      items:

        $ref: '#/components/schemas/ManagedElement-Single'

                               

    AssuranceClosedControlLoop-Multiple:

      type: array
@@ -250,5 +230,3 @@ components: 
       - $ref: '#/components/schemas/AssuranceClosedControlLoop-Single'

       - $ref: '#/components/schemas/AssuranceGoal-Single'    

       - $ref: '#/components/schemas/AssuranceReport-Single'
 
       - $ref: '#/components/schemas/SubNetwork-Single'

       - $ref: '#/components/schemas/ManagedElement-Single'