Commit b499edad authored by ruiyue's avatar ruiyue
Browse files

Merge branch 'TS28.541_Rel17_CR660_Add_C-SON_CCO_NRM_model_stage3' into... 

Merge branch 'TS28.541_Rel17_CR660_Add_C-SON_CCO_NRM_model_stage3' into 'Integration_Rel17_SA5_141_YAML'

Ts28.541 rel17 cr660 add c son cco nrm model stage3

See merge request !270
parents c222db07 a3eaa17c

OpenAPI/nrNrm.yaml

+64 −2
Original line number Diff line number Diff line
@@ -629,7 +629,13 @@ components: 
        - PRB_DL

        - RRC

        - DRB    



    ParameterRange:

      type: object

      properties:

          maxValue:

            type: integer

          minValue:

            type: integer

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



    RrmPolicy_-Attr:
@@ -685,7 +691,8 @@ components: 
              $ref: '#/components/schemas/RimRSGlobal-Single'

            Dynamic5QISet:

              $ref: '5gcNrm.yaml#/components/schemas/Dynamic5QISet-Multiple'



            CCOFunction:

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

    ManagedElement-Single:

      allOf:

        - $ref: 'genericNrm.yaml#/components/schemas/Top'
@@ -1799,6 +1806,57 @@ components: 
                      $ref: '#/components/schemas/LocalAddress'

                    remoteAddress:

                      $ref: '#/components/schemas/RemoteAddress'

    CCOFunction-Single:

      allOf:

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

        - type: object

          properties:

            attributes:

              type: object

              properties:

                cCOControl:

                  type: boolean

                cCOWeakCoverageParameters:

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

                cCOPilotPollutionParameters:

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

                cCOOvershootCoverageParameters-Single:

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

    CCOParameters-Attr:

      allOf:

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

        - type: object

          properties:

            attributes:

              type: object

              properties:

                coverageShapeList:

                  type: integer

                downlinkTransmitPowerRange:

                  $ref: '#/components/schemas/ParameterRange'

                antennaTiltRange:

                  $ref: '#/components/schemas/ParameterRange'

                antennaAzimuthRange:

                  $ref: '#/components/schemas/ParameterRange'

                digitalTiltRange:

                  $ref: '#/components/schemas/ParameterRange'

                digitalAzimuthRange:

                  $ref: '#/components/schemas/ParameterRange'



    CCOWeakCoverageParameters-Single:

      allOf:

        - $ref: '#/components/schemas/CCOParameters-Attr'

        - type: object



    CCOPilotPollutionParameters-Single:

      allOf:

        - $ref: '#/components/schemas/CCOParameters-Attr'

        - type: object

    

    CCOOvershootCoverageParameters-Single:

      allOf:

        - $ref: '#/components/schemas/CCOParameters-Attr'

        - type: object



#-------- Definition of JSON arrays for name-contained IOCs ----------------------
@@ -2018,3 +2076,7 @@ components: 
        - $ref: '#/components/schemas/EP_NgU-Single'

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

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

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

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

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

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