Commit a2a8a0b6 authored by sunse's avatar sunse
Browse files

Merge branch 'Rel18_Introducing_Nrm_root_to_Generic_NRM_and_removing_MnS_root'... 

Merge branch 'Rel18_Introducing_Nrm_root_to_Generic_NRM_and_removing_MnS_root' into 'Integration_Rel18_SA5_155_YAML'

Rel18 (TS28.536 CR0076, TS28.538 CR0077, TS28.541 CR1247, TS28.623 CR0354, TS28.318 CR0004) introducing NrmRoot and removing MnS root

See merge request !1125
parents 7a3c9a46 1eaf2bf2

OpenAPI/TS28318_DsoNrm.yaml

+0 −10
Original line number Diff line number Diff line
@@ -25,15 +25,6 @@ components: 




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

    MnS:

      oneOf:

        - type: object

          properties:

            SubNetwork:

              type: array

              items: 

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



    SubNetwork-ncO-DsoNrm:

      type: object

      properties:
@@ -92,6 +83,5 @@ components: 


    resources-DSORecovery:

      oneOf:

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

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

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

OpenAPI/TS28536_CoslaNrm.yaml

+0 −16
Original line number Diff line number Diff line
@@ -140,21 +140,6 @@ components: 
          $ref: '#/components/schemas/AssuranceClosedControlLoop-Multiple'



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

    MnS:

      oneOf:

        - type: object

          properties:

            SubNetwork:

              type: array

              items:

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

        - type: object

          properties:

            ManagedElement:

              type: array

              items:

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



    AssuranceClosedControlLoop-Single:

      allOf:

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -226,7 +211,6 @@ components: 


    resources-coslaNrm:

      oneOf:

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

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

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

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

OpenAPI/TS28538_EdgeNrm.yaml

+0 −9
Original line number Diff line number Diff line
@@ -158,14 +158,6 @@ components: 
          $ref: '#/components/schemas/EdgeDataNetwork-Multiple'



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

    MnS:

      oneOf:

        - type: object

          properties:

            SubNetwork:

              type: array

              items:

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



    EdgeDataNetwork-Single:

      allOf:
@@ -415,7 +407,6 @@ components: 


    resources-edgeNrm:

      oneOf:

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

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

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

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

OpenAPI/TS28541_5GcNrm.yaml

+0 −16
Original line number Diff line number Diff line
@@ -3021,21 +3021,6 @@ components: 
          $ref: '#/components/schemas/MnpfFunction-Multiple'



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

    MnS:

      oneOf:

        - type: object

          properties:

            SubNetwork:

              type: array

              items:

                $ref: '#/components/schemas/SubNetwork-ncO-5GcNrm'

        - type: object

          properties:

            ManagedElement:

              type: array

              items:

                $ref: '#/components/schemas/ManagedElement-ncO-5GcNrm'



    AmfFunction-Single:

      allOf:

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -5767,7 +5752,6 @@ components: 


    resources-5gcNrm:

      oneOf:

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

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

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

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

OpenAPI/TS28541_NrNrm.yaml

+0 −17
Original line number Diff line number Diff line
@@ -784,21 +784,6 @@ components: 


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



    MnS:

      oneOf:

        - type: object

          properties:

            SubNetwork:

              type: array

              items:

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

        - type: object

          properties:

            ManagedElement:

              type: array

              items:

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



    GnbDuFunction-Single:

      allOf:

        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Top'
@@ -2189,8 +2174,6 @@ components: 


    resources-nrNrm:

      oneOf:

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



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

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

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