From 83a8989892841690c17c9749425d1a49d13dd3af Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Mon, 21 Apr 2025 13:12:57 +0000 Subject: [PATCH 01/14] Update file _3gpp-5gc-nrm-stmfunction.yang --- yang-models/_3gpp-5gc-nrm-stmfunction.yang | 107 ++++++++++++++++++--- 1 file changed, 92 insertions(+), 15 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-stmfunction.yang b/yang-models/_3gpp-5gc-nrm-stmfunction.yang index 5ad40a9c2..77d5ffa13 100644 --- a/yang-models/_3gpp-5gc-nrm-stmfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-stmfunction.yang @@ -16,22 +16,16 @@ module _3gpp-5gc-nrm-stmfunction { reference "3GPP TS 28.abc Signalling traffic monitoring management"; + revision 2025-05-01 { reference "S5-25xxxx"; } revision 2024-11-07 { reference "S5-247077"; } - grouping StmCtrlGrp { - description "Represents the StmCtrl IOC."; + grouping NetworkInterfaceGrp { + description "Represents the STM Network Interface Datatype."; - leaf-list reportingNFList { - type types3gpp:DistinguishedName; - description "List of Network Function Distinguished Name, which - specifies the target network interface type to be monitored. If - this parameter is not present or it is empty, then all applicable - interface types from the target NF shall be monitored"; - } - - leaf-list networkInterfaceTypeList { + leaf networkInterfaceType { type enumeration { enum ALL; + enum N2; enum N4; enum N5; enum N7; @@ -42,21 +36,104 @@ module _3gpp-5gc-nrm-stmfunction { enum N13; enum N14; enum N15; + enum N16; + enum N17; + enum N18; + enum N20; + enum N21; enum N22; + enum N23; + enum N26; + enum N28; + enum N29; + enum N30; + enum N33; + enum N34; + enum N35; + enum N36; + enum N37; + enum N40; + enum N41; + enum N42; + enum N51; + enum N52; enum N58; enum N59; + enum N60; + enum N61; + enum N62; + enum N63; enum N80; enum N81; + enum N82; + enum N83; + enum N84; + enum N85; + enum N86; + enum N87; + enum N88; + enum N89; + enum N96; + enum NL1; + enum NL2; + enum NL5; + enum NL6; + enum NL8; + enum NL9; } default ALL; - description "List of network interface type. it specifies the network - function whose signalling traffic is to be monitored. If this + mandatory true; + description "List of network interface type to be monitored. The + applicable network interface type names are specified based on + subclause 4.2.3 of 3GPP TS 23.501 and clause 4.2.1 of 3GPP + TS 23.273. The value "ALL" is specified for the case if all the + applicable interface type of the network function shall be + monitored."; + reference "Clause 4.2.3 of 3GPP TS 23.501 and clause 4.2.1 of + 3GPP TS 23.273 for details on the allowed values."; + } + + leaf-list networkInterfaceInstanceList { + type types3gpp:DistinguishedName; + mandatory false; + description "The list of applicable network interface instances + of the network interface type specified by + networkInterfaceType."; + reference "allowedValues: DN of the following MOIs as specified + in subclause 5.2.1 of 3GPP TS 28.541" + } + + leaf-list serviceOperationList { + type string; + description "The list of applicable service operations exchanged + over the network interface instances specified by + networkInterfaceInstanceList. Or, + If networkInterfaceInstanceList is not present, the list of + applicable service operations exchanged over the network + interface type specified by networkInterfaceType."; + reference "allowedValues: refer to subclause 5.2 of 3GPP + TS 23.502 " + } + } + + grouping StmCtrlGrp { + description "Represents the StmCtrl IOC."; + + leaf-list reportingNFList { + type types3gpp:DistinguishedName; + description "List of Network Function Distinguished Name, which + specifies the target network interface type to be monitored. If + this parameter is not present or it is empty, then all applicable + interface types from the target NF shall be monitored"; + } + + leaf-list networkInterfaceList { + type NetworkInterfaceGrp; + description "List of network interface to be monitored. If this parameter is not present or it is empty, then all Network Functions within the SubNetwork or ManagedElement shall be monitored. This parameter shall be omitted if the STM control object is specified under a ManagedFunction. "; - reference "Clause 4.2.3 of 3GPP TS 23.501 for details on the - allowed values."; } leaf stmTargetUri { -- GitLab From 593d29b1f70f4028ef85ada2bbb8ca7024ed64f4 Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Mon, 21 Apr 2025 13:20:03 +0000 Subject: [PATCH 02/14] Update file _3gpp-5gc-nrm-stmfunction.yang --- yang-models/_3gpp-5gc-nrm-stmfunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-5gc-nrm-stmfunction.yang b/yang-models/_3gpp-5gc-nrm-stmfunction.yang index 77d5ffa13..adf471d74 100644 --- a/yang-models/_3gpp-5gc-nrm-stmfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-stmfunction.yang @@ -86,7 +86,7 @@ module _3gpp-5gc-nrm-stmfunction { description "List of network interface type to be monitored. The applicable network interface type names are specified based on subclause 4.2.3 of 3GPP TS 23.501 and clause 4.2.1 of 3GPP - TS 23.273. The value "ALL" is specified for the case if all the + TS 23.273. The value 'ALL' is specified for the case if all the applicable interface type of the network function shall be monitored."; reference "Clause 4.2.3 of 3GPP TS 23.501 and clause 4.2.1 of -- GitLab From 0b9ad10b45a0bafc38ced605fd82b8d0e5c61bc3 Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Mon, 21 Apr 2025 13:23:41 +0000 Subject: [PATCH 03/14] Update file _3gpp-5gc-nrm-stmfunction.yang --- yang-models/_3gpp-5gc-nrm-stmfunction.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-stmfunction.yang b/yang-models/_3gpp-5gc-nrm-stmfunction.yang index adf471d74..80a4ead30 100644 --- a/yang-models/_3gpp-5gc-nrm-stmfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-stmfunction.yang @@ -100,7 +100,7 @@ module _3gpp-5gc-nrm-stmfunction { of the network interface type specified by networkInterfaceType."; reference "allowedValues: DN of the following MOIs as specified - in subclause 5.2.1 of 3GPP TS 28.541" + in subclause 5.2.1 of 3GPP TS 28.541"; } leaf-list serviceOperationList { @@ -112,7 +112,7 @@ module _3gpp-5gc-nrm-stmfunction { applicable service operations exchanged over the network interface type specified by networkInterfaceType."; reference "allowedValues: refer to subclause 5.2 of 3GPP - TS 23.502 " + TS 23.502"; } } -- GitLab From 01e4dac8292a23fb76d1838fa6b0bf837380888a Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Mon, 21 Apr 2025 13:27:11 +0000 Subject: [PATCH 04/14] Update file _3gpp-5gc-nrm-stmfunction.yang --- yang-models/_3gpp-5gc-nrm-stmfunction.yang | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-stmfunction.yang b/yang-models/_3gpp-5gc-nrm-stmfunction.yang index 80a4ead30..456c5877d 100644 --- a/yang-models/_3gpp-5gc-nrm-stmfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-stmfunction.yang @@ -82,7 +82,6 @@ module _3gpp-5gc-nrm-stmfunction { enum NL9; } default ALL; - mandatory true; description "List of network interface type to be monitored. The applicable network interface type names are specified based on subclause 4.2.3 of 3GPP TS 23.501 and clause 4.2.1 of 3GPP @@ -95,7 +94,6 @@ module _3gpp-5gc-nrm-stmfunction { leaf-list networkInterfaceInstanceList { type types3gpp:DistinguishedName; - mandatory false; description "The list of applicable network interface instances of the network interface type specified by networkInterfaceType."; @@ -128,7 +126,7 @@ module _3gpp-5gc-nrm-stmfunction { } leaf-list networkInterfaceList { - type NetworkInterfaceGrp; + uses NetworkInterfaceGrp; description "List of network interface to be monitored. If this parameter is not present or it is empty, then all Network Functions within the SubNetwork or ManagedElement shall be monitored. This -- GitLab From 6533b8a22e04d1b5d9a2f9acd917bfc4cdb9e81d Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Mon, 21 Apr 2025 13:30:23 +0000 Subject: [PATCH 05/14] Update file _3gpp-5gc-nrm-stmfunction.yang --- yang-models/_3gpp-5gc-nrm-stmfunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-5gc-nrm-stmfunction.yang b/yang-models/_3gpp-5gc-nrm-stmfunction.yang index 456c5877d..9d39c6c32 100644 --- a/yang-models/_3gpp-5gc-nrm-stmfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-stmfunction.yang @@ -125,7 +125,7 @@ module _3gpp-5gc-nrm-stmfunction { interface types from the target NF shall be monitored"; } - leaf-list networkInterfaceList { + list networkInterfaceList { uses NetworkInterfaceGrp; description "List of network interface to be monitored. If this parameter is not present or it is empty, then all Network Functions -- GitLab From 3fb75008114d143de11040194b3e3f76beccb707 Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Mon, 21 Apr 2025 13:35:26 +0000 Subject: [PATCH 06/14] Update file _3gpp-5gc-nrm-stmfunction.yang --- yang-models/_3gpp-5gc-nrm-stmfunction.yang | 1 + 1 file changed, 1 insertion(+) diff --git a/yang-models/_3gpp-5gc-nrm-stmfunction.yang b/yang-models/_3gpp-5gc-nrm-stmfunction.yang index 9d39c6c32..ca0676a20 100644 --- a/yang-models/_3gpp-5gc-nrm-stmfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-stmfunction.yang @@ -127,6 +127,7 @@ module _3gpp-5gc-nrm-stmfunction { list networkInterfaceList { uses NetworkInterfaceGrp; + key "networkInterfaceType"; description "List of network interface to be monitored. If this parameter is not present or it is empty, then all Network Functions within the SubNetwork or ManagedElement shall be monitored. This -- GitLab From fed0e3c0e9127c74751b97cea82417787018a1fe Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Thu, 24 Apr 2025 01:26:07 +0000 Subject: [PATCH 07/14] Update file _3gpp-5gc-nrm-stmfunction.yang --- yang-models/_3gpp-5gc-nrm-stmfunction.yang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-stmfunction.yang b/yang-models/_3gpp-5gc-nrm-stmfunction.yang index ca0676a20..ee126f979 100644 --- a/yang-models/_3gpp-5gc-nrm-stmfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-stmfunction.yang @@ -10,8 +10,8 @@ module _3gpp-5gc-nrm-stmfunction { organization "3gpp SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; - description "This IOC represents the STM function defined in 3GPP TS 28.abc. - Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, + description "This IOC represents the STM function defined in 3GPP TS 28.560. + Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, TTA, TTC). All rights reserved."; reference "3GPP TS 28.abc Signalling traffic monitoring management"; -- GitLab From b062fdb41bb157a8556ca5714c607250609f30b2 Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Sat, 26 Apr 2025 12:42:02 +0000 Subject: [PATCH 08/14] Update file _3gpp-5gc-nrm-stmfunction.yang --- yang-models/_3gpp-5gc-nrm-stmfunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-5gc-nrm-stmfunction.yang b/yang-models/_3gpp-5gc-nrm-stmfunction.yang index ee126f979..fb6383782 100644 --- a/yang-models/_3gpp-5gc-nrm-stmfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-stmfunction.yang @@ -16,7 +16,7 @@ module _3gpp-5gc-nrm-stmfunction { reference "3GPP TS 28.abc Signalling traffic monitoring management"; - revision 2025-05-01 { reference "S5-25xxxx"; } + revision 2025-05-01 { reference "CR-0009"; } revision 2024-11-07 { reference "S5-247077"; } grouping NetworkInterfaceGrp { -- GitLab From dd54906c2c0dbe0ae5b4a9a1fc5c1821ffa1c1bb Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Sat, 26 Apr 2025 15:07:44 +0000 Subject: [PATCH 09/14] Update file _3gpp-5gc-nrm-stmfunction.yang --- yang-models/_3gpp-5gc-nrm-stmfunction.yang | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-stmfunction.yang b/yang-models/_3gpp-5gc-nrm-stmfunction.yang index fb6383782..133533ac2 100644 --- a/yang-models/_3gpp-5gc-nrm-stmfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-stmfunction.yang @@ -20,11 +20,22 @@ module _3gpp-5gc-nrm-stmfunction { revision 2024-11-07 { reference "S5-247077"; } grouping NetworkInterfaceGrp { - description "Represents the STM Network Interface Datatype."; + description "Represents the network interface for which signalling traffic + messages are to be copied and sent to the external entity. + The attribute networkInterfaceType specifies the network interface type to + be monitored. The optional attribute networkInterfaceInstanceList + specifies the network interface instances to be monitored. It is a list of + applicable network interface instances of the network interface type + specified by networkInterfaceType. The optional attribute + serviceOperationList specifies the service operations to be monitored. + It is a list of applicable service operations exchanged over the network + interface instances specified by networkInterfaceInstanceList, or, if + networkInterfaceInstanceList is not present, it is list of applicable + service operations exchanged over the network interface type specified + by networkInterfaceType."; leaf networkInterfaceType { type enumeration { - enum ALL; enum N2; enum N4; enum N5; -- GitLab From 4fc0087d7de4b04ba318482a85dcccdde56536be Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Sat, 26 Apr 2025 15:08:57 +0000 Subject: [PATCH 10/14] Update file _3gpp-5gc-nrm-stmfunction.yang --- yang-models/_3gpp-5gc-nrm-stmfunction.yang | 1 - 1 file changed, 1 deletion(-) diff --git a/yang-models/_3gpp-5gc-nrm-stmfunction.yang b/yang-models/_3gpp-5gc-nrm-stmfunction.yang index 133533ac2..a15fbe9f0 100644 --- a/yang-models/_3gpp-5gc-nrm-stmfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-stmfunction.yang @@ -92,7 +92,6 @@ module _3gpp-5gc-nrm-stmfunction { enum NL8; enum NL9; } - default ALL; description "List of network interface type to be monitored. The applicable network interface type names are specified based on subclause 4.2.3 of 3GPP TS 23.501 and clause 4.2.1 of 3GPP -- GitLab From 6f64c6b574f70e23a058237f011c412dc7c6bc27 Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Mon, 28 Apr 2025 12:44:43 +0000 Subject: [PATCH 11/14] Update file _3gpp-5gc-nrm-stmfunction.yang --- yang-models/_3gpp-5gc-nrm-stmfunction.yang | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-stmfunction.yang b/yang-models/_3gpp-5gc-nrm-stmfunction.yang index a15fbe9f0..2ecb93805 100644 --- a/yang-models/_3gpp-5gc-nrm-stmfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-stmfunction.yang @@ -16,7 +16,7 @@ module _3gpp-5gc-nrm-stmfunction { reference "3GPP TS 28.abc Signalling traffic monitoring management"; - revision 2025-05-01 { reference "CR-0009"; } + revision 2025-05-07 { reference "CR-0009"; } revision 2024-11-07 { reference "S5-247077"; } grouping NetworkInterfaceGrp { @@ -95,9 +95,7 @@ module _3gpp-5gc-nrm-stmfunction { description "List of network interface type to be monitored. The applicable network interface type names are specified based on subclause 4.2.3 of 3GPP TS 23.501 and clause 4.2.1 of 3GPP - TS 23.273. The value 'ALL' is specified for the case if all the - applicable interface type of the network function shall be - monitored."; + TS 23.273."; reference "Clause 4.2.3 of 3GPP TS 23.501 and clause 4.2.1 of 3GPP TS 23.273 for details on the allowed values."; } -- GitLab From 42d47874f2b564b19d6727ccfa0e6d2c6b3bc1b5 Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Tue, 29 Apr 2025 13:29:59 +0000 Subject: [PATCH 12/14] Update file _3gpp-5gc-nrm-stmfunction.yang --- yang-models/_3gpp-5gc-nrm-stmfunction.yang | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/yang-models/_3gpp-5gc-nrm-stmfunction.yang b/yang-models/_3gpp-5gc-nrm-stmfunction.yang index 2ecb93805..8ddf5f59a 100644 --- a/yang-models/_3gpp-5gc-nrm-stmfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-stmfunction.yang @@ -36,6 +36,7 @@ module _3gpp-5gc-nrm-stmfunction { leaf networkInterfaceType { type enumeration { + enum ALL; enum N2; enum N4; enum N5; @@ -92,10 +93,13 @@ module _3gpp-5gc-nrm-stmfunction { enum NL8; enum NL9; } + default ALL; description "List of network interface type to be monitored. The applicable network interface type names are specified based on subclause 4.2.3 of 3GPP TS 23.501 and clause 4.2.1 of 3GPP - TS 23.273."; + TS 23.273. + The value "ALL" is specified for the case if all the applicable + interface type of the network function shall be monitored."; reference "Clause 4.2.3 of 3GPP TS 23.501 and clause 4.2.1 of 3GPP TS 23.273 for details on the allowed values."; } -- GitLab From 6802d9f8ef38e99dfdca848ada5e367679c4d0db Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Tue, 29 Apr 2025 13:31:17 +0000 Subject: [PATCH 13/14] Update file _3gpp-5gc-nrm-stmfunction.yang --- yang-models/_3gpp-5gc-nrm-stmfunction.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-5gc-nrm-stmfunction.yang b/yang-models/_3gpp-5gc-nrm-stmfunction.yang index 8ddf5f59a..9d59d55cf 100644 --- a/yang-models/_3gpp-5gc-nrm-stmfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-stmfunction.yang @@ -98,7 +98,7 @@ module _3gpp-5gc-nrm-stmfunction { applicable network interface type names are specified based on subclause 4.2.3 of 3GPP TS 23.501 and clause 4.2.1 of 3GPP TS 23.273. - The value "ALL" is specified for the case if all the applicable + The value ALL is specified for the case if all the applicable interface type of the network function shall be monitored."; reference "Clause 4.2.3 of 3GPP TS 23.501 and clause 4.2.1 of 3GPP TS 23.273 for details on the allowed values."; -- GitLab From 39a6f07eb1a791c13f5532c1fecd6380c07a043b Mon Sep 17 00:00:00 2001 From: Zu Qiang Date: Wed, 21 May 2025 23:41:24 -0500 Subject: [PATCH 14/14] Update file _3gpp-5gc-nrm-stmfunction.yang --- yang-models/_3gpp-5gc-nrm-stmfunction.yang | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/yang-models/_3gpp-5gc-nrm-stmfunction.yang b/yang-models/_3gpp-5gc-nrm-stmfunction.yang index 9d59d55cf..8dc23e5b5 100644 --- a/yang-models/_3gpp-5gc-nrm-stmfunction.yang +++ b/yang-models/_3gpp-5gc-nrm-stmfunction.yang @@ -20,12 +20,12 @@ module _3gpp-5gc-nrm-stmfunction { revision 2024-11-07 { reference "S5-247077"; } grouping NetworkInterfaceGrp { - description "Represents the network interface for which signalling traffic - messages are to be copied and sent to the external entity. - The attribute networkInterfaceType specifies the network interface type to - be monitored. The optional attribute networkInterfaceInstanceList - specifies the network interface instances to be monitored. It is a list of - applicable network interface instances of the network interface type + description "Represents the network interfaces for which signalling + traffic messages are to be copied and sent to the external entity. + The attribute networkInterfaceType specifies the network interface type + to be monitored. The optional attribute networkInterfaceInstanceList + specifies the network interface instances to be monitored. It is a list + of applicable network interface instances of the network interface type specified by networkInterfaceType. The optional attribute serviceOperationList specifies the service operations to be monitored. It is a list of applicable service operations exchanged over the network @@ -106,9 +106,9 @@ module _3gpp-5gc-nrm-stmfunction { leaf-list networkInterfaceInstanceList { type types3gpp:DistinguishedName; - description "The list of applicable network interface instances - of the network interface type specified by - networkInterfaceType."; + description "The list of applicable network interface instances, for + which the monitoring is to be performed, of the network interface + type specified by networkInterfaceType."; reference "allowedValues: DN of the following MOIs as specified in subclause 5.2.1 of 3GPP TS 28.541"; } @@ -117,7 +117,7 @@ module _3gpp-5gc-nrm-stmfunction { type string; description "The list of applicable service operations exchanged over the network interface instances specified by - networkInterfaceInstanceList. Or, + networkInterfaceInstanceList, that needs to be monitored. Or, If networkInterfaceInstanceList is not present, the list of applicable service operations exchanged over the network interface type specified by networkInterfaceType."; @@ -137,7 +137,7 @@ module _3gpp-5gc-nrm-stmfunction { interface types from the target NF shall be monitored"; } - list networkInterfaceList { + list targetInterfaceInfoList { uses NetworkInterfaceGrp; key "networkInterfaceType"; description "List of network interface to be monitored. If this -- GitLab