Commit 20e24d05 authored by lengyelb's avatar lengyelb
Browse files

Updated according to 28.623 g50 and 28.541 g60. Corrected...

Updated according to 28.623 g50 and 28.541 g60. Corrected _3gpp-common-managed-function.yang, _3gpp-5gc-nrm-dynamic5qiset.yang, _3gpp-5gc-nrm-GtpUPathQoSMonitoringControl.yang, _3gpp-5gc-nrm-predefinedpccruleset.yang for errors detected by pyang --strict
parent 9c740ca4
Loading
Loading
Loading
Loading
+58 −0
Original line number Diff line number Diff line
module _3gpp-5gc-nrm-FiveQiDscpMappingSet {
  yang-version 1.1;
  
  namespace urn:3gpp:sa5:_3gpp-5gc-nrm-FiveQiDscpMappingSet;
  prefix FiveQiDscpMapping3gpp;
  
  import _3gpp-common-top { prefix top3gpp; }
  import _3gpp-common-managed-element { prefix me3gpp; }
  import _3gpp-5gc-nrm-smffunction { prefix smf3gpp; }
  
  organization "3gpp SA5";
  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
  description " This IOC represents the set of mapping between 5QIs and DSCP.";
  reference "3GPP TS 28.541";

  revision 2020-08-03 { reference "CR-0321"; }
  revision 2020-05-27 { reference "CR-0287"; }

  grouping FiveQiDscpMapping {
    leaf-list fiveQIValues {
      type uint32 {
        range 0..255 ;
      }
      min-elements 1;
      description " Identifies the 5QI values that are mapped to a same DSCP, as specified in TS 28.541.";
     }
     
    leaf dscp {
      type uint32 {
        range 0..255 ;
      }
      mandatory true;
     }
  }

  grouping FiveQiDscpMappingSetGrp {
    description "Represents the FiveQiDscpMappingSet IOC.";
    list FiveQiDscpMappingList {
      key "dscp";
      uses FiveQiDscpMapping;
    }
  }    

  grouping FiveQiDscpMappingSetSubtree {
    list FiveQiDscpMappingSet {
      description "Specifies the mapping between 5QIs and DSCPs.";
      key id;
      uses top3gpp:Top_Grp;
      container attributes {
        uses FiveQiDscpMappingSetGrp;
      }
    }  
  }
  
  augment "/me3gpp:ManagedElement/smf3gpp:SMFFunction" {
    uses FiveQiDscpMappingSetSubtree;
  } 
}
 No newline at end of file
+136 −0
Original line number Diff line number Diff line
module _3gpp-5gc-nrm-GtpUPathQoSMonitoringControl {
  yang-version 1.1;
  
  namespace urn:3gpp:sa5:_3gpp-5gc-nrm-GtpUPathQoSMonitoringControl;
  prefix gtpUPathQMCtrl3gpp;
  
  import _3gpp-common-managed-element { prefix me3gpp; }
  import _3gpp-common-yang-types { prefix types3gpp; }
   import _3gpp-5gc-nrm-smffunction { prefix smf3gpp; }
  import _3gpp-common-top { prefix top3gpp; }
  
  organization "3gpp SA5";
  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
  description "This IOC represents the capabilities and properties for control 
    of GTP-U path QoS monitoring defined in 3GPP TS 23.501.";
  reference "3GPP TS 28.541";

  revision 2020-08-03 { reference "CR-0321"; }
  revision 2020-04-10 { reference "S5-202103"; }

  grouping GtpUPathDelayThresholdsType {
    leaf n3AveragePacketDelayThreshold {
      mandatory true;
      type uint32;
    }
    leaf n3MinPacketDelayThreshold {
      mandatory true;
      type uint32;
     }
    leaf n3MaxPacketDelayThreshold {
      mandatory true;
      type uint32;
     }
    leaf n9AveragePacketDelayThreshold {
      mandatory true;
      type uint32;
    }
    leaf n9MinPacketDelayThreshold {
      mandatory true;
      type uint32;
     }
    leaf n9MaxPacketDelayThreshold {
      mandatory true;
      type uint32;
    }
  }

  grouping GtpUPathQoSMonitoringControlGrp {
    description "Represents the GtpUPathQoSMonitoringControl IOC.";

    leaf gtpUPathQoSMonitoringState {
      description "The state of GTP-U path QoS monitoring.";
      mandatory true;
      type enumeration {
        enum ENABLED;
        enum DISABLED;
      }
     }
     
    leaf-list gtpUPathMonitoredSNSSAIs {
      description "The S-NSSAIs for which the the GTP-U path QoS monitoring is 
        to be performed.";
      reference "3GPP TS 23.003";
      type types3gpp:SNssai;
     }
     
    leaf-list monitoredDSCPs {
      description "The DSCPs for which the GTP-U path QoS monitoring is to be
        performed.";
      reference "3GPP TS 29.244";
      type uint32;
     }
     
    leaf isEventTriggeredGtpUPathMonitoringSupported {
      description "It indicates whether the event triggered GTP-U path QoS
        monitoring reporting based on thresholds is supported.";
      mandatory true;
      reference "3GPP TS 29.244";
      type boolean;
     }
     
    leaf isPeriodicGtpUMonitoringSupported {
      description "It indicates whether the periodic GTP-U path QoS monitoring 
        reporting is supported.";
      mandatory true;
      reference "3GPP TS 29.244";
      type boolean;
     }
     
    leaf isImmediateGtpUMonitoringSupported {
      description "It indicates whether the immediate GTP-U path QoS monitoring 
        reporting is supported.";
      mandatory true;
      reference "3GPP TS 29.244";
      type boolean;
     }
     
    list gtpUPathDelayThresholds {
      key n3AveragePacketDelayThreshold;  
      // if max-elements is increased later, the key may need to be modified
      min-elements 1;
      max-elements 1;
      description "It specifies the thresholds for reporting the packet delay 
        for the GTO-U path QoS monitoring.";
      uses GtpUPathDelayThresholdsType;
     }
     
    leaf gtpUPathMinimumWaitTime {
      description "It specifies the minimum waiting time (in seconds) between 
        two consecutive reports for event triggered GTP-U path QoS monitoring 
        reporting.";
      type uint32;
     }
     
    leaf gtpUPathMeasurementPeriod {
      description "It specifies the period (in seconds) for reporting the packet 
        delay for GTP-U path QoS monitoring.";
      type uint32;
    }	
  }    

  augment "/me3gpp:ManagedElement/smf3gpp:SMFFunction" {

    list GtpUPathQoSMonitoringControl {
      description "Specifies the capabilities and properties for control of 
        GTP-U path QoS monitoring. For more information about the GTP-U path 
        QoS monitoring.";
      reference "3GPP TS 23.501";
      key id;
      uses top3gpp:Top_Grp;
      container attributes {
        uses GtpUPathQoSMonitoringControlGrp;
      }
    }
  }
}
 No newline at end of file
+130 −0
Original line number Diff line number Diff line
module _3gpp-5gc-nrm-QFQoSMonitoringControl {
  yang-version 1.1;
  
  namespace urn:3gpp:sa5:_3gpp-5gc-nrm-QFQoSMonitoringControl;
  prefix qFQMCtrl3gpp;
  
  import _3gpp-common-managed-element { prefix me3gpp; }
  import _3gpp-common-yang-types { prefix types3gpp; }
  import _3gpp-5gc-nrm-smffunction { prefix smf3gpp; }
  import _3gpp-common-top { prefix top3gpp; }
  
  organization "3gpp SA5";  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
  description "This IOC represents the capabilities and properties for control 
  	of QoS monitoring per QoS flow per UE for URLLC service defined 
  	in 3GPP TS 23.501.";
  reference "3GPP TS 28.541";

  revision 2020-08-03 { reference "CR-0321"; }
  revision 2020-04-10 { reference "S5-202101";   }

  grouping QFPacketDelayThresholdsTypeGrp {
    leaf thresholdDl {
      type uint32;
      units milliseconds;
      description "Downlink threshold";
    }

    leaf thresholdUl {
      type uint32;
      units milliseconds;
      description "Uplink threshold";
     }

    leaf thresholdRtt {
      type uint32;
      units milliseconds;
      description "Round trip threshold";
    }
  }

  grouping QFQoSMonitoringControlGrp {
    description "Represents the QFQoSMonitoringControl IOC.";
    reference "3GPP TS 28.541";

    leaf qFQoSMonitoringState {
      description "The state of QoS monitoring per QoS flow per UE.";
      mandatory true;
      type enumeration {
        enum ENABLED;
        enum DISABLED;
      }
     }
     
    leaf-list qFMonitoredSNSSAIs {
      description "The S-NSSAIs for which the QoS monitoring per QoS flow
       per UE is to be performed.";
      reference "3GPP TS 23.003";
      type types3gpp:SNssai;
     }
     
    leaf-list qFMonitored5QIs {
      description "The 5QIs for which the QoS monitoring per QoS flow 
       per UE is to be performed.";
      reference "3GPP TS 23.501";
      type uint32 {
        range "0..255";
      }
     }
     
    leaf isEventTriggeredQFMonitoringSupported {
      description "It indicates whether the event based QoS monitoring 
       reporting per QoS flow per UE is supported.";
      mandatory true;
      reference "3GPP TS 29.244";
      type boolean;
     }
     
    leaf isPeriodicQFMonitoringSupported {
      description "It indicates whether the periodic QoS monitoring reporting 
       per QoS flow per UE is supported.";
      mandatory true;
      reference "3GPP TS 29.244";
      type boolean;
     }
     
    leaf isSessionReleasedQFMonitoringSupported {
      description "It indicates whether the session release based QoS monitoring 
       reporting  per QoS flow per UE is supported.";
      mandatory true;
      reference "3GPP TS 29.244";
      type boolean;
     }

    list qFPacketDelayThresholds {
      key "idx";
      min-elements 1;
      max-elements 1;
      description "It specifies the thresholds for reporting the packet delay 
        between PSA and UE for QoS monitoring per QoS flow per UE.";

      leaf idx { type uint32 ; }
      uses QFPacketDelayThresholdsTypeGrp;
    }

    leaf qFMinimumWaitTime {
      description "It specifies the minimum waiting time (in seconds) between
       two consecutive reports for event triggered QoS monitoring reporting 
       per QoS flow per UE.";
      type uint32;
     }
     
    leaf qFMeasurementPeriod {
      description "It specifies the period (in seconds) for reporting the packet delay for QoS monitoring per QoS flow per UE.";
      type uint32;
    }	
  }    

  augment "/me3gpp:ManagedElement/smf3gpp:SMFFunction" {

    list QFQoSMonitoringControl {
      description "Represents the QFQoSMonitoringControl IOC.";
      reference "3GPP TS 28.541";
      key id;
      uses top3gpp:Top_Grp;
      container attributes {
        uses QFQoSMonitoringControlGrp;
      }
    }
  }
}
 No newline at end of file
+125 −0
Original line number Diff line number Diff line
module _3gpp-5gc-nrm-configurable5qiset {
  yang-version 1.1;
  
  namespace urn:3gpp:sa5:_3gpp-5gc-nrm-configurable5qiset;
  prefix Conf5QIs3gpp;
  
  import _3gpp-common-top { prefix top3gpp; }
  import _3gpp-common-managed-element { prefix me3gpp; }
  import _3gpp-common-subnetwork { prefix subnet3gpp; }
  
  organization "3gpp SA5";
  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
  description "This IOC represents the non-standardized 5QIs, including 
    their QoS characteristics, that need to be pre-configured 
    (and configurable) to the 5G NFs.";
  reference "3GPP TS 28.541";

  revision 2020-08-03 { reference "CR-0321"; }
  revision 2020-06-03 { reference "CR-0286"; }

  grouping PacketErrorRate {
    leaf scalar {
      type uint32 {
        range 0..9 ;
      }
      mandatory true;
      description "The Packet Error Rate of a 5QI expressed as Scalar x 10-k 
        where k is the Exponent.";
    }
    leaf exponent {
      type uint32 {
        range 0..9 ;
      }
      mandatory true;
      description "The Packet Error Rate of a 5QI expressed as Scalar x 10-k, 
        where k is the Exponent.";
    }
  }

  grouping FiveQICharacteristics {
    leaf fiveQIValue {
      type uint32 {
        range 0..255 ;
      }
      mandatory true;
      description "Identifies the 5QI value.";
    }

    leaf resourceType {
      type enumeration {
        enum GBR;
        enum NON_GBR;
      }
      mandatory true;
      description "It indicates the Resource Type of a 5QI, as specified 
        in TS 23.501 ";
    }
    
    leaf priorityLevel {
      type uint32 {
        range 0..127 ;
      }
    }
    
    leaf packetDelayBudget {
      type uint32 {
        range 0..1023 ;
      }
      description "Indicates the Packet Delay Budget (in unit of 0.5ms)of a 5QI, 
        as specified in TS 23.501 ";
    }
    
    list packetErrorRate {
      key "scalar exponent";
      min-elements 0;
      max-elements 1;
      uses PacketErrorRate;
      reference "TS 23.501";
    }

    leaf averagingWindow {
      type uint32 {
        range 0..4095 ;
      }
      units ms;
      reference "TS 23.501";
    }
    
    leaf maximumDataBurstVolume {
      type uint32{
        range 0..4095 ;
      }
      units byte;
    }
  }

  grouping Configurable5QISetGrp {
    description "Represents the Configurable5QISet IOC.";
    list configurable5QIs {
      key "fiveQIValue";
      uses FiveQICharacteristics;
    }
  }    

  grouping Configurable5QISetSubtree {
    list Configurable5QISet {
      description "Specifies the non-standardized 5QIs, including their QoS 
        characteristics, that need to be pre-configured (and configurable) to 
        the 5G NFs, see 3GPP TS 23.501.";
      key id;
      uses top3gpp:Top_Grp;
      container attributes {
        uses Configurable5QISetGrp;
      }
    }  
  }
  
  augment "/subnet3gpp:SubNetwork" {
    uses Configurable5QISetSubtree;
  }

  augment "/me3gpp:ManagedElement" {
    uses Configurable5QISetSubtree;
  }
}
 No newline at end of file
+46 −0
Original line number Diff line number Diff line
module _3gpp-5gc-nrm-dynamic5qiset {
  yang-version 1.1;
  
  namespace urn:3gpp:sa5:_3gpp-5gc-nrm-dynamic5qiset;
  prefix dyn5QIs3gpp;
  
  import _3gpp-common-top { prefix top3gpp; }
  import _3gpp-common-subnetwork { prefix subnet3gpp; }
  import _3gpp-common-managed-element { prefix me3gpp; }
  import _3gpp-5gc-nrm-configurable5qiset { prefix Conf5QIs3gpp; }
  
  organization "3gpp SA5";
  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
  description "This IOC represents the dynamic 5QIs including their QoS characteristics.";
  reference "3GPP TS 28.541";

  revision 2020-08-06 { reference "CR-0333"; }

  grouping Dynamic5QISetGrp {
    description "Represents the Dynamic5QISet IOC.";
    list dynamic5QIs {
      key "fiveQIValue";
      uses Conf5QIs3gpp:FiveQICharacteristics;
    }
  }    

  grouping Dynamic5QISetSubtree {
    list Dynamic5QISet {
      description "Specifies the dynamic 5QIs including their QoS 
        characteristics, see 3GPP TS 23.501.";
      key "id";
      uses top3gpp:Top_Grp;
      container attributes {
        uses Dynamic5QISetGrp;
      }
    }  
  }
  
  augment "/subnet3gpp:SubNetwork" {
    uses Dynamic5QISetSubtree;
  }

  augment "/me3gpp:ManagedElement" {
    uses Dynamic5QISetSubtree;
  }
}
 No newline at end of file
Loading