Locally rebased and merged https://forge.3gpp.org/rep/sa5/MnS/-/merge_requests/1855 (d40ca877) · Commits · SA5 – Management & Orchestration and Charging / Management and Orchestration APIs

yang-models/_3gpp-common-trace.yang

+51 −39

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-08-06 { reference CR-0563; }
		revision 2025-06-24 { reference "CR-0550"; }
		revision 2025-05-06 { reference "CR-0531 CR-0535" ; }
		revision 2025-02-06 { reference "CR-0503 CR-0507" ; }
		@@ -115,46 +116,57 @@ module _3gpp-common-trace {
		This <<dataType>> defines an area scope";

		choice AreaScopeChoice {
		case eutran-only {
		leaf-list eutraCellIdList {
		type string;
		min-elements 1;
		max-elements 32;
		description "List of E-UTRAN cells identified by E-UTRAN-CGI";
		}

		leaf-list nrCellIdList {
		type string;
		min-elements 1;
		max-elements 32;
		description "List of NR cells identified by NG-RAN CGI";
		}

		case tac {
		leaf-list tacList {
		type types3gpp:Tac;
		min-elements 1;
		max-elements 8;
		description "Tracking Area Code list";
		}

		leaf-list cAGIdList {
		type string;
		max-elements 256;
		description "It identifies a CAG list containing up to
		256 CAG-identifiers per UE or up to 12 CAG-identifiers
		per cell, see TS 38.331 [38]. CAG ID is used to combine
		with PLMN ID to identify a PNI-NPN.AG ID is a hexadecimal
		range with size 32 bit.";
		}
		}
		case else {
		list nPNIdentityList {
		description "list of NPN IDs of in NR. It is either
		a list of PNI-NPNs identified by CAG ID with
		associated plmn-Identity or a list of SNPN
		identified by Network ID with associated plmn-Identity";
		key idx;
		min-elements 1;
		uses types3gpp:NpnIdGrp;
		leaf idx { type string; }
		}
		leaf-list nrCellIdList {
		must 'not(../taiList)';
		type string;
		max-elements 32;
		description "List of NR cells identified by NG-RAN CGI";
		}
		list taiList {
		must 'not(../nrCellIdList)';
		description "Tracking Area Identity list";
		key idx;
		min-elements 1;
		max-elements 8;
		leaf idx { type string; }
		uses types3gpp:TaiGrp;
		}
		}

		list nPNIdentityList {
		description "It defines which NPNs that can be served by the NR cell,
		and which CAG IDs or NIDs can be supported by the NR cell for
		corresponding PNI-NPN or SNPN in case of the cell is NPN-only cell.
		(NPN-Identity referring to TS 38.331).";
		key idx;
		min-elements 1;
		uses NpnIdGrp;
		leaf idx { type string; }
		}
		}

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

+42 −0

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

		revision 2025-08-18 { reference CR-1557; }
		revision 2025-08-06 { reference CR-0563; }
		revision 2025-02-18 { reference CR-0511; }
		revision 2025-02-06 { reference CR-0507; }
		revision 2024-05-18 { reference CR-0359; }
		@@ -299,6 +300,47 @@ module _3gpp-common-yang-types {
		}
		}

		grouping NpnIdGrp {
		description "Represents the NPN supported by the <<IOC>> using this
		<<dataType>> as one of its attributes in case of the cell is a
		NPN-only cell.";

		list plmnId {
		key "mcc mnc";
		min-elements 1;
		description "It specifies the PLMN Id of the NPN network.";
		uses types3gpp:PLMNId;
		}

		choice npnidChoice {
		leaf-list cAGIdList {
		type string {
		pattern '^[A-Fa-f0-9]{8}$';
		}
		max-elements 256;
		description "It identifies a CAG list containing up to 12
		CAG-identifiers per Ue or up to 12 CAG-identifiers per cell,
		see TS 38.331.
		CAG ID is used to combine with PLMN ID to identify a PNI-NPN.CAG ID is
		a hexadecimal range with size 32 bit";
		}

		leaf-list nIDList {
		type string {
		pattern '^[A-Fa-f0-9]{11}$';
		}
		max-elements 16;
		description "It identifies a list of NIDs containing up to 16 NIDs, see
		TS 38.331. NID is used to combine with PLMN ID to identify an SNPN.
		NID is a hexadecimal range with size 44 bit.";
		}
		}
		}





		typedef TenthOfDegrees {
		type uint16 {
		range 0..3600;