Commit 68036630 authored by sunse's avatar sunse
Browse files

Merge branch 'Rel16_OpenAPI_NRM_adding_MnS_142e' into 'Integration_Rel16_SA5_143_YAML' 

Adding ProvMns for discovery purpose

See merge request sa5/MnS!335
parents 56522fdd be4e3004

OpenAPI/5gcNrm.yaml

+12 −0
Original line number Diff line number Diff line
@@ -442,6 +442,16 @@ 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:
@@ -1918,6 +1928,8 @@ components: 


    resources-5gcNrm:

      oneOf:

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

       

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

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

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

OpenAPI/coslaNrm.yaml

+20 −0
Original line number Diff line number Diff line
@@ -58,6 +58,16 @@ 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:
@@ -131,6 +141,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
@@ -146,6 +165,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
@@ -573,6 +573,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'
@@ -1819,6 +1830,8 @@ components: 


    resources-nrNrm:

      oneOf:

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



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

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

OpenAPI/sliceNrm.yaml

+13 −0
Original line number Diff line number Diff line
@@ -304,6 +304,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'
@@ -410,6 +421,8 @@ components: 


    resources-sliceNrm:

      oneOf:

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



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

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

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