Merge branch 'Integration_Rel18_SA5_159_YANG' into 'Rel-18' (55da8821) · Commits · SA5 – Management & Orchestration and Charging / Management and Orchestration APIs

yang-models/_3gpp-common-managementdatacollection.yang

+2 −6

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

		revision 2025-02-05 { reference "CR-0460" ; }
		revision 2024-04-12 { reference CR-0346; }
		revision 2023-11-18 { reference CR-0299 ; }
		revision 2023-11-06 { reference "CR-0305"; }
		@@ -213,12 +214,7 @@ module _3gpp-common-managementdatacollection {

		The metrics are identified with their names/identifiers.
		For performance measurements defined in TS 28.552 the name is
		constructed as follows:
		- 'family.measurementName.subcounter' for measurement types with
		subcounters
		- 'family.measurementName' for measurement types without
		subcounters
		- 'family' for measurement families
		constructed as the bullet e) of the measurement definition.

		For KPIs defined in TS 28.554 the name is defined according to the
		KPI definitions template as the component designated with a).

yang-models/_3gpp-common-measurements.yang

+8 −19

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@ module _3gpp-common-measurements {
		Measurements can be contained under ManagedElement, SubNetwork, or
		any list representing a class inheriting from Subnetwork or
		ManagedFunction. Note: KPIs will only be supported under SubNetwork
		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.623
		Generic Network Resource Model (NRM)
		@@ -56,6 +56,8 @@ module _3gpp-common-measurements {
		Integration Reference Point (IRP);
		Information Service (IS)";

		revision 2025-02-05 { reference CR-0460; }
		revision 2025-01-28 { reference CR-0511; }
		revision 2024-11-06 { reference CR-0487; }
		revision 2024-05-06 { reference CR-0359; }
		revision 2024-02-24 { reference CR-0346; }
		@@ -93,13 +95,8 @@ module _3gpp-common-measurements {
		by other SDOs, or be vendor specific. Performance metrics are
		identified with their names.

		For measurements defined in TS 28.552 the name is constructed as follows:
		- 'family.measurementName.subcounter' for measurement types with
		subcounters
		- 'family.measurementName' for measurement types without subcounters
		`- 'family' for measurement families
		For KPIs defined in TS 28.554 [28] the name is defined in the KPI
		definitions template as the component designated with e).
		For measurements defined in TS 28.552 the name is constructed as the
		bullet e) of the measurement definition.

		A name can also identify a vendor specific performance metric or a
		group of vendor specific performance metrics.";
		@@ -208,11 +205,7 @@ module _3gpp-common-measurements {
		Measurements are identified by name.

		For measurements defined in TS 28.552 the name is constructed as
		follows:
		- 'family.measurementName.subcounter' for measurement types with
		subcounters
		- 'family.measurementName' for measurement types without subcounters
		- 'family' for measurement families
		the bullet e) of the measurement definition.

		For KPIs defined in TS 28.554 the name is defined in the KPI
		definitions template as the component designated with e).
		@@ -251,7 +244,7 @@ module _3gpp-common-measurements {
		}

		grouping PerfMetricJobGrp {
		description "Represents the attributtes of the IOC PerfMetricJob";
		description "Represents the attributes of the IOC PerfMetricJob";

		leaf administrativeState {
		default UNLOCKED;
		@@ -282,11 +275,7 @@ module _3gpp-common-measurements {
		identify a vendor specific group of performance metrics.

		For measurements defined in TS 28.552 the name is constructed as
		follows:
		- 'family.measurementName.subcounter' for measurement types with
		subcounters
		- 'family.measurementName' for measurement types without subcounters
		- 'family' for measurement families
		the bullet e) of the measurement definition.

		For KPIs defined in TS 28.554 the name is defined in the KPI
		definitions template as the component designated with e).";

yang-models/_3gpp-common-trace.yang

+495 −348

File changed.

Preview size limit exceeded, changes collapsed.

yang-models/_3gpp-common-yang-extensions.yang

+15 −6

Original line number	Diff line number	Diff line
		@@ -38,7 +38,7 @@ module _3gpp-common-yang-extensions {
		If support for an extension is missing the extension statement needs
		individual handling or it SHOULD be removed from the module using
		the extension e.g. with a deviation.
		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.623
		Generic Network Resource Model (NRM)
		@@ -46,6 +46,7 @@ module _3gpp-common-yang-extensions {
		Solution Set (SS) definitions
		3GPP TS 28.623";

		revision 2025-02-06{ reference "CR-0507, 0507" ; }
		revision 2024-04-05 { reference "CR-0332, 0333" ; }
		revision 2023-09-17 { reference "CR-0270, 0271" ; }
		revision 2022-10-31 { reference "CR-0195, 0196"; }
		@@ -65,7 +66,9 @@ module _3gpp-common-yang-extensions {
		Zero or one only-system-created statement per parent statement is
		allowed. No sub-statements are allowed.

		Adding this statement is an NBC change, removing it is BC.";
		Adding this statement is an NBC change,
		removing it is BC, however if the system behavior is also changed in
		parallel (the system stops creating the MOIs), this behavior is NBC.";
		}

		extension notNotifyable {
		@@ -73,14 +76,16 @@ module _3gpp-common-yang-extensions {
		"Indicates that data change notifications shall not be sent
		for this attribute. If the extension is not present and other
		conditions are fulfilled data change notification should be sent.

		If a list or container already has the notNotifyable
		extension, that is also valid for all contained data nodes.

		The statement MUST only be a substatement of a leaf, leaf-list, list,
		container statement that is contained within the 'attributes'
		container of an IOC and that represents an attribute or sub-parts of
		an attribute .

		an attribute. If the attribute is represented by a container or list,
		the statement shall be put on these, not on data nodes inside the
		list/container.
		Zero or one notNotifyable statement is allowed per parent statement.
		NO substatements are allowed.

		@@ -103,8 +108,12 @@ module _3gpp-common-yang-extensions {

		It is unnecessary to use and MUST NOT be used for key leafs.

		The statement MUST only be a substatement of a leaf, leaf-list, list
		statement that is config=true.
		The statement MUST only be a substatement of a leaf, leaf-list, list,
		container statement that is contained within the 'attributes'
		container of an IOC and that represents an attribute or sub-parts of
		an attribute and is config=true. If the attribute is represented by a
		container or list, the statement shall be put on these, not on data
		nodes inside the list/container.
		Zero or one inVariant statement is allowed per parent statement.
		NO substatements are allowed.

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

+17 −11

Original line number	Diff line number	Diff line
		@@ -12,10 +12,12 @@ module _3gpp-common-yang-types {
		description "The model defines a YANG mapping of the top level
		information classes used for management of 5G networks and
		network slicing.
		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.623";

		revision 2025-02-18 { reference CR-0511; }
		revision 2025-02-06 { reference CR-0507; }
		revision 2024-05-18 { reference CR-0359; }
		revision 2024-04-12 { reference CR-0346; }
		revision 2023-11-06 { reference CR-0305; }
		@@ -312,7 +314,7 @@ module _3gpp-common-yang-types {

		grouping GeographicalCoordinates {
		description "This datatype represents the geographical coordinates";
		reference "#GPP TS 28.558 clause 6.3.8";
		reference "3GPP TS 28.538 clause 6.3.8";

		leaf latitude {
		type Latitude;
		@@ -323,11 +325,6 @@ module _3gpp-common-yang-types {
		type Longitude;
		mandatory true;
		}

		leaf altitude {
		type Altitude;
		}

		}

		typedef OnOff {
		@@ -644,6 +641,10 @@ module _3gpp-common-yang-types {
		global reference frame (WGS 84). Positive values correspond to
		degrees east of 0 degrees longitude.";
		}

		leaf altitude {
		type Altitude;
		}
		}

		grouping GeoAreaGrp {
		@@ -980,10 +981,15 @@ module _3gpp-common-yang-types {
		deleted, the 'NtfSubscriptionControl' instance created due to the
		request for implicit subscription shall be deleted as well.

		- When only the fileReportingPeriod and fileLocation attributes are
		present, the MnS producer shall store the files on a MnS consumer, that
		can be any entity such as a file server, at the location specified by
		fileLocation. No notification is emitted by the MnS producer.
		- When only the 'fileReportingPeriod' and 'fileLocation' attributes
		are present (CHOICE_3), the MnS producer shall store the files at the
		location specified by 'fileLocation'. The file location may identify
		any entity such as a file server or a MnS consumer. The identified
		MnS consumer may or may not be identical to the MnS consumer creating
		the 'PerfMetricJob'. As for CHOICE_1 the MnS producer may emit
		'notifyFileReady' and 'notifyFilePreparationError' notifications to
		inform subscribers that a file has been made available at the location
		specified by 'fileLocation'.

		- When only the streamTarget attribute is present, the MnS producer
		shall stream the data to the location specified by streamTarget.