Commit d4ff982e authored by lengyelb's avatar lengyelb Committed by lengyelb
Browse files

Local rebasing and merging of MR924 Rel17 28.541 CR 1057 28.623 CR1130...

Local rebasing and merging of MR924 Rel17 28.541 CR 1057 28.623 CR1130 Correction of TAI type in YANG
parent 323a8673
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ module _3gpp-common-yang-types {
    TTA, TTC). All rights reserved.";
  reference "3GPP TS 28.623";

  revision 2023-11-05 { reference CR-0306 ; } 
  revision 2023-11-05 { reference "CR-0306 CR-1130zz" ; } 
  revision 2023-09-17 { reference CR-0270 ; } 
  revision 2023-08-09 { reference CR-0265; }
  revision 2023-05-09 { reference CR-0249; }
+19 −21
Original line number Diff line number Diff line
@@ -18,9 +18,9 @@ submodule _3gpp-ns-nrm-sliceprofile {
  reference "3GPP TS 28.541
    Management and orchestration; 
    5G Network Resource Model (NRM);
    Information model definitions for network slice NRM (chapter 6)
    ";
    Information model definitions for network slice NRM (chapter 6)";
    
  revision 2023-11-05 { reference CR-1057 ; } 
  revision 2023-09-17 { reference CR-1042 ; } 
  revision 2021-07-17 { reference CR-0566 ; } 
  revision 2021-05-05 {
@@ -109,11 +109,6 @@ submodule _3gpp-ns-nrm-sliceprofile {
  }

  grouping TopSliceSubnetProfileGrp {
    leaf-list coverageArea {
       min-elements 1;
       description "A list of TrackingAreas where the NSI can be selected.";
       type types3gpp:Tac;
    }
    leaf latency {
      description "The packet transmission latency (milliseconds) through 
        the RAN, CN, and TN part of 5G network, used to evaluate 
@@ -311,11 +306,13 @@ submodule _3gpp-ns-nrm-sliceprofile {
        fraction-digits 1;
      }
    }
    leaf-list coverageAreaTAList {
    list coverageAreaTAList {
      description "A list of TrackingAreas where the NSI can be selected.";
      key idx; //no obvious leaf to use as a key
      leaf idx { type uint32; }
      //optional support
      min-elements 1;
      type types3gpp:Tac;
      uses types3gpp:TaiGrp;
    }
    leaf uEMobilityLevel {
      description "The mobility level of UE accessing the network slice 
@@ -411,11 +408,6 @@ submodule _3gpp-ns-nrm-sliceprofile {
  }
    
  grouping CNSliceSubnetProfileGrp {
    leaf-list coverageArea {
       min-elements 1;
       description "A list of TrackingAreas where the NSI can be selected.";
       type types3gpp:Tac;
    }
    leaf latency {
      description "The packet transmission latency (milliseconds) through 
        the RAN, CN, and TN part of 5G network, used to evaluate 
@@ -574,11 +566,13 @@ submodule _3gpp-ns-nrm-sliceprofile {
        type ns3cmn3gpp:Support-enum;
      }
    }
    leaf-list coverageAreaTAList {
    list coverageAreaTAList {
      description "A list of TrackingAreas where the NSI can be selected.";
      key idx; //no obvious leaf to use as a key
      leaf idx { type uint32; }
      //optional support
      min-elements 1;
      type types3gpp:Tac;
      uses types3gpp:TaiGrp;
    }
    leaf resourceSharingLevel {
      description "Specifies whether the resources to be allocated to the 
@@ -847,11 +841,13 @@ submodule _3gpp-ns-nrm-sliceprofile {
        fraction-digits 1;
      }
    }
    leaf-list coverageAreaTAList {
    list coverageAreaTAList {
      description "A list of TrackingAreas where the NSI can be selected.";
      key idx; //no obvious leaf to use as a key
      leaf idx { type uint32; }
      //optional support
      min-elements 1;
      type types3gpp:Tac;
      uses types3gpp:TaiGrp;
    }
    leaf uEMobilityLevel {
      description "The mobility level of UE accessing the network slice 
@@ -986,11 +982,13 @@ submodule _3gpp-ns-nrm-sliceprofile {
      type uint64;
    }
    
    leaf-list coverageAreaTAList {
    list coverageAreaTAList {
      description "A list of TrackingAreas where the NSI can be selected.";
      key idx; //no obvious leaf to use as a key
      leaf idx { type uint32; }
      //optional support
      min-elements 1;
      type types3gpp:Tac;
      uses types3gpp:TaiGrp;
    }
    
    leaf latency {