Commit 2b189663 authored by lengyelb's avatar lengyelb
Browse files

Major update to managementdatacollection and correction of the datatype name supportedmetric

parent 68bd86dd
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ module _3gpp-common-ep-rp {

  grouping EP_Common {
    uses EP_RPGrp;
    uses meas3gpp:SupportedPerfMetricGroupsGrp;
    uses meas3gpp:SupportedPerfMetricGroupGrp;
    list localAddress {
      description "Local IP address and VLAN ID.";
      key "ipAddress vlanId";
+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ module _3gpp-common-managed-element {
      mandatory true;
    }      
    
    uses meas3gpp:SupportedPerfMetricGroupsGrp;
    uses meas3gpp:SupportedPerfMetricGroupGrp;

    leaf-list supportedTraceMetrics {
      type string;
+1 −1
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ module _3gpp-common-managed-function {
      type uint32;
    }

    uses meas3gpp:SupportedPerfMetricGroupsGrp;
    uses meas3gpp:SupportedPerfMetricGroupGrp;
    
    leaf-list supportedTraceMetrics {
      type string;
+124 −5
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ module _3gpp-common-managementdatacollection {

  import _3gpp-common-top { prefix top3gpp; }
  import _3gpp-common-yang-types {prefix types3gpp; }
  import _3gpp-common-yang-extensions {prefix yext3gpp; }
  //import ietf-inet-types { prefix inet; }
  import ietf-yang-types { prefix yang; }
  import _3gpp-common-subnetwork { prefix subnet3gpp; }
@@ -27,7 +28,13 @@ module _3gpp-common-managementdatacollection {
  revision 2022-11-04 { reference "CR-0194"; }


  grouping Tai {
  grouping TaiGrp { // (Maybe type: types3gpp:Tai,if we define Tai there.)
    description "This <<dataType>> defines a Tracking Area Identity (TAI) 
      as specified in clause 28.6 of TS 23.003, clause 8.2 of TS 38.300 
      and clause 9.3.3.11 of TS 38.413. It is composed of the PLMN 
      identifier (PLMN-Id, which is composed of the MCC and MNC) and 
      the Tracking Area Code (TAC). ";
      
    list plmnId {
      description "PLMN Identity.";
      min-elements 1;
@@ -39,6 +46,121 @@ module _3gpp-common-managementdatacollection {
    leaf tac { type types3gpp:Tac; }
  }
  
  grouping GeoCoordinateGrp {
    description "Geographical location on earth";
    
    leaf latitude {
      type decimal64 {
         fraction-digits 4;
         range -90..90 ;
      }
      mandatory true;
      description "Latitude based on World Geodetic System (1984 version) 
        global reference frame (WGS 84). Positive values correspond to the 
        northern hemisphere.";
    }
      
    leaf longitude {
      type decimal64 {
        fraction-digits 4;
        range -180..180 ;
      }
      mandatory true;
      description "Longitude based on World Geodetic System (1984 version) 
        global reference frame (WGS 84). Positive values correspond to 
        degrees east of 0 degrees longitude.";
    }
  }
  
  grouping GeoAreaGrp {
    description "This data type defines a geographical area. 
    The geo-area is defined using a convex polygon in the attribute 
    'convexGeoPolygon'.";
    
    list convexGeoPolygon {
      description "Specifies the geographical area with a convex polygon. 
        The convex polygon is specified by its corners.";
      key "latitude longitude";
      min-elements 3;
      ordered-by user;
      
      uses GeoCoordinateGrp;
    }
  }
  
  grouping GeoAreaToCellMappingGrp {
    description "Represents the GeoAreaToCellMapping data type. 
      
      The mapping of the geographical area to cells is performed at 
      instantiation of the IOC.";
    
    list geoArea {
      description "It specifies the geographical area using the cordinates of 
        the corners of a convex polygon.";
      key idx;
      max-elements 1;
      leaf idx {
        type string;
      }
      uses GeoAreaGrp;
    }
    
    leaf associationThreshold {
      type uint8 {
        range 1..100;
      }
      yext3gpp:inVariant;
      description "It specifies the threshold of coverage area in 
        percentage whether a cell belongs to the geographical area or not.

        If this attribute is absent, the location of the base station 
        antenna determines whether a cell belongs to the geographical 
        area or not.";
    }
  }

  grouping AreaOfInterestGrp {
    description "It specifies a location(s) from where the management data 
      shall be collected."; 
      
    list geoAreaToCellMapping {
      description "Contains a geographical area and an association threshold. 
        The geo-area is defined as a convex polygon using the attribute 
        'geoArea'.

        The MnS producer shall map the geographical area to cells. There are 
        two evaluation criteria whether a cell belongs to a geographical area 
        or not. If attribute 'associationThreshold' is absent, the location 
        of the base station antenna determines the belonging. If attribute 
        'associationThreshold' is configured, the coverage area is considered. 
        The attribute 'associationThreshold' determines the lower boundary of 
        the coverage ratio. For example, if the 'associationThreshold' is 
        configured to 60%, a cell shall be considered as included in the 
        geographical area if at least 60% of the coverage area of that 
        cell overlaps with the specified geographical area. 

        The mapping of the geographical area to cells is performed at 
        instantiation of the IOC.";
      key idx;
      leaf idx { type string; }
      uses GeoAreaToCellMappingGrp;
    }
        
    leaf-list nrCellIdList {
      type string;
      description "List of NR cells identified by NG-RAN CGI";
    }
    
    leaf-list eutraCellIdList {
      type string;
      description "List of E-UTRAN cells identified by E-UTRAN-CGI";
    }
    
    leaf-list utraCellIdList {
      type string;
      description "List of UTRAN cells identified by UTRAN CGI";
    }
  }

  grouping NodeFilterGrp {

@@ -47,9 +169,7 @@ module _3gpp-common-managementdatacollection {
      leaf idx {
        type string;
      }
      uses Tai;          // (Maybe type: types3gpp:Tai,if we define Tai there.)
      // mandatory false
      min-elements 1;
      uses AreaOfInterestGrp;          
      description "It specifies a location(s) from where the management data
        shall be collected. It is defined in terms of TAI(s).";
    }
@@ -78,7 +198,6 @@ module _3gpp-common-managementdatacollection {

    leaf sst {
      type uint8;  // TS 28.003 clause 28.4.
      //mandatory false;
      description "It specifies the slice service type (SST) of which the slice
        subnet should be targeted. Please refer to 3GPP TS 23.501: 'System
        Architecture for the 5G System'";
+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ module _3gpp-common-measurements {
    }
  }

  grouping SupportedPerfMetricGroupsGrp {
  grouping SupportedPerfMetricGroupGrp {
    list SupportedPerfMetricGroups {
      config false;
      description "Captures a group of supported performance metrics and
Loading