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

Local merge of branch 28.623_Rel17_CR0180_YANG_Corrections merge request...

Local merge of branch 28.623_Rel17_CR0180_YANG_Corrections  merge request sa5/MnS!362
parent f1f10d8b
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -59,9 +59,9 @@ module _3gpp-common-filemanagement {

    leaf cancelJob {
      description "Setting this attribute to TRUE cancels the file download job.
         As specified in the definition of ProcessMonitor, cancellation is possible in
         the NOT_STARTED and RUNNING state. Setting the attribute to FALSE has no 
         observable result.";
         As specified in the definition of ProcessMonitor, cancellation is 
         possible in the NOT_STARTED and RUNNING state. Setting the attribute  
         to FALSE has no observable result.";
      type boolean;
      mandatory true;
    }
+30 −11
Original line number Diff line number Diff line
@@ -17,9 +17,8 @@ module _3gpp-common-mnsregistry {
  revision 2021-10-18 { reference "S5-215263"; }
  revision 2021-08-29 { reference "Initial revision, S5-214388"; }
  
  grouping MNSInfoGrp {
    description "Represents the MNSInfo IOC.";
    reference "3GPP TS 28.622";
  grouping MnsInfoGrp {
    description "Represents the MnsInfo IOC.";
    leaf mnsLabel {
      description "Human-readable name of management service.";
      mandatory true;
@@ -48,26 +47,46 @@ module _3gpp-common-mnsregistry {
    }    
    
    leaf-list mnsScope {
      description "List of the managed object instances that can be accessed using the MnS. If a complete SubNetwork can be accessed using the MnS, this attribute may contain the DN of the SubNetwork instead of the DNs of the individual managed entities within the SubNetwork.";
      description "List of the managed object instances that can be accessed
        using the MnS. If a complete SubNetwork can be accessed using the MnS,
        this attribute may contain the DN of the SubNetwork instead of the
        DNs of the individual managed entities within the SubNetwork.";
      min-elements 1;
      type types3gpp:DistinguishedName;
    }
    
  }
  
  augment "/subnet3gpp:SubNetwork" {
    list MNSRegistry {
      description "Represents the MNSRegistry IOC.";
      reference "3GPP TS 28.622";
      description "Represents the MNSRegistry IOC.
        The IOC is instantiated by the system.";
      uses top3gpp:Top_Grp;
      key id;
      max-elements 1;

      list MNSInfo {
        description "Represents the MNSInfo IOC.";
        reference "3GPP TS 28.622";
        description "This IOC represents an available Management Service (MnS)
          and provides the data required to support its discovery.
          It is name-contained by MnsRegistry.

          This information is used by the consumer to discover the producers
          of specific Management Services and to derive the addresses of the
          Management Service.

          Attributes mnsLabel, mnsType, and mnsVersion are used to describe
          the Management Service.

          Attribute mnsAddress is used to provide addressing information for
          the Management Service operations.

          Attribute mnsScope is used to provide information about the
          management scope of the Management Service. The management scope is
          defined as the set of managed object instances that can be accessed
          using the Management Service.";

        uses top3gpp:Top_Grp;
        key "mnsType mnsVersion mnsAddress";
        uses MNSInfoGrp;
        uses MnsInfoGrp;
    }
  }
}	
+15 −8
Original line number Diff line number Diff line
@@ -541,7 +541,8 @@ module _3gpp-common-trace {
    }

    leaf tjTriggeringEvent {
      when '../tjJobType = "TRACE_ONLY" or ../tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
      when '../tjJobType = "TRACE_ONLY" or ' +
        '../tjJobType = "IMMEDIATE_MDT_AND_TRACE"';
      type string ;
      mandatory true;
      description "Specifies the triggering event parameter of the trace session.
@@ -750,7 +751,8 @@ module _3gpp-common-trace {
    }

    leaf tjMDTLoggingDuration {
      when '../tjJobType = "LOGGED_MDT_ONLY" or ../tjJobType = "LOGGED_MBSFN_MDT"';
      when '../tjJobType = "LOGGED_MDT_ONLY" or' 
        + ' ../tjJobType = "LOGGED_MBSFN_MDT"';
      type uint32 {
        range "600|1200|2400|3600|5400|7200";
      }
@@ -764,7 +766,8 @@ module _3gpp-common-trace {
    }

    leaf tjMDTLoggingInterval {
      when '../tjJobType = "LOGGED_MDT_ONLY" or ../tjJobType = "LOGGED_MBSFN_MDT"';
      when '../tjJobType = "LOGGED_MDT_ONLY" or' 
        + ' ../tjJobType = "LOGGED_MBSFN_MDT"';
      type uint32 {
        range "1280|2560|5120|10240|20480|"
          +"30720|40960|61440";
@@ -778,7 +781,8 @@ module _3gpp-common-trace {
    }

    leaf tjMDTLoggingEventThreshold {
      when '../tjJobType = "LOGGED_MDT_ONLY" or ../tjJobType = "LOGGED_MBSFN_MDT"';
      when '../tjJobType = "LOGGED_MDT_ONLY" or' 
        + ' ../tjJobType = "LOGGED_MBSFN_MDT"';
      type uint32 {
        range "0..127";
      }
@@ -792,7 +796,8 @@ module _3gpp-common-trace {
    }
    
    leaf tjMDTLoggedHysteresis {
      when '../tjJobType = "LOGGED_MDT_ONLY" or ../tjJobType = "LOGGED_MBSFN_MDT"';
      when '../tjJobType = "LOGGED_MDT_ONLY" or '
         + '../tjJobType = "LOGGED_MBSFN_MDT"';
      type uint32 {
        range "0..30";
      }
@@ -806,7 +811,8 @@ module _3gpp-common-trace {
    }
    
    leaf tjMDTLoggedTimeToTrigger {
      when '../tjJobType = "LOGGED_MDT_ONLY" or ../tjJobType = "LOGGED_MBSFN_MDT"';
      when '../tjJobType = "LOGGED_MDT_ONLY" or '
          + '../tjJobType = "LOGGED_MBSFN_MDT"';
      type int32 ;
      description "It specifies the threshold which should trigger 
        the reporting in case of event based reporting of logged NR MDT. 
@@ -992,7 +998,8 @@ module _3gpp-common-trace {
    }

    leaf tjMDTTraceCollectionEntityID {
      when '../tjJobType = "LOGGED_MDT_ONLY" or ../tjJobType = "LOGGED_MBSFN_MDT"';
      when '../tjJobType = "LOGGED_MDT_ONLY" or ' 
        + '../tjJobType = "LOGGED_MBSFN_MDT"';
      type uint8;
      mandatory true;
      description "It specifies the TCE Id which is sent to the UE in 
+22 −2
Original line number Diff line number Diff line
@@ -13,8 +13,10 @@ module _3gpp-common-yang-types {
    network slicing.";
  reference "3GPP TS 28.623";

  revision 2022-07-26 { reference CR-0180 ; }
  revision 2022-02-09 { reference "CR-0144"; }
  revision 2021-11-01 { reference "CR-0141"; }
  
  revision 2021-09-30 {
    description "Added Longitude, Latitude, TenthOfDegrees, OnOff.";
    reference "CR-0138";
@@ -68,7 +70,7 @@ module _3gpp-common-yang-types {

      The progress of the process is described by the 'status' and 
      'progressPercentage' attributes. Additional textual qualifications for 
      the 'status' attribute may be provided by the 'progessStateInfo' and 
      the 'status' attribute may be provided by the 'progressStateInfo' and 
      'resultStateInfo' attributes.

      When the process is instantiated, the 'status' is set to 'NOT_RUNNING' 
@@ -80,7 +82,7 @@ module _3gpp-common-yang-types {

      During the 'RUNNING' state the 'progressPercentage' attribute may be 
      repeatedly updated. The exact semantic of this attribute is subject to 
      further specialisation. The 'progessInfo' attribute may be used to 
      further specialisation. The 'progressInfo' attribute may be used to 
      provide additional textual information in the 'NOT_RUNNING', 'CANCELLING' 
      and 'RUNNING' states. Further specialisation of 
      'progressStateInfo' may be provided where this data type is 
@@ -428,6 +430,24 @@ module _3gpp-common-yang-types {
    }
  }
  
  typedef BasicAdministrativeState {
    reference "3GPP TS 28.625 and ITU-T X.731";
    type enumeration {
      enum LOCKED {
        value 0;
        description "The resource is administratively prohibited from performing
                 services for its users.";
      }

      enum UNLOCKED {
        value 1;
        description "The resource is administratively permitted to perform
          services for its users. This is independent of its inherent
          operability.";
      }
    }
  }
  
  typedef AdministrativeState {
    reference "3GPP TS 28.625 and ITU-T X.731";
    type enumeration {
+1 −1

File changed.

Contains only whitespace changes.