Commit 06209943 authored by sunse's avatar sunse
Browse files

Merge branch 'Integration_Rel17_SA5_140_YAML' into... 

Merge branch 'Integration_Rel17_SA5_140_YAML' into '28.541_Rel17_CR0630_Stage3_update_for_UPF_and_PCF'

# Conflicts: with manual resolution: keep both
#   OpenAPI/5gcNrm.yaml
parents 87f32d12 d0867d80

OpenAPI/5gcNrm.yaml

+81 −18
Original line number Diff line number Diff line
@@ -173,6 +173,32 @@ components: 
        - $ref: '#/components/schemas/UpfInfo'

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

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

    NotificationType:      

      type: string

      enum:

        -  N1_MESSAGES 

        -  N2_INFORMATION

        -  LOCATION_NOTIFICATION

        -  DATA_REMOVAL_NOTIFICATION

        -  DATA_CHANGE_NOTIFICATION

        -  LOCATION_UPDATE_NOTIFICATION

        -  NSSAA_REAUTH_NOTIFICATION

        -  NSSAA_REVOC_NOTIFICATION

    DefaultNotificationSubscription:

      type: object

      properties:

        notificationType:

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

        callbackURI:

          type: string

        n1MessageClass:  

          type: boolean

        n2InfroamtionClass:

          type: boolean

        versions:

          type: string

        binding:

          type: string

    ManagedNFProfile:

      type: object

      properties:
@@ -180,6 +206,8 @@ components: 
          type: string

        nfType:

          $ref: 'genericNrm.yaml#/components/schemas/NFType'

        heartbeatTimer:

          type: integer

        authzInfo:

          type: string

        hostAddr:
@@ -382,6 +410,8 @@ components: 
          $ref: '#/components/schemas/SteeringMode'

        mulAccCtrl:

          $ref: 'https://forge.3gpp.org/rep/all/5G_APIs/raw/REL-16/TS29512_Npcf_SMPolicyControl.yaml#/components/schemas/MulticastAccessControl'

        snssaiList:

          $ref: 'nrNrm.yaml#/components/schemas/SnssaiList'



    TrafficControlDataList:

      type: array
@@ -469,6 +499,11 @@ components: 
      items:

        type: string

    

    ECSAddrConfigInfo:

      type: array

      items:

        type: string

 

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



    SubNetwork-Single:
@@ -573,7 +608,7 @@ components: 
                      $ref: '#/components/schemas/WeightFactor'

                    snssaiList:

                      $ref: 'nrNrm.yaml#/components/schemas/SnssaiList'

                    amfSet:

                    amfSetRef:

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

                    managedNFProfile:

                      $ref: '#/components/schemas/ManagedNFProfile'
@@ -624,6 +659,10 @@ components: 
                      $ref: '#/components/schemas/AmfSetId'

                    snssaiList:

                      $ref: 'nrNrm.yaml#/components/schemas/SnssaiList'

                    aMFRegionRef:

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

                    aMFSetMemberList:

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

    AmfRegion-Single:

      allOf:

        - $ref: 'genericNrm.yaml#/components/schemas/Top'
@@ -642,6 +681,8 @@ components: 
                      $ref: '#/components/schemas/AmfRegionId'

                    snssaiList:

                      $ref: 'nrNrm.yaml#/components/schemas/SnssaiList'

                    aMFSetListRef:

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

    SmfFunction-Single:

      allOf:

        - $ref: 'genericNrm.yaml#/components/schemas/Top'
@@ -837,6 +878,8 @@ components: 
                      $ref: '#/components/schemas/ManagedNFProfile'

                    commModelList:

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

                    eCSAddrConfigInfo:

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

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

        - type: object

          properties:
@@ -1138,12 +1181,14 @@ components: 
        - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'

        - type: object

          properties:

            EP_N64:

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

            EP_N65:

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

            EP_N66:

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

            EP_Npc4:

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

            EP_Npc6:

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

            EP_Npc7:

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

            EP_Npc8:

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



    ExternalAmfFunction-Single:

      allOf:
@@ -1651,7 +1696,7 @@ components: 
                      $ref: 'nrNrm.yaml#/components/schemas/LocalAddress'

                    remoteAddress:

                      $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'

    EP_N64-Single:

    EP_Npc4-Single:

      allOf:

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

        - type: object
@@ -1665,7 +1710,7 @@ components: 
                      $ref: 'nrNrm.yaml#/components/schemas/LocalAddress'

                    remoteAddress:

                      $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'

    EP_N65-Single:

    EP_Npc6-Single:

      allOf:

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

        - type: object
@@ -1679,7 +1724,21 @@ components: 
                      $ref: 'nrNrm.yaml#/components/schemas/LocalAddress'

                    remoteAddress:

                      $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress' 

    EP_N66-Single:

    EP_Npc7-Single:

      allOf:

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

        - type: object

          properties:

            attributes:

              allOf:

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

                - type: object

                  properties:

                    localAddress:

                      $ref: 'nrNrm.yaml#/components/schemas/LocalAddress'

                    remoteAddress:

                      $ref: 'nrNrm.yaml#/components/schemas/RemoteAddress'

    EP_Npc8-Single:

      allOf:

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

        - type: object
@@ -2091,18 +2150,22 @@ components: 
      type: array

      items:

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

    EP_N64-Multiple:

    EP_Npc4-Multiple:

      type: array

      items:

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

    EP_Npc6-Multiple:

      type: array

      items:

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

    EP_N65-Multiple:

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

    EP_Npc7-Multiple:

      type: array

      items:

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

    EP_N66-Multiple:

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

    EP_Npc8-Multiple:

      type: array

      items:

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

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

    Configurable5QISet-Multiple:

      type: array

      items:

OpenAPI/nrNrm.yaml

+50 −5
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ components: 
    PlmnInfo:

      type: object

      properties:

        plmnId":

        plmnId:

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

        snssai:

          $ref: '#/components/schemas/Snssai'
@@ -80,7 +80,7 @@ components: 
    NpnIdentity:

      type: object

      properties:

        plmnId":

        plmnId:

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

        cagidList:

          $ref: '#/components/schemas/cagId'
@@ -709,6 +709,23 @@ components: 
              $ref: '#/components/schemas/EP_F1U-Multiple'

            DRACHOptimizationFunction:

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



    OperatorDu-Single:

      allOf:

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

        - type: object

          properties:

            gnbId:

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

            gnbIdLength:

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

        - type: object

          properties:

            EP_F1C:

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

            EP_F1U:

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



    GnbCuUpFunction-Single:

      allOf:

        - $ref: 'genericNrm.yaml#/components/schemas/Top'
@@ -784,6 +801,10 @@ components: 
                      $ref: 'genericNrm.yaml#/components/schemas/Dn'

                    dynamic5QISetRef:

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

                    dCHOControl:

                      type: boolean

                    dDAPSHOControl:

                      type: boolean

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

        - type: object

          properties:
@@ -936,6 +957,18 @@ components: 
            DRACHOptimizationFunction:

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



    NrOperatorCellDu-Single:

      allOf:

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

        - type: object

          properties:

            cellLocalId:

              type: integer

            plmnInfoList:

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

            nrTac:

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



    NRFrequency-Single:

      allOf:

        - $ref: 'genericNrm.yaml#/components/schemas/Top'
@@ -1104,7 +1137,7 @@ components: 
                      $ref: '#/components/schemas/CellIndividualOffset'

                    adjacentNRCellRef:

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

                    nRFrequencyRef:

                    nRFreqRelationRef:

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

                    isRemoveAllowed:

                      type: boolean
@@ -1139,13 +1172,13 @@ components: 
                  properties:

                    offsetMO:

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

                    blackListEntry:

                    blockListEntry:

                      type: array

                      items:

                        type: integer

                        minimum: 0

                        maximum: 1007

                    blackListEntryIdleMode:

                    blockListEntryIdleMode:

                      type: integer

                    cellReselectionPriority:

                      type: integer
@@ -1712,6 +1745,10 @@ components: 
      type: array

      items:

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

    OperatorDu-Multiple:

      type: array

      items:

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

    GnbCuUpFunction-Multiple:

      type: array

      items:
@@ -1725,6 +1762,12 @@ components: 
      type: array

      items:

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

    

    NrOperatorCellDu-Multiple:

      type: array

      items:

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

        

    NrCellCu-Multiple:

      type: array

      items:
@@ -1857,9 +1900,11 @@ components: 
        - $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/NRFrequency-Single'

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

OpenAPI/sliceNrm.yaml

+36 −0
Original line number Diff line number Diff line
@@ -257,6 +257,34 @@ components: 
          $ref: '#/components/schemas/ServAttrCom'

        performance:

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

    NSSAASupport:

      type: object

      properties:

        servAttrCom:

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

        support:

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

    SecFunc:

      type: object

      properties:

        secFunId:

          type: string

        secFunType:

          type: string

        secRules:

          type: array

          items:

            type: string

    N6Protection:

      type: object

      properties:

        servAttrCom:

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

        secFuncList:

          type: array

          items:

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



    CNSliceSubnetProfile:

      type: object

      properties:
@@ -298,6 +326,10 @@ components: 
          $ref: '#/components/schemas/DeterministicComm'

        survivalTime:

          type: string

        nssaaSupport:

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

        n6Protection:

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

    RANSliceSubnetProfile:

      type: object

      properties:
@@ -476,6 +508,10 @@ components: 
            $ref: '#/components/schemas/SliceSimultaneousUse'

          energyEfficiency:

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

          nssaaSupport:

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

          n6Protection:

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

    SliceProfile:

      type: object

      properties:

yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang

+17 −2
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ module _3gpp-nr-nrm-gnbcucpfunction { 
    Object Class (IOC) that is part of the NR Network Resource Model (NRM).";

  reference "3GPP TS 28.541 5G Network Resource Model (NRM)";



  revision 2021-11-05 { reference "CR-0609"; }

  revision 2020-11-05 { reference "CR-0611" ; }

  revision 2020-10-02 { reference CR-0384 ; }

  revision 2020-08-06 { reference "CR-0333"; }

  revision 2020-08-03 { reference "CR-0321"; }
@@ -101,6 +103,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { 
      type string;

      description "List of nodes to which handovers over  Xn are prohibited.";

    }



    leaf configurable5QISetRef {

      type types3gpp:DistinguishedName;

      description "DN of the Configurable5QISet that the GNBCUCPFunction supports (is associated to).";
@@ -110,10 +113,22 @@ module _3gpp-nr-nrm-gnbcucpfunction { 
      type string;

      description "List of nodes to which handovers over X2 are prohibited.";

    }



    leaf dynamic5QISetRef {

      type types3gpp:DistinguishedName;

      description "DN of the Dynamic5QISet that the GNBCUCPFunction supports (is associated to).";

    }



    leaf dCHOControl {

      type boolean;

      description "This attribute determines whether the CHO function is enabled or disabled.";

    }



    leaf dDAPSHOControl {

      type boolean;

      description "This attribute determines whether the DAPS handover function

                   is enabled or disabled.";

    }

  }



  augment "/me3gpp:ManagedElement" {