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

yang-models/_3gpp-common-trace.yang

+39 −25

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@ module _3gpp-common-trace {
		Integration Reference Point (IRP);
		Information Service (IS)" ;

		revision 2025-06-25 { reference "CR-0551" ; }
		revision 2025-08-07 { reference "CR-0551 CR-0562" ; }
		revision 2025-05-07 { reference "CR-0532 CR-0536 CR-0540" ; }
		revision 2025-02-07 { reference "CR-0504" ; }
		revision 2025-02-05 { reference "CR-0461" ; }
		@@ -116,53 +116,67 @@ module _3gpp-common-trace {
		description "This <<dataType>> defines an area scope.";

		choice AreaScopeChoice {

		case eutran-only {
		leaf-list eutraCellIdList {
		type string;
		type types3gpp:EutraCellId;
		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 types3gpp:CagId;
		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.";
		}
		}

		list sliceIdList {
		description "Network Slice Id list";
		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;
		uses types5g3gpp:PLMNInfo;
		min-elements 1;
		max-elements 16384;
		uses types3gpp:NpnIdGrp;
		leaf idx { type string; }
		}

		leaf-list nrCellIdList {
		must 'not(../taiList)';
		type types3gpp:NrCellId;
		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 "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";
		list sliceIdList {
		description "Network Slice Id list";
		key idx;
		uses types5g3gpp:PLMNInfo;
		min-elements 1;
		uses types3gpp:NpnIdGrp;
		max-elements 16384;
		leaf idx { type string; }
		}
		}

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

+56 −3

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


		revision 2025-08-31 { reference "CR-0551 CR-0556"; }
		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; }
		revision 2024-11-25 { reference CR-1442; }
		@@ -294,6 +294,39 @@ module _3gpp-common-yang-types {
		}
		}


		typedef EutraCellId {
		type string {
		pattern '^[A-Fa-f0-9]{7}$';
		}
		description "28-bit string identifying an E-UTRA Cell Id
		as specified in clause 9.3.1.9 of 3GPP TS 38.413
		in hexadecimal representation. Each character in the
		string shall take a value of '0' to '9', 'a' to 'f'
		or 'A' to 'F' and shall represent 4 bits.
		The most significant character representing the 4 most
		significant bits of the Cell Id shall appear first in the
		string, and the character representing the 4 least
		significant bit of the Cell Id shall appear last in the
		string.";
		}

		typedef NrCellId {
		type string {
		pattern '^[A-Fa-f0-9]{9}$';
		}
		description "36-bit string identifying an NR Cell Id
		as specified in clause 9.3.1.7 of 3GPP TS 38.413
		in hexadecimal representation. Each character in the
		string shall take a value of '0' to '9', 'a' to 'f'
		or 'A' to 'F' and shall represent 4 bits.
		The most significant character representing the 4 most
		significant bits of the Cell Id shall appear first in the
		string, and the character representing the 4 least
		significant bit of the Cell Id shall appear last in the
		string.";
		}

		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
		@@ -308,7 +341,7 @@ module _3gpp-common-yang-types {

		choice npnidChoice {
		leaf-list cAGIdList {
		type string;
		type CagId;
		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,
		@@ -318,7 +351,7 @@ module _3gpp-common-yang-types {
		}

		leaf-list nIDList {
		type string;
		type Nid;
		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.
		@@ -884,6 +917,26 @@ module _3gpp-common-yang-types {
		}
		}

		typedef Nid {
		description "This represents the Network Identifier, which
		together with a PLMN ID is used to identify a SNPN.";
		type string {
		pattern '^[A-Fa-f0-9]{11}$';
		}
		reference "3GPP TS 23.003 and 3GPP TS 23.501 clause 5.3.2.1.";
		}

		typedef CagId {
		description "This represents the identifier of a Closed Access
		Group (CAG), which together with a PLMN ID is used to
		identify a PNI-NPN.";
		type string {
		pattern '^[A-Fa-f0-9]{8}$';
		}
		reference "3GPP TS 23.003 and 3GPP TS 23.501.";
		}


		/* DistinguishedName pattern is built up based on the
		EBNF in 32.300 clause 7.3 EBNF of DN String Representation