diff --git a/yang-models/_3gpp-common-mecontext.yang b/yang-models/_3gpp-common-mecontext.yang new file mode 100644 index 0000000000000000000000000000000000000000..ed183f1a72c8e880e788732bdd3edac15487e6f5 --- /dev/null +++ b/yang-models/_3gpp-common-mecontext.yang @@ -0,0 +1,82 @@ +module _3gpp-common-mecontext { + yang-version 1.1; + namespace "urn:3gpp:sa5:_3gpp-common-mecontext"; + prefix "mectx3gpp"; + + import _3gpp-common-yang-types { prefix types3gpp; } + import _3gpp-common-top { prefix top3gpp; } + import _3gpp-common-subnetwork { prefix subnet3gpp; } + import ietf-yang-schema-mount { prefix yangmnt; } + + organization "3GPP SA5"; + contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; + + description "Defines basic MeContext which will be augmented by other 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)"; + + revision 2024-07-17 { reference "CR-0381 CR-0382 CR-0383"; } + + grouping MeContextGrp { + description "Represents the MeContext IOC."; + + leaf dnPrefix { + type types3gpp:DistinguishedName; + description "It carries the DN Prefix information or no information. + The instance of MeContext is the local root instance of the MIB. + Otherwise the attribute shall be absent or carry no information."; + reference "Annex C of 32.300 "; + } + } + + augment "/subnet3gpp:SubNetwork" { + list Mecontext { + description "This IOC is introduced for naming purposes. It may support + creation of unique DNs in scenarios when some MEs have the same RDNs due + to the fact that they have been manufacturer pre-configured. + + If some MEs have the same RDNs (for the above mentioned reason) and they + are contained in the same SubNetwork instance, some measure shall be + taken in order to assure the global uniqueness of DNs for all IOC + instances under those MEs. One way could be to set different dnPrefix + for those NEs, but that would require either that: + + a) all LDNs or DNs are locally modified using the new dnPrefix for the + upper portion of the DNs, or + b) a mapping (translation) of the old LDNs or DNs to the new DNs every + time they are used externally, e.g. in alarm notifications. + + As both the two alternatives above may involve unacceptable drawbacks + (as the old RDNs for the MEs then would have to be changed or mapped to + new values), using MeContext offers a new alternative to resolve the DN + creation. Using MeContext as part of the naming tree (and thus the DN) + means that the dnPrefix, including a unique MeContext for each ME, may + be directly concatenated with the LDNs, without any need to change or + map the existing ME RDNs to new values. + + MeContext have 0..N instances. It may exist even if no SubNetwork exists. + Every instance of MeContext contains exactly one ManagedElement during + steady-state operations."; + + key id; + uses top3gpp:Top_Grp; + container attributes { + uses MeContextGrp; + } + + yangmnt:mount-point children-of-MeContext { + description "Mountpoint for ManagedElement"; + reference "RFC8528 YANG Schema Mount"; + } + } + } +} \ No newline at end of file diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index c9b799140929018ba96a95636bd2107a68a78961..8f2546ba282a8c895f6e184f7b41b5f6d5ae8d2e 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -26,6 +26,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)"; + revision 2024-08-09 { reference "CR-0419" ; } revision 2024-05-13 { reference "CR-0360" ; } revision 2024-04-05 { reference "CR-0341" ; } revision 2023-11-05 { reference "CR-0293 CR-0301" ; } @@ -59,6 +60,52 @@ module _3gpp-common-trace { } } + grouping AreaScopeGrp { + description "Represents the AreaScope dataType. + This <> defines the area scope of MDT. + The Area Scope parameter in LTE and NR is either: + - list of Cells, identified by E-UTRAN-CGI or NG-RAN CGI. + Maximum 32 CGI can be defined. + - list of Tracking Area, identified by TAC. + Maximum of 8 TAC can be defined. + - list of Tracking Area Identity, identified by TAC with + associated plmn-Identity perTAC-List containing the + PLMN identity for each TAC. Maximum of 8 TAI can be defined."; + + choice AreaScopeChoice { + leaf-list eutraCellIdList { + type string; + min-elements 1; + max-elements 32; + description "List of E-UTRAN cells identified by E-UTRAN-CGI"; + } + + leaf-list nrCellIdList { + type string; + min-elements 1; + max-elements 32; + description "List of NR cells identified by NG-RAN CGI"; + } + + leaf-list tacList { + type types3gpp:Tac; + min-elements 1; + max-elements 8; + description "Tracking Area Code list"; + } + + list taiList { + description "Tracking Area Identity list"; + key idx; + min-elements 1; + max-elements 8; + leaf idx { type string; } + uses types3gpp:TaiGrp; + } + } + } + + grouping TraceJobGrp { leaf jobType { type enumeration { @@ -590,8 +637,10 @@ module _3gpp-common-trace { reference "Clause 5.1 of 3GPP TS 32.422"; } + + leaf MDTAnonymizationOfData { - when ../MDTAreaScope ; + when ../areaScope ; type enumeration { enum NO_IDENTITY; enum TAC_OF_IMEI; @@ -624,8 +673,7 @@ module _3gpp-common-trace { } } - leaf-list MDTAreaScope { - type string; + list areaScope { description "specifies MDT area scope when activates an MDT job. For RLF and RCEF reporting it specifies the eNB or list of eNBs where the @@ -641,6 +689,10 @@ module _3gpp-common-trace { One or list of eNBs for RLF and RCEFreporting"; reference "Clause 5.10.2 of 3GPP TS 32.422"; + + key idx; + leaf idx {type string; } + uses AreaScopeGrp; } leaf MDTCollectionPeriodRrmLte {