From 5b79871845b02c2a80e6eb5a5ca4ea582701f161 Mon Sep 17 00:00:00 2001 From: lengyelb Date: Mon, 22 Jan 2024 16:24:55 +0000 Subject: [PATCH 1/3] Add dataNodeSelector Update _3gpp-common-subscription-control.yang --- .../_3gpp-common-subscription-control.yang | 74 ++++++++++--------- 1 file changed, 41 insertions(+), 33 deletions(-) diff --git a/yang-models/_3gpp-common-subscription-control.yang b/yang-models/_3gpp-common-subscription-control.yang index e037ff83c..d426cb05e 100755 --- a/yang-models/_3gpp-common-subscription-control.yang +++ b/yang-models/_3gpp-common-subscription-control.yang @@ -18,6 +18,7 @@ module _3gpp-common-subscription-control { Solution Set (SS) definitions 3GPP TS 28.623"; + revision 2024-01-18 { reference CR-0329 ; } revision 2023-09-18 { reference CR-0271 ; } revision 2023-08-10 { reference "CR0257 CR0260"; } revision 2022-10-20 { reference CR-0196; } @@ -42,45 +43,52 @@ module _3gpp-common-subscription-control { discriminated by notificationFilter attribute."; } - list scope { - key "scopeType"; - min-elements 1; - max-elements 1; + choice scope { description "Describes which object instances are selected with respect to a base object instance."; - leaf scopeType { - type enumeration { - enum BASE_ONLY; - enum BASE_ALL; - enum BASE_NTH_LEVEL; - enum BASE_SUBTREE; - } - description "If the optional scopeLevel parameter is not supported - or absent, allowed values of scopeType are BASE_ONLY and BASE_ALL. + + case type-level { + leaf scopeType { + type enumeration { + enum BASE_ONLY; + enum BASE_ALL; + enum BASE_NTH_LEVEL; + enum BASE_SUBTREE; + } + description "If the optional scopeLevel parameter is not supported + or absent, allowed values of scopeType are BASE_ONLY and BASE_ALL. - The value BASE_ONLY indicates only the base object is selected. - The value BASE_ALL indicates the base object and all of its - subordinate objects (incl. the leaf objects) are selected. + The value BASE_ONLY indicates only the base object is selected. + The value BASE_ALL indicates the base object and all of its + subordinate objects (incl. the leaf objects) are selected. - If the scopeLevel parameter is supported and present, allowed - values of scopeType are BASE_ALL, BASE_ONLY, BASE_NTH_LEVEL - and BASE_SUBTREE. + If the scopeLevel parameter is supported and present, allowed + values of scopeType are BASE_ALL, BASE_ONLY, BASE_NTH_LEVEL + and BASE_SUBTREE. - The value BASE_NTH_LEVEL indicates all objects on the level, - which is specified by the scopeLevel parameter, below the base - object are selected. The base object is at scopeLevel zero. - The value BASE_SUBTREE indicates the base object and all of its - subordinate objects down to and including the objects on the level, - which is specified by the scopeLevel parameter, are selected. - The base object is at scopeLevel zero."; - } + The value BASE_NTH_LEVEL indicates all objects on the level, + which is specified by the scopeLevel parameter, below the base + object are selected. The base object is at scopeLevel zero. + The value BASE_SUBTREE indicates the base object and all of its + subordinate objects down to and including the objects on the level, + which is specified by the scopeLevel parameter, are selected. + The base object is at scopeLevel zero."; + } - leaf scopeLevel { - when '../scopeType = "BASE_NTH_LEVEL" or ../scopeType = "BASE_SUBTREE"'; - type uint16; - mandatory true; - description "See description of scopeType."; + leaf scopeLevel { + when '../scopeType = "BASE_NTH_LEVEL" or ../scopeType = "BASE_SUBTREE"'; + type uint16; + mandatory true; + description "See description of scopeType."; + } + } + case dataNodeSelector { + leaf dataNodeSelector { + type string; + description "The value shall follow the rules of RFC 8641 + filter-spec"; + reference "RFC 8641 section 5."; + } } } @@ -288,4 +296,4 @@ module _3gpp-common-subscription-control { } } } -} \ No newline at end of file +} -- GitLab From 6e87637d0124594fda9ac59db3cbf2731af51852 Mon Sep 17 00:00:00 2001 From: lengyelb Date: Mon, 22 Jan 2024 16:29:38 +0000 Subject: [PATCH 2/3] Correct _3gpp-common-subscription-control.yang --- yang-models/_3gpp-common-subscription-control.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-subscription-control.yang b/yang-models/_3gpp-common-subscription-control.yang index d426cb05e..eaa22229d 100755 --- a/yang-models/_3gpp-common-subscription-control.yang +++ b/yang-models/_3gpp-common-subscription-control.yang @@ -47,7 +47,7 @@ module _3gpp-common-subscription-control { description "Describes which object instances are selected with respect to a base object instance."; - + case type-level { + case type-level { leaf scopeType { type enumeration { enum BASE_ONLY; -- GitLab From 0a321c93f2e3fff3581b97b884b72629d7db5c2a Mon Sep 17 00:00:00 2001 From: lengyelb Date: Mon, 22 Jan 2024 16:40:11 +0000 Subject: [PATCH 3/3] Added mandatory _3gpp-common-subscription-control.yang --- yang-models/_3gpp-common-subscription-control.yang | 1 + 1 file changed, 1 insertion(+) diff --git a/yang-models/_3gpp-common-subscription-control.yang b/yang-models/_3gpp-common-subscription-control.yang index eaa22229d..a6a1ab477 100755 --- a/yang-models/_3gpp-common-subscription-control.yang +++ b/yang-models/_3gpp-common-subscription-control.yang @@ -55,6 +55,7 @@ module _3gpp-common-subscription-control { enum BASE_NTH_LEVEL; enum BASE_SUBTREE; } + mandatory true; description "If the optional scopeLevel parameter is not supported or absent, allowed values of scopeType are BASE_ONLY and BASE_ALL. -- GitLab