From 7b290e20bde372f120d00dddb460ac52b5d3d51c Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 1 Feb 2024 01:26:07 +0100 Subject: [PATCH 1/2] renamed _3gpp-5gc-ecmconnectioninfo.yang --- ...fo.yang => _3gpp-5gc-nrm-ecmconnectioninfo.yang} | 13 +++++++------ yang-models/_3gpp-common-managed-element.yang | 5 +++-- yang-models/_3gpp-common-subnetwork.yang | 5 +++-- 3 files changed, 13 insertions(+), 10 deletions(-) rename yang-models/{_3gpp-5gc-ecmconnectioninfo.yang => _3gpp-5gc-nrm-ecmconnectioninfo.yang} (95%) diff --git a/yang-models/_3gpp-5gc-ecmconnectioninfo.yang b/yang-models/_3gpp-5gc-nrm-ecmconnectioninfo.yang similarity index 95% rename from yang-models/_3gpp-5gc-ecmconnectioninfo.yang rename to yang-models/_3gpp-5gc-nrm-ecmconnectioninfo.yang index a5f590d5a..143fa4920 100644 --- a/yang-models/_3gpp-5gc-ecmconnectioninfo.yang +++ b/yang-models/_3gpp-5gc-nrm-ecmconnectioninfo.yang @@ -1,6 +1,6 @@ -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,11 +11,12 @@ 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 2023-11-14 { reference CR-1136 ; } + revision 2024-01-29 { reference CR-1166 ; } + revision 2023-11-05 { reference CR-1131 ; } grouping GeoLocGrp { description "This datatype represent the geographical location."; @@ -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.558) that is defined as a datatype + (see clause 7.3.3.2 in TS 23.538) that is defined as a datatype (see clause 6.3.8)."; key latitude; max-elements 1; @@ -250,4 +251,4 @@ module _3gpp-5gc-ecmconnectioninfo { } } } -} +} \ No newline at end of file diff --git a/yang-models/_3gpp-common-managed-element.yang b/yang-models/_3gpp-common-managed-element.yang index 153510be9..233aa6f4a 100755 --- a/yang-models/_3gpp-common-managed-element.yang +++ b/yang-models/_3gpp-common-managed-element.yang @@ -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-30 { reference CR-0328 ; } revision 2023-11-14 { reference CR-0305 ; } revision 2023-09-18 { reference CR-0271 ; } revision 2023-08-10 { reference CR-0257; } diff --git a/yang-models/_3gpp-common-subnetwork.yang b/yang-models/_3gpp-common-subnetwork.yang index 7bca2e5de..d6d5f7010 100755 --- a/yang-models/_3gpp-common-subnetwork.yang +++ b/yang-models/_3gpp-common-subnetwork.yang @@ -12,13 +12,13 @@ module _3gpp-common-subnetwork { import ietf-yang-schema-mount { prefix yangmnt; } 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 basic SubNetwork 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-subnetwork { 3GPP TS 28.620 Umbrella Information Model (UIM)"; + revision 2024-01-30 { reference CR-0328 ; } revision 2023-11-14 { reference CR-0305 ; } revision 2023-09-18 { reference CR-0271 ; } revision 2023-08-10 { reference CR-0257; } -- GitLab From 3d80f656d56fb90ab6af33c1f00919d2b5e77bfa Mon Sep 17 00:00:00 2001 From: "U-ERICSSON\\ETHBLL" Date: Thu, 1 Feb 2024 01:48:57 +0100 Subject: [PATCH 2/2] corrected reference --- yang-models/_3gpp-5gc-nrm-ecmconnectioninfo.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-5gc-nrm-ecmconnectioninfo.yang b/yang-models/_3gpp-5gc-nrm-ecmconnectioninfo.yang index 143fa4920..b8b795ab4 100644 --- a/yang-models/_3gpp-5gc-nrm-ecmconnectioninfo.yang +++ b/yang-models/_3gpp-5gc-nrm-ecmconnectioninfo.yang @@ -24,7 +24,7 @@ module _3gpp-5gc-nrm-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; -- GitLab