From 07f8cb630b73f53d81c81baa8095cbb26a96176f Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Wed, 7 Aug 2024 11:12:46 +0200 Subject: [PATCH 1/9] add MeContext; the file is the same in R17,18,19 --- yang-models/_3gpp-common-mecontext.yang | 82 +++++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 yang-models/_3gpp-common-mecontext.yang diff --git a/yang-models/_3gpp-common-mecontext.yang b/yang-models/_3gpp-common-mecontext.yang new file mode 100644 index 000000000..ed183f1a7 --- /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 -- GitLab From e0316313ac87a8972400461f2aa1b152ada8158e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 7 Aug 2024 17:44:18 +0000 Subject: [PATCH 2/9] Update _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 57 ++++++++++++++++++++++++++++- 1 file changed, 55 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index c9b799140..57435e575 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -590,8 +590,59 @@ module _3gpp-common-trace { reference "Clause 5.1 of 3GPP TS 32.422"; } + + 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. + The Area Scope parameter in NR can also contain: + - list of NPN-IDs in NR. It is either a list of PNI-NPNs + identified by CAG ID with associated plmn-Identity or a + list of SNPNs identified by Network ID with associated + plmn-Identity ."; + + 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; + } + } + } + leaf MDTAnonymizationOfData { - when ../MDTAreaScope ; + when ../areaScope ; type enumeration { enum NO_IDENTITY; enum TAC_OF_IMEI; @@ -624,7 +675,7 @@ module _3gpp-common-trace { } } - leaf-list MDTAreaScope { + leaf-list areaScope { type string; description "specifies MDT area scope when activates an MDT job. @@ -641,6 +692,8 @@ module _3gpp-common-trace { One or list of eNBs for RLF and RCEFreporting"; reference "Clause 5.10.2 of 3GPP TS 32.422"; + + uses AreaScopeGrp; } leaf MDTCollectionPeriodRrmLte { -- GitLab From 5d1fe634746dc828c87fff304d5c2c149e573697 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Wed, 7 Aug 2024 17:59:44 +0000 Subject: [PATCH 3/9] Update _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 102 ++++++++++++++-------------- 1 file changed, 52 insertions(+), 50 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 57435e575..61a11c687 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -59,6 +59,57 @@ 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. + The Area Scope parameter in NR can also contain: + - list of NPN-IDs in NR. It is either a list of PNI-NPNs + identified by CAG ID with associated plmn-Identity or a + list of SNPNs identified by Network ID with associated + plmn-Identity ."; + + 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 { @@ -591,56 +642,7 @@ 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. - The Area Scope parameter in NR can also contain: - - list of NPN-IDs in NR. It is either a list of PNI-NPNs - identified by CAG ID with associated plmn-Identity or a - list of SNPNs identified by Network ID with associated - plmn-Identity ."; - - 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; - } - } - } - + leaf MDTAnonymizationOfData { when ../areaScope ; type enumeration { -- GitLab From 85a14879d4f3b5d9b9bb078656f3404c10217a25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Thu, 8 Aug 2024 09:00:28 +0000 Subject: [PATCH 4/9] Update _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 61a11c687..3ee29467b 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-0xxx" ; } revision 2024-05-13 { reference "CR-0360" ; } revision 2024-04-05 { reference "CR-0341" ; } revision 2023-11-05 { reference "CR-0293 CR-0301" ; } @@ -69,12 +70,7 @@ module _3gpp-common-trace { 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. - The Area Scope parameter in NR can also contain: - - list of NPN-IDs in NR. It is either a list of PNI-NPNs - identified by CAG ID with associated plmn-Identity or a - list of SNPNs identified by Network ID with associated - plmn-Identity ."; + PLMN identity for each TAC. Maximum of 8 TAI can be defined."; choice AreaScopeChoice { leaf-list eutraCellIdList { -- GitLab From 703f0341ac0885d4e3b1e0e333901457f24c207f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Thu, 8 Aug 2024 09:22:41 +0000 Subject: [PATCH 5/9] Update _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 3ee29467b..d4a34229b 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -673,7 +673,7 @@ module _3gpp-common-trace { } } - leaf-list areaScope { + list areaScope { type string; description "specifies MDT area scope when activates an MDT job. -- GitLab From 406d9e87710260626eb835b7e584ed3fae35f26c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Thu, 8 Aug 2024 09:25:51 +0000 Subject: [PATCH 6/9] Update _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index d4a34229b..3ee29467b 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -673,7 +673,7 @@ module _3gpp-common-trace { } } - list areaScope { + leaf-list areaScope { type string; description "specifies MDT area scope when activates an MDT job. -- GitLab From 9b3f30d325eabcd993a5a8c8c3759e4940986896 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Thu, 8 Aug 2024 09:45:27 +0000 Subject: [PATCH 7/9] Update _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 3ee29467b..d290bc88c 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -673,7 +673,7 @@ module _3gpp-common-trace { } } - leaf-list areaScope { + list areaScope { type string; description "specifies MDT area scope when activates an MDT job. @@ -691,6 +691,8 @@ 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; } -- GitLab From 3766e49512e9483fb3a06caddfb09b40ef8f3c82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Thu, 8 Aug 2024 10:03:52 +0000 Subject: [PATCH 8/9] Update _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 1 - 1 file changed, 1 deletion(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index d290bc88c..2689349ba 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -674,7 +674,6 @@ module _3gpp-common-trace { } list areaScope { - type string; 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 -- GitLab From ec76059384522f1071c847b8b6eba8780bff3ac6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Fri, 9 Aug 2024 17:32:45 +0000 Subject: [PATCH 9/9] Update _3gpp-common-trace.yang --- yang-models/_3gpp-common-trace.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-trace.yang b/yang-models/_3gpp-common-trace.yang index 2689349ba..8f2546ba2 100755 --- a/yang-models/_3gpp-common-trace.yang +++ b/yang-models/_3gpp-common-trace.yang @@ -26,7 +26,7 @@ module _3gpp-common-trace { Integration Reference Point (IRP); Information Service (IS)"; - revision 2024-08-09 { reference "CR-0xxx" ; } + 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" ; } -- GitLab