Merge branch '28.623_Rel17_CR0252_28.541_Rel17_CR0932_YANG_Corrections' into... (9c88da97) · Commits · SA5 – Management & Orchestration and Charging / Management and Orchestration APIs

yang-models/_3gpp-common-mnsregistry.yang

+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

yang-models/_3gpp-common-trace.yang

+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 {

yang-models/_3gpp-nr-nrm-eutrancellrelation.yang

+11 −20

Original line number	Diff line number	Diff line
		@@ -4,21 +4,20 @@ module _3gpp-nr-nrm-eutrancellrelation {
		prefix "eutrancellrel3gpp";

		import _3gpp-common-yang-types { prefix types3gpp; }
		import _3gpp-common-managed-function { prefix mf3gpp; }
		import _3gpp-common-managed-element { prefix me3gpp; }
		import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; }
		import _3gpp-nr-nrm-nrcellcu { prefix nrcellcu3gpp; }
		import _3gpp-common-top { prefix top3gpp; }

		organization "3GPP SA5";
		contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
		description "Defines the YANG mapping of the EUtranCellRelation Information
		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 2019-10-28 { reference S5-193518 ; }
		revision 2019-06-17 {
		description "Initial revision";
		}
		revision 2019-06-17 { reference "Initial revision"; }

		typedef ActionAllowed {
		type enumeration {
		@@ -38,7 +37,6 @@ module _3gpp-nr-nrm-eutrancellrelation {
		grouping EUtranCellRelationGrp {
		description "Represents the EUtranCellRelation IOC.";
		reference "3GPP TS 28.541, EUtranRelation in 3GPP TS 28.658";
		uses mf3gpp:ManagedFunctionGrp;

		leaf tCI {
		description "Target Cell Identifier. Consists of E-UTRAN Cell Global
		@@ -55,7 +53,7 @@ module _3gpp-nr-nrm-eutrancellrelation {
		be removed (deleted). If NO, the subject EUtranCellRelation instance
		shall not be removed (deleted) by any entity but an IRPManager.";
		mandatory true;
		type ActionAllowed;
		type boolean;
		}

		leaf isHOAllowed {
		@@ -65,18 +63,9 @@ module _3gpp-nr-nrm-eutrancellrelation {
		cell referenced by this EUtranCellRelation instance. If NO, handover
		shall not be allowed.";
		mandatory true;
		type ActionAllowed;
		}
		leaf isENDCAllowed {
		description "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.";
		mandatory true;
		type ActionAllowed;
		type boolean;
		}


		leaf isICICInformationSendAllowed {
		description "Indicates if ICIC (Inter Cell Interference Coordination)
		load information message sending is allowed or prohibited. If YES,
		@@ -133,6 +122,7 @@ module _3gpp-nr-nrm-eutrancellrelation {
		Balancing Optimization (LBO) function.";
		reference "3GPP TS 36.331";
		config false;
		mandatory true;
		type types3gpp:QOffsetRange;
		}

		@@ -144,17 +134,18 @@ module _3gpp-nr-nrm-eutrancellrelation {
		}
		}

		augment /me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/nrcellcu3gpp:NRCellCU {
		augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" +
		"nrcellcu3gpp:NRCellCU" {

		list EUtranCellRelation {
		description "Represents a relation between an NR cell and an E-UTRAN cell.";
		description "Represents a relation between an NR cell
		and an E-UTRAN cell.";
		reference "3GPP TS 28.541";
		key id;
		uses top3gpp:Top_Grp;
		container attributes {
		uses EUtranCellRelationGrp;
		}
		uses mf3gpp:ManagedFunctionContainedClasses;
		}
		}
		}
		No newline at end of file

yang-models/_3gpp-nr-nrm-eutranfreqrelation.yang

+15 −18

Original line number	Diff line number	Diff line
		@@ -4,26 +4,24 @@ module _3gpp-nr-nrm-eutranfreqrelation {
		prefix "eutranfreqrel3gpp";

		import _3gpp-common-yang-types { prefix types3gpp; }
		import _3gpp-common-managed-function { prefix mf3gpp; }
		import _3gpp-common-managed-element { prefix me3gpp; }
		import _3gpp-common-top { prefix top3gpp; }
		import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; }
		import _3gpp-nr-nrm-nrcellcu { prefix nrcellcu3gpp; }

		organization "3GPP SA5";
		contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
		description "Defines the YANG mapping of the EUtranFreqRelation Information
		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 2019-10-28 { reference S5-193518 ; }
		revision 2019-06-17 {
		description "Initial revision";
		}
		revision 2019-06-17 { reference "Initial revision"; }

		grouping EUtranFreqRelationGrp {
		description "Represents the EUtranFreqRelation IOC.";
		reference "3GPP TS 28.541";
		uses mf3gpp:ManagedFunctionGrp;

		leaf cellIndividualOffset {
		description "Offset applicable to a neighbouring cell. Used for
		@@ -31,22 +29,19 @@ module _3gpp-nr-nrm-eutranfreqrelation {
		Used by the HandOver parameter Optimization (HOO) function or
		Load Balancing Optimization (LBO) function.";
		reference "cellIndividualOffset in MeasObjectEUTRA in 3GPP TS 38.331";
		default 0;
		type types3gpp:QOffsetRange;
		}

		leaf-list blackListEntry {
		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";
		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.";
		min-elements 0;
		exclude-listed in SIB4 and SIB5.";
		type uint16 { range "0..1007"; }
		}

		@@ -83,7 +78,9 @@ module _3gpp-nr-nrm-eutranfreqrelation {
		leaf qOffsetFreq {
		description "The frequency specific offset applied when evaluating
		candidates for cell reselection.";
		type int32;
		type int32 { range "-24 \| -22 \| -20 \| -18 \| -16 \| -14 \| -12 \| -10 " +
		"\| -8 \| -6 \| -5 \| -4 \| -3 \| -2 \| -1 \| 0 \| 1 \| 2 \| 3 \| 4 \| 5 \| 6 " +
		"\| 8 \| 10 \| 12 \| 14 \| 16 \| 18 \| 20 \| 22 \| 24"; }
		default 0;
		}

		@@ -148,7 +145,7 @@ module _3gpp-nr-nrm-eutranfreqrelation {
		serving frequency. Each frequency of NR and E-UTRAN might have a
		specific threshold.";
		reference "ThreshX, LowQ in 3GPP TS 38.304";
		mandatory false;
		mandatory true;
		type int32 { range "0..31"; }
		units dB;
		}
		@@ -191,7 +188,8 @@ module _3gpp-nr-nrm-eutranfreqrelation {
		}
		}

		augment /me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/nrcellcu3gpp:NRCellCU {
		augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" +
		"nrcellcu3gpp:NRCellCU" {

		list EUtranFreqRelation {
		description "Represents a frequency relation between an NR cell and an
		@@ -202,7 +200,6 @@ module _3gpp-nr-nrm-eutranfreqrelation {
		container attributes {
		uses EUtranFreqRelationGrp;
		}
		uses mf3gpp:ManagedFunctionContainedClasses;
		}
		}
		}
		No newline at end of file

yang-models/_3gpp-nr-nrm-nrcellrelation.yang

+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 {