Commit 39adf37d authored by cintiarosa's avatar cintiarosa
Browse files

added ProSeCapability to _3gpp-5gc-nrm-nfprofile.yang and corrected yang errors

parent 167be630
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ module _3gpp-5gc-nrm-gmlcfunction {
  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
  description "This module defines the GMLC Function IOC per 3GPP TS 28.541.
    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI, 
    TTA, TTC). All rights reserved.";";
    TTA, TTC). All rights reserved.";
  reference "3GPP TS 28.541";

    revision 2025-03-25 { reference CR-1489 ; }
+129 −12
Original line number Diff line number Diff line
@@ -486,7 +486,68 @@ module _3gpp-5gc-nrm-nfprofile {
        type PduSessionType;
      }
    }
    
    grouping ProSeCapability {
      leaf proseDirectDiscovery {
        type boolean;
        description "Indicates support for ProSe Direct Discovery.";
        }
      leaf proseDirectCommunication {
          type boolean;
          description "Indicates support for ProSe Direct Communication.";
      }
      leaf proseL2UetoNetworkRelay {
          type boolean;
          description "Indicates support for ProSe Layer-2 UE-to-Network Relay..";
      }
      leaf proseL3UetoNetworkRelay {
          type boolean;
          description "Indicates support for ProSe Layer-3 UE-to-Network Relay.";
      }
      leaf proseL2RemoteUe {
          type boolean;
          description "Indicates support for ProSe Layer-2 Remote UE.";
      }
      leaf proseL3RemoteUe {
          type boolean;
          description "Indicates support for ProSe Layer-3 Remote UE.";
      }
      leaf proseL2UetoUeRelay {
          type boolean;
          description "Indicates support for ProSe Layer-2 UE-to-UE Relay.";
      }
      leaf proseL3UetoUeRelay {
        type boolean;
        description "Indicates support for ProSe Layer-3 UE-to-UE Relay.";
        }
      leaf proseL2EndUe {
          type boolean;
          description "Indicates support for ProSe Layer-2 End UE.";
      }
      leaf proseL3EndUe {
          type boolean;
          description "Indicates support for ProSe Layer-3 End UE.";
      }
      leaf proseL3IntermRelay {
          type boolean;
          description "Indicates support for ProSe Layer-3 Intermediate Relay.";
      }
      leaf proseL3MultihopRemote {
          type boolean;
          description "Indicates support for ProSe Layer-3 Multihop Remote.";
      }
      leaf proseL3NetMultihopRelay {
          type boolean;
          description "Indicates support for ProSe Layer-3 Network Multihop Relay.";
      }
      leaf proseL3UeMultihopRelay {
          type boolean;
          description "Indicates support for ProSe Layer-3 UE Multihop Relay.";
      }
      leaf proseL3EndUeMultihop {
          type boolean;
          description "Indicates support for ProSe Layer-3 End UE Multihop.";
      }                 
    }   
    grouping pcfInfo {
      
      leaf-list dnnList {
@@ -522,6 +583,11 @@ module _3gpp-5gc-nrm-nfprofile {
        
        type string;
      }
      list proseCapability {
        description "It indicates the supported ProSe Capability by the PCF.";
        uses ProSeCapability;
        config false;
      }
    }
    
    grouping bsfInfo {
@@ -668,6 +734,10 @@ module _3gpp-5gc-nrm-nfprofile {
      profile data is available in the HSS instance.";
      min-elements 1;
      key "id";
      leaf id {
      description "Unique identifier for the IMSI range.";
      type string;
      }
      uses ImsiRange;
    }
    list imsPrivateIdentityRanges{
@@ -675,6 +745,10 @@ module _3gpp-5gc-nrm-nfprofile {
      Identities whose profile data is available in the HSS instance.";
      min-elements 1;
      key "id";
      leaf id {
      description "Unique identifier for the IMSI range.";
      type string;
      }
      uses IdentityRange;
    }
    list imsPublicIdentityRanges{
@@ -682,6 +756,10 @@ module _3gpp-5gc-nrm-nfprofile {
      profile data is available in the HSS instance. ";
      min-elements 1;
      key "id";
      leaf id {
      description "Unique identifier for the IMSI range.";
      type string;
      }      
      uses IdentityRange;
    }
    list msisdnRanges{
@@ -689,6 +767,10 @@ module _3gpp-5gc-nrm-nfprofile {
      Identities whose profile data is available in the HSS instance ";
      min-elements 1;
      key "id";
      leaf id {
      description "Unique identifier for the IMSI range.";
      type string;
      }      
      uses IdentityRange;
    }
    list externalGroupIdentifiersRanges{
@@ -697,18 +779,31 @@ module _3gpp-5gc-nrm-nfprofile {
      the HSS instance does not serve any external groups. ";
      min-elements 1;
      key "id";
      leaf id {
      description "Unique identifier for the IMSI range.";
      type string;
      }
      uses IdentityRange;
    }
    list hssDiameterAddress{
      description "This attribute defines the Diameter Address of the HSS ";
      max-elements 1;
      key "id";
      leaf id {
      description "Unique identifier for the IMSI range.";
      type string;
      }  
      uses NetworkNodeDiameterAddress;
    }  
    list additionalDiamAddresses{
      description "This attribute defines the Additional Diameter Addresses
      of the HSS;may be present if hssDiameterAddress is present ";
      min-elements 1;

      key "id";
      leaf id {
      description "Unique identifier for the IMSI range.";
      type string;
      }  
      uses NetworkNodeDiameterAddress;
    }   

@@ -718,6 +813,18 @@ module _3gpp-5gc-nrm-nfprofile {
      key dnn;
      uses DnnUpfInfoItem;
    }
  }
    grouping FiveGDdnmfInfo {
    description "This data type represents the specific data for the 5G DDMF NF.
    See clause 6.1.6.2.74 of TS 29.510.";
    list plmnId {
      description "PLMN ID for which list of supported S-NSSAI(s)
       is provided.";
      min-elements 1;
      max-elements 1;
      key "mcc mnc";
      uses types3gpp:PLMNId;
    }
  }   
    grouping nrfInfoGrp {
      
@@ -952,6 +1059,19 @@ module _3gpp-5gc-nrm-nfprofile {
        min-elements 1;
        uses HssInfoGrp;
      } 
     list served5gDdnmfInfo {
        description "This attribute contains all the 5gDdnmfInfo
        attribute locally configured in the NRF or that the NRF 
        received during NF registration. The key of the map is 
        the nfInstanceId to which the map entry belongs to.";        
        key nfInstanceId;
        leaf nfInstanceId {
          description "String uniquely identifying a NF instance.";
          type string;
        }
        min-elements 1;
        uses FiveGDdnmfInfo ;
      }                           
    }
    list nrfInfo {
      description "nrfinfo";
@@ -1347,30 +1467,27 @@ module _3gpp-5gc-nrm-nfprofile {
    }
  }
  grouping ImsiRange{
    leaf-list start{
    leaf start{
      description "This attribute indicates the first value identifying
      the start of a IMSI range. ";
      max-elements 1;
      type string{
        pattern "^[0-9]+$";
      }
    }
    leaf-list end{
    leaf end{
      description "This attribute indicates the last value identifying
       the end of a IMSI range.";
      max-elements 1;
      type string{
        pattern "^[0-9]+$";
      }
    }
    leaf-list pattern{
    leaf pattern{
      description "This attribute indicates pattern (regular expression 
      according to the ECMA-262 dialect [75]) representing the set of 
      IMSIs belonging to this range. An IMSI value is considered part 
      of the range if and only if the IMSI string fully matches the 
      regular expression.Either the start and end attributes, or the 
      pattern attribute, shall be present.";
      max-elements 1;
      type string;
    }
  }