Merge branch 'Integration_Rel18_SA5_167_YANG' into 'Rel-18' (fcd2b4b0) · Commits · SA5 – Management & Orchestration and Charging / Management and Orchestration APIs

yang-models/_3gpp-5gc-nrm-predefinedpccruleset.yang

+17 −3

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@ module _3gpp-5gc-nrm-predefinedpccruleset {

		import _3gpp-common-managed-element { prefix me3gpp; }
		import _3gpp-common-top { prefix top3gpp; }
		import _3gpp-common-yang-types { prefix types3gpp; }
		import _3gpp-5gc-nrm-smffunction { prefix smf3gpp; }
		import _3gpp-5gc-nrm-pcffunction { prefix pcf3gpp; }
		import ietf-yang-types { prefix yang; }
		@@ -14,10 +15,11 @@ module _3gpp-5gc-nrm-predefinedpccruleset {
		contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
		description "This IOC represents the predefined PCC rules, which are
		configured to SMF and referenced by PCF.
		Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
		Copyright 2026, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
		TTA, TTC). All rights reserved.";
		reference "3GPP TS 28.541";

		revision 2026-03-18 { reference CR-1696 ; }
		revision 2023-09-18 { reference CR-1043 ; }
		revision 2023-04-26 { reference CR-0916; }
		revision 2020-10-04 { reference "CR-0393"; }
		@@ -234,7 +236,7 @@ module _3gpp-5gc-nrm-predefinedpccruleset {
		}
		}

		grouping TrafficControlDataInformation {
		grouping TrafficControlDataGrp {
		description "It specifies the traffic control data for a service
		flow of a PCC rule.";
		leaf tcId {
		@@ -298,6 +300,11 @@ module _3gpp-5gc-nrm-predefinedpccruleset {
		uses RouteToLocation;
		}
		}
		leaf traffCorreInd {
		type boolean;
		default false;
		description "It indicates the traffic correlation.";
		}
		uses UpPathChgEvent;
		leaf steerFun {
		type enumeration {
		@@ -323,6 +330,13 @@ module _3gpp-5gc-nrm-predefinedpccruleset {
		}
		description "It indicates whether the service data flow, corresponding to the service data flow template, is allowed or not allowed.";
		}
		list sNSSAIList {
		description "It represents the list of S-NSSAI the managed object is
		supporting. The S-NSSAI is defined in 3GPP TS 23.003.";
		key idx;
		leaf idx { type uint32 ; }
		uses types3gpp:SNssai;
		}
		}

		grouping ARP {
		@@ -595,7 +609,7 @@ module _3gpp-5gc-nrm-predefinedpccruleset {
		list trafficControlDataInfo {
		description "The list of traffic control policy data.";
		key "tcId";
		uses TrafficControlDataInformation;
		uses TrafficControlDataGrp;
		}
		}
		uses ConditionData;

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -15,10 +15,11 @@ module _3gpp-nr-nrm-nrcelldu {
		contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
		description "Defines the YANG mapping of the NRCellDU Information Object
		Class (IOC) that is part of the NR Network Resource Model (NRM).
		Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
		Copyright 2026, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
		TTA, TTC). All rights reserved.";
		reference "3GPP TS 28.541 5G Network Resource Model (NRM)";

		revision 2026-03-18 { reference CR-1697 ; }
		revision 2024-05-24 { reference CR-1273 ; }
		revision 2023-09-18 { reference CR-1043 ; }
		revision 2022-07-28 { reference "CR-0770"; }
		@@ -368,7 +369,6 @@ module _3gpp-nr-nrm-nrcelldu {

		leaf-list nRSectorCarrierRef {
		description "Reference to corresponding NRSectorCarrier instance.";
		min-elements 1;
		type types3gpp:DistinguishedName;
		}

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

+8 −12

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ module _3gpp-nr-nrm-ntnfunction {
		TTA, TTC). All rights reserved.";
		reference "3GPP TS 28.541";

		revision 2026-05-06 { reference CR-1716 ; }
		revision 2024-05-24 { reference CR-1273 ; }

		feature NTNFunctionUnderSubNetwork {
		@@ -116,8 +117,7 @@ module _3gpp-nr-nrm-ntnfunction {
		config false;
		default 0;
		units meter;
		description "Satellite orbital parameter: semi major axis alpha,
		see NIMA TR 8350.2.
		description "Satellite orbital parameter: semi major axis alpha.
		Step of 4.249 * 10**-3 m.
		Actual value = 6500000 + field value * (4.249 * 10**-3).";
		}
		@@ -128,8 +128,7 @@ module _3gpp-nr-nrm-ntnfunction {
		}
		config false;
		default 0;
		description "Satellite orbital parameter: eccentricity e,
		see NIMA TR 8350.2.
		description "Satellite orbital parameter: eccentricity e.
		Step 1.431 * 10**-8.
		Actual value = field value * (1.431 * 10**-8).";
		}
		@@ -141,8 +140,7 @@ module _3gpp-nr-nrm-ntnfunction {
		config false;
		default 0;
		units radian;
		description "Satellite orbital parameter: argument of periapsis omega,
		see NIMA TR 8350.2.
		description "Satellite orbital parameter: argument of periapsis omega.
		Step of 2.341* 10**-8 rad.
		Actual value = field value * (2.341* 10**-8).";
		}
		@@ -155,7 +153,7 @@ module _3gpp-nr-nrm-ntnfunction {
		default 0;
		units radian;
		description "Satellite orbital parameter: longitude of ascending node
		OMEGA, see NIMA TR 8350.2.
		omega.
		Step of 2.341* 10**-8 rad.
		Actual value = field value * (2.341* 10**-8).";
		}
		@@ -167,8 +165,7 @@ module _3gpp-nr-nrm-ntnfunction {
		config false;
		default 0;
		units radian;
		description "Satellite orbital parameter: inclination i,
		see NIMA TR 8350.2.
		description "Satellite orbital parameter: inclination i.
		Step of 2.341* 10**-8 rad.
		Actual value = field value * (2.341* 10**-8).";
		}
		@@ -180,8 +177,7 @@ module _3gpp-nr-nrm-ntnfunction {
		config false;
		default 0;
		units radian;
		description "Satellite orbital parameter: Mean anomaly M at epoch time,
		see NIMA TR 8350.2.
		description "Satellite orbital parameter: Mean anomaly M at epoch time.
		Step of 2.341* 10**-8 rad.
		Actual value = field value * (2.341* 10**-8).";
		}
		@@ -221,7 +217,7 @@ module _3gpp-nr-nrm-ntnfunction {

		list orbital {
		description "It indicates ephemeris is in orbital parameter ephemeris
		format, as specified in NIMA TR 8350.2";
		format.";
		max-elements 1;
		config false;
		uses OrbitalGrp;