Merge branch 'Integration_Rel17_SA5_153_YANG' into 'Rel-17' (50a2d9d7) · Commits · SA5 – Management & Orchestration and Charging / Management and Orchestration APIs

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

+5 −4

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,10 +11,11 @@ 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 2024-01-29 { reference CR-1166 ; }
		revision 2023-11-05 { reference CR-1131 ; }

		grouping GeoLocGrp {
		@@ -23,7 +24,7 @@ module _3gpp-5gc-ecmconnectioninfo {

		list geographicalCoordinates {
		description "This refers to the Topological Service Area,
		(see clause 7.3.3.2 in TS 23.538) that is defined as a datatype
		(see clause 7.3.3.2 in TS 23.558) that is defined as a datatype
		(see clause 6.3.8).";
		key latitude;
		max-elements 1;

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; }

		@@ -17,13 +17,14 @@ module _3gpp-common-filemanagement {
		TTA, TTC). All rights reserved.";
		reference "3GPP TS 28.623 Generic Network Resource Model (NRM)";

		revision 2023-12-17 { reference CR-0327 ; }
		revision 2023-09-17 { reference CR-0270 ; }
		revision 2022-10-31 { reference CR-0195; }
		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

+3 −2

Original line number	Diff line number	Diff line
		@@ -11,14 +11,14 @@ module _3gpp-common-managed-element {
		import _3gpp-common-trace { prefix trace3gpp; }
		import _3gpp-common-files { prefix files3gpp; }
		import _3gpp-5gc-nrm-configurable5qiset { prefix fiveqi3gpp; }
		import _3gpp-5gc-ecmconnectioninfo { prefix econn3gpp ; }
		import _3gpp-5gc-nrm-ecmconnectioninfo { prefix econn3gpp ; }

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

		description "Defines ManagedElement which will be augmented
		by other IOCs
		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.623
		Generic Network Resource Model (NRM)
		@@ -33,6 +33,7 @@ module _3gpp-common-managed-element {
		3GPP TS 28.620
		Umbrella Information Model (UIM)";

		revision 2024-01-29 { reference CR-0327 ; }
		revision 2023-11-05 { reference CR-0306 ; }
		revision 2023-09-17 { reference CR-0270 ; }
		revision 2022-07-26 { reference CR-0180 ; }

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

+4 −3

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

		revision 2023-12-17 { reference CR-0327 ; }
		revision 2023-09-17 { reference CR-0270 ; }
		revision 2022-10-31 { reference CR-0195; }
		revision 2022-01-07 { reference "CR-0146"; }
		@@ -45,7 +46,7 @@ module _3gpp-common-managed-function {
		description "The TraceSubtree shall be contained under ManagedFunction";
		}

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

		@@ -101,13 +102,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";
		}

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

0 → 100644

+92 −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
		Copyright 2024, 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)

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

		revision 2024-01-29 { reference CR-0327 ; }

		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