Merge branch '28.623_Rel18_CR0234_YANG_Corrections' into 'Integration_Rel18_SA5_147_YANG' (d9016074) · Commits · SA5 – Management & Orchestration and Charging / Management and Orchestration APIs

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 {

yang-models/_3gpp-common-management-node.yang

0 → 100644

+90 −0

Original line number	Diff line number	Diff line
		module _3gpp-common-management-node {
		yang-version 1.1;
		namespace urn:3gpp:sa5:_3gpp-common-management-node;
		prefix "mmgmtnode3gpp";

		import _3gpp-common-top { prefix top3gpp; }
		import _3gpp-common-yang-types { prefix types3gpp ; }
		import _3gpp-common-subnetwork { prefix subnet3gpp ; }

		organization "3GPP SA5";
		contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";

		description "Defines ManagementNode IOCs";
		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)

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

		revision 2023-02-14 { reference "CR-0234"; }

		grouping ManagementSystem_Grp {
		description "Represents the ManagementSystem_ IOC.";

		leaf userLabel {
		type string;
		description "A user-friendly (and user assignable) name of this object.";
		}

		leaf-list managedElements {
		type types3gpp:DistinguishedName;
		config false;
		description "Contains a list of the DN(s) of the related subclasses of
		ManagedElement_ instance(s).";
		}
		}

		grouping ManagementNodeGrp {
		uses ManagementSystem_Grp;

		leaf vendorName {
		type string;
		config false;
		}

		leaf userDefinedState {
		type string;
		description "An operator defined state for operator specific usage";
		}

		leaf locationName {
		type string;
		config false;
		description "The physical location of this entity (e.g. an address).";
		}

		leaf swVersion {
		type string;
		config false;
		}
		}

		augment /subnet3gpp:SubNetwork {
		list ManagementNode {
		description "Represents a telecommunications management system (EM) within
		the TMN that contains functionality for managing a number of
		ManagedElements (MEs). The management system communicates with the MEs
		directly or indirectly over one or more interfaces for the purpose
		of monitoring and/or controlling these MEs.

		This class has similar characteristics as the ManagedElement. The
		main difference between these two classes is that the ManagementNode
		has a special association to the managed elements that it is
		responsible for managing.";

		key id;
		uses top3gpp:Top_Grp;
		container attributes {
		uses ManagementNodeGrp;
		}
		}
		}
		}
		No newline at end of file

yang-models/_3gpp-common-managementdatacollection.yang

+123 −13

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

		import _3gpp-common-top { prefix top3gpp; }
		import _3gpp-common-yang-types {prefix types3gpp; }
		import _3gpp-common-yang-extensions {prefix yext3gpp; }
		//import ietf-inet-types { prefix inet; }
		import ietf-yang-types { prefix yang; }
		import _3gpp-common-subnetwork { prefix subnet3gpp; }
		@@ -24,21 +25,133 @@ module _3gpp-common-managementdatacollection {
		Integration Reference Point (IRP);
		Information Service (IS)";

		revision 2023-02-14 { reference "CR-0234"; }
		revision 2022-11-04 { reference "CR-0194"; }

		grouping GeoCoordinateGrp {
		description "Geographical location on earth";

		grouping Tai {
		list plmnId {
		description "PLMN Identity.";
		min-elements 1;
		leaf latitude {
		type decimal64 {
		fraction-digits 4;
		range -90..90 ;
		}
		mandatory true;
		description "Latitude based on World Geodetic System (1984 version)
		global reference frame (WGS 84). Positive values correspond to the
		northern hemisphere.";
		}

		leaf longitude {
		type decimal64 {
		fraction-digits 4;
		range -180..180 ;
		}
		mandatory true;
		description "Longitude based on World Geodetic System (1984 version)
		global reference frame (WGS 84). Positive values correspond to
		degrees east of 0 degrees longitude.";
		}
		}

		grouping GeoAreaGrp {
		description "This data type defines a geographical area.
		The geo-area is defined using a convex polygon in the attribute
		'convexGeoPolygon'.";

		list convexGeoPolygon {
		description "Specifies the geographical area with a convex polygon.
		The convex polygon is specified by its corners.";
		key "latitude longitude";
		min-elements 3;
		ordered-by user;

		uses GeoCoordinateGrp;
		}
		}

		grouping GeoAreaToCellMappingGrp {
		description "Represents the GeoAreaToCellMapping data type.

		The mapping of the geographical area to cells is performed at
		instantiation of the IOC.";

		list geoArea {
		description "It specifies the geographical area using the cordinates of
		the corners of a convex polygon.";
		key idx;
		max-elements 1;
		key "mcc mnc";
		uses types3gpp:PLMNId;
		leaf idx {
		type string;
		}
		uses GeoAreaGrp;
		}

		leaf tac { type types3gpp:Tac; }
		leaf associationThreshold {
		type uint8 {
		range 1..100;
		}
		yext3gpp:inVariant;
		description "It specifies the threshold of coverage area in
		percentage whether a cell belongs to the geographical area or not.

		If this attribute is absent, the location of the base station
		antenna determines whether a cell belongs to the geographical
		area or not.";
		}
		}

		grouping AreaOfInterestGrp {
		description "It specifies a location(s) from where the management data
		shall be collected.";

		list geoAreaToCellMapping {
		description "Contains a geographical area and an association threshold.
		The geo-area is defined as a convex polygon using the attribute
		'geoArea'.

		The MnS producer shall map the geographical area to cells. There are
		two evaluation criteria whether a cell belongs to a geographical area
		or not. If attribute 'associationThreshold' is absent, the location
		of the base station antenna determines the belonging. If attribute
		'associationThreshold' is configured, the coverage area is considered.
		The attribute 'associationThreshold' determines the lower boundary of
		the coverage ratio. For example, if the 'associationThreshold' is
		configured to 60%, a cell shall be considered as included in the
		geographical area if at least 60% of the coverage area of that
		cell overlaps with the specified geographical area.

		The mapping of the geographical area to cells is performed at
		instantiation of the IOC.";
		key idx;
		leaf idx { type string; }
		uses GeoAreaToCellMappingGrp;
		}

		list taiList {
		description "Tracking Area Identity list";
		key idx;
		min-elements 1;
		max-elements 8;
		leaf idx { type string; }
		uses types3gpp:TaiGrp;
		}

		leaf-list nrCellIdList {
		type string;
		description "List of NR cells identified by NG-RAN CGI";
		}

		leaf-list eutraCellIdList {
		type string;
		description "List of E-UTRAN cells identified by E-UTRAN-CGI";
		}

		leaf-list utraCellIdList {
		type string;
		description "List of UTRAN cells identified by UTRAN CGI";
		}
		}

		grouping NodeFilterGrp {

		@@ -47,9 +160,7 @@ module _3gpp-common-managementdatacollection {
		leaf idx {
		type string;
		}
		uses Tai; // (Maybe type: types3gpp:Tai,if we define Tai there.)
		// mandatory false
		min-elements 1;
		uses AreaOfInterestGrp;
		description "It specifies a location(s) from where the management data
		shall be collected. It is defined in terms of TAI(s).";
		}
		@@ -78,7 +189,6 @@ module _3gpp-common-managementdatacollection {

		leaf sst {
		type uint8; // TS 28.003 clause 28.4.
		//mandatory false;
		description "It specifies the slice service type (SST) of which the slice
		subnet should be targeted. Please refer to 3GPP TS 23.501: 'System
		Architecture for the 5G System'";