diff --git a/src/yang/etsi-nfv-common.yang b/src/yang/etsi-nfv-common.yang index 0b09fc483cef064f66eb0ab761af9df2048a9f5f..81b128fd6d176d73e597cfa72206278943483c41 100644 --- a/src/yang/etsi-nfv-common.yang +++ b/src/yang/etsi-nfv-common.yang @@ -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 { diff --git a/src/yang/etsi-nfv-descriptors.yang b/src/yang/etsi-nfv-descriptors.yang index 396d7c8617da05473a7d41975afb3f7da9e7ce61..e62d24a736d916e0330ce4ed754467c865cbff97 100644 --- a/src/yang/etsi-nfv-descriptors.yang +++ b/src/yang/etsi-nfv-descriptors.yang @@ -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 { diff --git a/src/yang/etsi-nfv-ns.yang b/src/yang/etsi-nfv-ns.yang index bca0abdad585a5ae52a222f12824eea566342535..d9a56ebcc4daff9cf8612aab1c6de7c8a1424d72 100644 --- a/src/yang/etsi-nfv-ns.yang +++ b/src/yang/etsi-nfv-ns.yang @@ -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 diff --git a/src/yang/etsi-nfv-nsd.yang b/src/yang/etsi-nfv-nsd.yang index 108d5d574746d29a5ee22de7a016666b781af806..df09195972dc8882918328fa4755f1a3629a3a6b 100644 --- a/src/yang/etsi-nfv-nsd.yang +++ b/src/yang/etsi-nfv-nsd.yang @@ -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 { diff --git a/src/yang/etsi-nfv-pnf.yang b/src/yang/etsi-nfv-pnf.yang index e2a094013b459cd1fc90e71c313fe9c2dd3a4582..80d44e758a4e868e14e6eaedab611765babf0ac3 100644 --- a/src/yang/etsi-nfv-pnf.yang +++ b/src/yang/etsi-nfv-pnf.yang @@ -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 { diff --git a/src/yang/etsi-nfv-pnfd.yang b/src/yang/etsi-nfv-pnfd.yang index 005c5de7ed7a80282b9d573be820d259c1470b20..6afbfd06614cc88a7395414e32057d6d6e901415 100644 --- a/src/yang/etsi-nfv-pnfd.yang +++ b/src/yang/etsi-nfv-pnfd.yang @@ -13,11 +13,11 @@ module etsi-nfv-pnfd { description "Physcial Network Function Descriptor."; - revision 2020-02-11 { + revision 2020-06-10 { description - "Version 3.3.1 + "Version 3.3.1. - PNFD according to ETSI GS NFV-IFA 014 Ed341v333."; + PNFD according to ETSI GS NFV-IFA 014 Release 3."; } revision 2019-10-01 { diff --git a/src/yang/etsi-nfv-vnf.yang b/src/yang/etsi-nfv-vnf.yang index a28592e1ae922a5dd6301d035a37d3c6582416e0..6e04e1f580e327aa6846e20840fc9f349b3b5472 100755 --- a/src/yang/etsi-nfv-vnf.yang +++ b/src/yang/etsi-nfv-vnf.yang @@ -16,12 +16,12 @@ submodule etsi-nfv-vnf { description "Models for VNFD according to GS NFV-IFA 011."; - revision 2020-02-11 { + revision 2020-06-10 { description - "Version 3.3.1 + "Version 3.3.1. - Data structures to support VNFD according to: - ETSI GS NFV-IFA 011 Ed341v332."; + Data structures to support VNFD according to + ETSI GS NFV-IFA 011 Release 3."; } revision 2019-10-01 { diff --git a/src/yang/etsi-nfv-vnfd.yang b/src/yang/etsi-nfv-vnfd.yang index d43182ae1fa7d9d224d921dca589088244978c5b..06f76bfa7c3ed83c5bea31ddc2df55d2dc340e68 100644 --- a/src/yang/etsi-nfv-vnfd.yang +++ b/src/yang/etsi-nfv-vnfd.yang @@ -13,11 +13,11 @@ module etsi-nfv-vnfd { description "Virtual Network Function Descriptor."; - revision 2020-02-11 { + revision 2020-06-10 { description - "Version 3.3.1 + "Version 3.3.1. - VNFD according to ETSI GS NFV-IFA 011 Ed341v332."; + VNFD according to ETSI GS NFV-IFA 011 Release 3."; } revision 2019-10-01 {