Merge branch 'Integration_Rel19_SA5_159_YANG' into 'Rel-19' (cd2baa31) · Commits · SA5 – Management & Orchestration and Charging / Management and Orchestration APIs

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -11,10 +11,11 @@ module _3gpp-5gc-nrm-FiveQiDscpMappingSet {
		organization "3gpp SA5";
		contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
		description " This IOC represents the set of mapping between 5QIs and DSCP.
		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 2025-01-25 { reference CR-1442 ; }
		revision 2023-09-18 { reference CR-1043 ; }
		revision 2020-08-03 { reference "CR-0321"; }
		revision 2020-05-27 { reference "CR-0287"; }
		@@ -38,7 +39,8 @@ module _3gpp-5gc-nrm-FiveQiDscpMappingSet {

		grouping FiveQiDscpMappingSetGrp {
		description "Represents the FiveQiDscpMappingSet IOC.";
		list FiveQiDscpMappingList {
		list fiveQiDscpMappingList {
		description "It provides the list of mapping between 5QIs and DSCP.";
		key "dscp";
		uses FiveQiDscpMapping;
		}

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -17,10 +17,11 @@ module _3gpp-5gc-nrm-neffunction {
		contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
		description "This IOC represents the NEF function in 5GC. For more
		information about the NEF, see 3GPP TS 23.501.
		Copyright 2024, 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 2025-01-25 { reference CR-1442 ; }
		revision 2024-05-18 { reference CR-1273 ; }
		revision 2024-04-12 { reference CR-1218 ; }
		revision 2023-09-18 { reference CR-1103 ; }
		@@ -156,7 +157,7 @@ module _3gpp-5gc-nrm-neffunction {
		uses types3gpp:TaiGrp;
		}

		list taiRangelist {
		list taiRangeList {
		config false;
		description "Range of TAIs";
		yext3gpp:inVariant;

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

+21 −20

Original line number	Diff line number	Diff line
		@@ -12,10 +12,11 @@ module _3gpp-5gc-nrm-nfprofile {
		organization "3gpp SA5";
		contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
		description "NF profile class.
		Copyright 2024, 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 29.510";

		revision 2025-01-25 { reference CR-1442 ; }
		revision 2024-04-12 { reference CR-1218 ; }
		revision 2023-11-18 { reference CR-1103 ; }
		revision 2023-09-18 { reference CR-1043 ; }
		@@ -23,7 +24,7 @@ module _3gpp-5gc-nrm-nfprofile {
		revision 2019-06-17 { reference "initial revision"; }

		grouping NFProfileGrp {
		leaf nfInstanceID {
		leaf nfInstanceId {
		description "String uniquely identifying a NF instance.";
		mandatory true;
		type string;
		@@ -588,8 +589,8 @@ module _3gpp-5gc-nrm-nfprofile {
		locally configured in the NRF or the NRF received
		during NF registration.";

		key nfInstanceID;
		leaf nfInstanceID {
		key nfInstanceId;
		leaf nfInstanceId {
		description "String uniquely identifying a NF instance.";
		type string;
		}
		@@ -604,8 +605,8 @@ module _3gpp-5gc-nrm-nfprofile {
		locally configured in the NRF or the NRF
		received during NF registration.";

		key nfInstanceID;
		leaf nfInstanceID {
		key nfInstanceId;
		leaf nfInstanceId {
		description "String uniquely identifying a NF instance.";
		type string;
		}
		@@ -620,8 +621,8 @@ module _3gpp-5gc-nrm-nfprofile {
		locally configured in the NRF or the NRF
		received during NF registration.";

		key nfInstanceID;
		leaf nfInstanceID {
		key nfInstanceId;
		leaf nfInstanceId {
		description "String uniquely identifying a NF instance.";
		type string;
		}
		@@ -636,8 +637,8 @@ module _3gpp-5gc-nrm-nfprofile {
		locally configured in the NRF or the NRF received
		during NF registration.";

		key nfInstanceID;
		leaf nfInstanceID {
		key nfInstanceId;
		leaf nfInstanceId {
		description "String uniquely identifying a NF instance.";
		type string;
		}
		@@ -652,8 +653,8 @@ module _3gpp-5gc-nrm-nfprofile {
		locally configured in the NRF or the NRF received
		during NF registration.";

		key nfInstanceID;
		leaf nfInstanceID {
		key nfInstanceId;
		leaf nfInstanceId {
		description "String uniquely identifying a NF instance.";
		type string;
		}
		@@ -668,8 +669,8 @@ module _3gpp-5gc-nrm-nfprofile {
		locally configured in the NRF or the NRF received
		during NF registration.";

		key nfInstanceID;
		leaf nfInstanceID {
		key nfInstanceId;
		leaf nfInstanceId {
		description "String uniquely identifying a NF instance.";
		type string;
		}
		@@ -684,8 +685,8 @@ module _3gpp-5gc-nrm-nfprofile {
		locally configured in the NRF or the NRF received
		during NF registration.";

		key nfInstanceID;
		leaf nfInstanceID {
		key nfInstanceId;
		leaf nfInstanceId {
		description "String uniquely identifying a NF instance.";
		type string;
		}
		@@ -700,8 +701,8 @@ module _3gpp-5gc-nrm-nfprofile {
		locally configured in the NRF or the NRF received
		during NF registration.";

		key nfInstanceID;
		leaf nfInstanceID {
		key nfInstanceId;
		leaf nfInstanceId{
		description "String uniquely identifying a NF instance.";
		type string;
		}
		@@ -716,8 +717,8 @@ module _3gpp-5gc-nrm-nfprofile {
		locally configured in the NRF or the NRF received
		during NF registration.";

		key nfInstanceID;
		leaf nfInstanceID {
		key nfInstanceId;
		leaf nfInstanceId {
		description "String uniquely identifying a NF instance.";
		type string;
		}

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

+89 −34

Original line number	Diff line number	Diff line
		@@ -12,10 +12,11 @@ module _3gpp-5gc-nrm-nfservice {
		organization "3gpp SA5";
		contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
		description "NF service class.
		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 29.510";

		revision 2025-01-25 { reference CR-1442; }
		revision 2023-09-18 { reference CR-1043 ; }
		revision 2021-01-25 { reference CR-0454 ; }
		revision 2020-11-05 { reference CR-0412 ; }
		@@ -98,7 +99,7 @@ module _3gpp-5gc-nrm-nfservice {
		uses types3gpp:DefaultNotificationSubscription;
		}

		list allowedPlmns {
		list allowedPLMNs {
		description "PLMNs allowed to access the service instance.
		The absence of this attribute indicates that any PLMN is allowed to
		access the service instance.";
		@@ -108,40 +109,89 @@ module _3gpp-5gc-nrm-nfservice {
		key "mcc mnc";
		uses types3gpp:PLMNId;
		}
		list allowedSnpns {
		description "PLMNs allowed to access the service instance.
		The absence of this attribute indicates that any PLMN is allowed to
		access the service instance.";

		min-elements 1;
		//optional support
		key "mcc mnc";
		uses types3gpp:PLMNId;
		}
		leaf-list allowedNfTypes {
		description "Type of the NFs allowed to access the service instance.
		The absence of this attribute indicates that any NF type is allowed
		to access the service instance.";

		description "SNPNs allowed to access the NF instance";
		min-elements 1;
		//optional support
		type types3gpp:NfType;
		}

		leaf-list allowedNfDomains {
		description "Pattern representing the NF domain names allowed to access the service instance.";
		description "Pattern representing the NF domain names allowed to
		access the service instance.";
		//optional support
		min-elements 1;
		type string;
		}

		list allowedNssais {
		description "S-NSSAI of the allowed slices to access the service instance.
		The absence of this attribute indicates that any slice is allowed to
		access the service instance.";
		list allowedNSSAI {
		description "S-NSSAI of the allowed slices to access the service
		instance. The absence of this attribute indicates that any slice
		is allowed to access the service instance.";
		min-elements 1;
		//optional support
		key "sd sst";
		uses types5g3gpp:SNssai;
		}
		leaf-list allowedOperationsPerNfType {
		description "It indicates the allowed operations on resources for
		each type of NF; the key of the map is the NF Type, and the value
		is an array of scopes";
		//optional support
		type string;
		min-elements 1;
		}
		leaf-list allowedOperationsPerNfInstance {
		description "It indicates the allowed operations on resources for
		a given NF Instance; the key of the map is the NF Instance Id, and
		the value is an array of scopes";
		//optional support
		type string;
		min-elements 1;
		}
		leaf allowedOperationsPerNfInstanceOverrides {
		type boolean;
		default false;
		description "When it is present and set to true, indicates that
		the scopes defined in attribute allowedOperationsPerNfInstance
		for a given NF Instance ID take precedence over the scopes defined
		in attribute allowedOperationsPerNfType for the corresponding
		NF type of the NF Instance associated to such NF Instance ID..";
		}

		leaf-list oauth2Required {
		type boolean;
		max-elements 1;
		description "It indicates whether the NF Service Instance requires
		Oauth2-based authorization";
		}

		leaf-list sharedServiceDataId {
		type string;
		max-elements 1;
		description "String uniquely identifying SharedServiceData. The format
		of the sharedServiceDataId shall be a Universally Unique Identifier
		(UUID) version 4, as described in IETF RFC 4122 [44]. The hexadecimal
		letters should be formatted as lower-case characters by the sender,
		and they shall be handled as case-insensitive by the receiver.";
		}

		leaf priority {
		description "Priority (relative to other services of the same type)
		in the range of 0-65535, to be used for NF Service selection; lower
		values indicate a higher priority.";
		//optional support
		type uint16;
		type uint16 { range "0..65535"; }
		}

		leaf capacity {
		@@ -151,12 +201,6 @@ module _3gpp-5gc-nrm-nfservice {
		type uint16;
		}

		leaf load {
		description "Dynamic load information, ranged from 0 to 100, indicates
		the current load percentage of the NF Service.";
		//optional support
		type types3gpp:Load;
		}

		leaf recoveryTime {
		description "Timestamp when the NF was (re)started.";
		@@ -164,18 +208,10 @@ module _3gpp-5gc-nrm-nfservice {
		type yang:date-and-time;
		}

		list chfServiceInfo { //is the key unique
		description "Specific data for a CHF service instance.";
		leaf vendorId {
		description "Vendor ID of the NF instance";
		//optional support
		max-elements 1;
		key "primaryChfServiceInstance secondaryChfServiceInstance";
		uses ChfServiceInfo;
		}

		leaf supportedFeatures {
		description "Supported Features of the NF Service instance.";
		//optional support
		type SupportedFeatures;
		type string;
		}
		}

		@@ -302,4 +338,23 @@ module _3gpp-5gc-nrm-nfservice {
		type string;
		}
		}
		grouping SNPNIdGrp {
		description "This <<dataType>> represents the information of a SNPN
		identification";
		leaf mCC {
		description "This is the Mobile Country Code (MCC) of the PLMN
		identifier. See TS 23.003 [13] subclause 2.2 and 12.1";
		type string;
		}
		leaf mNC {
		description "This is the Mobile Network Code (MNC) of the PLMN
		identifier. See TS 23.003 [13] subclause 2.2 and 12.1.";
		type string;
		}
		leaf nId {
		description "Network Identity; Shall be present if PlmnIdNid
		identifies an SNPN";
		type string;
		}
		}
		}
		No newline at end of file

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -16,10 +16,11 @@ module _3gpp-5gc-nrm-nrffunction {
		contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
		description "This IOC represents the NRF function in 5GC.
		For more information about the NRF, see 3GPP TS 23.501 [2].
		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 2025-01-25 { reference CR-1442 ; }
		revision 2023-09-18 { reference CR-1043 ; }
		revision 2023-04-26 { reference CR-0916; }
		revision 2020-11-08 { reference CR-0412 ; }
		@@ -72,7 +73,7 @@ module _3gpp-5gc-nrm-nrffunction {
		list nFProfileList {
		description "Set of NFProfile(s) to be registered in the NRF instance.";
		//optional support
		key nfInstanceID;
		key nfInstanceId;
		uses nfp3gpp:NFProfileGrp;
		}
		}