diff --git a/src/yang/etsi-nfv-common.yang b/src/yang/etsi-nfv-common.yang index a8eef0d9466a44cc2268cd410308821518fd9549..80882997a6268cd25828f7df8e0135883a8c33e3 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. @@ -557,6 +574,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"; + } + } } } @@ -819,12 +865,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 +947,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."; diff --git a/src/yang/etsi-nfv-descriptors.yang b/src/yang/etsi-nfv-descriptors.yang index fc51fbfcb196e2d2c7fd3712fdc930d8a0c90277..f60beb9e893f32030c01d8cba53e4757ba2e096e 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 ae3cf1e19736251f9752643d0b817312bbeb70d5..aa0b9099a2271490b778e36f9bed19fda7c0798d 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 8c9f21b4d160536cb24298defc3127f0aba01173..dfdfa1a1ca6d1050cbf80e86bbbb9dc4a9b60cd2 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 a24746c4f24414b0cf80b553ec837926e2a83276..6cff84a3afe32fa1bc90d5dba37078694094e0d6 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 c79d6b9c19ec5752f29bf5c97f7fef32fff9e967..48713fe0dde4af9e942f1b0c090f493682ad3fe2 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 843a49eb4bc248ac7e7553ce8f6764e8449e4473..37214e2a93a35ffc8a32d6e31c17821e9302af31 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. @@ -78,19 +94,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"; @@ -1509,8 +1512,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)."; @@ -1518,6 +1521,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; diff --git a/src/yang/etsi-nfv-vnfd.yang b/src/yang/etsi-nfv-vnfd.yang index 25bff84f0d7e026b02078b1f2d60162bae4680d2..4a87c3bd6a4ebb0be4e3843acca64524aca0979d 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.