Merge branch 'Integration_Rel18_SA5_153_YANG' into 'Rel-18' (1f848044) · Commits · SA5 – Management & Orchestration and Charging / Management and Orchestration APIs

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

+148 −1

Original line number	Diff line number	Diff line
		@@ -25,6 +25,140 @@ module _3gpp-5gc-nrm-amffunction {
		revision 2019-05-31 { reference "Ericsson refactoring."; }
		revision 2018-08-07 { reference "Initial revision"; }

		grouping GlobalRanNodeIDGrp{

		list pLMNId {
		description "The PLMN Identifier is composed of
		a Mobile Country Code (MCC) and
		a Mobile Network Code (MNC).";
		min-elements 1;
		max-elements 1;
		key "mcc mnc";
		uses types3gpp:PLMNId;
		}

		choice GlobalRanNodeID{
		description "Unique identifier of an NG-RAN node.";
		reference "3GPP TS 38.413";
		mandatory true;
		case gNB {
		leaf GlobalgNBID{
		description "Unique identifier of a gNB.";
		reference "3GPP TS 38.413";
		type int64;
		mandatory true;
		}
		}

		case ng-eNB{
		leaf Globalng-eNBID{
		type string{
		pattern '^(MacroNGeNB-[A-Fa-f0-9]{5}\|LMacroNGeNB-
		[A-Fa-f0-9]{6}\|SMacroNGeNB
		-[A-Fa-f0-9]{5})$';
		}
		description "This represents the identifier of
		the ng-eNB ID as specified in
		clause 9.3.1.8 of 3GPP TS 38.413.";
		mandatory true;
		}
		}

		case N3IWF{
		leaf N3IWFID{
		type string{
		pattern '^[A-Fa-f0-9]+$';
		}
		description "This IE shall contain the N3IWF
		identifier received over NGAP and
		shall be encoded as a string of
		hexadecimal characters.";
		mandatory true;
		}
		}

		case TNGF{
		leaf TNGFID{
		type string{
		pattern '^[A-Fa-f0-9]+$';
		}
		description "This represents the identifier of
		the TNGF ID as specified in clause
		9.3.1.161 of 3GPP TS 38.413 in hexadecimal
		representation.";
		mandatory true;
		}
		}

		case TWIF{
		leaf TWIFID{
		type string;
		description "This represents the TWIF identification
		as specified in clause
		9.3.1.163 of TS 38.413";
		mandatory true;
		}
		}

		case W-AGF{
		leaf W-AGFID{
		type string{
		pattern '^[A-Fa-f0-9]+$';
		}
		description "This represents the identifier of
		the W-AGF ID as specified in
		clause 9.3.1.162 of 3GPP TS 38.413
		in hexadecimal representation.";
		mandatory true;
		}
		}
		}
		}

		grouping satelliteBackhaulInfo{
		description "Defines information related to satellite backhaul category
		and corresponding information of gNB.";
		reference "3GPP TS 23.501";

		list GlobalRanNodeID{
		description "Unique identifier of an NG-RAN node.";
		uses GlobalRanNodeIDGrp;
		min-elements 1;
		max-elements 1;
		leaf GlobalRanNodeIDValue{
		type string;
		description "this relies on the choice of GlobalRanNodeID";
		}
		key "GlobalRanNodeIDValue";
		}

		leaf satelliteBackhaulCategory{
		description "Satellite backhaul category refers to the type of the
		satellite used in the backhaul. Only a single backhaul category
		can be indicated.";
		reference "3GPP TS 29.571";
		type enumeration{
		enum GEO;
		enum MEO;
		enum LEO;
		enum OTHER_SAT;
		enum DYNAMIC_GEO;
		enum DYNAMIC_MEO;
		enum DYNAMIC_LEO;
		enum DYNAMIC_OTHER_SAT;
		enum NON_SATELLITE;
		}
		mandatory true;
		}

		leaf geoSatelliteId{
		description "Unique identifier of a GEO satellite.";
		reference "3GPP TS 29.571";
		type string;
		//condition present only if the UPF is deployed on the satellite.
		}
		}

		grouping AMFFunctionGrp {
		description "Represents the AMFFunction IOC";
		uses mf3gpp:ManagedFunctionGrp;
		@@ -38,7 +172,7 @@ module _3gpp-5gc-nrm-amffunction {
		}

		container aMFIdentifier {
		presence true;
		//presence true;
		description "An AMF identifier, comprising an AMF Region ID, an
		AMF Set ID and an AMF Pointer.";
		uses types3gpp:AmfIdentifier;
		@@ -66,6 +200,7 @@ module _3gpp-5gc-nrm-amffunction {
		min-elements 1;
		max-elements 1;
		uses types3gpp:ManagedNFProfile;
		description "";
		}

		list commModelList {
		@@ -77,6 +212,18 @@ module _3gpp-5gc-nrm-amffunction {
		uses types5g3gpp:CommModel;
		}

		list satelliteBackhaulInfoList{
		description "Specifies a list of satellite backhaul information. It can be
		used by NF and NF services.";
		leaf GlobalRanNodeIDValue{
		type string;
		description "this relies on the choice of GlobalRanNodeID";
		}
		key "GlobalRanNodeIDValue";
		min-elements 1;
		uses satelliteBackhaulInfo;
		}

		}

		augment "/me3gpp:ManagedElement" {

yang-models/_3gpp-5gc-ecmconnectioninfo.yang→yang-models/_3gpp-5gc-nrm-ecmconnectioninfo.yang

+6 −5

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

		import ietf-inet-types { prefix inet; }
		@@ -11,11 +11,12 @@ module _3gpp-5gc-ecmconnectioninfo {
		contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
		description "Defines the YANG mapping of the EcmConnectionInfo Information
		Object Class (IOC) that is part of the NR Network Resource Model (NRM).
		Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
		Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
		TTA, TTC). All rights reserved.";
		reference "3GPP TS 28.541 5G Network Resource Model (NRM)";

		revision 2023-11-14 { reference CR-1136 ; }
		revision 2024-01-29 { reference CR-1166 ; }
		revision 2023-11-05 { reference CR-1131 ; }

		grouping GeoLocGrp {
		description "This datatype represent the geographical location.";

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

+267 −110

File changed.

Preview size limit exceeded, changes collapsed.

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

+21 −0

Original line number	Diff line number	Diff line
		@@ -91,6 +91,27 @@ module _3gpp-5gc-nrm-smffunction {
		description "DN of the Dynamic5QISet that the SMFFunction supports
		(is associated to).";
		}

		list dnaiSatelliteMappingList {
		description "List of the mapping relationship between
		satellite ID and at least one DNAI.";
		min-elements 1;
		key "satelliteid";
		uses dnaiSatelliteMapping;
		}
		}

		grouping dnaiSatelliteMapping {
		leaf-list dnaiList {
		description "List of Data network access identifiers.";
		min-elements 1;
		type string;
		}

		leaf satelliteid {
		description "Unique identifier of a GEO satellite.";
		type string;
		}
		}

		augment "/me3gpp:ManagedElement" {

yang-models/_3gpp-common-fm.yang

+5 −9

Original line number	Diff line number	Diff line
		@@ -14,16 +14,12 @@ module _3gpp-common-fm {
		description "Defines a Fault Management model
		Copyright 2023, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
		TTA, TTC). All rights reserved.";
		reference "3GPP TS 28.623
		Generic Network Resource Model (NRM)
		Integration Reference Point (IRP);
		Solution Set (SS) definitions

		3GPP TS 28.622
		Generic Network Resource Model (NRM)
		Integration Reference Point (IRP);
		Information Service (IS)";
		reference "3GPP TS 28.111";

		revision 2024-01-18 {
		description "The specification of the file is moved from 28.623 to 28.532";
		reference "28.623 CR-0315";
		}
		revision 2023-09-18 { reference CR-0271 ; }
		revision 2023-05-10 { reference CR-0250; }
		revision 2022-10-24 { reference CR-0196; }