Commit 4eb51a0d authored by rosabolzek's avatar rosabolzek Committed by lengyelb
Browse files

Updated YANG models for compliance and corrections

parent f6e4592c
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ module _3gpp-5gc-nrm-FiveQiDscpMappingSet {
  grouping FiveQiDscpMappingSetGrp {
    description "Represents the FiveQiDscpMappingSet IOC.";
    list fiveQiDscpMappingList {
      description "It provides the list of mapping between 5QIs and DSCP.";
      key "dscp";
      uses FiveQiDscpMapping;
    }
+27 −21
Original line number Diff line number Diff line
@@ -127,31 +127,34 @@ module _3gpp-5gc-nrm-nfservice {
    }
    
    leaf-list allowedNfDomains {
      description "Pattern representing the NF domain names allowed to access the service instance.";
      description "Pattern representing the NF domain names allowed to
      access the service instance.";
      //optional support
      min-elements 1;
      type string;
    }
    
    list allowedNSSAI {
      description "S-NSSAI of the allowed slices to access the service instance.
        The absence of this attribute indicates that any slice is allowed to 
        access the service instance.";
      description "S-NSSAI of the allowed slices to access the service
      instance. The absence of this attribute indicates that any slice
      is allowed to access the service instance.";
      min-elements 1;
      //optional support
      key "sd sst";
      uses types5g3gpp:SNssai;
    }
    leaf-list allowedOperationsPerNfType {
      description "It indicates the allowed operations on resources for each type
       of NF; the key of the map is the NF Type, and the value is an array of scopes";
      description "It indicates the allowed operations on resources for
      each type of NF; the key of the map is the NF Type, and the value
      is an array of scopes";
      //optional support
      type string;
      min-elements 1;
    }    
    leaf-list allowedOperationsPerNfInstance {
      description "It indicates the allowed operations on resources for a given NF 
      Instance; the key of the map is the NF Instance Id, and the value is an array of scopes";
      description "It indicates the allowed operations on resources for
      a given NF Instance; the key of the map is the NF Instance Id, and
      the value is an array of scopes";
      //optional support
      type string;
      min-elements 1;
@@ -159,26 +162,28 @@ module _3gpp-5gc-nrm-nfservice {
    leaf allowedOperationsPerNfInstanceOverrides {
      type boolean;
      default false;
      description "When it is present and set to true, indicates that the scopes defined in 
      attribute allowedOperationsPerNfInstance for a given NF Instance ID take precedence over 
      the scopes defined in attribute allowedOperationsPerNfType for the corresponding NF type
      of the NF Instance associated to such NF Instance ID..";
      description "When it is present and set to true, indicates that
      the scopes defined in attribute allowedOperationsPerNfInstance 
      for a given NF Instance ID take precedence over the scopes defined
      in attribute allowedOperationsPerNfType for the corresponding 
      NF type of the NF Instance associated to such NF Instance ID..";
    } 

    leaf-list oauth2Required {
      type boolean;
      max-elements 1;
      description "It indicates whether the NF Service Instance requires Oauth2-based authorization";
      description "It indicates whether the NF Service Instance requires 
      Oauth2-based authorization";
    } 

    leaf-list sharedServiceDataId {
      type string;
      max-elements 1;
      description "String uniquely identifying SharedServiceData. The format of the 
      sharedServiceDataId shall be a Universally Unique Identifier (UUID) version 4,
      as described in IETF RFC 4122 [44]. The hexadecimal letters should be formatted
      as lower-case characters by the sender, and they shall be handled as case-insensitive
      by the receiver.";
      description "String uniquely identifying SharedServiceData. The format
      of the sharedServiceDataId shall be a Universally Unique Identifier 
      (UUID) version 4, as described in IETF RFC 4122 [44]. The hexadecimal
      letters should be formatted as lower-case characters by the sender,
      and they shall be handled as case-insensitive by the receiver.";
    } 

    leaf priority {
@@ -342,12 +347,13 @@ module _3gpp-5gc-nrm-nfservice {
      type string;
    }
     leaf mNC {
      description "This is the Mobile Network Code (MNC) of the PLMN identifier.
       See TS 23.003 [13] subclause 2.2 and 12.1.";
      description "This is the Mobile Network Code (MNC) of the PLMN 
      identifier. See TS 23.003 [13] subclause 2.2 and 12.1.";
      type string;
    }
    leaf nId {
      description "Network Identity; Shall be present if PlmnIdNid identifies an SNPN";
      description "Network Identity; Shall be present if PlmnIdNid 
      identifies an SNPN";
      type string;
    }       
  }
+30 −23
Original line number Diff line number Diff line
@@ -731,9 +731,9 @@ module _3gpp-common-yang-types {
  grouping GeoAreaGrp {
    description "This data type defines a geographical area. 
      The geo-area is defined using a convex polygon in the attribute 
      'convexGeoPolygon'.";
      'geoPolygon'.";
    
    list convexGeoPolygon {
    list geoPolygon {
      description "Specifies the geographical area with a convex polygon. 
        The convex polygon is specified by its corners.";
        key "latitude longitude";
@@ -871,7 +871,8 @@ module _3gpp-common-yang-types {
    
     leaf interPlmnCallbackUri {
      description "It indicates the callback URI to be used by NF Service 
      Producers located in PLMNs that are different from the PLMN of the NF consumer.";
      Producers located in PLMNs that are different from the PLMN of 
      the NF consumer.";
      type inet:uri;
    }   
    leaf n1MessageClass {
@@ -889,44 +890,50 @@ module _3gpp-common-yang-types {
      type N2InformationClass;
    }
    leaf binding {
      description "This attribute shall contain the value of the Binding Indication
      for the default subscription notification ";
      reference " i.e. the value part of 3gpp-Sbi-Binding header, as specified in 
      description "This attribute shall contain the value of the Binding
      Indication for the default subscription notification ";
      reference " i.e. the value part of 3gpp-Sbi-Binding header, as 
      specified in 
      clause 6.12.4 of 3GPP TS 29.500 76. ";
      //optional
      type string;
      config false;
    }
    leaf acceptedEncoding {
      description "It indicates the content encodings that are accepted by a NF Service 
      Consumer when receiving a notification related to a default notification subscription";
      description "It indicates the content encodings that are accepted by a 
      NF Service Consumer when receiving a notification related to a default
      notification subscription";
      reference "IETF RFC 9110 clause 12.5.3 ";
      //optional
      type string;
      config false;
    }
    leaf supportedFeatures {
      description "It is a string, which indicates the features of the service corresponding
      to the subscribed default notification, which are supported by the NF (Service) instance
      acting as NF service consumer. The string shall contain a bitmask indicating supported 
      features in hexadecimal representation:Each character in the string shall take a value 
      description "It is a string, which indicates the features of the service
      corresponding to the subscribed default notification, which are supported
      by the NF (Service) instance acting as NF service consumer. The string
      shall contain a bitmask indicating supported features in hexadecimal
      representation:Each character in the string shall take a value 
      of 0 to 9, a to f or A to F ";
      reference "shall represent the support of 4 features as described in table 5.2.2-3 of TS 29.571 [61].";
      reference "shall represent the support of 4 features as described in 
      table 5.2.2-3 of TS 29.571 [61].";
      //optional
      type string;
      config false;
    } 
    leaf serviceInfoList {
      description "It indicates a list of service specific information. It may be present
      when the notification request of the notification type may be generated by multiple
      services, i.e. notifications from different services may be received by the subscription.";
      description "It indicates a list of service specific information. It may 
      be present when the notification request of the notification type may be
      generated by multiple services, i.e. notifications from different 
      services may be received by the subscription.";
      //optional
      type string;
      config false;
    } 
    leaf callbackUriPrefix {
      description "It indicates the optional path segment(s) used to construct the prefix of the
       Callback URIs during the reselection of an NF service consumer, as described in 3GPP TS 29.501";
      description "It indicates the optional path segment(s) used to construct
      the prefix of the Callback URIs during the reselection of an NF service
      consumer, as described in 3GPP TS 29.501";
      //optional
      type inet:uri;
    }                    
@@ -1104,9 +1111,9 @@ module _3gpp-common-yang-types {
        In addition, the MnS producer shall create on behalf of the MnS
        consumer a subscription, using 'NtfSubscriptionControl', for the
        notification types 'notifyMOICreation' and 'notifyMOIDeletion' related
        to the 'File' instances that will be produced later. In case an existing
        subscription does already include the 'File' instances to be produced,
        no new subscription shall be created. The
        to the 'File' instances that will be produced later. In case an 
        existing subscription does already include the 'File' instances to be 
        produced, no new subscription shall be created. The
        'notificationRecipientAddress' attribute in the created
        'NtfSubscriptionControl' instance shall be set to the value of the
        'notificationRecipientAddress' in the related 'PerfMetricJob'. This
@@ -1148,8 +1155,8 @@ module _3gpp-common-yang-types {
            leaf fileLocation {
            type string ;
            description "Applicable and must be present when the file-based
              reporting method is supported, and the files are stored on the MnS
              consumer.";
              reporting method is supported, and the files are stored on the 
              MnS consumer.";
            }
          }
          case notification-target {
+11 −7
Original line number Diff line number Diff line
@@ -11,18 +11,20 @@ module _3gpp-nr-nrm-eutranfreqrelation {
  import _3gpp-nr-nrm-nrcellcu { prefix nrcellcu3gpp; }

  organization "3GPP SA5";
  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
  description "Defines the YANG mapping of the EUtranFreqRelation Information
    Object Class (IOC) that is part of the NR Network Resource Model (NRM).
    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
    TTA, TTC). All rights reserved.";
  reference "3GPP TS 28.541 5G Network Resource Model (NRM)";

  revision 2025-01-25 { reference CR-; } 
  revision 2025-01-25 { reference CR-1442; } 
  revision 2024-02-24 { reference CR-1218; } 
  revision 2023-09-18 { reference CR-1043; } 
  revision 2019-10-28 { reference S5-193518 ; }
  revision 2019-06-17 {
  revision 2019-06-17 {reference CR-; }
    description "Initial revision";
    
  }

  grouping EUtranFreqRelationGrp {
@@ -44,14 +46,14 @@ module _3gpp-nr-nrm-eutranfreqrelation {
      description "A list of Physical Cell Identities (PCIs) that are
      blocklisted in E-UTRAN measurements.";
      reference "3GPP TS 38.331";
      min-elements 0;
      //optional
      type uint16 { range "0..503"; }
    }

    leaf-list blockListEntryIdleMode {
      description "A list of Physical Cell Identities (PCIs) that are
        blocklisted in SIB4 and SIB5.";
      min-elements 0;
        //optional
      type uint16 { range "0..1007"; }
    }

@@ -153,7 +155,6 @@ module _3gpp-nr-nrm-eutranfreqrelation {
        serving frequency. Each frequency of NR and E-UTRAN might have a
        specific threshold.";
      reference "ThreshX, LowQ in 3GPP TS 38.304";
      mandatory false;
      type int32 { range "0..31"; }
      units dB;
    }
@@ -196,7 +197,10 @@ module _3gpp-nr-nrm-eutranfreqrelation {
    }
  }
    
  augment /me3gpp:ManagedElement/gnbcucp3gpp:GNBCUCPFunction/nrcellcu3gpp:NRCellCU {
  augment 
   /me3gpp:ManagedElement
   /gnbcucp3gpp:GNBCUCPFunction
   /nrcellcu3gpp:NRCellCU {

    list EUtranFreqRelation {
      description "Represents a frequency relation between an NR cell and an
+4 −3
Original line number Diff line number Diff line
@@ -350,7 +350,8 @@ module _3gpp-nr-nrm-gnbcucpfunction {
    leaf gnbIdLength {
      type int32 {range "22..32";}
		  mandatory true;
      description "This indicates the number of bits for encoding the gNB ID. See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413";
      description "This indicates the number of bits for encoding the gNB ID. 
      See 'Global gNB ID' in subclause 9.3.1.6 of TS 38.413";
    }

    leaf gnbId {
@@ -367,8 +368,8 @@ module _3gpp-nr-nrm-gnbcucpfunction {
    uses types3gpp:PLMNId;
    
    leaf enbId {
      description "It identifies an eNB within a PLMN. The eNB ID is part of the E-UTRAN Cell Global Identifier (ECGI) of the eNB
        cells.";
      description "It identifies an eNB within a PLMN. The eNB ID is part of 
      the E-UTRAN Cell Global Identifier (ECGI) of the eNB cells.";
      reference "eNB ID in 3GPP TS 36.300. Global eNB ID in 3GPP TS 36.413.";
      mandatory true;
      type int32 {range "0..4194303";}
Loading