Merge branch 'YANG-stage3-Corrections-Rel19-SA5-166' into 'Integration_Rel19_SA5_166_YANG' (6e17fec9) · Commits · SA5 – Management & Orchestration and Charging / Management and Orchestration APIs

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

+188 −1

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

		revision 2026-01-07 { reference CR- ; }
		revision 2026-03-25 { reference CR-1694 ; }
		revision 2025-11-07 { reference CR-1640 ; }
		revision 2025-11-01 { reference CR-1657 ; }
		revision 2025-07-25 { reference CR-1558 ; }
		@@ -179,6 +179,111 @@ module _3gpp-5g-common-yang-types {
		}
		}

		grouping SupiRangeGrp {
		description "This <<dataType>> represents a range of SUPIs.";
		leaf start {
		description "First value identifying the start of a SUPI range.";
		type string {
		pattern '^[0-9]+$';
		}
		}
		leaf end {
		description "Last value identifying the end of a SUPI range.";
		type string {
		pattern '^[0-9]+$';
		}
		}
		leaf pattern {
		description "Pattern representing the set of SUPIs belonging to
		this range.";
		type string;
		}
		}

		grouping IdentityRangeGrp {
		description "This <<dataType>> represents a range of identities.";
		leaf start {
		description "First value identifying the start of an identity range.";
		type string {
		pattern '^[0-9]+$';
		}
		}
		leaf end {
		description "Last value identifying the end of an identity range.";
		type string;
		}
		leaf pattern {
		description "Pattern representing the set of identities belonging to
		this range.";
		type string;
		}
		}

		grouping InternalGroupIdRangeGrp {
		description "This data type represents a range of Group
		IDs (internal group identities), either based on a
		numeric range, or based on regular-expression
		matching. (See TS 29.510).";
		reference "3GPP TS 28.541 clause 5.3.132";

		leaf start {
		description "It indicates first value identifying
		the start of an identity range, to be used when
		the range of identities can be represented as a
		consecutive numeric range.";
		type string;
		}

		leaf end {
		description "It indicates last value identifying
		the end of an identity range, to be used when
		the range of identities can be represented as a
		consecutive numeric range.";
		type string;
		}

		leaf pattern {
		description "It indicates pattern (regular
		expression according to the ECMA-262 dialect)
		representing the set of identities belonging to
		this range. An identity value is considered part
		of the range if and only if the identity string
		fully matches the regular expression.";
		type string;
		}
		}

		grouping SupportedVendorSpecificFeaturesGrp {
		description "This <<dataType>> represents a map of Vendor-Specific features,
		where the key of the map is the IANA-assigned SMI Network Management
		Private Enterprise Codes and the value of each entry of the map shall be
		a list (array) of VendorSpecificFeature objects as defined in clause 5.3.247.";
		reference "3GPP TS 29.510 clause 5.3.247";

		list supportedVendorSpecificFeatures {
		description "It indicates a map of Vendor-Specific features, where the
		key of the map is the IANA-assigned SMI Network Management Private
		Enterprise Codes and the value of each entry of the map shall be
		a list (array) of VendorSpecificFeature objects as defined
		in the clause 5.3.247.";
		key "enterpriseCode";

		leaf enterpriseCode {
		type uint32;
		description "IANA-assigned SMI Network Management Private
		Enterprise Code";
		}

		list vendorSpecificFeature {
		key "featureName";
		config false;
		description "VendorSpecificFeature objects as defined
		in the clause 5.3.247.";
		uses VendorSpecificFeatureGrp;
		}
		}
		}

		grouping SnssaiExtensionGrp {
		list sdRanges {
		min-elements 1;
		@@ -597,6 +702,88 @@ module _3gpp-5g-common-yang-types {
		}
		}

		grouping RuleSetGrp {
		description "This data type represents list of rules specifying whether
		access/scopes are allowed/denied for NF-Consumers.";
		reference "3GPP TS 29.510 clause 6.2.6.2.121";

		leaf priority {
		description "It indicates the unique Priority of the rule. Lower value
		means higher priority.";
		mandatory true;
		type uint32;
		}

		list plmns {
		description "It indicates PLMNs allowed/dis-allowed to access the
		service instance. When absent, NF-Consumers of all PLMNs are
		assumed to match this criteria.";
		key "mcc mnc";
		uses types3gpp:PLMNId;
		}

		list snpns {
		description "It indicates SNPNs allowed/dis-allowed to access the
		service instance. When absent, NF-Consumers of all SNPNs are
		assumed to match this criteria.";
		key "mcc mnc";
		uses PlmnIdNid;
		}

		leaf-list nfTypes {
		description "It indicates type of the NFs allowed/dis-allowed to
		access the service instance. When absent, NF-Consumers of all
		nfTypes are assumed to match this criteria.";
		type types3gpp:NfType;
		}

		leaf-list nfDomains {
		description "It represents pattern (regular expression according to
		the ECMA-262 dialect) representing the NF domain names within the
		PLMN of the NRF allowed/dis-allowed to access the service instance.
		When absent, NF-Consumers of all nfDomains are assumed to match
		this criteria.";
		type string;
		}

		list nssais {
		description "It represents S-NSSAIs of the NF-Consumers
		allowed/dis-allowed to access the service instance. When absent,
		NF-Consumers of all slices are assumed to match this criteria.";
		key idx;
		leaf idx { type uint32; }
		uses ExtSnssaiGrp;
		}

		leaf-list nfInstances {
		description "It represents NF-Instance IDs of the NF-Consumers
		allowed/dis-allowed to access the NF/NF-Service instance. When
		absent, all the NF-Consumers are assumed to match this criteria.";
		type string;
		}

		leaf-list scopes {
		description "It represents list of scopes allowed or denied to the
		NF-Consumers matching the rule. The scopes shall be any of those
		defined in the API that defines the current service. When absent,
		the NF-Consumer is allowed or denied full access to all the
		resources/operations of service instance.";
		type string;
		}

		leaf action {
		description "It specifies whether the scopes/access mentioned are
		allowed or denied for a specific NF-Consumer.
		ALLOW: The NF consumer is allowed to access NF producer.
		DENY: The NF consumer is not allowed to access NF Producer.";
		mandatory true;
		type enumeration {
		enum ALLOW;
		enum DENY;
		}
		}
		}

		grouping LocationInfoGrp {
		description "This data type contains location information
		of an NR mobile node (e.g., IAB-node or MWAB).";

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

+36 −1

Original line number	Diff line number	Diff line
		@@ -14,11 +14,12 @@ module _3gpp-5gc-nrm-aiot {
		contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
		description "Defines the YANG mapping AIOT (Ambient power-enabled Internet
		of Things).
		Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
		Copyright 2026, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
		TTA, TTC). All rights reserved.";
		reference "3GPP TS 28.541
		3GPP TS 23.369";

		revision 2026-03-19 { reference "CR-1695 CR-1694"; } //common r19-20
		revision 2025-11-01 { reference CR-1640; }

		grouping ServedAIOTAreaIDGrp {
		@@ -169,6 +170,30 @@ module _3gpp-5gc-nrm-aiot {

		//////////////////////////////////////////////////////////////////////

		grouping AdmInfoGrp {
		description "Represents the datatype AdmInfo";

		leaf-list deviceIdList {
		type string;
		description "This attribute represents a list of device IDs served by
		ADM as defined in TS 29.510 [23]. The format of String is specified
		in TS 29.510.";
		}

		leaf devIdRegEx {
		type string;
		description "This attribute represents a regular expression (according to
		the ECMA-262 dialect) identifying the set of device IDs served by
		the ADM as defined in TS 29.510.";
		}

		leaf-list afIdList {
		type string;
		description "This attribute represents a list of AF IDs served by ADM as
		defined in TS 29.510.";
		}
		}

		grouping ADMFunctionGrp {
		description "Attributes of the IOC ADMFunction";

		@@ -200,6 +225,16 @@ module _3gpp-5gc-nrm-aiot {
		description "This parameter defines profile for managed NF";
		reference "3gpp TS 23.501";
		}

		list admInfo {
		description "This attribute represents ADM-specific information for
		management purposes. The information carried by this attribute is
		aligned with the ADM-related information defined in TS 29.510.";
		max-elements 1;
		key idx;
		leaf idx { type uint32; }
		uses AdmInfoGrp;
		}
		}

		feature ADMFunctionUnderManagedElement {

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -16,10 +16,11 @@ module _3gpp-5gc-nrm-ausffunction {
		contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
		description "This IOC represents the AUSF function in 5GC. For more
		information about the AUSF, see 3GPP TS 23.501.
		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.541";

		revision 2026-03-25 { reference CR-1694 ; }
		revision 2023-09-18 { reference CR-1043 ; }
		revision 2022-01-07 { reference CR-0643; }
		revision 2020-11-06 { reference CR-0412 ; }
		@@ -66,7 +67,7 @@ module _3gpp-5gc-nrm-ausffunction {
		by the PCF instance.";
		key idx;
		leaf idx { type uint32 ; }
		uses mnfp3gpp:SupiRangeGrp;
		uses types5g3gpp:SupiRangeGrp;
		}

		leaf-list routingIndicators {

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

0 → 100755

+143 −0

Original line number	Diff line number	Diff line
		module _3gpp-5gc-nrm-chffunction {
		yang-version 1.1;
		namespace urn:3gpp:sa5:_3gpp-5gc-nrm-chffunction;
		prefix chf3gpp;

		import _3gpp-common-managed-function { prefix mf3gpp; }
		import _3gpp-common-managed-element { prefix me3gpp; }
		import _3gpp-common-yang-types { prefix types3gpp; }
		import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
		import _3gpp-common-top { prefix top3gpp; }
		import _3gpp-5gc-nrm-managed-nfprofile { prefix mnfp3gpp; }
		import ietf-inet-types { prefix inet; }

		organization "3gpp SA5";
		contact
		"https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
		description "This IOC represents the CHF function. For more
		information about the CHF, see TS 23.501 and
		TS 32.240.
		Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS,
		CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved.";
		reference "3GPP TS 28.541";

		revision 2025-03-25 { reference "CR-"; }

		grouping ChfInfoGrp {
		description "This data type represents the Specific
		data for the CHF.
		(See clause 6.1.6.2.32 TS 29.510).";

		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.";
		key idx;
		leaf idx { type uint32; }
		uses types5g3gpp: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.";
		key idx;
		leaf idx { type uint32; }
		uses types5g3gpp:IdentityRangeGrp;
		}

		list plmnRangeList {
		description "List of ranges of PLMNs (including
		the PLMN IDs of the CHF instance) that can be
		served by the CHF instance. If not provided,
		the CHF can serve any PLMN.";
		key "mcc mnc";
		uses types3gpp:PLMNId;
		}

		leaf groupId {
		description "It represents the identity of the CHF
		group that is served by the CHF instance. If not
		provided, the CHF instance does not pertain to
		any CHF group.";
		type string;
		}

		leaf primaryChfInstance {
		description "This attribute represents the NF
		Instance Id of the primary CHF instance. This
		attribute shall be absent if the
		secondaryChfInstance is present.";
		type string;
		}

		leaf secondaryChfInstance {
		description "This attribute represents the NF
		Instance Id of the secondary CHF instance.
		This attribute shall be absent if the
		primaryChfInstance is present.";
		type string;
		}
		}

		grouping CHFFunctionGrp {
		description "Represents the CHFFunction IOC.";
		uses mf3gpp:ManagedFunctionGrp;

		list pLMNInfoList {
		description "It defines the PLMN(s) of a Network
		Function.";
		key "mcc mnc sd sst";
		min-elements 1;
		uses types5g3gpp:PLMNInfo;
		}

		leaf sBIFQDN {
		description "The FQDN of the registered NF instance
		in the service-based interface.";
		type inet:domain-name;
		}

		list managedNFProfile {
		key idx;
		leaf idx { type uint32; }
		min-elements 1;
		max-elements 1;
		description "Profile definition of a Managed NF
		(See TS 23.501).";
		uses mnfp3gpp:ManagedNFProfileGrp;
		}

		list commModelList {
		min-elements 1;
		key "groupId";
		description "Specifies a list of commModel. It can
		be used by NF and NF services to interact with
		each other in 5G Core network.";
		reference "3GPP TS 23.501";
		uses types5g3gpp:CommModel;
		}

		list chfInfo {
		description "This attribute represents information
		of a CHF NF Instance.";
		max-elements 1;
		key idx;
		leaf idx { type uint32; }
		uses ChfInfoGrp;
		}
		}

		augment "/me3gpp:ManagedElement" {
		list CHFFunction {
		description "5G Core CHF Function";
		reference "3GPP TS 28.541";
		key id;
		uses top3gpp:Top_Grp;
		container attributes {
		uses CHFFunctionGrp;
		}
		uses mf3gpp:ManagedFunctionContainedClasses;
		}
		}
		}

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

+479 −333

File changed.

Preview size limit exceeded, changes collapsed.