Merge branch 'dev-v3.6.1' into master

src/yang/etsi-nfv-common.yang

@@ -16,7 +16,15 @@ submodule etsi-nfv-common {
   description
     "Common data types for ETSI data models.";
 
-revision 2021-07-05 {
+	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.
 
@@ -566,6 +574,35 @@ revision 2021-07-05 {
              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";
+        }
+      }      
     }
   }
 
@@ -828,12 +865,44 @@ revision 2021-07-05 {
           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.";
@@ -878,7 +947,11 @@ revision 2021-07-05 {
           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.";

src/yang/etsi-nfv-descriptors.yang

@@ -14,6 +14,14 @@ 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.

src/yang/etsi-nfv-ns.yang

@@ -11,6 +11,13 @@ 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.

src/yang/etsi-nfv-nsd.yang

@@ -13,6 +13,13 @@ 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.

src/yang/etsi-nfv-pnf.yang

@@ -12,6 +12,13 @@ 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.

src/yang/etsi-nfv-pnfd.yang

@@ -13,7 +13,13 @@ module etsi-nfv-pnfd {
   description
     "Physcial Network Function Descriptor.";
 
-revision 2021-07-05 {
+  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.
 

src/yang/etsi-nfv-vnf.yang

@@ -16,6 +16,14 @@ 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.
@@ -86,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";
@@ -1526,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;

src/yang/etsi-nfv-vnfd.yang

@@ -13,6 +13,13 @@ 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.