From ecb2da8d74938ae8113d90b16d8f18d0d69d6470 Mon Sep 17 00:00:00 2001 From: qiwen Date: Tue, 31 Oct 2023 14:36:41 +0000 Subject: [PATCH 01/15] Update file _3gpp-5gc-nrm-QFQoSMonitoringControl.yang --- .../_3gpp-5gc-nrm-QFQoSMonitoringControl.yang | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang index 6f3ae3526..76d69c529 100755 --- a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang @@ -43,6 +43,22 @@ in 3GPP TS 23.501."; } } + grouping SatelliteBackhaulCategory{ + description "Specifies the satellite backhaul."; + reference "3GPP TS 29.571"; + type enumeration{ + enum GEO; + enum MEO; + enum LEO; + enum OTHER_SAT; + enum DYNAMIC_GEO; + enum DYNAMIC_MEO; + enum DYNAMIC_LEO; + enum DYNAMIC_OTHER_SAT; + enum NON_SATELLITE; + } + } + grouping QFQoSMonitoringControlGrp { description "Represents the QFQoSMonitoringControl IOC."; reference "3GPP TS 28.541"; @@ -119,6 +135,16 @@ in 3GPP TS 23.501."; packet delay for QoS monitoring per QoS flow per UE."; type uint32; } + + list qFMonitoredSatelliteBackhaulCategories{ + description "The satellite backhaul categories for which the QoS monitoring per QoS flow + per UE is to be performed."; + key satellite backhaul category; + uses top3gpp:Top_Grp; + container attributes { + uses SatelliteBackhaulCategory; + } + } } augment "/me3gpp:ManagedElement/smf3gpp:SMFFunction" { -- GitLab From 335c0de487b64accf7f0027763486fea296b9141 Mon Sep 17 00:00:00 2001 From: qiwen Date: Tue, 31 Oct 2023 14:40:23 +0000 Subject: [PATCH 02/15] Update file _3gpp-5gc-nrm-QFQoSMonitoringControl.yang --- yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang index 76d69c529..f35495e89 100755 --- a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang @@ -139,7 +139,7 @@ in 3GPP TS 23.501."; list qFMonitoredSatelliteBackhaulCategories{ description "The satellite backhaul categories for which the QoS monitoring per QoS flow per UE is to be performed."; - key satellite backhaul category; + key SatelliteBackhaulCategory; uses top3gpp:Top_Grp; container attributes { uses SatelliteBackhaulCategory; -- GitLab From 9c70dde18c9faeb3f43c3541b0d5e8e39463d35c Mon Sep 17 00:00:00 2001 From: qiwen Date: Tue, 31 Oct 2023 14:55:30 +0000 Subject: [PATCH 03/15] Update file _3gpp-5gc-nrm-QFQoSMonitoringControl.yang --- .../_3gpp-5gc-nrm-QFQoSMonitoringControl.yang | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang index f35495e89..3184343f7 100755 --- a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang @@ -46,16 +46,21 @@ in 3GPP TS 23.501."; grouping SatelliteBackhaulCategory{ description "Specifies the satellite backhaul."; reference "3GPP TS 29.571"; - type enumeration{ - enum GEO; - enum MEO; - enum LEO; - enum OTHER_SAT; - enum DYNAMIC_GEO; - enum DYNAMIC_MEO; - enum DYNAMIC_LEO; - enum DYNAMIC_OTHER_SAT; - enum NON_SATELLITE; + + leaf satelliteBackhaulCategory{ + description "The type of the satellite used in the backhaul."; + reference "3GPP TS 29.571"; + type enumeration{ + enum GEO; + enum MEO; + enum LEO; + enum OTHER_SAT; + enum DYNAMIC_GEO; + enum DYNAMIC_MEO; + enum DYNAMIC_LEO; + enum DYNAMIC_OTHER_SAT; + enum NON_SATELLITE; + } } } -- GitLab From 4e85f27192aa66920945d186707d9e6e5b4823ba Mon Sep 17 00:00:00 2001 From: qiwen Date: Tue, 31 Oct 2023 15:00:03 +0000 Subject: [PATCH 04/15] Update file _3gpp-5gc-nrm-QFQoSMonitoringControl.yang --- yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang index 3184343f7..b751e7642 100755 --- a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang @@ -144,7 +144,7 @@ in 3GPP TS 23.501."; list qFMonitoredSatelliteBackhaulCategories{ description "The satellite backhaul categories for which the QoS monitoring per QoS flow per UE is to be performed."; - key SatelliteBackhaulCategory; + key satelliteBackhaulCategory; uses top3gpp:Top_Grp; container attributes { uses SatelliteBackhaulCategory; -- GitLab From 49ea4f2051377642011966f621ac40f36fb2e747 Mon Sep 17 00:00:00 2001 From: qiwen Date: Tue, 31 Oct 2023 15:17:53 +0000 Subject: [PATCH 05/15] Update file _3gpp-5gc-nrm-QFQoSMonitoringControl.yang --- yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang index b751e7642..7b05b228c 100755 --- a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang @@ -47,7 +47,7 @@ in 3GPP TS 23.501."; description "Specifies the satellite backhaul."; reference "3GPP TS 29.571"; - leaf satelliteBackhaulCategory{ + leaf satelliteBackhaulCat{ description "The type of the satellite used in the backhaul."; reference "3GPP TS 29.571"; type enumeration{ @@ -144,7 +144,7 @@ in 3GPP TS 23.501."; list qFMonitoredSatelliteBackhaulCategories{ description "The satellite backhaul categories for which the QoS monitoring per QoS flow per UE is to be performed."; - key satelliteBackhaulCategory; + key satelliteBackhaulCat; uses top3gpp:Top_Grp; container attributes { uses SatelliteBackhaulCategory; -- GitLab From 2ae5c999b4821cad0affa65876139f2bb18fc251 Mon Sep 17 00:00:00 2001 From: qiwen Date: Tue, 31 Oct 2023 15:25:44 +0000 Subject: [PATCH 06/15] Update file _3gpp-5gc-nrm-QFQoSMonitoringControl.yang --- yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang index 7b05b228c..b4b747940 100755 --- a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang @@ -50,7 +50,7 @@ in 3GPP TS 23.501."; leaf satelliteBackhaulCat{ description "The type of the satellite used in the backhaul."; reference "3GPP TS 29.571"; - type enumeration{ + type enumeration { enum GEO; enum MEO; enum LEO; -- GitLab From 9e869a0de617c99ca1c540977ad222a2cad89793 Mon Sep 17 00:00:00 2001 From: qiwen Date: Tue, 31 Oct 2023 15:30:25 +0000 Subject: [PATCH 07/15] Update file _3gpp-5gc-nrm-QFQoSMonitoringControl.yang --- yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang index b4b747940..bbbc84599 100755 --- a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang @@ -46,7 +46,6 @@ in 3GPP TS 23.501."; grouping SatelliteBackhaulCategory{ description "Specifies the satellite backhaul."; reference "3GPP TS 29.571"; - leaf satelliteBackhaulCat{ description "The type of the satellite used in the backhaul."; reference "3GPP TS 29.571"; @@ -144,7 +143,7 @@ in 3GPP TS 23.501."; list qFMonitoredSatelliteBackhaulCategories{ description "The satellite backhaul categories for which the QoS monitoring per QoS flow per UE is to be performed."; - key satelliteBackhaulCat; + key "satelliteBackhaulCat"; uses top3gpp:Top_Grp; container attributes { uses SatelliteBackhaulCategory; -- GitLab From 3a277349a2a666307318b2283ba50eead0958abe Mon Sep 17 00:00:00 2001 From: qiwen Date: Tue, 31 Oct 2023 15:32:21 +0000 Subject: [PATCH 08/15] Update file _3gpp-5gc-nrm-QFQoSMonitoringControl.yang --- yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang index bbbc84599..43763e85a 100755 --- a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang @@ -144,9 +144,8 @@ in 3GPP TS 23.501."; description "The satellite backhaul categories for which the QoS monitoring per QoS flow per UE is to be performed."; key "satelliteBackhaulCat"; - uses top3gpp:Top_Grp; container attributes { - uses SatelliteBackhaulCategory; + uses satelliteBackhaulCat; } } } -- GitLab From f6f6f66b8b3813d1a78555a429beac65e9a09d2e Mon Sep 17 00:00:00 2001 From: qiwen Date: Tue, 31 Oct 2023 15:36:09 +0000 Subject: [PATCH 09/15] Update file _3gpp-5gc-nrm-QFQoSMonitoringControl.yang --- yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang index 43763e85a..6456d3ca8 100755 --- a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang @@ -42,8 +42,8 @@ in 3GPP TS 23.501."; description "Round trip threshold"; } } - - grouping SatelliteBackhaulCategory{ + + grouping SatelliteBackhaulCategory { description "Specifies the satellite backhaul."; reference "3GPP TS 29.571"; leaf satelliteBackhaulCat{ @@ -143,7 +143,7 @@ in 3GPP TS 23.501."; list qFMonitoredSatelliteBackhaulCategories{ description "The satellite backhaul categories for which the QoS monitoring per QoS flow per UE is to be performed."; - key "satelliteBackhaulCat"; + key "satelliteBackhaulCat"; container attributes { uses satelliteBackhaulCat; } -- GitLab From 2b91414bd4e2b43400def12b853eb7d7b0117865 Mon Sep 17 00:00:00 2001 From: qiwen Date: Tue, 31 Oct 2023 15:49:15 +0000 Subject: [PATCH 10/15] Update file _3gpp-5gc-nrm-QFQoSMonitoringControl.yang --- .../_3gpp-5gc-nrm-QFQoSMonitoringControl.yang | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang index 6456d3ca8..b01fad84c 100755 --- a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang @@ -42,14 +42,14 @@ in 3GPP TS 23.501."; description "Round trip threshold"; } } - - grouping SatelliteBackhaulCategory { + + grouping satelliteBackhaulCategory{ description "Specifies the satellite backhaul."; - reference "3GPP TS 29.571"; - leaf satelliteBackhaulCat{ - description "The type of the satellite used in the backhaul."; - reference "3GPP TS 29.571"; - type enumeration { + reference "3GPP TS 23.501"; + + leaf satellitebackhaulcat{ + description ""; + type enumeration{ enum GEO; enum MEO; enum LEO; @@ -143,11 +143,12 @@ in 3GPP TS 23.501."; list qFMonitoredSatelliteBackhaulCategories{ description "The satellite backhaul categories for which the QoS monitoring per QoS flow per UE is to be performed."; - key "satelliteBackhaulCat"; + key "satellitebackhaulcat"; container attributes { - uses satelliteBackhaulCat; + uses satelliteBackhaulCategory; } } + } augment "/me3gpp:ManagedElement/smf3gpp:SMFFunction" { -- GitLab From 516f0dc327b32ff0f5c0248ef6b0e772bb1954a7 Mon Sep 17 00:00:00 2001 From: qiwen Date: Tue, 31 Oct 2023 15:52:54 +0000 Subject: [PATCH 11/15] Update file _3gpp-5gc-nrm-QFQoSMonitoringControl.yang --- yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang | 9 --------- 1 file changed, 9 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang index b01fad84c..745b8d64f 100755 --- a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang @@ -139,15 +139,6 @@ in 3GPP TS 23.501."; packet delay for QoS monitoring per QoS flow per UE."; type uint32; } - - list qFMonitoredSatelliteBackhaulCategories{ - description "The satellite backhaul categories for which the QoS monitoring per QoS flow - per UE is to be performed."; - key "satellitebackhaulcat"; - container attributes { - uses satelliteBackhaulCategory; - } - } } -- GitLab From 8a1bfe3274bbb5281f527f1f4833ca2f18797d0f Mon Sep 17 00:00:00 2001 From: qiwen Date: Tue, 31 Oct 2023 15:55:01 +0000 Subject: [PATCH 12/15] Update file _3gpp-5gc-nrm-QFQoSMonitoringControl.yang --- yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang index 745b8d64f..ead28b64f 100755 --- a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang @@ -140,6 +140,15 @@ in 3GPP TS 23.501."; type uint32; } + list qFMonitoredSatelliteBackhaulCategories{ + description "The satellite backhaul categories for which the QoS monitoring per QoS flow + per UE is to be performed."; + key "satellitebackhaulcat"; + container attributes { + uses satelliteBackhaulCategory; + } + } + } augment "/me3gpp:ManagedElement/smf3gpp:SMFFunction" { -- GitLab From a71f562f6e00b01c134e5d7d8aeab43c77783b3c Mon Sep 17 00:00:00 2001 From: qiwen Date: Tue, 31 Oct 2023 16:12:45 +0000 Subject: [PATCH 13/15] Update file _3gpp-5gc-nrm-QFQoSMonitoringControl.yang --- yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang index ead28b64f..5fe31acd4 100755 --- a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang @@ -43,7 +43,7 @@ in 3GPP TS 23.501."; } } - grouping satelliteBackhaulCategory{ + grouping satelliteBackhaulCategory { description "Specifies the satellite backhaul."; reference "3GPP TS 23.501"; @@ -143,7 +143,7 @@ in 3GPP TS 23.501."; list qFMonitoredSatelliteBackhaulCategories{ description "The satellite backhaul categories for which the QoS monitoring per QoS flow per UE is to be performed."; - key "satellitebackhaulcat"; + key satellitebackhaulcat; container attributes { uses satelliteBackhaulCategory; } -- GitLab From d5abff05360e8226a69b13ba528d6e420b8910b7 Mon Sep 17 00:00:00 2001 From: qiwen Date: Tue, 31 Oct 2023 16:22:56 +0000 Subject: [PATCH 14/15] Update file _3gpp-5gc-nrm-QFQoSMonitoringControl.yang --- .../_3gpp-5gc-nrm-QFQoSMonitoringControl.yang | 39 ++++++++----------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang index 5fe31acd4..9c0aaa3c1 100755 --- a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang @@ -43,25 +43,6 @@ in 3GPP TS 23.501."; } } - grouping satelliteBackhaulCategory { - description "Specifies the satellite backhaul."; - reference "3GPP TS 23.501"; - - leaf satellitebackhaulcat{ - description ""; - type enumeration{ - enum GEO; - enum MEO; - enum LEO; - enum OTHER_SAT; - enum DYNAMIC_GEO; - enum DYNAMIC_MEO; - enum DYNAMIC_LEO; - enum DYNAMIC_OTHER_SAT; - enum NON_SATELLITE; - } - } - } grouping QFQoSMonitoringControlGrp { description "Represents the QFQoSMonitoringControl IOC."; @@ -140,15 +121,27 @@ in 3GPP TS 23.501."; type uint32; } - list qFMonitoredSatelliteBackhaulCategories{ + list qFMonitoredSatelliteBackhaulCategories { description "The satellite backhaul categories for which the QoS monitoring per QoS flow per UE is to be performed."; key satellitebackhaulcat; - container attributes { - uses satelliteBackhaulCategory; + + leaf satellitebackhaulcat{ + description "Specifies the satellite backhaul."; + reference "3GPP TS 23.501"; + type enumeration { + enum GEO; + enum MEO; + enum LEO; + enum OTHER_SAT; + enum DYNAMIC_GEO; + enum DYNAMIC_MEO; + enum DYNAMIC_LEO; + enum DYNAMIC_OTHER_SAT; + enum NON_SATELLITE; + } } } - } augment "/me3gpp:ManagedElement/smf3gpp:SMFFunction" { -- GitLab From 234b990f544d98eafe80eebfc16f44bd54a2c046 Mon Sep 17 00:00:00 2001 From: qiwen Date: Tue, 31 Oct 2023 16:25:35 +0000 Subject: [PATCH 15/15] Update file _3gpp-5gc-nrm-QFQoSMonitoringControl.yang --- yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang index 9c0aaa3c1..747720a5c 100755 --- a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang @@ -122,8 +122,8 @@ in 3GPP TS 23.501."; } list qFMonitoredSatelliteBackhaulCategories { - description "The satellite backhaul categories for which the QoS monitoring per QoS flow - per UE is to be performed."; + description "The satellite backhaul categories for which the QoS monitoring + per QoS flow per UE is to be performed."; key satellitebackhaulcat; leaf satellitebackhaulcat{ -- GitLab