Merge branch... (77982f7d) · Commits · SA5 – Management & Orchestration and Charging / Management and Orchestration APIs

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

+11 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,7 @@ module _3gpp-common-managed-element {
		import _3gpp-common-files { prefix files3gpp; }
		import _3gpp-5gc-nrm-configurable5qiset { prefix fiveqi3gpp; }
		import _3gpp-5gc-nrm-ecmconnectioninfo { prefix econn3gpp ; }
		import _3gpp-nr-nrm-ecmappingrule { prefix ecmap3gpp ; }

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

		revision 2024-08-21 { reference CR-1337 ; }
		revision 2024-01-30 { reference CR-0328 ; }
		revision 2023-11-14 { reference CR-0305 ; }
		revision 2023-09-18 { reference CR-0271 ; }
		@@ -49,6 +51,10 @@ module _3gpp-common-managed-element {
		revision 2019-06-17 { reference " S5-203316"; }
		revision 2019-05-08 { reference "Initial revision"; }

		feature ECMappingRuleUnderManagedElement {
		description "ECMappingRule shall be contained under ManagedElement.";
		}

		feature EcmConnectionInfoUnderManagedElement {
		description "The EcmConnectionInfo shall be contained under
		ManagedElement";
		@@ -304,5 +310,10 @@ module _3gpp-common-managed-element {
		uses econn3gpp:EcmConnectionInfoSubtree {
		if-feature EcmConnectionInfoUnderManagedElement;
		}

		uses ecmap3gpp:NRECMappingRuleSubtree {
		if-feature ECMappingRuleUnderManagedElement;
		}

		}
		}

yang-models/_3gpp-common-subnetwork.yang

+12 −1

Original line number	Diff line number	Diff line
		@@ -13,6 +13,7 @@ module _3gpp-common-subnetwork {
		import _3gpp-common-files { prefix files3gpp; }
		import _3gpp-5gc-nrm-configurable5qiset { prefix fiveqi3gpp; }
		import _3gpp-5gc-nrm-ecmconnectioninfo { prefix econn3gpp ; }
		import _3gpp-nr-nrm-ecmappingrule { prefix ecmap3gpp ; }

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

		revision 2024-01-30 { reference CR-1337 ; }
		revision 2024-01-30 { reference CR-0328 ; }
		revision 2023-11-14 { reference CR-0305 ; }
		revision 2023-09-18 { reference CR-0271 ; }
		@@ -61,6 +63,10 @@ module _3gpp-common-subnetwork {
		reference "Initial revision";
		}

		feature ECMappingRuleUnderSubNetwork {
		description "ECMappingRule shall be contained under SubNetwork.";
		}

		feature EcmConnectionInfoUnderSubNetwork {
		description "The EcmConnectionInfo shall be contained under
		Subnetwork";
		@@ -264,6 +270,11 @@ module _3gpp-common-subnetwork {
		if-feature EcmConnectionInfoUnderSubNetwork;
		}

		uses ecmap3gpp:NRECMappingRuleSubtree {
		if-feature EcmConnectionInfoUnderSubNetwork;
		}


		yangmnt:mount-point children-of-SubNetwork {
		description "Mountpoint for ManagedElement";
		reference "RFC8528 YANG Schema Mount";

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

0 → 100644

+56 −0

Original line number	Diff line number	Diff line
		module _3gpp-nr-nrm-ecmappingrule {
		yang-version 1.1;
		namespace urn:3gpp:sa5:_3gpp-nr-nrm-ecmappingrule;
		prefix ecmap3gpp;

		import _3gpp-common-top { prefix top3gpp; }

		organization "3gpp SA5";
		contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
		description "This IOC represents the unified mapping rule input to support
		Energy Cost Index Mapping when Energy Cost Reporting.
		Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
		TTA, TTC). All rights reserved.";
		reference "3GPP TS 28.541";

		revision 2024-08-21 { reference CR-1337 ; }

		grouping NRECMappingRuleGrp {
		description "Represents the unified mapping rule to support Energy Cost Mapping
		when Energy Cost Reporting is supported. Can be name-contained by SubNetwork
		or ManagedElement. It applies to all ManagedEntity contained by the parent.";
		leaf eCMRInputMinValue {
		type uint8;
		description "The minimum value of to be applied
		for mapping from this attribute to the energy cost.";
		}

		leaf eCMRInputMaxValue {
		type uint8;
		description "The maximum value of to be applied
		for mapping from this attribute to the energy cost.";
		}

		leaf eCTimeInterval {
		type uint8;
		description "Time interval (in seconds) that
		should be applied for collecting values of mapping
		rule attribute to be used for computing the energy cost.";
		units seconds;
		}
		}

		grouping NRECMappingRuleSubtree {
		description "Helps augmenting NRECMappingRule into multiple places.";
		list NRECMappingRule {
		key id;
		uses top3gpp:Top_Grp;
		min-elements 1;
		max-elements 1;
		leaf idx { type uint32; }
		container attributes {
		uses NRECMappingRuleGrp;
		}
		}
		}
		}

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

+9 −1

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ module _3gpp-nr-nrm-gnbcucpfunction {
		TTA, TTC). All rights reserved.";
		reference "3GPP TS 28.541 5G Network Resource Model (NRM)";

		revision 2024-08-21 { reference CR-1337 ; }
		revision 2024-05-24 { reference CR-1273 ; }
		revision 2024-04-04 { reference CR-1139; }
		revision 2024-02-24 { reference CR-1218; }
		@@ -180,6 +181,13 @@ module _3gpp-nr-nrm-gnbcucpfunction {
		type types3gpp:DistinguishedName;
		description "This is the DN of EphemerisInfoSet.";
		}

		leaf nRECMappingRuleRef {
		type types3gpp:DistinguishedName;
		description "DN of a NRECMappingRule. An empty value indicates the
		NRECMappingRule contained by parent, e.g. ManagedElement or
		SubNetwork, applies.";
		}
		}

		grouping QceIdMappingInfoGrp {