From a898eb89b52f573d9e4f5961f9f1f61a130c85da Mon Sep 17 00:00:00 2001 From: qiwen Date: Fri, 9 Aug 2024 13:40:55 +0000 Subject: [PATCH 1/6] Update file _3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang --- ...-5gc-nrm-GtpUPathQoSMonitoringControl.yang | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang index b649d0bb0..d1672c707 100755 --- a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang @@ -126,6 +126,28 @@ module _3gpp-5gc-nrm-GtpUPathQoSMonitoringControl { delay for GTP-U path QoS monitoring."; 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; + + 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 da7228bf64450082d06000b4eb463c96fc217fbb Mon Sep 17 00:00:00 2001 From: qiwen Date: Fri, 9 Aug 2024 16:50:21 +0000 Subject: [PATCH 2/6] Update 2 files - /yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang - /yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang --- ...-5gc-nrm-GtpUPathQoSMonitoringControl.yang | 23 ------------------- .../_3gpp-5gc-nrm-QFQoSMonitoringControl.yang | 23 +++++++++++++++++++ 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang index d1672c707..de4714662 100755 --- a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang @@ -126,29 +126,6 @@ module _3gpp-5gc-nrm-GtpUPathQoSMonitoringControl { delay for GTP-U path QoS monitoring."; 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; - - 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" { diff --git a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang index 3294c01f8..0fce7d456 100755 --- a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang @@ -122,6 +122,29 @@ 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; + + 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 0a382b3eeff81078b54f6e83313ae5cc4d0893c2 Mon Sep 17 00:00:00 2001 From: qiwen Date: Fri, 9 Aug 2024 16:51:28 +0000 Subject: [PATCH 3/6] Update file _3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang --- yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang | 1 + 1 file changed, 1 insertion(+) diff --git a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang index de4714662..58ece735b 100755 --- a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang @@ -126,6 +126,7 @@ module _3gpp-5gc-nrm-GtpUPathQoSMonitoringControl { delay for GTP-U path QoS monitoring."; type uint32; } + } augment "/me3gpp:ManagedElement/smf3gpp:SMFFunction" { -- GitLab From e30f17a83a33269e445477d3df947cc0652a941b Mon Sep 17 00:00:00 2001 From: qiwen Date: Fri, 9 Aug 2024 16:55:21 +0000 Subject: [PATCH 4/6] Update 2 files - /yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang - /yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang --- yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang | 1 - yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang index 58ece735b..de4714662 100755 --- a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang @@ -126,7 +126,6 @@ module _3gpp-5gc-nrm-GtpUPathQoSMonitoringControl { delay for GTP-U path QoS monitoring."; type uint32; } - } augment "/me3gpp:ManagedElement/smf3gpp:SMFFunction" { diff --git a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang index 0fce7d456..002cdede3 100755 --- a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang @@ -145,7 +145,7 @@ in 3GPP TS 23.501. } } } - } + augment "/me3gpp:ManagedElement/smf3gpp:SMFFunction" { -- GitLab From 4d49e79ee52712cf7d1c32421515f6961d433f5a Mon Sep 17 00:00:00 2001 From: qiwen Date: Fri, 9 Aug 2024 16:58:13 +0000 Subject: [PATCH 5/6] Update file _3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang --- yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang | 1 + 1 file changed, 1 insertion(+) diff --git a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang index de4714662..58ece735b 100755 --- a/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang @@ -126,6 +126,7 @@ module _3gpp-5gc-nrm-GtpUPathQoSMonitoringControl { delay for GTP-U path QoS monitoring."; type uint32; } + } augment "/me3gpp:ManagedElement/smf3gpp:SMFFunction" { -- GitLab From 18e147508630709ec95fe16583b3e38024b3887d Mon Sep 17 00:00:00 2001 From: qiwen Date: Wed, 21 Aug 2024 11:22:35 +0000 Subject: [PATCH 6/6] Update file _3gpp-5gc-nrm-QFQoSMonitoringControl.yang --- yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang index 002cdede3..a4724bf4e 100755 --- a/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang +++ b/yang-models/_3gpp-5gc-nrm-QFQoSMonitoringControl.yang @@ -124,23 +124,18 @@ 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{ 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; } } } -- GitLab