correct rrmpolicy containment and lint errors (643dab16) · Commits · Miguel Angel Reina Ortega / Management and Orchestration APIs

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

+8 −8

Original line number	Diff line number	Diff line
		@@ -7,7 +7,6 @@ module _3gpp-nr-nrm-gnbcucpfunction {
		import _3gpp-common-managed-function { prefix mf3gpp; }
		import _3gpp-common-managed-element { prefix me3gpp; }
		import _3gpp-common-top { prefix top3gpp; }
		import _3gpp-nr-nrm-rrmpolicy { prefix nrrrmpolicy3gpp; }

		organization "3GPP SA5";
		contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
		@@ -15,6 +14,7 @@ module _3gpp-nr-nrm-gnbcucpfunction {
		Object Class (IOC) that is part of the NR Network Resource Model (NRM).";
		reference "3GPP TS 28.541 5G Network Resource Model (NRM)";

		revision 2022-07-28 { reference "CR-18-541-yang-corrections"; }
		revision 2021-11-06 { reference "CR-0611" ; }
		revision 2021-11-05 { reference "CR-0609"; }
		revision 2020-10-02 { reference CR-0384 ; }
		@@ -25,9 +25,7 @@ module _3gpp-nr-nrm-gnbcucpfunction {
		revision 2020-04-28 { reference "0260"; }
		revision 2020-02-14 { reference S5-20XXXX ; }
		revision 2019-10-28 { reference S5-193518 ; }
		revision 2019-06-17 {
		description "Initial revision";
		}
		revision 2019-06-17 { reference "Initial revision"; }

		feature DESManagementFunction {
		description "Classs representing Distributed SON Energy Saving feature";
		@@ -46,7 +44,6 @@ module _3gpp-nr-nrm-gnbcucpfunction {
		description "Represents the GNBCUCPFunction IOC.";
		reference "3GPP TS 28.541";
		uses mf3gpp:ManagedFunctionGrp;
		uses nrrrmpolicy3gpp:RRMPolicy_Grp;

		leaf gNBId {
		description "Identifies a gNB within a PLMN. The gNB Identifier (gNB ID)
		@@ -106,7 +103,8 @@ module _3gpp-nr-nrm-gnbcucpfunction {

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

		leaf-list x2HOBlackList {
		@@ -116,12 +114,14 @@ module _3gpp-nr-nrm-gnbcucpfunction {

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

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

		leaf dDAPSHOControl {

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -7,7 +7,6 @@ module _3gpp-nr-nrm-gnbcuupfunction {
		import _3gpp-common-managed-function { prefix mf3gpp; }
		import _3gpp-common-managed-element { prefix me3gpp; }
		import _3gpp-common-top { prefix top3gpp; }
		import _3gpp-nr-nrm-rrmpolicy { prefix nrrrmpolicy3gpp; }
		import _3gpp-5g-common-yang-types { prefix types5g3gpp; }

		organization "3GPP SA5";
		@@ -16,6 +15,7 @@ module _3gpp-nr-nrm-gnbcuupfunction {
		Object Class (IOC) that is part of the NR Network Resource Model (NRM).";
		reference "3GPP TS 28.541 5G Network Resource Model (NRM)";

		revision 2022-07-28 { reference "CR-18-541-yang-corrections"; }
		revision 2020-11-05 { reference CR-0412 ; }
		revision 2020-08-06 { reference "CR-0333"; }
		revision 2020-08-03 { reference "CR-0321"; }
		@@ -98,7 +98,6 @@ module _3gpp-nr-nrm-gnbcuupfunction {
		description "Represents the GNBCUUPFunction IOC.";
		reference "3GPP TS 28.541";
		uses mf3gpp:ManagedFunctionGrp;
		uses nrrrmpolicy3gpp:RRMPolicy_Grp;

		leaf gNBCUUPId {
		type uint64 {

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -6,7 +6,6 @@ module _3gpp-nr-nrm-gnbdufunction {
		import _3gpp-common-managed-function { prefix mf3gpp; }
		import _3gpp-common-managed-element { prefix me3gpp; }
		import _3gpp-common-top { prefix top3gpp; }
		import _3gpp-nr-nrm-rrmpolicy { prefix nrrrmpolicy3gpp; }
		import _3gpp-common-yang-types { prefix types3gpp; }

		organization "3GPP SA5";
		@@ -15,6 +14,7 @@ module _3gpp-nr-nrm-gnbdufunction {
		Object Class (IOC) that is part of the NR Network Resource Model (NRM).";
		reference "3GPP TS 28.541 5G Network Resource Model (NRM)";

		revision 2022-07-28 { reference "CR-18-541-yang-corrections"; }
		revision 2021-10-28 { reference CR-0607 ; }
		revision 2021-04-30 { reference CR-0490 ; }
		revision 2020-10-02 { reference CR-0384 ; }
		@@ -132,7 +132,6 @@ module _3gpp-nr-nrm-gnbdufunction {
		description "Represents the GNBDUFunction IOC.";
		reference "3GPP TS 28.541";
		uses mf3gpp:ManagedFunctionGrp;
		uses nrrrmpolicy3gpp:RRMPolicy_Grp;

		leaf gNBId {
		type int64 { range "0..4294967295"; }

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -8,7 +8,6 @@ module _3gpp-nr-nrm-nrcelldu {
		import _3gpp-common-managed-element { prefix me3gpp; }
		import _3gpp-common-top { prefix top3gpp; }
		import _3gpp-nr-nrm-gnbdufunction { prefix gnbdu3gpp; }
		import _3gpp-nr-nrm-rrmpolicy { prefix nrrrmpolicy3gpp; }
		import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
		import ietf-yang-types { prefix yang; }

		@@ -18,6 +17,7 @@ module _3gpp-nr-nrm-nrcelldu {
		Class (IOC) that is part of the NR Network Resource Model (NRM).";
		reference "3GPP TS 28.541 5G Network Resource Model (NRM)";

		revision 2022-07-28 { reference "CR-18-541-yang-corrections"; }
		revision 2021-10-28 { reference CR-0607 ; }
		revision 2021-01-25 { reference CR-0454 ; }
		revision 2020-11-25 { reference CR-0386 ; }
		@@ -81,7 +81,6 @@ module _3gpp-nr-nrm-nrcelldu {
		description "Represents the NRCellDU IOC.";
		reference "3GPP TS 28.541";
		uses mf3gpp:ManagedFunctionGrp;
		uses nrrrmpolicy3gpp:RRMPolicy_Grp;

		leaf cellLocalId {
		description "Identifies an NR cell of a gNB. Together with the

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

+91 −20

Original line number	Diff line number	Diff line
		module _3gpp-nr-nrm-rrmpolicy {
		yang-version 1.1;
		namespace "urn:3gpp:sa5:_3gpp-nr-nrm-rrmpolicy";
		prefix "nrrrmpolicy3gpp";
		prefix "rrmpolicy3gpp";

		import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
		import _3gpp-common-top { prefix top3gpp; }
		import _3gpp-common-managed-element { prefix me3gpp; }
		import _3gpp-nr-nrm-nrcellcu { prefix nrcellcu3gpp ; }
		import _3gpp-nr-nrm-nrcelldu { prefix nrcelldu3gpp ; }
		import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp ; }
		import _3gpp-nr-nrm-gnbcuupfunction { prefix gnbcuup3gpp ; }
		import _3gpp-nr-nrm-gnbdufunction { prefix gnbdu3gpp ; }

		organization "3GPP SA5";
		contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
		@@ -12,6 +18,7 @@ module _3gpp-nr-nrm-rrmpolicy {
		is part of the NR Network Resource Model (NRM).";
		reference "3GPP TS 28.541 5G Network Resource Model (NRM)";

		revision 2022-07-28 { reference "CR-18-541-yang-corrections"; }
		revision 2020-11-05 { reference CR-0412 ; }
		revision 2020-04-28 { reference "CR0285"; }
		revision 2020-02-14 { reference "Initial revision"; }
		@@ -26,13 +33,6 @@ module _3gpp-nr-nrm-rrmpolicy {
		uses types5g3gpp:PLMNInfo;
		}

		typedef CyclicPrefix {
		type enumeration {
		enum NORMAL;
		enum EXTENDED;
		}
		}

		grouping RRMPolicy_Grp {
		description "This IOC represents the properties of an abstract RRMPolicy
		. The RRMPolicy_ IOC needs to be subclassed to be instantiated.
		@@ -71,13 +71,11 @@ module _3gpp-nr-nrm-rrmpolicy {
		}
		} // grouping


		grouping RRMPolicyRatioGrp {
		description "Represents the RRMPolicyRatio concrete IOC.";

		uses RRMPolicy_Grp; // Inherits RRMPolicy_


		leaf rRMPolicyMaxRatio {
		description " This attribute specifies the maximum percentage of radio
		resource that can be used by the associated rRMPolicyMemberList.
		@@ -113,12 +111,61 @@ module _3gpp-nr-nrm-rrmpolicy {
		}
		}

		grouping RrmPolicySubtree {
		description "Contains RrmPolicy related classes.
		Should be used in all classes (or classes inheriting from)
		- NRCellCU, NRCellDU, GNBCUUPFunction, GNBCUCPFunction, GNBDUFunction

		If some YAM wants to augment these classes/list/groupings they must
		augment all user classes!";

		list RRMPolicyRatio {
		description " The RRMPolicyRatio IOC is one realization of a RRMPolicy_ IOC,
		see the inheritance in Figure 4.2.1.2-1. This RRM framework allows
		adding new policies, both standardized (like RRMPolicyRatio) or as
		vendor specific, by inheriting from the
		abstract RRMPolicy_ IOC. For details see subclause 4.3.36.";
		description "This IOC represents the properties of RRMPolicyRatio.
		RRMPolicyRatio is one realization of abstract RRMPolicy_ IOC.
		RRMPolicyRatio has three attributes, apart from those inherited
		(DN, resourceType, rRMPolicyMemberList).

		Structure of RRMPolicyRatio includes in order: Dedicated Resources,
		Prioritized Resources, Shared Resources, etc.

		- The attribute rRMPolicyMaxRatio defines the maximum resource usage
		quota for the associated rRMPolicyMemberList, including at least one of
		shared resources, prioritized resources and dedicated resources. The
		sum of the 'rRMPolicyMaxRatio' values assigned to all RRMPolicyRatio(s)
		name-contained by same MangedEntity can be greater than 100.
		- The attribute rRMPolicyMinRatio defines the minimum resource usage
		quota for the associated RRMPolicyMemberList, including at least one
		of prioritized resources and dedicated resources, which means the
		resources quota that need to be guaranteed for use by the associated
		rRMPolicyMemberList. The sum of the 'rRMPolicyMinRatio' values assigned
		to all RRMPolicyRatio(s) name-contained by same MangedEntity shall be
		less or equal 100.
		- The attribute rRMPolicyDedicatedRatio defines the dedicated resource
		usage quota for the RRMPolicyMemberList, including dedicated resources.
		The sum of the 'rRMPolicyDedicatedRatio' values assigned to all
		RRMPolicyRatio(s) name-contained by same MangedEntity shall be less
		or equal 100.

		The following are the definition for above mentioned three resource
		categories:
		- Shared resources: means the resources that are shared with other
		rRMPolicyMemberList(s) (i.e. the rRMPolicyMemberList(s) defined in
		RRMPolicyRatio(s) name-contained by the same ManagedEntity). The shared
		resources are not guaranteed for use by the associated
		rRMPolicyMemberList. The shared resources quota is represented by
		[rRMPolicyMaxRatio-rRMPolicyMinRatio].
		- Priortized resources: means the resources are preferentially used by
		the associated RRMPolicyMemberList. These resources are guaranteed for
		use by the associated RRMPolicyMemberList when it needs to use them.
		When not used, these resources may be used by other
		rRMPolicyMemberList(s) (i.e. the rRMPolicyMemberList(s) defined in
		RRMPolicyRatio(s) name-contained by the same ManagedEntity).
		The prioritized resources quota is represented by
		[rRMPolicyMinRatio-rRMPolicyDedicatedRatio]
		- Dedicated resources: means the resources are dedicated for use by
		the associated RRMPolicyMemberList. These resources can not be shared
		even if the associated RRMPolicyMember does not use them. The Dedicated
		resources quota is represented by [rRMPolicyDedicatedRatio].";
		key id;
		uses top3gpp:Top_Grp;
		container attributes {
		@@ -126,3 +173,27 @@ module _3gpp-nr-nrm-rrmpolicy {
		}
		}
		}

		augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/" +
		"nrcellcu3gpp:NRCellCU" {
		uses RrmPolicySubtree;
		}

		augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction/" +
		"nrcelldu3gpp:NRCellDU" {
		uses RrmPolicySubtree;
		}

		augment "/me3gpp:ManagedElement/gnbcuup3gpp:GNBCUUPFunction" {
		uses RrmPolicySubtree;
		}

		augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction" {
		uses RrmPolicySubtree;
		}

		augment "/me3gpp:ManagedElement/gnbdu3gpp:GNBDUFunction" {
		uses RrmPolicySubtree;
		}

		}
		No newline at end of file