Commit 7866ec3e authored by Balazs Lengyel's avatar Balazs Lengyel

Merge branch 'Rel-16-SA87-Agreed' into 'master'

YAMs as agreed aby SA#87e according to 28623-g31-0401-balazscorrection.doc and 28541-g40-0331.docx...

See merge request !28
parents 5fd5233a cbe5b31e
Pipeline #3256 passed with stage
in 0 seconds
...@@ -3,6 +3,7 @@ module _3gpp-5g-common-yang-types { ...@@ -3,6 +3,7 @@ module _3gpp-5g-common-yang-types {
namespace "urn:3gpp:sa5:_3gpp-5g-common-yang-types"; namespace "urn:3gpp:sa5:_3gpp-5g-common-yang-types";
prefix "types5g3gpp"; prefix "types5g3gpp";
import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-yang-types { prefix types3gpp; }
organization "3GPP SA5"; organization "3GPP SA5";
...@@ -50,7 +51,8 @@ module _3gpp-5g-common-yang-types { ...@@ -50,7 +51,8 @@ module _3gpp-5g-common-yang-types {
type CommModelType; type CommModelType;
} }
leaf-list targetNFServiceList { leaf-list targetNFServiceList {
type types3gpp:DistinguishedName;
type types3gpp:DistinguishedName;
} }
leaf commModelConfiguration { leaf commModelConfiguration {
type string; type string;
......
...@@ -43,7 +43,7 @@ module _3gpp-5gc-nrm-amffunction { ...@@ -43,7 +43,7 @@ module _3gpp-5gc-nrm-amffunction {
type inet:domain-name; type inet:domain-name;
} }
leaf-list NSSAIList { leaf-list sNSSAIList {
min-elements 0; // conditionally mandatory if network slicing feature is supported min-elements 0; // conditionally mandatory if network slicing feature is supported
description "List of S-NSSAIs the managed object is capable of supporting. description "List of S-NSSAIs the managed object is capable of supporting.
(Single Network Slice Selection Assistance Information) (Single Network Slice Selection Assistance Information)
......
...@@ -7,8 +7,8 @@ module _3gpp-5gc-nrm-ausffunction { ...@@ -7,8 +7,8 @@ module _3gpp-5gc-nrm-ausffunction {
import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-managed-function { prefix mf3gpp; }
import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-common-managed-element { prefix me3gpp; }
import ietf-inet-types { prefix inet; } import ietf-inet-types { prefix inet; }
import _3gpp-common-yang-types { prefix types3gpp; }
import _3gpp-5g-common-yang-types { prefix types5g3gpp; } import _3gpp-5g-common-yang-types { prefix types5g3gpp; }
import _3gpp-common-yang-types { prefix types3gpp; }
import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-top { prefix top3gpp; }
organization "3gpp SA5"; organization "3gpp SA5";
...@@ -55,6 +55,7 @@ module _3gpp-5gc-nrm-ausffunction { ...@@ -55,6 +55,7 @@ module _3gpp-5gc-nrm-ausffunction {
min-elements 1; min-elements 1;
uses types3gpp:ManagedNFProfile; uses types3gpp:ManagedNFProfile;
} }
list commModelList { list commModelList {
min-elements 1; min-elements 1;
......
...@@ -480,8 +480,8 @@ module _3gpp-5gc-nrm-ep { ...@@ -480,8 +480,8 @@ module _3gpp-5gc-nrm-ep {
uses EP_N32Grp; uses EP_N32Grp;
} }
} }
}
}
augment "/me3gpp:ManagedElement/smsf3gpp:SMSFFunction" { augment "/me3gpp:ManagedElement/smsf3gpp:SMSFFunction" {
list EP_N20 { list EP_N20 {
description "Represents the EP_20 IOC."; description "Represents the EP_20 IOC.";
......
...@@ -18,6 +18,7 @@ module _3gpp-5gc-nrm-smsffunction { ...@@ -18,6 +18,7 @@ module _3gpp-5gc-nrm-smsffunction {
revision 2019-05-15 { revision 2019-05-15 {
description "initial revision"; description "initial revision";
} }
grouping SMSFFunctionGrp { grouping SMSFFunctionGrp {
......
...@@ -18,6 +18,7 @@ module _3gpp-5gc-nrm-udsffunction { ...@@ -18,6 +18,7 @@ module _3gpp-5gc-nrm-udsffunction {
revision 2019-05-22 { revision 2019-05-22 {
description "initial revision"; description "initial revision";
} }
grouping UDSFFuntionGrp { grouping UDSFFuntionGrp {
......
...@@ -54,7 +54,7 @@ module _3gpp-5gc-nrm-upffunction { ...@@ -54,7 +54,7 @@ module _3gpp-5gc-nrm-upffunction {
min-elements 1; min-elements 1;
uses types3gpp:ManagedNFProfile; uses types3gpp:ManagedNFProfile;
} }
list commModelList { list commModelList {
min-elements 1; min-elements 1;
key "groupId"; key "groupId";
......
This diff is collapsed.
...@@ -6,18 +6,27 @@ module _3gpp-common-managed-element { ...@@ -6,18 +6,27 @@ module _3gpp-common-managed-element {
import _3gpp-common-yang-types { prefix types3gpp ; } import _3gpp-common-yang-types { prefix types3gpp ; }
import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-top { prefix top3gpp; }
import _3gpp-common-measurements { prefix meas3gpp; } import _3gpp-common-measurements { prefix meas3gpp; }
import _3gpp-common-fm { prefix fm3gpp; }
organization "3GPP SA5"; organization "3GPP SA5";
description "Defines ManagedElement which will be augmented description "Defines ManagedElement which will be augmented
by other IOCs"; by other IOCs";
reference "3GPP TS 28.622 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) Generic Network Resource Model (NRM)
Integration Reference Point (IRP); Integration Reference Point (IRP);
Information Service (IS) Information Service (IS)
3GPP TS 28.620 3GPP TS 28.620
Umbrella Information Model (UIM)"; Umbrella Information Model (UIM)";
revision 2020-02-24 {
reference "S5-201365";
}
revision 2019-06-17 { revision 2019-06-17 {
description "Initial revision"; description "Initial revision";
} }
...@@ -26,6 +35,10 @@ module _3gpp-common-managed-element { ...@@ -26,6 +35,10 @@ module _3gpp-common-managed-element {
description "The MeasurementSubtree shall be contained under ManageElement"; description "The MeasurementSubtree shall be contained under ManageElement";
} }
feature FmUnderManagedElement {
description "The FmSubtree shall be contained under ManageElement";
}
grouping ManagedElement_Grp { grouping ManagedElement_Grp {
description "Abstract class representing telecommunications resources. description "Abstract class representing telecommunications resources.
An ME communicates with a manager (directly or indirectly) for the An ME communicates with a manager (directly or indirectly) for the
...@@ -152,5 +165,9 @@ module _3gpp-common-managed-element { ...@@ -152,5 +165,9 @@ module _3gpp-common-managed-element {
uses meas3gpp:MeasurementSubtree { uses meas3gpp:MeasurementSubtree {
if-feature MeasurementsUnderManagedElement ; if-feature MeasurementsUnderManagedElement ;
} }
uses fm3gpp:FmSubtree {
if-feature FmUnderManagedElement ;
}
} }
} }
\ No newline at end of file
This diff is collapsed.
...@@ -6,31 +6,54 @@ module _3gpp-common-subnetwork { ...@@ -6,31 +6,54 @@ module _3gpp-common-subnetwork {
import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-yang-types { prefix types3gpp; }
import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-top { prefix top3gpp; }
import _3gpp-common-measurements { prefix meas3gpp; } import _3gpp-common-measurements { prefix meas3gpp; }
import _3gpp-common-fm { prefix fm3gpp; }
import ietf-yang-schema-mount { prefix yangmnt; } import ietf-yang-schema-mount { prefix yangmnt; }
organization "3GPP SA5"; organization "3GPP SA5";
description "Defines basic SubNetwork which will be augmented by other IOCs"; description "Defines basic SubNetwork which will be augmented by other IOCs";
reference "3GPP TS 28.622 reference "3GPP TS 28.623
Generic Network Resource Model (NRM) Generic Network Resource Model (NRM)
Integration Reference Point (IRP); Integration Reference Point (IRP);
Information Service (IS) Solution Set (SS) definitions
3GPP TS 28.622
Generic Network Resource Model (NRM)
Integration Reference Point (IRP);
Information Service (IS)
3GPP TS 28.620 3GPP TS 28.620
Umbrella Information Model (UIM)"; Umbrella Information Model (UIM)";
revision 2020-03-11 {
description "Added KPIs and corrections";
reference "S5-201365, S5-201581, SP-200229";
}
revision 2020-02-24 {
reference "S5-201365";
}
revision 2019-06-17 { revision 2019-06-17 {
description "Initial revision"; description "Initial revision";
} }
feature ExternalsUnderSubNetwork { feature ExternalsUnderSubNetwork {
description "Classes representing external entities like EUtranFrequency, description "Classes representing external entities like EUtranFrequency,
ExternalGNBCUCPFunction, ExternalENBFunction ExternalGNBCUCPFunction, ExternalENBFunction
are contained under a Subnetwork list/class."; are contained under a Subnetwork list/class.";
} }
feature MeasurementsUnderSubNetwork { feature MeasurementsUnderSubNetwork {
description "The MeasurementSubtree shall be contained under SubNetwork"; description "The MeasurementSubtree shall be contained under SubNetwork
indicating the support of Measurements and/or KPIs";
}
feature FmUnderSubNetwork {
description "The FmSubtree shall be contained under SubNetwork";
} }
grouping Domain_Grp { grouping Domain_Grp {
...@@ -60,6 +83,8 @@ module _3gpp-common-subnetwork { ...@@ -60,6 +83,8 @@ module _3gpp-common-subnetwork {
grouping SubNetworkGrp { grouping SubNetworkGrp {
uses Domain_Grp; uses Domain_Grp;
uses meas3gpp:Measurements; uses meas3gpp:Measurements;
uses meas3gpp:KPIs;
leaf-list setOfMcc { leaf-list setOfMcc {
description "Set of Mobile Country Code (MCC). description "Set of Mobile Country Code (MCC).
...@@ -119,6 +144,10 @@ module _3gpp-common-subnetwork { ...@@ -119,6 +144,10 @@ module _3gpp-common-subnetwork {
if-feature MeasurementsUnderSubNetwork ; if-feature MeasurementsUnderSubNetwork ;
} }
uses fm3gpp:FmSubtree {
if-feature FmUnderSubNetwork ;
}
yangmnt:mount-point children-of-SubNetwork { yangmnt:mount-point children-of-SubNetwork {
description "Mountpoint for ManagedElement"; description "Mountpoint for ManagedElement";
reference "RFC8528 YANG Schema Mount"; reference "RFC8528 YANG Schema Mount";
......
...@@ -40,7 +40,7 @@ module _3gpp-common-subscription-control { ...@@ -40,7 +40,7 @@ module _3gpp-common-subscription-control {
list scope { list scope {
key "scopeType"; key "scopeType";
min-elements 0; min-elements 1;
max-elements 1; max-elements 1;
description "Describes which object instances are selected with description "Describes which object instances are selected with
respect to a base object instance."; respect to a base object instance.";
......
...@@ -12,6 +12,11 @@ module _3gpp-common-yang-types { ...@@ -12,6 +12,11 @@ module _3gpp-common-yang-types {
network slicing."; network slicing.";
reference "3GPP TS 28.541"; reference "3GPP TS 28.541";
revision 2020-03-10 {
description "Removed faulty when statements.";
reference "SP-200229";
}
revision 2019-10-25 { revision 2019-10-25 {
description "Added ManagedNFProfile."; description "Added ManagedNFProfile.";
reference "S5-194457"; reference "S5-194457";
...@@ -81,45 +86,41 @@ module _3gpp-common-yang-types { ...@@ -81,45 +86,41 @@ module _3gpp-common-yang-types {
} }
leaf nFSrvGroupId { leaf nFSrvGroupId {
when '../nfType = "UDM" or ../nfType = "AUSF" or ../nfType = "UDR"';
mandatory true;
type string ; type string ;
description "This parameter defines identity of the group that is description "This parameter defines identity of the group that is
served by the NF instance. served by the NF instance.
May be config false or true depending on the ManagedFunction. May be config false or true depending on the ManagedFunction.
Config=true for Udrinfo. Config=false for UdmInfo and AusfInfo."; Config=true for Udrinfo. Config=false for UdmInfo and AusfInfo.
Shall be present if ../nfType = UDM or AUSF or UDR. ";
reference "TS 29.510" ; reference "TS 29.510" ;
} }
leaf-list supportedDataSetIds { leaf-list supportedDataSetIds {
when '../nfType = "UDR"';
type enumeration { type enumeration {
enum SUBSCRIPTION; enum SUBSCRIPTION;
enum POLICY; enum POLICY;
enum EXPOSURE; enum EXPOSURE;
enum APPLICATION; enum APPLICATION;
} }
description "List of supported data sets in the UDR instance."; description "List of supported data sets in the UDR instance.
May be present if ../nfType = UDR";
reference "TS 29.510" ; reference "TS 29.510" ;
} }
leaf-list smfServingAreas { leaf-list smfServingAreas {
when '../nfType = "UPF"';
min-elements 1;
type string ; type string ;
description "Defines the SMF service area(s) the UPF can serve."; description "Defines the SMF service area(s) the UPF can serve.
Shall be present if ../nfType = UPF";
reference "TS 29.510" ; reference "TS 29.510" ;
} }
leaf priority { leaf priority {
when '../nfType = "AMF"';
mandatory true;
type uint16; type uint16;
description "This parameter defines Priority (relative to other NFs description "This parameter defines Priority (relative to other NFs
of the same type) in the range of 0-65535, to be used for NF selection; of the same type) in the range of 0-65535, to be used for NF selection;
lower values indicate a higher priority. If priority is also present lower values indicate a higher priority. If priority is also present
in the nfServiceList parameters, those will have precedence over in the nfServiceList parameters, those will have precedence over
this value "; this value. Shall be present if ../nfType = AMF ";
reference "TS 29.510" ; reference "TS 29.510" ;
} }
} }
......
module _3gpp-nr-nrm-common {
yang-version 1.1;
namespace "urn:3gpp:sa5:3gpp-nr-nrm-common";
prefix "nrcommon3gpp";
import _3gpp-common-yang-types { prefix types3gpp; }
organization "3GPP SA5";
description "Defines the YANG mapping of comon parts for 3GPP TS 28.541.";
reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
revision 2020-02-14 {
description "Initial revision";
}
grouping PLMNInfo {
description "The PLMNInfo data type define a S-NSSAI member in a specific PLMNId, and it have
two attributes PLMNId and S-NSSAI (PLMNId, S-NSSAI). The PLMNId represents a data type that
is comprised of mcc (mobile country code) and mnc (mobile network code), (See TS 23.003
subclause 2.2 and 12.1) and S-NSSAI represents an data type, that is comprised of an SST
(Slice/Service type) and an optional SD (Slice Differentiator) field, (See TS 23.003 [13]).";
uses types3gpp:PLMNId;
leaf sNssai {
type types3gpp:SNssai;
}
}
}
\ No newline at end of file
...@@ -16,6 +16,7 @@ module _3gpp-nr-nrm-ep { ...@@ -16,6 +16,7 @@ module _3gpp-nr-nrm-ep {
Resource Model (NRM)."; Resource Model (NRM).";
reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
revision 2020-03-02 { reference S5-201191"; }
revision 2019-06-17 { revision 2019-06-17 {
description "Initial revision"; description "Initial revision";
} }
...@@ -117,8 +118,10 @@ module _3gpp-nr-nrm-ep { ...@@ -117,8 +118,10 @@ module _3gpp-nr-nrm-ep {
list EP_XnC { list EP_XnC {
description "Represents the local gNB node end point of the logical description "Represents the local gNB node end point of the logical
link, supporting Xn application protocols, to a neighbour gNB node."; link, supporting Xn application protocols, to a neighbour NG-RAN node
reference "3GPP TS 28.541, 3GPP TS 38.420"; (including gNB and ng-eNB). The Xn Application PDUs are carried over
SCTP/IP/Data link layer/Physical layer stack.";
reference "3GPP TS 28.541, 3GPP TS 38.420 subclause 7";
key id; key id;
uses top3gpp:Top_Grp; uses top3gpp:Top_Grp;
container attributes { container attributes {
......
...@@ -7,12 +7,14 @@ module _3gpp-nr-nrm-gnbcucpfunction { ...@@ -7,12 +7,14 @@ module _3gpp-nr-nrm-gnbcucpfunction {
import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-managed-function { prefix mf3gpp; }
import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-common-managed-element { prefix me3gpp; }
import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-top { prefix top3gpp; }
import _3gpp-nr-nrm-rrmpolicy { prefix nrrrmpolicy3gpp; }
organization "3GPP SA5"; organization "3GPP SA5";
description "Defines the YANG mapping of the GNBCUCPFunction Information description "Defines the YANG mapping of the GNBCUCPFunction Information
Object Class (IOC) that is part of the NR Network Resource Model (NRM)."; Object Class (IOC) that is part of the NR Network Resource Model (NRM).";
reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
revision 2020-02-14 { reference S5-20XXXX ; }
revision 2019-10-28 { reference S5-193518 ; } revision 2019-10-28 { reference S5-193518 ; }
revision 2019-06-17 { revision 2019-06-17 {
description "Initial revision"; description "Initial revision";
...@@ -22,6 +24,7 @@ module _3gpp-nr-nrm-gnbcucpfunction { ...@@ -22,6 +24,7 @@ module _3gpp-nr-nrm-gnbcucpfunction {
description "Represents the GNBCUCPFunction IOC."; description "Represents the GNBCUCPFunction IOC.";
reference "3GPP TS 28.541"; reference "3GPP TS 28.541";
uses mf3gpp:ManagedFunctionGrp; uses mf3gpp:ManagedFunctionGrp;
uses nrrrmpolicy3gpp:RRMPolicy_Grp;
leaf gNBId { leaf gNBId {
description "Identifies a gNB within a PLMN. The gNB Identifier (gNB ID) description "Identifies a gNB within a PLMN. The gNB Identifier (gNB ID)
......
...@@ -7,21 +7,93 @@ module _3gpp-nr-nrm-gnbcuupfunction { ...@@ -7,21 +7,93 @@ module _3gpp-nr-nrm-gnbcuupfunction {
import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-managed-function { prefix mf3gpp; }
import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-common-managed-element { prefix me3gpp; }
import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-top { prefix top3gpp; }
import _3gpp-nr-nrm-rrmpolicy { prefix nrrrmpolicy3gpp; }
import _3gpp-nr-nrm-common { prefix nrcommon3gpp; }
organization "3GPP SA5"; organization "3GPP SA5";
description "Defines the YANG mapping of the GNBCUUPFunction Information description "Defines the YANG mapping of the GNBCUUPFunction Information
Object Class (IOC) that is part of the NR Network Resource Model (NRM)."; Object Class (IOC) that is part of the NR Network Resource Model (NRM).";
reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
revision 2020-03-12 { reference "SP-200233 S5-201547"; }
revision 2020-02-14 { reference S5-20XXXX ; }
revision 2019-10-28 { reference S5-193518 ; } revision 2019-10-28 { reference S5-193518 ; }
revision 2019-08-21 { revision 2019-08-21 {
description "Initial revision"; description "Initial revision";
} }
grouping TAIGrp {
description "Tracking Area Identity";
list pLMNId {
key "mcc mnc";
uses types3gpp:PLMNId;
}
leaf nRTAC {
type int64;
description "Identity of the common Tracking Area Code for the PLMNs
allowedValues:
a) It is the TAC or Extended-TAC.
b) A cell can only broadcast one TAC or Extended-TAC.
See TS 36.300, subclause 10.1.7 (PLMNID and TAC relation).
c) TAC is defined in subclause 19.4.2.3 of 3GPP TS 23.003 and
Extended-TAC is defined in subclause 9.3.1.29 of 3GPP TS 38.473.
d) For a 5G SA (Stand Alone), it has a non-null value.";
}
}
grouping BackhaulAddressGrp {
description "Indicates the backhauladdress of gNB.";
leaf gNBId {
type uint32 {
range "0..4294967295";
}
description "It identifies a gNB within a PLMN. The gNB ID is part of
the NR Cell Identifier (NCI) of the gNB cells.";
reference "gNB Identifier (gNB ID) of subclause 8.2 of TS 38.300.
Global gNB ID in subclause 9.3.1.6 of TS 38.413";
}
list tAI {
key nRTAC;
min-elements 1;
max-elements 1;
description "Tracking Area Identity";
reference "subclause 9.3.3.11 in TS 38.413";
uses TAIGrp;
}
}
grouping MappingSetIDBackhaulAddressGrp {
description "Mapping relationship between setID and backhaulAddress of gNB";
leaf idx {
type uint32 ;
description "ID value";
}
leaf setID {
type uint32;
mandatory true;
description "Indicates the setID of gNB.";
reference "Subclause 7.4.1.6 in TS 38.211";
}
list backhaulAddress {
key gNBId;
min-elements 1;
max-elements 1;
description "Indicates the backhauladdress of gNB.";
uses BackhaulAddressGrp;
}
}
grouping GNBCUUPFunctionGrp { grouping GNBCUUPFunctionGrp {
description "Represents the GNBCUUPFunction IOC."; description "Represents the GNBCUUPFunction IOC.";
reference "3GPP TS 28.541"; reference "3GPP TS 28.541";
uses mf3gpp:ManagedFunctionGrp; uses mf3gpp:ManagedFunctionGrp;
uses nrrrmpolicy3gpp:RRMPolicy_Grp;
leaf gNBCUUPId { leaf gNBCUUPId {
type uint64 { type uint64 {
...@@ -36,17 +108,25 @@ module _3gpp-nr-nrm-gnbcuupfunction { ...@@ -36,17 +108,25 @@ module _3gpp-nr-nrm-gnbcuupfunction {
leaf gNBId { leaf gNBId {
mandatory true; mandatory true;
type int32 { range "22..32"; } type int32 { range "22..32"; }
description "Indicates the number of bits for encoding the gNB ID."; 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 "gNB Id in 3GPP TS 38.300, Global gNB ID in 3GPP TS 38.413";
} }
list pLMNIdList { list pLMNInfoList {
description "The PLMNInfoList is a list of PLMNInfo data type. It defines which PLMNs that
can be served by the GNBCUUPFunction and which S-NSSAIs can be supported by the
GNBCUUPFunction for corresponding PLMN in case of network slicing feature is supported";
key "mcc mnc"; key "mcc mnc";
description "A list of PLMN identifiers. Defines from which set of PLMNs uses nrcommon3gpp:PLMNInfo;
an UE must have as its serving PLMN to be allowed to use the
gNB CU-UP.";
uses types3gpp:PLMNId;
} }
list mappingSetIDBackhaulAddressList {
key idx;
description "Specifies a list of mappingSetIDBackhaulAddress used to
retrieve the backhaul address of the victim set.
Must be present if Remote Interference Management function is supported.";
uses MappingSetIDBackhaulAddressGrp;
}
} }
augment "/me3gpp:ManagedElement" { augment "/me3gpp:ManagedElement" {
......
...@@ -6,12 +6,15 @@ module _3gpp-nr-nrm-gnbdufunction { ...@@ -6,12 +6,15 @@ module _3gpp-nr-nrm-gnbdufunction {
import _3gpp-common-managed-function { prefix mf3gpp; } import _3gpp-common-managed-function { prefix mf3gpp; }
import _3gpp-common-managed-element { prefix me3gpp; } import _3gpp-common-managed-element { prefix me3gpp; }
import _3gpp-common-top { prefix top3gpp; } import _3gpp-common-top { prefix top3gpp; }
import _3gpp-nr-nrm-rrmpolicy { prefix nrrrmpolicy3gpp; }
organization "3GPP SA5"; organization "3GPP SA5";
description "Defines the YANG mapping of the GNBDUFunction Information description "Defines the YANG mapping of the GNBDUFunction Information
Object Class (IOC) that is part of the NR Network Resource Model (NRM)."; Object Class (IOC) that is part of the NR Network Resource Model (NRM).";
reference "3GPP TS 28.541 5G Network Resource Model (NRM)"; reference "3GPP TS 28.541 5G Network Resource Model (NRM)";
revision 2020-02-14 { reference S5-20XXXX ; }
revision 2020-03-12 { reference "SP-200233 S5-201547" ; }
revision 2019-10-28 { reference S5-193518 ; } revision 2019-10-28 { reference S5-193518 ; }
revision 2019-08-21 { revision 2019-08-21 {
description "Initial revision."; description "Initial revision.";
...@@ -21,9 +24,11 @@ module _3gpp-nr-nrm-gnbdufunction { ...@@ -21,9 +24,11 @@ module _3gpp-nr-nrm-gnbdufunction {
description "Represents the GNBDUFunction IOC."; description "Represents the GNBDUFunction IOC.";
reference "3GPP TS 28.541"; reference "3GPP TS 28.541";
uses mf3gpp:ManagedFunctionGrp; uses mf3gpp:ManagedFunctionGrp;
uses nrrrmpolicy3gpp:RRMPolicy_Grp;
leaf gNBId { leaf gNBId {
type int64 { range "0..4294967295"; } type int64 { range "0..4294967295"; }
config false;
mandatory true; mandatory true;
description "Identifies a gNB within a PLMN. The gNB Identifier (gNB ID) description "Identifies a gNB within a PLMN. The gNB Identifier (gNB ID)
is part of the NR Cell Identifier (NCI) of the gNB cells."; is part of the NR Cell Identifier (NCI) of the gNB cells.";
...@@ -48,13 +53,28 @@ module _3gpp-nr-nrm-gnbdufunction { ...@@ -48,13 +53,28 @@ module _3gpp-nr-nrm-gnbdufunction {
type string { length "1..150"; } type string { length "1..150"; }
description "Identifies the Distributed Unit of an NR node"; description "Identifies the Distributed Unit of an NR node";
reference "3GPP TS 38.473"; reference "3GPP TS 38.473";
} }
leaf aggressorSetID {
type uint32 { range "0..4194304"; }
config false;
description "Indicates the associated aggressor gNB Set ID of the cell
Valid when Remote Interference Management function is supported.";
reference "3GPP TS 38.211 subclause 7.4.1.6";
}
leaf victimSetID {
type uint32 { range "0..4194304"; }
config false;
description "Indicates the associated victim gNB Set ID of the cell
Valid when Remote Interference Management function is supported.";
reference "3GPP TS 38.211 subclause 7.4.1.6";
}
} }
augment "/me3gpp:ManagedElement" { augment "/me3gpp:ManagedElement" {
list GNBDUFunction { list GNBDUFunction {
key id; key id;
description "Represents the logical function DU of gNB or en-gNB."; description "Represents the logical function DU of gNB or en-gNB.";
reference "3GPP TS 28.541"; reference "3GPP TS 28.541";
uses top3gpp:Top_Grp; uses top3gpp:Top_Grp;
......
...@@ -8,132 +8,19 @@ module _3gpp-nr-nrm-nrcellcu { ...@@ -8,132 +8,19 @@ module _3gpp-nr-nrm-nrcellcu {