Corrrect NpnId defintions for _3gpp-common-trace.yang... (3be825c3) · Commits · SA5 – Management & Orchestration and Charging / Management and Orchestration APIs

yang-models/_3gpp-common-trace.yang

+4 −28

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

		revision 2024-11-25 { reference CR-0942; }
		revision 2024-11-07 { reference "CR-0480"; }
		revision 2024-10-01 { reference "CR-0457"; }
		revision 2024-08-13 { reference "CR-0387 CR-0377"; }
		@@ -158,32 +159,7 @@ module _3gpp-common-trace {
		identified by Network ID with associated plmn-Identity";
		key idx;
		min-elements 1;
		uses NpnIdGrp;
		leaf idx { type string; }
		}
		}

		grouping NpnIdGrp {
		description "Represents the NpnId dataType.";

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

		list cAGIdList {
		key idx;
		max-elements 256;
		description "It specifies the PNI-NPN identified by CAG ID ";
		leaf idx { type string; }
		}

		list nIDList {
		key idx;
		max-elements 16;
		description "It specifies the SNPN identified by Network ID";
		uses types3gpp:NpnIdGrp;
		leaf idx { type string; }
		}
		}
		@@ -1430,7 +1406,7 @@ module _3gpp-common-trace {
		corresponding PNI-NPN or SNPN.";
		key idx;
		max-elements 1;
		uses NpnIdGrp;
		uses types3gpp:NpnIdGrp;
		leaf idx { type string;}
		}
		}
		@@ -1798,7 +1774,7 @@ module _3gpp-common-trace {
		several NPNs are supported in the RAN.";
		key idx;
		max-elements 1;
		uses NpnIdGrp;
		uses types3gpp:NpnIdGrp;
		leaf idx { type string;}
		}
		}

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

+18 −24

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@ module _3gpp-common-yang-types {
		TTA, TTC). All rights reserved.";
		reference "3GPP TS 28.623";

		revision 2024-11-25 { reference CR-0942; }
		revision 2024-11-25 { reference CR-1442; }
		revision 2024-11-25 { reference CR-1412; }
		revision 2024-11-01 { reference CR-0463; }
		@@ -301,42 +302,35 @@ module _3gpp-common-yang-types {
		yext3gpp:notNotifyable;
		}
		}
		grouping NPNIdGrp {
		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 {
		list plmnId {
		key "mcc mnc";
		min-elements 1;
		description "PLMNId";
		description "It specifies the PLMN Id of the NPN network.";
		uses types3gpp:PLMNId;
		}

		leaf cAGIdList {
		type string;
		mandatory true;
		list cAGIdList {
		key idx;
		max-elements 256;
		description "It identifies a CAG list containing up to 12 CAG-identifiers
		per PLMN Identity, see TS 38.331.

		CAG is used for the PNI-NPNs to prevent UE(s), which are not allowed
		to access the NPN via the associated cell(s), from automatically
		selecting and accessing the associated CAG cell(s).

		CAG ID is used to combine with PLMN ID to identify a PNI-NPN.

		Exist if the cell is a NPN-only cell see TS 38.331";
		}

		leaf nIDList {
		type string;
		mandatory true;
		description "It identifies a list of NIDs containing up to 12 NIDs per
		PLMN Identity, see TS 38.331.

		NID is used to combine with PLMN ID to identify an SNPN.

		Exist if the cell is a NPN-only cell see TS 38.331";
		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.CAG ID is
		a hexadecimal range with size 32 bit";
		leaf idx { type string; }
		}

		list nIDList {
		key idx;
		max-elements 16;
		description "It identifies a list of NIDs containing up to 16 NIDs, see
		TS 38.331 [38].NID is used to combine with PLMN ID to identify an SNPN.
		NID is a hexadecimal range with size 44 bit.";
		leaf idx { type string; }
		}
		}

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

+2 −1

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

		revision 2024-11-25 { reference CR-0942; }
		revision 2024-05-25 { reference CR-1412 ; }
		revision 2024-05-24 { reference CR-1273 ; }
		revision 2023-09-18 { reference CR-1043 ; }
		@@ -105,7 +106,7 @@ module _3gpp-nr-nrm-nrcelldu {
		corresponding PNI-NPN or SNPN in case of the cell is NPN-only cell.";
		reference "3GPP TS 38.331";
		leaf idx { type uint32 ; }
		uses types3gpp:NPNIdGrp;
		uses types3gpp:NpnIdGrp;
		}

		leaf nRPCI {