Commit 7866ec3e authored by lengyelb's avatar lengyelb
Browse files

Merge branch 'Rel-16-SA87-Agreed' into 'master' 

YAMs as agreed aby SA#87e according to 28623-g31-0401-balazscorrection.doc and 28541-g40-0331.docx...

See merge request 3GPP/SA5/data-models!28
parents 5fd5233a cbe5b31e

yang-models/_3gpp-5g-common-yang-types.yang

+3 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ module _3gpp-5g-common-yang-types { 
  namespace "urn:3gpp:sa5:_3gpp-5g-common-yang-types";

  prefix "types5g3gpp";

  

  

  import _3gpp-common-yang-types { prefix types3gpp; }



  organization "3GPP SA5";
@@ -50,6 +51,7 @@ module _3gpp-5g-common-yang-types { 
       type CommModelType;

    }  

    leaf-list targetNFServiceList {

      

	  type types3gpp:DistinguishedName;    

    }

    leaf commModelConfiguration {

yang-models/_3gpp-5gc-nrm-amffunction.yang

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ module _3gpp-5gc-nrm-amffunction { 
      type inet:domain-name;

    }



    leaf-list NSSAIList {

    leaf-list sNSSAIList {

      min-elements 0;  // conditionally mandatory if network slicing feature is supported

      description "List of S-NSSAIs the managed object is capable of supporting.

                  (Single Network Slice Selection Assistance Information)

yang-models/_3gpp-5gc-nrm-ausffunction.yang

+2 −1
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ module _3gpp-5gc-nrm-ausffunction { 
  import _3gpp-common-managed-function { prefix mf3gpp; }

  import _3gpp-common-managed-element { prefix me3gpp; }

  import ietf-inet-types { prefix inet; }

  import _3gpp-common-yang-types { prefix types3gpp; }

  import _3gpp-5g-common-yang-types { prefix types5g3gpp; }

  import _3gpp-common-yang-types { prefix types3gpp; }

  import _3gpp-common-top { prefix top3gpp; }

  

  organization "3gpp SA5";
@@ -56,6 +56,7 @@ module _3gpp-5gc-nrm-ausffunction { 
      uses types3gpp:ManagedNFProfile;

    }

  



    list commModelList {

      min-elements 1;

      key "groupId";

yang-models/_3gpp-5gc-nrm-ep.yang

+2 −2
Original line number Diff line number Diff line
@@ -480,8 +480,8 @@ module _3gpp-5gc-nrm-ep { 
        uses EP_N32Grp;

      }

    }

  }



 }    

  augment "/me3gpp:ManagedElement/smsf3gpp:SMSFFunction" {

    list EP_N20 {

      description "Represents the EP_20 IOC.";

yang-models/_3gpp-5gc-nrm-smsffunction.yang

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ module _3gpp-5gc-nrm-smsffunction { 
    

  revision 2019-05-15 {

    description "initial revision";

    

  }

  

  grouping SMSFFunctionGrp {