Merge branch 'YANG_Corrections_28.111_28.623_28.541_Rel19-SA5-161' into... (b1e39791) · Commits · SA5 – Management & Orchestration and Charging / Management and Orchestration APIs

yang-models/_3gpp-common-managed-element.yang

+10 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@ module _3gpp-common-managed-element {
		import _3gpp-5gc-nrm-ecmconnectioninfo { prefix econn3gpp ; }
		import _3gpp-nr-nrm-ecmappingrule { prefix ecmap3gpp ; }
		import _3gpp-5gc-nrm-stmfunction { prefix stm3gpp; }
		import _3gpp-nr-nrm-mwab { prefix mwab3gpp; }

		organization "3GPP SA5";
		contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
		@@ -36,6 +37,7 @@ module _3gpp-common-managed-element {
		3GPP TS 28.620
		Umbrella Information Model (UIM)";

		revision 2025-04-25 { reference CR-1527 ; }
		revision 2025-03-25 { reference "CR-0516"; }
		revision 2024-10-01 { reference "CR-0437,CR-0438" ; }
		revision 2024-01-30 { reference CR-0328 ; }
		@@ -133,6 +135,10 @@ module _3gpp-common-managed-element {
		description "The StmCtrlSubtree shall be contained under ManagedElement";
		}

		feature MWABUnderManagedElement {
		description "The MWAB shall be contained under ManagedElement";
		}

		grouping ManagedElement_Grp {
		description "Abstract class representing telecommunications resources.
		An ME communicates with a manager (directly or indirectly) for the
		@@ -326,5 +332,9 @@ module _3gpp-common-managed-element {
		uses stm3gpp:StmCtrlSubTree {
		if-feature StmCtrlUnderManagedElement ;
		}

		uses mwab3gpp:MWABSubTree {
		if-feature MWABUnderManagedElement ;
		}
		}
		}

yang-models/_3gpp-common-managed-function.yang

+138 −136

Original line number	Diff line number	Diff line
		@@ -161,34 +161,9 @@ module _3gpp-common-managed-function {
		description "A user-friendly (and user assignable) name of this object.";
		}
		}

		grouping ManagedFunctionGrp {
		description "Abstract root class to be inherited/reused by classes
		representing 3GPP functions.

		Anywhere this grouping is used by classes inheriting from ManagedFunction
		the list representing the inheriting class needs to include all
		contained classes of ManagedFunction too. Contained classes are
		either
		- augmented into the Function class or
		- shall be included in the list representing the inheriting class
		using the grouping ManagedFunctionContainedClasses:
		1) EP_RP solved using augment
		2) uses mf3gpp:ManagedFunctionContainedClasses;
		";

		uses Function_Grp;

		list vnfParametersList {
		key vnfInstanceId;
		description "Contains the parameter set of the VNF
		instance(s) corresponding to an NE.
		The presence of this list indicates that the ManagedFunction
		represented is realized by one or more VNF instance(s). Otherwise it
		shall be absent.
		The presence of a vnfParametersList entry, whose vnfInstanceId with a
		string length of zero, in createMO operation can trigger the
		instantiation of the related VNF/VNFC instances.";
		grouping VnfParametersGrp {
		description "This <<dataType>> represents the parameter set of the VNF
		instance(s) corresponding to an NE.";

		leaf vnfInstanceId {
		type string ;
		@@ -231,14 +206,11 @@ module _3gpp-common-managed-function {
		}
		}

		list peeParametersList {
		key idx;
		description "Contains the parameter set for the control
		and monitoring of power, energy and environmental parameters of
		ManagedFunction instance(s).";

		grouping PeeParametersGrp {
		description "This <<dataType>> represents the parameter list for the
		control and monitoring of power, energy and environmental parameters
		of ManagedFunction instance(s).";
		leaf idx { type uint32; }

		leaf siteIdentification {
		type string;
		mandatory true;
		@@ -283,7 +255,6 @@ module _3gpp-common-managed-function {
		NRSectorCarrier instance(s).";
		}


		leaf siteDescription {
		type string;
		mandatory true;
		@@ -315,8 +286,39 @@ module _3gpp-common-managed-function {
		}
		}

		grouping ManagedFunctionGrp {
		description "Abstract root class to be inherited/reused by classes
		representing 3GPP functions.

		Anywhere this grouping is used by classes inheriting from ManagedFunction
		the list representing the inheriting class needs to include all
		contained classes of ManagedFunction too. Contained classes are
		either
		- augmented into the Function class or
		- shall be included in the list representing the inheriting class
		using the grouping ManagedFunctionContainedClasses:
		1) EP_RP solved using augment
		2) uses mf3gpp:ManagedFunctionContainedClasses;
		";

		uses Function_Grp;
		list vnfParametersList {
		key "vnfInstanceId";
		uses VnfParametersGrp;
		description "This attribute contains the parameter set of the VNF
		instance(s) corresponding to an NE. The presence of this attribute
		indicates that the ManagedFunction represented by the MOI is a
		virtualized function ";
		}
		list peeParameterslist{
		key "idx";
		uses PeeParametersGrp;
		description "This attribute contains the parameter list for the control
		and monitoring of power, energy and environmental parameters of
		ManagedFunction instance(s). ";
		}

		leaf priorityLabel {
		mandatory true;
		type uint32;
		}

yang-models/_3gpp-common-measurements.yang

+2 −1

Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@ module _3gpp-common-measurements {

		Measurements can be contained under ManagedElement, SubNetwork, or
		any list representing a class inheriting from Subnetwork or
		ManagedFunction. Note: KPIs will only be supported under SubNetwork
		ManagedFunction.
		Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
		TTA, TTC). All rights reserved.";
		reference "3GPP TS 28.623
		@@ -56,6 +56,7 @@ module _3gpp-common-measurements {
		Integration Reference Point (IRP);
		Information Service (IS)";

		revision 2025-05-19 { reference CR-0532; }
		revision 2025-02-07 { reference CR-0461; }
		revision 2025-01-29 { reference CR-0512; }
		revision 2024-11-01 { reference CR-0488; }

yang-models/_3gpp-common-subnetwork.yang

+11 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@ module _3gpp-common-subnetwork {
		import _3gpp-5gc-nrm-ecmconnectioninfo { prefix econn3gpp ; }
		import _3gpp-nr-nrm-ecmappingrule { prefix ecmap3gpp ; }
		import _3gpp-5gc-nrm-stmfunction { prefix stm3gpp; }
		import _3gpp-nr-nrm-mwab { prefix mwab3gpp; }

		organization "3GPP SA5";
		contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
		@@ -36,6 +37,7 @@ module _3gpp-common-subnetwork {
		3GPP TS 28.620
		Umbrella Information Model (UIM)";

		revision 2025-04-25 { reference CR-1527 ; }
		revision 2025-03-25 { reference "CR-0516 CR-0527"; }
		revision 2024-11-19 { reference "Add STM"; }
		revision 2024-01-30 { reference CR-1337 ; }
		@@ -150,6 +152,10 @@ module _3gpp-common-subnetwork {
		description "The StmCtrlSubtree shall be contained under SubNetwork";
		}

		feature MWABUnderSubNetwork {
		description "The MWAB shall be contained under SubNetwork";
		}

		grouping Domain_Grp {
		description "A domain is a partition of instances of managed entities
		such that :
		@@ -266,6 +272,11 @@ module _3gpp-common-subnetwork {
		if-feature StmCtrlUnderManagedSubNetwork ;
		}


		uses mwab3gpp:MWABSubTree {
		if-feature MWABUnderSubNetwork ;
		}

		yangmnt:mount-point children-of-SubNetwork {
		description "Mountpoint for contained ManagedElements and SubNetworks";
		reference "RFC8528 YANG Schema Mount";

yang-models/_3gpp-common-trace.yang

+1 −1

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-05-07 { reference "CR-0532" ; }
		revision 2025-02-07 { reference "CR-0504" ; }
		revision 2025-02-05 { reference "CR-0461" ; }
		revision 2024-11-25 { reference "CR-0492" ; }
		@@ -1749,7 +1750,6 @@ module _3gpp-common-trace {
		type string;
		yext3gpp:inVariant;
		description "Identifier of a TraceJob";
		yext3gpp:inVariant;
		}

		leaf traceReportingFormat {