Commit 3f4e384c authored by cintiarosa's avatar cintiarosa
Browse files

correct mismaches from stage 2 to stage 3 yang

parent 9d8f3da2
Loading
Loading
Loading
Loading
Loading
+4 −3
Original line number Diff line number Diff line
@@ -17,10 +17,11 @@ module _3gpp-5gc-nrm-amffunction {
  organization "3gpp SA5";
  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
  description "AMFFunction derived from basic ManagedFunction.
    Copyright 2025, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
    Copyright 2026, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
    TTA, TTC). All rights reserved.";
  reference "3GPP TS 28.541 5G Network Resource Model (NRM)";

  revision 2026-05-25 { reference CR-1702 ; }
  revision 2025-07-25 { reference CR-1558 ; }
  revision 2025-03-25 { reference "CR-1489 CR-1512" ; }
  revision 2024-11-01 { reference CR-1405; }
@@ -368,14 +369,14 @@ module _3gpp-5gc-nrm-amffunction {
  grouping AmfInfoGrp {
    description "Represents the data type AmfInfo.";

    leaf amfRegionId {
    leaf aMFRegionId {
      type int64;
      mandatory true;
      description "It represents the AMF Region ID, which identifies the
        region. AllowedValues: defined in subclause 2.10.1 of 3GPP TS 23.003 ";
    }

    leaf amfSetId {
    leaf aMFSetId {
      type int64;
      mandatory true;
      description "It represents the AMF Set ID, which is uniquely identifies
+4 −6
Original line number Diff line number Diff line
@@ -325,18 +325,16 @@ grouping ManagedNFProfileGrp {
      of a NF instance.";
      type string;
    }
    leaf-list lcHSupportInd {
    leaf lcHSupportInd {
      description "This parameter indicates whether the NF supports or does
      not support Load Control based on LCI Header.";
      reference "clause 6.3 of 3gpp TS 29.500";
      max-elements 1;
      type boolean;
    }
    leaf-list olcHSupportInd {
    leaf olcHSupportInd {
      description "This parameter indicates whether the NF supports or does
      not support Overload Control based on OCI Header .";
      reference "clause 6.4 of 3gpp TS 29.500";
      max-elements 1;
      type boolean;
    }
    leaf-list nfSetRecoveryTimeList {
@@ -371,7 +369,7 @@ grouping ManagedNFProfileGrp {
      Server. It is an array of FQDN.";
      type string;
    }
    leaf-list interPlmnFqdn {
    leaf interPlmnFqdn {
      description "If the NF needs to be discoverable by other
       NFs in a different PLMN, then an FQDN that is used
        for inter-PLMN routing is specified.";
@@ -381,7 +379,7 @@ grouping ManagedNFProfileGrp {
      description "List of NF Service Instances. It shall include
        the services produced by the NF that can be discovered by
        other NFs.";
      key serviceInstanceID;
      key serviceInstanceId;
      min-elements 1;
      uses nfs3gpp:NFServiceGrp;
    }
+5 −4
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ module _3gpp-5gc-nrm-nfservice {
    TTA, TTC). All rights reserved.";
  reference "3GPP TS 29.510";
  
  revision 2026-05-25 { reference CR-1702 ; }
  revision 2026-03-25 { reference CR-1694 ; }
  revision 2025-01-25 { reference CR-1442; } 
  revision 2023-09-18 { reference CR-1043 ; } 
@@ -27,7 +28,7 @@ module _3gpp-5gc-nrm-nfservice {
  grouping NFServiceGrp {
    description "This data type represents the NF Service
     defined in TS 29.510 [23].";
    leaf serviceInstanceID {
    leaf serviceInstanceId {
      description 
        "Unique ID of the service instance within a given NF Instance.";
      mandatory true;
@@ -50,10 +51,10 @@ module _3gpp-5gc-nrm-nfservice {
      uses NFServiceVersion;
    }
    
    leaf scheme {
    leaf schema {
      description "URI scheme (e.g. 'http', 'https').";
      mandatory true;
      type UriScheme;
      type UriSchema;
    }
    
    leaf nfServiceStatus {
@@ -667,7 +668,7 @@ module _3gpp-5gc-nrm-nfservice {
    }
  }
  
  typedef UriScheme {
  typedef UriSchema {
    type enumeration {
      enum HTTP;
      enum HTTPS;
+2 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ module _3gpp-5gc-nrm-nrffunction {
    TTA, TTC). All rights reserved.";
  reference "3GPP TS 28.541";

  revision 2026-05-25 { reference CR-1702 ; }
  revision 2026-03-25 { reference CR-1694 ; }
  revision 2025-11-01 { reference CR-1640 ; }
  revision 2025-07-25 { reference CR-1558 ; }
@@ -147,7 +148,7 @@ module _3gpp-5gc-nrm-nrffunction {
  }
  grouping HssInfoGrp {
    description " Information of an HSS NF Instance";
    leaf groupID{
    leaf groupId{
      description "This attribute defines the identity of the HSS group
      that is served by the HSS instance.If not provided, the HSS instance
      does not pertain to any HSS group.";
+5 −6
Original line number Diff line number Diff line
@@ -14,10 +14,11 @@ module _3gpp-5gc-nrm-smffunction {
  organization "3gpp SA5";
  contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464";
  description "SMFFunction derived from basic ManagedFunction.
    Copyright 2024, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
    Copyright 2026, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TSDSI,
    TTA, TTC). All rights reserved.";
  reference "3GPP TS 28.541";

  revision 2026-05-25 { reference CR-1702 ; }
  revision 2024-05-24 { reference CR-1273 ; }
  revision 2023-09-18 { reference CR-1043 ; }
  revision 2023-04-26 { reference CR-0916; }
@@ -87,7 +88,7 @@ module _3gpp-5gc-nrm-smffunction {
         those will have precedence over this value ";
         type uint16;
      }
      leaf-list vsmfSupportInd {
      leaf vsmfSupportInd {
        description "Used by an SMF to explicitly indicate the support of
         V-SMF capability and its preference to be selected as V-SMF.
         When present it indicate whether the V-SMF capability is supported
@@ -96,7 +97,6 @@ module _3gpp-5gc-nrm-smffunction {
         - false: V-SMF capability not supported by the SMF.
         When absent the V-SMF capability support of the SMF is not specified.";
         type boolean;

      }
      leaf pgwFqdnList {
        description "When present, this attribute provides additional FQDNs
@@ -105,7 +105,7 @@ module _3gpp-5gc-nrm-smffunction {
        is present.";
        type string;
      }
      leaf-list ismfSupportInd {
      leaf ismfSupportInd {
        description "This attribute may be used by an SMF to explicitly
        indicate the support of I-SMF capability and its preference to be
        selected as I-SMF. When present, this attribute shall indicate
@@ -114,7 +114,6 @@ module _3gpp-5gc-nrm-smffunction {
        - FALSE: I-SMF capability not supported by the SMF. Absence of this
        attribute indicates the I-SMF capability support of the SMF is not
        specified.";
        max-elements 1;
        type boolean;
      }
      leaf-list smfOnboardingCapability {
@@ -127,7 +126,7 @@ module _3gpp-5gc-nrm-smffunction {
        type boolean;
        max-elements 1;
      }
      leaf-list smfUPRPCapability {
      leaf smfUPRPCapability {
        description "This attribute IE indicates the SMF supports User
        Plane Remote Provisioning (UPRP) capability. This is used for
        the case of Onboarding of UEs for SNPNs ,
Loading