Commit 06657ae3 authored by Mahesh Jethanandani's avatar Mahesh Jethanandani
Browse files

Merge branch 'dev-v3.3.1' into v3.3.1

parents 6f83cbf0 dd59b3d9

src/yang/etsi-nfv-common.yang

+4 −4
Original line number Diff line number Diff line
@@ -16,13 +16,13 @@ submodule etsi-nfv-common { 
  description

    "Common data types for ETSI data models.";



  revision 2020-02-11 {

  revision 2020-06-10 {

    description

      "Version 3.3.1

      "Version 3.3.1.



       Common data structures to support VNFD and NSD according to:

       ETSI GS NFV-IFA 014 Ed341v333

       ETSI GS NFV-IFA 011 Ed341v332.";

       ETSI GS NFV-IFA 014 Release 3

       ETSI GS NFV-IFA 011 Release 3.";

  }



  revision 2019-10-01 {

src/yang/etsi-nfv-descriptors.yang

+4 −4
Original line number Diff line number Diff line
@@ -14,12 +14,12 @@ module etsi-nfv-descriptors { 
  description

    "Network Function Virtualization Descriptors";



  revision 2020-02-11 {

  revision 2020-06-10 {

    description

      "Version 3.3.1

      "Version 3.3.1.



       NSD and PNFD according to ETSI GS NFV-IFA 014 Ed341v333

       VNFD according to ETSI GS NFV-IFA 011 Ed341v332.";

       NSD and PNFD according to ETSI GS NFV-IFA 014 Release 3

       VNFD according to ETSI GS NFV-IFA 011 Release 3.";

  }



  revision 2019-10-01 {

src/yang/etsi-nfv-ns.yang

+3 −20
Original line number Diff line number Diff line
@@ -11,12 +11,11 @@ submodule etsi-nfv-ns { 
  description

    "Models for NS according to ETSI GS NFV-IFA 014.";



  revision 2020-02-11 {

  revision 2020-06-10 {

    description

      "Version 3.3.1

      "Version 3.3.1.



       Common data structures to support NSD according to:

       ETSI GS NFV-IFA 014 Ed341v333.";

       NSD according to ETSI GS NFV-IFA 014 Release 3.";

  }



  revision 2019-10-01 {
@@ -1688,22 +1687,6 @@ submodule etsi-nfv-ns { 
        }

      }



      leaf priority {

        type uint32;

        description

          "Specifies the priority for the NS instance.



           The allowed range will be reasonably high. The 'zero'

           value will express the highest priority and the fact

           that the NS instance based on this DF cannot be

           pre-empted during resource allocation.



           Examples for the usage of priority include conflict

           resolution in case of resource shortage.";

        reference

          "GS NFV IFA014: Section 6.3.2.2 NsDf information element";

      }



      leaf service-availability-level {

        type uint32;

        description

src/yang/etsi-nfv-nsd.yang

+3 −4
Original line number Diff line number Diff line
@@ -13,12 +13,11 @@ module etsi-nfv-nsd { 
  description

    "Network Services Descriptors";



  revision 2020-02-11 {

  revision 2020-06-10 {

    description

      "Version 3.3.1

      "Version 3.3.1.



       Common data structures to support NSD according to:

       ETSI GS NFV-IFA 014 Ed341v333.";

       NSD according to ETSI GS NFV-IFA 014 Release 3.";

  }



  revision 2019-10-01 {

src/yang/etsi-nfv-pnf.yang

+3 −4
Original line number Diff line number Diff line
@@ -12,12 +12,11 @@ submodule etsi-nfv-pnf { 
  description

    "Models for PNFD according to GS NFV-IFA 014.";



  revision 2020-02-11 {

  revision 2020-06-10 {

    description

      "Version 3.3.1

      "Version 3.3.1.



       Common data structures to support PNFD according to:

       ETSI GS NFV-IFA 014 Ed341v333.";

       PNFD according to ETSI GS NFV-IFA 014 Release 3.";

  }



  revision 2019-10-01 {