From 5bfc361adaf9bb8f71a6de08883c4a2143103ec0 Mon Sep 17 00:00:00 2001
From: Sandeep Shah <sandeeplinux1068@gmail.com>
Date: Fri, 6 Nov 2020 10:24:53 -0600
Subject: Model updates for RANSlice YANG

Changed mandatory fields to optional and
corrected definition for gNBId in gNBCUUPFnGrp

Issue-ID: CCSDK-2969
Signed-off-by: SandeepLinux <Sandeep.Shah@ibm.com>
Change-Id: Ic1b5584809f06139303efb410166976e93d542ea
---
 .../src/main/yang/ran-network@2020-08-06.yang      | 39 +++++++++++-----------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/sdnr/northbound/ranSlice/model/src/main/yang/ran-network@2020-08-06.yang b/sdnr/northbound/ranSlice/model/src/main/yang/ran-network@2020-08-06.yang
index 506565930..db859f40f 100644
--- a/sdnr/northbound/ranSlice/model/src/main/yang/ran-network@2020-08-06.yang
+++ b/sdnr/northbound/ranSlice/model/src/main/yang/ran-network@2020-08-06.yang
@@ -612,7 +612,7 @@ module ran-network {
     leaf-list nfType {
       type NfType;
       config false;
-      min-elements 1;
+      // min-elements 1;
       description
         "Type of the Network Function";
     }
@@ -714,13 +714,13 @@ module ran-network {
       "TS 28.622";
     leaf host {
       type inet:host;
-      mandatory true;
+      // mandatory true;
       description
         "TODO";
     }
     leaf port {
       type inet:port-number;
-      mandatory true;
+      // mandatory true;
       description
         "TODO";
     }
@@ -733,13 +733,13 @@ module ran-network {
       "TS 23.658";
     leaf mcc {
       type Mcc;
-      mandatory true;
+      // mandatory true;
       description
         "TODO";
     }
     leaf mnc {
       type Mnc;
-      mandatory true;
+      // mandatory true;
       description
         "TODO";
     }
@@ -867,7 +867,7 @@ module ran-network {
     leaf-list managedElementTypeList {
       type string;
       config false;
-      min-elements 1;
+      // min-elements 1;
       description
         "The type of functionality provided by the ManagedElement.
          It may represent one ME functionality or a combination of
@@ -971,12 +971,12 @@ module ran-network {
   	grouping SliceProfile{
   		leaf sliceProfileId{
   			type string;
-  			mandatory true;
+  			// mandatory true;
   			description "slice profile id";
   		}
   		leaf sNSSAI{
   			type SNssai;
-  			mandatory false;
+  			// mandatory false;
   			description "The S-NSSAI may include both the SST and SD fields (in which case the S-NSSAI length is 32 bits in total), or the S-NSSAI may just include the SST field (in which case the S-NSSAI length is 8 bits only)";
   		}
   		leaf maxNumberofUEs{
@@ -1180,7 +1180,7 @@ module ran-network {
     }
     list pLMNInfoList {
       key "mcc mnc";
-      min-elements 1;
+      // min-elements 1;
       description
         "The PLMNInfoList is a list of PLMNInfo data type. It defines which PLMNs that
          can be served by the NR cell, and which S-NSSAIs that can be supported by the NR cell for
@@ -1315,7 +1315,7 @@ module ran-network {
     }
     leaf-list nRSectorCarrierRef {
       type DistinguishedName;
-      min-elements 1;
+      // min-elements 1;
       description
         "Reference to corresponding NRSectorCarrier instance.";
     }
@@ -1482,14 +1482,15 @@ module ran-network {
         "'gNB-CU-UP ID' in subclause 9.3.1.15 of 3GPP TS 38.463";
     }
     leaf gNBId {
-      type int32 {
-        range "22..32";
+      type int64 {
+        range "0..4294967295";
       }
       mandatory false;
       description
-        "Indicates the number of bits for encoding the gNB Id.";
+        "Identifies a gNB within a PLMN. The gNB Identifier (gNB ID)
+         is part of the NR Cell Identifier (NCI) of the gNB cells.";
       reference
-        "gNB Id in 3GPP TS 38.300, Global gNB ID in 3GPP TS 38.413";
+        "gNB ID in 3GPP TS 38.300, Global gNB ID in 3GPP TS 38.413";
     }
     list pLMNInfoList {
       key "mcc mnc";
@@ -1559,8 +1560,8 @@ module ran-network {
     }
     list pLMNId {
       key "mcc mnc";
-      min-elements 1;
-      max-elements 1;
+      // min-elements 1;
+      // max-elements 1;
       description
         "The PLMN identifier to be used as part of the global RAN
          node identity.";
@@ -1614,7 +1615,7 @@ module ran-network {
     }
     list pLMNInfoList {
       key "mcc mnc";
-      min-elements 1;
+      // min-elements 1;
       description
         "The PLMNInfoList is a list of PLMNInfo data type. It defines which PLMNs
          that can be served by the NR cell, and which S-NSSAIs that can be supported by the
@@ -1990,8 +1991,8 @@ module ran-network {
     }
     list sAP {
       key "host port";
-      min-elements 1;
-      max-elements 1;
+      // min-elements 1;
+      // max-elements 1;
       description
         "The service access point of the managed NF service instance";
       uses SAP;
-- 
cgit 1.2.3-korg