Commit 9c96d3e8 authored by lengyelb's avatar lengyelb
Browse files

Commit represents the manual merge of... 

Commit represents the manual merge of sa5/MnS!445 28.623 rel18 cr0218 add missing attribute properties to yang due to merge conflicts and rebase failure
parent 31957f4f

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

+34 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ module _3gpp-common-fm { 
  import ietf-yang-types { prefix yang; }

  import _3gpp-common-top { prefix top3gpp; }

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

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



  organization "3GPP SA5";

  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
@@ -22,6 +23,7 @@ module _3gpp-common-fm { 
      Integration Reference Point (IRP);

      Information Service (IS)";



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

  revision 2021-08-08 { reference "CR-0132"; }

  revision 2021-06-02 { reference "CR-0130"; }

  revision 2020-06-03 { reference "CR-0091"; }
@@ -107,58 +109,68 @@ module _3gpp-common-fm { 
        type string;

        mandatory true;

        description "Identifies the alarmRecord";

        yext3gpp:notNotifyable;

      }



      leaf objectInstance {

        type string;

        config false ;

        mandatory true;

        yext3gpp:notNotifyable;

      }



      leaf notificationId {

        type int32;

        config false ;

        mandatory true;

        yext3gpp:notNotifyable;

      }



      leaf alarmRaisedTime {

        type yang:date-and-time ;

        config false ;

        yext3gpp:notNotifyable;

      }



      leaf alarmChangedTime {

        type yang:date-and-time ;

        config false ;

        description "not applicable if related alarm has not changed";

        yext3gpp:notNotifyable;

      }



      leaf alarmClearedTime {

        type yang:date-and-time ;

        config false ;

        description "not applicable if related alarm was not cleared";

        yext3gpp:notNotifyable;

      }



      leaf alarmType {

        type eventType;

        config false ;

        description "General category for the alarm.";

        yext3gpp:notNotifyable;

      }



      leaf probableCause {

        type string;

        config false ;

        yext3gpp:notNotifyable;

      }



      leaf specificProblem {

        type string;

        config false ;

        reference "ITU-T Recommendation X.733 clause 8.1.2.2.";

        yext3gpp:notNotifyable;

      }



      leaf perceivedSeverity {

        type severity-level;

        description "This is Writable only if producer supports consumer

          to set perceivedSeverity to CLEARED";

        yext3gpp:notNotifyable;

      }



      leaf backedUpStatus {
@@ -166,11 +178,13 @@ module _3gpp-common-fm { 
        config false ;

        description "Indicates if an object (the MonitoredEntity) has a back

          up. See definition in ITU-T Recommendation X.733 clause 8.1.2.4.";

        yext3gpp:notNotifyable;

      }



      leaf backUpObject {

        type string;

        config false ;

        yext3gpp:notNotifyable;

      }



      leaf trendIndication {
@@ -179,6 +193,7 @@ module _3gpp-common-fm { 
        description "Indicates if some observed condition is getting better,

          worse, or not changing. ";

        reference "ITU-T Recommendation X.733 clause 8.1.2.6.";

        yext3gpp:notNotifyable;

      }



      grouping ThresholdPackGrp {
@@ -226,6 +241,7 @@ module _3gpp-common-fm { 


      list thresholdInfo {

        config false ;

        yext3gpp:notNotifyable;

        uses ThresholdInfoGrp;

      }
@@ -234,6 +250,7 @@ module _3gpp-common-fm { 
        config false ;

        description "Indicates MO attribute value changes. See definition

          in ITU-T Recommendation X.733 clause 8.1.2.11.";

        yext3gpp:notNotifyable;

      }



      leaf monitoredAttributes {
@@ -242,6 +259,7 @@ module _3gpp-common-fm { 
        description "Indicates MO attributes whose value changes are being

          monitored.";

        reference "ITU-T Recommendation X.733 clause 8.1.2.11.";

        yext3gpp:notNotifyable;

      }



      leaf proposedRepairActions {
@@ -249,15 +267,18 @@ module _3gpp-common-fm { 
        config false ;

        description "Indicates proposed repair actions. See definition in

          ITU-T Recommendation X.733 clause 8.1.2.12.";

        yext3gpp:notNotifyable;

      }



      leaf additionalText {

        type string;

        config false ;

        yext3gpp:notNotifyable;

      }



      anydata additionalInformation {

        config false ;

        yext3gpp:notNotifyable;

      }



      leaf rootCauseIndicator {
@@ -269,6 +290,7 @@ module _3gpp-common-fm { 
        description "It indicates that this AlarmInformation is the root cause

          of the events captured by the notifications whose identifiers are in

          the related CorrelatedNotification instances.";

        yext3gpp:notNotifyable;

      }



      leaf ackTime  {
@@ -277,12 +299,14 @@ module _3gpp-common-fm { 
        description "It identifies the time when the alarm has been

          acknowledged or unacknowledged the last time, i.e. it registers the

          time when ackState changes.";

        yext3gpp:notNotifyable;

      }



      leaf ackUserId  {

        type string;

        description "It identifies the last user who has changed the

          Acknowledgement State.";

        yext3gpp:notNotifyable;

      }



      leaf ackSystemId  {
@@ -290,6 +314,7 @@ module _3gpp-common-fm { 
        description "It identifies the system (Management System) that last

          changed the ackState of an alarm, i.e. acknowledged or unacknowledged

          the alarm.";

        yext3gpp:notNotifyable;

      }



      leaf ackState  {
@@ -302,16 +327,19 @@ module _3gpp-common-fm { 
              been acknowledged.";

          }

        }

        yext3gpp:notNotifyable;

      }



      leaf clearUserId {

        type string;

        description "Carries the identity of the user who invokes the

          clearAlarms operation.";

        yext3gpp:notNotifyable;

      }



      leaf clearSystemId {

        type string;

        yext3gpp:notNotifyable;

      }



      leaf serviceUser {
@@ -320,6 +348,7 @@ module _3gpp-common-fm { 
        description "It identifies the service-user whose request for service

          provided by the serviceProvider led to the generation of the

          security alarm.";

        yext3gpp:notNotifyable;

      }



      leaf serviceProvider {
@@ -328,11 +357,13 @@ module _3gpp-common-fm { 
        description "It identifies the service-provider whose service is

          requested by the serviceUser and the service request provokes the

          generation of the security alarm.";

        yext3gpp:notNotifyable;

      }



      leaf securityAlarmDetector {

        type string;

        config false ;

        yext3gpp:notNotifyable;

      }

  }
@@ -361,17 +392,20 @@ module _3gpp-common-fm { 
      config false;

      mandatory true;

      description "The number of alarm records in the AlarmList";

      yext3gpp:notNotifyable;

    }



    leaf lastModification {

      type yang:date-and-time ;

      config false;

      description "The last time when an alarm record was modified";

      yext3gpp:notNotifyable;

    }



    list alarmRecords {

      key alarmId;

      description "List of alarmRecords";

      yext3gpp:notNotifyable;

      uses AlarmRecordGrp;

    }

  }

yang-models/_3gpp-common-managed-function.yang

+4 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ module _3gpp-common-managed-function { 
  prefix mf3gpp;



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

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

  import _3gpp-common-top { prefix top3gpp; }

  import _3gpp-common-measurements { prefix meas3gpp; }

  import _3gpp-common-trace { prefix trace3gpp; }
@@ -22,6 +23,7 @@ module _3gpp-common-managed-function { 
    3GPP TS 28.620 

    Umbrella Information Model (UIM)";

  revision 2022-11-02 { reference "CR-0753"; }

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

  revision 2022-01-07 { reference "CR-0146"; }

  revision 2021-01-25 { reference "CR-0122"; }  

  revision 2020-09-30 { reference "CR-bbbb"; }
@@ -53,6 +55,7 @@ module _3gpp-common-managed-function { 
    leaf name {

      type string;

      mandatory true;

      yext3gpp:notNotifyable;

    }

    

    leaf-list allowedNFTypes {
@@ -90,6 +93,7 @@ module _3gpp-common-managed-function { 
      type string; 

      description "The type of the managed NF service instance

        The specifc values allowed are described in clause 7.2 of TS 23.501";

      yext3gpp:notNotifyable;

    }

 

    list sAP {

yang-models/_3gpp-common-measurements.yang

+5 −1
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ module _3gpp-common-measurements { 


  import _3gpp-common-top { prefix top3gpp; }

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

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

  

  organization "3GPP SA5";

  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
@@ -53,6 +54,7 @@ module _3gpp-common-measurements { 
      Integration Reference Point (IRP);

      Information Service (IS)";



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

  revision 2021-07-22 { reference "CR-0137"; }

  revision 2020-11-06 { reference "CR-0118"; }

  revision 2020-09-04 { reference "CR-000107"; }
@@ -371,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

+17 −2
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ module _3gpp-common-subscription-control { 
  prefix "subscr3gpp";

    

  import _3gpp-common-top { prefix top3gpp; }

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



  organization "3GPP SA5";

  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
@@ -15,6 +16,7 @@ module _3gpp-common-subscription-control { 
      Solution Set (SS) definitions

      3GPP TS 28.623";

  

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

  revision 2021-01-16 { reference "CR-0120"; }  

  revision 2020-08-26 { reference "CR-0106"; }

  revision 2019-11-29 { reference "S5-197648 S5-197647 S5-197829 S5-197828"; }
@@ -90,8 +92,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 +102,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 {