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

Merge branch... 

Merge branch 'Rel_19_CR_TS_28.541_update_the_naming_convention_in_TS28541_NrNrm_yaml_to_align_with_stage_2_definition' into 'Integration_Rel19_SA5_160_YAML'

Rel_19_CR1500_TS_28.541_update_the_naming_convention_in_TS28541_NrNrm_yaml_to_align_with_stage_2_definition

See merge request !1669
parents 7e4a2f47 b7ab5832

OpenAPI/TS28541_NrNrm.yaml

+124 −119
Original line number Diff line number Diff line
@@ -73,13 +73,13 @@ components: 
      items:

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

      minItems: 1

    NpnIdentityList:

    NPNIdentityList:

      type: array

      uniqueItems: true

      items:

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

      minItems: 1

    GGnbId:

    GgNBId:

      type: object

      properties:

        plmnId:
@@ -88,7 +88,7 @@ components: 
          $ref: '#/components/schemas/GnbIdLength'

        gnbId:

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

    GEnbId:

    GeNBId:

      type: object

      properties:

        plmnId:
@@ -98,24 +98,24 @@ components: 
          minimum: 0

          maximum: 4194303



    GGnbIdList:

    GgNBIdList:

        type: array

        uniqueItems: true

        items: 

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

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



    GEnbIdList:

    GeNBIdList:

        type: array

        uniqueItems: true

        items: 

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

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



    NrPci:

      type: integer

      maximum: 503

    NrTac:

    NRTAC:

      $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac'

    NrTacList:

    NRTACList:

      type: array

      uniqueItems: true

      items:
@@ -294,18 +294,18 @@ components: 
        - NO

        - PARTIAL

        - FULL

    RrmPolicyMember:

    RRMPolicyMember:

      type: object

      properties:

        plmnId:

          $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'

        snssai:

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

    RrmPolicyMemberList:

    RRMPolicyMemberList:

      type: array

      uniqueItems: true

      items:

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

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

      minItems: 1

    AddressWithVlan:

      type: object
@@ -610,6 +610,11 @@ components: 
            type: integer

          minValue:

            type: integer

    NTNTAClist:

      type: array

      uniqueItems: true

      items:

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

    Ephemeris:

      type: object

      oneOf:
@@ -767,12 +772,12 @@ components: 
      properties:

        NRFrequency:

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

        ExternalGnbCuCpFunction:

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

        ExternalGnbCuUpFunction:

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

        ExternalGnbDuFunction:

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

        ExternalGNBCUCPFunction:

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

        ExternalGNBCUUPFunction:

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

        ExternalGNBDUFunction:

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

        ExternalENBFunction:

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

        EUtranFrequency:
@@ -809,12 +814,12 @@ components: 
    ManagedElement-ncO-NrNrm:

      type: object

      properties:

        GnbDuFunction:

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

        GnbCuUpFunction:

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

        GnbCuCpFunction:

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

        GNBDUFunction:

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

        GNBCUUPFunction:

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

        GNBCUCPFunction:

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

        DESManagementFunction:

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

        DRACHOptimizationFunction:
@@ -842,17 +847,17 @@ components: 


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



    RrmPolicy_-Attr:

    RRMPolicy_-Attr:

      type: object

      properties:

        resourceType:

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

        rRMPolicyMemberList:

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

        RRMPolicyMemberList:

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



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



    GnbDuFunction-Single:

    GNBDUFunction-Single:

      allOf:

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

        - type: object
@@ -885,12 +890,12 @@ components: 
          properties:

            RRMPolicyRatio:

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

            NrCellDu:

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

            Bwp-Multiple:

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

            NrSectorCarrier-Multiple:

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

            NRCellDU:

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

            BWP-Multiple:

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

            NRSectorCarrier-Multiple:

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

            EP_F1C:

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

            EP_F1U:
@@ -898,7 +903,7 @@ components: 
            DRACHOptimizationFunction:

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

            OperatorDU:

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

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

            BWPSet:

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

            Configurable5QISet:
@@ -906,7 +911,7 @@ components: 
            Dynamic5QISet:

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



    OperatorDu-Single:

    OperatorDU-Single:

      allOf:

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

        - type: object
@@ -927,9 +932,9 @@ components: 
            dynamic5QISetRef:

              description: This attribute is condition optional. The condition is NG-RAN Multi-Operator Core Network (NG-RAN MOCN) network sharing with operator specific 5QI is supported.            

              $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnRo'

            NrOperatorCellDu:

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

    GnbCuUpFunction-Single:

            NROperatorCellDU:

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

    GNBCUUPFunction-Single:

      allOf:

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

        - type: object
@@ -949,7 +954,7 @@ components: 
                      type: boolean

                    onboardSatelliteId:

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

                    plmnInfoList:

                    PlmnInfoList:

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

                    configurable5QISetRef:

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'
@@ -977,7 +982,7 @@ components: 
            Dynamic5QISet:

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



    GnbCuCpFunction-Single:

    GNBCUCPFunction-Single:

      allOf:

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

        - type: object
@@ -996,17 +1001,17 @@ components: 
                    plmnId:

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/PlmnId'

                    x2BlockList:

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

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

                    xnBlockList:

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

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

                    x2AllowList:

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

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

                    xnAllowList:

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

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

                    x2HOBlockList:

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

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

                    xnHOBlockList:

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

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

                    mappingSetIDBackhaulAddressList:

                      type: array

                      uniqueItems: true
@@ -1044,8 +1049,8 @@ components: 
          properties:

            RRMPolicyRatio:

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

            NrCellCu:

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

            NRCellCU:

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

            EP_XnC:

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

            EP_E1:
@@ -1073,7 +1078,7 @@ components: 
            EUtranNetwork:  

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



    NrCellCu-Single:

    NRCellCU-Single:

      allOf:

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

        - type: object
@@ -1113,7 +1118,7 @@ components: 
            DPCIConfigurationFunction:

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



    NrCellDu-Single:

    NRCellDU-Single:

      allOf:

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

        - type: object
@@ -1131,13 +1136,13 @@ components: 
                      type: integer

                    cellState:

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

                    plmnInfoList:

                    plmnInfoInfoList:

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

                    npnIdentityList:

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

                    nPNIdentityList:

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

                    nrPci:

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

                    nrTac:

                    nRTAC:

                      $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac'

                    arfcnDL:

                      type: integer
@@ -1173,18 +1178,18 @@ components: 
                        enum:

                          - REDCAP_1RX

                          - REDCAP_2RX 

                    nrSectorCarrierRef:

                    nRSectorCarrierRef:

                      type: array

                      uniqueItems: true

                      items:

                        $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

                    bwpRef:

                    bWPRef:

                      description: "Condition is BWP sets are not supported"                      

                      type: array

                      uniqueItems: true

                      items:

                        $ref: 'TS28623_ComDefs.yaml#/components/schemas/Dn'

                    bwpSetRef:

                    bWPSetRef:

                      description: "Condition is BWP sets are supported"

                      $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnList'                    

                    rimRSMonitoringStartTime:
@@ -1230,7 +1235,7 @@ components: 
              maxItems: 12      





    NrOperatorCellDu-Single:

    NROperatorCellDU-Single:

      allOf:

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

        - type: object
@@ -1241,7 +1246,7 @@ components: 
              $ref: 'TS28623_ComDefs.yaml#/components/schemas/AdministrativeState'

            plmnInfoList:

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

            nrTac:

            nRTAC:

              $ref: 'TS28623_GenericNrm.yaml#/components/schemas/Tac'



    NRFrequency-Single:
@@ -1280,7 +1285,7 @@ components: 
                  minimum: 1

                  maximum: 256



    NrSectorCarrier-Single:

    NRSectorCarrier-Single:

      allOf:

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

        - type: object
@@ -1309,7 +1314,7 @@ components: 
          properties:

            CommonBeamformingFunction:

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

    Bwp-Single:

    BWP-Single:

      allOf:

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

        - type: object
@@ -1402,7 +1407,7 @@ components: 
          properties:

            attributes:

              allOf:

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

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

                - type: object

                  properties:

                    rRMPolicyMaxRatio:
@@ -1816,7 +1821,7 @@ components: 
                nRCellDURefs:

                  $ref: 'TS28623_ComDefs.yaml#/components/schemas/DnListRo'



    ExternalGnbDuFunction-Single:

    ExternalGNBDUFunction-Single:

      allOf:

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

        - type: object
@@ -1844,15 +1849,15 @@ components: 
          properties:

            NRFrequency:

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

            ExternalGnbCuCpFunction:

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

            ExternalGnbCuUpFunction:

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

            ExternalGnbDuFunction:

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

            ExternalGNBCUCPFunction:

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

            ExternalGNBCUUPFunction:

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

            ExternalGNBDUFunction:

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





    ExternalGnbCuUpFunction-Single:

    ExternalGNBCUUPFunction-Single:

      allOf:

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

        - type: object
@@ -1875,7 +1880,7 @@ components: 
              $ref: '#/components/schemas/EP_F1U-Multiple'

            EP_XnU:

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

    ExternalGnbCuCpFunction-Single:

    ExternalGNBCUCPFunction-Single:

      allOf:

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

        - type: object
@@ -1895,15 +1900,15 @@ components: 
        - $ref: 'TS28623_GenericNrm.yaml#/components/schemas/ManagedFunction-ncO'

        - type: object

          properties:

            ExternalNrCellCu:

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

            ExternalNRCellCU:

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

            EP_XnC:

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

            EP_E1:

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

            EP_F1C:

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

    ExternalNrCellCu-Single:

    ExternalNRCellCU-Single:

      allOf:

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

        - type: object
@@ -2124,11 +2129,11 @@ components: 
              properties:

                cCOControl:

                  type: boolean

                cCOWeakCoverageParameters:

                CCOWeakCoverageParameters:

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

                cCOPilotPollutionParameters:

                CCOPilotPollutionParameters:

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

                cCOOvershootCoverageParameters-Single:

                CCOOvershootCoverageParameters-Single:

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

    CCOParameters-Attr:

      allOf:
@@ -2177,8 +2182,8 @@ components: 
                nTNpLMNInfoList:

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

                nTNTAClist:

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

            ephemerisInfoSet:

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

            EphemerisInfoSet:

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

            nTNTimeBasedConfig:

              $ref: '#/components/schemas/NTNTimeBasedConfig-Multiple'
@@ -2251,41 +2256,41 @@ components: 


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



    GnbDuFunction-Multiple:

    GNBDUFunction-Multiple:

      type: array

      items:

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

    OperatorDu-Multiple:

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

    OperatorDU-Multiple:

      type: array

      items:

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

    GnbCuUpFunction-Multiple:

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

    GNBCUUPFunction-Multiple:

      type: array

      items:

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

    GnbCuCpFunction-Multiple:

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

    GNBCUCPFunction-Multiple:

      type: array

      items:

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

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

    BWPSet-Multiple:

      type: array

      items:

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



    NrCellDu-Multiple:

    NRCellDU-Multiple:

      type: array

      items:

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

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

    

    NrOperatorCellDu-Multiple:

    NROperatorCellDU-Multiple:

      type: array

      items:

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

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

        

    NrCellCu-Multiple:

    NRCellCU-Multiple:

      type: array

      items:

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

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



    NRFrequency-Multiple:

      type: array
@@ -2298,14 +2303,14 @@ components: 
      items:

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



    NrSectorCarrier-Multiple:

    NRSectorCarrier-Multiple:

      type: array

      items:

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

    Bwp-Multiple:

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

    BWP-Multiple:

      type: array

      items:

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

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

    Beam-Multiple:

      type: array

      items:
@@ -2337,22 +2342,22 @@ components: 
      items:

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



    ExternalGnbDuFunction-Multiple:

    ExternalGNBDUFunction-Multiple:

      type: array

      items:

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

    ExternalGnbCuUpFunction-Multiple:

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

    ExternalGNBCUUPFunction-Multiple:

      type: array

      items:

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

    ExternalGnbCuCpFunction-Multiple:

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

    ExternalGNBCUCPFunction-Multiple:

      type: array

      items:

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

    ExternalNrCellCu-Multiple:

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

    ExternalNRCellCU-Multiple:

      type: array

      items:

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

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

    

    ExternalENBFunction-Multiple:

      type: array
@@ -2424,14 +2429,14 @@ components: 


    resources-nrNrm:

      oneOf:

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

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

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

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

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

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

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

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



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

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

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

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

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

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



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

        - $ref: '#/components/schemas/EUtraNetwork-Single'
@@ -2439,8 +2444,8 @@ components: 
        - $ref: '#/components/schemas/NRFrequency-Single'

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



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

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

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

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

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

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

        - $ref: '#/components/schemas/Beam-Single'
@@ -2463,10 +2468,10 @@ components: 
        - $ref: '#/components/schemas/RimRSGlobal-Single'

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

        

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

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

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

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

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

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

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

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

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

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