Commit c85f9dec authored by sunse's avatar sunse
Browse files

manual resolve merge confliction for CR0609

parents 2a253a69 33755222

OpenAPI/nrNrm.yaml

+2 −0
Original line number Diff line number Diff line
@@ -803,6 +803,8 @@ components: 
                      $ref: 'genericNrm.yaml#/components/schemas/Dn'

                    dCHOControl:

                      type: boolean

                    dDAPSHOControl:

                      type: boolean

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

        - type: object

          properties:

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

+7 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { 
  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"; }
@@ -122,6 +123,12 @@ module _3gpp-nr-nrm-gnbcucpfunction { 
      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" {