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
Pipeline #4504 passed with stage
in 0 seconds
...@@ -16,13 +16,13 @@ submodule etsi-nfv-common { ...@@ -16,13 +16,13 @@ submodule etsi-nfv-common {
description description
"Common data types for ETSI data models."; "Common data types for ETSI data models.";
revision 2020-02-11 { revision 2020-06-10 {
description description
"Version 3.3.1 "Version 3.3.1.
Common data structures to support VNFD and NSD according to: Common data structures to support VNFD and NSD according to:
ETSI GS NFV-IFA 014 Ed341v333 ETSI GS NFV-IFA 014 Release 3
ETSI GS NFV-IFA 011 Ed341v332."; ETSI GS NFV-IFA 011 Release 3.";
} }
revision 2019-10-01 { revision 2019-10-01 {
......
...@@ -14,12 +14,12 @@ module etsi-nfv-descriptors { ...@@ -14,12 +14,12 @@ module etsi-nfv-descriptors {
description description
"Network Function Virtualization Descriptors"; "Network Function Virtualization Descriptors";
revision 2020-02-11 { revision 2020-06-10 {
description description
"Version 3.3.1 "Version 3.3.1.
NSD and PNFD according to ETSI GS NFV-IFA 014 Ed341v333 NSD and PNFD according to ETSI GS NFV-IFA 014 Release 3
VNFD according to ETSI GS NFV-IFA 011 Ed341v332."; VNFD according to ETSI GS NFV-IFA 011 Release 3.";
} }
revision 2019-10-01 { revision 2019-10-01 {
......
...@@ -11,12 +11,11 @@ submodule etsi-nfv-ns { ...@@ -11,12 +11,11 @@ submodule etsi-nfv-ns {
description description
"Models for NS according to ETSI GS NFV-IFA 014."; "Models for NS according to ETSI GS NFV-IFA 014.";
revision 2020-02-11 { revision 2020-06-10 {
description description
"Version 3.3.1 "Version 3.3.1.
Common data structures to support NSD according to: NSD according to ETSI GS NFV-IFA 014 Release 3.";
ETSI GS NFV-IFA 014 Ed341v333.";
} }
revision 2019-10-01 { revision 2019-10-01 {
...@@ -1688,22 +1687,6 @@ submodule etsi-nfv-ns { ...@@ -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 { leaf service-availability-level {
type uint32; type uint32;
description description
......
...@@ -13,12 +13,11 @@ module etsi-nfv-nsd { ...@@ -13,12 +13,11 @@ module etsi-nfv-nsd {
description description
"Network Services Descriptors"; "Network Services Descriptors";
revision 2020-02-11 { revision 2020-06-10 {
description description
"Version 3.3.1 "Version 3.3.1.
Common data structures to support NSD according to: NSD according to ETSI GS NFV-IFA 014 Release 3.";
ETSI GS NFV-IFA 014 Ed341v333.";
} }
revision 2019-10-01 { revision 2019-10-01 {
......
...@@ -12,12 +12,11 @@ submodule etsi-nfv-pnf { ...@@ -12,12 +12,11 @@ submodule etsi-nfv-pnf {
description description
"Models for PNFD according to GS NFV-IFA 014."; "Models for PNFD according to GS NFV-IFA 014.";
revision 2020-02-11 { revision 2020-06-10 {
description description
"Version 3.3.1 "Version 3.3.1.
Common data structures to support PNFD according to: PNFD according to ETSI GS NFV-IFA 014 Release 3.";
ETSI GS NFV-IFA 014 Ed341v333.";
} }
revision 2019-10-01 { revision 2019-10-01 {
......
...@@ -13,11 +13,11 @@ module etsi-nfv-pnfd { ...@@ -13,11 +13,11 @@ module etsi-nfv-pnfd {
description description
"Physcial Network Function Descriptor."; "Physcial Network Function Descriptor.";
revision 2020-02-11 { revision 2020-06-10 {
description 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 { revision 2019-10-01 {
......
...@@ -16,12 +16,12 @@ submodule etsi-nfv-vnf { ...@@ -16,12 +16,12 @@ submodule etsi-nfv-vnf {
description description
"Models for VNFD according to GS NFV-IFA 011."; "Models for VNFD according to GS NFV-IFA 011.";
revision 2020-02-11 { revision 2020-06-10 {
description description
"Version 3.3.1 "Version 3.3.1.
Data structures to support VNFD according to: Data structures to support VNFD according to
ETSI GS NFV-IFA 011 Ed341v332."; ETSI GS NFV-IFA 011 Release 3.";
} }
revision 2019-10-01 { revision 2019-10-01 {
......
...@@ -13,11 +13,11 @@ module etsi-nfv-vnfd { ...@@ -13,11 +13,11 @@ module etsi-nfv-vnfd {
description description
"Virtual Network Function Descriptor."; "Virtual Network Function Descriptor.";
revision 2020-02-11 { revision 2020-06-10 {
description 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 { revision 2019-10-01 {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment