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

28.623_Rel17_CR0252_28.541_Rel17_CR0932_YANG_Corrections

parent 699d0137
Loading
Loading
Loading
Loading
+5 −3
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ module _3gpp-common-mnsregistry {
    Class (IOC) that is part of the Generic Network Resource Model (NRM).";
  reference "3GPP TS 28.623 Generic Network Resource Model (NRM)";

  revision 2023-05-09 { reference "S5-216090"; }
  revision 2023-07-25 { reference CR00252; }
  revision 2021-11-23 { reference "S5-216090"; }
  revision 2021-10-18 { reference "S5-215263"; }
  revision 2021-08-29 { reference "Initial revision, S5-214388"; }
@@ -85,10 +85,12 @@ module _3gpp-common-mnsregistry {
          defined as the set of managed object instances that can be accessed
          using the Management Service.";

        uses top3gpp:Top_Grp;
        key id;
        uses top3gpp:Top_Grp;
        container attributes {
          uses MnsInfoGrp;
        }
      }
    }
  }	
}
 No newline at end of file
+8 −7
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ module _3gpp-common-trace {
      Integration Reference Point (IRP);
      Information Service (IS)";

  revision 2023-07-25 { reference CR00252; }
  revision 2023-02-17 { reference "CR-0232"; }
  revision 2023-02-15 { reference "CR-0236"; }
  revision 2022-04-27 { reference "CR-0159"; }
@@ -379,7 +380,7 @@ module _3gpp-common-trace {
    }
    }

    leaf-list listOfNeTypes {
    leaf-list listOfNETypes {
      type enumeration {
        enum MSC_SERVER;
        enum SGSN;
@@ -404,19 +405,19 @@ module _3gpp-common-trace {
        allowed values";
    }

    leaf PLMNTarget {
      type string;
      mandatory true;
    list pLMNTarget {
      key "mcc mnc";
      description "Specifies which PLMN that the subscriber of the session to
        be recorded uses as selected PLMN. PLMN Target might differ from the
        PLMN specified in the Trace Reference";
      reference "Clause 5.9b of 3GPP TS 32.422";
      
      uses types3gpp:PLMNId;
    }

    leaf streamingTraceConsumerURI {
    leaf traceReportingConsumerUri {
      when '../traceReportingFormat  = "STREAMING"';
      type inet:uri;
      mandatory true;
      description "URI of the Streaming Trace data reporting MnS consumer
        (a.k.a. streaming target).
        This attribute shall be present if file based trace data reporting is
@@ -425,7 +426,7 @@ module _3gpp-common-trace {
      reference "Clause 5.9 of 3GPP TS 32.422";
    }

    leaf traceCollectionEntityAddress {
    leaf traceCollectionEntityIPAddress {
      when '../traceReportingFormat  = "FILE_BASED" or '
        +'../jobType = "LOGGED_MDT_ONLY" or ../jobType = "LOGGED_MBSFN_MDT"';
      type union {
+2 −2
Original line number Diff line number Diff line
@@ -34,14 +34,14 @@ module _3gpp-nr-nrm-eutranfreqrelation {

    leaf-list blockListEntry {
      description "A list of Physical Cell Identities (PCIs) that are
        blacklisted in E-UTRAN measurements.";
        exclude-listed in E-UTRAN measurements.";
      reference "3GPP TS 38.331";
      type uint16 { range "0..1007"; }
    }

    leaf-list blockListEntryIdleMode {
      description "A list of Physical Cell Identities (PCIs) that are
        blacklisted in SIB4 and SIB5.";
        exclude-listed in SIB4 and SIB5.";
      type uint16 { range "0..1007"; }
    }

+49 −20
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ module _3gpp-nr-nrm-nrcellrelation {
    Object Class (IOC) that is part of the NR Network Resource Model (NRM).";
  reference "3GPP TS 28.541 5G Network Resource Model (NRM)";

  revision 2023-06-25 { reference CR0932 ; }
  revision 2021-01-25 { reference CR-0454 ; }
  revision 2020-06-03 { reference S5-202333 ; }
  revision 2020-04-23 { reference CR0281 ; }
@@ -124,6 +125,34 @@ module _3gpp-nr-nrm-nrcellrelation {
        changed to energy saving state.";
      type EnergySavingCoverage;
    }
    
    leaf isENDCAllowed {
      type boolean;
      mandatory true;
      description "This indicates if EN-DC is allowed or prohibited.
        If TRUE, the target cell is allowed to be used for EN-DC.  
        The target cell is referenced by the NRCellRelation that 
        contains this isENDCAllowed. 

        If FALSE, EN-DC shall not be allowed.";
    }
    
    leaf isMLBAllowed {
      type boolean;
      mandatory true;
      description "This indicates if mobility load balancing is allowed or 
        prohibited from source cell to target cell.

        If TRUE, load balancing is allowed from source cell to target cell.  
        The source cell is identified by the name-containing NRCellCU of 
        the NRCellRelation that contains the isMLBAllowed. The target cell 
        is referenced by the NRCellRelation that contains this isLBAllowed. 
        In case of isHOAllowed is FALSE, mobility load balancing is 
        prohibited by handover from source cell to target cell.  

        If FALSE, load balancing shall be prohibited from source cell to 
        target cell.";    
    }
  }

  augment /me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/nrcellcu3gpp:NRCellCU {
+5 −4
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ module _3gpp-nr-nrm-nrfreqrelation {
    Object Class (IOC) that is part of the NR Network Resource Model (NRM).";
  reference "3GPP TS 28.541 5G Network Resource Model (NRM)";

  revision 2023-06-25 { reference CR0932 ; }
  revision 2020-04-23 { reference CR0281 ; }
  revision 2019-10-28 { reference S5-193518 ; }
  revision 2019-06-17 {
@@ -72,17 +73,17 @@ module _3gpp-nr-nrm-nrfreqrelation {
      }
    }

    leaf-list blackListEntry {
    leaf-list blockListEntry {
      description "A list of Physical Cell Identities (PCIs) that are
        blacklisted in NR measurements.";
        exclude-listed in NR measurements.";
      reference "3GPP TS 38.331";
      min-elements 0;
      type uint16 { range "0..1007"; }
    }

    leaf-list blackListEntryIdleMode {
    leaf-list blockListEntryIdleMode {
      description "A list of Physical Cell Identities (PCIs) that are
        blacklisted in SIB4 and SIB5.";
        exclude-listed in SIB4 and SIB5.";
      min-elements 0;
      type uint16 { range "0..1007"; }
    }