Commit eff655e3 authored by lengyelb's avatar lengyelb
Browse files

updated subsriptioncontrol

parent eb53a9e7

yang-models/_3gpp-common-fm.yang

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ module _3gpp-common-fm { 
  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";



  description "Defines a Fault Management model

    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 

    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 

    TTA, TTC). All rights reserved.";

  reference "3GPP TS 28.111";

yang-models/_3gpp-common-mecontext.yang

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ module _3gpp-common-mecontext { 
    Information Service (IS)";



  revision 2025-03-24 { reference "CR-0524"; } 

  revision 2025-03-24 { reference "CR-0517 CR-0382 CR-0516"; }

  revision 2025-03-24 { reference "CR-0517 CR-0516"; }

  revision 2024-07-17 { reference "CR-0381 CR-0382 CR-0383"; }



  grouping MeContextGrp {

yang-models/_3gpp-common-subscription-control.yang

+23 −6
Original line number Diff line number Diff line
@@ -5,12 +5,13 @@ module _3gpp-common-subscription-control { 
    

  import _3gpp-common-top { prefix top3gpp; }

  import _3gpp-common-yang-extensions { prefix yext3gpp; }

  import ietf-yang-types { prefix yang; }

  

  organization "3GPP SA5";

  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";

    

  description "Defines IOCs for subscription and heartbeat control.

    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 

    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 

    TTA, TTC). All rights reserved.";

  reference "3GPP TS 28.623

      Generic Network Resource Model (NRM)
@@ -18,6 +19,7 @@ module _3gpp-common-subscription-control { 
      Solution Set (SS) definitions

      3GPP TS 28.623";

  

  revision 2025-03-24 { reference CR-0517 ; } 

  revision 2024-05-18 { reference CR-0359 ; } 

  revision 2024-01-18 { reference "CR-0309 CR-0329" ; } 

  revision 2023-09-18 { reference CR-0271 ; }
@@ -84,11 +86,26 @@ module _3gpp-common-subscription-control { 
        }

      }

      case dataNodeSelector {

        leaf dataNodeSelector {

          type string;

        container dataNodeSelector {

          description "The value shall follow the rules of RFC 8641 

            filter-spec";

          reference "RFC 8641 section 5.";

          reference "RFC 8641 section 5. and ietf-yang-push.yang";

          choice dataNodeSelector {

            anydata datastore-subtree-filter {

              description "Subtree filter";

              reference 

                "RFC 6241: Network Configuration Protocol (NETCONF),  Section 6";

            }

            leaf datastore-xpath-filter {

              type yang:xpath1.0;

              description "XPath-filter";

              reference

                "XML Path Language (XPath) Version 1.0

                 (https://www.w3.org/TR/1999/REC-xpath-19991116)

                 RFC 7950: The YANG 1.1 Data Modeling Language,

                           Section 10";

            }

          }          

        }

      }

    }
@@ -114,7 +131,7 @@ module _3gpp-common-subscription-control { 
    list scope {

      description "Scopes (selects) data nodes in an object tree.";

      key idx;

      max-elements 8;

      max-elements 1;

      leaf idx { type string; }

      uses ScopeGrp;

    }