Commit e08ccafa authored by beaulac's avatar beaulac Committed by beaulac
Browse files

Corrected ThresholdMonitor 

Reverted ManagedNfProfile
Updated FileDownloadJob
parent ac761842

yang-models/_3gpp-common-filemanagement.yang

+4 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ module _3gpp-common-filemanagement { 
  import _3gpp-common-subnetwork { prefix subnet3gpp; }

  import _3gpp-common-top { prefix top3gpp; }

  import _3gpp-common-yang-types { prefix yang3gpp; }

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

  import _3gpp-common-managed-element { prefix me3gpp; }

   

  organization "3GPP SA5";
@@ -14,6 +15,7 @@ module _3gpp-common-filemanagement { 
    Class (IOC) that is part of the Generic Network Resource Model (NRM).";

  reference "3GPP TS 28.623 Generic Network Resource Model (NRM)";



  revision 2022-10-24 { reference CR-0196;  }

  revision 2022-02-10 { reference "Initial revision, S5-221757"; }



  grouping FileDownloadProcessMonitor {
@@ -50,11 +52,13 @@ module _3gpp-common-filemanagement { 
        allowedValues:  File URI (See RFC 8089)";

      mandatory true;

      type string;

      yext3gpp:notNotifyable;

    }

    

    leaf notificationRecipientAddress {

      description "Address of the notification recipient.";

      type string;

      yext3gpp:notNotifyable;

    }



    leaf cancelJob {

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-yang-types.yang

+0 −2
Original line number Diff line number Diff line
@@ -264,7 +264,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 {
@@ -272,7 +271,6 @@ module _3gpp-common-yang-types { 
      min-elements 1;

      type NfType;

      description "Type of the Network Function" ;

      yext3gpp:notNotifyable;

    }

    

    leaf hostAddr {