SOL005_21: updated descriptions and notes and added attribute to InstantiateVnfData datamodel

src/SOL005/NSLifecycleManagement/definitions/SOL005NSLifecycleManagement_def.yaml

@@ -2496,18 +2496,39 @@ definitions:
       update operation, a set of these parameters are then passed by the NFVO to the VNFM. It shall comply with the
       provisions defined in Table 6.5.3.24-1.
     type: object
-    required:
-      - vnfdId
-      - vnfFlavourId
     properties:
       vnfdId:
         description: >
           Information sufficient to identify the VNFD which defines
           the VNF to be instantiated.
+
+          If vnfdId and vnfFlavourId (and vnfInstantiationLevelId,
+          if provided) are present, there should be only one vnfProfile
+          that matches the vnfdId and vnfFlavourId (and vnfInstantiationLevelId,
+          if present) in the NS deployment flavour specified in the NSD
+          associated to the NS instance to which the present operation is
+          triggered. In the case there is more than one matching vnfProfile,
+          the NFVO may select a matching vnfProfile based on other information,
+          such as external VL.
+
+          Either the attribute triple "vnfdId, vnfFlavourId and vnfInstantiationLevelId
+          (if provided)" or the attribute "vnProfileId" shall be present, but not both.
         $ref: "../../definitions/SOL005_def.yaml#/definitions/Identifier"
       vnfFlavourId:
         description: >
           Identifier of the VNF deployment flavor to be instantiated.
+
+          If vnfdId and vnfFlavourId (and vnfInstantiationLevelId,
+          if provided) are present, there should be only one vnfProfile
+          that matches the vnfdId and vnfFlavourId (and vnfInstantiationLevelId,
+          if present) in the NS deployment flavour specified in the NSD
+          associated to the NS instance to which the present operation is
+          triggered. In the case there is more than one matching vnfProfile,
+          the NFVO may select a matching vnfProfile based on other information,
+          such as external VL.
+
+          Either the attribute triple "vnfdId, vnfFlavourId and vnfInstantiationLevelId
+          (if provided)" or the attribute "vnProfileId" shall be present, but not both.
         $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
       vnfInstantiationLevelId:
         description: >
@@ -2515,7 +2536,26 @@ definitions:
           flavor to be instantiated. If not present, the default
           instantiation level as declared in the VNFD is
           instantiated.
+
+          If vnfdId and vnfFlavourId (and vnfInstantiationLevelId,
+          if provided) are present, there should be only one vnfProfile
+          that matches the vnfdId and vnfFlavourId (and vnfInstantiationLevelId,
+          if present) in the NS deployment flavour specified in the NSD
+          associated to the NS instance to which the present operation is
+          triggered. In the case there is more than one matching vnfProfile,
+          the NFVO may select a matching vnfProfile based on other information,
+          such as external VL.
+
+          Either the attribute triple "vnfdId, vnfFlavourId and vnfInstantiationLevelId
+          (if provided)" or the attribute "vnProfileId" shall be present, but not both.
         $ref: "../../definitions/SOL005_def.yaml#/definitions/IdentifierInVnfd"
+      vnfProfileId:
+        description: >
+          Identifier of (Reference to) a vnfProfile defined in the NSD which is used for instantiating the VNF.
+
+          Either the attribute triple "vnfdId, vnfFlavourId and vnfInstantiationLevelId
+          (if provided)" or the attribute "vnProfileId" shall be present, but not both.
+        $ref: "#/definitions/IdentifierInNsd"
       vnfInstanceName:
         description: >
           Human-readable name of the VNF instance to be created.
@@ -2547,7 +2587,11 @@ definitions:
         type: string
       vnfConfigurableProperties:
         description: >
-          Values for the "vnfConfigurableProperties" input
+          If present, this attribute provides values for the configurable
+          properties declared in the VNFD. These values will override
+          the default values if default values are also declared in the VNFD.
+
+          It provides values for the "vnfConfigurableProperties" input
           parameter of the Instantiate VNF operation
           defined in ETSI GS NFV-SOL 003 [4].
         $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs"
@@ -2558,11 +2602,19 @@ definitions:
         $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs"
       metadata:
         description: >
+          If present, this attribute provides values for metadata. Metadata
+          can but need not be declared in the VNFD. These values will override
+          the default values if default values are also declared in the VNFD.
+
           This attribute provides values for the "metadata" input parameter of
           the Create VNF Identifier operation.
         $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs"
       extensions:
         description: >
+          If present, this attribute provides values for extensions declared
+          in the VNFD. These values will override the default values if default
+          values are also declared in the VNFD.
+
           This attribute provides values for the "extensions" input parameter of
           the Instantiate VNF operation.
         $ref: "../../definitions/SOL005_def.yaml#/definitions/KeyValuePairs"