Update neffunction and part of S5-25477 (2394839b) · Commits · SA5 – Management & Orchestration and Charging / Management and Orchestration APIs

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

+79 −1

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

		revision 2025-11-07 { reference CR-1640 ; }
		revision 2025-07-25 { reference CR-1558 ; }
		revision 2025-03-25 { reference CR-1489 ; }
		revision 2024-11-01 { reference CR-1405; }
		@@ -26,6 +27,83 @@ module _3gpp-5g-common-yang-types {
		revision 2020-11-05 { reference CR-0412 ; }
		revision 2019-10-20 { reference "Initial version."; }

		grouping AreaScopeGrp {
		description "This <<dataType>> defines an area scope.";

		choice AreaScopeChoice {

		case eutran-only {
		leaf-list eutraCellIdList {
		type types3gpp:EutraCellId;
		min-elements 1;
		max-elements 32;
		description "List of E-UTRAN cells identified by E-UTRAN-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.";
		}
		}

		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 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;
		max-elements 8;
		leaf idx { type string; }
		uses types3gpp:TaiGrp;
		}
		list ntnGeoAreaList {
		must 'not(../nrCellIdList)';
		description "geographical areas for NTN MDT";
		key idx;
		max-elements 8;
		leaf idx { type string; }
		uses types3gpp:GeoAreaGrp;
		}
		}
		}

		list sliceIdList {
		description "Network Slice Id list";
		key idx;
		uses PLMNInfo;
		min-elements 1;
		max-elements 16384;
		leaf idx { type string; }
		}
		}

		grouping IpInterfaceGrp {
		leaf-list ipv4EndpointAddresses {
		description "Available endpoint IPv4 address(es) of
		@@ -114,7 +192,7 @@ module _3gpp-5g-common-yang-types {
		min-elements 1;
		max-elements 1;
		key "sst sd";
		uses types5g3gpp:SNssai;
		uses SNssai;
		}

		list dnnSmfInfoList {

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

+41 −0

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

		revision 2025-11-07 { reference CR-1640 ; }
		revision 2025-07-25 { reference CR-1558 ; }
		revision 2025-03-25 { reference CR-1489 ; }
		revision 2025-01-25 { reference CR-1442 ; }
		@@ -282,6 +283,33 @@ module _3gpp-5gc-nrm-neffunction {
		}
		}

		grouping AIoTNEFMappingGrp {
		description "Represents the data type AIoTNEFMapping";

		list targetAreaAF {
		description "It represents the external target area provided by an AF
		to NEF for triggering A-IoT services. It could refer to a geographical
		location.";
		min-elements 1;
		max-elements 1;
		key idx;
		leaf idx { type uint32 ; }
		uses types3gpp:GeoAreaGrp;
		}

		list internalTargetArea {
		description "This is the (internal) target area mapped to external
		target area. It is provided to NEF by NRF.
		It could refer to any of TAC/TAI(list), PLMN or any geographical
		location/coordinate/area polygon";
		min-elements 1;
		max-elements 1;
		key idx;
		leaf idx { type uint32 ; }
		uses types5g3gpp:AreaScopeGrp;
		}
		}

		grouping NEFFunctionGrp {
		description "Represents the NEFFunction IOC";
		uses mf3gpp:ManagedFunctionGrp;
		@@ -327,6 +355,19 @@ module _3gpp-5gc-nrm-neffunction {
		leaf idx { type uint32 ; }
		uses NefInfoGrp;
		}

		list AIoTNEFMapping {
		description "It represents mapping information between external target
		area (provided by AF) and (5G core internal) target area that is to
		be provided to NRF";
		config false;
		min-elements 1;
		yext3gpp:inVariant;
		yext3gpp:notNotifyable;
		key idx;
		leaf idx { type uint32 ; }
		uses AIoTNEFMappingGrp;
		}
		}

		augment "/me3gpp:ManagedElement" {

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

+403 −386

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@ module _3gpp-5gc-nrm-nrffunction {
		import _3gpp-common-yang-types { prefix types3gpp; }
		import _3gpp-common-top { prefix top3gpp; }
		import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
		import _3gpp-common-yang-extensions { prefix yext3gpp; }
		import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; }
		import _3gpp-5gc-nrm-udrfunction { prefix udr3gpp; }
		import _3gpp-5gc-nrm-udmfunction { prefix udm3gpp; }
		@@ -21,7 +22,7 @@ module _3gpp-5gc-nrm-nrffunction {
		import _3gpp-5gc-nrm-nwdaffunction { prefix nwdaf3gpp;}
		import _3gpp-5gc-nrm-gmlcfunction { prefix gmlc3gpp;}
		import _3gpp-5gc-nrm-lmffunction { prefix lmf3gpp;}

		import _3gpp-5gc-nrm-aiot { prefix aiot3gpp;}

		organization "3gpp SA5";
		contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
		@@ -31,6 +32,7 @@ module _3gpp-5gc-nrm-nrffunction {
		TTA, TTC). All rights reserved.";
		reference "3GPP TS 28.541";

		revision 2025-11-01 { reference CR-1640 ; }
		revision 2025-07-25 { reference CR-1558 ; }
		revision 2025-01-25 { reference CR-1442 ; }
		revision 2023-09-18 { reference CR-1043 ; }
		@@ -40,7 +42,6 @@ module _3gpp-5gc-nrm-nrffunction {
		revision 2019-10-28 { reference S5-193518 ; }
		revision 2019-05-15 { reference "initial revision"; }


		grouping bsfInfo {

		list ipv4AddressRanges {
		@@ -74,7 +75,6 @@ module _3gpp-5gc-nrm-nrffunction {
		}
		}
		grouping chfInfo {

		list supiRangeList {
		description "List of ranges of SUPIs that can be served by
		the CHF instance. If not provided, the CHF can serve any SUPI.";
		@@ -82,7 +82,6 @@ module _3gpp-5gc-nrm-nrffunction {
		min-elements 1;
		uses mnfp3gpp:SupiRangeGrp;
		}

		list gpsiRangeList {
		description "List of ranges of GPSI that can be served
		by the CHF instance. If not provided, the CHF can serve any GPSI.";
		@@ -91,7 +90,6 @@ module _3gpp-5gc-nrm-nrffunction {
		min-elements 1;
		uses mnfp3gpp:IdentityRange;
		}

		list plmnRangeList {
		description "List of ranges of PLMNs (including the PLMN
		IDs of the CHF instance) that can be served by the CHF instance.
		@@ -625,27 +623,52 @@ module _3gpp-5gc-nrm-nrffunction {
		uses types3gpp:PLMNId;
		}
		}
		grouping AIoTNRFMappingGrp {
		description "Data type AIoTNRFMapping";

		leaf aIOTFdN {
		type types3gpp:DistinguishedName;
		mandatory true;
		description "Represents the distinguished name (DN) identifier of the
		AIOTF that serves the (internal) target area provided by NEF to NRF";
		}

		list internalTargetArea {
		description "It is the (internal) target area used by NRF (as provided
		by NEF) to accurately locate the AIOTF instance. It is mapped to aIOTFdN.
		It could refer to a list of AIoT Areas.";
		key idx;
		leaf idx { type uint32; }
		min-elements 1;
		uses aiot3gpp:ServedAIOTAreaIDGrp;
		}
		}
		grouping NRFFunctionGrp {
		description "Represents the NRFFunction IOC";
		uses mf3gpp:ManagedFunctionGrp;

		list pLMNIdList {
		description "List of at most six entries of PLMN Identifiers, but at
		least one (the primary PLMN Id).
		The PLMN Identifier is composed of a Mobile Country Code (MCC) and a
		Mobile Network Code (MNC).";
		list pLMNInfoList {
		description "It defines the PLMN(s) of a Network Function.";

		min-elements 1;
		max-elements 6;
		key "mcc mnc";
		uses types3gpp:PLMNId;
		key "mcc mnc sd sst";
		uses types5g3gpp:PLMNInfo;
		}


		leaf sBIFQDN {
		description "The FQDN of the registered NF instance in the service-based
		interface.";
		description "It is used to indicate the FQDN of the registered NF instance
		in service-based interface, for example, NF instance FQDN structure is:
		nftype<nfnum>.slicetype<sliceid>.mnc<MNC>.mcc<MCC>.3gppnetwork.org";
		type inet:domain-name;
		mandatory true;
		}

		list nFProfileList {
		description "It is a set of NFProfile(s) to be registered in the NRF
		instance. NFProfile is defined in 3GPP TS 29.510 ";
		key idx;
		leaf idx { type uint32; }
		uses mnfp3gpp:ManagedNFProfileGrp;
		}

		leaf-list cNSIIdList {
		@@ -657,32 +680,14 @@ module _3gpp-5gc-nrm-nrffunction {
		type string;
		}

		list sNSSAIList {
		description "List of S-NSSAIs the managed object is capable of supporting.
		(Single Network Slice Selection Assistance Information)
		An S-NSSAI has an SST (Slice/Service type) and an optional SD
		(Slice Differentiator) field.";
		//optional support
		reference "3GPP TS 23.003";
		key "sd sst";
		uses types5g3gpp:SNssai;
		}

		list nrfInfo {
		description "";
		description "Represents information of an NRF NF Instance.";
		max-elements 1;
		key idx;
		leaf idx {type uint32;}
		uses NrfInfoGrp;
		}
		list nFProfileList {
		description "It is a set of NFProfile(s) to be registered in the NRF
		instance. NFProfile is defined in 3GPP TS 29.510 ";
		key idx;
		leaf idx { type uint32; }
		min-elements 1;
		max-elements 1;
		uses mnfp3gpp:ManagedNFProfileGrp;
		}

		list managedNFProfile {
		key idx;
		leaf idx { type uint32; }
		@@ -692,6 +697,18 @@ module _3gpp-5gc-nrm-nrffunction {
		description "This parameter defines profile for managed NF";
		reference "3gpp TS 23.501";
		}

		list aIoTNRFMapping {
		config false;
		yext3gpp:notNotifyable;
		description "Represents mapping information between (Internal) target
		area (provided by NEF) and AIOTF DN.";
		min-elements 1;
		key idx;
		leaf idx { type uint32; }

		uses AIoTNRFMappingGrp;
		}
		}

		augment "/me3gpp:ManagedElement" {

yang-models/_3gpp-common-qmcjob.yang

+2 −1

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

		revision 2025-11-07 { reference CR-0586; }
		revision 2025-02-06 { reference CR-0508; }
		revision 2024-11-05 { reference CR-0480; }
		revision 2024-04-04 { reference CR-0334; }
		@@ -54,7 +55,7 @@ module _3gpp-common-qmcjob {
		leaf idx { type uint32 ; }
		description "It defines the area scope of QoE, which is specified
		in clause 5.4 of TS 28.405.";
		uses trace3gpp:AreaScopeGrp;
		uses types5g3gpp:AreaScopeGrp;
		}

		leaf qoECollectionEntityAddress {

yang-models/_3gpp-common-trace.yang

+1 −78

Original line number	Diff line number	Diff line
		@@ -114,83 +114,6 @@ module _3gpp-common-trace {
		}
		}

		grouping AreaScopeGrp {
		description "This <<dataType>> defines an area scope.";

		choice AreaScopeChoice {

		case eutran-only {
		leaf-list eutraCellIdList {
		type types3gpp:EutraCellId;
		min-elements 1;
		max-elements 32;
		description "List of E-UTRAN cells identified by E-UTRAN-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.";
		}
		}

		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 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;
		max-elements 8;
		leaf idx { type string; }
		uses types3gpp:TaiGrp;
		}
		list ntnGeoAreaList {
		must 'not(../nrCellIdList)';
		description "geographical areas for NTN MDT";
		key idx;
		max-elements 8;
		leaf idx { type string; }
		uses types3gpp:GeoAreaGrp;
		}
		}
		}

		list sliceIdList {
		description "Network Slice Id list";
		key idx;
		uses types5g3gpp:PLMNInfo;
		min-elements 1;
		max-elements 16384;
		leaf idx { type string; }
		}
		}

		grouping ExcessPacketDelayThresholdsGrp {
		description "Represents the ExcessPacketDelayThresholds dataType.
		This <<dataType>> defines a excess packet delay threshold information
		@@ -1681,7 +1604,7 @@ module _3gpp-common-trace {
		leaf idx { type uint32 ; }
		description "It specifies the area where data shall be collected. ";
		max-elements 1;
		uses AreaScopeGrp;
		uses types5g3gpp:AreaScopeGrp;
		}

		leaf-list sensorInformation {