VnfcResourceInfo removed from VNFLifecycleManagement_def.yaml, now ref to...

VnfcResourceInfo removed from VNFLifecycleManagement_def.yaml, now ref to VnfcResourceInfo in SOL002SOL003VNFLifecycleManagement_def.yaml

src/SOL002/VNFLifecycleManagement/definitions/VNFLifecycleManagement_def.yaml

@@ -402,7 +402,7 @@ definitions:
           by the VNFCs of the VNF instance.
         type: array
         items:
-          $ref: "#/definitions/VnfcResourceInfo"
+          $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/VnfcResourceInfo"
       virtualLinkResourceInfo:
         description: >
           Information about the virtualised network resources used by the VLs
@@ -840,92 +840,7 @@ definitions:
           Metadata about this resource.
         $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs"
 
-  VnfcResourceInfo:
-    description: >
-      This type represents the information on virtualised compute and storage
-      resources used by a VNFC in a VNF instance.
-    type: object
-    required:
-      - id
-      - vduId
-      - computeResource
-      - vnfcCpInfo
-    properties:
-      id:
-        description: >
-          Identifier of this VnfcResourceInfo instance.
-        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf"
-      vduId:
-        description: >
-          Reference to the applicable VDU in the VNFD.
-        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd"
-      computeResource:
-        description: >
-          Reference to the VirtualCompute resource.
-        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/ResourceHandle"
-      storageResourceIds:
-        description: >
-          References to the VirtualStorage resources. The value refers to a
-          VirtualStorageResourceInfo item in the VnfInstance.
-        type: array
-        items:
-          $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf"
-      reservationId:
-        description: >
-          The reservation identifier applicable to the resource. It shall be
-          present when an applicable reservation exists.
-        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
-      vnfcCpInfo:
-        description: >
-          CPs of the VNFC instance.
-          Shall be present when that particular CP of the VNFC instance is
-          associated to an external CP of the VNF instance.
-          May be present otherwise.
-        type: array
-        items:
-          type: object
-          required:
-            - id
-            - cpdId
-          properties:
-            id:
-              description: >
-                Identifier of this VNFC CP instance and the associated array
-                entry.
-              $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf"
-            cpdId:
-              description: >
-                Identifier of the VDU CPD, cpdId, in the VNFD.
-              $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd"
-            vnfExtCpId:
-              description: >
-                When the VNFC CP is exposed as external CP of the VNF, the
-                identifier of this external VNF CP.
-              $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf"
-            cpProtocolInfo:
-              description: >
-                Network protocol information for this CP.
-              $ref: "../../../definitions/SOL002SOL003VNFLifecycleManagement_def.yaml#/definitions/CpProtocolInfo"
-            vnfLinkPortId:
-              description: >
-                Identifier of the "vnfLinkPorts" structure in the
-                "vnfVirtualLinkResourceInfo" structure. Shall be present if
-                the CP is associated to a link port.
-              $ref: "../../../SOL002SOL003_def.yaml#/definitions/IdentifierInVnf"
-            metadata:
-              description: >
-                Metadata about this external CP.
-              $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs"
-#            addresses:
-#              description: >
-#                List of network addresses that have been configured (statically
-#                or dynamically) on the CP.
-#              $ref: "#/definitions/NetworkAddressInfo"
-      metadata:
-        description: >
-          Metadata about this resource.
-        $ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs"
-
+  
   VnfExtCpData:
     # Ref TBD
     description: >