From f86a0d1b69f6beba53064a27c527ccb7376f4114 Mon Sep 17 00:00:00 2001
From: Per Elmdahl EPKPEEL <per.elmdahl@ericsson.com>
Date: Wed, 3 Nov 2021 16:46:12 +0100
Subject: [PATCH 1/2] This commit reflects S5-216051

---
 OpenAPI/nrNrm.yaml                            |  2 ++
 yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 12 ++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/OpenAPI/nrNrm.yaml b/OpenAPI/nrNrm.yaml
index e0fe8fbe0..35ead708f 100644
--- a/OpenAPI/nrNrm.yaml
+++ b/OpenAPI/nrNrm.yaml
@@ -801,6 +801,8 @@ components:
                       $ref: 'genericNrm.yaml#/components/schemas/Dn'
                     dynamic5QISetRef:
                       $ref: 'genericNrm.yaml#/components/schemas/Dn'
+                    dCHOControl:
+                      type: boolean
         - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
         - type: object
           properties:
diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
index 04122e97f..ecce855d6 100755
--- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
@@ -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-XXXX"; }
   revision 2020-10-02 { reference CR-0384 ; }
   revision 2020-08-06 { reference "CR-0333"; }
   revision 2020-08-03 { reference "CR-0321"; }
@@ -100,7 +101,8 @@ module _3gpp-nr-nrm-gnbcucpfunction {
     leaf-list xnHOBlackList {
       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 +112,16 @@ 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.";
+    }
   }
 
   augment "/me3gpp:ManagedElement" {
@@ -129,4 +137,4 @@ module _3gpp-nr-nrm-gnbcucpfunction {
       uses mf3gpp:ManagedFunctionContainedClasses;
     }
   }
-}
\ No newline at end of file
+}
-- 
GitLab


From 5e19b3cc9abc2c814dda11f23c4a6606ec31bb0c Mon Sep 17 00:00:00 2001
From: Per Elmdahl EPKPEEL <per.elmdahl@ericsson.com>
Date: Wed, 3 Nov 2021 17:13:46 +0100
Subject: [PATCH 2/2] Corrected CR number in description of revision.

---
 yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
index ecce855d6..4ba821028 100755
--- a/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
+++ b/yang-models/_3gpp-nr-nrm-gnbcucpfunction.yang
@@ -15,7 +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-XXXX"; }
+  revision 2021-11-05 { reference "CR-0609"; }
   revision 2020-10-02 { reference CR-0384 ; }
   revision 2020-08-06 { reference "CR-0333"; }
   revision 2020-08-03 { reference "CR-0321"; }
-- 
GitLab