Commit 66b3f1c6 authored by rosabolzek's avatar rosabolzek
Browse files

move AreaScopeGrp to _3gpp-5g-common-yang-types.yang

parent 423a5326
Loading
Loading
Loading
Loading
Loading
+82 −0
Original line number Diff line number Diff line
@@ -26,6 +26,88 @@ module _3gpp-5g-common-yang-types {
  revision 2020-11-05 { reference CR-0412 ; }
  revision 2019-10-20 { reference "Initial version."; }

  grouping AreaScopeGrp {
    description "This <<dataType>> defines an area scope.";

    choice AreaScopeChoice {

      case eutran-only { // choice 1
        leaf-list eutraCellIdList {
          type types3gpp:EutraCellId;
          min-elements 1;
          max-elements 32;
          description "List of E-UTRAN cells identified by E-UTRAN-CGI";
        }
      }
      case tac { // choice 3
        leaf-list tacList { 
          type types3gpp:Tac;
          min-elements 1;
          max-elements 8;
          description "Tracking Area Code list";
        }
        leaf-list cAGIdList { 
          type types3gpp:CagId;
          max-elements 256;
          description "It identifies a CAG list containing up to 
            256 CAG-identifiers per UE or up to 12 CAG-identifiers 
            per cell, see TS 38.331 [38]. CAG ID is used to combine 
            with PLMN ID to identify a PNI-NPN.AG ID is a hexadecimal 
            range with size 32 bit.";
        }
      }

      case ntnGeoAreaList{ // choice 6
        list ntnGeoAreaList {
          must 'not(../nrCellIdList)';
          description "geographical areas for NTN MDT";
          key idx;
          max-elements 8;
          leaf idx { type string; }
          uses types3gpp:GeoAreaGrp;
        }
      }

      case else {
        list nPNIdentityList { // choice 2, 4 , 5
          description "list of NPN IDs of in NR. It is either 
            a list of PNI-NPNs identified by CAG ID with 
            associated plmn-Identity or a list of SNPN 
            identified by Network ID with associated plmn-Identity";
          key idx;
          min-elements 1;
            uses types3gpp:NpnIdGrp;
          leaf idx { type string; }
        }
        leaf-list nrCellIdList {
          must 'not(../taiList)';
          type types3gpp:NrCellId;
          max-elements 32;
          description "List of NR cells identified by NG-RAN CGI";        
        }
        list taiList {
          must 'not(../nrCellIdList)';
          description "Tracking Area Identity list";
          key idx;
          max-elements 8;
          leaf idx { type string; }
          uses types3gpp:TaiGrp;
        }

      }
    }
        

    list sliceIdList {
      description "Network Slice Id list";
      key idx;
      uses PLMNInfo;
      min-elements 1;
      max-elements 16384;
      leaf idx { type string; }
    }
  }

  grouping IpInterfaceGrp {
    leaf-list ipv4EndpointAddresses {
      description "Available endpoint IPv4 address(es) of
+2 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ module _3gpp-common-qmcjob {
      Integration Reference Point (IRP);
      Information Service (IS)";

  revision 2025-11-02 { reference CR-; }
  revision 2025-02-06 { reference CR-0508; }
  revision 2024-11-05 { reference CR-0480; }
  revision 2024-04-04 { reference CR-0334; } 
@@ -54,7 +55,7 @@ module _3gpp-common-qmcjob {
      leaf idx { type uint32 ; }
      description "It defines the area scope of QoE, which is specified
       in clause 5.4 of TS 28.405.";   
      uses trace3gpp:AreaScopeGrp;      
      uses types5g3gpp:AreaScopeGrp;      
    }

    leaf qoECollectionEntityAddress {
+2 −77
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ module _3gpp-common-trace {
      Integration Reference Point (IRP);
      Information Service (IS)" ;

  revision 2025-11-02 { reference "CR-" ; }    // common for rel-19, rel-20
  revision 2025-10-07 { reference "CR-0573" ; }    // common for rel-19, rel-20
  revision 2025-10-01 { reference "CR-0578" ; }
  revision 2025-08-07 { reference "CR-0551 CR-0552 CR-0562" ; }
@@ -114,82 +115,6 @@ module _3gpp-common-trace {
    }
  }

  grouping AreaScopeGrp {
    description "This <<dataType>> defines an area scope.";

    choice AreaScopeChoice {

      case eutran-only {
        leaf-list eutraCellIdList {
          type types3gpp:EutraCellId;
          min-elements 1;
          max-elements 32;
          description "List of E-UTRAN cells identified by E-UTRAN-CGI";
        }
      }
      case tac {
        leaf-list tacList {
          type types3gpp:Tac;
          min-elements 1;
          max-elements 8;
          description "Tracking Area Code list";
        }
        leaf-list cAGIdList {
          type types3gpp:CagId;
          max-elements 256;
          description "It identifies a CAG list containing up to 
            256 CAG-identifiers per UE or up to 12 CAG-identifiers 
            per cell, see TS 38.331 [38]. CAG ID is used to combine 
            with PLMN ID to identify a PNI-NPN.AG ID is a hexadecimal 
            range with size 32 bit.";
        }
      }

      case else {
        list nPNIdentityList {
          description "list of NPN IDs of in NR. It is either 
            a list of PNI-NPNs identified by CAG ID with 
            associated plmn-Identity or a list of SNPN 
            identified by Network ID with associated plmn-Identity";
          key idx;
          min-elements 1;
            uses types3gpp:NpnIdGrp;
          leaf idx { type string; }
        }
        leaf-list nrCellIdList {
          must 'not(../taiList)';
          type types3gpp:NrCellId;
          max-elements 32;
          description "List of NR cells identified by NG-RAN CGI";        
        }
        list taiList {
          must 'not(../nrCellIdList)';
          description "Tracking Area Identity list";
          key idx;
          max-elements 8;
          leaf idx { type string; }
          uses types3gpp:TaiGrp;
        }
        list ntnGeoAreaList {
          must 'not(../nrCellIdList)';
          description "geographical areas for NTN MDT";
          key idx;
          max-elements 8;
          leaf idx { type string; }
          uses types3gpp:GeoAreaGrp;
        }
      }
    }

    list sliceIdList {
      description "Network Slice Id list";
      key idx;
      uses types5g3gpp:PLMNInfo;
      min-elements 1;
      max-elements 16384;
      leaf idx { type string; }
    }
  }

  grouping ExcessPacketDelayThresholdsGrp {
    description "Represents the ExcessPacketDelayThresholds dataType.
@@ -1681,7 +1606,7 @@ module _3gpp-common-trace {
      leaf idx { type uint32 ; }
      description "It specifies the area where data shall be collected. ";
      max-elements 1;
      uses AreaScopeGrp;
      uses types5g3gpp:AreaScopeGrp;
    }

   leaf-list sensorInformation {