Merge branch 'dev-v3.5.1' into 'issue#28'

# Conflicts:
#   src/yang/etsi-nfv-vnf.yang

src/yang/etsi-nfv-common.yang

@@ -865,6 +865,16 @@ submodule etsi-nfv-common {
               "GS NFV IFA011: Section 7.1.3.4, L3AddressData
                information element.";
           }
+
+          leaf fixed-ip-address {
+            type string;
+            description
+              "IP address to be assigned to the CP instance.";
+            reference
+              "GS NFV IFA011: Section 7.1.3.4, L3AddressData
+               information element.";
+          }
+
         }
         description
           "Provides information on the addresses to be assigned to the

src/yang/etsi-nfv-vnf.yang

@@ -594,6 +594,85 @@ submodule etsi-nfv-vnf {
           "GS NFV IFA011: Section 7.1.6.7,
            VnfcConfigurableProperties Information element.";
       }
+
+      list trunk-port {
+        key "parent-port-cpd";
+        description
+          "Specifies the logical topology between an intCpd in
+           trunk mode, used to describe a trunk port, and other
+           intCpds used to describe subports of the same trunk.
+
+           Cardinality 0 is used when there is no intCpd with
+           trunkmode = True, or when no individual intCpds to
+           describe the subports are included in the Vdu.";
+        reference
+          "GS NFV IFA011: Section 7.1.6.2, Vdu information element";
+
+        leaf parent-port-cpd {
+          type leafref {
+            path "../int-cpd/id";
+          }
+          description
+            "Reference of the internal VDU CPD which is used to
+             instantiate the parent port in a logical trunk model.";
+          reference
+            "GS NFV IFA011: Section 7.1.6.11, Information elements
+             related to TrunkPort Topology.";
+        }
+        leaf segmentation-type {
+          default "vlan";
+          type enumeration {
+            enum "vlan";
+            enum "inherit";
+          }
+          description
+            "Specifies the encapsulation type for the traffics
+             coming in and out of the trunk subport.
+             Values:
+             •  VLAN: the subport uses VLAN as encapsulation type.
+             •  INHERIT: the subport gets its segmentation type
+                from the network it’s connected to.
+
+             Cardinality 0 means default value VLAN is used.";
+          reference
+            "GS NFV IFA011: Section 7.1.6.11, Information elements
+             related to TrunkPort Topology.";
+        }
+
+        list sub-port-list {
+          key "sub-port-cpd";
+          description
+            "Provides information used for the subport.";
+          reference
+            "GS NFV IFA011: Section 7.1.6.11, Information elements
+             related to subport of a trunk parent port.";
+
+          leaf sub-port-cpd{
+            type leafref {
+              path "../../int-cpd/id";
+            }
+          description
+            "Reference of the internal VDU CPD which is used
+             to instantiate the subport in a logical trunk model.";
+          reference
+            "GS NFV IFA011: Section 7.1.6.12, Information elements
+             related to subport of a trunk parent port.";
+          }
+          leaf segmentation-id {
+            type unit32;
+            description
+              "Specifies the segmentation ID for the subport, which is
+               used to differentiate the traffics on different networks
+               coming in and out of the trunk port. If a value is provided
+               here it may be overridden by a value provided at run time
+               when the infrastructure doesn’t support mapping of
+               segmentation IDs.";
+            reference
+              "GS NFV IFA011: Section 7.1.6.12, Information elements
+               related to subport of a trunk parent port.";
+          }
+        }
+      }
     }
 
     list virtual-compute-desc {
@@ -901,29 +980,13 @@ submodule etsi-nfv-vnf {
               type string;
             }
             description
-              "A list of rules that should be considered during the
+              "List of rules that should be considered during the
                allocation of the virtual CPUs to logical CPUs in case
                of 'static' virtualCpuPinningPolicy.";
             reference
               "GS NFV IFA011: Section 7.1.9.2.4,
                VirtualCpuPinningData information element.";
           }
-
-          leaf-list cpu-policy {
-            type enumeration {
-              enum "dedicated";
-              enum "shared";
-            }
-            description
-              "Shows the list of dedicated virtual CPU cores and
-               shared virtual CPU cores in a VM. Dedicated refers to
-               a virtual CPU core occupies one physical CPU core.
-               Shared refers to multi virtual CPU cores shared one
-               physical CPU core.";
-            reference
-              "GS NFV IFA011: Section 7.1.9.2.4,
-               VirtualCpuPinningData information element.";
-          }
           description
             "The virtual CPU pinning configuration for the
              virtualised compute resource.";
@@ -1555,7 +1618,7 @@ submodule etsi-nfv-vnf {
            virtual IP addresses allocated when a VipCp instance
            is created from the VipCpd.";
         reference
-          "GS NFV IFA011: Section 7.1.x, VipCpd information element.";
+          "GS NFV IFA011: Section 7.1.17.2, VipCpd information element.";
       }
 
       leaf-list vnf-ext-cpd {
@@ -1568,7 +1631,7 @@ submodule etsi-nfv-vnf {
            virtual IP addresses allocated when a VipCp instance is
            created from the VipCpd.";
         reference
-          "GS NFV IFA011: Section 7.1.x, VipCpd information element.";
+          "GS NFV IFA011: Section 7.1.17.2, VipCpd information element.";
       }
 
       leaf vip-function {
@@ -1582,7 +1645,7 @@ submodule etsi-nfv-vnf {
              • high availability
              • load balancing.";
         reference
-          "GS NFV IFA011: Section 7.1.x, VipCpd information element.";
+          "GS NFV IFA011: Section 7.1.17.2, VipCpd information element.";
       }
 
       uses cpd;
@@ -1668,7 +1731,7 @@ submodule etsi-nfv-vnf {
 	    path "../../affinity-or-anti-affinity-group/id";
 	  }
           description
-            "Identifier(s) of the affinity or anti-affinity
+            "References of the affinity or anti-affinity
              group(s) the VDU belongs to.";
           reference
             "GS NFV IFA011: Section 7.1.8.3, VduProfile information
@@ -1725,7 +1788,7 @@ submodule etsi-nfv-vnf {
 	    path "../../affinity-or-anti-affinity-group/id";
 	  }
           description
-            "Identifier(s) of the affinity or anti-affinity
+            "References of the affinity or anti-affinity
              group(s) the VnfVirtualLinkDesc belongs to.";
           reference
             "GS NFV IFA011: Section 7.1.8.4, VirtualLinkProfile
@@ -2113,10 +2176,10 @@ submodule etsi-nfv-vnf {
           path "../instantiation-level/id";
         }
         description
-          "This attribute references the 'instantiationLevel'
-           entry which defines the default instantiation level for
-           this DF. It shall be present if there are multiple
-           'instantiationLevel' entries.";
+          "References the 'instantiationLevel' entry which defines
+           the default instantiation level for this DF. It shall be
+           present if there are multiple 'instantiationLevel'
+           entries.";
         reference
           "GS NFV IFA011: Section 7.1.8.2 VnfDf information
            element";
@@ -2507,7 +2570,8 @@ submodule etsi-nfv-vnf {
           }
         }
 
-        container change-current-vnf-package-op-config {
+        list change-current-vnf-package-op-config {
+          key "id";
           description
             "Configuration parameters for the
              ChangeCurrentVnfPackageOpConfig operation.";
@@ -2515,6 +2579,16 @@ submodule etsi-nfv-vnf {
             "GS NFV IFA011: Section 7.1.5.2
              VnfLcmOperationsConfiguration information element";
 
+          leaf id {
+            type string;
+            description
+              "Identifier of this parameter set for later referencing.";
+            reference
+              "GS NFV IFA011: Section 7.1.5.13
+               ChangeCurrentVnfPackageOpConfig information
+               element";
+          }
+
           list parameter {
             key "key";
 
@@ -3441,7 +3515,7 @@ submodule etsi-nfv-vnf {
       leaf additional-params-id {
         type leafref {
           path "../../df/lcm-operations-configuration/" +
-               "change-current-vnf-package-op-config/parameter/key";
+               "change-current-vnf-package-op-config/id";
         }
         description
           "References the ChangeCurrentVnfPackageOpConfig information