SOL003_20: added new attributes to VnfLinkPortInfo datamodel and update description of an attribute

src/definitions/SOL002SOL003VNFLifecycleManagement_def.yaml

@@ -331,6 +331,10 @@ definitions:
           (i.e. VNFC CP) instance.
           The value refers to an "extCpInfo" item in the VnfInstance or a
           "vnfcCpInfo" item of a "vnfcResourceInfo" item in the VnfInstance.
+          Either cpInstanceId with cpInstanceType set to "EXT_CP" or any combination of cpInstanceId
+          with cpInstanceType set to "VNFC_CP" and vipCpInstanceId (i.e. one or both of them) shall
+          be present for a VnfLinkPortInfo. In case both cpInstanceId with cpInstanceType set to "VNFC_CP"
+          and vipCpInstanceId are present, the two different CP instances share the linkport.
         $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf"
       cpInstanceType:
         description: >
@@ -339,11 +343,35 @@ definitions:
           Permitted values:
           VNFC_CP: The link port is connected to a VNFC CP
           EXT_CP: The link port is associated to an external CP.
+          Either cpInstanceId with cpInstanceType set to "EXT_CP" or any combination of cpInstanceId
+          with cpInstanceType set to "VNFC_CP" and vipCpInstanceId (i.e. one or both of them) shall
+          be present for a VnfLinkPortInfo. In case both cpInstanceId with cpInstanceType set to "VNFC_CP"
+          and vipCpInstanceId are present, the two different CP instances share the linkport.
         type: string
         enum:
           - VNFC_CP
           - EXT_CP
 
+      vipCpInstanceId:
+        description: >
+          VIP CP instance of the VNF connected to this link port. May be present.
+          Either cpInstanceId with cpInstanceType set to "EXT_CP" or any combination of cpInstanceId with cpInstanceType
+          set to "VNFC_CP" and vipCpInstanceId (i.e. one or both of them) shall be present for a VnfLinkPortInfo.
+          In case both cpInstanceId with cpInstanceType set to "VNFC_CP" and vipCpInstanceId are present, the two
+          different CP instances share the linkport.
+          Annex A.4 of ETSI GS NFV-IFA 007 provides examples for configurations where both vipCpInstanceId and
+          vnfcCpInstanceId are present (UC#5 and UC#5-b), only vnfcCpInstanceId is present (UC#2), or only
+          vipCpInstanceId is present (UC6 and UC#6-b).
+        $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVnf"
+
+      trunkResourceId:
+        description: >
+          Identifier of the trunk resource in the VIM.
+          Shall be present if the present link port corresponds to the parent port that the trunk resource is associated with.
+          The value of "trunkResourceId" is scoped by the value of "vimConnectionId" in the "resourceHandle" attribute.
+        $ref: "SOL002SOL003_def.yaml#/definitions/IdentifierInVim"
+
+
   ExtLinkPortInfo:
     description: >
       This type represents information about a link port of an external VL,