From 3878129eb689b15dcd34b1d5eb4d4f664c232094 Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Mon, 6 Nov 2023 15:19:06 +0000 Subject: [PATCH 1/4] Update _3gpp-common-yang-types.yang --- yang-models/_3gpp-common-yang-types.yang | 45 ++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index 2e9eb85a9..52b8870c8 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -14,6 +14,7 @@ module _3gpp-common-yang-types { network slicing."; reference "3GPP TS 28.623"; + revision 2023-11-06 { reference CR-0305; } revision 2023-08-09 { reference CR-0266; } revision 2023-05-10 { reference CR-0250; } revision 2023-02-14 { reference CR-0234; } @@ -916,7 +917,47 @@ module _3gpp-common-yang-types { supported."; } } - + + grouping GeoCoordinateGrp { + description "Geographical location on earth"; + leaf latitude { + type decimal64 { + fraction-digits 4; + range -90..90 ; + } + mandatory true; + description "Latitude based on World Geodetic System (1984 version) + global reference frame (WGS 84). Positive values correspond to the + northern hemisphere."; + } + + leaf longitude { + type decimal64 { + fraction-digits 4; + range -180..180 ; + } + mandatory true; + description "Longitude based on World Geodetic System (1984 version) + global reference frame (WGS 84). Positive values correspond to + degrees east of 0 degrees longitude."; + } + } + + grouping GeoAreaGrp { + description "This data type defines a geographical area. + The geo-area is defined using a convex polygon in the attribute + 'convexGeoPolygon'."; + + list convexGeoPolygon { + description "Specifies the geographical area with a convex polygon. + The convex polygon is specified by its corners."; + key "latitude longitude"; + min-elements 3; + ordered-by user; + + uses GeoCoordinateGrp; + } + } } } -} \ No newline at end of file +} -- GitLab From f36eb37aa5b4b48ef330df51cd20d804d5fe3abd Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Mon, 6 Nov 2023 15:39:27 +0000 Subject: [PATCH 2/4] Update _3gpp-common-yang-types.yang --- yang-models/_3gpp-common-yang-types.yang | 82 ++++++++++++------------ 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/yang-models/_3gpp-common-yang-types.yang b/yang-models/_3gpp-common-yang-types.yang index 52b8870c8..f238819c4 100755 --- a/yang-models/_3gpp-common-yang-types.yang +++ b/yang-models/_3gpp-common-yang-types.yang @@ -540,6 +540,47 @@ module _3gpp-common-yang-types { leaf tac { type Tac; } } + + grouping GeoCoordinateGrp { + description "Geographical location on earth"; + leaf latitude { + type decimal64 { + fraction-digits 4; + range -90..90 ; + } + mandatory true; + description "Latitude based on World Geodetic System (1984 version) + global reference frame (WGS 84). Positive values correspond to the + northern hemisphere."; + } + + leaf longitude { + type decimal64 { + fraction-digits 4; + range -180..180 ; + } + mandatory true; + description "Longitude based on World Geodetic System (1984 version) + global reference frame (WGS 84). Positive values correspond to + degrees east of 0 degrees longitude."; + } + } + + grouping GeoAreaGrp { + description "This data type defines a geographical area. + The geo-area is defined using a convex polygon in the attribute + 'convexGeoPolygon'."; + + list convexGeoPolygon { + description "Specifies the geographical area with a convex polygon. + The convex polygon is specified by its corners."; + key "latitude longitude"; + min-elements 3; + ordered-by user; + + uses GeoCoordinateGrp; + } + } typedef AmfRegionId { type union { @@ -917,47 +958,6 @@ module _3gpp-common-yang-types { supported."; } } - - grouping GeoCoordinateGrp { - description "Geographical location on earth"; - leaf latitude { - type decimal64 { - fraction-digits 4; - range -90..90 ; - } - mandatory true; - description "Latitude based on World Geodetic System (1984 version) - global reference frame (WGS 84). Positive values correspond to the - northern hemisphere."; - } - - leaf longitude { - type decimal64 { - fraction-digits 4; - range -180..180 ; - } - mandatory true; - description "Longitude based on World Geodetic System (1984 version) - global reference frame (WGS 84). Positive values correspond to - degrees east of 0 degrees longitude."; - } - } - - grouping GeoAreaGrp { - description "This data type defines a geographical area. - The geo-area is defined using a convex polygon in the attribute - 'convexGeoPolygon'."; - - list convexGeoPolygon { - description "Specifies the geographical area with a convex polygon. - The convex polygon is specified by its corners."; - key "latitude longitude"; - min-elements 3; - ordered-by user; - - uses GeoCoordinateGrp; - } - } } } } -- GitLab From 1d3f63e146ab83fb9d4158f68bb997f7f180ec6c Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Mon, 6 Nov 2023 15:41:35 +0000 Subject: [PATCH 3/4] Update _3gpp-common-managementdatacollection.yang --- ..._3gpp-common-managementdatacollection.yang | 46 ++----------------- 1 file changed, 3 insertions(+), 43 deletions(-) diff --git a/yang-models/_3gpp-common-managementdatacollection.yang b/yang-models/_3gpp-common-managementdatacollection.yang index 11448f08c..04df6e244 100644 --- a/yang-models/_3gpp-common-managementdatacollection.yang +++ b/yang-models/_3gpp-common-managementdatacollection.yang @@ -25,51 +25,11 @@ module _3gpp-common-managementdatacollection { Integration Reference Point (IRP); Information Service (IS)"; + revision 2023-11-06 { reference "CR-0305"; } revision 2023-02-14 { reference "CR-0234"; } revision 2022-11-04 { reference "CR-0194"; } - grouping GeoCoordinateGrp { - description "Geographical location on earth"; - - leaf latitude { - type decimal64 { - fraction-digits 4; - range -90..90 ; - } - mandatory true; - description "Latitude based on World Geodetic System (1984 version) - global reference frame (WGS 84). Positive values correspond to the - northern hemisphere."; - } - - leaf longitude { - type decimal64 { - fraction-digits 4; - range -180..180 ; - } - mandatory true; - description "Longitude based on World Geodetic System (1984 version) - global reference frame (WGS 84). Positive values correspond to - degrees east of 0 degrees longitude."; - } - } - - grouping GeoAreaGrp { - description "This data type defines a geographical area. - The geo-area is defined using a convex polygon in the attribute - 'convexGeoPolygon'."; - - list convexGeoPolygon { - description "Specifies the geographical area with a convex polygon. - The convex polygon is specified by its corners."; - key "latitude longitude"; - min-elements 3; - ordered-by user; - - uses GeoCoordinateGrp; - } - } - + grouping GeoAreaToCellMappingGrp { description "Represents the GeoAreaToCellMapping data type. @@ -372,4 +332,4 @@ module _3gpp-common-managementdatacollection { } } -} \ No newline at end of file +} -- GitLab From ab10bd5279ebe46365ef5f3cc85d4be82910253e Mon Sep 17 00:00:00 2001 From: rosabolzek Date: Mon, 6 Nov 2023 15:53:47 +0000 Subject: [PATCH 4/4] correcting type of GeoArea --- yang-models/_3gpp-common-managementdatacollection.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-managementdatacollection.yang b/yang-models/_3gpp-common-managementdatacollection.yang index 04df6e244..5f5f49555 100644 --- a/yang-models/_3gpp-common-managementdatacollection.yang +++ b/yang-models/_3gpp-common-managementdatacollection.yang @@ -44,7 +44,7 @@ module _3gpp-common-managementdatacollection { leaf idx { type string; } - uses GeoAreaGrp; + uses types3gpp:GeoAreaGrp; } leaf associationThreshold { -- GitLab