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

update gnbcucp and gnbcuup

parent a9c98b1f
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ module _3gpp-5gc-nrm-amffunction {
  import ietf-inet-types { prefix inet; }
  import ietf-yang-types { prefix yang; }
  import _3gpp-common-top { prefix top3gpp; }
  import _3gpp-nr-nrm-gnbcuupfunction { prefix gnbcuup3gpp ;}
  import _3gpp-5gc-nrm-nfprofile { prefix nfp3gpp; }

  organization "3gpp SA5";
@@ -20,6 +19,7 @@ module _3gpp-5gc-nrm-amffunction {
    TTA, TTC). All rights reserved.";
  reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
  
  revision 2024-11-01 { reference CR-xxxx; }
  revision 2024-10-06 { reference CR-1389; }
  revision 2024-04-04 { reference CR-1139; }
  revision 2023-09-18 { reference CR-1043 ; } 
@@ -384,7 +384,7 @@ module _3gpp-5gc-nrm-amffunction {
      description "The list of TAIs.";
      key "idx";
      leaf idx { type uint32 ; }
      uses gnbcuup3gpp:TAIGrp; 
      uses types3gpp:TaiGrp; 
    }
    
    list taiRangeList {
+24 −6
Original line number Diff line number Diff line
@@ -620,10 +620,24 @@ module _3gpp-common-yang-types {
  }

  typedef Tac {
    type int32 {
      range 0..16777215 ;
    }
    description "Tracking Area Code";
    type string {
      pattern "([A-Fa-f0-9]{4})|([A-Fa-f0-9]{6})" ;
    }
    description "Tracking Area Code
      2 or 3-octet string identifying a tracking area code as specified in 
      clause 9.3.3.10 of 3GPP TS 38.413 [34], in hexadecimal representation. 
      Each character in the string shall take a value of 
      '0' to '9', 'a' to 'f' or 'A' to 'F' and shall represent 4 bits. 
      The most significant character representing the 4 most significant 
      bits of the TAC shall appear first in the string, and the character 
      representing the 4 least significant bit of the TAC shall appear last 
      in the string.

      pattern: '(^[A-Fa-f0-9]{4}$)|(^[A-Fa-f0-9]{6}$)'

      Examples:
      A legacy TAC 0x4305 shall be encoded as '4305'.
      An extended TAC 0x63F84B shall be encoded as '63F84B'";
    reference "TS 23.003 clause 19.4.2.3";
  }

@@ -641,7 +655,11 @@ module _3gpp-common-yang-types {
      uses types3gpp:PLMNId;
    }
    
    leaf tac { type Tac; }
    leaf tac { 
      type Tac;
      mandatory true;
      description "Tracking Area Code";
    }
  }
       
  grouping GeoCoordinateGrp {
+130 −26
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ module _3gpp-nr-nrm-gnbcucpfunction {
  prefix "gnbcucp3gpp";
    
  import _3gpp-common-yang-types { prefix types3gpp; }
  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
  import _3gpp-common-yang-extensions { prefix yext3gpp; }
  import _3gpp-common-managed-function { prefix mf3gpp; }
  import _3gpp-common-managed-element { prefix me3gpp; }
@@ -19,6 +20,7 @@ module _3gpp-nr-nrm-gnbcucpfunction {
    TTA, TTC). All rights reserved.";
  reference "3GPP TS 28.541 5G Network Resource Model (NRM)";

  revision 2024-08-19 { reference "CR-xxxx"; } 
  revision 2024-08-19 { reference "CR-1337 CR-1352"; } 
  revision 2024-05-24 { reference CR-1273 ; } 
  revision 2024-04-04 { reference CR-1139; }
@@ -57,6 +59,84 @@ module _3gpp-nr-nrm-gnbcucpfunction {
    description "Class representing D-SON function of MRO feature";
  }

  grouping BackhaulAddressGrp {
    description "This data type represents the properties describing the 
      backhaul address of gNB. ";
      
    leaf gNBId {
      type uint32 ;
      mandatory true;
      description "It identifies a gNB within a PLMN. The gNB ID is part of 
        the NR Cell Identifier (NCI) of the gNB cells.";
      reference "gNB Identifier (gNB ID) of subclause 8.2 of TS 38.300. 
                 Global gNB ID in subclause 9.3.1.6 of TS 38.413";
    }
    
    list tAI {
      key tac;
      min-elements 1;
      max-elements 1;
      description "Tracking Area Identity";
      reference "subclause 9.3.3.11 in TS 38.413";
      uses types3gpp:TaiGrp;
    }
  }
  
  grouping MappingSetIDBackhaulAddressGrp {
    description "This data type represents the properties describing the 
      mapping relationship between set ID and backhaul address of gNB.";
    
    leaf setID {
      type uint32 {
        range 0..4194304;  // 22 bits
      }
      mandatory true;
      description "This specifies the set ID of a victim Set (RIM-RS1 Set) or 
        aggressor Set (RIM-RS2 set). (See subclause 7.4.1.6 in TS 38.211). 

      allowedValues:
      The bit length of the set ID is maximum 22bit.";
    }
    
    list backhaulAddress  {
      description "The attribute specifies backhaulAddress which is defined as 
        a datatype.";
      min-elements 1;
      max-elements 1;
      key gNBId;
      uses BackhaulAddressGrp;
    }
  }

  grouping tceIDMappingInfoGrp {
    description "This data type represents the properties describing the 
      mapping relationship between TCE ID, PLMN where TCE resides and 
      IP address of TCE.";
    
    leaf tceIPAddress {
      type inet:ip-address;
      mandatory true;
      description "This attribute indicates IP address of TCE. 
        (See subclause 4.1.1.9.2 in TS 32.422)";
    }
    
    leaf tceID {
      type int64;
      mandatory true;
      description "This attribute indicates TCE Id. 
        (See subclause 4.1.1.9.2 in TS 32.422)";
    }
    
    list pLMNTarget {
      description "Indicates the PLMN where TCE resides. 
        (See subclauses 4.1.1.9.2 and 4.9.2 in TS 32.422)";
      min-elements 1;
      max-elements 1;
      key mnc;      
      uses types3gpp:PLMNId;
    }
  }
  
  grouping GNBCUCPFunctionGrp {
    description "Represents the GNBCUCPFunction IOC.";
    reference "3GPP TS 28.541";
@@ -114,38 +194,36 @@ module _3gpp-nr-nrm-gnbcucpfunction {
      description "List of nodes to which X2 connections are enforced.";
    }

    leaf-list xnHOBlockList {
      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).";
    }

    leaf-list x2HOBlockList {
      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-list xnHOBlockList {
      type string;
      description "List of nodes to which handovers over  Xn are prohibited.";
    }

    leaf dCHOControl {
      type boolean;
      description "This attribute determines whether the CHO function is 
        enabled or disabled.";
    list mappingSetIDBackhaulAddressList {
      description "The attribute specifies a list of mappingSetIDBackhaulAddress 
        which is defined as a datatype. Which is used to 
        retrieve the backhaul address of the victim set.";
      min-elements 1;
      key idx;
      leaf idx {type uint32; }
      uses MappingSetIDBackhaulAddressGrp;
    }
    
    leaf dLTMCellSwitchControl {
      type boolean;
      description "This attribute determines whether the distributed SON
        function LTM Cell Switch is enabled or disabled.";
    list tceIDMappingInfoList {
      description "This attribute includes a list of TCE ID, PLMN where TCE 
        resides and the corresponding TCE IP address. It is used in Logged MDT 
        case to provide the information to the gNodeB or GNBCUCPFunction to 
        get the corresponding TCE IP address when there is an MDT log 
        received from the UE.";
      min-elements 1;
      key idx;
      leaf idx { type uint32; }
      uses tceIDMappingInfoGrp;
    }
    
    leaf dDAPSHOControl {
@@ -154,6 +232,12 @@ module _3gpp-nr-nrm-gnbcucpfunction {
                   is enabled or disabled.";
    }

    leaf dCHOControl {
      type boolean;
      description "This attribute determines whether the CHO function is 
        enabled or disabled.";
    }

    list qceIdMappingInfoList {
      description "List of the mapping relationship between QoE collection entity
        identity, PLMN where QoE collection entity resides, and the IP address of
@@ -183,6 +267,26 @@ module _3gpp-nr-nrm-gnbcucpfunction {
        subject to user consent at MDT activation.";
    }
    
    list mappedCellIdInfoList  {
      description "This attribute provides the list of mapping between 
        geographical location and Mapped Cell ID.";
      key idx;
      leaf idx { type uint32; }
      uses types5g3gpp:MappedCellIdInfoGrp;
    }
    
    leaf configurable5QISetRef {
      type types3gpp:DistinguishedName;
      description "DN of the Configurable5QISet that the GNBCUCPFunction 
        supports (is associated to).";
    }

    leaf dynamic5QISetRef {
      type types3gpp:DistinguishedName;
      description "DN of the Dynamic5QISet that the GNBCUCPFunction supports 
        (is associated to).";
    }

    leaf ephemerisInfoSetRef {
      type types3gpp:DistinguishedName;
      description "This is the DN of EphemerisInfoSet.";
+1 −77
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ module _3gpp-nr-nrm-gnbcuupfunction {
    TTA, TTC). All rights reserved.";
  reference "3GPP TS 28.541 5G Network Resource Model (NRM)";

  revision 2024-11-01 { reference CR-xxxx ; } 
  revision 2024-05-24 { reference CR-1273 ; } 
  revision 2023-09-18 { reference CR-1043 ; } 
  revision 2023-04-26 { reference CR-0916; }
@@ -38,74 +39,6 @@ module _3gpp-nr-nrm-gnbcuupfunction {
    GNBCUUPFunction";
  }

  grouping TAIGrp {
    description "Tracking Area Identity";
    
    list pLMNId {
      key "mcc mnc";
      description "PLMN IDs for the Tracking area";
      uses types3gpp:PLMNId;
    }
    
    leaf nRTAC {
      type types5g3gpp:NRTAC;
      description "Identity of the common Tracking Area Code for the PLMNs
        allowedValues:
        a) It is the TAC or Extended-TAC. 
        b) A cell can only broadcast one TAC or Extended-TAC. 
          See TS 36.300, subclause 10.1.7 (PLMNID and TAC relation).
        c) TAC is defined in subclause 19.4.2.3 of 3GPP TS 23.003 and 
          Extended-TAC is defined in subclause 9.3.1.29 of 3GPP TS 38.473.
        d) For a 5G SA (Stand Alone), it has a non-null value.";
    }
  }
  
  grouping BackhaulAddressGrp {
    description "Indicates the backhauladdress of gNB.";

    leaf gNBId {
      type uint32 {
        range "0..4294967295";
      }
      description "It identifies a gNB within a PLMN. The gNB ID is part of 
        the NR Cell Identifier (NCI) of the gNB cells.";
      reference "gNB Identifier (gNB ID) of subclause 8.2 of TS 38.300. 
                 Global gNB ID in subclause 9.3.1.6 of TS 38.413";
    }
    
    list tAI {
      key nRTAC;
      min-elements 1;
      max-elements 1;
      description "Tracking Area Identity";
      reference "subclause 9.3.3.11 in TS 38.413";
      uses TAIGrp;
    }
  }
  
  grouping MappingSetIDBackhaulAddressGrp {
    description "Mapping relationship between setID and backhaulAddress of gNB";
    
    leaf idx { 
      type uint32 ;
      description "ID value";
    }
    
    leaf setID {
      type uint32;
      mandatory true;
      description "Indicates the setID of gNB.";
      reference "Subclause 7.4.1.6 in TS 38.211";
    }

    list backhaulAddress {
      key gNBId;
      min-elements 1;
      max-elements 1;
      description "Indicates the backhauladdress of gNB.";
      uses BackhaulAddressGrp;
    }
  }
  grouping GNBCUUPFunctionGrp {
    description "Represents the GNBCUUPFunction IOC.";
    reference "3GPP TS 28.541";
@@ -147,15 +80,6 @@ module _3gpp-nr-nrm-gnbcuupfunction {
      uses types5g3gpp:PLMNInfo;
    }
    
    list mappingSetIDBackhaulAddressList {
      key idx;
      description "Specifies a list of mappingSetIDBackhaulAddress used to 
        retrieve the backhaul address of the victim set.
        Must be present if Remote Interference Management function is 
        supported.";
      uses MappingSetIDBackhaulAddressGrp;
    }

    leaf configurable5QISetRef {
      type types3gpp:DistinguishedName;
      description "DN of the Configurable5QISet that the GNBCUUPFunction