aligne stage 2 and yang for nfservice and managed profile attributes and datatype (ac2cf3e1) · Commits · SA5 – Management & Orchestration and Charging / Management and Orchestration APIs

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

+799 −756

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- ; }
		revision 2025-11-07 { reference CR-1640 ; }
		revision 2025-11-01 { reference CR-1657 ; }
		revision 2025-07-25 { reference CR-1558 ; }
		@@ -179,6 +179,77 @@ 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 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;
		@@ -348,34 +419,6 @@ module _3gpp-5g-common-yang-types {
		}
		}

		grouping PlmnSnssai {
		description "This data type represents the list of S-NSSAIs supported
		per PLMN.";
		list plmnId {
		description "PLMN ID for which list of supported S-NSSAI(s)
		is provided.";
		min-elements 1;
		max-elements 1;
		key "mcc mnc";
		uses types3gpp:PLMNId;
		}
		list sNssaiList {
		description "The specific list of S-NSSAIs supported
		by the given PLMN.";
		min-elements 1;
		max-elements 1;
		key "sst sd";
		uses SNssai;
		}
		leaf nid {
		description "Network Identity; Shall be present if PlmnIdNid
		identifies an SNPN.";
		reference "see clauses 5.30.2.3, 5.30.2.9, 6.3.4,
		and 6.3.8 in 3GPP TS 23.501";
		type string;
		}
		}

		grouping PLMNInfo {
		description "The PLMNInfo data type define a S-NSSAI member in a specific
		PLMNId, and it have two attributes PLMNId and S-NSSAI (PLMNId, S-NSSAI).

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- ; }
		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-managed-nfprofile.yang

+3 −221

Original line number	Diff line number	Diff line
		@@ -53,202 +53,6 @@ revision 2025-07-25 { reference CR-1558 ; }
		type types3gpp:NfType;
		}
		}
		grouping SupiRangeGrp {
		leaf start {
		description "First value identifying the start ofa SUPI range.To be
		used when the range of SUPI's can be represented as a numeric range
		(e.g., IMSI ranges).";
		type string {
		pattern '^[0-9]+$';
		}
		}

		leaf end {
		description "Last value identifying the end of a SUPI range.To be
		used when the range of SUPI's can be represented as a numeric range
		(e.g. IMSI ranges).";
		type string {
		pattern '^[0-9]+$';
		}
		}

		leaf pattern {
		description "Pattern representing the set of SUPI's belonging to
		this range.A SUPI value is considered part of the range if and
		only if the SUPI string fully matches the regular expression.";
		type string;
		}
		}

		grouping ConditionItemGrp {
		description "This data type represents a single condition item that
		shall be evaluated to determine whether a discovered NF (Service)
		Instance shall be selected.";

		leaf-list consumerNfTypes {
		description "It represents the NF types of the consumers for
		which the conditions included in this ConditionItem apply.
		If this attribute is absent, the conditions are applicable
		to all NF consumer types.";
		min-elements 1;
		type types3gpp:NfType;
		}
		leaf serviceFeature {
		description "It represents a feature number of that NF Service
		Instance,under CANARY_RELEASE status. This attribute only
		applies when the selectionConditions, where this
		ConditionItem is included, is included in a NF Service Instance
		This condition is evaluated to <true> when the service requests
		froma consumer of this NF Service Instance require the support
		of the indicated feature on the NF Service Instance.";
		type uint32; // positive integer, 0 excluded by context
		}
		leaf vsServiceFeature {
		description "It represents a Vendor-Specific feature
		number of thatNF Service Instance, under CANARY_RELEASE
		status. This attribute only applies when the
		selectionConditions, where this ConditionItem is included,
		is included in a NF Service Instance.This condition is
		evaluated to true when the service requests from a
		consumer of this NF Service Instance require the support
		of the indicated Vendor-Specific feature on the NF
		Service Instance.";
		type uint32;
		}
		list supiRangeList {
		description "It represents a set of SUPIs for which
		the NF (Service) instance under CANARY_RELEASE status shall
		be selected.";
		key idx;
		leaf idx { type uint32; }
		uses SupiRangeGrp;
		}
		list gpsiRangeList {
		description "It represents a set of GPSIs for which the NF
		(Service)
		instance under CANARY_RELEASE status shall be selected";
		min-elements 1;
		key idx;
		leaf idx { type uint32; }
		uses IdentityRange;
		}
		list impuRangeList {
		description "It represents a set of IMS Public Identities
		for which the NF (Service) instance under CANARY_RELEASE
		status shall be selected";
		min-elements 1;
		key idx;
		leaf idx { type uint32; }
		uses IdentityRange;
		}
		list impiRangeList {
		description "It represents a set of IMS Private Identities
		for which theNF (Service) instance under
		CANARY_RELEASE status shall be selected.";
		min-elements 1;
		key idx;
		leaf idx { type uint32; }
		uses IdentityRange;
		}
		leaf-list peiList {
		description "It represents a set of PEIs of the UEs for
		which the NF (Service) instance under CANARY_RELEASE status
		shall be selected.";
		min-elements 1;
		type string;
		}
		list taiRangeList {
		description "It represents a set of TAIs where the
		NF(Service) instance under CANARY_RELEASE status shall
		be selected for a certain UE";
		min-elements 1;
		key idx;
		leaf idx { type uint32; }
		uses types5g3gpp:TaiRangeGrp;
		}
		leaf-list dnnList {
		description "It represents a set of DNNs where the NF
		(Service) instance under CANARY_RELEASE status shall be
		selected.";
		min-elements 1;
		type string;
		}
		}


		grouping SelectionConditionsGrp {
		description "This data type represents the list of conditions that
		shall be selected by an NF Service Consumer.";
		reference "See clause 6.1.6.2.123 TS 29.510 [23]";

		list conditionItem {
		key "id";
		description "It represent a single condition item that shall be
		evaluated to determine whether a discovered NF (Service)
		Instance shall be selected.";
		leaf id {
		type string;
		}
		uses ConditionItemGrp;
		}

		list conditionGroup {
		description "It represents a group of conditions
		that shall be evaluated.";
		key idx;
		leaf idx { type uint32; }
		max-elements 1;
		// Note: ConditionGroupGrp references SelectionConditionsGrp
		// creating a circular dependency. Inlined one level to avoid it.
		choice LogicalOperator {
		case and {
		list and {
		description "It represents a list of conditions where the
		overall evaluation is true only if all the conditions
		in the list are evaluated as true.";
		key idx;
		leaf idx { type uint32; }
		list conditionItem {
		key "id";
		description "It represent a single condition item that
		shall be evaluated.";
		leaf id { type string; }
		uses ConditionItemGrp;
		}
		}
		}
		case or {
		list or {
		description "It represents a list of conditions where the
		overall evaluation is true if at least one of the
		conditions in the list is evaluated as true.";
		key idx;
		leaf idx { type uint32; }
		list conditionItem {
		key "id";
		description "It represent a single condition item that
		shall be evaluated.";
		leaf id { type string; }
		uses ConditionItemGrp;
		}
		}
		}
		}
		}
		}

		grouping IdentityRange {
		leaf start {
		description "First value identifying the start of an identity range.
		To be used when the range of identities can be represented
		as a numeric range (e.g., MSISDN ranges).";
		type string {
		pattern '^[0-9]+$';
		}
		}
		leaf end {type string; } // dummy
		leaf pattern {type string; } // dummy
		}

		grouping ManagedNFProfileGrp {
		description "Represents the ManagedNFProfile <<dataType>> as defined in
		@@ -357,7 +161,7 @@ grouping ManagedNFProfileGrp {
		of the NFService(s).";
		key idx;
		leaf idx { type uint32; }
		uses types5g3gpp:PlmnSnssai;
		uses nfs3gpp:PlmnSnssai;
		}

		list allowedSNPNs {
		@@ -573,28 +377,7 @@ grouping ManagedNFProfileGrp {
		min-elements 1;
		uses nfs3gpp:NFServiceGrp;
		}
		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";
		config false;

		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 types5g3gpp:VendorSpecificFeatureGrp;
		}
		}
		uses types5g3gpp:SupportedVendorSpecificFeaturesGrp;

		list selectionConditions {
		description "This attribute includes the conditions under which an NF
		@@ -604,7 +387,7 @@ grouping ManagedNFProfileGrp {
		leaf idx { type uint32; }
		key "idx";
		max-elements 1;
		uses SelectionConditionsGrp;
		uses nfs3gpp:SelectionConditionsGrp;
		}
		leaf canaryRelease {
		description "This attribute indicates whether an NF instance whose
		@@ -680,4 +463,3 @@ grouping ManagedNFProfileGrp {
		}
		}
		}

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -213,7 +213,7 @@ module _3gpp-5gc-nrm-neffunction {
		min-elements 1;
		key idx;
		leaf idx { type uint32 ; }
		uses mnfp3gpp:IdentityRange;
		uses types5g3gpp:IdentityRangeGrp;
		}

		list externalGroupIdentifiersRanges {
		@@ -222,7 +222,7 @@ module _3gpp-5gc-nrm-neffunction {
		min-elements 1;
		key idx;
		leaf idx { type uint32 ; }
		uses mnfp3gpp:IdentityRange;
		uses types5g3gpp:IdentityRangeGrp;
		}

		leaf-list servedFqdnList {

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

+718 −556

File changed.

Preview size limit exceeded, changes collapsed.