Merge branch 'Integration_Rel18_SA5_147_YANG' into 'Rel-18' (2f32e9c3) · Commits · SA5 – Management & Orchestration and Charging / Management and Orchestration APIs

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

+8 −21

Original line number	Diff line number	Diff line
		@@ -13,9 +13,8 @@ module _3gpp-5gc-nrm-nfprofile {
		description "NF profile class.";
		reference "3GPP TS 29.510";

		revision 2019-06-17 {
		description "initial revision";
		}
		revision 2023-02-14 { reference CR-0891; }
		revision 2019-06-17 { reference "initial revision"; }

		grouping NFProfileGrp {
		leaf nfInstanceID {
		@@ -322,7 +321,7 @@ module _3gpp-5gc-nrm-nfprofile {

		//optional support
		min-elements 1;
		uses Tai;
		uses types3gpp:TaiGrp;
		}

		list taiRangeList {
		@@ -390,7 +389,7 @@ module _3gpp-5gc-nrm-nfprofile {

		//optional support
		min-elements 1;
		uses Tai;
		uses types3gpp:TaiGrp;
		}

		list taiRangeList {
		@@ -936,18 +935,6 @@ module _3gpp-5gc-nrm-nfprofile {
		}
		}

		grouping Tai {
		list plmnId {
		description "PLMN Identity.";
		min-elements 1;
		max-elements 1;
		key "mcc mnc";
		uses types3gpp:PLMNId;
		}

		leaf tac { type types3gpp:Tac; }
		}

		grouping InterfaceUpfInfoItem {
		leaf interfaceType {
		description "User Plane interface type.";

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@ module _3gpp-5gc-nrm-scpfunction {
		revision 2019-10-20 {
		description "initial revision";
		reference "Based on
		3GPP TS 28.541 V16.X.XX";
		3GPP TS 28.541";
		}

		grouping SCPFunctionGrp {

yang-models/_3gpp-common-filemanagement.yang

+3 −2

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@ module _3gpp-common-filemanagement {

		import _3gpp-common-subnetwork { prefix subnet3gpp; }
		import _3gpp-common-top { prefix top3gpp; }
		import _3gpp-common-yang-types { prefix yang3gpp; }
		import _3gpp-common-yang-types { prefix types3gpp; }
		import _3gpp-common-yang-extensions { prefix yext3gpp; }
		import _3gpp-common-managed-element { prefix me3gpp; }

		@@ -15,12 +15,13 @@ module _3gpp-common-filemanagement {
		Class (IOC) that is part of the Generic Network Resource Model (NRM).";
		reference "3GPP TS 28.623 Generic Network Resource Model (NRM)";

		revision 2023-02-14 { reference CR-0234; }
		revision 2022-10-24 { reference CR-0196; }
		revision 2022-02-10 { reference "Initial revision, S5-221757"; }

		grouping FileDownloadProcessMonitor {
		description "Provides specialisations of the ProcessMonitor datatype.";
		uses yang3gpp:ProcessMonitor {
		uses types3gpp:ProcessMonitorGrp {
		refine resultStateInfo {
		description "If status is FAILED resultStateInfo will be one of
		the following or empty.";

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

+17 −1

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ module _3gpp-common-managed-element {
		3GPP TS 28.620
		Umbrella Information Model (UIM)";

		revision 2023-02-14 { reference "CR-0234"; }
		revision 2022-09-30 { reference "CR-0191"; }
		revision 2021-01-16 { reference "CR-0120"; }
		revision 2020-08-06 { reference "CR-0102"; }
		@@ -162,7 +163,6 @@ module _3gpp-common-managed-element {
		and/or service to the subscriber.";

		uses ManagedElement_Grp;
		uses meas3gpp:SupportedPerfMetricGroupGrp;

		leaf vendorName {
		config false;
		@@ -183,6 +183,22 @@ module _3gpp-common-managed-element {
		type uint32;
		mandatory true;
		}

		uses meas3gpp:SupportedPerfMetricGroupGrp;

		leaf-list supportedTraceMetrics {
		type string;
		config false;
		description "List of trace metrics. When this attribute is contained in
		a managed object it defines the trace metrics supported for this
		object and all descendant objects.

		Trace metrics include trace messages, MDT measurements
		(Immediate MDT, Logged MDT, Logged MBSFN MDT), RLF and RCEF reports,
		see TS 32.422. Trace metrics are identified with their metric
		identifier. The metric identifier is constructed as defined
		in clause 10 of TS 32.422.";
		}
		}

		list ManagedElement {

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

+21 −4

Original line number	Diff line number	Diff line
		@@ -22,6 +22,8 @@ module _3gpp-common-managed-function {

		3GPP TS 28.620
		Umbrella Information Model (UIM)";

		revision 2023-02-14 { reference "CR-0234"; }
		revision 2022-11-02 { reference "CR-0753"; }
		revision 2022-10-24 { reference CR-0196; }
		revision 2022-01-07 { reference "CR-0146"; }
		@@ -48,8 +50,8 @@ module _3gpp-common-managed-function {
		description "The TraceSubtree shall be contained under ManagedFunction";
		}

		grouping Operation {
		description "This data type represents an Operation.";
		grouping OperationGrp {
		description "This data type represents an operation.";
		reference "3gpp TS 28.622";

		leaf name {
		@@ -101,13 +103,13 @@ module _3gpp-common-managed-function {
		min-elements 1;
		max-elements 1;
		description "The service access point of the managed NF service instance";
		uses types3gpp:SAP;
		uses types3gpp:SAPGrp;
		}

		list operations {
		key name;
		min-elements 1;
		uses Operation ;
		uses OperationGrp ;
		description "Set of operations supported by the managed NF
		service instance";
		}
		@@ -309,7 +311,22 @@ module _3gpp-common-managed-function {
		mandatory true;
		type uint32;
		}

		uses meas3gpp:SupportedPerfMetricGroupGrp;

		leaf-list supportedTraceMetrics {
		type string;
		config false;
		description "List of trace metrics. When this attribute is contained in
		a managed object it defines the trace metrics supported for this
		object and all descendant objects.

		Trace metrics include trace messages, MDT measurements
		(Immediate MDT, Logged MDT, Logged MBSFN MDT), RLF and RCEF reports,
		see TS 32.422. Trace metrics are identified with their metric
		identifier. The metric identifier is constructed as defined
		in clause 10 of TS 32.422.";
		}
		}

		grouping ManagedFunctionContainedClasses {