Commit 16a134f0 authored by sunse's avatar sunse
Browse files

Merge branch 'Rel17_OpenAPI_NRM_adding_ProvMnS_142e' into 'Integration_Rel17_SA5_143_YAML' 

Adding ProvMns for Discovery purpose in EdgeNrm.yaml

See merge request !336
parents ca129dd2 60058731

OpenAPI/5gcNrm.yaml

+11 −0
Original line number Diff line number Diff line
@@ -645,6 +645,16 @@ components: 
        $ref: 'nrNrm.yaml#/components/schemas/Tai' 



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

    ProvMnS:

      oneOf:

        - type: object

          properties:

            SubNetwork:

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

        - type: object

          properties:

            ManagedElement:

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



    SubNetwork-Single:

      allOf:
@@ -2471,6 +2481,7 @@ components: 


    resources-5gcNrm:

      oneOf:

       - $ref: '#/components/schemas/ProvMnS'

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

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

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

OpenAPI/EdgeNRM.yaml

+7 −0
Original line number Diff line number Diff line
@@ -85,6 +85,12 @@ components: 
          type: string



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

    MnS:

      oneOf:

        - type: object

          properties:

            SubNetwork:

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



    SubNetwork-Single:

      allOf:
@@ -234,6 +240,7 @@ components: 


    resources-edgeNrm:

      oneOf:

        - $ref: '#/components/schemas/MnS'

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

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

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

OpenAPI/coslaNrm.yaml

+20 −0
Original line number Diff line number Diff line
@@ -92,6 +92,16 @@ components: 
          $ref: 'nrNrm.yaml#/components/schemas/TaiList'



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

    MnS:

      oneOf:

        - type: object

          properties:

            SubNetwork:

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

        - type: object

          properties:

            ManagedElement:

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



    SubNetwork-Single:

      allOf:
@@ -169,6 +179,15 @@ components: 
                      $ref: 'comDefs.yaml#/components/schemas/Dn' 

                      

#-------- 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
@@ -184,6 +203,7 @@ components: 


    resources-coslaNrm:

      oneOf:

       - $ref: '#/components/schemas/MnS'

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

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

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

OpenAPI/nrNrm.yaml

+13 −0
Original line number Diff line number Diff line
@@ -616,6 +616,17 @@ components: 


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



    MnS:

      oneOf:

        - type: object

          properties:

            SubNetwork:

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

        - type: object

          properties:

            ManagedElement:

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



    SubNetwork-Single:

      allOf:

        - $ref: 'genericNrm.yaml#/components/schemas/Top'
@@ -1994,6 +2005,8 @@ components: 


    resources-nrNrm:

      oneOf:

        - $ref: '#/components/schemas/MnS'

        

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

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

OpenAPI/sliceNrm.yaml

+14 −0
Original line number Diff line number Diff line
@@ -625,6 +625,18 @@ components: 




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



    MnS:

      oneOf:

        - type: object

          properties:

            SubNetwork:

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

#        - type: object

#          properties:

#            ManagedElement:

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



    SubNetwork-Single:

      allOf:

        - $ref: 'genericNrm.yaml#/components/schemas/Top'
@@ -806,6 +818,8 @@ components: 


    resources-sliceNrm:

      oneOf:

       - $ref: '#/components/schemas/MnS'

               

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

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

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