yang-models/_3gpp-5gc-nrm-managed-nfprofile.yang

@@ -52,7 +52,7 @@ TTA, TTC). All rights reserved.";
             type types3gpp:NfType;
         }
     }
-    grouping SupiRange {
+    grouping SupiRangeGrp {
     leaf start {
         description "First value identifying the start ofa SUPI range.To be
         used when the range of SUPI's can be represented as a numeric range
@@ -119,7 +119,7 @@ TTA, TTC). All rights reserved.";
                  be selected.";
             key idx;
             leaf idx { type uint32; }
-            uses SupiRange;
+            uses SupiRangeGrp;
         }
         list gpsiRangeList {
             description "It represents a set of GPSIs for which the NF

yang-models/_3gpp-5gc-nrm-pcffunction.yang

@@ -113,9 +113,10 @@ module _3gpp-5gc-nrm-pcffunction {
       list supiRanges {
         description "List of ranges of SUPIs that can be served by
          the PCF instance. If not provided, the PCF can serve any SUPI.";
-        key "start end pattern";
+        key idx;
+        leaf idx { type uint32; }
         min-elements 1;
-        uses mnfp3gpp:SupiRange;
+        uses mnfp3gpp:SupiRangeGrp;
       }
 
       leaf rxDiamHost {

yang-models/_3gpp-5gc-nrm-smffunction.yang

@@ -29,7 +29,7 @@ module _3gpp-5gc-nrm-smffunction {
   revision 2018-08-07 { reference "Initial revision";}
 
 
-    grouping smfInfo {
+    grouping SmfInfoGrp {
 
       list sNssaiSmfInfoList {
         description "List of parameters supported by the SMF per S-NSSAI.";

yang-models/_3gpp-5gc-nrm-udmfunction.yang

@@ -85,7 +85,7 @@ module _3gpp-5gc-nrm-udmfunction {
         available in the UDM instance.";
         key "start end pattern";
         min-elements 1;
-        uses mnfp3gpp:SupiRange;
+        uses mnfp3gpp:SupiRangeGrp;
       }
 
       list gpsiRanges {

yang-models/_3gpp-5gc-nrm-udrfunction.yang

@@ -28,7 +28,7 @@ module _3gpp-5gc-nrm-udrfunction {
 
   revision 2019-05-22 {reference "initial revision"; }
 
-    grouping udrInfo {
+    grouping UdrInfoGrp {
 
       leaf groupId {
         description "Identity of the UDR group that is served
@@ -43,7 +43,7 @@ module _3gpp-5gc-nrm-udrfunction {
          is available in the UDR instance.";
         key "start end pattern";
         min-elements 1;
-        uses mnfp3gpp:SupiRange;
+        uses mnfp3gpp:SupiRangeGrp;
       }
 
       list gpsiRanges {