Merge branch '2.7.1-dev-SOL003-reference-descriptors' into '2.7.1-dev'

SOL003 - Implementation of additional test steps for checks against VNFD content in v2.7.1

See merge request !145

SOL003/VNFLifecycleManagement-API/IndividualVNFInstance.robot

@@ -35,6 +35,7 @@ Get Information about an individual VNF Instance
     GET individual vnfInstance
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    vnfInstance
+    Check HTTP Response Body vnfInstance content against VNF Descriptor
     
 PUT Individual VNFInstance - Method not implemented 
     [Documentation]    Test ID: 7.3.1.2.3

SOL003/VNFLifecycleManagement-API/IndividualVnfLcmOperationOccurence.robot

@@ -30,6 +30,7 @@ Get Individual VNF LCM Operation occurrences
     Get Individual VNF LCM Operation occurrences
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is    VnfLcmOpOcc 
+    Check HTTP Response Body of Individual VNF LCM Operation occurrences content against VNF Descriptor
 
 PUT Individual VNF LCM Operation occurrences - Method not implemented
     [Documentation]    Test ID: 7.3.1.12.3

SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot

@@ -8,6 +8,8 @@ Library    BuiltIn
 Library    JSONLibrary
 Library    Collections
 Library    JSONSchemaLibrary    schemas/
+Variables    descriptors/SOL001/VNFD/vnfd_SOL001.yaml
+Variables    descriptors/SOL006/VNFD/vnfd_SOL006.yaml
 
 *** Keywords ***
 Get Vnf Instance 
@@ -123,7 +125,9 @@ Send VNF Instance Resource Create Request
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/createVnfRequest.json
+    Run Keyword If    ${check_descriptors} == 1    PARSE the Descriptor File
+    ${template}=    Get File    jsons/createVnfRequest.json
+    ${body}=        Format String   ${template}     vnfdId=${Descriptor_ID}    vnfProvider=${Provider}    vnfProductName=${Product_Name}    vnfSoftwareVersion=${Software_Version}    vnfdVersion= ${Descriptor_Version}    flavourId=${Flavour_ID}
     ${response}=    Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances    ${body}
 
 Send VNF Instance Resource Delete Request
@@ -322,11 +326,13 @@ POST Change VNF deployment flavour
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${check_descriptors} == 1    PARSE the Descriptor File
     ${template}=    Get File    jsons/changeVnfFlavourRequest.json
-    ${body}=        Format String   ${template}     newFlavourId=${newFlavourId}
+    ${body}=        Format String   ${template}     newFlavourId=${Flavour_ID}
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}/change_flavour    ${body} 
     ${outputResponse}=    Output    response
-	Set Global Variable    ${response}    ${outputResponse}  	 
+	Set Global Variable    ${response}    ${outputResponse}	 
+
 GET Change VNF deployment flavour
     log    Trying to perform a GET. This method should not be implemented
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
@@ -360,8 +366,9 @@ POST Create a new vnfInstance
     Set Headers  {"Accept":"${ACCEPT}"}  
     Set Headers  {"Content-Type": "${CONTENT_TYPE}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
+    Run Keyword If    ${check_descriptors} == 1    PARSE the Descriptor File
     ${template}=    Get File    jsons/createVnfRequest.json
-    ${body}=        Format String   ${template}     vnfdId=${vnfdId} 
+    ${body}=        Format String   ${template}     vnfdId=${Descriptor_ID}    vnfProvider=${Provider}    vnfProductName=${Product_Name}    vnfSoftwareVersion=${Software_Version}    vnfdVersion= ${Descriptor_Version} 
     Post    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 	
@@ -491,10 +498,13 @@ PATCH individual vnfInstance
     Set Headers    {"Accept":"${ACCEPT}"}  
     Set Headers    {"Content-Type": "${CONTENT_TYPE_PATCH}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
-    ${body}=    Get File    jsons/patchBodyRequest.json
+    Run Keyword If    ${check_descriptors} == 1    PARSE the Descriptor File
+    ${template}=    Get File    jsons/patchBodyRequest.json
+    ${body}=        Format String   ${template}     vnfdId=${Descriptor_ID}    vnfdVersion= ${Descriptor_Version}
     Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/vnf_instances/${vnfInstanceId}    ${body}	
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
+	
 DELETE individual vnfInstance
     log    Trying to delete an individual VNF instance
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"Authorization":"${AUTHORIZATION}"}
@@ -1180,3 +1190,160 @@ GET test endpoint
 Check HTTP Response Header Contain Link
     ${linkURL}=    Get Value From Json    ${response['headers']}    $..Link
     Should Not Be Empty    ${linkURL}
+    
+Check HTTP Response Body vnfInstance content against VNF Descriptor
+    Run Keyword If    ${check_descriptors} == 1    Check Individual VNF Instance Content
+    
+Check Individual VNF Instance Content    
+    PARSE the Descriptor File
+    Match the VNF Instance Response Attributes with Descriptors
+    
+PARSE the Descriptor File
+    Run Keyword If  '${descriptorType}'=='SOL001'    Fetch Information from SOL001 descriptor file    ELSE    Fetch Information from SOL006 descriptor file
+    
+Fetch Information from SOL001 descriptor file
+    @{VDU_labels}=    Create List
+    @{VNF_labels}=    Create List
+    @{VirtualLink_labels}=    Create List
+    @{CP_labels}=    Create List
+    @{Storage_labels}=    Create List
+    FOR    ${key}    IN    @{topology_template.node_templates.keys()} 
+        ${key_type}=    Get Variable Value    ${topology_template.node_templates.${key}.type}
+        ${VDU_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}   ${tosca_type_VDU_compute}
+        ${VNF_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_VNF}
+        ${Link_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_virtual_link}
+        ${VDUcp_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_VDU_cp}
+        ${Storage_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key_type}    ${tosca_type_storage}
+        Run Keyword If    ${VDU_check}    Append To List    ${VDU_labels}    ${key}
+        Run Keyword If    ${VNF_check}    Append To List    ${VNF_labels}    ${key}
+        Run Keyword If    ${VNF_check}    Get VNF Attributes from SOL001    ${key}            
+        Run Keyword If    ${Link_check}    Append To List    ${VirtualLink_labels}    ${key}
+        Run Keyword If    ${VDUcp_check}    Append To List    ${CP_labels}    ${key}
+        Run Keyword If    ${Storage_check}    Append To List    ${Storage_labels}    ${key}
+    END
+    Set Global Variable    @{VDU_IDs}    @{VDU_labels}
+    Set Global Variable    @{VNF_IDs}    @{VNF_labels}
+    Set Global Variable    @{VirtualLink_IDs}    @{VirtualLink_labels}
+    Set Global Variable    @{CP_IDs}    @{CP_labels}
+    Set Global Variable    @{Storage_IDs}    @{Storage_labels}
+
+Get VNF Attributes from SOL001
+     [Arguments]    ${VNF_label}
+    ${descriptor_id}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.descriptor_id}
+    ${provider}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.provider}
+    ${product_name}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.product_name}
+    ${software_version}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.software_version}
+    ${descriptor_version}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.descriptor_version}
+    ${flavour_id}=    Get Variable Value    ${topology_template.node_templates.${VNF_label}.properties.flavour_id}
+    
+    Set Global Variable    ${Descriptor_ID}    ${descriptor_id}
+    Set Global Variable    ${Provider}    ${provider}
+    Set Global Variable    ${Product_Name}    ${product_name}
+    Set Global Variable    ${Software_Version}    ${software_version}
+    Set Global Variable    ${Descriptor_Version}    ${descriptor_version}
+    Set Global Variable    ${Flavour_ID}    ${flavour_id}
+
+
+Fetch Information from SOL006 descriptor file
+    ${descriptor_id}=    Get Variable Value    ${nfv.vnfd[0].id}
+    ${provider}=    Get Variable Value    ${nfv.vnfd[0].provider}
+    ${product_name}=    Get Variable Value    ${nfv.vnfd[0]['product-name']}
+    ${software_version}=    Get Variable Value    ${nfv.vnfd[0]['software-version']}
+    ${descriptor_version}=    Get Variable Value    ${nfv.vnfd[0].version}    
+    ${VDUcount}=    Get Length    ${nfv.vnfd[0].vdu}
+    ${extCP_count}=    Get Length    ${nfv.vnfd[0]['ext-cpd']}
+    ${virtualLink_count}=    Get length    ${nfv.vnfd[0]['int-virtual-link-desc']}
+    ${instantiation_levels}=    Get Length    ${nfv.vnfd[0].df['instantiation-level']}    
+    FOR    ${key}    IN    @{nfv.vnfd[0].keys()}
+        ${VDU_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    vdu
+        Run Keyword If    ${VDU_check}    Get VDU IDs    ${VDUcount}
+        ${extCP_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    ext-cpd
+        Run Keyword If    ${extCP_check}    Get External CP IDs    ${extCP_count}
+        ${virtualLink_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    int-virtual-link-desc
+        Run Keyword If    ${virtualLink_check}    Get Virtual Link IDs   ${virtualLink_count}    
+        ${DF_check}=    Run Keyword And Return Status    Should Be Equal As Strings    ${key}    df
+        Run Keyword If    ${DF_check}    Get Instantiation Levels    ${instantiation_levels}    
+    END
+    Set Global Variable    ${Descriptor_ID}    ${descriptor_id}
+    Set Global Variable    ${Provider}    ${provider}
+    Set Global Variable    ${Product_Name}    ${product_name}
+    Set Global Variable    ${Software_Version}    ${software_version}
+    Set Global Variable    ${Descriptor_Version}    ${descriptor_version}
+    
+Get VDU IDs
+    [Arguments]    ${count}    
+    @{VDU_labels}=    Create List
+    ${Storage_labels}=    Create List
+    FOR    ${i}    IN RANGE    ${count}
+        Append To List    ${VDU_labels}    ${nfv.vnfd[0].vdu[${i}]['id']}
+        Append To List    ${Storage_labels}    ${nfv.vnfd[0].vdu[${i}]['virtual-storage-desc']} 
+        Get Internal CPs for each VDU    ${i}   
+    END
+    Set Global Variable    ${VDU_IDs}    ${VDU_labels}
+    Set Global Variable    ${Storage_IDs}    ${Storage_labels}
+            
+Get Internal CPs for each VDU
+    [Arguments]    ${vdu}
+    ${count}=    Get Length    ${nfv.vnfd[0].vdu[${vdu}]['int-cpd']}    
+    ${internal_CPs}=    Create List
+    FOR    ${i}    IN RANGE    ${count}
+        Append To List    ${internal_CPs}    ${nfv.vnfd[0].vdu[${vdu}]['int-cpd'][${i}]['id']} 
+    END
+    Set Global Variable    ${internalCP_IDs}    ${internal_CPs}
+    
+Get External CP IDs
+    [Arguments]    ${count}    
+    @{external_CPs}=    Create List
+    FOR    ${i}    IN RANGE    ${count}
+        Append To List    ${external_CPs}    ${nfv.vnfd[0].ext_cpd[${i}].id} 
+    END
+    Set Global Variable    ${externalCP_IDs}    ${external_CPs}
+
+Get Virtual Link IDs
+    [Arguments]    ${count}    
+    ${VirtualLink_labels}=    Create List
+    FOR    ${i}    IN RANGE    ${count}
+        Append To List    ${VirtualLink_labels}    ${nfv.vnfd[0]['int-virtual-link-desc'][${i}]['id']} 
+    END
+    Set Global Variable    ${VirtualLink_IDs}    ${VirtualLink_labels}
+
+Get Instantiation Levels
+    [Arguments]    ${count}
+    @{Instantiation_Levels}=    Create List
+    FOR    ${i}    IN RANGE    ${count}
+        Append To List    ${Instantiation_Levels}    ${nfv.vnfd[0].df['instantiation-level'][${i}]['id']} 
+    END
+    Set Global Variable    ${InstantiationLevel_IDs}    ${Instantiation_Levels}
+    
+Match the VNF Instance Response Attributes with Descriptors
+    #Checking Response attributes with VNF Descriptors
+    Should Be Equal As Strings    ${response['body']['vnfdId']}    ${Descriptor_ID}
+    Should Be Equal As Strings    ${response['body']['vnfProvider']}    ${Provider}
+    Should Be Equal As Strings    ${response['body']['vnfProductName']}    ${Product_Name}
+    Should Be Equal As Strings    ${response['body']['vnfSoftwareVersion']}    ${Software_Version}
+    Should Be Equal As Strings    ${response['body']['vnfdVersion']}    ${Descriptor_Version}
+    Should Be Equal As Strings    ${response['body']['instantiatedVnfInfo']['flavourId']}    ${Flavour_ID}
+    List Should Contain Value    ${VDU_IDs}    ${response['body']['instantiatedVnfInfo']['vnfcResourceInfo']['vduId']}        
+    Run Keyword If  '${descriptorType}'=='SOL006'    List Should Contain Value    ${externalCP_IDs}    ${response['body']['instantiatedVnfInfo']['extCpInfo'][0]['cpdId']}
+    Run Keyword If  '${descriptorType}'=='SOL006'    List Should Contain Value    ${internalCP_IDs}    ${response['body']['instantiatedVnfInfo']['vnfcResourceInfo'][0]['vnfcCpInfo'][0]['cpdId']}
+    Run Keyword If  '${descriptorType}'=='SOL001'    List Should Contain Value    @{CP_IDs}    ${response['body']['instantiatedVnfInfo']['extCpInfo'][0]['cpdId']}
+    Run Keyword If  '${descriptorType}'=='SOL001'    List Should Contain Value    @{CP_IDs}    ${response['body']['instantiatedVnfInfo']['vnfcResourceInfo'][0]['vnfcCpInfo'][0]['cpdId']}
+    List Should Contain value    ${Storage_IDs}    ${response['body']['instantiatedVnfInfo']['virtualStorageResourceInfo'][0]['virtualStorageDescId']}
+    List Should Contain Value    ${VirtualLink_IDs}    ${response['body']['instantiatedVnfInfo']['extManagedVirtualLinkInfo'][0]['vnfVirtualLinkDescId']}
+
+Check HTTP Response Body of Individual VNF LCM Operation occurrences content against VNF Descriptor
+    Run Keyword If    ${check_descriptors} == 1    Check Individual VNF LCM Operation Occurence Content
+    
+Check Individual VNF LCM Operation Occurence Content
+    PARSE the Descriptor File
+    Match the VNF LCM Operation Occurence Response Attributes with Descriptors
+    
+Match the VNF LCM Operation Occurence Response Attributes with Descriptors
+    #Checking Response attributes with VNF Descriptors
+    Should Be Equal As Strings    ${response['body']['changedInfo']['vnfdId']}    ${Descriptor_ID}
+    Should Be Equal As Strings    ${response['body']['changedInfo']['vnfdVersion']}    ${Descriptor_Version}
+    List Should Contain Value    ${VDU_IDs}    ${response['body']['resourceChanges']['affectedVnfcs'][0]['vduId']}
+    List Should Contain value    ${Storage_IDs}    ${response['body']['resourceChanges']['affectedVirtualStorages'][0]['virtualStorageDescId']}
+    List Should Contain Value    ${VirtualLink_IDs}    ${response['body']['resourceChanges']['affectedVirtualLinks'][0]['virtualStorageDescId']}
+    
+    
\ No newline at end of file

SOL003/VNFLifecycleManagement-API/descriptors/SOL001/VNFD/vnfd_SOL001.yaml

+tosca_definitions_version: tosca_simple_yaml_1_2
+description: "TST010 reference VNF-B"
+metadata:
+  descriptor_id: "VNF-B"
+  vendor: "ETSI TST WG"
+  version: "2.0"
+topology_template:
+  substitution_mappings:
+    node_type: "tosca.nodes.nfv.VNF"
+    requirements:
+      virtual_link_management:
+        [management, virtual_link_management]
+      virtual_link_left:
+        [left, virtual_link_left]
+      virtual_link_right:
+        [right, virtual_link_right]
+  node_templates:
+    right:
+      type: "tosca.nodes.nfv.VduCp"
+      properties:
+        order: 1
+      requirements:
+        virtual_link_right:
+        virtual_binding: VDU-B-2
+    management:
+      type: "tosca.nodes.nfv.VduCp"
+      properties:
+        order: 0
+      requirements:
+        virtual_link_management:
+        virtual_binding: VDU-B-1
+    left:
+      type: "tosca.nodes.nfv.VduCp"
+      properties:
+        order: 2
+      requirements:
+        virtual_link_left:
+        virtual_binding: VDU-B-1
+    internal_vl:
+      type: "tosca.nodes.nfv.VnfVirtualLink"
+      properties:
+        connectivity_type:
+          layer_protocols: [ ipv4 ]
+        description: Internal Virtual link in the VNF
+        vl_profile:
+          max_bitrate_requirements:
+            root: 100000
+            leaf: 20000
+          min_bitrate_requirements:
+            root: 10000
+            leaf: 10000
+    internal_vdu_b_1_cp:
+      type: "tosca.nodes.nfv.VduCp"
+      properties:
+        order: 2
+      requirements:
+        - virtual_binding: VDU-B-1
+        - virtual_link: internal_vl
+    internal_vdu_b_2_cp:
+      type: "tosca.nodes.nfv.VduCp"
+      properties:
+        order: 0
+      requirements:
+        - virtual_binding: VDU-B-2
+        - virtual_link: internal_vl
+    vdu_b_1_vsd:
+      type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
+      properties:
+        virtual_block_storage_data:
+          size_of_storage: 20
+          rdma_enabled: false
+        sw_image_data:
+          name: "vdu-b-1 image"
+          version: "1.1"
+          checksum: 
+            algorithm: "sha-224"
+            hash: "somehashfortst010"
+          container_format: "bare"
+          disk-format: qcow2
+          min-disk: '1'
+          min-ram: '2'
+          size: '1'
+      artifacts:
+        sw_image:
+          type: "tosca.artifacts.nfv.SwImage"
+          file: vdu-b-1.qcow2
+    vdu_b_2_vsd:
+      type: "tosca.nodes.nfv.Vdu.VirtualBlockStorage"
+      properties:
+        virtual_block_storage_data:
+          size_of_storage: 20
+          rdma_enabled: false
+        sw_image_data:
+          name: "vdu-b-2 image"
+          version: "1.1"
+          checksum: 
+            algorithm: "sha-224"
+            hash: "somehashfortst010"
+          container_format: "bare"
+          disk-format: qcow2
+          min-disk: '1'
+          min-ram: '2'
+          size: '1'
+      artifacts:
+        sw_image:
+          type: tosca.artifacts.nfv.SwImage
+          file: vdu-b-2.qcow2
+    vnf_b_1_VNF:
+      type: "tosca.nodes.nfv.VNF"
+      properties:
+        descriptor_id: "VNF-B-2VDUs"
+        descriptor_version: "2.0"
+        provider: "ETSI TST WG"
+        product_name: "VNF-B-2VDUs"
+        software_version: "2.0"
+        product_info_name: "VNF-B-2VDUs"
+        product_info_description: "TST010 reference VNF-B with 2 VDUs"
+        flavour_id: "VNF-B-2VDU_flavor"
+        flavour_description: "VNF-B with 2 VDUs flavor"
+        vnfm_info: 
+          etsivnfm: 
+          - v2.3.1 
+        interfaces:
+            Vnflcm:
+              scale:
+                implementation: scale-example.yaml
+              terminate:
+                implementation: terminate-example.yaml
+              operate:
+                implementation: operate-example.yaml
+    VDU_B_1:
+      type: "tosca.nodes.nfv.Vdu.Compute"
+      properties:
+        name: "vdu-b-1-vcd"
+        descriptor: "Description of VDU-B-1"
+        vdu_profile:
+          min_number_of_instances: 1
+          max_number_of_instances: 2
+      capabilities:
+        virtual_compute:
+          properties:
+            virtual_memory:
+              virtual_mem_size: 4096
+              numa_enabled: false
+            virtual_cpu:
+              num_virtual_cpu: 2
+      requirements:
+        virtual_storage:
+        - "vdu-b-1-vsd"
+    VDU_B_2:
+      type: "tosca.nodes.nfv.Vdu.Compute"
+      properties:
+        name: "vdu-b-2-vcd"
+        descriptor: "Description of VDU-B-2"
+        vdu_profile:
+          min_number_of_instances: 1
+          max_number_of_instances: 4
+      capabilities:
+        virtual_compute:
+          properties:
+            virtual_memory:
+              virtual_mem_size: 6144
+              numa_enabled: false
+            virtual_cpu:
+              num_virtual_cpu: 2
+      requirements:
+        virtual_storage:
+        - "vdu-b-2-vsd"                
\ No newline at end of file

SOL003/VNFLifecycleManagement-API/descriptors/SOL006/VNFD/vnfd_SOL006.yaml

+nfv:
+  vnfd:
+    - id: VNF-B-2vdu
+      provider: ETSI TST WG
+      product-name: TST010 reference VNF-B with 2 VDUs
+      software-version: '2.2'
+      version: '2.2'
+      vnfm-info: ETSI VNFM
+      vdu:
+        - id: vdu-b-1
+          name: VNF-B VDU 1
+          int-cpd:
+           - id: left
+             layer-protocol: ethernet
+           - id: management
+             layer-protocol: ethernet
+           - id: internal
+             layer-protocol: ethernet
+             int-virtual-link-desc: internal-vl
+          virtual-compute-desc: vdu-b-1-vcd
+          virtual-storage-desc: vdu-b-1-vsd
+          sw-image-desc: vdu-b-1-image
+        - id: vdu-b-2
+          name: VNF-B VDU 2
+          int-cpd:
+           - id: right
+             layer-protocol: ethernet
+           - id: management
+             layer-protocol: ethernet
+           - id: internal
+             layer-protocol: ethernet
+             int-virtual-link-desc: internal-vl
+          virtual-compute-desc: vdu-b-2-vcd
+          virtual-storage-desc: vdu-b-2-vsd
+          sw-image-desc: vdu-b-2-image
+      virtual-compute-desc:
+        id: vdu-b-1-vcd
+        virtual-memory:
+          size: '4.0'
+        virtual-cpu:
+          num-virtual-cpu: '2'
+      virtual-storage-desc:
+        id: vdu-b-1-vsd
+        type-of-storage: root-storage
+        size-of-storage: '0'
+      sw-image-desc:
+        id: vdu-b-1-image
+        name: VNF-B image
+        version: '1.1'
+        checksum:
+          algorithm: sha-224
+          hash: somehashfortst010
+        container-format: bare
+        disk-format: qcow2
+        min-disk: '1'
+        min-ram: '2.0'
+        size: '1'
+        image: 'http://someurl.com/VNF-B.qcow2'
+      virtual-compute-desc:
+        id: vdu-b-2-vcd
+        virtual-memory:
+          size: '6.0'
+        virtual-cpu:
+          num-virtual-cpu: '2'
+      virtual-storage-desc:
+        id: vdu-b-2-vsd
+        type-of-storage: root-storage
+        size-of-storage: '0'
+      sw-image-desc:
+        id: vdu-b-2-image
+        name: VNF-B-2 image
+        version: '1.1'
+        checksum:
+          algorithm: sha-224
+          hash: somehashfortst010
+        container-format: bare
+        disk-format: qcow2
+        min-disk: '1'
+        min-ram: '2.0'
+        size: '1'
+        image: 'http://someurl.com/VNF-B-2.qcow2'
+      int-virtual-link-desc:
+        - id: internal-vl
+          flavour:
+            id: internal-vl-flavour
+            qos:
+              latency: '1'
+              packet-delay-variation: '1'
+              packet-loss-ratio: '0.05'
+          connectivity-type:
+            layer-protocol: ethernet     
+      ext-cpd:
+        - id: ext-b-left
+          int-cpd:
+            vdu-id: vdu-b-1
+            cpd: left
+          layer-protocol: ethernet
+        - id: management
+          int-cpd:
+            vdu-id: vdu-b-1
+            cpd: management
+          layer-protocol: ethernet
+        - id: ext-b-right
+          int-cpd:
+            vdu-id: vdu-b-2
+            cpd: right
+          layer-protocol: ethernet
+      df:
+        id: normal
+        vdu-profile:
+          - id: vdu-b-1
+            min-number-of-instances: '1'
+            max-number-of-instances: '2'
+          - id: vdu-b-2
+            min-number-of-instances: '1'
+            max-number-of-instances: '4'          
+        instantiation-level:
+          - id: double
+            vdu-level:
+              - vdu-id: vdu-b-1
+                number-of-instances: '2'
+              - vdu-id: vdu-b-2
+                number-of-instances: '2'
+          - id: single
+            vdu-level:
+              - vdu-id: vdu-b-1
+                number-of-instances: '1'
+              - vdu-id: vdu-b-2
+                number-of-instances: '1'
+        default-instantiation-level: single
+        lcm-operations-configuration:
+          scale-vnf-to-level-op-config:
+            arbitrary-target-levels-supported: 'true'
+          terminate-vnf-op-config:
+            min-graceful-termination: '1'
+          operate-vnf-op-config:
+            min-graceful-stop-timeout: '1'
\ No newline at end of file

SOL003/VNFLifecycleManagement-API/environment/variables.txt

@@ -97,4 +97,29 @@ ${element}
 ${aspectId}
 ${scaleOutResponse}
 
-${callbackResp}    localhost
\ No newline at end of file
+${callbackResp}    localhost
+
+${descriptorType}    SOL001
+${check_descriptors}	1
+
+${tosca_type_VDU_compute}    tosca.nodes.nfv.Vdu.Compute
+${tosca_type_VNF}    tosca.nodes.nfv.VNF
+${tosca_type_virtual_link}    tosca.nodes.nfv.VnfVirtualLink
+${tosca_type_VDU_cp}    tosca.nodes.nfv.VduCp
+${tosca_type_storage}    tosca.nodes.nfv.Vdu.VirtualBlockStorage
+ 
+@{VDU_IDs}
+@{VNF_IDs}
+@{virtualLink_IDs}
+@{CP_IDs}
+@{Storage_IDs}
+@{internalCP_IDs}
+@{externalCP_IDs}
+@{InstantiationLevel_IDs}