Merge branch 'YANG_Corrections_Rel20-SA5-163_28.111_28.623_28.541' into... (db7bd4e2) · Commits · SA5 – Management & Orchestration and Charging / Management and Orchestration APIs

yang-models/_3gpp-common-ep-rp.yang

+4 −2

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@ module _3gpp-common-ep-rp {
		description "Common/basic class/grouping to be inherited/reused.
		This IOC represents an end point of a link used across a reference
		point between two network entities.
		Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
		Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
		TTA, TTC). All rights reserved.";
		reference
		"3GPP TS 28.622
		@@ -23,6 +23,7 @@ module _3gpp-common-ep-rp {
		3GPP TS 28.620
		Umbrella Information Model (UIM)";

		revision 2025-10-01 { reference CR-0578 ; }
		revision 2023-09-18 { reference CR-0271 ; }
		revision 2020-06-08 { reference "CR-0092"; }

		@@ -49,11 +50,12 @@ module _3gpp-common-ep-rp {
		config false;
		type types3gpp:DistinguishedName;
		}

		uses meas3gpp:SupportedPerfMetricGroupGrp;
		}

		grouping EP_Common {
		uses EP_RPGrp;
		uses meas3gpp:SupportedPerfMetricGroupGrp;
		list localAddress {
		description "Local IP address and VLAN ID.";
		key "ipAddress vlanId";

yang-models/_3gpp-common-trace.yang

+5 −4

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-10-01 { reference "CR-0578" ; }
		revision 2025-08-07 { reference "CR-0551 CR-0552 CR-0562" ; }
		revision 2025-05-07 { reference "CR-0532 CR-0536 CR-0540" ; }
		revision 2025-02-07 { reference "CR-0504" ; }
		@@ -1585,7 +1586,7 @@ module _3gpp-common-trace {
		reference "clause 5.10.38 of TS 32.422";
		}

		list areaConfigurationForNeighCells {
		list areaConfigurationForNeighCell {
		when '../../../jobType = "LOGGED_MDT_ONLY" or'
		+ ' ../../../jobType = "IMMEDIATE_MDT_AND_LOGGED_MDT"';
		key "idx";
		@@ -1731,7 +1732,7 @@ module _3gpp-common-trace {
		trsrPrefixLength defines the size of base TRSR prefix.";
		reference "Clause 5.10 of 3GPP TS 32.422.";
		leaf idx { type uint32 ; }
		uses trace3gpp:trsrPrefixCfgGrp ;
		uses trace3gpp:TrsrPrefixCfgGrp ;
		}
		}

		@@ -1786,8 +1787,8 @@ module _3gpp-common-trace {
		}
		}

		grouping trsrPrefixCfgGrp {
		leaf trstPrefix {
		grouping TrsrPrefixCfgGrp {
		leaf trsrPrefix {
		type string;
		mandatory true;
		description "A 2 byte Octet String. This is the base TRSR prefix";

yang-models/_3gpp-common-yang-types.yang

+2 −1

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@ module _3gpp-common-yang-types {
		reference "3GPP TS 28.623";


		revision 2025-10-01 { reference "CR-0578" ; }
		revision 2025-08-31 { reference "CR-0551 CR-0556 CR-0562"; }
		revision 2025-02-19 { reference CR-0512; }
		revision 2025-02-07 { reference CR-0492; }
		@@ -103,7 +104,7 @@ module _3gpp-common-yang-types {
		}

		typedef FullTime {
		type yang:time-with-zone-offset;
		type yang:time;
		}

		grouping DayInYearGrp {

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

+22 −2

Original line number	Diff line number	Diff line
		@@ -9,6 +9,7 @@ module _3gpp-nr-nrm-ep {
		import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; }
		import _3gpp-nr-nrm-gnbcuupfunction { prefix gnbcuup3gpp; }
		import _3gpp-nr-nrm-gnbdufunction { prefix gnbdu3gpp; }
		import _3gpp-common-yang-types { prefix types3gpp ; }

		organization "3GPP SA5";
		contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
		@@ -19,6 +20,7 @@ module _3gpp-nr-nrm-ep {
		TTA, TTC). All rights reserved.";
		reference "3GPP TS 28.541 5G Network Resource Model (NRM)";

		revision 2025-10-01 { reference CR-1617 ; }
		revision 2025-05-06 { reference "CR-1526 CR-1527" ; } // common for R18, R19
		revision 2023-09-18 { reference CR-1043 ; }
		revision 2022-01-07 { reference CR-0643; }
		@@ -47,6 +49,11 @@ module _3gpp-nr-nrm-ep {
		uses eprp3gpp:EP_Common;
		}

		grouping EP_F1CGrp {
		description "Attributes of IOC EP_F1U";
		uses eprp3gpp:EP_Common;
		}

		grouping EP_F1CSubtree {
		list EP_F1C {
		description "Represents the local end point of the control plane
		@@ -55,9 +62,22 @@ module _3gpp-nr-nrm-ep {
		key id;
		uses top3gpp:Top_Grp;
		container attributes {
		uses eprp3gpp:EP_Common;
		uses EP_F1CGrp;
		}
		}
		}

		grouping EP_F1UGrp {
		description "Attributes of IOC EP_F1U";
		uses eprp3gpp:EP_Common;

		leaf-list epTransportRef {
		type types3gpp:DistinguishedName;
		config false;
		description "This parameter specifies a list of transport level EPs
		associated with the application level EP (i.e. EP_N3 or EP_NgU or
		EP_F1U) or network slice subnet.";
		}
		}

		grouping EP_F1USubtree {
		@@ -68,7 +88,7 @@ module _3gpp-nr-nrm-ep {
		key id;
		uses top3gpp:Top_Grp;
		container attributes {
		uses eprp3gpp:EP_Common;
		uses EP_F1UGrp;
		}
		}
		}

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

+6 −4

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ module _3gpp-nr-nrm-iabfunction {
		reference "3GPP TS 28.541; 3GPP TS 28.314; 3GPP TS 28.315; 3GPP TS 33.310,
		IETF RFC 9811";

		revision 2025-10-01 { reference "CR-1617" ; }
		revision 2025-08-15 { reference "CR-1598"; }

		grouping CaraConfigurationGrp {
		@@ -170,7 +171,8 @@ module _3gpp-nr-nrm-iabfunction {
		uses LocationInfoGrp;
		}
		}
		grouping IabSubTree {

		grouping IABSubTree {
		description "Contains classes that manage IAB function management";

		list IAB {
		@@ -191,7 +193,7 @@ module _3gpp-nr-nrm-iabfunction {

		augment /me3gpp:ManagedElement {
		if-feature IABUnderManagedElement;
		uses IabSubTree;
		uses IABSubTree;
		}

		feature IABUnderSubNetwork {
		@@ -200,6 +202,6 @@ module _3gpp-nr-nrm-iabfunction {

		augment /subnet3gpp:SubNetwork {
		if-feature IABUnderSubNetwork;
		uses IabSubTree;
		uses IABSubTree;
		}
		}
		No newline at end of file