Commit 2f74a7a0 authored by sunse's avatar sunse
Browse files

manual rabase for merge request 139/140e of Rel17 YAML on 26.01.2022

parents 97671bf4 dbf49cc4

OpenAPI/5gcNrm.yaml

+38 −7
Original line number Diff line number Diff line
@@ -525,11 +525,6 @@ components: 
        maxNumberofPDUSessions:

          type: integer

     

    SupportedBMOList:

      type: array

      items:

        type: string

        

    NRTACRange:

      type: object

      properties:
@@ -550,6 +545,34 @@ components: 
          items:

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

   

    GUAMInfo:

      type: object

      properties:

          pLMNId: 

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

          aMFIdentifier:

            type: integer   

       

    SupportedBMOList:

      type: array

      items:

        type: string

    

    ECSAddrConfigInfo:

      type: array

      items:

        type: string



    TaiRange:

      type: object

      properties:

        plmnId:

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

        nRTACRangelist:

          type: array

          items:

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

            

    ECSAddrConfigInfo:

      type: array

      items:
@@ -673,6 +696,14 @@ components: 
                      $ref: '#/components/schemas/WeightFactor'

                    snssaiList:

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

                    cNSIIdList:

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

                    gUAMIdList: 

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

                    backupInfoAmfFailure:

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

                    backupInfoAmfRemoval:

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

                    amfSetRef:

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

                    managedNFProfile:
@@ -2283,7 +2314,7 @@ components: 
    EP_Npc8-Multiple:

      type: array

      items:

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

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

    EP_Nxx-Multiple:

      type: array

      items:

OpenAPI/nrNrm.yaml

+1 −2
Original line number Diff line number Diff line
@@ -140,7 +140,6 @@ components: 
      type: array

      items:

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

        

    NrtacRange: 

      type: object

      properties:

OpenAPI/sliceNrm.yaml

+1 −0
Original line number Diff line number Diff line
@@ -284,6 +284,7 @@ components: 
          type: array

          items:

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



    CNSliceSubnetProfile:

      type: object

      properties:

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

+6 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 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"; }
@@ -118,6 +119,11 @@ module _3gpp-nr-nrm-gnbcucpfunction { 
      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