update to NRNetwork containment (421ee6a0) · Commits · SA5 – Management & Orchestration and Charging / Management and Orchestration APIs

yang-models/_3gpp-nr-nrm-externalamffunction.yang

+1 −6

Original line number	Diff line number	Diff line
		@@ -5,7 +5,6 @@ module _3gpp-nr-nrm-externalamffunction {

		import _3gpp-common-managed-function { prefix mf3gpp; }
		import _3gpp-common-subnetwork { prefix subnet3gpp; }
		import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; }
		import _3gpp-common-top { prefix top3gpp; }
		import _3gpp-common-yang-types { prefix types3gpp; }

		@@ -16,6 +15,7 @@ module _3gpp-nr-nrm-externalamffunction {
		TTA, TTC). All rights reserved.";
		reference "3GPP TS 28.541 5G Network Resource Model (NRM)";

		revision 2025-04-25 { reference CR-1527 ; }
		revision 2023-09-18 { reference CR-1043 ; }
		revision 2019-10-28 { reference S5-193518 ; }
		revision 2019-06-17 {
		@@ -64,9 +64,4 @@ module _3gpp-nr-nrm-externalamffunction {
		if-feature subnet3gpp:ExternalsUnderSubNetwork ;
		uses ExternalAMFFunctionWrapper;
		}

		augment "/nrnet3gpp:NRNetwork" {
		if-feature nrnet3gpp:ExternalsUnderNRNetwork;
		uses ExternalAMFFunctionWrapper;
		}
		}
		No newline at end of file

yang-models/_3gpp-nr-nrm-externalgnbcucpfunction.yang

+32 −16

Original line number	Diff line number	Diff line
		@@ -5,40 +5,44 @@ module _3gpp-nr-nrm-externalgnbcucpfunction {

		import _3gpp-common-yang-types { prefix types3gpp; }
		import _3gpp-common-managed-function { prefix mf3gpp; }
		import _3gpp-common-managed-element { prefix me3gpp; }
		import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; }
		import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; }
		import _3gpp-common-subnetwork { prefix subnet3gpp; }
		import _3gpp-nr-nrm-externalnrcellcu { prefix extnrcellcu3gpp; }
		import _3gpp-common-top { prefix top3gpp; }

		organization "3GPP SA5";
		contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
		description "Defines the YANG mapping of the ExternalGNBCUCPFunction
		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 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
		TTA, TTC). All rights reserved.";
		reference "3GPP TS 28.541 5G Network Resource Model (NRM)";

		revision 2025-04-25 { reference CR-1527 ; }
		revision 2023-09-18 { reference CR-1043 ; }
		revision 2019-10-28 { reference S5-193518 ; }
		revision 2019-06-17 {
		description "Initial revision";
		}
		revision 2019-06-17 { reference "Initial revision"; }

		grouping ExternalGNBCUCPFunctionGrp {
		description "Represets the ExternalGNBCUCPFunction IOC.";
		reference "3GPP TS 28.541";
		uses mf3gpp:ManagedFunctionGrp;

		leaf gNBId {
		description "Identifies a gNB within a PLMN.";
		reference "gNB Identifier (gNB ID) in 3GPP TS 38.300, Global gNB ID
		in 3GPP TS 38.413";
		description "Identifies a gNB within a PLMN.
		The gNB ID is part of the NR Cell Identifier (NCI) of the gNB cells.

		See 'gNB Identifier (gNB ID)' of subclause 8.2 of TS 38.300.
		See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413";
		mandatory true;
		type int64 { range "0..4294967295"; }
		type uint32 { range "0..4294967295"; }
		}

		leaf gNBIdLength {
		description "Indicates the number of bits for encoding the gNB ID.";
		reference "gNB ID in 3GPP TS 38.300, Global gNB ID in 3GPP TS 38.413";
		reference "'Global gNB ID' in subclause 9.3.1.6 of TS 38.413";
		mandatory true;
		type int32 { range "22..32"; }
		}
		@@ -57,23 +61,35 @@ module _3gpp-nr-nrm-externalgnbcucpfunction {
		list ExternalGNBCUCPFunction {
		description "Represents the properties, known by the management function,
		of a GNBCUCPFunction managed by another management function.";
		reference "3GPP TS 28.541";
		key id;
		uses top3gpp:Top_Grp;
		container attributes {
		uses ExternalGNBCUCPFunctionGrp;
		}
		uses mf3gpp:ManagedFunctionContainedClasses;

		uses extnrcellcu3gpp:ExternalNRCellCUSubtree;
		}
		}

		augment "/subnet3gpp:SubNetwork" {
		if-feature subnet3gpp:ExternalsUnderSubNetwork ;
		feature ExternalGNBCUCPFunctionUnderNRNetwork {
		description "The ExternalGNBCUCPFunction shall be contained under
		NRNetwork";
		}

		augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/"
		+ "nrnet3gpp:NRNetwork" {
		if-feature ExternalGNBCUCPFunctionUnderNRNetwork;
		uses ExternalGNBCUCPFunctionWrapper;
		}

		augment "/nrnet3gpp:NRNetwork" {
		if-feature nrnet3gpp:ExternalsUnderNRNetwork;
		feature ExternalGNBCUCPFunctionUnderSubNetwork {
		description "The ExternalGNBCUCPFunction shall be contained under
		SubNetwork";
		}

		augment "/subnet3gpp:SubNetwork" {
		if-feature ExternalGNBCUCPFunctionUnderSubNetwork ;
		uses ExternalGNBCUCPFunctionWrapper;
		}
		}
		No newline at end of file

yang-models/_3gpp-nr-nrm-externalgnbcuupfunction.yang

+31 −17

Original line number	Diff line number	Diff line
		@@ -4,11 +4,14 @@ module _3gpp-nr-nrm-externalgnbcuupfunction {
		prefix "extgnbcuup3gpp";

		import _3gpp-common-managed-function { prefix mf3gpp; }
		import _3gpp-common-managed-element { prefix me3gpp; }
		import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; }
		import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; }
		import _3gpp-common-subnetwork { prefix subnet3gpp; }
		import _3gpp-common-top { prefix top3gpp; }

		organization "3GPP SA5";
		contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
		description "Defines the YANG mapping of the ExternalGNBCUUPFunction
		Information Object Class (IOC), that is part of the NR Network
		Resource Model (NRM).
		@@ -16,11 +19,10 @@ module _3gpp-nr-nrm-externalgnbcuupfunction {
		TTA, TTC). All rights reserved.";
		reference "3GPP TS 28.541 5G Network Resource Model (NRM)";

		revision 2025-04-25 { reference CR-1527 ; }
		revision 2023-09-18 { reference CR-1043 ; }
		revision 2019-10-28 { reference S5-193518 ; }
		revision 2019-06-17 {
		description "Initial revision";
		}
		revision 2019-06-17 { reference "Initial revision"; }

		grouping ExternalGNBCUUPFunctionGrp {
		description "Represets the ExternalGNBCUUPFunction IOC.";
		@@ -28,26 +30,27 @@ module _3gpp-nr-nrm-externalgnbcuupfunction {
		uses mf3gpp:ManagedFunctionGrp;

		leaf gNBId {
		description "Identifies a gNB within a PLMN.";
		reference "gNB Identifier (gNB ID) in 3GPP TS 38.300, Global gNB ID
		in 3GPP TS 38.413";
		description "Identifies a gNB within a PLMN.
		The gNB ID is part of the NR Cell Identifier (NCI) of the gNB cells.

		See 'gNB Identifier (gNB ID)' of subclause 8.2 of TS 38.300.
		See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413";
		mandatory true;
		type int64 { range "0..4294967295"; }
		type uint32 { range "0..4294967295"; }
		}

		leaf gNBIdLength {
		description "Indicates the number of bits for encoding the gNB ID.";
		reference "gNB ID in 3GPP TS 38.300, Global gNB ID in 3GPP TS 38.413";
		reference "'Global gNB ID' in subclause 9.3.1.6 of TS 38.413";
		mandatory true;
		type int32 { range "22..32"; }
		}
		}

		grouping ExternalGNBCUUPFunctionWrapper {
		grouping ExternalGNBCUUPFunctionSubtree {
		list ExternalGNBCUUPFunction {
		description "Represents the properties, known by the management function,
		of a GNBCUUPFunction managed by another management function.";
		reference "3GPP TS 28.541";
		key id;
		uses top3gpp:Top_Grp;
		container attributes {
		@@ -57,13 +60,24 @@ module _3gpp-nr-nrm-externalgnbcuupfunction {
		}
		}

		augment "/subnet3gpp:SubNetwork" {
		if-feature subnet3gpp:ExternalsUnderSubNetwork ;
		uses ExternalGNBCUUPFunctionWrapper;
		feature ExternalGNBCUUPFunctionUnderNRNetwork {
		description "The ExternalGNBCUUPFunction shall be contained under
		NRNetwork";
		}

		augment "/nrnet3gpp:NRNetwork" {
		if-feature nrnet3gpp:ExternalsUnderNRNetwork;
		uses ExternalGNBCUUPFunctionWrapper;
		augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/"
		+ "nrnet3gpp:NRNetwork" {
		if-feature ExternalGNBCUUPFunctionUnderNRNetwork;
		uses ExternalGNBCUUPFunctionSubtree;
		}

		feature ExternalGNBCUUPFunctionUnderSubNetwork {
		description "The ExternalGNBCUUPFunction shall be contained under
		SubNetwork";
		}

		augment "/subnet3gpp:SubNetwork" {
		if-feature ExternalGNBCUUPFunctionUnderSubNetwork ;
		uses ExternalGNBCUUPFunctionSubtree;
		}
		}
		No newline at end of file

yang-models/_3gpp-nr-nrm-externalgnbdufunction.yang

+31 −27

Original line number	Diff line number	Diff line
		@@ -3,26 +3,27 @@ module _3gpp-nr-nrm-externalgnbdufunction {
		namespace "urn:3gpp:sa5:_3gpp-nr-nrm-externalgnbdufunction";
		prefix "extgnbdu3gpp";

		import _3gpp-common-yang-types { prefix types3gpp; }
		import _3gpp-common-yang-extensions { prefix yext3gpp; }
		import _3gpp-common-managed-function { prefix mf3gpp; }
		import _3gpp-common-managed-element { prefix me3gpp; }
		import _3gpp-nr-nrm-gnbcucpfunction { prefix gnbcucp3gpp; }
		import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; }
		import _3gpp-common-subnetwork { prefix subnet3gpp; }
		import _3gpp-common-top { prefix top3gpp; }

		organization "3GPP SA5";
		contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
		description "Defines the YANG mapping of the ExternalGNBDUFunction
		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 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
		TTA, TTC). All rights reserved.";
		reference "3GPP TS 28.541 5G Network Resource Model (NRM)";

		revision 2025-04-25 { reference CR-1527 ; }
		revision 2023-09-18 { reference CR-1043 ; }
		revision 2019-10-28 { reference S5-193518 ; }
		revision 2019-06-17 {
		description "Initial revision";
		}
		revision 2019-06-17 { reference "Initial revision"; }

		grouping ExternalGNBDUFunctionGrp {
		description "Represets the ExternalGNBDUFunction IOC.";
		@@ -30,36 +31,28 @@ module _3gpp-nr-nrm-externalgnbdufunction {
		uses mf3gpp:ManagedFunctionGrp;

		leaf gNBId {
		description "Identifies a gNB within a PLMN.";
		reference "gNB Identifier (gNB ID) in 3GPP TS 38.300, Global gNB ID
		in 3GPP TS 38.413";
		description "Identifies a gNB within a PLMN.
		The gNB ID is part of the NR Cell Identifier (NCI) of the gNB cells.

		See 'gNB Identifier (gNB ID)' of subclause 8.2 of TS 38.300.
		See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413";
		mandatory true;
		type int64 { range "0..4294967295"; }
		type uint32 { range "0..4294967295"; }
		yext3gpp:inVariant;
		}

		leaf gNBIdLength {
		description "Indicates the number of bits for encoding the gNB ID.";
		reference "gNB ID in 3GPP TS 38.300, Global gNB ID in 3GPP TS 38.413";
		reference "'Global gNB ID' in subclause 9.3.1.6 of TS 38.413";
		mandatory true;
		type int32 { range "22..32"; }
		}

		list pLMNId {
		description "Specifies the PLMN identifier to be used as part of the
		global RAN node identity.";
		key "mcc mnc";
		min-elements 1;
		max-elements 1;
		uses types3gpp:PLMNId;
		}
		}

		grouping ExternalGNBDUFunctionWrapper {
		grouping ExternalGNBDUFunctionSubtree {
		list ExternalGNBDUFunction {
		description "Represents the properties, known by the management function,
		of a GNBDUFunction managed by another management function.";
		reference "3GPP TS 28.541";
		key id;
		uses top3gpp:Top_Grp;
		container attributes {
		@@ -69,13 +62,24 @@ module _3gpp-nr-nrm-externalgnbdufunction {
		}
		}

		augment "/subnet3gpp:SubNetwork" {
		if-feature subnet3gpp:ExternalsUnderSubNetwork ;
		uses ExternalGNBDUFunctionWrapper;
		feature ExternalGNBDUFunctionUnderNRNetwork {
		description "The ExternalGNBDUFunction shall be contained under
		NRNetwork";
		}

		augment "/nrnet3gpp:NRNetwork" {
		if-feature nrnet3gpp:ExternalsUnderNRNetwork;
		uses ExternalGNBDUFunctionWrapper;
		augment "/me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/"
		+ "nrnet3gpp:NRNetwork" {
		if-feature ExternalGNBDUFunctionUnderNRNetwork;
		uses ExternalGNBDUFunctionSubtree;
		}

		feature ExternalGNBDUFunctionUnderSubNetwork {
		description "The ExternalGNBDUFunction shall be contained under
		SubNetwork";
		}

		augment "/subnet3gpp:SubNetwork" {
		if-feature ExternalGNBDUFunctionUnderSubNetwork ;
		uses ExternalGNBDUFunctionSubtree;
		}
		}
		No newline at end of file

yang-models/_3gpp-nr-nrm-externalnrcellcu.yang

+35 −31

Original line number	Diff line number	Diff line
		@@ -5,43 +5,57 @@ module _3gpp-nr-nrm-externalnrcellcu {

		import _3gpp-common-yang-types { prefix types3gpp; }
		import _3gpp-common-managed-function { prefix mf3gpp; }
		import _3gpp-nr-nrm-nrnetwork { prefix nrnet3gpp; }
		import _3gpp-common-subnetwork { prefix subnet3gpp; }
		import _3gpp-nr-nrm-externalgnbcucpfunction { prefix extgnbcucp3gpp; }
		import _3gpp-common-top { prefix top3gpp; }

		organization "3GPP SA5";
		contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
		description "Defines the YANG mapping of the ExternalNRCellCU 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 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
		TTA, TTC). All rights reserved.";
		reference "3GPP TS 28.541 5G Network Resource Model (NRM)";

		revision 2025-04-25 { reference CR-1527 ; }
		revision 2023-09-18 { reference CR-1043 ; }
		revision 2019-10-28 { reference S5-193518 ; }

		revision 2019-06-17 {
		description "Initial revision";
		}
		revision 2019-06-17 { reference "Initial revision"; }

		grouping ExternalNRCellCUGrp {
		description "Represents the ExternalNRCellCU IOC.";
		reference "3GPP TS 28.541";
		uses mf3gpp:ManagedFunctionGrp;

		leaf cellLocalId {
		description "Identifies an NR cell of a gNB. Together with corresponding
		gNB ID it forms the NR Cell Identifier (NCI).";
		reference "NCI in 3GPP TS 38.300";
		description "It identifies a NR cell of a gNB.

		It, together with the gNB Identifier (using gNBId of the parent
		GNBCUCPFunction or GNBDUFunction or OperatorDU (for MOCN network
		sharing scenario) or ExternalCUCPFunction), identifies a NR cell within
		a PLMN. This is the NR Cell Identity(NCI). See subclause 8.2 of TS38.300.

		The NCI can be constructed by encoding the gNB Identifier using gNBId
		(of the parent GNBCUCPFunction or GNBDUFunction or OperatorDU
		(for MOCN network sharing scenario) or ExternalCUCPFunction) and
		cellLocalId where the gNB Identifier field is of length specified by
		gNBIdLength (of the parent GNBCUCPFunction or GNBDUFunction or
		ExternalCUCPFunction). See 'Global gNB ID' in subclause 9.3.1.6 of
		TS 38.413.

		The NR Cell Global identifier (NCGI) is constructed from the
		PLMN identity the cell belongs to and the NR Cell Identifier (NCI) of
		the cell.

		See relation between NCI and NCGI subclause 8.2 of TS 38.300 ";
		mandatory true;
		type int32 {range "0..16383"; }
		type int32;
		}

		leaf nRPCI {
		description "The Physical Cell Identity (PCI) of the NR cell.";
		reference "3GPP TS 36.211";
		description "This holds the Physical Cell Identity (PCI) of the NR cell.

		allowedValues:
		See 3GPP TS 36.211 subclause 6.11 for legal values of pci.";
		mandatory true;
		type int32 { range "0..1007"; }
		type int64;
		}

		list pLMNIdList {
		@@ -62,11 +76,11 @@ module _3gpp-nr-nrm-externalnrcellcu {
		}
		}

		grouping ExternalNRCellCUWrapper {
		grouping ExternalNRCellCUSubtree {
		list ExternalNRCellCU {
		description "Represents the properties of an NRCellCU controlled by
		another Management Service Provider.";
		reference "3GPP TS 28.541";
		description "This IOC contains necessary attributes for inter-system
		and intra-system handover. It also contains a subset of the attributes
		of related IOCs controlled by Management Service Provider.";
		key id;
		uses top3gpp:Top_Grp;
		container attributes {
		@@ -75,14 +89,4 @@ module _3gpp-nr-nrm-externalnrcellcu {
		uses mf3gpp:ManagedFunctionContainedClasses;
		}
		}

		augment "/subnet3gpp:SubNetwork/extgnbcucp3gpp:ExternalGNBCUCPFunction" {
		if-feature subnet3gpp:ExternalsUnderSubNetwork ;
		uses ExternalNRCellCUWrapper;
		}

		augment "/nrnet3gpp:NRNetwork/extgnbcucp3gpp:ExternalGNBCUCPFunction" {
		if-feature nrnet3gpp:ExternalsUnderNRNetwork;
		uses ExternalNRCellCUWrapper;
		}
		}
		No newline at end of file