Merge branch 'Merge_Helper_for_Integration_Rel17_SA5_145_YANG_c' into 'Rel-17' (e5c60002) · Commits · Miguel Angel Reina Ortega / Management and Orchestration APIs

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

+38 −49

Original line number	Diff line number	Diff line
		module _3gpp-5gc-nrm-configurable5qiset {
		yang-version 1.1;

		namespace urn:3gpp:sa5:_3gpp-5gc-nrm-configurable5qiset;
		prefix Conf5QIs3gpp;
		prefix conf5QIs3gpp;

		import _3gpp-common-top { prefix top3gpp; }
		import _3gpp-common-managed-element { prefix me3gpp; }
		import _3gpp-common-subnetwork { prefix subnet3gpp; }

		organization "3gpp SA5";
		contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
		@@ -15,12 +12,13 @@ module _3gpp-5gc-nrm-configurable5qiset {
		(and configurable) to the 5G NFs.";
		reference "3GPP TS 28.541";

		revision 2022-07-27 { reference "CR-0769"; }
		revision 2022-04-29 { reference "CR-0729"; }
		revision 2022-01-07 { reference CR-0643; }
		revision 2020-08-04 { reference "CR-0321"; }
		revision 2020-06-03 { reference "CR-0286"; }

		grouping PacketErrorRate {
		grouping PacketErrorRateGrp {
		leaf scalar {
		type uint32 {
		range 0..9 ;
		@@ -41,11 +39,6 @@ module _3gpp-5gc-nrm-configurable5qiset {

		grouping FiveQICharacteristicsGrp {
		description "Represents the FiveQICharacteristics IOC.";
		reference "3GPP TS 28.541";
		}

		list configurableFiveQIs {
		key fiveQIValue;
		leaf fiveQIValue {
		type uint32 {
		range 0..255 ;
		@@ -68,27 +61,34 @@ module _3gpp-5gc-nrm-configurable5qiset {
		type uint32 {
		range 0..127 ;
		}
		mandatory true;
		description "It indicates the Priority Level of a 5QI, as specified
		in TS 23.501.";
		}

		leaf packetDelayBudget {
		type uint32 {
		range 0..1023 ;
		}
		mandatory true;
		description "Indicates the Packet Delay Budget (in unit of 0.5ms)of a 5QI,
		as specified in TS 23.501 ";
		}

		list packetErrorRate {
		key "scalar exponent";
		min-elements 1;
		max-elements 1;
		uses PacketErrorRate;
		reference "TS 23.501";
		uses PacketErrorRateGrp;
		description "It indicates the Packet Error Rate of a 5QI,
		as specified in TS 23.501.";
		}

		leaf averagingWindow {
		type uint32 {
		range 0..4095 ;
		}
		mandatory true;
		units ms;
		reference "TS 23.501";
		}
		@@ -97,24 +97,20 @@ module _3gpp-5gc-nrm-configurable5qiset {
		type uint32{
		range 0..4095 ;
		}
		mandatory true;
		units byte;
		}
		}

		grouping FiveQiCharacteristicsSubtree {
		description "Represents the FiveQICharacterics IOC.";
		list FiveQICharacteristics {
		key id;
		uses top3gpp:Top_Grp;
		container attributes {
		uses FiveQICharacteristicsGrp;
		}
		}
		grouping Configurable5QISetGrp {
		description "Represents the Configurable5QISet IOC.
		No attributes defined.";
		}

		grouping Configurable5QISetGrp {
		description "Represents the Configurable5QISet IOC.";
		list configurable5QIs {
		grouping FiveQICharacteristicsSubtree {
		list FiveQICharacteristics {
		description "This specifies the 5QI value and the corresponding
		QoS characteristics for a 5QI.";
		key id;
		uses top3gpp:Top_Grp;
		container attributes {
		@@ -133,14 +129,7 @@ module _3gpp-5gc-nrm-configurable5qiset {
		container attributes {
		uses Configurable5QISetGrp;
		}
		uses FiveQICharacteristicsSubtree;
		}
		}

		augment "/subnet3gpp:SubNetwork" {
		uses Configurable5QISetSubtree;
		}

		augment "/me3gpp:ManagedElement" {
		uses Configurable5QISetSubtree;
		}
		}
		No newline at end of file

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

+11 −5

Original line number	Diff line number	Diff line
		module _3gpp-5gc-nrm-dynamic5qiset {
		yang-version 1.1;

		namespace urn:3gpp:sa5:_3gpp-5gc-nrm-dynamic5qiset;
		prefix dyn5QIs3gpp;

		@@ -15,6 +14,7 @@ module _3gpp-5gc-nrm-dynamic5qiset {
		characteristics.";
		reference "3GPP TS 28.541";

		revision 2022-07-27 { reference "CR-0769"; }
		revision 2022-01-07 { reference CR-0643; }
		revision 2020-10-01 { reference "CR-0393"; }
		revision 2020-08-06 { reference "CR-0333"; }
		@@ -22,6 +22,11 @@ module _3gpp-5gc-nrm-dynamic5qiset {
		grouping Dynamic5QISetGrp {
		description "Represents the Dynamic5QISet IOC.";
		list dynamic5QIs {
		description "This IOC specifies the dynamically assigned 5QIs
		including their QoS characteristics, see 3GPP TS 23.501.
		The instance of this IOC shall not be created or modified by the
		MnS consumer except for the instance associated to
		PCFFunction MOI or SMFFunction MOI when the PCF is not deployed.";
		key id;
		uses top3gpp:Top_Grp;
		container attributes {
		@@ -40,6 +45,7 @@ module _3gpp-5gc-nrm-dynamic5qiset {
		container attributes {
		uses Dynamic5QISetGrp;
		}
		uses Conf5QIs3gpp:FiveQICharacteristicsSubtree;
		}
		}

yang-models/_3gpp-common-filemanagement.yang

+4 −4

Original line number	Diff line number	Diff line
		@@ -59,9 +59,9 @@ module _3gpp-common-filemanagement {

		leaf cancelJob {
		description "Setting this attribute to TRUE cancels the file download job.
		As specified in the definition of ProcessMonitor, cancellation is possible in
		the NOT_STARTED and RUNNING state. Setting the attribute to FALSE has no
		observable result.";
		As specified in the definition of ProcessMonitor, cancellation is
		possible in the NOT_STARTED and RUNNING state. Setting the attribute
		to FALSE has no observable result.";
		type boolean;
		mandatory true;
		}

yang-models/_3gpp-common-managed-element.yang

+10 −1

Original line number	Diff line number	Diff line
		@@ -9,6 +9,7 @@ module _3gpp-common-managed-element {
		import _3gpp-common-subscription-control { prefix subscr3gpp; }
		import _3gpp-common-fm { prefix fm3gpp; }
		import _3gpp-common-trace { prefix trace3gpp; }
		import _3gpp-5gc-nrm-configurable5qiset { prefix conf5QIs3gpp; }

		organization "3GPP SA5";
		contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
		@@ -28,6 +29,7 @@ module _3gpp-common-managed-element {
		3GPP TS 28.620
		Umbrella Information Model (UIM)";

		revision 2022-07-26 { reference CR-0180 ; }
		revision 2021-01-16 { reference "CR-0120"; }
		revision 2020-08-06 { reference "CR-0102"; }
		revision 2020-08-03 { reference "CR-0095"; }
		@@ -37,6 +39,10 @@ module _3gpp-common-managed-element {
		revision 2019-06-17 { reference " S5-203316"; }
		revision 2019-05-08 { reference "Initial revision"; }

		feature Configurable5qisetUnderManagedElement {
		description "The Configurable5qiset shall be contained under ManagedElement";
		}

		feature MeasurementsUnderManagedElement {
		description "The MeasurementSubtree shall be contained under
		ManagedElement";
		@@ -244,5 +250,8 @@ module _3gpp-common-managed-element {
		if-feature TraceUnderManagedElement;
		}

		uses conf5QIs3gpp:Configurable5QISetSubtree {
		if-feature Configurable5qisetUnderManagedElement;
		}
		}
		}
		No newline at end of file

yang-models/_3gpp-common-mnsregistry.yang

+30 −11

Original line number	Diff line number	Diff line
		@@ -17,9 +17,8 @@ module _3gpp-common-mnsregistry {
		revision 2021-10-18 { reference "S5-215263"; }
		revision 2021-08-29 { reference "Initial revision, S5-214388"; }

		grouping MNSInfoGrp {
		description "Represents the MNSInfo IOC.";
		reference "3GPP TS 28.622";
		grouping MnsInfoGrp {
		description "Represents the MnsInfo IOC.";
		leaf mnsLabel {
		description "Human-readable name of management service.";
		mandatory true;
		@@ -48,26 +47,46 @@ module _3gpp-common-mnsregistry {
		}

		leaf-list mnsScope {
		description "List of the managed object instances that can be accessed using the MnS. If a complete SubNetwork can be accessed using the MnS, this attribute may contain the DN of the SubNetwork instead of the DNs of the individual managed entities within the SubNetwork.";
		description "List of the managed object instances that can be accessed
		using the MnS. If a complete SubNetwork can be accessed using the MnS,
		this attribute may contain the DN of the SubNetwork instead of the
		DNs of the individual managed entities within the SubNetwork.";
		min-elements 1;
		type types3gpp:DistinguishedName;
		}

		}

		augment "/subnet3gpp:SubNetwork" {
		list MNSRegistry {
		description "Represents the MNSRegistry IOC.";
		reference "3GPP TS 28.622";
		description "Represents the MNSRegistry IOC.
		The IOC is instantiated by the system.";
		uses top3gpp:Top_Grp;
		key id;
		max-elements 1;

		list MNSInfo {
		description "Represents the MNSInfo IOC.";
		reference "3GPP TS 28.622";
		description "This IOC represents an available Management Service (MnS)
		and provides the data required to support its discovery.
		It is name-contained by MnsRegistry.

		This information is used by the consumer to discover the producers
		of specific Management Services and to derive the addresses of the
		Management Service.

		Attributes mnsLabel, mnsType, and mnsVersion are used to describe
		the Management Service.

		Attribute mnsAddress is used to provide addressing information for
		the Management Service operations.

		Attribute mnsScope is used to provide information about the
		management scope of the Management Service. The management scope is
		defined as the set of managed object instances that can be accessed
		using the Management Service.";

		uses top3gpp:Top_Grp;
		key "mnsType mnsVersion mnsAddress";
		uses MNSInfoGrp;
		uses MnsInfoGrp;
		}
		}
		}