From a256e3cf79c18c0794020bdbd70a8b5958aacb75 Mon Sep 17 00:00:00 2001 From: Preethika Date: Tue, 9 Nov 2021 13:17:37 +0000 Subject: [PATCH 1/7] issue #45 Removal of deprecated attribute in vnfd Signed-off-by: Preethika --- src/yang/etsi-nfv-vnf.yang | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/yang/etsi-nfv-vnf.yang b/src/yang/etsi-nfv-vnf.yang index 843a49e..2078dbf 100755 --- a/src/yang/etsi-nfv-vnf.yang +++ b/src/yang/etsi-nfv-vnf.yang @@ -78,19 +78,6 @@ submodule etsi-nfv-vnf { VirtualNetworkInterfaceRequirements information element"; } - leaf support-mandatory { - status "deprecated"; - default "false"; - type boolean; - description - "Indicates whether fulfilling the constraint is - mandatory (true) for successful operation or desirable - (false)."; - reference - "GS NFV-IFA011: Section 7.1.6.6, - VirtualNetworkInterfaceRequirements information element"; - } - list network-interface-requirements { key "key"; min-elements "1"; -- GitLab From 59aae177160c04ddacd3a5670bfd3259815a1922 Mon Sep 17 00:00:00 2001 From: Preethika Date: Mon, 13 Dec 2021 10:13:36 +0000 Subject: [PATCH 2/7] issue #46 Fixing IpAddressAssignment flag Signed-off-by: Preethika --- src/yang/etsi-nfv-common.yang | 48 ++++++++++++++++++++++++++++++----- 1 file changed, 42 insertions(+), 6 deletions(-) diff --git a/src/yang/etsi-nfv-common.yang b/src/yang/etsi-nfv-common.yang index a8eef0d..b3d183d 100644 --- a/src/yang/etsi-nfv-common.yang +++ b/src/yang/etsi-nfv-common.yang @@ -819,12 +819,44 @@ submodule etsi-nfv-common { when "../type='ip-address'"; leaf ip-address-assignment { type boolean; - mandatory true; description - "Specify if the address assignment is the responsibility - of management and orchestration function or not. If it - is set to True, it is the management and orchestration - function responsibility. "; + "Specify which mode is used for the address assignment. + If set to True, IP configuration information shall be + provided for the VNF by a management entity using the + NFV MANO interfaces towards the VNFM. + If it is set to False, the value of the + 'ipAddressAssignmentSubtype' attribute defines the + method of IP address assignment. + Shall be present if the 'fixedIpAddress' attribute + is not present and should be absent otherwise."; + reference + "GS NFV IFA011: Section 7.1.3.4, L3AddressData + information element."; + } + + leaf ip-address-assignment-subtype { + type enumeration { + enum dynamic; + enum vnf_pkg; + enum external; + } + description + "Method of IP address assignment in case the IP + configuration is not provided using the NFV MANO + interfaces towards the VNFM. + Shall be present in case the 'ipAddressAssignment' + attribute is set to 'False' and shall be absent + otherwise. + + Valid values: + DYNAMIC: the VNF gets an IP address dynamically from + the NFVI (e.g., using DHCP) + VNF_PKG: an IP address defined by the VNF provider is + assigned by means included as part of the VNF package + (e.g., LCM script) + EXTERNAL: an IP address is provided by an external + management entity (such as EM) directly towards the + VNF."; reference "GS NFV IFA011: Section 7.1.3.4, L3AddressData information element."; @@ -869,7 +901,11 @@ submodule etsi-nfv-common { leaf fixed-ip-address { type string; description - "IP address to be assigned to the CP instance."; + "Fixed IP addresses to be assigned to the internal CP + instance. + This attribute enables the VNF provider to define + fixed IP addresses for internal CP instances to be + assigned by the VNFM or the NFVO."; reference "GS NFV IFA011: Section 7.1.3.4, L3AddressData information element."; -- GitLab From ce6bbf64846521477ebeb28cee677a4b803cf67b Mon Sep 17 00:00:00 2001 From: Preethika Date: Mon, 13 Dec 2021 11:44:28 +0000 Subject: [PATCH 3/7] issue #47 Adding externallyManaged attribute to VnfVirtualLinkDesc Signed-off-by: Preethika --- src/yang/etsi-nfv-vnf.yang | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/src/yang/etsi-nfv-vnf.yang b/src/yang/etsi-nfv-vnf.yang index 2078dbf..eabb03a 100755 --- a/src/yang/etsi-nfv-vnf.yang +++ b/src/yang/etsi-nfv-vnf.yang @@ -1496,8 +1496,8 @@ submodule etsi-nfv-vnf { } uses nfvi-maintenance-info { - description - "When present, provides information on the rules to be + description + "When present, provides information on the rules to be observed when an instance based on this VnfVirtualLinkDesc is impacted during NFVI operation and maintenance (e.g. NFVI resource upgrades)."; @@ -1505,6 +1505,29 @@ submodule etsi-nfv-vnf { "GS NFV IFA011: Section 7.1.7.2, VnfVirtualLinkDesc information element."; } + + leaf externally-managed { + type enumeration { + enum required; + enum allowed; + } + description + "Specifies the intent of the VNF designer w.r.t. the + internal VL instances created from this descriptor being + externally managed. + Values: + REQUIRED + ALLOWED + Default: ALLOWED + + If the VNFD does not reference any LCM script and if the + 'vnfmInfo' attribute in the 'Vnfd' information element + indicates that the VNF can be managed by any ETSI NFV + compliant VNFM, this attribute shall not be present."; + reference + "GS NFV IFA011: Section 7.1.7.2, VnfVirtualLinkDesc + information element."; + } } uses security-group-rule; -- GitLab From e55229e9eb9237640c94d46419f190c821dce2c0 Mon Sep 17 00:00:00 2001 From: Preethika Date: Mon, 13 Dec 2021 12:58:29 +0000 Subject: [PATCH 4/7] issue #48 Add standardized interface requirements to VirtualNetworkInterfaceRequirements Signed-off-by: Preethika --- src/yang/etsi-nfv-vnf.yang | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/src/yang/etsi-nfv-vnf.yang b/src/yang/etsi-nfv-vnf.yang index 2078dbf..478968d 100755 --- a/src/yang/etsi-nfv-vnf.yang +++ b/src/yang/etsi-nfv-vnf.yang @@ -78,9 +78,26 @@ submodule etsi-nfv-vnf { VirtualNetworkInterfaceRequirements information element"; } + list standardized-network-interface-requirements { + key "key"; + max-elements "1"; + + leaf key { + type string; + } + leaf value { + type string; + } + description + "The requirements on standardized network interface + capabilities, e.g., SR-IOV."; + reference + "GS NFV-IFA011: Section 7.1.6.6, + VirtualNetworkInterfaceRequirements information element"; + } + list network-interface-requirements { key "key"; - min-elements "1"; max-elements "1"; leaf key { @@ -90,9 +107,11 @@ submodule etsi-nfv-vnf { type string; } description - "The network interface requirements. An element from an - array of key-value pairs that articulate the network - interface deployment requirements."; + "The additional network interface requirements beyond + those specified in the standardizedNetworkInterface + Requirements attribute.An element from an array of + key-value pairs that articulate the network interface + deployment requirements."; reference "GS NFV-IFA011: Section 7.1.6.6, VirtualNetworkInterfaceRequirements information element"; -- GitLab From f26c471b0d86055d2e947010f0e94ba98de346b2 Mon Sep 17 00:00:00 2001 From: Preethika Date: Tue, 14 Dec 2021 05:16:32 +0000 Subject: [PATCH 5/7] issue #49 FEAT03 Add missing minNumberofPreservedInstances attribute to NfviMaintenanceInfo IE Signed-off-by: Preethika --- src/yang/etsi-nfv-common.yang | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/src/yang/etsi-nfv-common.yang b/src/yang/etsi-nfv-common.yang index a8eef0d..4548fbc 100644 --- a/src/yang/etsi-nfv-common.yang +++ b/src/yang/etsi-nfv-common.yang @@ -557,6 +557,35 @@ submodule etsi-nfv-common { information element"; } } + + list min-number-of-preserved-instances { + key "group-size"; + ordered-by user; + must "./min-number-of-preserved-instances <= ./group-size"; + + leaf group-size { + type uint32; + description + "When present, it determines the size of the group for + which the minNumberOfPreservedInstances is specified. + Otherwise the size is not limited."; + reference + "GS NFV-IFA011: Section 7.1.8.21, MinNumberOfPreserved + Instances information element"; + } + + leaf min-number-of-preserved-instances { + type uint32 { + range "1 .. max"; + } + description + "The maximum number of instances that can be impacted + simultaneously within the group of the specified size."; + reference + "GS NFV-IFA011: Section 7.1.8.21, MinNumberOfPreserved + Instances information element"; + } + } } } -- GitLab From 5fb94404f1d885fe55743084ae7db4e7d83702d2 Mon Sep 17 00:00:00 2001 From: ppree Date: Mon, 20 Dec 2021 08:52:30 +0100 Subject: [PATCH 6/7] Revert "Merge branch 'issue#48' into 'dev-v3.6.1'" This reverts merge request !105 --- src/yang/etsi-nfv-vnf.yang | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/src/yang/etsi-nfv-vnf.yang b/src/yang/etsi-nfv-vnf.yang index 9140778..eabb03a 100755 --- a/src/yang/etsi-nfv-vnf.yang +++ b/src/yang/etsi-nfv-vnf.yang @@ -78,26 +78,9 @@ submodule etsi-nfv-vnf { VirtualNetworkInterfaceRequirements information element"; } - list standardized-network-interface-requirements { - key "key"; - max-elements "1"; - - leaf key { - type string; - } - leaf value { - type string; - } - description - "The requirements on standardized network interface - capabilities, e.g., SR-IOV."; - reference - "GS NFV-IFA011: Section 7.1.6.6, - VirtualNetworkInterfaceRequirements information element"; - } - list network-interface-requirements { key "key"; + min-elements "1"; max-elements "1"; leaf key { @@ -107,11 +90,9 @@ submodule etsi-nfv-vnf { type string; } description - "The additional network interface requirements beyond - those specified in the standardizedNetworkInterface - Requirements attribute.An element from an array of - key-value pairs that articulate the network interface - deployment requirements."; + "The network interface requirements. An element from an + array of key-value pairs that articulate the network + interface deployment requirements."; reference "GS NFV-IFA011: Section 7.1.6.6, VirtualNetworkInterfaceRequirements information element"; -- GitLab From c6c8927df8ad7175eda9e051b1bcb24b919360fc Mon Sep 17 00:00:00 2001 From: Miguel Angel Reina Ortega Date: Tue, 8 Mar 2022 11:08:08 +0100 Subject: [PATCH 7/7] Update src/yang/etsi-nfv-common.yang, src/yang/etsi-nfv-descriptors.yang, src/yang/etsi-nfv-ns.yang, src/yang/etsi-nfv-nsd.yang, src/yang/etsi-nfv-pnf.yang, src/yang/etsi-nfv-pnfd.yang, src/yang/etsi-nfv-vnf.yang, src/yang/etsi-nfv-vnfd.yang files --- src/yang/etsi-nfv-common.yang | 17 +++++++++++++++++ src/yang/etsi-nfv-descriptors.yang | 16 ++++++++++++++++ src/yang/etsi-nfv-ns.yang | 14 ++++++++++++++ src/yang/etsi-nfv-nsd.yang | 14 ++++++++++++++ src/yang/etsi-nfv-pnf.yang | 15 +++++++++++++++ src/yang/etsi-nfv-pnfd.yang | 13 +++++++++++++ src/yang/etsi-nfv-vnf.yang | 16 ++++++++++++++++ src/yang/etsi-nfv-vnfd.yang | 16 +++++++++++++++- 8 files changed, 120 insertions(+), 1 deletion(-) diff --git a/src/yang/etsi-nfv-common.yang b/src/yang/etsi-nfv-common.yang index 17402f4..8088299 100644 --- a/src/yang/etsi-nfv-common.yang +++ b/src/yang/etsi-nfv-common.yang @@ -16,6 +16,23 @@ submodule etsi-nfv-common { description "Common data types for ETSI data models."; + revision 2022-03-08 { + description + "Version 3.6.1. + + Common data structures to support VNFD and NSD according to: + ETSI GS NFV-IFA 014 Release 3 + ETSI GS NFV-IFA 011 Release 3."; + } + revision 2021-07-05 { + description + "Version 3.5.1. + + Common data structures to support VNFD and NSD according to: + ETSI GS NFV-IFA 014 Release 3 + ETSI GS NFV-IFA 011 Release 3."; + } + revision 2020-06-10 { description "Version 3.3.1. diff --git a/src/yang/etsi-nfv-descriptors.yang b/src/yang/etsi-nfv-descriptors.yang index fc51fbf..f60beb9 100644 --- a/src/yang/etsi-nfv-descriptors.yang +++ b/src/yang/etsi-nfv-descriptors.yang @@ -14,6 +14,22 @@ module etsi-nfv-descriptors { description "Network Function Virtualization Descriptors"; + revision 2022-03-08 { + description + "Version 3.6.1. + + NSD and PNFD according to ETSI GS NFV-IFA 014 Release 3 + VNFD according to ETSI GS NFV-IFA 011 Release 3."; + } + + revision 2021-07-05 { + description + "Version 3.5.1. + + NSD and PNFD according to ETSI GS NFV-IFA 014 Release 3 + VNFD according to ETSI GS NFV-IFA 011 Release 3."; + } + revision 2020-06-10 { description "Version 3.3.1. diff --git a/src/yang/etsi-nfv-ns.yang b/src/yang/etsi-nfv-ns.yang index ae3cf1e..aa0b909 100644 --- a/src/yang/etsi-nfv-ns.yang +++ b/src/yang/etsi-nfv-ns.yang @@ -11,6 +11,20 @@ submodule etsi-nfv-ns { description "Models for NS according to ETSI GS NFV-IFA 014."; + revision 2022-03-08 { + description + "Version 3.6.1. + + NSD according to ETSI GS NFV-IFA 014 Release 3."; + } + + revision 2021-07-05 { + description + "Version 3.5.1. + + NSD according to ETSI GS NFV-IFA 014 Release 3."; + } + revision 2020-06-10 { description "Version 3.3.1. diff --git a/src/yang/etsi-nfv-nsd.yang b/src/yang/etsi-nfv-nsd.yang index 8c9f21b..dfdfa1a 100644 --- a/src/yang/etsi-nfv-nsd.yang +++ b/src/yang/etsi-nfv-nsd.yang @@ -13,6 +13,20 @@ module etsi-nfv-nsd { description "Network Services Descriptors"; + revision 2022-03-08 { + description + "Version 3.6.1. + + NSD according to ETSI GS NFV-IFA 014 Release 3."; + } + + revision 2021-07-05 { + description + "Version 3.5.1. + + NSD according to ETSI GS NFV-IFA 014 Release 3."; + } + revision 2020-06-10 { description "Version 3.3.1. diff --git a/src/yang/etsi-nfv-pnf.yang b/src/yang/etsi-nfv-pnf.yang index a24746c..6cff84a 100644 --- a/src/yang/etsi-nfv-pnf.yang +++ b/src/yang/etsi-nfv-pnf.yang @@ -12,6 +12,21 @@ submodule etsi-nfv-pnf { description "Models for PNFD according to GS NFV-IFA 014."; + revision 2022-03-08 { + description + "Version 3.6.1. + + PNFD according to ETSI GS NFV-IFA 014 Release 3."; + } + + revision 2021-07-05 { + description + "Version 3.5.1. + + PNFD according to ETSI GS NFV-IFA 014 Release 3."; + } + + revision 2020-06-10 { description "Version 3.3.1. diff --git a/src/yang/etsi-nfv-pnfd.yang b/src/yang/etsi-nfv-pnfd.yang index c79d6b9..48713fe 100644 --- a/src/yang/etsi-nfv-pnfd.yang +++ b/src/yang/etsi-nfv-pnfd.yang @@ -13,6 +13,19 @@ module etsi-nfv-pnfd { description "Physcial Network Function Descriptor."; + revision 2022-03-08 { + description + "Version 3.6.1. + + PNFD according to ETSI GS NFV-IFA 014 Release 3."; + } + revision 2021-07-05 { + description + "Version 3.5.1. + + PNFD according to ETSI GS NFV-IFA 014 Release 3."; + } + revision 2020-06-10 { description "Version 3.3.1. diff --git a/src/yang/etsi-nfv-vnf.yang b/src/yang/etsi-nfv-vnf.yang index eabb03a..37214e2 100755 --- a/src/yang/etsi-nfv-vnf.yang +++ b/src/yang/etsi-nfv-vnf.yang @@ -16,6 +16,22 @@ submodule etsi-nfv-vnf { description "Models for VNFD according to GS NFV-IFA 011."; + revision 2022-03-08 { + description + "Version 3.6.1. + + Data structures to support VNFD according to + ETSI GS NFV-IFA 011 Release 3."; + } + + revision 2021-07-05 { + description + "Version 3.5.1. + + Data structures to support VNFD according to + ETSI GS NFV-IFA 011 Release 3."; + } + revision 2020-06-10 { description "Version 3.3.1. diff --git a/src/yang/etsi-nfv-vnfd.yang b/src/yang/etsi-nfv-vnfd.yang index 25bff84..4a87c3b 100644 --- a/src/yang/etsi-nfv-vnfd.yang +++ b/src/yang/etsi-nfv-vnfd.yang @@ -12,7 +12,21 @@ module etsi-nfv-vnfd { description "Virtual Network Function Descriptor."; - + + revision 2022-03-08 { + description + "Version 3.6.1. + + VNFD according to ETSI GS NFV-IFA 011 Release 3."; + } + + revision 2021-07-05 { + description + "Version 3.5.1. + + VNFD according to ETSI GS NFV-IFA 011 Release 3."; + } + revision 2020-06-10 { description "Version 3.3.1. -- GitLab