updated importing variables for descriptors in LCM-API

SOL003/VNFLifecycleManagement-API/VnfLcmMntOperationKeywords.robot

@@ -9,8 +9,8 @@ Library    JSONLibrary
 Library    Collections
 Library    Process
 Library    JSONSchemaLibrary    schemas/
-Variables    descriptors/SOL001/VNFD/vnfd_SOL001.yaml
-Variables    descriptors/SOL006/VNFD/vnfd_SOL006.yaml
+#Variables    descriptors/SOL001/VNFD/vnfd_SOL001.yaml
+#Variables    descriptors/SOL006/VNFD/vnfd_SOL006.yaml
 
 *** Keywords ***
 Create Sessions   
@@ -1441,6 +1441,7 @@ 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
+    Import Variables    ${CURDIR}/descriptors/SOL001/VNFD/vnfd_SOL001.yaml
     @{VDU_labels}=    Create List
     @{VNF_labels}=    Create List
     @{VirtualLink_labels}=    Create List
@@ -1467,7 +1468,8 @@ Fetch Information from SOL001 descriptor file
     Set Global Variable    @{Storage_IDs}    @{Storage_labels}
 
 Get VNF Attributes from SOL001
-     [Arguments]    ${VNF_label}
+    [Arguments]    ${VNF_label}
+    Import Variables    ${CURDIR}/descriptors/SOL001/VNFD/vnfd_SOL001.yaml    
     ${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}
@@ -1484,6 +1486,7 @@ Get VNF Attributes from SOL001
 
 
 Fetch Information from SOL006 descriptor file
+    Import Variables    ${CURDIR}/descriptors/SOL006/VNFD/vnfd_SOL006.yaml
     ${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']}
@@ -1511,6 +1514,7 @@ Fetch Information from SOL006 descriptor file
     
 Get VDU IDs
     [Arguments]    ${count}    
+    Import Variables    ${CURDIR}/descriptors/SOL006/VNFD/vnfd_SOL006.yaml
     @{VDU_labels}=    Create List
     ${Storage_labels}=    Create List
     FOR    ${i}    IN RANGE    ${count}
@@ -1523,6 +1527,7 @@ Get VDU IDs
             
 Get Internal CPs for each VDU
     [Arguments]    ${vdu}
+    Import Variables    ${CURDIR}/descriptors/SOL006/VNFD/vnfd_SOL006.yaml    
     ${count}=    Get Length    ${nfv.vnfd[0].vdu[${vdu}]['int-cpd']}    
     ${internal_CPs}=    Create List
     FOR    ${i}    IN RANGE    ${count}
@@ -1532,6 +1537,7 @@ Get Internal CPs for each VDU
     
 Get External CP IDs
     [Arguments]    ${count}    
+    Import Variables    ${CURDIR}/descriptors/SOL006/VNFD/vnfd_SOL006.yaml
     @{external_CPs}=    Create List
     FOR    ${i}    IN RANGE    ${count}
         Append To List    ${external_CPs}    ${nfv.vnfd[0].ext_cpd[${i}].id} 
@@ -1540,6 +1546,7 @@ Get External CP IDs
 
 Get Virtual Link IDs
     [Arguments]    ${count}    
+    Import Variables    ${CURDIR}/descriptors/SOL006/VNFD/vnfd_SOL006.yaml    
     ${VirtualLink_labels}=    Create List
     FOR    ${i}    IN RANGE    ${count}
         Append To List    ${VirtualLink_labels}    ${nfv.vnfd[0]['int-virtual-link-desc'][${i}]['id']} 
@@ -1548,6 +1555,7 @@ Get Virtual Link IDs
 
 Get Instantiation Levels
     [Arguments]    ${count}
+    Import Variables    ${CURDIR}/descriptors/SOL006/VNFD/vnfd_SOL006.yaml
     @{Instantiation_Levels}=    Create List
     FOR    ${i}    IN RANGE    ${count}
         Append To List    ${Instantiation_Levels}    ${nfv.vnfd[0].df['instantiation-level'][${i}]['id']} 
@@ -1627,8 +1635,6 @@ DELETE Change Current VNF Package Task
 Check HTTP Location Header Contains URI of Created Resource
     ${URI}=    Get Value From Json    ${response['headers']}    $..Location
     Should Not Be Empty    ${URI}
-    
-*** Keywords ***
 
 POST Create VNF Snapshot Task
     Log    Trying to request a snapshot of a VNF instance
@@ -2029,7 +2035,6 @@ Check HTTP Content-Type Header Is Set
     Should Be Equal As Strings    ${response['headers']['Content-Type']}    ${CONTENT_TYPE_OCTET} 
     Log    Content type validated
     
-
 Check HTTP Content-Range Header Is Set
     Log    Check Content-Range HTTP Header
     Should Contain    ${response['headers']}    Content-Range