Commit d0f3c2dd authored by beaulac's avatar beaulac Committed by lengyelb
Browse files

Added HeartbeatControl.triggerHeartbeatNtf 

Reverted ManagedNfProfile
Corrected ThresholdMonitor
parent 4038d55e

yang-models/_3gpp-common-measurements.yang

+2 −2
Original line number Diff line number Diff line
@@ -267,14 +267,12 @@ module _3gpp-common-measurements { 


    leaf-list objectInstances {

      type types3gpp:DistinguishedName;

      yext3gpp:notNotifyable;

    }



    leaf-list rootObjectInstances {

      type types3gpp:DistinguishedName;

      description "Each object instance designates the root of a subtree that

      contains the root object and all descendant objects.";

      yext3gpp:notNotifyable;

    }



    choice reportingCtrl {
@@ -375,12 +373,14 @@ module _3gpp-common-measurements { 


     leaf-list objectInstances {

      type types3gpp:DistinguishedName;

      yext3gpp:notNotifyable;

    }



    leaf-list rootObjectInstances {

      type types3gpp:DistinguishedName;

      description "Each object instance designates the root of a subtree that

      contains the root object and all descendant objects.";

      yext3gpp:notNotifyable;

    }

  }

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

+15 −2
Original line number Diff line number Diff line
@@ -90,8 +90,7 @@ module _3gpp-common-subscription-control { 
  }

  

  grouping HeartbeatControlGrp {

   description "Attributes of HeartbeatControl. Note the triggerHeartbeatNtf

     attribute has no mapping in the present release.";

   description "Attributes of HeartbeatControl.";

    

    leaf heartbeatNtfPeriod {

      type uint32;
@@ -101,6 +100,20 @@ module _3gpp-common-subscription-control { 
        The value of zero has the special meaning of stopping the heartbeat 

        notification emission.";

    }

    

    leaf triggerHeartbeatNtf {

      type boolean;

      default false;

      description "Setting this attribute to 'true' triggers an immediate 

        additional heartbeat notification emission. Setting the value to 

        'false' has no observable result.



        The periodicity of notifyHeartbeat emission is not changed.

        

        After triggering the heartbeat the system SHALL set the value 

        back to false.";

      yext3gpp:notNotifyable;

    }

  }

  

  grouping SubscriptionControlSubtree {

yang-models/_3gpp-common-yang-types.yang

+0 −4
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ module _3gpp-common-yang-types { 
  

  import ietf-inet-types { prefix inet; }

  import ietf-yang-types { prefix yang; }

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



  organization "3GPP SA5";

  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
@@ -14,7 +13,6 @@ module _3gpp-common-yang-types { 
    network slicing.";

  reference "3GPP TS 28.623";



  revision 2022-11-03 { reference CR-0192;   }

  revision 2021-11-01 { reference "CR-0141"; }

  revision 2020-11-06 {

    description "Removed incorrect S-NSSAI definitions.";
@@ -63,7 +61,6 @@ module _3gpp-common-yang-types { 
        The format of the NF Instance ID shall be a 

        Universally Unique Identifier (UUID) version 4, 

        as described in IETF RFC 4122 " ;

      yext3gpp:notNotifyable;

    }

    

    leaf-list nfType {
@@ -71,7 +68,6 @@ module _3gpp-common-yang-types { 
      min-elements 1;

      type NfType;

      description "Type of the Network Function" ;

      yext3gpp:notNotifyable;

    }

    

    leaf hostAddr {